@code-yeongyu/senpi-tui 2026.9.29 → 2026.10.1-2

package/dist/terminal.js

@@ -188,6 +188,8 @@ export class ProcessTerminal {
         this._kittyProtocolActive = false;
         this._modifyOtherKeysActive = false;
         this.keyboardProtocolPushed = false;
+        /** DA1 replies owed to keyboard protocol queries. Later DA1 replies answer other queries and are forwarded. */
+        this.pendingKeyboardProtocolDeviceAttributes = 0;
         this.keyboardProtocolNegotiationBuffer = "";
         this.discardingPrivateResponse = false;
         this.writeLogPath = (() => {
@@ -399,15 +401,15 @@ export class ProcessTerminal {
                     return;
                 }
             }
-            const negotiationSequence = this.readKeyboardProtocolNegotiationSequence(sequence);
-            if (negotiationSequence === "pending") {
+            const negotiation = this.readKeyboardProtocolNegotiationSequence(sequence);
+            if (negotiation === "pending") {
                 this.scheduleKeyboardProtocolNegotiationBufferFlush();
                 return; // Wait briefly for the rest of a split Kitty response.
             }
-            if (this.handleKeyboardProtocolNegotiationSequence(negotiationSequence)) {
+            if (negotiation && this.handleKeyboardProtocolNegotiationSequence(negotiation.parsed)) {
                 return;
             }
-            this.forwardInputSequence(sequence);
+            this.forwardInputSequence(negotiation?.sequence ?? sequence);
         });
         // Re-wrap paste content with bracketed paste markers for existing editor handling
         this.stdinBuffer.on("paste", (content) => {
@@ -443,12 +445,11 @@ export class ProcessTerminal {
             this.enableModifyOtherKeys();
         }
         this.keyboardProtocolPushed = true;
+        this.pendingKeyboardProtocolDeviceAttributes += 1;
         this.clearKeyboardProtocolNegotiationBuffer();
         this.rawWrite(KITTY_KEYBOARD_PROTOCOL_QUERY);
     }
     handleKeyboardProtocolNegotiationSequence(negotiationSequence) {
-        if (!negotiationSequence)
-            return false;
         this.clearKeyboardProtocolNegotiationBuffer();
         if (negotiationSequence.type === "cursor-position") {
             if (this.cursorQuery?.issued && this.cursorQuery.tmuxPane === undefined) {
@@ -457,6 +458,11 @@ export class ProcessTerminal {
             }
             return true;
         }
+        if (negotiationSequence.type === "device-attributes") {
+            if (this.pendingKeyboardProtocolDeviceAttributes === 0)
+                return false;
+            this.pendingKeyboardProtocolDeviceAttributes -= 1;
+        }
         this.keyboardNegotiationSettled = true;
         this.issueCursorQuery();
         if (negotiationSequence.type === "kitty-flags") {
@@ -477,13 +483,14 @@ export class ProcessTerminal {
         }
         return true;
     }
+    /** Returns the parsed negotiation reply with its full (possibly reassembled) sequence. */
     readKeyboardProtocolNegotiationSequence(sequence) {
         if (this.keyboardProtocolNegotiationBuffer) {
             const bufferedSequence = this.keyboardProtocolNegotiationBuffer + sequence;
             const negotiationSequence = parseKeyboardProtocolNegotiationSequence(bufferedSequence);
             if (negotiationSequence) {
                 this.clearKeyboardProtocolNegotiationBuffer();
-                return negotiationSequence;
+                return { parsed: negotiationSequence, sequence: bufferedSequence };
             }
             if (isKeyboardProtocolNegotiationSequencePrefix(bufferedSequence)) {
                 this.setKeyboardProtocolNegotiationBuffer(bufferedSequence);
@@ -493,7 +500,7 @@ export class ProcessTerminal {
         }
         const negotiationSequence = parseKeyboardProtocolNegotiationSequence(sequence);
         if (negotiationSequence)
-            return negotiationSequence;
+            return { parsed: negotiationSequence, sequence };
         if (isKeyboardProtocolNegotiationSequencePrefix(sequence)) {
             this.setKeyboardProtocolNegotiationBuffer(sequence);
             return "pending";

package/dist/tui-alt-screen.d.ts

@@ -1,8 +1,12 @@
 import type { Terminal } from "./terminal.ts";
 import { type Component, TuiBase, type TuiStopOptions, VIEWPORT_TUI, type ViewportTUI } from "./tui.ts";
+import { type WheelScrollLines } from "./wheel-scroll.ts";
 export interface TuiAltScreenOptions {
-    /** Number of logical lines moved for each mouse-wheel event. */
-    wheelScrollLines?: number;
+    /**
+     * Logical lines moved for each mouse-wheel event (default: 1). `"auto"` accelerates fast wheel
+     * spins on terminals that send one event per notch. Alt+wheel moves five times as far.
+     */
+    wheelScrollLines?: WheelScrollLines;
     /** Capture mouse events for viewport scrolling and application-owned text selection. */
     mouse?: boolean;
     /** Style a non-current transcript search match. */
@@ -23,10 +27,11 @@ export interface TuiAltScreenOptions {
     /** Automatically copy selected text to the clipboard on mouse release (default: true). */
     copyOnSelect?: boolean;
     /**
-     * Copy selected text to the system clipboard. Return `true` on success; the caller flashes
-     * an error otherwise. When omitted, the selection is copied via an OSC 52 write.
+     * Copy selected text to the system clipboard. Return `true` on success, an error message to
+     * display on failure, or `false` for a generic error. When omitted, the selection is copied
+     * via an OSC 52 write.
      */
-    copySelection?: (text: string) => Promise<boolean>;
+    copySelection?: (text: string) => Promise<boolean | string>;
 }
 /** Alternate-screen TUI with a scrollable, application-owned viewport. */
 export declare class TuiAltScreen extends TuiBase implements ViewportTUI {
@@ -65,7 +70,7 @@ export declare class TuiAltScreen extends TuiBase implements ViewportTUI {
     private mousePressPoint?;
     private mousePressMoved;
     private lastComponentClick?;
-    private readonly wheelScrollLines;
+    private readonly wheelScroll;
     private readonly mouseEnabled;
     private readonly searchMatchStyle;
     private readonly searchCurrentMatchStyle;
@@ -78,6 +83,7 @@ export declare class TuiAltScreen extends TuiBase implements ViewportTUI {
     constructor(terminal: Terminal, showHardwareCursor?: boolean, logDirectory?: string, options?: TuiAltScreenOptions);
     get viewportTop(): number;
     get isFollowingOutput(): boolean;
+    setWheelScrollLines(lines: WheelScrollLines): void;
     getCopyOnSelect(): boolean;
     setCopyOnSelect(enabled: boolean): void;
     /** Whether the fullscreen viewport has a non-empty active text selection. */
@@ -119,7 +125,6 @@ export declare class TuiAltScreen extends TuiBase implements ViewportTUI {
     private clearTextSelection;
     private handleMouseEvent;
     private parseWheelEvent;
-    private getWheelScrollLines;
     private routeWheel;
     private parseSgrMouseEvent;
     private handleRightClickPaste;

package/dist/tui-alt-screen.js

@@ -10,6 +10,7 @@ import { decodeMouseButton, isMouseSequence, parseSgrMouseEvent, parseWheelEvent
 import { deleteAllKittyImages, deleteAllKittyPlacements, deleteKittyImage, getCapabilities, getKittyImagePlacement, isImageLine, setCapabilities, } from "./terminal-image.js";
 import { Container, CURSOR_MARKER, compositeTuiLine, dispatchMouseEvent, retargetMouseEvent, TuiBase, VIEWPORT_TUI, } from "./tui.js";
 import { extractAnsiCode, getGraphemeCellRange, getOsc8LinkAtColumn, getWordSegmenter, sliceByColumn, stripTerminalSequences, truncateToWidth, visibleWidth, } from "./utils.js";
+import { WheelScrollAccelerator } from "./wheel-scroll.js";
 const ENTER_ALT_SCREEN = "\x1b[?1049h";
 const EXIT_ALT_SCREEN = "\x1b[?1049l";
 const DISABLE_AUTOWRAP = "\x1b[?7l";
@@ -29,6 +30,7 @@ const MAX_CACHED_OFFSCREEN_KITTY_IMAGES = 16;
 const MAX_CACHED_OFFSCREEN_KITTY_TRANSMISSION_BYTES = 32 * 1024 * 1024;
 const MAX_CACHED_OFFSCREEN_KITTY_DECODED_BYTES = 64 * 1024 * 1024;
 const DOUBLE_CLICK_INTERVAL_MS = 500;
+const COPY_ERROR_FLASH_DURATION_MS = 5000;
 // Regular mode delegates double-click selection to the terminal emulator. Fullscreen owns mouse selection,
 // so mirror common terminal word-selection behavior by keeping paths and kebab-case tokens whole.
 const TERMINAL_WORD_SELECTION_JOINERS = new Set(["/", "-"]);
@@ -62,7 +64,7 @@ export class TuiAltScreen extends TuiBase {
         };
         this.implicitScrollView = new ScrollView(this.implicitDocument, { follow: "end", primary: true });
         this.flashes = new AltScreenFlashContainer(() => this.requestRender());
-        this.wheelScrollLines = Math.max(1, Math.floor(options.wheelScrollLines ?? 1));
+        this.wheelScroll = new WheelScrollAccelerator(options.wheelScrollLines ?? 1);
         this.mouseEnabled = options.mouse ?? true;
         this.searchMatchStyle = options.searchMatchStyle ?? ((text) => `\x1b[4m${text}\x1b[24m`);
         this.searchCurrentMatchStyle = options.searchCurrentMatchStyle ?? ((text) => `\x1b[1;7m${text}\x1b[22;27m`);
@@ -80,6 +82,9 @@ export class TuiAltScreen extends TuiBase {
     get isFollowingOutput() {
         return this.getPrimaryScrollView().isFollowingEnd;
     }
+    setWheelScrollLines(lines) {
+        this.wheelScroll.setLines(lines);
+    }
     getCopyOnSelect() {
         return this.copyOnSelect;
     }
@@ -459,9 +464,10 @@ export class TuiAltScreen extends TuiBase {
             return { consume: true };
         const wheelEvent = this.parseWheelEvent(data);
         if (wheelEvent) {
-            const event = this.createMouseEvent("wheel", wheelEvent.button, wheelEvent.x, wheelEvent.y, {
-                wheelDelta: wheelEvent.direction * this.getWheelScrollLines(wheelEvent.button),
-            });
+            const lines = this.wheelScroll.next(wheelEvent.direction, performance.now());
+            // SGR mouse button codes use bit 3 (value 8) for the Alt modifier.
+            const wheelDelta = wheelEvent.direction * ((wheelEvent.button & 8) !== 0 ? lines * ALT_WHEEL_SCROLL_MULTIPLIER : lines);
+            const event = this.createMouseEvent("wheel", wheelEvent.button, wheelEvent.x, wheelEvent.y, { wheelDelta });
             const overlay = this.dispatchMouseToOverlay(event);
             const result = overlay.result ?? (overlay.hit ? undefined : this.dispatchMouseToLayout(event));
             if (result) {
@@ -471,7 +477,7 @@ export class TuiAltScreen extends TuiBase {
             }
             if (this.shouldDeferViewportInputToOverlay())
                 return undefined;
-            this.routeWheel(wheelEvent);
+            this.routeWheel(wheelEvent, wheelDelta);
             return { consume: true };
         }
         const mouseEvent = this.parseSgrMouseEvent(data);
@@ -721,12 +727,8 @@ export class TuiAltScreen extends TuiBase {
     parseWheelEvent(data) {
         return parseWheelEvent(data);
     }
-    getWheelScrollLines(button) {
-        // SGR mouse button codes use bit 3 (value 8) for the Alt modifier.
-        return (button & 8) !== 0 ? this.wheelScrollLines * ALT_WHEEL_SCROLL_MULTIPLIER : this.wheelScrollLines;
-    }
-    routeWheel(event) {
-        let remaining = event.direction * this.getWheelScrollLines(event.button);
+    routeWheel(event, delta) {
+        let remaining = delta;
         const seen = new Set();
         for (const scrollView of this.currentLayout ? getScrollViewsAt(this.currentLayout, event.x, event.y) : []) {
             seen.add(scrollView);
@@ -1153,8 +1155,9 @@ export class TuiAltScreen extends TuiBase {
         // "Copied!" while leaving the system clipboard untouched (e.g. macOS Terminal.app, tmux
         // without OSC 52 clipboard passthrough), so only report success when it actually copies.
         if (this.copySelection) {
-            const ok = await this.copySelection(text);
-            this.flash(ok ? "Copied!" : "Copy failed");
+            const result = await this.copySelection(text);
+            const ok = result === true;
+            this.flash(ok ? "Copied!" : typeof result === "string" ? result : "Copy failed", ok ? undefined : COPY_ERROR_FLASH_DURATION_MS);
             return ok;
         }
         this.terminal.write(`\x1b]52;c;${Buffer.from(text).toString("base64")}\x07`);
@@ -1329,12 +1332,15 @@ export class TuiAltScreen extends TuiBase {
         if (row >= screen.length || isImageLine(screen[row] ?? ""))
             return screen;
         const scrollbarColumn = box ? getScrollbarGeometry(box)?.column : undefined;
-        const availableWidth = Math.max(0, (scrollbarColumn ?? clip.x + clip.width) - clip.x);
-        const text = truncateToWidth(this.scrollToEndIndicator(), availableWidth, "");
+        const label = truncateToWidth(this.scrollToEndIndicator(), clip.width, "");
+        const labelWidth = visibleWidth(label);
+        const column = clip.x + Math.floor((clip.width - labelWidth) / 2);
+        const rightEdge = scrollbarColumn ?? clip.x + clip.width;
+        const availableWidth = Math.max(0, rightEdge - column);
+        const text = truncateToWidth(label, availableWidth, "");
         const textWidth = visibleWidth(text);
         if (textWidth === 0)
             return screen;
-        const column = clip.x + Math.floor((availableWidth - textWidth) / 2);
         const result = [...screen];
         result[row] = compositeTuiLine(result[row] ?? "", text, column, textWidth, width);
         this.scrollToEndIndicatorRect = { row, column, width: textWidth };
@@ -1402,10 +1408,24 @@ export class TuiAltScreen extends TuiBase {
                 buffer += deleteAllKittyPlacements();
         }
         buffer += preparedKittyScreen.evictedImageDeletion;
+        // WezTerm erases intersecting Kitty image cells when a later EL clears a covered row.
+        // Only separate clearing from drawing for WezTerm frames that place images; preserve the
+        // existing interleaved output for text-only frames and every other terminal.
+        const clearRowsBeforeKittyImages = redrawImages &&
+            this.imageProtocol === "kitty" &&
+            screen.some(isImageLine) &&
+            (Boolean(process.env.WEZTERM_PANE) || process.env.TERM_PROGRAM?.toLowerCase() === "wezterm");
+        if (clearRowsBeforeKittyImages) {
+            for (let row = 0; row < height; row++) {
+                if (!fullRedraw && !imagesNeedRedraw && screen[row] === this.previousScreen[row])
+                    continue;
+                buffer += `\x1b[${row + 1};1H\x1b[2K`;
+            }
+        }
         for (let row = 0; row < height; row++) {
             if (!fullRedraw && !imagesNeedRedraw && screen[row] === this.previousScreen[row])
                 continue;
-            buffer += `\x1b[${row + 1};1H\x1b[2K${preparedKittyScreen.lines[row] ?? ""}`;
+            buffer += `\x1b[${row + 1};1H${clearRowsBeforeKittyImages ? "" : "\x1b[2K"}${preparedKittyScreen.lines[row] ?? ""}`;
         }
         if (cursorPos) {
             buffer += `\x1b[${cursorPos.row + 1};${Math.min(width, cursorPos.col) + 1}H`;

package/dist/tui.d.ts

@@ -2,7 +2,7 @@
  * Minimal TUI implementation with differential rendering
  */
 import type { Terminal } from "./terminal.ts";
-import { type RgbColor, type TerminalColorScheme } from "./terminal-colors.ts";
+import { type TerminalColorScheme, type TerminalColors } from "./terminal-colors.ts";
 import { visibleWidth } from "./utils.ts";
 /**
  * Component interface - all components must implement this
@@ -282,8 +282,11 @@ export declare abstract class TuiBase extends Container {
     private muxViewportRepaintCount;
     private overWideCrashDumpWritten;
     protected stopped: boolean;
-    private pendingOsc11BackgroundReplies;
-    private pendingOsc11BackgroundQueries;
+    /**
+     * Color queries waiting for their DA1 reply, oldest first. Terminals answer in order, so color
+     * replies belong to the oldest one. Queries stay here after a timeout to collect late replies.
+     */
+    private pendingTerminalColorQueries;
     private terminalColorSchemeListeners;
     private terminalColorSchemeNotificationsEnabled;
     /** Directory for debug/crash logs. The fork keeps a concrete default (`~/.senpi/agent`) so PI_DEBUG_REDRAW and crash dumps stay in the agent directory. */
@@ -401,7 +404,9 @@ export declare abstract class TuiBase extends Container {
     private scheduleRender;
     private commitExpeditedRender;
     private handleTerminalInput;
-    private consumeOsc11BackgroundResponse;
+    private consumeTerminalColorResponse;
+    private terminalColorQueryResult;
+    private completeTerminalColorQuery;
     private consumeTerminalColorSchemeReport;
     private consumeCellSizeResponse;
     /**
@@ -468,21 +473,17 @@ export declare abstract class TuiBase extends Container {
     private finishFrame;
     private positionHardwareCursor;
     /**
-     * Query the terminal's default background color with OSC 11 (`ESC ] 11 ; ? BEL`).
-     * @param timeoutMs Query timeout in milliseconds.
-     * @returns Promise containing the parsed RGB color, or undefined if it times out or fails to parse.
-     */
-    queryTerminalBackgroundColor({ timeoutMs }: {
-        timeoutMs: number;
-    }): Promise<RgbColor | undefined>;
-    /**
-     * Query the terminal's color-scheme preference with DSR (`CSI ? 996 n`).
-     * Terminals that support the color palette notification protocol reply with
-     * `CSI ? 997 ; 1 n` for dark or `CSI ? 997 ; 2 n` for light.
+     * Query the terminal's theme colors: the default foreground (OSC 10), the default background
+     * (OSC 11), and ANSI colors 0-15 (OSC 4), followed by a DA1 request that marks the end of the
+     * replies. Resolves when the DA1 reply or all color replies arrive, or when the timeout expires.
+     * Colors the terminal did not report are undefined; the palette is only set when all 16 arrived.
+     * @param timeoutMs Query timeout in milliseconds, for terminals that do not answer DA1 either.
+     * @param onLateReply Receives the replies if the query completes after the timeout, e.g. over slow links.
      */
-    queryTerminalColorScheme({ timeoutMs }: {
+    queryTerminalColors({ timeoutMs, onLateReply, }: {
         timeoutMs: number;
-    }): Promise<TerminalColorScheme | undefined>;
+        onLateReply?: (colors: TerminalColors) => void;
+    }): Promise<TerminalColors>;
 }
 /** Legacy main-screen renderer export. */
 export declare class TUI extends TuiBase {

package/dist/tui.js

@@ -7,7 +7,7 @@ import * as path from "node:path";
 import { performance } from "node:perf_hooks";
 import { isKeyRelease, matchesKey } from "./keys.js";
 import { isMultiplexerSession, useLegacyMuxRender, viewportRenderEnabled } from "./mux.js";
-import { isOsc11BackgroundColorResponse, parseOsc11BackgroundColor, parseTerminalColorSchemeReport, } from "./terminal-colors.js";
+import { parseOscColorResponse, parseTerminalColorSchemeReport, } from "./terminal-colors.js";
 import { deleteKittyImage, getCapabilities, isImageLine, resetCapabilitiesCache, setCellDimensions, } from "./terminal-image.js";
 import { consumeTmuxFocusEvent, DISABLE_FOCUS_REPORTING, ENABLE_FOCUS_REPORTING } from "./tmux-focus.js";
 import { extractSegments, normalizeTerminalOutput, sliceByColumn, sliceWithWidth, visibleWidth } from "./utils.js";
@@ -68,8 +68,13 @@ export function dispatchMouseEvent(component, event) {
     const result = component.handleMouse?.(event);
     if (!result)
         return undefined;
-    if ("target" in result)
-        return result;
+    if ("target" in result) {
+        // The component forwarded the event to a child it hosts. Like a delegating container, it routes
+        // keys to that child itself, so it keeps keyboard focus. Focusing the child directly would leave
+        // focus on a detached component once the host removes it, e.g. a closed settings submenu.
+        const forwarded = result;
+        return forwarded.focus && component.handleInput ? { ...forwarded, focusTarget: component } : forwarded;
+    }
     if (!result.handled && !result.capture && !result.focus)
         return undefined;
     return {
@@ -95,6 +100,16 @@ export function retargetMouseEvent(event, target) {
         height: target.height,
     };
 }
+const TERMINAL_PALETTE_SIZE = 16;
+/** OSC 10 and 11 plus OSC 4 for every palette color. */
+const TERMINAL_COLOR_REPLY_COUNT = 2 + TERMINAL_PALETTE_SIZE;
+/**
+ * Default colors, palette colors 0-15, and a trailing primary device attributes (DA1) request.
+ * Every terminal answers DA1 and terminals answer in order, so the DA1 reply marks the end of
+ * the color replies, including for terminals that ignore the color queries.
+ */
+const TERMINAL_COLOR_QUERY = `\x1b]10;?\x07\x1b]11;?\x07${Array.from({ length: TERMINAL_PALETTE_SIZE }, (_, index) => `\x1b]4;${index};?\x07`).join("")}\x1b[c`;
+const DEVICE_ATTRIBUTES_RESPONSE_PATTERN = /^\x1b\[\?[\d;]*c$/;
 /** Type guard to check if a component implements Focusable */
 export function isFocusable(component) {
     return component !== null && "focused" in component;
@@ -422,8 +437,11 @@ export class TuiBase extends Container {
         this.muxViewportRepaintCount = 0;
         this.overWideCrashDumpWritten = false;
         this.stopped = false;
-        this.pendingOsc11BackgroundReplies = 0;
-        this.pendingOsc11BackgroundQueries = [];
+        /**
+         * Color queries waiting for their DA1 reply, oldest first. Terminals answer in order, so color
+         * replies belong to the oldest one. Queries stay here after a timeout to collect late replies.
+         */
+        this.pendingTerminalColorQueries = [];
         this.terminalColorSchemeListeners = new Set();
         this.terminalColorSchemeNotificationsEnabled = false;
         // Overlay stack for modal components rendered on top of base content
@@ -1075,7 +1093,10 @@ export class TuiBase extends Container {
         this.lastRenderAt = performance.now();
         this.doRender();
     }
+    /** After stop(), the shell owns the cursor and it must stay visible, so only a running TUI hides it. */
     #setCursorVisibility(visible) {
+        if (!visible && this.stopped)
+            return;
         if (this.#lastCursorVisibility === visible)
             return;
         if (visible) {
@@ -1191,7 +1212,7 @@ export class TuiBase extends Container {
                 data = focus.data;
             }
         }
-        if (this.consumeOsc11BackgroundResponse(data)) {
+        if (this.consumeTerminalColorResponse(data)) {
             return;
         }
         if (this.consumeTerminalColorSchemeReport(data)) {
@@ -1262,27 +1283,50 @@ export class TuiBase extends Container {
             this.requestRender(false, "input");
         }
     }
-    consumeOsc11BackgroundResponse(data) {
-        if (this.pendingOsc11BackgroundReplies <= 0) {
+    consumeTerminalColorResponse(data) {
+        const query = this.pendingTerminalColorQueries[0];
+        if (!query) {
             return false;
         }
-        if (!isOsc11BackgroundColorResponse(data)) {
+        if (DEVICE_ATTRIBUTES_RESPONSE_PATTERN.test(data)) {
+            this.pendingTerminalColorQueries.shift();
+            this.completeTerminalColorQuery(query);
+            return true;
+        }
+        const response = parseOscColorResponse(data);
+        if (!response) {
             return false;
         }
-        const rgb = parseOsc11BackgroundColor(data);
-        this.pendingOsc11BackgroundReplies -= 1;
-        const query = this.pendingOsc11BackgroundQueries.shift();
-        if (query && !query.settled) {
-            query.settled = true;
-            if (query.timer) {
-                clearTimeout(query.timer);
-                query.timer = undefined;
-            }
-            query.resolve?.(rgb);
-            query.resolve = undefined;
+        const { target, rgb } = response;
+        const key = String(target);
+        if (!query.deliver || query.replied.has(key)) {
+            return true;
+        }
+        query.replied.add(key);
+        if (target === "foreground") {
+            query.foreground = rgb;
+        }
+        else if (target === "background") {
+            query.background = rgb;
+        }
+        else if (target < TERMINAL_PALETTE_SIZE) {
+            query.palette[target] = rgb;
+        }
+        if (query.replied.size === TERMINAL_COLOR_REPLY_COUNT) {
+            this.completeTerminalColorQuery(query);
         }
         return true;
     }
+    terminalColorQueryResult(query) {
+        const palette = query.palette.every((color) => color !== undefined) ? query.palette : undefined;
+        return { foreground: query.foreground, background: query.background, palette };
+    }
+    completeTerminalColorQuery(query) {
+        const deliver = query.deliver;
+        query.deliver = undefined;
+        clearTimeout(query.timer);
+        deliver?.(this.terminalColorQueryResult(query));
+    }
     consumeTerminalColorSchemeReport(data) {
         const scheme = parseTerminalColorSchemeReport(data);
         if (!scheme) {
@@ -2403,55 +2447,28 @@ export class TuiBase extends Container {
             this.terminal.write(TUI.FRAME_BEGIN + buffer + TUI.FRAME_END);
     }
     /**
-     * Query the terminal's default background color with OSC 11 (`ESC ] 11 ; ? BEL`).
-     * @param timeoutMs Query timeout in milliseconds.
-     * @returns Promise containing the parsed RGB color, or undefined if it times out or fails to parse.
+     * Query the terminal's theme colors: the default foreground (OSC 10), the default background
+     * (OSC 11), and ANSI colors 0-15 (OSC 4), followed by a DA1 request that marks the end of the
+     * replies. Resolves when the DA1 reply or all color replies arrive, or when the timeout expires.
+     * Colors the terminal did not report are undefined; the palette is only set when all 16 arrived.
+     * @param timeoutMs Query timeout in milliseconds, for terminals that do not answer DA1 either.
+     * @param onLateReply Receives the replies if the query completes after the timeout, e.g. over slow links.
      */
-    queryTerminalBackgroundColor({ timeoutMs }) {
+    queryTerminalColors({ timeoutMs, onLateReply, }) {
         return new Promise((resolve) => {
             const query = {
-                settled: false,
-                resolve,
+                palette: Array.from({ length: TERMINAL_PALETTE_SIZE }, () => undefined),
+                replied: new Set(),
+                deliver: resolve,
                 timer: undefined,
             };
+            // Resolve with the replies so far, and keep collecting late replies for `onLateReply`.
             query.timer = setTimeout(() => {
-                if (query.settled) {
-                    return;
-                }
-                query.settled = true;
-                query.timer = undefined;
-                query.resolve?.(undefined);
-                query.resolve = undefined;
+                query.deliver = onLateReply;
+                resolve(this.terminalColorQueryResult(query));
             }, timeoutMs);
-            this.pendingOsc11BackgroundQueries.push(query);
-            this.pendingOsc11BackgroundReplies += 1;
-            this.terminal.write("\x1b]11;?\x07");
-        });
-    }
-    /**
-     * Query the terminal's color-scheme preference with DSR (`CSI ? 996 n`).
-     * Terminals that support the color palette notification protocol reply with
-     * `CSI ? 997 ; 1 n` for dark or `CSI ? 997 ; 2 n` for light.
-     */
-    queryTerminalColorScheme({ timeoutMs }) {
-        return new Promise((resolve) => {
-            let settled = false;
-            let timer;
-            let unsubscribe = () => { };
-            const settle = (scheme) => {
-                if (settled)
-                    return;
-                settled = true;
-                if (timer) {
-                    clearTimeout(timer);
-                    timer = undefined;
-                }
-                unsubscribe();
-                resolve(scheme);
-            };
-            unsubscribe = this.onTerminalColorSchemeChange(settle);
-            timer = setTimeout(() => settle(undefined), timeoutMs);
-            this.terminal.write("\x1b[?996n");
+            this.pendingTerminalColorQueries.push(query);
+            this.terminal.write(TERMINAL_COLOR_QUERY);
         });
     }
 }

package/dist/utils.d.ts

@@ -15,6 +15,9 @@ interface WidthCacheStats {
 }
 export declare function __widthCacheStats(): WidthCacheStats | undefined;
 export declare const cjkBreakRegex: RegExp;
+export declare const cjkPunctuationRegex: RegExp;
+export declare const autocompleteSeparatorRegex: RegExp;
+export declare const autocompleteBoundaryRegex: RegExp;
 /**
  * Calculate the visible width of a string in terminal columns.
  */