@psnext/slingcli 2.4.20260601-1 → 2.5.20260602-2

package/node_modules/@earendil-works/pi-tui/dist/terminal.js

@@ -10,6 +10,23 @@ const TERMINAL_PROGRESS_KEEPALIVE_MS = 1000;
 const TERMINAL_PROGRESS_ACTIVE_SEQUENCE = "\x1b]9;4;3\x07";
 const TERMINAL_PROGRESS_CLEAR_SEQUENCE = "\x1b]9;4;0;\x07";
 const APPLE_TERMINAL_SHIFT_ENTER_SEQUENCE = "\x1b[13;2u";
+const DESIRED_KITTY_KEYBOARD_PROTOCOL_FLAGS = 7;
+const KITTY_KEYBOARD_PROTOCOL_FALLBACK_TIMEOUT_MS = 150;
+const KEYBOARD_PROTOCOL_RESPONSE_FRAGMENT_TIMEOUT_MS = 150;
+const KITTY_KEYBOARD_PROTOCOL_QUERY = `\x1b[>${DESIRED_KITTY_KEYBOARD_PROTOCOL_FLAGS}u\x1b[?u\x1b[c`;
+export function parseKeyboardProtocolNegotiationSequence(sequence) {
+    const kittyFlags = sequence.match(/^\x1b\[\?(\d+)u$/);
+    if (kittyFlags) {
+        return { type: "kitty-flags", flags: Number.parseInt(kittyFlags[1], 10) };
+    }
+    if (/^\x1b\[\?[\d;]*c$/.test(sequence)) {
+        return { type: "device-attributes" };
+    }
+    return undefined;
+}
+function isKeyboardProtocolNegotiationSequencePrefix(sequence, allowBareEscapePrefix) {
+    return (allowBareEscapePrefix && sequence === "\x1b") || sequence === "\x1b[" || /^\x1b\[\?[\d;]*$/.test(sequence);
+}
 export function isAppleTerminalSession() {
     return process.platform === "darwin" && process.env.TERM_PROGRAM === "Apple_Terminal";
 }
@@ -27,6 +44,12 @@ export class ProcessTerminal {
     resizeHandler;
     _kittyProtocolActive = false;
     _modifyOtherKeysActive = false;
+    keyboardProtocolPushed = false;
+    keyboardProtocolNegotiationPending = false;
+    keyboardProtocolLateResponsePending = false;
+    keyboardProtocolNegotiationBuffer = "";
+    keyboardProtocolFallbackTimer;
+    keyboardProtocolBufferFlushTimer;
     stdinBuffer;
     stdinDataHandler;
     progressInterval;
@@ -88,30 +111,28 @@ export class ProcessTerminal {
      */
     setupStdinBuffer() {
         this.stdinBuffer = new StdinBuffer({ timeout: 10 });
-        // Kitty protocol response pattern: \x1b[?<flags>u
-        const kittyResponsePattern = /^\x1b\[\?(\d+)u$/;
         // Forward individual sequences to the input handler
         this.stdinBuffer.on("data", (sequence) => {
-            // Check for Kitty protocol response (only if not already enabled)
-            if (!this._kittyProtocolActive) {
-                const match = sequence.match(kittyResponsePattern);
-                if (match) {
-                    this._kittyProtocolActive = true;
-                    setKittyProtocolActive(true);
-                    // Enable Kitty keyboard protocol (push flags)
-                    // Flag 1 = disambiguate escape codes
-                    // Flag 2 = report event types (press/repeat/release)
-                    // Flag 4 = report alternate keys (shifted key, base layout key)
-                    // Base layout key enables shortcuts to work with non-Latin keyboard layouts
-                    process.stdout.write("\x1b[>7u");
-                    return; // Don't forward protocol response to TUI
+            if (this.keyboardProtocolNegotiationPending) {
+                const negotiationSequence = this.readKeyboardProtocolNegotiationSequence(sequence, true);
+                if (negotiationSequence === "pending") {
+                    return; // Wait for the rest of a split negotiation response.
+                }
+                if (this.handleKeyboardProtocolNegotiationSequence(negotiationSequence)) {
+                    return;
                 }
             }
-            if (this.inputHandler) {
-                const isAppleTerminal = sequence === "\r" && isAppleTerminalSession();
-                const input = normalizeAppleTerminalInput(sequence, isAppleTerminal, isAppleTerminal && isNativeModifierPressed("shift"));
-                this.inputHandler(input);
+            if (this.keyboardProtocolLateResponsePending) {
+                const negotiationSequence = this.readKeyboardProtocolNegotiationSequence(sequence, false);
+                if (negotiationSequence === "pending") {
+                    this.scheduleKeyboardProtocolNegotiationBufferFlush();
+                    return; // Wait for the rest of a split late negotiation response.
+                }
+                if (this.handleKeyboardProtocolNegotiationSequence(negotiationSequence)) {
+                    return;
+                }
             }
+            this.forwardInputSequence(sequence);
         });
         // Re-wrap paste content with bracketed paste markers for existing editor handling
         this.stdinBuffer.on("paste", (content) => {
@@ -125,29 +146,131 @@ export class ProcessTerminal {
         };
     }
     /**
-     * Query terminal for Kitty keyboard protocol support and enable if available.
-     *
-     * Sends CSI ? u to query current flags. If terminal responds with CSI ? <flags> u,
-     * it supports the protocol and we enable it with CSI > 1 u.
+     * Query terminal for Kitty keyboard protocol support and enable it if available.
      *
-     * If no Kitty response arrives shortly after startup, fall back to enabling
-     * xterm modifyOtherKeys mode 2. This is needed for tmux, which can forward
-     * modified enter keys as CSI-u when extended-keys is enabled, but may not
-     * answer the Kitty protocol query.
+     * Kitty's progressive enhancement detection requires requesting the desired
+     * flags before querying them. The trailing DA query is a sentinel supported by
+     * terminals that do not know Kitty keyboard protocol. A short timeout remains
+     * as a backup for terminals, PTYs, and SSH sessions that delay, split, or drop
+     * the DA response.
      *
-     * The response is detected in setupStdinBuffer's data handler, which properly
-     * handles the case where the response arrives split across multiple stdin events.
+     * The requested flags are:
+     * - 1 = disambiguate escape codes
+     * - 2 = report event types (press/repeat/release)
+     * - 4 = report alternate keys (shifted key, base layout key)
      */
     queryAndEnableKittyProtocol() {
         this.setupStdinBuffer();
         process.stdin.on("data", this.stdinDataHandler);
-        process.stdout.write("\x1b[?u");
-        setTimeout(() => {
-            if (!this._kittyProtocolActive && !this._modifyOtherKeysActive) {
-                process.stdout.write("\x1b[>4;2m");
-                this._modifyOtherKeysActive = true;
+        this.keyboardProtocolPushed = true;
+        this.keyboardProtocolNegotiationPending = true;
+        this.keyboardProtocolLateResponsePending = false;
+        this.clearKeyboardProtocolNegotiationBuffer();
+        process.stdout.write(KITTY_KEYBOARD_PROTOCOL_QUERY);
+        this.keyboardProtocolFallbackTimer = setTimeout(() => {
+            this.keyboardProtocolFallbackTimer = undefined;
+            this.keyboardProtocolNegotiationPending = false;
+            this.keyboardProtocolLateResponsePending = true;
+            if (this.keyboardProtocolNegotiationBuffer === "\x1b") {
+                this.flushKeyboardProtocolNegotiationBufferAsInput();
+            }
+            else {
+                this.scheduleKeyboardProtocolNegotiationBufferFlush();
+            }
+            this.enableModifyOtherKeys();
+        }, KITTY_KEYBOARD_PROTOCOL_FALLBACK_TIMEOUT_MS);
+    }
+    handleKeyboardProtocolNegotiationSequence(negotiationSequence) {
+        if (!negotiationSequence)
+            return false;
+        if (negotiationSequence.type === "kitty-flags") {
+            if (negotiationSequence.flags !== 0 && !this._kittyProtocolActive) {
+                this._kittyProtocolActive = true;
+                setKittyProtocolActive(true);
+                this.keyboardProtocolNegotiationPending = false;
+                this.keyboardProtocolLateResponsePending = true;
+                this.clearKeyboardProtocolNegotiationBuffer();
+                this.clearKeyboardProtocolFallbackTimer();
+            }
+            return true;
+        }
+        this.keyboardProtocolNegotiationPending = false;
+        this.keyboardProtocolLateResponsePending = true;
+        this.clearKeyboardProtocolNegotiationBuffer();
+        this.clearKeyboardProtocolFallbackTimer();
+        this.enableModifyOtherKeys();
+        return true;
+    }
+    readKeyboardProtocolNegotiationSequence(sequence, allowBareEscapePrefix) {
+        if (this.keyboardProtocolNegotiationBuffer) {
+            const bufferedSequence = this.keyboardProtocolNegotiationBuffer + sequence;
+            const negotiationSequence = parseKeyboardProtocolNegotiationSequence(bufferedSequence);
+            if (negotiationSequence) {
+                this.clearKeyboardProtocolNegotiationBuffer();
+                return negotiationSequence;
+            }
+            if (isKeyboardProtocolNegotiationSequencePrefix(bufferedSequence, allowBareEscapePrefix)) {
+                this.setKeyboardProtocolNegotiationBuffer(bufferedSequence);
+                return "pending";
             }
-        }, 150);
+            this.flushKeyboardProtocolNegotiationBufferAsInput();
+        }
+        const negotiationSequence = parseKeyboardProtocolNegotiationSequence(sequence);
+        if (negotiationSequence)
+            return negotiationSequence;
+        if (isKeyboardProtocolNegotiationSequencePrefix(sequence, allowBareEscapePrefix)) {
+            this.setKeyboardProtocolNegotiationBuffer(sequence);
+            return "pending";
+        }
+        return undefined;
+    }
+    setKeyboardProtocolNegotiationBuffer(sequence) {
+        this.clearKeyboardProtocolNegotiationBufferFlushTimer();
+        this.keyboardProtocolNegotiationBuffer = sequence;
+    }
+    clearKeyboardProtocolNegotiationBuffer() {
+        this.clearKeyboardProtocolNegotiationBufferFlushTimer();
+        this.keyboardProtocolNegotiationBuffer = "";
+    }
+    flushKeyboardProtocolNegotiationBufferAsInput() {
+        if (!this.keyboardProtocolNegotiationBuffer)
+            return;
+        const sequence = this.keyboardProtocolNegotiationBuffer;
+        this.clearKeyboardProtocolNegotiationBuffer();
+        this.forwardInputSequence(sequence);
+    }
+    scheduleKeyboardProtocolNegotiationBufferFlush() {
+        if (!this.keyboardProtocolNegotiationBuffer || this.keyboardProtocolBufferFlushTimer)
+            return;
+        this.keyboardProtocolBufferFlushTimer = setTimeout(() => {
+            this.keyboardProtocolBufferFlushTimer = undefined;
+            this.flushKeyboardProtocolNegotiationBufferAsInput();
+        }, KEYBOARD_PROTOCOL_RESPONSE_FRAGMENT_TIMEOUT_MS);
+    }
+    clearKeyboardProtocolNegotiationBufferFlushTimer() {
+        if (!this.keyboardProtocolBufferFlushTimer)
+            return;
+        clearTimeout(this.keyboardProtocolBufferFlushTimer);
+        this.keyboardProtocolBufferFlushTimer = undefined;
+    }
+    forwardInputSequence(sequence) {
+        if (!this.inputHandler)
+            return;
+        const isAppleTerminal = sequence === "\r" && isAppleTerminalSession();
+        const input = normalizeAppleTerminalInput(sequence, isAppleTerminal, isAppleTerminal && isNativeModifierPressed("shift"));
+        this.inputHandler(input);
+    }
+    enableModifyOtherKeys() {
+        if (this._kittyProtocolActive || this._modifyOtherKeysActive)
+            return;
+        process.stdout.write("\x1b[>4;2m");
+        this._modifyOtherKeysActive = true;
+    }
+    clearKeyboardProtocolFallbackTimer() {
+        if (!this.keyboardProtocolFallbackTimer)
+            return;
+        clearTimeout(this.keyboardProtocolFallbackTimer);
+        this.keyboardProtocolFallbackTimer = undefined;
     }
     /**
      * On Windows, add ENABLE_VIRTUAL_TERMINAL_INPUT (0x0200) to the stdin
@@ -188,13 +311,19 @@ export class ProcessTerminal {
         }
     }
     async drainInput(maxMs = 1000, idleMs = 50) {
-        if (this._kittyProtocolActive) {
+        const shouldDisableKittyProtocol = this.keyboardProtocolPushed || this._kittyProtocolActive || this.keyboardProtocolNegotiationPending;
+        this.keyboardProtocolLateResponsePending = false;
+        this.clearKeyboardProtocolNegotiationBuffer();
+        this.clearKeyboardProtocolFallbackTimer();
+        if (shouldDisableKittyProtocol) {
             // Disable Kitty keyboard protocol first so any late key releases
             // do not generate new Kitty escape sequences.
             process.stdout.write("\x1b[<u");
+            this.keyboardProtocolPushed = false;
             this._kittyProtocolActive = false;
             setKittyProtocolActive(false);
         }
+        this.keyboardProtocolNegotiationPending = false;
         if (this._modifyOtherKeysActive) {
             process.stdout.write("\x1b[>4;0m");
             this._modifyOtherKeysActive = false;
@@ -229,12 +358,18 @@ export class ProcessTerminal {
         }
         // Disable bracketed paste mode
         process.stdout.write("\x1b[?2004l");
+        const shouldDisableKittyProtocol = this.keyboardProtocolPushed || this._kittyProtocolActive || this.keyboardProtocolNegotiationPending;
+        this.keyboardProtocolLateResponsePending = false;
+        this.clearKeyboardProtocolNegotiationBuffer();
+        this.clearKeyboardProtocolFallbackTimer();
         // Disable Kitty keyboard protocol if not already done by drainInput()
-        if (this._kittyProtocolActive) {
+        if (shouldDisableKittyProtocol) {
             process.stdout.write("\x1b[<u");
+            this.keyboardProtocolPushed = false;
             this._kittyProtocolActive = false;
             setKittyProtocolActive(false);
         }
+        this.keyboardProtocolNegotiationPending = false;
         if (this._modifyOtherKeysActive) {
             process.stdout.write("\x1b[>4;0m");
             this._modifyOtherKeysActive = false;

package/node_modules/@earendil-works/pi-tui/dist/tui.js

@@ -118,6 +118,7 @@ export class TUI extends Container {
     // Overlay stack for modal components rendered on top of base content
     focusOrderCounter = 0;
     overlayStack = [];
+    overlayFocusRestore = { status: "inactive" };
     constructor(terminal, showHardwareCursor) {
         super();
         this.terminal = terminal;
@@ -152,16 +153,115 @@ export class TUI extends Container {
         this.clearOnShrink = enabled;
     }
     setFocus(component) {
-        // Clear focused flag on old component
+        this.setFocusInternal({ component, overlayFocusRestore: "clear" });
+    }
+    setFocusInternal({ component, overlayFocusRestore, }) {
+        const previousFocus = this.focusedComponent;
+        let nextFocus = component;
+        const previousFocusedOverlay = previousFocus
+            ? this.overlayStack.find((entry) => entry.component === previousFocus && this.isOverlayVisible(entry))
+            : undefined;
+        const nextFocusIsOverlay = nextFocus ? this.overlayStack.some((entry) => entry.component === nextFocus) : false;
+        const restoreState = this.getVisibleOverlayFocusRestore();
+        if (nextFocus && !nextFocusIsOverlay) {
+            if (restoreState.status === "blocked" && restoreState.blockedBy === previousFocus) {
+                if (restoreState.resume.status === "focus-target" || !this.isComponentMounted(restoreState.blockedBy)) {
+                    nextFocus = this.resolveBlockedOverlayFocusResume(restoreState);
+                }
+                else {
+                    this.overlayFocusRestore = {
+                        status: "blocked",
+                        overlay: restoreState.overlay,
+                        blockedBy: nextFocus,
+                        resume: restoreState.resume,
+                    };
+                }
+            }
+            else if (previousFocusedOverlay &&
+                restoreState.status !== "inactive" &&
+                restoreState.overlay === previousFocusedOverlay &&
+                !this.isOverlayFocusAncestor(previousFocusedOverlay, nextFocus)) {
+                this.overlayFocusRestore = {
+                    status: "blocked",
+                    overlay: previousFocusedOverlay,
+                    blockedBy: nextFocus,
+                    resume: { status: "restore-overlay" },
+                };
+            }
+        }
+        else if (nextFocus === null) {
+            if (restoreState.status === "blocked" && restoreState.blockedBy === previousFocus) {
+                nextFocus = this.resolveBlockedOverlayFocusResume(restoreState);
+            }
+            else if (overlayFocusRestore === "clear") {
+                this.clearOverlayFocusRestore();
+            }
+        }
         if (isFocusable(this.focusedComponent)) {
             this.focusedComponent.focused = false;
         }
-        this.focusedComponent = component;
-        // Set focused flag on new component
-        if (isFocusable(component)) {
-            component.focused = true;
+        this.focusedComponent = nextFocus;
+        if (isFocusable(nextFocus)) {
+            nextFocus.focused = true;
+        }
+        const focusedOverlay = nextFocus
+            ? this.overlayStack.find((entry) => entry.component === nextFocus && this.isOverlayVisible(entry))
+            : undefined;
+        if (focusedOverlay) {
+            this.overlayFocusRestore = { status: "eligible", overlay: focusedOverlay };
+        }
+    }
+    clearOverlayFocusRestore() {
+        this.overlayFocusRestore = { status: "inactive" };
+    }
+    clearOverlayFocusRestoreFor(overlay) {
+        if (this.overlayFocusRestore.status !== "inactive" && this.overlayFocusRestore.overlay === overlay) {
+            this.clearOverlayFocusRestore();
+        }
+    }
+    resolveBlockedOverlayFocusResume(restoreState) {
+        if (restoreState.resume.status === "restore-overlay")
+            return restoreState.overlay.component;
+        this.clearOverlayFocusRestore();
+        return restoreState.resume.target;
+    }
+    getVisibleOverlayFocusRestore() {
+        const restoreState = this.overlayFocusRestore;
+        if (restoreState.status === "inactive")
+            return restoreState;
+        if (!this.overlayStack.includes(restoreState.overlay) || !this.isOverlayVisible(restoreState.overlay)) {
+            return { status: "inactive" };
+        }
+        return restoreState;
+    }
+    isOverlayFocusAncestor(entry, component) {
+        const visited = new Set();
+        let current = entry.preFocus;
+        while (current && !visited.has(current)) {
+            visited.add(current);
+            if (current === component)
+                return true;
+            current = this.overlayStack.find((overlay) => overlay.component === current)?.preFocus ?? null;
+        }
+        return false;
+    }
+    retargetOverlayPreFocus(removed) {
+        for (const overlay of this.overlayStack) {
+            if (overlay !== removed && overlay.preFocus === removed.component) {
+                overlay.preFocus = removed.preFocus;
+            }
         }
     }
+    isComponentMounted(component) {
+        return this.children.some((child) => this.containsComponent(child, component));
+    }
+    containsComponent(root, target) {
+        if (root === target)
+            return true;
+        if (!(root instanceof Container))
+            return false;
+        return root.children.some((child) => this.containsComponent(child, target));
+    }
     /**
      * Show an overlay component with configurable positioning and sizing.
      * Returns a handle to control the overlay's visibility.
@@ -169,7 +269,7 @@ export class TUI extends Container {
     showOverlay(component, options) {
         const entry = {
             component,
-            options,
+            ...(options === undefined ? {} : { options }),
             preFocus: this.focusedComponent,
             hidden: false,
             focusOrder: ++this.focusOrderCounter,
@@ -186,6 +286,8 @@ export class TUI extends Container {
             hide: () => {
                 const index = this.overlayStack.indexOf(entry);
                 if (index !== -1) {
+                    this.clearOverlayFocusRestoreFor(entry);
+                    this.retargetOverlayPreFocus(entry);
                     this.overlayStack.splice(index, 1);
                     // Restore focus if this overlay had focus
                     if (this.focusedComponent === component) {
@@ -203,6 +305,7 @@ export class TUI extends Container {
                 entry.hidden = hidden;
                 // Update focus when hiding/showing
                 if (hidden) {
+                    this.clearOverlayFocusRestoreFor(entry);
                     // If this overlay had focus, move focus to next visible or preFocus
                     if (this.focusedComponent === component) {
                         const topVisible = this.getTopmostVisibleOverlay();
@@ -222,17 +325,39 @@ export class TUI extends Container {
             focus: () => {
                 if (!this.overlayStack.includes(entry) || !this.isOverlayVisible(entry))
                     return;
-                if (this.focusedComponent !== component) {
-                    this.setFocus(component);
-                }
                 entry.focusOrder = ++this.focusOrderCounter;
+                this.setFocus(component);
                 this.requestRender();
             },
-            unfocus: () => {
-                if (this.focusedComponent !== component)
+            unfocus: (unfocusOptions) => {
+                const isFocused = this.focusedComponent === component;
+                const restoreState = this.overlayFocusRestore;
+                const hasPendingRestore = restoreState.status !== "inactive" && restoreState.overlay === entry;
+                if (!isFocused && !hasPendingRestore)
+                    return;
+                if (restoreState.status === "blocked" &&
+                    restoreState.overlay === entry &&
+                    this.focusedComponent === restoreState.blockedBy) {
+                    if (unfocusOptions) {
+                        this.overlayFocusRestore = {
+                            status: "blocked",
+                            overlay: entry,
+                            blockedBy: restoreState.blockedBy,
+                            resume: { status: "focus-target", target: unfocusOptions.target },
+                        };
+                    }
+                    else {
+                        this.clearOverlayFocusRestore();
+                    }
+                    this.requestRender();
                     return;
-                const topVisible = this.getTopmostVisibleOverlay();
-                this.setFocus(topVisible && topVisible !== entry ? topVisible.component : entry.preFocus);
+                }
+                this.clearOverlayFocusRestoreFor(entry);
+                if (isFocused || unfocusOptions) {
+                    const topVisible = this.getTopmostVisibleOverlay();
+                    const fallbackTarget = topVisible && topVisible !== entry ? topVisible.component : entry.preFocus;
+                    this.setFocus(unfocusOptions ? unfocusOptions.target : fallbackTarget);
+                }
                 this.requestRender();
             },
             isFocused: () => this.focusedComponent === component,
@@ -240,9 +365,12 @@ export class TUI extends Container {
     }
     /** Hide the topmost overlay and restore previous focus. */
     hideOverlay() {
-        const overlay = this.overlayStack.pop();
+        const overlay = this.overlayStack[this.overlayStack.length - 1];
         if (!overlay)
             return;
+        this.clearOverlayFocusRestoreFor(overlay);
+        this.retargetOverlayPreFocus(overlay);
+        this.overlayStack.pop();
         if (this.focusedComponent === overlay.component) {
             // Find topmost visible overlay, or fall back to preFocus
             const topVisible = this.getTopmostVisibleOverlay();
@@ -265,16 +393,17 @@ export class TUI extends Container {
         }
         return true;
     }
-    /** Find the topmost visible capturing overlay, if any */
+    /** Find the visual-frontmost visible capturing overlay, if any */
     getTopmostVisibleOverlay() {
-        for (let i = this.overlayStack.length - 1; i >= 0; i--) {
-            if (this.overlayStack[i].options?.nonCapturing)
+        let topmost;
+        for (const overlay of this.overlayStack) {
+            if (overlay.options?.nonCapturing || !this.isOverlayVisible(overlay))
                 continue;
-            if (this.isOverlayVisible(this.overlayStack[i])) {
-                return this.overlayStack[i];
+            if (!topmost || overlay.focusOrder > topmost.focusOrder) {
+                topmost = overlay;
             }
         }
-        return undefined;
+        return topmost;
     }
     invalidate() {
         super.invalidate();
@@ -411,8 +540,23 @@ export class TUI extends Container {
                 this.setFocus(topVisible.component);
             }
             else {
-                // No visible overlays, restore to preFocus
-                this.setFocus(focusedOverlay.preFocus);
+                this.setFocusInternal({ component: focusedOverlay.preFocus, overlayFocusRestore: "preserve" });
+            }
+        }
+        const focusIsOverlay = this.overlayStack.some((o) => o.component === this.focusedComponent);
+        if (!focusIsOverlay) {
+            const restoreState = this.getVisibleOverlayFocusRestore();
+            if (restoreState.status === "eligible") {
+                this.setFocus(restoreState.overlay.component);
+            }
+            else if (restoreState.status === "blocked" && restoreState.blockedBy !== this.focusedComponent) {
+                if (restoreState.resume.status === "restore-overlay") {
+                    this.setFocus(restoreState.overlay.component);
+                }
+                else {
+                    this.clearOverlayFocusRestore();
+                    this.setFocus(restoreState.resume.target);
+                }
             }
         }
         // Pass input to focused component (including Ctrl+C)

package/node_modules/@earendil-works/pi-tui/dist/utils.js

@@ -604,7 +604,10 @@ export function wrapTextWithAnsi(text, width) {
     for (const inputLine of inputLines) {
         // Prepend active ANSI codes from previous lines (except for first line)
         const prefix = result.length > 0 ? tracker.getActiveCodes() : "";
-        result.push(...wrapSingleLine(prefix + inputLine, width));
+        const wrappedLines = wrapSingleLine(prefix + inputLine, width);
+        for (const wrappedLine of wrappedLines) {
+            result.push(wrappedLine);
+        }
         // Update tracker with codes from this line for next iteration
         updateTrackerFromText(inputLine, tracker);
     }
@@ -640,7 +643,9 @@ function wrapSingleLine(line, width) {
             }
             // Break long token - breakLongWord handles its own resets
             const broken = breakLongWord(token, width, tracker);
-            wrapped.push(...broken.slice(0, -1));
+            for (let i = 0; i < broken.length - 1; i++) {
+                wrapped.push(broken[i]);
+            }
             currentLine = broken[broken.length - 1];
             currentVisibleLength = visibleWidth(currentLine);
             continue;
@@ -679,7 +684,7 @@ function wrapSingleLine(line, width) {
     // Trailing whitespace can cause lines to exceed the requested width
     return wrapped.length > 0 ? wrapped.map((line) => line.trimEnd()) : [""];
 }
-const PUNCTUATION_REGEX = /[(){}[\]<>.,;:'"!?+\-=*/\\|&%^$#@~`]/;
+export const PUNCTUATION_REGEX = /[(){}[\]<>.,;:'"!?+\-=*/\\|&%^$#@~`]/;
 /**
  * Check if a character is whitespace.
  */

package/node_modules/@earendil-works/pi-tui/dist/word-navigation.js

@@ -0,0 +1,96 @@
+import { getWordSegmenter, isWhitespaceChar, PUNCTUATION_REGEX } from "./utils.js";
+const wordSegmenter = getWordSegmenter();
+/**
+ * Find the cursor position after moving one word backward from `cursor` in `text`.
+ * Skips trailing whitespace, then stops at the next word/punctuation boundary.
+ *
+ * Pure function - does not mutate any state.
+ */
+export function findWordBackward(text, cursor, options) {
+    if (cursor <= 0)
+        return 0;
+    const textBeforeCursor = text.slice(0, cursor);
+    const segmentFn = options?.segment;
+    const isAtomic = options?.isAtomicSegment;
+    const segments = segmentFn ? [...segmentFn(textBeforeCursor)] : [...wordSegmenter.segment(textBeforeCursor)];
+    let newCursor = cursor;
+    // Skip trailing whitespace
+    while (segments.length > 0 &&
+        !isAtomic?.(segments[segments.length - 1]?.segment || "") &&
+        isWhitespaceChar(segments[segments.length - 1]?.segment || "")) {
+        newCursor -= segments.pop()?.segment.length || 0;
+    }
+    if (segments.length === 0)
+        return newCursor;
+    const last = segments[segments.length - 1];
+    if (isAtomic?.(last.segment)) {
+        // Skip one atomic segment.
+        newCursor -= last.segment.length;
+    }
+    else if (last.isWordLike) {
+        // Skip inside one word-like segment, preserving ASCII punctuation boundaries.
+        const segment = last.segment;
+        const matches = [...segment.matchAll(new RegExp(PUNCTUATION_REGEX, "g"))];
+        if (matches.length <= 0) {
+            newCursor -= segment.length;
+        }
+        else {
+            const lastMatch = matches[matches.length - 1];
+            newCursor -= segment.length - (lastMatch.index + lastMatch[0].length);
+        }
+    }
+    else {
+        // Skip non-word non-whitespace run (punctuation)
+        while (segments.length > 0 &&
+            !isAtomic?.(segments[segments.length - 1]?.segment || "") &&
+            !segments[segments.length - 1]?.isWordLike &&
+            !isWhitespaceChar(segments[segments.length - 1]?.segment || "")) {
+            newCursor -= segments.pop()?.segment.length || 0;
+        }
+    }
+    return newCursor;
+}
+/**
+ * Find the cursor position after moving one word forward from `cursor` in `text`.
+ * Skips leading whitespace, then stops at the next word/punctuation boundary.
+ *
+ * Pure function - does not mutate any state.
+ */
+export function findWordForward(text, cursor, options) {
+    if (cursor >= text.length)
+        return text.length;
+    const textAfterCursor = text.slice(cursor);
+    const segmentFn = options?.segment;
+    const isAtomic = options?.isAtomicSegment;
+    const segments = segmentFn ? segmentFn(textAfterCursor) : wordSegmenter.segment(textAfterCursor);
+    const iterator = segments[Symbol.iterator]();
+    let next = iterator.next();
+    let newCursor = cursor;
+    // Skip leading whitespace
+    while (!next.done && !isAtomic?.(next.value.segment) && isWhitespaceChar(next.value.segment)) {
+        newCursor += next.value.segment.length;
+        next = iterator.next();
+    }
+    if (next.done)
+        return newCursor;
+    if (isAtomic?.(next.value.segment)) {
+        // Skip one atomic segment.
+        newCursor += next.value.segment.length;
+    }
+    else if (next.value.isWordLike) {
+        // Skip inside one word-like segment, preserving ASCII punctuation boundaries.
+        newCursor += PUNCTUATION_REGEX.exec(next.value.segment)?.index ?? next.value.segment.length;
+    }
+    else {
+        // Skip non-word non-whitespace run (punctuation)
+        while (!next.done &&
+            !isAtomic?.(next.value.segment) &&
+            !next.value.isWordLike &&
+            !isWhitespaceChar(next.value.segment)) {
+            newCursor += next.value.segment.length;
+            next = iterator.next();
+        }
+    }
+    return newCursor;
+}
+//# sourceMappingURL=word-navigation.js.map