omk-tui 1.3.2 → 1.4.0

package/dist/tui.js

@@ -6,30 +6,12 @@ import * as os from "node:os";
 import * as path from "node:path";
 import { performance } from "node:perf_hooks";
 import { isKeyRelease, matchesKey } from "./keys.js";
+import { extractKittyImageIds, LineResetMemo, SEGMENT_RESET } from "./line-reset-memo.js";
+import { maxChildGeneration, nextRenderGeneration, releaseRenderCache } from "./render-generation.js";
 import { finishTerminalFrame } from "./terminal-final-frame.js";
 import { deleteKittyImage, getCapabilities, isImageLine, setCellDimensions } from "./terminal-image.js";
-import { extractSegments, normalizeTerminalOutput, sliceByColumn, sliceWithWidth, visibleWidth } from "./utils.js";
-const KITTY_SEQUENCE_PREFIX = "\x1b_G";
-function extractKittyImageIds(line) {
-    const sequenceStart = line.indexOf(KITTY_SEQUENCE_PREFIX);
-    if (sequenceStart === -1)
-        return [];
-    const paramsStart = sequenceStart + KITTY_SEQUENCE_PREFIX.length;
-    const paramsEnd = line.indexOf(";", paramsStart);
-    if (paramsEnd === -1)
-        return [];
-    const params = line.slice(paramsStart, paramsEnd);
-    for (const param of params.split(",")) {
-        const [key, value] = param.split("=", 2);
-        if (key !== "i" || value === undefined)
-            continue;
-        const id = Number(value);
-        if (Number.isInteger(id) && id > 0 && id <= 0xffffffff) {
-            return [id];
-        }
-    }
-    return [];
-}
+import { isTermuxSession, REPAINT_BUDGET_SCREENS, ResizeResync } from "./terminal-resync.js";
+import { extractSegments, sliceByColumn, sliceWithWidth, visibleWidth } from "./utils.js";
 /** Type guard to check if a component implements Focusable */
 export function isFocusable(component) {
     return component !== null && "focused" in component;
@@ -44,51 +26,55 @@ export const CURSOR_MARKER = "\x1b_pi:c\x07";
 export { visibleWidth };
 /** Parse a SizeValue into absolute value given a reference size */
 function parseSizeValue(value, referenceSize) {
-    if (value === undefined)
-        return undefined;
-    if (typeof value === "number")
+    if (value === undefined || typeof value === "number")
         return value;
     // Parse percentage string like "50%"
     const match = value.match(/^(\d+(?:\.\d+)?)%$/);
-    if (match) {
-        return Math.floor((referenceSize * parseFloat(match[1])) / 100);
-    }
-    return undefined;
-}
-function isTermuxSession() {
-    return Boolean(process.env.TERMUX_VERSION);
+    return match ? Math.floor((referenceSize * parseFloat(match[1])) / 100) : undefined;
 }
 /**
  * Container - a component that contains other components
  */
 export class Container {
     children = [];
+    /** Stamp of the last structural change (see render-generation.ts). */
+    structureGeneration = 0;
     addChild(component) {
         this.children.push(component);
+        this.structureGeneration = nextRenderGeneration();
     }
     removeChild(component) {
         const index = this.children.indexOf(component);
         if (index !== -1) {
             this.children.splice(index, 1);
+            this.structureGeneration = nextRenderGeneration();
         }
     }
     clear() {
         this.children = [];
+        this.structureGeneration = nextRenderGeneration();
+    }
+    /** Raises whenever this container's child list or any descendant changes. */
+    getRenderGeneration() {
+        return maxChildGeneration(this.structureGeneration, this.children);
     }
     invalidate() {
         for (const child of this.children) {
             child.invalidate?.();
         }
     }
+    /** Forwards to children; a container keeps no render cache of its own. */
+    releaseRenderCache() {
+        for (const child of this.children)
+            releaseRenderCache(child);
+    }
     render(width) {
-        const lines = [];
-        for (const child of this.children) {
-            const childLines = child.render(width);
-            for (const line of childLines) {
-                lines.push(line);
-            }
-        }
-        return lines;
+        const parts = [];
+        for (const child of this.children)
+            parts.push(child.render(width));
+        // Always a fresh array (callers mutate it). Native concat bulk-copies large
+        // children such as a windowed transcript instead of pushing row by row.
+        return parts.length < 8192 ? [].concat(...parts) : parts.flat();
     }
 }
 /**
@@ -98,6 +84,7 @@ export class TUI extends Container {
     terminal;
     previousLines = [];
     previousKittyImageIds = new Set();
+    lineResets = new LineResetMemo();
     previousWidth = 0;
     previousHeight = 0;
     focusedComponent = null;
@@ -108,12 +95,6 @@ export class TUI extends Container {
     renderTimer;
     lastRenderAt = 0;
     static MIN_RENDER_INTERVAL_MS = 16;
-    /**
-     * How far back a clearing repair repaint may reach, in viewport screens.
-     * Bounds the scrollback churn of fixing rows that already scrolled off
-     * (see the repaint budget note in doRender's fullRender helper).
-     */
-    static REPAINT_BUDGET_SCREENS = 4;
     cursorRow = 0; // Logical cursor row (end of rendered content)
     hardwareCursorRow = 0; // Actual terminal cursor row (may differ due to IME positioning)
     showHardwareCursor = process.env.OMK_HARDWARE_CURSOR === "1";
@@ -123,6 +104,7 @@ export class TUI extends Container {
     static MIN_CONTENT_COLUMNS = 20;
     maxLinesRendered = 0; // Track terminal's working area (max lines ever rendered)
     previousViewportTop = 0; // Track previous viewport top for resize-aware cursor moves
+    resizeResync = new ResizeResync(); // pre-overlay rows of recent frames, for height resizes
     fullRedrawCount = 0;
     stopped = false;
     // Overlay stack for modal components rendered on top of base content
@@ -139,6 +121,10 @@ export class TUI extends Container {
     get fullRedraws() {
         return this.fullRedrawCount;
     }
+    /** First buffer row inside the viewport as of the last render (0 while the whole frame fits). */
+    get viewportTop() {
+        return this.previousViewportTop;
+    }
     getShowHardwareCursor() {
         return this.showHardwareCursor;
     }
@@ -807,26 +793,6 @@ export class TUI extends Container {
         }
         return result;
     }
-    static SEGMENT_RESET = "\x1b[0m\x1b]8;;\x07";
-    applyLineResets(lines) {
-        const reset = TUI.SEGMENT_RESET;
-        for (let i = 0; i < lines.length; i++) {
-            const line = lines[i];
-            if (!isImageLine(line)) {
-                lines[i] = normalizeTerminalOutput(line) + reset;
-            }
-        }
-        return lines;
-    }
-    collectKittyImageIds(lines) {
-        const ids = new Set();
-        for (const line of lines) {
-            for (const id of extractKittyImageIds(line)) {
-                ids.add(id);
-            }
-        }
-        return ids;
-    }
     deleteKittyImages(ids) {
         let buffer = "";
         for (const id of ids) {
@@ -835,6 +801,10 @@ export class TUI extends Container {
         return buffer;
     }
     expandLastChangedForKittyImages(firstChanged, lastChanged) {
+        // previousKittyImageIds is the id set of exactly these previousLines: when it
+        // is empty no row can match, so skip the O(history) scan.
+        if (this.previousKittyImageIds.size === 0)
+            return lastChanged;
         let expandedLastChanged = lastChanged;
         for (let i = firstChanged; i < this.previousLines.length; i++) {
             if (extractKittyImageIds(this.previousLines[i]).length > 0) {
@@ -872,7 +842,7 @@ export class TUI extends Container {
         const afterTarget = Math.max(0, totalWidth - actualBeforeWidth - actualOverlayWidth);
         const afterPad = Math.max(0, afterTarget - base.afterWidth);
         // Compose result
-        const r = TUI.SEGMENT_RESET;
+        const r = SEGMENT_RESET;
         const result = base.before +
             " ".repeat(beforePad) +
             r +
@@ -938,20 +908,22 @@ export class TUI extends Container {
         // Render all components to get new lines. Children render at the content
         // width (terminal minus the reserved right gutter); overlays composite at
         // full-terminal coordinates below, so pinned rails own the gutter columns.
-        let newLines = finalLines ?? this.render(width - this.resolveRightGutter(width, height));
+        let newLines = this.resizeResync.track(finalLines ?? this.render(width - this.resolveRightGutter(width, height)));
         // Composite overlays into the rendered lines (before differential compare)
         if (finalLines === undefined && this.overlayStack.length > 0) {
             newLines = this.compositeOverlays(newLines, width, height);
         }
         // Extract cursor position before applying line resets (marker must be found first)
         const cursorPos = this.extractCursorPosition(newLines, height);
-        newLines = this.applyLineResets(newLines);
+        newLines = this.lineResets.apply(newLines);
         // Helper to optionally clear the visible viewport and render all new lines
-        const fullRender = (clear, fromRow) => {
+        const fullRender = (clear, fromRow, resync = "") => {
             this.fullRedrawCount += 1;
             let buffer = "\x1b[?2026h"; // Begin synchronized output
             if (clear) {
-                buffer += this.deleteKittyImages(this.previousKittyImageIds);
+                // A height resize first rewrites, relative to the cursor, the rows
+                // the resize may have cost scrollback (see resyncAfterResize).
+                buffer += this.deleteKittyImages(this.previousKittyImageIds) + resync;
                 // Repaint the visible screen IN PLACE: home the cursor, erase every row
                 // as it is rewritten below, then erase whatever is left over.
                 // \x1b[2J (erase all) is deliberately not used: conpty/Windows Terminal
@@ -987,7 +959,7 @@ export class TUI extends Container {
             // destroys more history than it repairs (a long report loses its
             // beginning). Rows older than the budget keep their existing copy.
             // Without fromRow the clamp collapses to tailStart, i.e. tail-only.
-            const repairStart = newLines.length - height * TUI.REPAINT_BUDGET_SCREENS;
+            const repairStart = newLines.length - height * REPAINT_BUDGET_SCREENS;
             const firstPrinted = clear ? Math.min(Math.max(fromRow ?? tailStart, repairStart), tailStart) : 0;
             for (let i = firstPrinted; i < newLines.length; i++) {
                 if (i > firstPrinted)
@@ -1010,13 +982,12 @@ export class TUI extends Container {
             this.previousViewportTop = Math.max(0, bufferLength - height);
             this.positionHardwareCursor(cursorPos, newLines.length);
             this.previousLines = newLines;
-            this.previousKittyImageIds = this.collectKittyImageIds(newLines);
+            this.previousKittyImageIds = this.lineResets.kittyImageIds;
             this.previousWidth = width;
             this.previousHeight = height;
         };
-        const debugRedraw = process.env.OMK_DEBUG_REDRAW === "1";
         const logRedraw = (reason) => {
-            if (!debugRedraw)
+            if (process.env.OMK_DEBUG_REDRAW !== "1")
                 return;
             const agentDir = process.env.OMK_CODING_AGENT_DIR ?? path.join(os.homedir(), ".omk", "agent");
             const logPath = path.join(agentDir, "omk-debug.log");
@@ -1039,22 +1010,29 @@ export class TUI extends Container {
         // but Termux changes height when the software keyboard shows or hides.
         // In that environment, a full redraw causes the entire history to replay on every toggle.
         if (heightChanged && !isTermuxSession()) {
-            logRedraw(`terminal height changed (${this.previousHeight} -> ${height})`);
-            fullRender(true);
+            const resync = this.resizeResync.after(newLines, this.hardwareCursorRow, height);
+            logRedraw(`terminal height changed (${this.previousHeight} -> ${height}; ${this.resizeResync.detail})`);
+            fullRender(true, undefined, resync);
             return;
         }
         // Find first and last changed lines
+        // Scan inward from both ends: unchanged rows compare by reference, and a
+        // change far above the viewport (which shifts every row below it) no longer
+        // costs a content comparison per history row.
         let firstChanged = -1;
         let lastChanged = -1;
         const maxLines = Math.max(newLines.length, this.previousLines.length);
+        const rowDiffers = (i) => (i < this.previousLines.length ? this.previousLines[i] : "") !== (i < newLines.length ? newLines[i] : "");
         for (let i = 0; i < maxLines; i++) {
-            const oldLine = i < this.previousLines.length ? this.previousLines[i] : "";
-            const newLine = i < newLines.length ? newLines[i] : "";
-            if (oldLine !== newLine) {
-                if (firstChanged === -1) {
-                    firstChanged = i;
-                }
+            if (rowDiffers(i)) {
+                firstChanged = i;
+                break;
+            }
+        }
+        for (let i = maxLines - 1; firstChanged !== -1 && i >= firstChanged; i--) {
+            if (rowDiffers(i)) {
                 lastChanged = i;
+                break;
             }
         }
         if (firstChanged !== -1) {
@@ -1134,7 +1112,7 @@ export class TUI extends Container {
             }
             this.positionHardwareCursor(cursorPos, newLines.length);
             this.previousLines = newLines;
-            this.previousKittyImageIds = this.collectKittyImageIds(newLines);
+            this.previousKittyImageIds = this.lineResets.kittyImageIds;
             this.previousWidth = width;
             this.previousHeight = height;
             this.previousViewportTop = prevViewportTop;
@@ -1270,7 +1248,7 @@ export class TUI extends Container {
         // Position hardware cursor for IME
         this.positionHardwareCursor(cursorPos, newLines.length);
         this.previousLines = newLines;
-        this.previousKittyImageIds = this.collectKittyImageIds(newLines);
+        this.previousKittyImageIds = this.lineResets.kittyImageIds;
         this.previousWidth = width;
         this.previousHeight = height;
     }