@opentui/core 0.5.9 → 0.5.11

package/{chunk-bun-jxfx3h5k.js → chunk-bun-bwjmgnxw.js}

@@ -1,47 +1,243 @@
 // @bun
 import {
-  Clipboard,
-  InternalKeyHandler,
-  KeyHandler,
-  NativeMeasureTargetKind,
-  OptimizedBuffer,
-  RGBA,
-  Selection,
-  SpanInfoStruct,
-  StdinParser,
-  StyledText,
-  SystemClock,
-  TextBuffer,
-  borderCharsToArray,
-  buildTerminalPaletteSignature,
-  convertGlobalToLocalSelection,
-  createExtmarksController,
-  createTerminalPalette,
-  createTextAttributes,
-  destroyTreeSitterClient,
-  env,
-  getBorderSides,
-  getTreeSitterClient,
-  isStyledText,
-  normalizeTerminalPalette,
-  parseAlign,
-  parseAlignItems,
-  parseBorderStyle,
-  parseColor,
-  parseFlexDirection,
-  parseJustify,
-  parseOverflow,
-  parsePositionType,
-  parseWrap,
-  registerEnvVar,
-  resolveRenderLib,
+  toArrayBuffer,
   singleton,
+  registerEnvVar2,
+  env2,
   sleep,
-  stringToStyledText,
-  toArrayBuffer,
-  treeSitterToTextChunks,
+  RGBA2,
+  parseColor2,
+  parseBorderStyle2,
+  getBorderSides2,
+  borderCharsToArray2,
+  KeyHandler2,
+  InternalKeyHandler2,
+  createTextAttributes2,
+  getLinkId2,
+  isStyledText2,
+  StyledText2,
+  stringToStyledText2,
+  SystemClock2,
+  parseAlign2,
+  parseAlignItems2,
+  parseFlexDirection2,
+  parseJustify2,
+  parseOverflow2,
+  parsePositionType2,
+  parseWrap2,
+  Selection2,
+  convertGlobalToLocalSelection2,
+  StdinParser2,
+  treeSitterToTextChunks2,
+  getTreeSitterClient2,
+  destroyTreeSitterClient2,
+  createExtmarksController2,
+  createTerminalPalette2,
+  normalizeTerminalPalette2,
+  buildTerminalPaletteSignature2,
+  Clipboard2,
+  OptimizedBuffer2,
+  TextBuffer2,
+  SpanInfoStruct,
+  NativeMeasureTargetKind2,
+  resolveRenderLib2,
   yoga_default
-} from "./chunk-bun-b0662dgp.js";
+} from "./chunk-bun-37s3zwb6.js";
+
+// src/syntax-style.ts
+function convertThemeToStyles2(theme) {
+  const flatStyles = {};
+  for (const tokenStyle of theme) {
+    const styleDefinition = {};
+    if (tokenStyle.style.foreground) {
+      styleDefinition.fg = parseColor2(tokenStyle.style.foreground);
+    }
+    if (tokenStyle.style.background) {
+      styleDefinition.bg = parseColor2(tokenStyle.style.background);
+    }
+    if (tokenStyle.style.bold !== undefined) {
+      styleDefinition.bold = tokenStyle.style.bold;
+    }
+    if (tokenStyle.style.italic !== undefined) {
+      styleDefinition.italic = tokenStyle.style.italic;
+    }
+    if (tokenStyle.style.underline !== undefined) {
+      styleDefinition.underline = tokenStyle.style.underline;
+    }
+    if (tokenStyle.style.dim !== undefined) {
+      styleDefinition.dim = tokenStyle.style.dim;
+    }
+    for (const scope of tokenStyle.scope) {
+      flatStyles[scope] = styleDefinition;
+    }
+  }
+  return flatStyles;
+}
+
+class SyntaxStyle2 {
+  lib;
+  stylePtr;
+  _destroyed = false;
+  nameCache = new Map;
+  styleDefs = new Map;
+  mergedCache = new Map;
+  constructor(lib, ptr) {
+    this.lib = lib;
+    this.stylePtr = ptr;
+  }
+  static create() {
+    const lib = resolveRenderLib2();
+    const ptr = lib.createSyntaxStyle();
+    return new SyntaxStyle2(lib, ptr);
+  }
+  static fromTheme(theme) {
+    const style = SyntaxStyle2.create();
+    const flatStyles = convertThemeToStyles2(theme);
+    for (const [name, styleDef] of Object.entries(flatStyles)) {
+      style.registerStyle(name, styleDef);
+    }
+    return style;
+  }
+  static fromStyles(styles) {
+    const style = SyntaxStyle2.create();
+    for (const [name, styleDef] of Object.entries(styles)) {
+      style.registerStyle(name, styleDef);
+    }
+    return style;
+  }
+  guard() {
+    if (this._destroyed)
+      throw new Error("NativeSyntaxStyle is destroyed");
+  }
+  registerStyle(name, style) {
+    this.guard();
+    const attributes = createTextAttributes2({
+      bold: style.bold,
+      italic: style.italic,
+      underline: style.underline,
+      dim: style.dim
+    });
+    const fg = style.fg ? parseColor2(style.fg) : null;
+    const bg = style.bg ? parseColor2(style.bg) : null;
+    const id = this.lib.syntaxStyleRegister(this.stylePtr, name, fg, bg, attributes);
+    this.nameCache.set(name, id);
+    this.styleDefs.set(name, { ...style, fg: fg ?? undefined, bg: bg ?? undefined });
+    return id;
+  }
+  resolveStyleId(name) {
+    this.guard();
+    const cached = this.nameCache.get(name);
+    if (cached !== undefined)
+      return cached;
+    const id = this.lib.syntaxStyleResolveByName(this.stylePtr, name);
+    if (id !== null) {
+      this.nameCache.set(name, id);
+    }
+    return id;
+  }
+  getStyleId(name) {
+    this.guard();
+    const id = this.resolveStyleId(name);
+    if (id !== null)
+      return id;
+    if (name.includes(".")) {
+      const baseName = name.split(".")[0];
+      return this.resolveStyleId(baseName);
+    }
+    return null;
+  }
+  get ptr() {
+    this.guard();
+    return this.stylePtr;
+  }
+  getStyleCount() {
+    this.guard();
+    return this.lib.syntaxStyleGetStyleCount(this.stylePtr);
+  }
+  clearNameCache() {
+    this.nameCache.clear();
+  }
+  getStyle(name) {
+    this.guard();
+    if (Object.prototype.hasOwnProperty.call(this.styleDefs, name)) {
+      return;
+    }
+    const style = this.styleDefs.get(name);
+    if (style)
+      return style;
+    if (name.includes(".")) {
+      const baseName = name.split(".")[0];
+      if (Object.prototype.hasOwnProperty.call(this.styleDefs, baseName)) {
+        return;
+      }
+      return this.styleDefs.get(baseName);
+    }
+    return;
+  }
+  mergeStyles(...styleNames) {
+    this.guard();
+    const cacheKey = styleNames.join(":");
+    const cached = this.mergedCache.get(cacheKey);
+    if (cached)
+      return cached;
+    const styleDefinition = {};
+    for (const name of styleNames) {
+      const style = this.getStyle(name);
+      if (!style)
+        continue;
+      if (style.fg)
+        styleDefinition.fg = style.fg;
+      if (style.bg)
+        styleDefinition.bg = style.bg;
+      if (style.bold !== undefined)
+        styleDefinition.bold = style.bold;
+      if (style.italic !== undefined)
+        styleDefinition.italic = style.italic;
+      if (style.underline !== undefined)
+        styleDefinition.underline = style.underline;
+      if (style.dim !== undefined)
+        styleDefinition.dim = style.dim;
+    }
+    const attributes = createTextAttributes2({
+      bold: styleDefinition.bold,
+      italic: styleDefinition.italic,
+      underline: styleDefinition.underline,
+      dim: styleDefinition.dim
+    });
+    const merged = {
+      fg: styleDefinition.fg,
+      bg: styleDefinition.bg,
+      attributes
+    };
+    this.mergedCache.set(cacheKey, merged);
+    return merged;
+  }
+  clearCache() {
+    this.guard();
+    this.mergedCache.clear();
+  }
+  getCacheSize() {
+    this.guard();
+    return this.mergedCache.size;
+  }
+  getAllStyles() {
+    this.guard();
+    return new Map(this.styleDefs);
+  }
+  getRegisteredNames() {
+    this.guard();
+    return Array.from(this.styleDefs.keys());
+  }
+  destroy() {
+    if (this._destroyed)
+      return;
+    this._destroyed = true;
+    this.nameCache.clear();
+    this.styleDefs.clear();
+    this.mergedCache.clear();
+    this.lib.destroySyntaxStyle(this.stylePtr);
+  }
+}
 
 // src/Renderable.ts
 import { EventEmitter } from "events";
@@ -121,22 +317,22 @@ function isSizeType(value) {
 
 // src/Renderable.ts
 var BrandedRenderable = Symbol.for("@opentui/core/Renderable");
-var LayoutEvents;
-((LayoutEvents2) => {
-  LayoutEvents2["LAYOUT_CHANGED"] = "layout-changed";
-  LayoutEvents2["RESIZED"] = "resized";
-})(LayoutEvents ||= {});
-var RenderableEvents;
-((RenderableEvents2) => {
-  RenderableEvents2["FOCUSED"] = "focused";
-  RenderableEvents2["BLURRED"] = "blurred";
-  RenderableEvents2["DESTROYED"] = "destroyed";
-})(RenderableEvents ||= {});
-function isRenderable(obj) {
+var LayoutEvents2;
+((LayoutEvents) => {
+  LayoutEvents["LAYOUT_CHANGED"] = "layout-changed";
+  LayoutEvents["RESIZED"] = "resized";
+})(LayoutEvents2 ||= {});
+var RenderableEvents2;
+((RenderableEvents) => {
+  RenderableEvents["FOCUSED"] = "focused";
+  RenderableEvents["BLURRED"] = "blurred";
+  RenderableEvents["DESTROYED"] = "destroyed";
+})(RenderableEvents2 ||= {});
+function isRenderable2(obj) {
   return !!obj?.[BrandedRenderable];
 }
 
-class BaseRenderable extends EventEmitter {
+class BaseRenderable2 extends EventEmitter {
   [BrandedRenderable] = true;
   static renderableNumber = 1;
   _id;
@@ -146,7 +342,7 @@ class BaseRenderable extends EventEmitter {
   _visible = true;
   constructor(options) {
     super();
-    this.num = BaseRenderable.renderableNumber++;
+    this.num = BaseRenderable2.renderableNumber++;
     this._id = options.id ?? `renderable-${this.num}`;
   }
   get id() {
@@ -190,7 +386,7 @@ function bumpRenderListRevision(ctx) {
   generationContext.__otuiRenderListRevision = getRenderListRevision(ctx) + 1;
 }
 
-class Renderable extends BaseRenderable {
+class Renderable2 extends BaseRenderable2 {
   static renderablesByNumber = new Map;
   _isDestroyed = false;
   _ctx;
@@ -240,7 +436,7 @@ class Renderable extends BaseRenderable {
   constructor(ctx, options) {
     super(options);
     this._ctx = ctx;
-    Renderable.renderablesByNumber.set(this.num, this);
+    Renderable2.renderablesByNumber.set(this.num, this);
     validateOptions(this.id, options);
     this.renderBefore = options.renderBefore;
     this.renderAfter = options.renderAfter;
@@ -412,7 +608,7 @@ class Renderable extends BaseRenderable {
     for (const child of this._childrenInLayoutOrder) {
       if (child.id === id)
         return child;
-      if (isRenderable(child)) {
+      if (isRenderable2(child)) {
         const found = child.findDescendantById(id);
         if (found)
           return found;
@@ -601,11 +797,11 @@ class Renderable extends BaseRenderable {
       this._flexShrink = hasExplicitWidth || hasExplicitHeight ? 0 : 1;
       node.setFlexShrink(this._flexShrink);
     }
-    node.setFlexDirection(parseFlexDirection(options.flexDirection));
-    node.setFlexWrap(parseWrap(options.flexWrap));
-    node.setAlignItems(parseAlignItems(options.alignItems));
-    node.setJustifyContent(parseJustify(options.justifyContent));
-    node.setAlignSelf(parseAlign(options.alignSelf));
+    node.setFlexDirection(parseFlexDirection2(options.flexDirection));
+    node.setFlexWrap(parseWrap2(options.flexWrap));
+    node.setAlignItems(parseAlignItems2(options.alignItems));
+    node.setJustifyContent(parseJustify2(options.justifyContent));
+    node.setAlignSelf(parseAlign2(options.alignSelf));
     if (isDimensionType(options.width)) {
       this._width = options.width;
       this.yogaNode.setWidth(options.width);
@@ -616,11 +812,11 @@ class Renderable extends BaseRenderable {
     }
     this._positionType = options.position === "absolute" ? "absolute" : "relative";
     if (this._positionType !== "relative") {
-      node.setPositionType(parsePositionType(this._positionType));
+      node.setPositionType(parsePositionType2(this._positionType));
     }
     this._overflow = options.overflow === "hidden" ? "hidden" : options.overflow === "scroll" ? "scroll" : "visible";
     if (this._overflow !== "visible") {
-      node.setOverflow(parseOverflow(this._overflow));
+      node.setOverflow(parseOverflow2(this._overflow));
     }
     const hasPositionProps = options.top !== undefined || options.right !== undefined || options.bottom !== undefined || options.left !== undefined;
     if (hasPositionProps) {
@@ -689,7 +885,7 @@ class Renderable extends BaseRenderable {
     if (!isPositionTypeType(positionType) || this._positionType === positionType)
       return;
     this._positionType = positionType;
-    this.yogaNode.setPositionType(parsePositionType(positionType));
+    this.yogaNode.setPositionType(parsePositionType2(positionType));
     this.requestRender();
   }
   get overflow() {
@@ -699,7 +895,7 @@ class Renderable extends BaseRenderable {
     if (!isOverflowType(overflow) || this._overflow === overflow)
       return;
     this._overflow = overflow;
-    this.yogaNode.setOverflow(parseOverflow(overflow));
+    this.yogaNode.setOverflow(parseOverflow2(overflow));
     bumpRenderListRevision(this._ctx);
     this.requestRender();
   }
@@ -755,23 +951,23 @@ class Renderable extends BaseRenderable {
     this.requestRender();
   }
   set flexDirection(direction) {
-    this.yogaNode.setFlexDirection(parseFlexDirection(direction));
+    this.yogaNode.setFlexDirection(parseFlexDirection2(direction));
     this.requestRender();
   }
   set flexWrap(wrap) {
-    this.yogaNode.setFlexWrap(parseWrap(wrap));
+    this.yogaNode.setFlexWrap(parseWrap2(wrap));
     this.requestRender();
   }
   set alignItems(alignItems) {
-    this.yogaNode.setAlignItems(parseAlignItems(alignItems));
+    this.yogaNode.setAlignItems(parseAlignItems2(alignItems));
     this.requestRender();
   }
   set justifyContent(justifyContent) {
-    this.yogaNode.setJustifyContent(parseJustify(justifyContent));
+    this.yogaNode.setJustifyContent(parseJustify2(justifyContent));
     this.requestRender();
   }
   set alignSelf(alignSelf) {
-    this.yogaNode.setAlignSelf(parseAlign(alignSelf));
+    this.yogaNode.setAlignSelf(parseAlign2(alignSelf));
     this.requestRender();
   }
   set flexBasis(basis) {
@@ -956,7 +1152,7 @@ class Renderable extends BaseRenderable {
     }
     try {
       const widthMethod = this._ctx.widthMethod;
-      this.frameBuffer = OptimizedBuffer.create(w, h, widthMethod, {
+      this.frameBuffer = OptimizedBuffer2.create(w, h, widthMethod, {
         respectAlpha: true,
         id: `framebuffer-${this.id}`
       });
@@ -979,7 +1175,7 @@ class Renderable extends BaseRenderable {
     if (!obj) {
       return -1;
     }
-    const renderable = maybeMakeRenderable(this._ctx, obj);
+    const renderable = maybeMakeRenderable2(this._ctx, obj);
     if (!renderable) {
       return -1;
     }
@@ -1024,7 +1220,7 @@ class Renderable extends BaseRenderable {
     if (!obj) {
       return -1;
     }
-    const renderable = maybeMakeRenderable(this._ctx, obj);
+    const renderable = maybeMakeRenderable2(this._ctx, obj);
     if (!renderable) {
       return -1;
     }
@@ -1034,7 +1230,7 @@ class Renderable extends BaseRenderable {
       }
       return -1;
     }
-    if (!isRenderable(anchor)) {
+    if (!isRenderable2(anchor)) {
       throw new Error("Anchor must be a Renderable");
     }
     if (anchor.isDestroyed) {
@@ -1083,7 +1279,7 @@ class Renderable extends BaseRenderable {
     return this._childrenInLayoutOrder.find((child) => child.id === id);
   }
   remove(child) {
-    if (!(child instanceof BaseRenderable)) {
+    if (!(child instanceof BaseRenderable2)) {
       throw new Error("remove expects a renderable child object");
     }
     const index = this._childrenInLayoutOrder.indexOf(child);
@@ -1200,13 +1396,13 @@ class Renderable extends BaseRenderable {
     }
   }
   _hasVisibleChildFilter() {
-    return this._getVisibleChildren !== Renderable.prototype._getVisibleChildren;
+    return this._getVisibleChildren !== Renderable2.prototype._getVisibleChildren;
   }
   _getVisibleChildren() {
     return this._childrenInZIndexOrder.map((child) => child.num);
   }
   canReuseRenderCommandList() {
-    return this.onUpdate === Renderable.prototype.onUpdate && (this._overflow === "visible" || this.getScissorRect === Renderable.prototype.getScissorRect) && !this._hasVisibleChildFilter();
+    return this.onUpdate === Renderable2.prototype.onUpdate && (this._overflow === "visible" || this.getScissorRect === Renderable2.prototype.getScissorRect) && !this._hasVisibleChildFilter();
   }
   onUpdate(deltaTime) {}
   getScissorRect() {
@@ -1240,7 +1436,7 @@ class Renderable extends BaseRenderable {
     this._childrenInLayoutOrder = [];
     this._childrenInZIndexOrder = [];
     this._shouldUpdateBefore.clear();
-    Renderable.renderablesByNumber.delete(this.num);
+    Renderable2.renderablesByNumber.delete(this.num);
     this.blur();
     this.removeAllListeners();
     this.destroySelf();
@@ -1364,7 +1560,7 @@ class Renderable extends BaseRenderable {
   }
 }
 
-class RootRenderable extends Renderable {
+class RootRenderable2 extends Renderable2 {
   renderList = [];
   _currentRenderable;
   appliedLayoutGeneration = -1;
@@ -1491,7 +1687,7 @@ class RootRenderable extends Renderable {
 import util from "util";
 var BrandedVNode = Symbol.for("@opentui/core/VNode");
 function isRenderableConstructor(value) {
-  return typeof value === "function" && value.prototype && Renderable.prototype.isPrototypeOf(value.prototype);
+  return typeof value === "function" && value.prototype && Renderable2.prototype.isPrototypeOf(value.prototype);
 }
 function flattenChildren(children) {
   const result = [];
@@ -1504,7 +1700,7 @@ function flattenChildren(children) {
   }
   return result;
 }
-function h(type, props, ...children) {
+function h2(type, props, ...children) {
   if (typeof type !== "function") {
     throw new TypeError("h() received an invalid vnode type");
   }
@@ -1550,20 +1746,20 @@ function h(type, props, ...children) {
   }
   return vnode;
 }
-function isVNode(node) {
+function isVNode2(node) {
   return node && node[BrandedVNode];
 }
-function maybeMakeRenderable(ctx, node) {
-  if (isRenderable(node))
+function maybeMakeRenderable2(ctx, node) {
+  if (isRenderable2(node))
     return node;
-  if (isVNode(node))
-    return instantiate(ctx, node);
+  if (isVNode2(node))
+    return instantiate2(ctx, node);
   if (true) {
     console.warn("maybeMakeRenderable received an invalid node", util.inspect(node, { depth: 2 }));
   }
   return null;
 }
-function wrapWithDelegates(instance, delegateMap) {
+function wrapWithDelegates2(instance, delegateMap) {
   if (!delegateMap || Object.keys(delegateMap).length === 0)
     return instance;
   const getDescendant = (id) => {
@@ -1595,8 +1791,8 @@ function wrapWithDelegates(instance, delegateMap) {
   });
   return proxy;
 }
-function instantiate(ctx, node) {
-  if (isRenderable(node))
+function instantiate2(ctx, node) {
+  if (isRenderable2(node))
     return node;
   if (!node || typeof node !== "object") {
     throw new TypeError("mount() received an invalid vnode");
@@ -1608,14 +1804,14 @@ function instantiate(ctx, node) {
   if (isRenderableConstructor(type)) {
     const instance = new type(ctx, props || {});
     for (const child of children) {
-      if (isRenderable(child)) {
+      if (isRenderable2(child)) {
         instance.add(child);
       } else {
-        const mounted = instantiate(ctx, child);
+        const mounted = instantiate2(ctx, child);
         instance.add(mounted);
       }
     }
-    const delegatedInstance = wrapWithDelegates(instance, delegateMap);
+    const delegatedInstance = wrapWithDelegates2(instance, delegateMap);
     const pendingCalls = vnode.__pendingCalls;
     if (pendingCalls) {
       for (const call of pendingCalls) {
@@ -1629,12 +1825,12 @@ function instantiate(ctx, node) {
     return delegatedInstance;
   }
   const resolved = type(props || {}, children);
-  const inst = instantiate(ctx, resolved);
-  return wrapWithDelegates(inst, delegateMap);
+  const inst = instantiate2(ctx, resolved);
+  return wrapWithDelegates2(inst, delegateMap);
 }
-function delegate(mapping, vnode) {
-  if (isRenderable(vnode)) {
-    return wrapWithDelegates(vnode, mapping);
+function delegate2(mapping, vnode) {
+  if (isRenderable2(vnode)) {
+    return wrapWithDelegates2(vnode, mapping);
   }
   if (!vnode || typeof vnode !== "object")
     return vnode;
@@ -1643,7 +1839,7 @@ function delegate(mapping, vnode) {
 }
 
 // src/text-buffer-view.ts
-class TextBufferView {
+class TextBufferView2 {
   lib;
   viewPtr;
   textBuffer;
@@ -1654,9 +1850,9 @@ class TextBufferView {
     this.textBuffer = textBuffer;
   }
   static create(textBuffer) {
-    const lib = resolveRenderLib();
+    const lib = resolveRenderLib2();
     const viewPtr = lib.createTextBufferView(textBuffer.ptr);
-    return new TextBufferView(lib, viewPtr, textBuffer);
+    return new TextBufferView2(lib, viewPtr, textBuffer);
   }
   guard() {
     if (this._destroyed)
@@ -1734,6 +1930,10 @@ class TextBufferView {
     this.guard();
     return this.lib.textBufferViewGetLogicalLineInfo(this.viewPtr);
   }
+  getLineSources(startLine, lineCount) {
+    this.guard();
+    return this.lib.textBufferViewGetLineSources(this.viewPtr, startLine, lineCount);
+  }
   getSelectedText() {
     this.guard();
     const byteSize = this.textBuffer.byteSize;
@@ -1786,7 +1986,7 @@ class TextBufferView {
 // src/edit-buffer.ts
 import { EventEmitter as EventEmitter2 } from "events";
 
-class EditBuffer extends EventEmitter2 {
+class EditBuffer2 extends EventEmitter2 {
   static registry = new Map;
   static nativeEventsSubscribed = false;
   lib;
@@ -1804,23 +2004,23 @@ class EditBuffer extends EventEmitter2 {
     this.bufferPtr = ptr;
     this.textBufferPtr = lib.editBufferGetTextBuffer(ptr);
     this.id = lib.editBufferGetId(ptr);
-    EditBuffer.registry.set(this.id, this);
-    EditBuffer.subscribeToNativeEvents(lib);
+    EditBuffer2.registry.set(this.id, this);
+    EditBuffer2.subscribeToNativeEvents(lib);
   }
   static create(widthMethod) {
-    const lib = resolveRenderLib();
+    const lib = resolveRenderLib2();
     const ptr = lib.createEditBuffer(widthMethod);
-    return new EditBuffer(lib, ptr);
+    return new EditBuffer2(lib, ptr);
   }
   static subscribeToNativeEvents(lib) {
-    if (EditBuffer.nativeEventsSubscribed)
+    if (EditBuffer2.nativeEventsSubscribed)
       return;
-    EditBuffer.nativeEventsSubscribed = true;
+    EditBuffer2.nativeEventsSubscribed = true;
     lib.onAnyNativeEvent((name, data) => {
       const buffer = new Uint16Array(data);
       if (name.startsWith("eb_") && buffer.length >= 1) {
         const id = buffer[0];
-        const instance = EditBuffer.registry.get(id);
+        const instance = EditBuffer2.registry.get(id);
         if (instance) {
           const eventName = name.slice(3);
           const eventData = data.slice(2);
@@ -2099,13 +2299,13 @@ class EditBuffer extends EventEmitter2 {
     if (this._destroyed)
       return;
     this._destroyed = true;
-    EditBuffer.registry.delete(this.id);
+    EditBuffer2.registry.delete(this.id);
     this.lib.destroyEditBuffer(this.bufferPtr);
   }
 }
 
 // src/editor-view.ts
-class EditorView {
+class EditorView2 {
   lib;
   viewPtr;
   editBuffer;
@@ -2118,9 +2318,9 @@ class EditorView {
     this.editBuffer = editBuffer;
   }
   static create(editBuffer, viewportWidth, viewportHeight) {
-    const lib = resolveRenderLib();
+    const lib = resolveRenderLib2();
     const viewPtr = lib.createEditorView(editBuffer.ptr, viewportWidth, viewportHeight);
-    return new EditorView(lib, viewPtr, editBuffer);
+    return new EditorView2(lib, viewPtr, editBuffer);
   }
   guard() {
     if (this._destroyed)
@@ -2285,7 +2485,7 @@ class EditorView {
   }
   get extmarks() {
     if (!this._extmarksController) {
-      this._extmarksController = createExtmarksController(this.editBuffer, this);
+      this._extmarksController = createExtmarksController2(this.editBuffer, this);
     }
     return this._extmarksController;
   }
@@ -2319,201 +2519,6 @@ class EditorView {
   }
 }
 
-// src/syntax-style.ts
-function convertThemeToStyles(theme) {
-  const flatStyles = {};
-  for (const tokenStyle of theme) {
-    const styleDefinition = {};
-    if (tokenStyle.style.foreground) {
-      styleDefinition.fg = parseColor(tokenStyle.style.foreground);
-    }
-    if (tokenStyle.style.background) {
-      styleDefinition.bg = parseColor(tokenStyle.style.background);
-    }
-    if (tokenStyle.style.bold !== undefined) {
-      styleDefinition.bold = tokenStyle.style.bold;
-    }
-    if (tokenStyle.style.italic !== undefined) {
-      styleDefinition.italic = tokenStyle.style.italic;
-    }
-    if (tokenStyle.style.underline !== undefined) {
-      styleDefinition.underline = tokenStyle.style.underline;
-    }
-    if (tokenStyle.style.dim !== undefined) {
-      styleDefinition.dim = tokenStyle.style.dim;
-    }
-    for (const scope of tokenStyle.scope) {
-      flatStyles[scope] = styleDefinition;
-    }
-  }
-  return flatStyles;
-}
-
-class SyntaxStyle {
-  lib;
-  stylePtr;
-  _destroyed = false;
-  nameCache = new Map;
-  styleDefs = new Map;
-  mergedCache = new Map;
-  constructor(lib, ptr) {
-    this.lib = lib;
-    this.stylePtr = ptr;
-  }
-  static create() {
-    const lib = resolveRenderLib();
-    const ptr = lib.createSyntaxStyle();
-    return new SyntaxStyle(lib, ptr);
-  }
-  static fromTheme(theme) {
-    const style = SyntaxStyle.create();
-    const flatStyles = convertThemeToStyles(theme);
-    for (const [name, styleDef] of Object.entries(flatStyles)) {
-      style.registerStyle(name, styleDef);
-    }
-    return style;
-  }
-  static fromStyles(styles) {
-    const style = SyntaxStyle.create();
-    for (const [name, styleDef] of Object.entries(styles)) {
-      style.registerStyle(name, styleDef);
-    }
-    return style;
-  }
-  guard() {
-    if (this._destroyed)
-      throw new Error("NativeSyntaxStyle is destroyed");
-  }
-  registerStyle(name, style) {
-    this.guard();
-    const attributes = createTextAttributes({
-      bold: style.bold,
-      italic: style.italic,
-      underline: style.underline,
-      dim: style.dim
-    });
-    const fg = style.fg ? parseColor(style.fg) : null;
-    const bg = style.bg ? parseColor(style.bg) : null;
-    const id = this.lib.syntaxStyleRegister(this.stylePtr, name, fg, bg, attributes);
-    this.nameCache.set(name, id);
-    this.styleDefs.set(name, { ...style, fg: fg ?? undefined, bg: bg ?? undefined });
-    return id;
-  }
-  resolveStyleId(name) {
-    this.guard();
-    const cached = this.nameCache.get(name);
-    if (cached !== undefined)
-      return cached;
-    const id = this.lib.syntaxStyleResolveByName(this.stylePtr, name);
-    if (id !== null) {
-      this.nameCache.set(name, id);
-    }
-    return id;
-  }
-  getStyleId(name) {
-    this.guard();
-    const id = this.resolveStyleId(name);
-    if (id !== null)
-      return id;
-    if (name.includes(".")) {
-      const baseName = name.split(".")[0];
-      return this.resolveStyleId(baseName);
-    }
-    return null;
-  }
-  get ptr() {
-    this.guard();
-    return this.stylePtr;
-  }
-  getStyleCount() {
-    this.guard();
-    return this.lib.syntaxStyleGetStyleCount(this.stylePtr);
-  }
-  clearNameCache() {
-    this.nameCache.clear();
-  }
-  getStyle(name) {
-    this.guard();
-    if (Object.prototype.hasOwnProperty.call(this.styleDefs, name)) {
-      return;
-    }
-    const style = this.styleDefs.get(name);
-    if (style)
-      return style;
-    if (name.includes(".")) {
-      const baseName = name.split(".")[0];
-      if (Object.prototype.hasOwnProperty.call(this.styleDefs, baseName)) {
-        return;
-      }
-      return this.styleDefs.get(baseName);
-    }
-    return;
-  }
-  mergeStyles(...styleNames) {
-    this.guard();
-    const cacheKey = styleNames.join(":");
-    const cached = this.mergedCache.get(cacheKey);
-    if (cached)
-      return cached;
-    const styleDefinition = {};
-    for (const name of styleNames) {
-      const style = this.getStyle(name);
-      if (!style)
-        continue;
-      if (style.fg)
-        styleDefinition.fg = style.fg;
-      if (style.bg)
-        styleDefinition.bg = style.bg;
-      if (style.bold !== undefined)
-        styleDefinition.bold = style.bold;
-      if (style.italic !== undefined)
-        styleDefinition.italic = style.italic;
-      if (style.underline !== undefined)
-        styleDefinition.underline = style.underline;
-      if (style.dim !== undefined)
-        styleDefinition.dim = style.dim;
-    }
-    const attributes = createTextAttributes({
-      bold: styleDefinition.bold,
-      italic: styleDefinition.italic,
-      underline: styleDefinition.underline,
-      dim: styleDefinition.dim
-    });
-    const merged = {
-      fg: styleDefinition.fg,
-      bg: styleDefinition.bg,
-      attributes
-    };
-    this.mergedCache.set(cacheKey, merged);
-    return merged;
-  }
-  clearCache() {
-    this.guard();
-    this.mergedCache.clear();
-  }
-  getCacheSize() {
-    this.guard();
-    return this.mergedCache.size;
-  }
-  getAllStyles() {
-    this.guard();
-    return new Map(this.styleDefs);
-  }
-  getRegisteredNames() {
-    this.guard();
-    return Array.from(this.styleDefs.keys());
-  }
-  destroy() {
-    if (this._destroyed)
-      return;
-    this._destroyed = true;
-    this.nameCache.clear();
-    this.styleDefs.clear();
-    this.mergedCache.clear();
-    this.lib.destroySyntaxStyle(this.stylePtr);
-  }
-}
-
 // src/renderables/Box.ts
 function isGapType(value) {
   if (value === undefined) {
@@ -2525,7 +2530,7 @@ function isGapType(value) {
   return isValidPercentage(value);
 }
 
-class BoxRenderable extends Renderable {
+class BoxRenderable2 extends Renderable2 {
   _backgroundColor;
   _border;
   _borderStyle;
@@ -2555,20 +2560,20 @@ class BoxRenderable extends Renderable {
     if (options.focusable === true) {
       this._focusable = true;
     }
-    this._backgroundColor = parseColor(options.backgroundColor || this._defaultOptions.backgroundColor);
+    this._backgroundColor = parseColor2(options.backgroundColor || this._defaultOptions.backgroundColor);
     this._border = options.border ?? this._defaultOptions.border;
     if (!options.border && (options.borderStyle || options.borderColor || options.focusedBorderColor || options.customBorderChars)) {
       this._border = true;
     }
-    this._borderStyle = parseBorderStyle(options.borderStyle, this._defaultOptions.borderStyle);
-    this._borderColor = parseColor(options.borderColor || this._defaultOptions.borderColor);
-    this._focusedBorderColor = parseColor(options.focusedBorderColor || this._defaultOptions.focusedBorderColor);
+    this._borderStyle = parseBorderStyle2(options.borderStyle, this._defaultOptions.borderStyle);
+    this._borderColor = parseColor2(options.borderColor || this._defaultOptions.borderColor);
+    this._focusedBorderColor = parseColor2(options.focusedBorderColor || this._defaultOptions.focusedBorderColor);
     this._customBorderCharsObj = options.customBorderChars;
-    this._customBorderChars = this._customBorderCharsObj ? borderCharsToArray(this._customBorderCharsObj) : undefined;
-    this.borderSides = getBorderSides(this._border);
+    this._customBorderChars = this._customBorderCharsObj ? borderCharsToArray2(this._customBorderCharsObj) : undefined;
+    this.borderSides = getBorderSides2(this._border);
     this.shouldFill = options.shouldFill ?? this._defaultOptions.shouldFill;
     this._title = options.title;
-    this._titleColor = options.titleColor ? parseColor(options.titleColor) : undefined;
+    this._titleColor = options.titleColor ? parseColor2(options.titleColor) : undefined;
     this._titleAlignment = options.titleAlignment || this._defaultOptions.titleAlignment;
     this._bottomTitle = options.bottomTitle;
     this._bottomTitleAlignment = options.bottomTitleAlignment || this._defaultOptions.bottomTitleAlignment;
@@ -2581,7 +2586,7 @@ class BoxRenderable extends Renderable {
   initializeBorder() {
     if (this._border === false) {
       this._border = true;
-      this.borderSides = getBorderSides(this._border);
+      this.borderSides = getBorderSides2(this._border);
       this.applyYogaBorders();
     }
   }
@@ -2590,14 +2595,14 @@ class BoxRenderable extends Renderable {
   }
   set customBorderChars(value) {
     this._customBorderCharsObj = value;
-    this._customBorderChars = value ? borderCharsToArray(value) : undefined;
+    this._customBorderChars = value ? borderCharsToArray2(value) : undefined;
     this.requestRender();
   }
   get backgroundColor() {
     return this._backgroundColor;
   }
   set backgroundColor(value) {
-    const newColor = parseColor(value ?? this._defaultOptions.backgroundColor);
+    const newColor = parseColor2(value ?? this._defaultOptions.backgroundColor);
     if (this._backgroundColor !== newColor) {
       this._backgroundColor = newColor;
       this.requestRender();
@@ -2609,7 +2614,7 @@ class BoxRenderable extends Renderable {
   set border(value) {
     if (this._border !== value) {
       this._border = value;
-      this.borderSides = getBorderSides(value);
+      this.borderSides = getBorderSides2(value);
       this.applyYogaBorders();
       this.requestRender();
     }
@@ -2618,7 +2623,7 @@ class BoxRenderable extends Renderable {
     return this._borderStyle;
   }
   set borderStyle(value) {
-    const _value = parseBorderStyle(value, this._defaultOptions.borderStyle);
+    const _value = parseBorderStyle2(value, this._defaultOptions.borderStyle);
     if (this._borderStyle !== _value || !this._border) {
       this._borderStyle = _value;
       this._customBorderChars = undefined;
@@ -2630,7 +2635,7 @@ class BoxRenderable extends Renderable {
     return this._borderColor;
   }
   set borderColor(value) {
-    const newColor = parseColor(value ?? this._defaultOptions.borderColor);
+    const newColor = parseColor2(value ?? this._defaultOptions.borderColor);
     if (this._borderColor !== newColor) {
       this._borderColor = newColor;
       this.initializeBorder();
@@ -2641,7 +2646,7 @@ class BoxRenderable extends Renderable {
     return this._focusedBorderColor;
   }
   set focusedBorderColor(value) {
-    const newColor = parseColor(value ?? this._defaultOptions.focusedBorderColor);
+    const newColor = parseColor2(value ?? this._defaultOptions.focusedBorderColor);
     if (this._focusedBorderColor !== newColor) {
       this._focusedBorderColor = newColor;
       this.initializeBorder();
@@ -2663,7 +2668,7 @@ class BoxRenderable extends Renderable {
     return this._titleColor;
   }
   set titleColor(value) {
-    const newColor = value ? parseColor(value) : undefined;
+    const newColor = value ? parseColor2(value) : undefined;
     if (this._titleColor !== newColor) {
       this._titleColor = newColor;
       this.requestRender();
@@ -2781,7 +2786,7 @@ class BoxRenderable extends Renderable {
 }
 
 // src/renderables/TextBufferRenderable.ts
-class TextBufferRenderable extends Renderable {
+class TextBufferRenderable2 extends Renderable2 {
   selectable = true;
   _defaultFg;
   _defaultBg;
@@ -2801,8 +2806,8 @@ class TextBufferRenderable extends Renderable {
   _textBufferSyntaxStyle;
   nativeRenderable = null;
   _defaultOptions = {
-    fg: RGBA.fromValues(1, 1, 1, 1),
-    bg: RGBA.fromValues(0, 0, 0, 0),
+    fg: RGBA2.fromValues(1, 1, 1, 1),
+    bg: RGBA2.fromValues(0, 0, 0, 0),
     selectionBg: undefined,
     selectionFg: undefined,
     selectable: true,
@@ -2814,20 +2819,20 @@ class TextBufferRenderable extends Renderable {
   };
   constructor(ctx, options) {
     super(ctx, options);
-    this._defaultFg = parseColor(options.fg ?? this._defaultOptions.fg);
-    this._defaultBg = parseColor(options.bg ?? this._defaultOptions.bg);
+    this._defaultFg = parseColor2(options.fg ?? this._defaultOptions.fg);
+    this._defaultBg = parseColor2(options.bg ?? this._defaultOptions.bg);
     this._defaultAttributes = options.attributes ?? this._defaultOptions.attributes;
-    this._selectionBg = options.selectionBg ? parseColor(options.selectionBg) : this._defaultOptions.selectionBg;
-    this._selectionFg = options.selectionFg ? parseColor(options.selectionFg) : this._defaultOptions.selectionFg;
+    this._selectionBg = options.selectionBg ? parseColor2(options.selectionBg) : this._defaultOptions.selectionBg;
+    this._selectionFg = options.selectionFg ? parseColor2(options.selectionFg) : this._defaultOptions.selectionFg;
     this.selectable = options.selectable ?? this._defaultOptions.selectable;
     this._wrapMode = options.wrapMode ?? this._defaultOptions.wrapMode;
     this._tabIndicator = options.tabIndicator ?? this._defaultOptions.tabIndicator;
-    this._tabIndicatorColor = options.tabIndicatorColor ? parseColor(options.tabIndicatorColor) : this._defaultOptions.tabIndicatorColor;
+    this._tabIndicatorColor = options.tabIndicatorColor ? parseColor2(options.tabIndicatorColor) : this._defaultOptions.tabIndicatorColor;
     this._truncate = options.truncate ?? this._defaultOptions.truncate;
-    this.textBuffer = TextBuffer.create(this._ctx.widthMethod);
-    this.textBufferView = TextBufferView.create(this.textBuffer);
+    this.textBuffer = TextBuffer2.create(this._ctx.widthMethod);
+    this.textBufferView = TextBufferView2.create(this.textBuffer);
     this._firstLineOffset = ctx.claimFirstLineOffset?.(this) ?? 0;
-    this._textBufferSyntaxStyle = SyntaxStyle.create();
+    this._textBufferSyntaxStyle = SyntaxStyle2.create();
     this.textBuffer.setSyntaxStyle(this._textBufferSyntaxStyle);
     this.textBufferView.setWrapMode(this._wrapMode);
     this.textBufferView.setFirstLineOffset(this._firstLineOffset);
@@ -2875,6 +2880,23 @@ class TextBufferRenderable extends Renderable {
   get lineInfo() {
     return this.textBufferView.logicalLineInfo;
   }
+  getLineSources(startLine, lineCount) {
+    if (this.needsLineInfoFallback(TextBufferRenderable2.prototype)) {
+      return this.lineInfo.lineSources.slice(startLine, startLine + lineCount);
+    }
+    return this.textBufferView.getLineSources(startLine, lineCount);
+  }
+  needsLineInfoFallback(owner) {
+    let prototype = this;
+    while (prototype && prototype !== owner) {
+      if (Object.hasOwn(prototype, "getLineSources"))
+        return false;
+      if (Object.hasOwn(prototype, "lineInfo"))
+        return true;
+      prototype = Object.getPrototypeOf(prototype);
+    }
+    return false;
+  }
   get lineCount() {
     return this.textBuffer.getLineCount();
   }
@@ -2909,7 +2931,7 @@ class TextBufferRenderable extends Renderable {
     return this.lineInfo.lineWidthColsMax;
   }
   get scrollHeight() {
-    return this.lineInfo.lineStartCols.length;
+    return this.virtualLineCount;
   }
   get maxScrollY() {
     return Math.max(0, this.scrollHeight - this.height);
@@ -2932,7 +2954,7 @@ class TextBufferRenderable extends Renderable {
     return this._defaultFg;
   }
   set fg(value) {
-    const newColor = parseColor(value ?? this._defaultOptions.fg);
+    const newColor = parseColor2(value ?? this._defaultOptions.fg);
     if (this._defaultFg !== newColor) {
       this._defaultFg = newColor;
       this.textBuffer.setDefaultFg(this._defaultFg);
@@ -2944,7 +2966,7 @@ class TextBufferRenderable extends Renderable {
     return this._selectionBg;
   }
   set selectionBg(value) {
-    const newColor = value ? parseColor(value) : this._defaultOptions.selectionBg;
+    const newColor = value ? parseColor2(value) : this._defaultOptions.selectionBg;
     if (this._selectionBg !== newColor) {
       this._selectionBg = newColor;
       if (this.lastLocalSelection) {
@@ -2957,7 +2979,7 @@ class TextBufferRenderable extends Renderable {
     return this._selectionFg;
   }
   set selectionFg(value) {
-    const newColor = value ? parseColor(value) : this._defaultOptions.selectionFg;
+    const newColor = value ? parseColor2(value) : this._defaultOptions.selectionFg;
     if (this._selectionFg !== newColor) {
       this._selectionFg = newColor;
       if (this.lastLocalSelection) {
@@ -2970,7 +2992,7 @@ class TextBufferRenderable extends Renderable {
     return this._defaultBg;
   }
   set bg(value) {
-    const newColor = parseColor(value ?? this._defaultOptions.bg);
+    const newColor = parseColor2(value ?? this._defaultOptions.bg);
     if (this._defaultBg !== newColor) {
       this._defaultBg = newColor;
       this.textBuffer.setDefaultBg(this._defaultBg);
@@ -3019,7 +3041,7 @@ class TextBufferRenderable extends Renderable {
     return this._tabIndicatorColor;
   }
   set tabIndicatorColor(value) {
-    const newColor = value ? parseColor(value) : undefined;
+    const newColor = value ? parseColor2(value) : undefined;
     if (this._tabIndicatorColor !== newColor) {
       this._tabIndicatorColor = newColor;
       if (newColor !== undefined) {
@@ -3066,13 +3088,13 @@ class TextBufferRenderable extends Renderable {
     this.emit("line-info-change");
   }
   setupNativeRenderable() {
-    const lib = resolveRenderLib();
+    const lib = resolveRenderLib2();
     const nativeRenderable = lib.createNativeRenderable();
     if (!lib.nativeRenderableAttachYogaNode(nativeRenderable, this.yogaNode.ptr)) {
       lib.destroyNativeRenderable(nativeRenderable);
       throw new Error("Failed to attach native renderable Yoga node");
     }
-    if (!lib.nativeRenderableSetMeasureTarget(nativeRenderable, NativeMeasureTargetKind.TextBufferView, this.textBufferView.ptr)) {
+    if (!lib.nativeRenderableSetMeasureTarget(nativeRenderable, NativeMeasureTargetKind2.TextBufferView, this.textBufferView.ptr)) {
       lib.destroyNativeRenderable(nativeRenderable);
       throw new Error("Failed to attach text buffer native measure target");
     }
@@ -3086,7 +3108,7 @@ class TextBufferRenderable extends Renderable {
     return localX >= 0 && localX < this.width && localY >= 0 && localY < this.height;
   }
   onSelectionChanged(selection) {
-    const localSelection = convertGlobalToLocalSelection(selection, this.x, this.y);
+    const localSelection = convertGlobalToLocalSelection2(selection, this.x, this.y);
     this.lastLocalSelection = localSelection;
     let changed;
     if (!localSelection?.isActive) {
@@ -3132,7 +3154,7 @@ class TextBufferRenderable extends Renderable {
     if (this.isDestroyed)
       return;
     if (this.nativeRenderable) {
-      resolveRenderLib().destroyNativeRenderable(this.nativeRenderable);
+      resolveRenderLib2().destroyNativeRenderable(this.nativeRenderable);
       this.nativeRenderable = null;
     }
     this.textBuffer.setSyntaxStyle(null);
@@ -3147,7 +3169,7 @@ class TextBufferRenderable extends Renderable {
 }
 
 // src/renderables/Code.ts
-class CodeRenderable extends TextBufferRenderable {
+class CodeRenderable2 extends TextBufferRenderable2 {
   _content;
   _filetype;
   _syntaxStyle;
@@ -3182,7 +3204,7 @@ class CodeRenderable extends TextBufferRenderable {
     this._content = options.content ?? this._contentDefaultOptions.content;
     this._filetype = options.filetype;
     this._syntaxStyle = options.syntaxStyle;
-    this._treeSitterClient = options.treeSitterClient ?? getTreeSitterClient();
+    this._treeSitterClient = options.treeSitterClient ?? getTreeSitterClient2();
     this._conceal = options.conceal ?? this._contentDefaultOptions.conceal;
     this._drawUnstyledText = options.drawUnstyledText ?? this._contentDefaultOptions.drawUnstyledText;
     this._streaming = options.streaming ?? this._contentDefaultOptions.streaming;
@@ -3216,7 +3238,7 @@ class CodeRenderable extends TextBufferRenderable {
         this.requestRender();
         return;
       }
-      if (this._initialStyledText && this._drawUnstyledText) {
+      if (value && this._initialStyledText && this._drawUnstyledText) {
         this.textBuffer.setStyledText(this._initialStyledText);
       } else {
         this.textBuffer.setText(value);
@@ -3225,6 +3247,14 @@ class CodeRenderable extends TextBufferRenderable {
       this.updateTextInfo();
     }
   }
+  updateStreamingPreview(content, initialStyledText) {
+    this._content = content;
+    this._initialStyledText = initialStyledText;
+    this.invalidateHighlights();
+    this.textBuffer.setStyledText(initialStyledText);
+    this.setRenderedLineSources(undefined);
+    this.updateTextInfo();
+  }
   get lineInfo() {
     if (!this._renderedLineSources)
       return super.lineInfo;
@@ -3238,6 +3268,14 @@ class CodeRenderable extends TextBufferRenderable {
     };
     return this._mappedLineInfo;
   }
+  getLineSources(startLine, lineCount) {
+    if (this.needsLineInfoFallback(CodeRenderable2.prototype)) {
+      return this.lineInfo.lineSources.slice(startLine, startLine + lineCount);
+    }
+    const sources = this.textBufferView.getLineSources(startLine, lineCount);
+    const renderedLineSources = this._renderedLineSources;
+    return renderedLineSources ? sources.map((line) => renderedLineSources[line] ?? line) : sources;
+  }
   get wrapMode() {
     return super.wrapMode;
   }
@@ -3296,6 +3334,10 @@ class CodeRenderable extends TextBufferRenderable {
   }
   set initialStyledText(value) {
     if (this._initialStyledText !== value) {
+      if (value && this._streaming && this._drawUnstyledText && this._isHighlighting) {
+        this.updateStreamingPreview(this._content, value);
+        return;
+      }
       this._initialStyledText = value;
       this.invalidateHighlights();
     }
@@ -3423,15 +3465,18 @@ class CodeRenderable extends TextBufferRenderable {
         }
       }
       if (highlights.length > 0 || this._onChunks || this._baseHighlight) {
+        const sourceRanges = this._onChunks ? [] : undefined;
         const context = {
           content,
           filetype,
           syntaxStyle: this._syntaxStyle,
-          highlights
+          highlights,
+          sourceRanges
         };
-        let chunks = treeSitterToTextChunks(content, highlights, this._syntaxStyle, {
+        let chunks = treeSitterToTextChunks2(content, highlights, this._syntaxStyle, {
           enabled: this._conceal,
-          baseHighlight: this._baseHighlight
+          baseHighlight: this._baseHighlight,
+          ranges: sourceRanges
         });
         const renderedLineSources = this._onChunks ? undefined : this.getConcealLinesSourceMap(content, highlights);
         chunks = await this.transformChunks(chunks, context);
@@ -3441,7 +3486,7 @@ class CodeRenderable extends TextBufferRenderable {
         }
         if (this.isDestroyed)
           return;
-        const styledText = new StyledText(chunks);
+        const styledText = new StyledText2(chunks);
         this.textBuffer.setStyledText(styledText);
         this.setRenderedLineSources(renderedLineSources);
       } else {
@@ -3530,7 +3575,7 @@ class CodeRenderable extends TextBufferRenderable {
   getConcealLinesSourceMap(content, highlights) {
     if (!this._conceal || content.length === 0)
       return;
-    const concealLineRanges = CodeRenderable.getMergedConcealLineRanges(highlights);
+    const concealLineRanges = CodeRenderable2.getMergedConcealLineRanges(highlights);
     if (concealLineRanges.length === 0)
       return;
     const lineSources = [];
@@ -3572,7 +3617,7 @@ class CodeRenderable extends TextBufferRenderable {
         break;
       lineStart = newlineOffset + 1;
     }
-    if (lineSources.length === 0 || CodeRenderable.isIdentityLineSources(lineSources))
+    if (lineSources.length === 0 || CodeRenderable2.isIdentityLineSources(lineSources))
       return;
     return lineSources;
   }
@@ -3634,12 +3679,12 @@ class CodeRenderable extends TextBufferRenderable {
 
 // src/renderables/TextNode.ts
 var BrandedTextNodeRenderable = Symbol.for("@opentui/core/TextNodeRenderable");
-function isTextNodeRenderable(obj) {
+function isTextNodeRenderable2(obj) {
   return !!obj?.[BrandedTextNodeRenderable];
 }
 function styledTextToTextNodes(styledText) {
   return styledText.chunks.map((chunk) => {
-    const node = new TextNodeRenderable({
+    const node = new TextNodeRenderable2({
       fg: chunk.fg,
       bg: chunk.bg,
       attributes: chunk.attributes,
@@ -3650,7 +3695,7 @@ function styledTextToTextNodes(styledText) {
   });
 }
 
-class TextNodeRenderable extends BaseRenderable {
+class TextNodeRenderable2 extends BaseRenderable2 {
   [BrandedTextNodeRenderable] = true;
   _fg;
   _bg;
@@ -3660,8 +3705,8 @@ class TextNodeRenderable extends BaseRenderable {
   parent = null;
   constructor(options) {
     super(options);
-    this._fg = options.fg ? parseColor(options.fg) : undefined;
-    this._bg = options.bg ? parseColor(options.bg) : undefined;
+    this._fg = options.fg ? parseColor2(options.fg) : undefined;
+    this._bg = options.bg ? parseColor2(options.bg) : undefined;
     this._attributes = options.attributes ?? 0;
     this._link = options.link;
   }
@@ -3670,12 +3715,12 @@ class TextNodeRenderable extends BaseRenderable {
   }
   set children(children) {
     for (const child of this._children) {
-      if (isTextNodeRenderable(child) && child.parent === this) {
+      if (isTextNodeRenderable2(child) && child.parent === this) {
         child.parent = null;
       }
     }
     for (const child of children) {
-      if (isTextNodeRenderable(child)) {
+      if (isTextNodeRenderable2(child)) {
         if (child.parent && child.parent !== this) {
           child.parent.remove(child);
         }
@@ -3701,14 +3746,14 @@ class TextNodeRenderable extends BaseRenderable {
       this.requestRender();
       return insertIndex;
     }
-    if (isTextNodeRenderable(obj)) {
+    if (isTextNodeRenderable2(obj)) {
       const insertIndex = this.prepareChildInsert(obj, index);
       this._children.splice(insertIndex, 0, obj);
       obj.parent = this;
       this.requestRender();
       return insertIndex;
     }
-    if (isStyledText(obj)) {
+    if (isStyledText2(obj)) {
       const textNodes = styledTextToTextNodes(obj);
       if (index !== undefined) {
         this._children.splice(index, 0, ...textNodes);
@@ -3740,10 +3785,10 @@ class TextNodeRenderable extends BaseRenderable {
   }
   replace(obj, index) {
     const existing = this._children[index];
-    if (isTextNodeRenderable(existing) && existing.parent === this) {
+    if (isTextNodeRenderable2(existing) && existing.parent === this) {
       existing.parent = null;
     }
-    if (isTextNodeRenderable(obj)) {
+    if (isTextNodeRenderable2(obj)) {
       if (obj.parent && obj.parent !== this) {
         obj.parent.remove(obj);
       } else if (obj.parent === this) {
@@ -3760,7 +3805,7 @@ class TextNodeRenderable extends BaseRenderable {
     this.requestRender();
   }
   insertBefore(child, anchorNode) {
-    if (!anchorNode || !isTextNodeRenderable(anchorNode)) {
+    if (!anchorNode || !isTextNodeRenderable2(anchorNode)) {
       throw new Error("Anchor must be a TextNodeRenderable");
     }
     const anchorIndex = this._children.indexOf(anchorNode);
@@ -3770,13 +3815,13 @@ class TextNodeRenderable extends BaseRenderable {
     if (child === anchorNode) {
       return this;
     }
-    if (isTextNodeRenderable(child)) {
+    if (isTextNodeRenderable2(child)) {
       this.add(child, anchorIndex);
       return this;
     }
     if (typeof child === "string") {
       this._children.splice(anchorIndex, 0, child);
-    } else if (isStyledText(child)) {
+    } else if (isStyledText2(child)) {
       const textNodes = styledTextToTextNodes(child);
       this._children.splice(anchorIndex, 0, ...textNodes);
       textNodes.forEach((node) => node.parent = this);
@@ -3787,7 +3832,7 @@ class TextNodeRenderable extends BaseRenderable {
     return this;
   }
   remove(child) {
-    if (!isTextNodeRenderable(child)) {
+    if (!isTextNodeRenderable2(child)) {
       throw new Error("remove expects a TextNodeRenderable child object");
     }
     const childIndex = this._children.indexOf(child);
@@ -3803,7 +3848,7 @@ class TextNodeRenderable extends BaseRenderable {
   }
   clear() {
     for (const child of this._children) {
-      if (isTextNodeRenderable(child) && child.parent === this) {
+      if (isTextNodeRenderable2(child) && child.parent === this) {
         child.parent = null;
       }
     }
@@ -3844,12 +3889,12 @@ class TextNodeRenderable extends BaseRenderable {
     return chunks;
   }
   static fromString(text, options = {}) {
-    const node = new TextNodeRenderable(options);
+    const node = new TextNodeRenderable2(options);
     node.add(text);
     return node;
   }
   static fromNodes(nodes, options = {}) {
-    const node = new TextNodeRenderable(options);
+    const node = new TextNodeRenderable2(options);
     for (const childNode of nodes) {
       node.add(childNode);
     }
@@ -3872,7 +3917,7 @@ class TextNodeRenderable extends BaseRenderable {
     return this._children.find((child) => typeof child !== "string" && child.id === id);
   }
   getRenderableIndex(id) {
-    return this._children.findIndex((child) => isTextNodeRenderable(child) && child.id === id);
+    return this._children.findIndex((child) => isTextNodeRenderable2(child) && child.id === id);
   }
   get fg() {
     return this._fg;
@@ -3883,7 +3928,7 @@ class TextNodeRenderable extends BaseRenderable {
       this.requestRender();
       return;
     }
-    this._fg = parseColor(fg);
+    this._fg = parseColor2(fg);
     this.requestRender();
   }
   set bg(bg) {
@@ -3892,7 +3937,7 @@ class TextNodeRenderable extends BaseRenderable {
       this.requestRender();
       return;
     }
-    this._bg = parseColor(bg);
+    this._bg = parseColor2(bg);
     this.requestRender();
   }
   get bg() {
@@ -3917,7 +3962,7 @@ class TextNodeRenderable extends BaseRenderable {
   }
 }
 
-class RootTextNodeRenderable extends TextNodeRenderable {
+class RootTextNodeRenderable2 extends TextNodeRenderable2 {
   ctx;
   textParent;
   constructor(ctx, options, textParent) {
@@ -3932,7 +3977,7 @@ class RootTextNodeRenderable extends TextNodeRenderable {
 }
 
 // src/renderables/Text.ts
-class TextRenderable extends TextBufferRenderable {
+class TextRenderable2 extends TextBufferRenderable2 {
   _text;
   _hasManualStyledText = false;
   rootTextNode;
@@ -3942,10 +3987,10 @@ class TextRenderable extends TextBufferRenderable {
   constructor(ctx, options) {
     super(ctx, options);
     const content = options.content ?? this._contentDefaultOptions.content;
-    const styledText = typeof content === "string" ? stringToStyledText(content) : content;
+    const styledText = typeof content === "string" ? stringToStyledText2(content) : content;
     this._text = styledText;
     this._hasManualStyledText = options.content !== undefined && content !== "";
-    this.rootTextNode = new RootTextNodeRenderable(ctx, {
+    this.rootTextNode = new RootTextNodeRenderable2(ctx, {
       id: `${this.id}-root`,
       fg: this._defaultFg,
       bg: this._defaultBg,
@@ -3969,7 +4014,7 @@ class TextRenderable extends TextBufferRenderable {
   }
   set content(value) {
     this._hasManualStyledText = true;
-    const styledText = typeof value === "string" ? stringToStyledText(value) : value;
+    const styledText = typeof value === "string" ? stringToStyledText2(value) : value;
     if (this._text !== styledText) {
       this._text = styledText;
       this.updateTextBuffer(styledText);
@@ -3984,7 +4029,7 @@ class TextRenderable extends TextBufferRenderable {
         attributes: this._defaultAttributes,
         link: undefined
       });
-      this.textBuffer.setStyledText(new StyledText(chunks));
+      this.textBuffer.setStyledText(new StyledText2(chunks));
       this.refreshLocalSelection();
       this.yogaNode.markDirty();
     }
@@ -4004,7 +4049,7 @@ class TextRenderable extends TextBufferRenderable {
   }
   clear() {
     this.rootTextNode.clear();
-    const emptyStyledText = stringToStyledText("");
+    const emptyStyledText = stringToStyledText2("");
     this._text = emptyStyledText;
     this.updateTextBuffer(emptyStyledText);
     this.updateTextInfo();
@@ -4034,11 +4079,11 @@ function toNumber(value) {
 }
 var canThrowAcrossNativeCallback = typeof process !== "undefined" && typeof process.versions === "object" && process.versions !== null && typeof process.versions.bun === "string";
 
-class NativeSpanFeed {
+class NativeSpanFeed2 {
   static create(options) {
-    const lib = resolveRenderLib();
+    const lib = resolveRenderLib2();
     const streamPtr = lib.createNativeSpanFeed(options);
-    const stream = new NativeSpanFeed(streamPtr);
+    const stream = new NativeSpanFeed2(streamPtr);
     lib.registerNativeSpanFeedStream(streamPtr, stream.eventHandler);
     const status = lib.attachNativeSpanFeed(streamPtr);
     if (status !== 0) {
@@ -4049,8 +4094,8 @@ class NativeSpanFeed {
     return stream;
   }
   static attach(streamPtr, _options) {
-    const lib = resolveRenderLib();
-    const stream = new NativeSpanFeed(streamPtr);
+    const lib = resolveRenderLib2();
+    const stream = new NativeSpanFeed2(streamPtr);
     lib.registerNativeSpanFeedStream(streamPtr, stream.eventHandler);
     const status = lib.attachNativeSpanFeed(streamPtr);
     if (status !== 0) {
@@ -4060,7 +4105,7 @@ class NativeSpanFeed {
     return stream;
   }
   streamPtr;
-  lib = resolveRenderLib();
+  lib = resolveRenderLib2();
   eventHandler;
   chunkMap = new Map;
   chunkSizes = new Map;
@@ -4534,14 +4579,14 @@ function getCallerInfo() {
   const columnNumber = parseInt(match[4], 10) || 0;
   return { functionName, fullPath, fileName, lineNumber, columnNumber };
 }
-var capture = singleton("ConsoleCapture", () => new Capture);
-registerEnvVar({
+var capture2 = singleton("ConsoleCapture", () => new Capture);
+registerEnvVar2({
   name: "OTUI_USE_CONSOLE",
   description: "Whether to use the console. Will not capture console output if set to false.",
   type: "boolean",
   default: true
 });
-registerEnvVar({
+registerEnvVar2({
   name: "SHOW_CONSOLE",
   description: "Show the console at startup if set to true.",
   type: "boolean",
@@ -4561,7 +4606,7 @@ class TerminalConsoleCache extends EventEmitter4 {
     super();
   }
   activate() {
-    if (!env.OTUI_USE_CONSOLE)
+    if (!env2.OTUI_USE_CONSOLE)
       return;
     if (!this._originalConsole) {
       this._originalConsole = global.console;
@@ -4570,10 +4615,10 @@ class TerminalConsoleCache extends EventEmitter4 {
     this.overrideConsoleMethods();
   }
   setupConsoleCapture() {
-    if (!env.OTUI_USE_CONSOLE)
+    if (!env2.OTUI_USE_CONSOLE)
       return;
-    const mockStdout = new CapturedWritableStream("stdout", capture);
-    const mockStderr = new CapturedWritableStream("stderr", capture);
+    const mockStdout = new CapturedWritableStream("stdout", capture2);
+    const mockStderr = new CapturedWritableStream("stderr", capture2);
     global.console = new Console({
       stdout: mockStdout,
       stderr: mockStderr,
@@ -4645,19 +4690,19 @@ class TerminalConsoleCache extends EventEmitter4 {
   }
 }
 var terminalConsoleCache = singleton("TerminalConsoleCache", () => {
-  const terminalConsoleCache2 = new TerminalConsoleCache;
+  const terminalConsoleCache = new TerminalConsoleCache;
   process.on("exit", () => {
-    terminalConsoleCache2.destroy();
+    terminalConsoleCache.destroy();
   });
-  return terminalConsoleCache2;
+  return terminalConsoleCache;
 });
-var ConsolePosition;
-((ConsolePosition2) => {
-  ConsolePosition2["TOP"] = "top";
-  ConsolePosition2["BOTTOM"] = "bottom";
-  ConsolePosition2["LEFT"] = "left";
-  ConsolePosition2["RIGHT"] = "right";
-})(ConsolePosition ||= {});
+var ConsolePosition2;
+((ConsolePosition) => {
+  ConsolePosition["TOP"] = "top";
+  ConsolePosition["BOTTOM"] = "bottom";
+  ConsolePosition["LEFT"] = "left";
+  ConsolePosition["RIGHT"] = "right";
+})(ConsolePosition2 ||= {});
 var defaultConsoleKeybindings = [
   { name: "up", action: "scroll-up" },
   { name: "down", action: "scroll-down" },
@@ -4680,10 +4725,10 @@ var DEFAULT_CONSOLE_OPTIONS = {
   colorError: "#FF0000",
   colorDebug: "#808080",
   colorDefault: "#FFFFFF",
-  backgroundColor: RGBA.fromValues(0.1, 0.1, 0.1, 0.7),
+  backgroundColor: RGBA2.fromValues(0.1, 0.1, 0.1, 0.7),
   startInDebugMode: false,
   title: "Console",
-  titleBarColor: RGBA.fromValues(0.05, 0.05, 0.05, 0.7),
+  titleBarColor: RGBA2.fromValues(0.05, 0.05, 0.05, 0.7),
   titleBarTextColor: "#FFFFFF",
   cursorColor: "#00A0FF",
   maxStoredLogs: 2000,
@@ -4691,12 +4736,12 @@ var DEFAULT_CONSOLE_OPTIONS = {
   onCopySelection: undefined,
   keyBindings: undefined,
   keyAliasMap: undefined,
-  selectionColor: RGBA.fromValues(0.3, 0.5, 0.8, 0.5),
+  selectionColor: RGBA2.fromValues(0.3, 0.5, 0.8, 0.5),
   copyButtonColor: "#00A0FF"
 };
 var INDENT_WIDTH = 2;
 
-class TerminalConsole extends EventEmitter4 {
+class TerminalConsole2 extends EventEmitter4 {
   isVisible = false;
   isFocused = false;
   renderer;
@@ -4765,23 +4810,23 @@ class TerminalConsole extends EventEmitter4 {
   constructor(renderer, options = {}) {
     super();
     this.renderer = renderer;
-    this.clock = options.clock ?? new SystemClock;
+    this.clock = options.clock ?? new SystemClock2;
     this.options = { ...DEFAULT_CONSOLE_OPTIONS, ...options };
     this.keyHandler = this.handleKeyPress.bind(this);
     this._debugModeEnabled = this.options.startInDebugMode;
     terminalConsoleCache.setCollectCallerInfo(this._debugModeEnabled);
-    this._rgbaInfo = parseColor(this.options.colorInfo);
-    this._rgbaWarn = parseColor(this.options.colorWarn);
-    this._rgbaError = parseColor(this.options.colorError);
-    this._rgbaDebug = parseColor(this.options.colorDebug);
-    this._rgbaDefault = parseColor(this.options.colorDefault);
-    this.backgroundColor = parseColor(this.options.backgroundColor);
-    this._rgbaTitleBar = parseColor(this.options.titleBarColor);
-    this._rgbaTitleBarText = parseColor(this.options.titleBarTextColor || this.options.colorDefault);
+    this._rgbaInfo = parseColor2(this.options.colorInfo);
+    this._rgbaWarn = parseColor2(this.options.colorWarn);
+    this._rgbaError = parseColor2(this.options.colorError);
+    this._rgbaDebug = parseColor2(this.options.colorDebug);
+    this._rgbaDefault = parseColor2(this.options.colorDefault);
+    this.backgroundColor = parseColor2(this.options.backgroundColor);
+    this._rgbaTitleBar = parseColor2(this.options.titleBarColor);
+    this._rgbaTitleBarText = parseColor2(this.options.titleBarTextColor || this.options.colorDefault);
     this._title = this.options.title;
-    this._rgbaCursor = parseColor(this.options.cursorColor);
-    this._rgbaSelection = parseColor(this.options.selectionColor);
-    this._rgbaCopyButton = parseColor(this.options.copyButtonColor);
+    this._rgbaCursor = parseColor2(this.options.cursorColor);
+    this._rgbaSelection = parseColor2(this.options.selectionColor);
+    this._rgbaCopyButton = parseColor2(this.options.copyButtonColor);
     this._keyAliasMap = mergeKeyAliases(defaultKeyAliases, options.keyAliasMap || {});
     this._keyBindings = options.keyBindings || [];
     this._mergedKeyBindings = mergeKeyBindings(defaultConsoleKeybindings, this._keyBindings);
@@ -4793,7 +4838,7 @@ class TerminalConsole extends EventEmitter4 {
       this._handleNewLog(logEntry);
     };
     terminalConsoleCache.on("entry", this._entryListener);
-    if (env.SHOW_CONSOLE) {
+    if (env2.SHOW_CONSOLE) {
       this.show();
     }
   }
@@ -5052,7 +5097,7 @@ class TerminalConsole extends EventEmitter4 {
       this._processCachedLogs();
       terminalConsoleCache.setCachingEnabled(false);
       if (!this.frameBuffer) {
-        this.frameBuffer = OptimizedBuffer.create(this.consoleWidth, this.consoleHeight, this.renderer.widthMethod, {
+        this.frameBuffer = OptimizedBuffer2.create(this.consoleWidth, this.consoleHeight, this.renderer.widthMethod, {
           respectAlpha: this.backgroundColor.a < 1,
           id: "console framebuffer"
         });
@@ -5099,7 +5144,7 @@ class TerminalConsole extends EventEmitter4 {
     const copyButtonX = this.consoleWidth - copyLabel.length - 1;
     if (copyButtonX >= 0) {
       const copyButtonEnabled = this.hasSelection();
-      const disabledColor = RGBA.fromInts(100, 100, 100, 255);
+      const disabledColor = RGBA2.fromInts(100, 100, 100, 255);
       const copyColor = copyButtonEnabled ? this._rgbaCopyButton : disabledColor;
       this.frameBuffer.drawText(copyLabel, copyButtonX, 0, copyColor, this._rgbaTitleBar);
       this._copyButtonBounds = { x: copyButtonX, y: 0, width: copyLabel.length, height: 1 };
@@ -5488,10 +5533,10 @@ class TerminalConsole extends EventEmitter4 {
 
 // src/renderables/EditBufferRenderable.ts
 var BrandedEditBufferRenderable = Symbol.for("@opentui/core/EditBufferRenderable");
-var EditBufferRenderableEvents;
-((EditBufferRenderableEvents2) => {
-  EditBufferRenderableEvents2["TRAITS_CHANGED"] = "traits-changed";
-})(EditBufferRenderableEvents ||= {});
+var EditBufferRenderableEvents2;
+((EditBufferRenderableEvents) => {
+  EditBufferRenderableEvents["TRAITS_CHANGED"] = "traits-changed";
+})(EditBufferRenderableEvents2 ||= {});
 function sameCapture(a, b) {
   if (a === b)
     return true;
@@ -5504,11 +5549,11 @@ function sameCapture(a, b) {
 function sameTraits(a, b) {
   return a.suspend === b.suspend && a.status === b.status && sameCapture(a.capture, b.capture);
 }
-function isEditBufferRenderable(obj) {
+function isEditBufferRenderable2(obj) {
   return !!(obj && typeof obj === "object" && (BrandedEditBufferRenderable in obj));
 }
 
-class EditBufferRenderable extends Renderable {
+class EditBufferRenderable2 extends Renderable2 {
   [BrandedEditBufferRenderable] = true;
   _focusable = true;
   selectable = true;
@@ -5536,7 +5581,7 @@ class EditBufferRenderable extends Renderable {
   editorView;
   nativeRenderable = null;
   _defaultOptions = {
-    textColor: RGBA.fromValues(1, 1, 1, 1),
+    textColor: RGBA2.fromValues(1, 1, 1, 1),
     backgroundColor: "transparent",
     selectionBg: undefined,
     selectionFg: undefined,
@@ -5546,7 +5591,7 @@ class EditBufferRenderable extends Renderable {
     scrollMargin: 0.2,
     scrollSpeed: 16,
     showCursor: true,
-    cursorColor: RGBA.fromValues(1, 1, 1, 1),
+    cursorColor: RGBA2.fromValues(1, 1, 1, 1),
     cursorStyle: {
       style: "block",
       blinking: true
@@ -5556,22 +5601,22 @@ class EditBufferRenderable extends Renderable {
   };
   constructor(ctx, options) {
     super(ctx, options);
-    this._textColor = parseColor(options.textColor ?? this._defaultOptions.textColor);
-    this._backgroundColor = parseColor(options.backgroundColor ?? this._defaultOptions.backgroundColor);
+    this._textColor = parseColor2(options.textColor ?? this._defaultOptions.textColor);
+    this._backgroundColor = parseColor2(options.backgroundColor ?? this._defaultOptions.backgroundColor);
     this._defaultAttributes = options.attributes ?? this._defaultOptions.attributes;
-    this._selectionBg = options.selectionBg ? parseColor(options.selectionBg) : this._defaultOptions.selectionBg;
-    this._selectionFg = options.selectionFg ? parseColor(options.selectionFg) : this._defaultOptions.selectionFg;
+    this._selectionBg = options.selectionBg ? parseColor2(options.selectionBg) : this._defaultOptions.selectionBg;
+    this._selectionFg = options.selectionFg ? parseColor2(options.selectionFg) : this._defaultOptions.selectionFg;
     this.selectable = options.selectable ?? this._defaultOptions.selectable;
     this._wrapMode = options.wrapMode ?? this._defaultOptions.wrapMode;
     this._scrollMargin = options.scrollMargin ?? this._defaultOptions.scrollMargin;
     this._scrollSpeed = options.scrollSpeed ?? this._defaultOptions.scrollSpeed;
     this._showCursor = options.showCursor ?? this._defaultOptions.showCursor;
-    this._cursorColor = parseColor(options.cursorColor ?? this._defaultOptions.cursorColor);
+    this._cursorColor = parseColor2(options.cursorColor ?? this._defaultOptions.cursorColor);
     this._cursorStyle = options.cursorStyle ?? this._defaultOptions.cursorStyle;
     this._tabIndicator = options.tabIndicator ?? this._defaultOptions.tabIndicator;
-    this._tabIndicatorColor = options.tabIndicatorColor ? parseColor(options.tabIndicatorColor) : this._defaultOptions.tabIndicatorColor;
-    this.editBuffer = EditBuffer.create(this._ctx.widthMethod);
-    this.editorView = EditorView.create(this.editBuffer, this.width || 80, this.height || 24);
+    this._tabIndicatorColor = options.tabIndicatorColor ? parseColor2(options.tabIndicatorColor) : this._defaultOptions.tabIndicatorColor;
+    this.editBuffer = EditBuffer2.create(this._ctx.widthMethod);
+    this.editorView = EditorView2.create(this.editBuffer, this.width || 80, this.height || 24);
     this.editorView.setWrapMode(this._wrapMode);
     this.editorView.setScrollMargin(this._scrollMargin);
     if (options.selectionOccupancy === "boundary") {
@@ -5663,7 +5708,7 @@ class EditBufferRenderable extends Renderable {
     return this._textColor;
   }
   set textColor(value) {
-    const newColor = parseColor(value ?? this._defaultOptions.textColor);
+    const newColor = parseColor2(value ?? this._defaultOptions.textColor);
     if (this._textColor !== newColor) {
       this._textColor = newColor;
       this.editBuffer.setDefaultFg(newColor);
@@ -5684,7 +5729,7 @@ class EditBufferRenderable extends Renderable {
     this.emit("traits-changed" /* TRAITS_CHANGED */, value, prev);
   }
   set selectionBg(value) {
-    const newColor = value ? parseColor(value) : this._defaultOptions.selectionBg;
+    const newColor = value ? parseColor2(value) : this._defaultOptions.selectionBg;
     if (this._selectionBg !== newColor) {
       this._selectionBg = newColor;
       this.refreshSelectionStyle();
@@ -5695,7 +5740,7 @@ class EditBufferRenderable extends Renderable {
     return this._selectionFg;
   }
   set selectionFg(value) {
-    const newColor = value ? parseColor(value) : this._defaultOptions.selectionFg;
+    const newColor = value ? parseColor2(value) : this._defaultOptions.selectionFg;
     if (this._selectionFg !== newColor) {
       this._selectionFg = newColor;
       this.refreshSelectionStyle();
@@ -5706,7 +5751,7 @@ class EditBufferRenderable extends Renderable {
     return this._backgroundColor;
   }
   set backgroundColor(value) {
-    const newColor = parseColor(value ?? this._defaultOptions.backgroundColor);
+    const newColor = parseColor2(value ?? this._defaultOptions.backgroundColor);
     if (this._backgroundColor !== newColor) {
       this._backgroundColor = newColor;
       this.editBuffer.setDefaultBg(newColor);
@@ -5750,7 +5795,7 @@ class EditBufferRenderable extends Renderable {
     return this._cursorColor;
   }
   set cursorColor(value) {
-    const newColor = parseColor(value);
+    const newColor = parseColor2(value);
     if (this._cursorColor !== newColor) {
       this._cursorColor = newColor;
       if (this._focused) {
@@ -5796,7 +5841,7 @@ class EditBufferRenderable extends Renderable {
     return this._tabIndicatorColor;
   }
   set tabIndicatorColor(value) {
-    const newColor = value ? parseColor(value) : undefined;
+    const newColor = value ? parseColor2(value) : undefined;
     if (this._tabIndicatorColor !== newColor) {
       this._tabIndicatorColor = newColor;
       if (newColor !== undefined) {
@@ -5868,7 +5913,7 @@ class EditBufferRenderable extends Renderable {
     return localX >= 0 && localX < this.width && localY >= 0 && localY < this.height;
   }
   onSelectionChanged(selection) {
-    const localSelection = convertGlobalToLocalSelection(selection, this.x, this.y);
+    const localSelection = convertGlobalToLocalSelection2(selection, this.x, this.y);
     this.lastLocalSelection = localSelection;
     const updateCursor = true;
     const followCursor = this._keyboardSelectionActive;
@@ -6240,13 +6285,13 @@ class EditBufferRenderable extends Renderable {
     return true;
   }
   setupNativeRenderable() {
-    const lib = resolveRenderLib();
+    const lib = resolveRenderLib2();
     const nativeRenderable = lib.createNativeRenderable();
     if (!lib.nativeRenderableAttachYogaNode(nativeRenderable, this.yogaNode.ptr)) {
       lib.destroyNativeRenderable(nativeRenderable);
       throw new Error("Failed to attach native renderable Yoga node");
     }
-    if (!lib.nativeRenderableSetMeasureTarget(nativeRenderable, NativeMeasureTargetKind.EditorView, this.editorView.ptr)) {
+    if (!lib.nativeRenderableSetMeasureTarget(nativeRenderable, NativeMeasureTargetKind2.EditorView, this.editorView.ptr)) {
       lib.destroyNativeRenderable(nativeRenderable);
       throw new Error("Failed to attach editor native measure target");
     }
@@ -6302,7 +6347,7 @@ class EditBufferRenderable extends Renderable {
       this.blur();
     }
     if (this.nativeRenderable) {
-      resolveRenderLib().destroyNativeRenderable(this.nativeRenderable);
+      resolveRenderLib2().destroyNativeRenderable(this.nativeRenderable);
       this.nativeRenderable = null;
     }
     this.editorView.destroy();
@@ -6612,7 +6657,7 @@ function oscThemeColorToHex(r, g, b, hex6) {
   return "#000000";
 }
 function inferThemeModeFromBackgroundColor(color) {
-  const [r, g, b] = parseColor(color).toInts();
+  const [r, g, b] = parseColor2(color).toInts();
   const brightness = (r * 299 + g * 587 + b * 114) / 1000;
   return brightness > 128 ? "light" : "dark";
 }
@@ -6744,51 +6789,52 @@ class RendererThemeMode {
 }
 
 // src/renderer.ts
-registerEnvVar({
+registerEnvVar2({
   name: "OTUI_DUMP_CAPTURES",
   description: "Dump captured stdout and console caches when the renderer exit handler runs.",
   type: "boolean",
   default: false
 });
-registerEnvVar({
+registerEnvVar2({
   name: "OTUI_NO_NATIVE_RENDER",
   description: "Skip the Zig/native frame renderer. Useful for debugging the render loop; split-footer stdout flushing may still write ANSI.",
   type: "boolean",
   default: false
 });
-registerEnvVar({
+registerEnvVar2({
   name: "OTUI_USE_ALTERNATE_SCREEN",
   description: "When explicitly set, force screen mode selection: true=alternate-screen, false=main-screen.",
   type: "boolean",
   default: true
 });
-registerEnvVar({
+registerEnvVar2({
   name: "OTUI_OVERRIDE_STDOUT",
   description: "When explicitly set, force stdout routing: false=passthrough, true=capture in split-footer mode.",
   type: "boolean",
   default: true
 });
-registerEnvVar({
+registerEnvVar2({
   name: "OTUI_DEBUG",
   description: "Enable debug mode to capture all raw input for debugging purposes.",
   type: "boolean",
   default: false
 });
-registerEnvVar({
+registerEnvVar2({
   name: "OTUI_STDIN_LOG",
   description: "Write the raw stdin byte stream to this file for debugging.",
   type: "string",
   default: ""
 });
-registerEnvVar({
+registerEnvVar2({
   name: "OTUI_SHOW_STATS",
   description: "Show the debug overlay at startup.",
   type: "boolean",
   default: false
 });
+var KITTY_IMAGE_TRANSPORTS = ["raw", "zlib", "file"];
 var DEFAULT_FOOTER_HEIGHT = 12;
 var MAX_SCROLLBACK_SURFACE_HEIGHT_PASSES = 4;
-var TRANSPARENT_RGBA = RGBA.fromValues(0, 0, 0, 0);
+var TRANSPARENT_RGBA = RGBA2.fromValues(0, 0, 0, 0);
 var scrollbackSurfaceCounter = 0;
 function normalizeFooterHeight(footerHeight) {
   if (footerHeight === undefined) {
@@ -6806,12 +6852,12 @@ function normalizeFooterHeight(footerHeight) {
 function resolveModes(config) {
   let screenMode = config.screenMode ?? "alternate-screen";
   if (process.env.OTUI_USE_ALTERNATE_SCREEN !== undefined) {
-    screenMode = env.OTUI_USE_ALTERNATE_SCREEN ? "alternate-screen" : "main-screen";
+    screenMode = env2.OTUI_USE_ALTERNATE_SCREEN ? "alternate-screen" : "main-screen";
   }
   const footerHeight = screenMode === "split-footer" ? normalizeFooterHeight(config.footerHeight) : DEFAULT_FOOTER_HEIGHT;
   let externalOutputMode = config.externalOutputMode ?? (screenMode === "split-footer" ? "capture-stdout" : "passthrough");
   if (process.env.OTUI_OVERRIDE_STDOUT !== undefined) {
-    externalOutputMode = env.OTUI_OVERRIDE_STDOUT && screenMode === "split-footer" ? "capture-stdout" : "passthrough";
+    externalOutputMode = env2.OTUI_OVERRIDE_STDOUT && screenMode === "split-footer" ? "capture-stdout" : "passthrough";
   }
   if (externalOutputMode === "capture-stdout" && screenMode !== "split-footer") {
     throw new Error('externalOutputMode "capture-stdout" requires screenMode "split-footer"');
@@ -6841,9 +6887,9 @@ class ExternalOutputQueue {
     }
     const clampedLimit = Number.isFinite(limit) ? Math.max(1, Math.trunc(limit)) : this.commits.length;
     if (clampedLimit >= this.commits.length) {
-      const output2 = this.commits;
+      const output = this.commits;
       this.commits = [];
-      return output2;
+      return output;
     }
     const output = this.commits.slice(0, clampedLimit);
     this.commits = this.commits.slice(clampedLimit);
@@ -6884,8 +6930,8 @@ class ScrollbackSnapshotRenderContext extends EventEmitter5 {
     this.resolution = resolution;
     this.capabilities = capabilities;
     this.widthMethod = widthMethod;
-    this.keyInput = new KeyHandler;
-    this._internalKeyInput = new InternalKeyHandler;
+    this.keyInput = new KeyHandler2;
+    this._internalKeyInput = new InternalKeyHandler2;
   }
   addToHitGrid(_x, _y, _width, _height, _id) {}
   pushHitGridScissorRect(_x, _y, _width, _height) {}
@@ -6904,7 +6950,7 @@ class ScrollbackSnapshotRenderContext extends EventEmitter5 {
   get currentFocusedEditor() {
     if (!this.currentFocusedRenderable)
       return null;
-    if (!isEditBufferRenderable(this.currentFocusedRenderable))
+    if (!isEditBufferRenderable2(this.currentFocusedRenderable))
       return null;
     return this.currentFocusedRenderable;
   }
@@ -6931,6 +6977,7 @@ class ScrollbackSnapshotRenderContext extends EventEmitter5 {
   updateSelection(_currentRenderable, _x, _y, _options) {}
 }
 var DEFAULT_FORWARDED_ENV_KEYS = [
+  "TMPDIR",
   "SSH_CONNECTION",
   "SSH_CLIENT",
   "SSH_TTY",
@@ -6970,7 +7017,7 @@ var KITTY_FLAG_ALL_KEYS_AS_ESCAPES = 8;
 var KITTY_FLAG_REPORT_TEXT = 16;
 var DEFAULT_STDIN_PARSER_MAX_BUFFER_BYTES = 64 * 1024 * 1024;
 var NATIVE_PALETTE_QUERY_SIZE = 16;
-function buildKittyKeyboardFlags(config) {
+function buildKittyKeyboardFlags2(config) {
   if (!config) {
     return 0;
   }
@@ -6993,7 +7040,7 @@ function buildKittyKeyboardFlags(config) {
   return flags;
 }
 
-class MouseEvent {
+class MouseEvent2 {
   type;
   button;
   x;
@@ -7030,19 +7077,19 @@ class MouseEvent {
     this._defaultPrevented = true;
   }
 }
-var MouseButton;
-((MouseButton2) => {
-  MouseButton2[MouseButton2["LEFT"] = 0] = "LEFT";
-  MouseButton2[MouseButton2["MIDDLE"] = 1] = "MIDDLE";
-  MouseButton2[MouseButton2["RIGHT"] = 2] = "RIGHT";
-  MouseButton2[MouseButton2["WHEEL_UP"] = 4] = "WHEEL_UP";
-  MouseButton2[MouseButton2["WHEEL_DOWN"] = 5] = "WHEEL_DOWN";
-})(MouseButton ||= {});
+var MouseButton2;
+((MouseButton) => {
+  MouseButton[MouseButton["LEFT"] = 0] = "LEFT";
+  MouseButton[MouseButton["MIDDLE"] = 1] = "MIDDLE";
+  MouseButton[MouseButton["RIGHT"] = 2] = "RIGHT";
+  MouseButton[MouseButton["WHEEL_UP"] = 4] = "WHEEL_UP";
+  MouseButton[MouseButton["WHEEL_DOWN"] = 5] = "WHEEL_DOWN";
+})(MouseButton2 ||= {});
 var rendererTracker = singleton("RendererTracker", () => ({
   renderers: new Set,
   streamOwners: new WeakMap
 }));
-async function createCliRenderer(config = {}) {
+async function createCliRenderer2(config = {}) {
   if (process.argv.includes("--delay-start")) {
     await new Promise((resolve) => setTimeout(resolve, 5000));
   }
@@ -7050,7 +7097,7 @@ async function createCliRenderer(config = {}) {
   const stdout = config.stdout ?? process.stdout;
   const width = stdout.columns || config.width || 80;
   const height = stdout.rows || config.height || 24;
-  const renderer = new CliRenderer(stdin, stdout, width, height, config);
+  const renderer = new CliRenderer2(stdin, stdout, width, height, config);
   try {
     await renderer.setupTerminal();
     return renderer;
@@ -7063,37 +7110,37 @@ async function createCliRenderer(config = {}) {
     throw error;
   }
 }
-var CliRenderEvents;
-((CliRenderEvents2) => {
-  CliRenderEvents2["RESIZE"] = "resize";
-  CliRenderEvents2["FRAME"] = "frame";
-  CliRenderEvents2["RENDER_ERROR"] = "render:error";
-  CliRenderEvents2["HANDLER_ERROR"] = "handler:error";
-  CliRenderEvents2["EXTERNAL_OUTPUT"] = "external_output";
-  CliRenderEvents2["FOCUS"] = "focus";
-  CliRenderEvents2["BLUR"] = "blur";
-  CliRenderEvents2["FOCUSED_RENDERABLE"] = "focused_renderable";
-  CliRenderEvents2["FOCUSED_EDITOR"] = "focused_editor";
-  CliRenderEvents2["THEME_MODE"] = "theme_mode";
-  CliRenderEvents2["PALETTE"] = "palette";
-  CliRenderEvents2["CAPABILITIES"] = "capabilities";
-  CliRenderEvents2["SELECTION"] = "selection";
-  CliRenderEvents2["DEBUG_OVERLAY_TOGGLE"] = "debugOverlay:toggle";
-  CliRenderEvents2["DESTROY"] = "destroy";
-  CliRenderEvents2["MEMORY_SNAPSHOT"] = "memory:snapshot";
-})(CliRenderEvents ||= {});
-var RendererControlState;
-((RendererControlState2) => {
-  RendererControlState2["IDLE"] = "idle";
-  RendererControlState2["AUTO_STARTED"] = "auto_started";
-  RendererControlState2["EXPLICIT_STARTED"] = "explicit_started";
-  RendererControlState2["EXPLICIT_PAUSED"] = "explicit_paused";
-  RendererControlState2["EXPLICIT_SUSPENDED"] = "explicit_suspended";
-  RendererControlState2["EXPLICIT_STOPPED"] = "explicit_stopped";
-})(RendererControlState ||= {});
+var CliRenderEvents2;
+((CliRenderEvents) => {
+  CliRenderEvents["RESIZE"] = "resize";
+  CliRenderEvents["FRAME"] = "frame";
+  CliRenderEvents["RENDER_ERROR"] = "render:error";
+  CliRenderEvents["HANDLER_ERROR"] = "handler:error";
+  CliRenderEvents["EXTERNAL_OUTPUT"] = "external_output";
+  CliRenderEvents["FOCUS"] = "focus";
+  CliRenderEvents["BLUR"] = "blur";
+  CliRenderEvents["FOCUSED_RENDERABLE"] = "focused_renderable";
+  CliRenderEvents["FOCUSED_EDITOR"] = "focused_editor";
+  CliRenderEvents["THEME_MODE"] = "theme_mode";
+  CliRenderEvents["PALETTE"] = "palette";
+  CliRenderEvents["CAPABILITIES"] = "capabilities";
+  CliRenderEvents["SELECTION"] = "selection";
+  CliRenderEvents["DEBUG_OVERLAY_TOGGLE"] = "debugOverlay:toggle";
+  CliRenderEvents["DESTROY"] = "destroy";
+  CliRenderEvents["MEMORY_SNAPSHOT"] = "memory:snapshot";
+})(CliRenderEvents2 ||= {});
+var RendererControlState2;
+((RendererControlState) => {
+  RendererControlState["IDLE"] = "idle";
+  RendererControlState["AUTO_STARTED"] = "auto_started";
+  RendererControlState["EXPLICIT_STARTED"] = "explicit_started";
+  RendererControlState["EXPLICIT_PAUSED"] = "explicit_paused";
+  RendererControlState["EXPLICIT_SUSPENDED"] = "explicit_suspended";
+  RendererControlState["EXPLICIT_STOPPED"] = "explicit_stopped";
+})(RendererControlState2 ||= {});
 var CLICK_REPEAT_INTERVAL_MS = 500;
 
-class CliRenderer extends EventEmitter5 {
+class CliRenderer2 extends EventEmitter5 {
   static animationFrameId = 0;
   lib;
   rendererPtr;
@@ -7128,7 +7175,7 @@ class CliRenderer extends EventEmitter5 {
   frameTimes = [];
   maxStatSamples = 300;
   postProcessFns = [];
-  backgroundColor = RGBA.fromInts(0, 0, 0, 0);
+  backgroundColor = RGBA2.fromInts(0, 0, 0, 0);
   waitingForPixelResolution = false;
   pixelResolutionRequeryPending = false;
   clock;
@@ -7144,6 +7191,7 @@ class CliRenderer extends EventEmitter5 {
   minTargetFrameTime = 1000 / this._maxFps;
   immediateRerenderRequested = false;
   updateScheduled = false;
+  updateGeneration = 0;
   liveRequestCounter = 0;
   _controlState = "idle" /* IDLE */;
   frameCallbacks = [];
@@ -7154,7 +7202,7 @@ class CliRenderer extends EventEmitter5 {
     frameCallbackTime: 0
   };
   debugOverlay = {
-    enabled: env.OTUI_SHOW_STATS,
+    enabled: env2.OTUI_SHOW_STATS,
     corner: 3 /* bottomRight */
   };
   _console;
@@ -7166,6 +7214,8 @@ class CliRenderer extends EventEmitter5 {
   animationRequest = new Map;
   resizeTimeoutId = null;
   capabilityTimeoutId = null;
+  kittyTransportTimer = null;
+  kittyTransportMode;
   terminalKeepAliveTimer = null;
   xtVersionWaiters = new Set;
   splitStartupSeedTimeoutId = null;
@@ -7237,8 +7287,8 @@ class CliRenderer extends EventEmitter5 {
   themeModeHandler;
   idleResolvers = [];
   _debugInputs = [];
-  _debugModeEnabled = env.OTUI_DEBUG;
-  stdinLogPath = env.OTUI_STDIN_LOG;
+  _debugModeEnabled = env2.OTUI_DEBUG;
+  stdinLogPath = env2.OTUI_STDIN_LOG;
   handleError = ((error) => {
     console.error(error);
     if (this._openConsoleOnError) {
@@ -7247,7 +7297,7 @@ class CliRenderer extends EventEmitter5 {
   }).bind(this);
   dumpOutputCache(optionalMessage = "") {
     const cachedLogs = this.console.getCachedLogs();
-    const capturedConsoleOutput = capture.claimOutput();
+    const capturedConsoleOutput = capture2.claimOutput();
     const capturedExternalOutputCommits = this.externalOutputQueue.claim();
     let capturedExternalOutput = "";
     for (const commit of capturedExternalOutputCommits) {
@@ -7281,7 +7331,7 @@ Captured external output:
   }
   exitHandler = (() => {
     this.destroy();
-    if (env.OTUI_DUMP_CAPTURES) {
+    if (env2.OTUI_DUMP_CAPTURES) {
       sleep(100).then(() => {
         this.dumpOutputCache(`=== CAPTURED OUTPUT ===
 `);
@@ -7296,8 +7346,7 @@ Captured external output:
   _detachFeed = null;
   _detachFeedError = null;
   feedIdleRenderScheduled = false;
-  ordinaryFrameWaitingForFeed = false;
-  ordinaryFrameWaitControlState = null;
+  feedIdleWaitPending = false;
   get controlState() {
     return this._controlState;
   }
@@ -7307,12 +7356,16 @@ Captured external output:
     this.stdout = stdout;
     this._usesProcessStdout = stdout === process.stdout;
     this.realStdoutWrite = stdout.write;
-    const lib = resolveRenderLib();
+    const lib = resolveRenderLib2();
     const useMemoryBufferedOutput = config.bufferedOutput === "memory";
     const useFeedOutput = !this._usesProcessStdout && !useMemoryBufferedOutput;
     const { screenMode, footerHeight, externalOutputMode } = resolveModes(config);
     const initialGeometry = calculateRenderGeometry(screenMode, width, height, footerHeight);
     const remoteMode = config.remote ?? (useFeedOutput ? true : undefined);
+    this.kittyTransportMode = config.kittyImageTransport ?? "raw";
+    const transportCode = KITTY_IMAGE_TRANSPORTS.indexOf(this.kittyTransportMode);
+    if (transportCode < 0)
+      throw new TypeError("Invalid kittyImageTransport");
     if (rendererTracker.streamOwners.get(stdin)) {
       throw new Error("Cannot create CliRenderer: stdin is already used by another CliRenderer");
     }
@@ -7322,7 +7375,7 @@ Captured external output:
     let feed = null;
     if (useFeedOutput) {
       try {
-        feed = NativeSpanFeed.create();
+        feed = NativeSpanFeed2.create();
       } catch (error) {
         throw new Error(`Failed to allocate NativeSpanFeed for custom stdout: ${error instanceof Error ? error.message : String(error)}`);
       }
@@ -7342,13 +7395,14 @@ Captured external output:
       feed?.close();
       throw new Error("Failed to create renderer");
     }
+    lib.setKittyImageTransport(rendererPtr, transportCode);
     if (config.useThread === undefined)
       config.useThread = true;
     if (process.platform === "linux")
       config.useThread = false;
     lib.setUseThread(rendererPtr, config.useThread);
     const kittyConfig = config.useKittyKeyboard ?? {};
-    const kittyFlags = buildKittyKeyboardFlags(kittyConfig);
+    const kittyFlags = buildKittyKeyboardFlags2(kittyConfig);
     lib.setKittyKeyboardFlags(rendererPtr, kittyFlags);
     this._feed = feed;
     if (feed) {
@@ -7358,6 +7412,8 @@ Captured external output:
         });
       });
       this._detachFeedError = feed.onError((code) => {
+        if (this.kittyTransportTimer !== null)
+          this.kittyOutputErrorHandler();
         console.error(`[CliRenderer] NativeSpanFeed error: code=${code}`);
       });
     }
@@ -7392,11 +7448,11 @@ Captured external output:
       "SIGBREAK",
       "SIGBUS"
     ];
-    this.clipboard = new Clipboard(this.lib, this.rendererPtr);
+    this.clipboard = new Clipboard2(this.lib, this.rendererPtr);
     this.resizeDebounceDelay = config.debounceDelay || 100;
     this.targetFps = config.targetFps || 30;
     this.maxFps = config.maxFps || 60;
-    this.clock = config.clock ?? new SystemClock;
+    this.clock = config.clock ?? new SystemClock2;
     this.themeModeState = new RendererThemeMode({
       queryThemeColors: () => {
         this.lib.queryThemeColors(this.rendererPtr);
@@ -7423,7 +7479,7 @@ Captured external output:
     this.currentRenderBuffer = this.lib.getCurrentBuffer(this.rendererPtr);
     this.postProcessFns = config.postProcessFns || [];
     this.prependedInputHandlers = config.prependInputHandlers || [];
-    this.root = new RootRenderable(this);
+    this.root = new RootRenderable2(this);
     if (this.memorySnapshotInterval > 0) {
       this.startMemorySnapshotTimer();
     }
@@ -7434,7 +7490,7 @@ Captured external output:
     process.on("uncaughtException", this.handleError);
     process.on("unhandledRejection", this.handleError);
     const useKittyForParsing = kittyConfig !== null;
-    this._keyHandler = new InternalKeyHandler;
+    this._keyHandler = new InternalKeyHandler2;
     this._keyHandler.on("keypress", (event) => {
       if (this.exitOnCtrlC && matchesKeyBinding(event, { name: "c", ctrl: true })) {
         process.nextTick(() => {
@@ -7445,7 +7501,7 @@ Captured external output:
     });
     this.addExitListeners();
     const stdinParserMaxBufferBytes = config.stdinParserMaxBufferBytes ?? DEFAULT_STDIN_PARSER_MAX_BUFFER_BYTES;
-    this.stdinParser = new StdinParser({
+    this.stdinParser = new StdinParser2({
       timeoutMs: 20,
       maxPendingBytes: stdinParserMaxBufferBytes,
       armTimeouts: true,
@@ -7462,7 +7518,7 @@ Captured external output:
       },
       clock: this.clock
     });
-    this._console = new TerminalConsole(this, {
+    this._console = new TerminalConsole2(this, {
       ...config.consoleOptions ?? {},
       clock: this.clock
     });
@@ -7476,20 +7532,21 @@ Captured external output:
     this._openConsoleOnError = config.openConsoleOnError ?? true;
     this._onDestroy = config.onDestroy;
     global.requestAnimationFrame = (callback) => {
-      const id = CliRenderer.animationFrameId++;
+      const id = CliRenderer2.animationFrameId++;
       this.animationRequest.set(id, callback);
       this.requestLive();
       return id;
     };
     global.cancelAnimationFrame = (handle) => {
-      this.animationRequest.delete(handle);
+      if (this.animationRequest.delete(handle))
+        this.dropLive();
     };
     const window = global.window;
     if (!window) {
       global.window = {};
     }
     global.window.requestAnimationFrame = requestAnimationFrame;
-    if (env.OTUI_NO_NATIVE_RENDER) {
+    if (env2.OTUI_NO_NATIVE_RENDER) {
       this.renderNative = () => {
         if (this._splitHeight > 0) {
           this.flushStdoutCache(this._splitHeight);
@@ -7530,8 +7587,9 @@ Captured external output:
   removeExitListeners() {
     if (!this._exitListenersAdded || this.exitSignals.length === 0)
       return;
+    const processEvents = process;
     this.exitSignals.forEach((signal) => {
-      process.removeListener(signal, this.exitHandler);
+      processEvents.removeListener(signal, this.exitHandler);
     });
     this._exitListenersAdded = false;
   }
@@ -7553,7 +7611,7 @@ Captured external output:
   get currentFocusedEditor() {
     if (!this._currentFocusedRenderable)
       return null;
-    if (!isEditBufferRenderable(this._currentFocusedRenderable))
+    if (!isEditBufferRenderable2(this._currentFocusedRenderable))
       return null;
     return this._currentFocusedRenderable;
   }
@@ -7635,27 +7693,33 @@ Captured external output:
   }
   scheduleRenderAfterFeedIdle() {
     const feed = this._feed;
-    if (!feed || this.feedIdleRenderScheduled || this._isDestroyed)
+    if (!feed || this._isDestroyed || this._controlState === "explicit_suspended" /* EXPLICIT_SUSPENDED */)
       return;
     this.feedIdleRenderScheduled = true;
+    if (this.feedIdleWaitPending)
+      return;
+    this.feedIdleWaitPending = true;
     feed.idle().then(() => {
-      this.feedIdleRenderScheduled = false;
-      const ordinaryFrameWasWaiting = this.ordinaryFrameWaitingForFeed;
-      const ordinaryFrameWaitControlState = this.ordinaryFrameWaitControlState;
-      this.ordinaryFrameWaitingForFeed = false;
-      this.ordinaryFrameWaitControlState = null;
-      if (this._isDestroyed || ordinaryFrameWasWaiting && this._controlState !== ordinaryFrameWaitControlState && (this._controlState === "explicit_paused" /* EXPLICIT_PAUSED */ || this._controlState === "explicit_stopped" /* EXPLICIT_STOPPED */ || this._controlState === "explicit_suspended" /* EXPLICIT_SUSPENDED */)) {
-        this.resolveIdleIfNeeded();
+      this.feedIdleWaitPending = false;
+      if (!this.feedIdleRenderScheduled)
+        return;
+      if (feed.isBackpressured()) {
+        this.scheduleRenderAfterFeedIdle();
         return;
       }
+      this.feedIdleRenderScheduled = false;
       this.scheduleRenderTimer();
       this.resolveIdleIfNeeded();
     });
   }
+  cancelRenderAfterFeedIdle() {
+    if (!this.feedIdleRenderScheduled)
+      return;
+    this.feedIdleRenderScheduled = false;
+    this.immediateRerenderRequested = false;
+  }
   handleNativeRenderRejection(status) {
     if (status === NATIVE_RENDER_STATUS_SKIPPED && this._feed) {
-      this.ordinaryFrameWaitingForFeed = true;
-      this.ordinaryFrameWaitControlState = this._controlState;
       this.scheduleRenderAfterFeedIdle();
       return "retryable-skip";
     }
@@ -7697,39 +7761,38 @@ Captured external output:
       return;
     }
     if (this._isRunning) {
-      if (!this.rendering && !this.renderTimeout && !this.ordinaryFrameWaitingForFeed) {
+      if (!this.rendering && !this.renderTimeout) {
         this.scheduleRenderTimer();
       }
       return;
     }
-    if (this.ordinaryFrameWaitingForFeed) {
-      return;
-    }
     if (this.rendering) {
       this.immediateRerenderRequested = true;
       return;
     }
     if (!this.updateScheduled && !this.renderTimeout) {
       this.updateScheduled = true;
+      const generation = ++this.updateGeneration;
       const now = this.normalizeClockTime(this.clock.now(), this.lastTime);
       const elapsed = this.getElapsedMs(now, this.lastTime);
       const delay = Math.max(this.minTargetFrameTime - elapsed, 0);
       if (delay === 0) {
-        process.nextTick(() => this.activateFrame());
+        process.nextTick(() => this.activateFrame(generation));
         return;
       }
-      this.clock.setTimeout(() => this.activateFrame(), delay);
+      this.clock.setTimeout(() => this.activateFrame(generation), delay);
     }
   }
-  async activateFrame() {
-    if (!this.updateScheduled) {
+  async activateFrame(generation) {
+    if (generation !== this.updateGeneration || !this.updateScheduled) {
       this.resolveIdleIfNeeded();
       return;
     }
     try {
       await this.loop();
     } finally {
-      this.updateScheduled = false;
+      if (generation === this.updateGeneration)
+        this.updateScheduled = false;
       this.resolveIdleIfNeeded();
     }
   }
@@ -7948,6 +8011,50 @@ Captured external output:
   get capabilities() {
     return this._capabilities;
   }
+  get kittyImageTransport() {
+    return this.kittyTransportMode;
+  }
+  set kittyImageTransport(mode) {
+    const code = KITTY_IMAGE_TRANSPORTS.indexOf(mode);
+    if (code < 0)
+      throw new TypeError("Invalid kittyImageTransport");
+    if (this._isDestroyed || mode === this.kittyTransportMode)
+      return;
+    this.kittyTransportMode = mode;
+    this.startKittyTransportPolling();
+    this.lib.setKittyImageTransport(this.rendererPtr, code);
+    this.requestRender();
+  }
+  startKittyTransportPolling() {
+    if (!this._terminalIsSetup || this.kittyTransportMode !== "file" || this.kittyTransportTimer !== null)
+      return;
+    this.stdout.on("error", this.kittyOutputErrorHandler);
+    this.kittyTransportTimer = this.clock.setInterval(() => {
+      if (!this._isDestroyed && this.lib.pollKittyImageTransport(this.rendererPtr))
+        this.requestRender();
+    }, 1000);
+  }
+  get kittyImageTransportStatus() {
+    const [mode, effective, fileState, fallback, pendingFiles, pendingBytes] = this.lib.getKittyImageTransport(this.rendererPtr);
+    return {
+      requested: KITTY_IMAGE_TRANSPORTS[mode],
+      effective: ["raw", "zlib", "png", "file"][effective],
+      fileState: ["disabled", "probing", "ready", "unsupported", "timeout", "io-error", "cancelled"][fileState],
+      fallback: ["none", "not-ready", "unavailable", "budget", "busy", "preparation", "compression"][fallback],
+      pendingFiles,
+      pendingBytes
+    };
+  }
+  cancelKittyImageTransport() {
+    if (this._isDestroyed)
+      return;
+    this.lib.cancelKittyImageTransport(this.rendererPtr, false);
+    this.requestRender();
+  }
+  kittyOutputErrorHandler = () => {
+    if (!this._isDestroyed)
+      this.lib.cancelKittyImageTransport(this.rendererPtr, true);
+  };
   triggerNotification(message, title) {
     if (this._isDestroyed)
       return false;
@@ -7998,8 +8105,8 @@ Captured external output:
       enumerable: true,
       configurable: true
     });
-    const internalRoot = new RootRenderable(renderContext);
-    const publicRoot = new BoxRenderable(renderContext, {
+    const internalRoot = new RootRenderable2(renderContext);
+    const publicRoot = new BoxRenderable2(renderContext, {
       id: `scrollback-surface-root-${surfaceId}`,
       position: "absolute",
       left: 0,
@@ -8022,12 +8129,16 @@ Captured external output:
     let surfaceDestroyed = false;
     let hasRendered = false;
     let nextCommitStartOnNewLine = startOnNewLine;
-    let backingBuffer = OptimizedBuffer.create(surfaceWidth, surfaceHeight, surfaceWidthMethod, {
+    let backingBuffer = OptimizedBuffer2.create(surfaceWidth, surfaceHeight, surfaceWidthMethod, {
       id: `scrollback-surface-buffer-${surfaceId}`
     });
     const destroyListener = () => {
       destroySurface();
     };
+    const capabilitiesListener = (capabilities) => {
+      snapshotContext.capabilities = capabilities;
+      renderContext.emit("capabilities" /* CAPABILITIES */, capabilities);
+    };
     const assertNotDestroyed = () => {
       if (surfaceDestroyed) {
         throw new Error("ScrollbackSurface is destroyed");
@@ -8059,7 +8170,7 @@ Captured external output:
     };
     const collectPendingCodeRenderables = (node) => {
       const pending = [];
-      if (node instanceof CodeRenderable && node.isHighlighting) {
+      if (node instanceof CodeRenderable2 && node.isHighlighting) {
         pending.push(node);
       }
       for (const child of node.getChildren()) {
@@ -8116,7 +8227,7 @@ Captured external output:
       let targetHeight = Math.max(1, surfaceHeight);
       if (surfaceWidthMethod !== widthMethod) {
         backingBuffer.destroy();
-        backingBuffer = OptimizedBuffer.create(width, targetHeight, widthMethod, {
+        backingBuffer = OptimizedBuffer2.create(width, targetHeight, widthMethod, {
           id: `scrollback-surface-buffer-${surfaceId}`
         });
       } else {
@@ -8176,7 +8287,7 @@ Captured external output:
         return;
       }
       const rowCount = endRowExclusive - startRow;
-      const commitBuffer = OptimizedBuffer.create(surfaceWidth, rowCount, surfaceWidthMethod, {
+      const commitBuffer = OptimizedBuffer2.create(surfaceWidth, rowCount, surfaceWidthMethod, {
         id: `scrollback-surface-commit-${surfaceId}`
       });
       try {
@@ -8199,6 +8310,7 @@ Captured external output:
       }
       surfaceDestroyed = true;
       renderer.off("destroy" /* DESTROY */, destroyListener);
+      renderer.off("capabilities" /* CAPABILITIES */, capabilitiesListener);
       let destroyError = null;
       try {
         internalRoot.destroyRecursively();
@@ -8219,6 +8331,7 @@ Captured external output:
       }
     };
     renderer.on("destroy" /* DESTROY */, destroyListener);
+    renderer.on("capabilities" /* CAPABILITIES */, capabilitiesListener);
     return {
       get renderContext() {
         return renderContext;
@@ -8265,8 +8378,8 @@ Captured external output:
       snapshotContext.width = snapshotWidth;
       snapshotContext.height = snapshotHeight;
       snapshotContext.widthMethod = this.widthMethod;
-      snapshotRoot = new RootRenderable(snapshotContext);
-      snapshotBuffer = OptimizedBuffer.create(snapshotWidth, snapshotHeight, this.widthMethod, {
+      snapshotRoot = new RootRenderable2(snapshotContext);
+      snapshotBuffer = OptimizedBuffer2.create(snapshotWidth, snapshotHeight, this.widthMethod, {
         id: "scrollback-snapshot-commit"
       });
       snapshotRoot.add(rootRenderable);
@@ -8425,8 +8538,8 @@ Captured external output:
     const lineCells = [...line];
     const rowColumns = Math.min(lineCells.length, maxWidth);
     const renderedLine = lineCells.slice(0, maxWidth).join("");
-    const snapshotRoot = new RootRenderable(snapshotContext);
-    const snapshotRenderable = new TextRenderable(snapshotContext, {
+    const snapshotRoot = new RootRenderable2(snapshotContext);
+    const snapshotRenderable = new TextRenderable2(snapshotContext, {
       id: "captured-stdout-snapshot",
       position: "absolute",
       left: 0,
@@ -8435,7 +8548,7 @@ Captured external output:
       height: 1,
       content: renderedLine
     });
-    const snapshotBuffer = OptimizedBuffer.create(Math.max(1, rowColumns), 1, this.widthMethod, {
+    const snapshotBuffer = OptimizedBuffer2.create(Math.max(1, rowColumns), 1, this.widthMethod, {
       id: "captured-stdout-snapshot"
     });
     try {
@@ -8509,7 +8622,7 @@ Captured external output:
       const forceCommit = forceFooterRepaint && index === lastCommitIndex;
       const beginFrame = index === 0;
       const finalizeFrame = index === lastCommitIndex;
-      const nativeResult = this.lib.commitSplitFooterSnapshot(this.rendererPtr, commit.snapshot, commit.rowColumns, commit.startOnNewLine, commit.trailingNewline, this.getSplitPinnedRenderOffset(), forceCommit, beginFrame, finalizeFrame);
+      const nativeResult = this.lib.commitSplitFooterSnapshot(this.rendererPtr, commit.snapshot, commit.rowColumns, commit.startOnNewLine, commit.trailingNewline, this.getSplitPinnedRenderOffset(), forceCommit, beginFrame, finalizeFrame, drainAll);
       if (nativeResult.status === NATIVE_RENDER_STATUS_SKIPPED) {
         nativeBackpressured = true;
         break;
@@ -8850,6 +8963,7 @@ Captured external output:
       explicitWidthCprActive: true,
       startupCursorCprActive
     });
+    this.startKittyTransportPolling();
     this.lib.setupTerminal(this.rendererPtr, this._screenMode === "alternate-screen");
     this._capabilities = this.lib.getTerminalCapabilities(this.rendererPtr);
     if (this.debugOverlay.enabled) {
@@ -9015,6 +9129,14 @@ Captured external output:
     });
   }
   handleStdinEvent(event) {
+    if (event.type === "response" && event.sequence.startsWith("\x1B_G")) {
+      const result = this.lib.processKittyImageReply(this.rendererPtr, event.sequence);
+      if (result !== 0) {
+        if (result === 2)
+          this.requestRender();
+        return;
+      }
+    }
     if (this._controlState === "explicit_suspended" /* EXPLICIT_SUSPENDED */) {
       if (event.type === "response" && isPixelResolutionResponse(event.sequence)) {
         this.dispatchSequenceHandlers(event.sequence);
@@ -9099,7 +9221,7 @@ Captured external output:
     this.startTerminalKeepAlive();
   }
   dispatchMouseEvent(target, attributes) {
-    const event = new MouseEvent(target, attributes);
+    const event = new MouseEvent2(target, attributes);
     this.sendMouseEvent(target, event);
     if (this.autoFocus && event.type === "down" && event.button === 0 /* LEFT */ && !event.defaultPrevented) {
       let current = target;
@@ -9136,27 +9258,27 @@ Captured external output:
     if (this._console.visible) {
       const consoleBounds = this._console.bounds;
       if (mouseEvent.x >= consoleBounds.x && mouseEvent.x < consoleBounds.x + consoleBounds.width && mouseEvent.y >= consoleBounds.y && mouseEvent.y < consoleBounds.y + consoleBounds.height) {
-        const event2 = new MouseEvent(null, mouseEvent);
-        const handled = this._console.handleMouse(event2);
+        const event = new MouseEvent2(null, mouseEvent);
+        const handled = this._console.handleMouse(event);
         if (handled)
           return true;
       }
     }
     if (mouseEvent.type === "scroll") {
-      const maybeRenderableId2 = this.hitTest(mouseEvent.x, mouseEvent.y);
-      const maybeRenderable2 = Renderable.renderablesByNumber.get(maybeRenderableId2);
+      const maybeRenderableId = this.hitTest(mouseEvent.x, mouseEvent.y);
+      const maybeRenderable = Renderable2.renderablesByNumber.get(maybeRenderableId);
       const fallbackTarget = this._currentFocusedRenderable && !this._currentFocusedRenderable.isDestroyed && this._currentFocusedRenderable.focused ? this._currentFocusedRenderable : null;
-      const scrollTarget = maybeRenderable2 ?? fallbackTarget;
+      const scrollTarget = maybeRenderable ?? fallbackTarget;
       if (scrollTarget) {
-        const event2 = new MouseEvent(scrollTarget, mouseEvent);
-        this.sendMouseEvent(scrollTarget, event2);
+        const event = new MouseEvent2(scrollTarget, mouseEvent);
+        this.sendMouseEvent(scrollTarget, event);
       }
       return true;
     }
     const maybeRenderableId = this.hitTest(mouseEvent.x, mouseEvent.y);
     const sameElement = maybeRenderableId === this.lastOverRenderableNum;
     this.lastOverRenderableNum = maybeRenderableId;
-    const maybeRenderable = Renderable.renderablesByNumber.get(maybeRenderableId);
+    const maybeRenderable = Renderable2.renderablesByNumber.get(maybeRenderableId);
     if (mouseEvent.type === "down" && mouseEvent.button === 0 /* LEFT */ && !this.currentSelection?.isDragging && !mouseEvent.modifiers.ctrl) {
       const canStartSelection = Boolean(maybeRenderable && maybeRenderable.selectable && !maybeRenderable.isDestroyed && maybeRenderable.shouldStartSelection(mouseEvent.x, mouseEvent.y));
       if (canStartSelection && maybeRenderable) {
@@ -9168,21 +9290,21 @@ Captured external output:
     if (mouseEvent.type === "drag" && this.currentSelection?.isDragging) {
       this.updateSelection(maybeRenderable, mouseEvent.x, mouseEvent.y);
       if (maybeRenderable) {
-        const event2 = new MouseEvent(maybeRenderable, {
+        const event = new MouseEvent2(maybeRenderable, {
           ...mouseEvent,
           isDragging: true
         });
-        this.sendMouseEvent(maybeRenderable, event2);
+        this.sendMouseEvent(maybeRenderable, event);
       }
       return true;
     }
     if (mouseEvent.type === "up" && mouseEvent.button === 0 /* LEFT */ && this.currentSelection?.isDragging) {
       if (maybeRenderable) {
-        const event2 = new MouseEvent(maybeRenderable, {
+        const event = new MouseEvent2(maybeRenderable, {
           ...mouseEvent,
           isDragging: true
         });
-        this.sendMouseEvent(maybeRenderable, event2);
+        this.sendMouseEvent(maybeRenderable, event);
       }
       this.finishSelection();
       return true;
@@ -9196,41 +9318,41 @@ Captured external output:
     }
     if (!sameElement && (mouseEvent.type === "drag" || mouseEvent.type === "move")) {
       if (this.lastOverRenderable && this.lastOverRenderable !== this.capturedRenderable && !this.lastOverRenderable.isDestroyed) {
-        const event2 = new MouseEvent(this.lastOverRenderable, {
+        const event = new MouseEvent2(this.lastOverRenderable, {
           ...mouseEvent,
           type: "out"
         });
-        this.sendMouseEvent(this.lastOverRenderable, event2);
+        this.sendMouseEvent(this.lastOverRenderable, event);
       }
       this.lastOverRenderable = maybeRenderable;
       if (maybeRenderable) {
-        const event2 = new MouseEvent(maybeRenderable, {
+        const event = new MouseEvent2(maybeRenderable, {
           ...mouseEvent,
           type: "over",
           source: this.capturedRenderable
         });
-        this.sendMouseEvent(maybeRenderable, event2);
+        this.sendMouseEvent(maybeRenderable, event);
       }
     }
     if (this.capturedRenderable && mouseEvent.type !== "up") {
-      const event2 = new MouseEvent(this.capturedRenderable, mouseEvent);
-      this.sendMouseEvent(this.capturedRenderable, event2);
+      const event = new MouseEvent2(this.capturedRenderable, mouseEvent);
+      this.sendMouseEvent(this.capturedRenderable, event);
       return true;
     }
     if (this.capturedRenderable && mouseEvent.type === "up") {
-      const event2 = new MouseEvent(this.capturedRenderable, {
+      const event = new MouseEvent2(this.capturedRenderable, {
         ...mouseEvent,
         type: "drag-end"
       });
-      this.sendMouseEvent(this.capturedRenderable, event2);
-      this.sendMouseEvent(this.capturedRenderable, new MouseEvent(this.capturedRenderable, mouseEvent));
+      this.sendMouseEvent(this.capturedRenderable, event);
+      this.sendMouseEvent(this.capturedRenderable, new MouseEvent2(this.capturedRenderable, mouseEvent));
       if (maybeRenderable) {
-        const event3 = new MouseEvent(maybeRenderable, {
+        const event = new MouseEvent2(maybeRenderable, {
           ...mouseEvent,
           type: "drop",
           source: this.capturedRenderable
         });
-        this.sendMouseEvent(maybeRenderable, event3);
+        this.sendMouseEvent(maybeRenderable, event);
       }
       this.lastOverRenderable = this.capturedRenderable;
       this.lastOverRenderableNum = this.capturedRenderable.num;
@@ -9260,7 +9382,7 @@ Captured external output:
     if (this.capturedRenderable)
       return;
     const hitId = this.hitTest(this._latestPointer.x, this._latestPointer.y);
-    const hitRenderable = Renderable.renderablesByNumber.get(hitId);
+    const hitRenderable = Renderable2.renderablesByNumber.get(hitId);
     const lastOver = this.lastOverRenderable;
     if (lastOver?.num === hitId) {
       this.lastOverRenderableNum = hitId;
@@ -9274,13 +9396,13 @@ Captured external output:
       modifiers: this._lastPointerModifiers
     };
     if (lastOver && !lastOver.isDestroyed) {
-      const event = new MouseEvent(lastOver, { ...baseEvent, type: "out" });
+      const event = new MouseEvent2(lastOver, { ...baseEvent, type: "out" });
       this.sendMouseEvent(lastOver, event);
     }
     this.lastOverRenderable = hitRenderable;
     this.lastOverRenderableNum = hitId;
     if (hitRenderable) {
-      const event = new MouseEvent(hitRenderable, {
+      const event = new MouseEvent2(hitRenderable, {
         ...baseEvent,
         type: "over"
       });
@@ -9294,6 +9416,18 @@ Captured external output:
   hitTest(x, y) {
     return this.lib.checkHit(this.rendererPtr, x, y);
   }
+  getLinkIdAt(x, y) {
+    if (this._isDestroyed || !Number.isInteger(x) || !Number.isInteger(y))
+      return 0;
+    const buffer = this.currentRenderBuffer;
+    if (x < 0 || y < 0 || x >= buffer.width || y >= buffer.height)
+      return 0;
+    return getLinkId2(buffer.buffers.attributes[y * buffer.width + x]);
+  }
+  getLinkAt(x, y) {
+    const linkId = this.getLinkIdAt(x, y);
+    return linkId === 0 ? null : this.currentRenderBuffer.lib.linkGetUrl(linkId) || null;
+  }
   takeMemorySnapshot() {
     if (this._isDestroyed)
       return;
@@ -9408,7 +9542,7 @@ Captured external output:
     this.processResize(width, height);
   }
   setBackgroundColor(color) {
-    const parsedColor = parseColor(color);
+    const parsedColor = parseColor2(color);
     this.lib.setBackgroundColor(this.rendererPtr, parsedColor);
     this.backgroundColor = parsedColor;
     this.nextRenderBuffer.clear(parsedColor);
@@ -9461,18 +9595,18 @@ Captured external output:
     this.lib.dumpOutputBuffer(this.rendererPtr, timestamp);
   }
   static setCursorPosition(renderer, x, y, visible = true) {
-    const lib = resolveRenderLib();
+    const lib = resolveRenderLib2();
     lib.setCursorPosition(renderer.rendererPtr, x, y, visible);
   }
   static setCursorStyle(renderer, options) {
-    const lib = resolveRenderLib();
+    const lib = resolveRenderLib2();
     lib.setCursorStyleOptions(renderer.rendererPtr, options);
     if (options.cursor !== undefined) {
       renderer._currentMousePointerStyle = options.cursor;
     }
   }
   static setCursorColor(renderer, color) {
-    const lib = resolveRenderLib();
+    const lib = resolveRenderLib2();
     lib.setCursorColor(renderer.rendererPtr, color);
   }
   setCursorPosition(x, y, visible = true) {
@@ -9513,13 +9647,21 @@ Captured external output:
     if (this._controlState === "idle" /* IDLE */ && this.liveRequestCounter > 0) {
       this._controlState = "auto_started" /* AUTO_STARTED */;
       this.internalStart();
+    } else if (this._controlState === "explicit_suspended" /* EXPLICIT_SUSPENDED */ && this._previousControlState === "idle" /* IDLE */) {
+      this._previousControlState = "auto_started" /* AUTO_STARTED */;
     }
   }
   dropLive() {
-    this.liveRequestCounter = Math.max(0, this.liveRequestCounter - 1);
+    if (this.liveRequestCounter === 0)
+      return;
+    this.liveRequestCounter--;
+    if (this.liveRequestCounter === 0 && this._controlState === "explicit_suspended" /* EXPLICIT_SUSPENDED */ && this._previousControlState === "auto_started" /* AUTO_STARTED */) {
+      this._previousControlState = "idle" /* IDLE */;
+    }
     if (this._controlState === "auto_started" /* AUTO_STARTED */ && this.liveRequestCounter === 0) {
       this._controlState = "idle" /* IDLE */;
-      this.internalPause();
+      this._isRunning = false;
+      this.resolveIdleIfNeeded();
     }
   }
   start() {
@@ -9533,6 +9675,7 @@ Captured external output:
     if (!this._isRunning && !this._isDestroyed) {
       this._isRunning = true;
       this.updateScheduled = false;
+      this.updateGeneration++;
       if (this.memorySnapshotInterval > 0) {
         this.startMemorySnapshotTimer();
       }
@@ -9547,6 +9690,7 @@ Captured external output:
     this._previousControlState = this._controlState;
     this._controlState = "explicit_suspended" /* EXPLICIT_SUSPENDED */;
     this.updateScheduled = false;
+    this.updateGeneration++;
     this.internalPause();
     if (this._terminalIsSetup) {
       this.clearSplitStartupCursorSeed();
@@ -9624,6 +9768,7 @@ Captured external output:
   }
   internalPause() {
     this._isRunning = false;
+    this.cancelRenderAfterFeedIdle();
     if (this.renderTimeout) {
       this.clock.clearTimeout(this.renderTimeout);
       this.renderTimeout = null;
@@ -9637,20 +9782,14 @@ Captured external output:
     this.internalStop();
   }
   internalStop() {
-    if (this.isRunning && !this._isDestroyed) {
-      this._isRunning = false;
-      if (this.memorySnapshotTimer) {
-        this.clock.clearInterval(this.memorySnapshotTimer);
-        this.memorySnapshotTimer = null;
-      }
-      if (this.renderTimeout) {
-        this.clock.clearTimeout(this.renderTimeout);
-        this.renderTimeout = null;
-      }
-      if (!this.rendering) {
-        this.resolveIdleIfNeeded();
-      }
+    this.updateScheduled = false;
+    this.updateGeneration++;
+    this.immediateRerenderRequested = false;
+    if (this.memorySnapshotTimer) {
+      this.clock.clearInterval(this.memorySnapshotTimer);
+      this.memorySnapshotTimer = null;
     }
+    this.internalPause();
   }
   destroy() {
     if (this._isDestroyed)
@@ -9668,12 +9807,20 @@ Captured external output:
     if (this._destroyCleanupPrepared)
       return;
     this._destroyCleanupPrepared = true;
+    this.cancelRenderAfterFeedIdle();
+    if (this.kittyTransportTimer !== null) {
+      this.clock.clearInterval(this.kittyTransportTimer);
+      this.kittyTransportTimer = null;
+      this.stdout.off("error", this.kittyOutputErrorHandler);
+      this.lib.cancelKittyImageTransport(this.rendererPtr, false);
+    }
+    const processEvents = process;
     if (this._usesProcessStdout) {
-      process.removeListener("SIGWINCH", this.sigwinchHandler);
+      processEvents.removeListener("SIGWINCH", this.sigwinchHandler);
     }
-    process.removeListener("uncaughtException", this.handleError);
-    process.removeListener("unhandledRejection", this.handleError);
-    process.removeListener("warning", this.warningHandler);
+    processEvents.removeListener("uncaughtException", this.handleError);
+    processEvents.removeListener("unhandledRejection", this.handleError);
+    processEvents.removeListener("warning", this.warningHandler);
     this.removeExitListeners();
     if (this.resizeTimeoutId !== null) {
       this.clock.clearTimeout(this.resizeTimeoutId);
@@ -9791,7 +9938,7 @@ Captured external output:
     }
     rendererTracker.renderers.delete(this);
     if (rendererTracker.renderers.size === 0) {
-      destroyTreeSitterClient().catch((error) => {
+      destroyTreeSitterClient2().catch((error) => {
         console.error("Failed to destroy tree-sitter client:", error);
       });
     }
@@ -9847,6 +9994,11 @@ Captured external output:
     this.rendering = true;
     let renderFailed = false;
     try {
+      if (this._feed?.isBackpressured()) {
+        this.handleNativeRenderRejection(NATIVE_RENDER_STATUS_SKIPPED);
+        this.immediateRerenderRequested = false;
+        return;
+      }
       this._frameId++;
       const now = this.normalizeClockTime(this.clock.now(), this.lastTime);
       const elapsed = this.getElapsedMs(now, this.lastTime);
@@ -9929,7 +10081,7 @@ Captured external output:
             this.renderTimeout = null;
           }
         } else if (nativeStatus === "backpressured") {
-          if (!startedWhileRunning || this._isRunning || this.immediateRerenderRequested) {
+          if (!startedWhileRunning || this._isRunning || this.immediateRerenderRequested || this._controlState === "idle" /* IDLE */) {
             this.scheduleRenderAfterBackpressure();
           }
         } else if (nativeStatus === "retryable-skip") {
@@ -10064,7 +10216,7 @@ Captured external output:
       return;
     this.clearSelectionState();
     this.selectionContainers.push(renderable.parent || this.root);
-    this.currentSelection = new Selection(renderable, { x, y }, { x, y }, behavior);
+    this.currentSelection = new Selection2(renderable, { x, y }, { x, y }, behavior);
     this.currentSelection.isStart = true;
     this.notifySelectablesOfSelectionChange();
   }
@@ -10106,7 +10258,7 @@ Captured external output:
     if (this.currentSelection?.isDragging) {
       const pointer = this._latestPointer;
       const maybeRenderableId = this.hitTest(pointer.x, pointer.y);
-      const maybeRenderable = Renderable.renderablesByNumber.get(maybeRenderableId);
+      const maybeRenderable = Renderable2.renderablesByNumber.get(maybeRenderableId);
       this.updateSelection(maybeRenderable, pointer.x, pointer.y);
     }
   }
@@ -10187,7 +10339,7 @@ Captured external output:
     if (!this._paletteDetector) {
       const isTmux = Boolean(this.capabilities?.multiplexer === "tmux" || this.capabilities?.terminal?.name?.toLowerCase()?.includes("tmux"));
       const isLegacyTmux = this.capabilities?.terminal?.name?.toLowerCase()?.includes("tmux") && this.capabilities?.terminal?.version?.localeCompare("3.6") < 0;
-      this._paletteDetector = createTerminalPalette({
+      this._paletteDetector = createTerminalPalette2({
         stdin: this.stdin,
         stdout: this.stdout,
         writeFn: (data) => this._isDestroyed ? false : this.writeOut(data),
@@ -10202,18 +10354,18 @@ Captured external output:
     return this._paletteDetector;
   }
   syncNativePaletteState(colors) {
-    const signature = buildTerminalPaletteSignature(colors);
+    const signature = buildTerminalPaletteSignature2(colors);
     if (this._nativePaletteSignature !== signature) {
       this._paletteEpoch = this._paletteEpoch + 1 >>> 0;
     }
     this._nativePaletteSignature = signature;
-    const normalized = normalizeTerminalPalette(colors);
+    const normalized = normalizeTerminalPalette2(colors);
     this.lib.rendererSetPaletteState(this.rendererPtr, normalized.palette, normalized.defaultForeground, normalized.defaultBackground, this._paletteEpoch);
   }
   emitPaletteChange(colors) {
     if (this.listenerCount("palette" /* PALETTE */) === 0)
       return;
-    const signature = buildTerminalPaletteSignature(colors);
+    const signature = buildTerminalPaletteSignature2(colors);
     if (this._emittedPaletteSignature === signature)
       return;
     this._emittedPaletteSignature = signature;
@@ -10319,7 +10471,7 @@ Captured external output:
   }
 }
 
-export { h, isVNode, maybeMakeRenderable, wrapWithDelegates, instantiate, delegate, LayoutEvents, RenderableEvents, isRenderable, BaseRenderable, Renderable, RootRenderable, TextBufferView, EditBuffer, EditorView, convertThemeToStyles, SyntaxStyle, ANSI, BoxRenderable, TextBufferRenderable, CodeRenderable, isTextNodeRenderable, TextNodeRenderable, RootTextNodeRenderable, TextRenderable, NativeSpanFeed, defaultKeyAliases, mergeKeyAliases, mergeKeyBindings, getKeyBindingAction, buildKeyBindingsMap, capture, ConsolePosition, TerminalConsole, getObjectsInViewport, EditBufferRenderableEvents, isEditBufferRenderable, EditBufferRenderable, buildKittyKeyboardFlags, MouseEvent, MouseButton, createCliRenderer, CliRenderEvents, RendererControlState, CliRenderer };
+export { convertThemeToStyles2, SyntaxStyle2, h2, isVNode2, maybeMakeRenderable2, wrapWithDelegates2, instantiate2, delegate2, LayoutEvents2, RenderableEvents2, isRenderable2, BaseRenderable2, Renderable2, RootRenderable2, TextBufferView2, EditBuffer2, EditorView2, ANSI, BoxRenderable2, TextBufferRenderable2, CodeRenderable2, isTextNodeRenderable2, TextNodeRenderable2, RootTextNodeRenderable2, TextRenderable2, NativeSpanFeed2, defaultKeyAliases, mergeKeyAliases, mergeKeyBindings, getKeyBindingAction, buildKeyBindingsMap, capture2, ConsolePosition2, TerminalConsole2, getObjectsInViewport, EditBufferRenderableEvents2, isEditBufferRenderable2, EditBufferRenderable2, buildKittyKeyboardFlags2, MouseEvent2, MouseButton2, createCliRenderer2, CliRenderEvents2, RendererControlState2, CliRenderer2 };
 
-//# debugId=3EFDC723C8276A6F64756E2164756E21
-//# sourceMappingURL=chunk-bun-jxfx3h5k.js.map
+//# debugId=D9293021961B480764756E2164756E21
+//# sourceMappingURL=chunk-bun-bwjmgnxw.js.map