@valyrianjs/terminal 0.2.0 → 0.2.1

package/src/session.ts

@@ -1,10 +1,10 @@
-import { ANSI_ENTER_ALTERNATE_SCREEN, ANSI_EXIT_ALTERNATE_SCREEN, ANSI_HIDE_CURSOR, ANSI_SHOW_CURSOR, createAnsiDiffWriter, formatPlainFrame, toAnsiFrame } from "./ansi.js";
+import { ANSI_DISABLE_MOUSE_REPORTING, ANSI_ENABLE_MOUSE_REPORTING, ANSI_ENTER_ALTERNATE_SCREEN, ANSI_EXIT_ALTERNATE_SCREEN, ANSI_HIDE_CURSOR, ANSI_SHOW_CURSOR, createAnsiDiffWriter, formatPlainFrame, toAnsiFrame } from "./ansi.js";
 import { createSystemClipboardAdapter } from "./clipboard.js";
 import { createEditorState, insertEditorText, moveEditorCursor, removeEditorBackward, removeEditorForward } from "./editor-state.js";
 import { copySelection, hasSelection, insertText, moveCursorEnd, moveCursorHome, moveCursorLeft, moveCursorRight, moveCursorWordLeft, moveCursorWordRight, normalizeInputState, parseTerminalKey, removeBackward, removeForward, selectAll } from "./events.js";
 import { createResolvedTerminalKeymap, resolveTerminalKeyBinding } from "./keymap.js";
 import { mergeVertical } from "./layout.js";
-import { cursorFromHitbox, parseTerminalInput, resolvePointerTarget } from "./mouse.js";
+import { cursorFromHitbox, parseTerminalInput, parseTerminalMousePrefix, resolvePointerTarget } from "./mouse.js";
 import { createOutputWriter } from "./output-writer.js";
 import { parseBracketedPaste } from "./paste.js";
 import { renderTerminalFrame } from "./render.js";
@@ -27,9 +27,11 @@ import type {
   TerminalHitbox,
   TerminalListChangeEventPayload,
   TerminalListPressEventPayload,
+  TerminalListViewportChangeEventPayload,
   TerminalMountOptions,
   TerminalOutputStream,
   TerminalNode,
+  ParsedTerminalInput,
   TerminalPointerSource,
   TerminalRowPointerEventPayload,
   TerminalSession,
@@ -44,6 +46,7 @@ interface ResolvedRuntimeOptions {
   stdout?: TerminalOutputStream;
   alternateScreen: boolean;
   hideCursor: boolean;
+  mouseReporting: boolean;
   writesAnsi: boolean;
 }
 
@@ -60,6 +63,10 @@ const KNOWN_TERMINAL_KEY_SEQUENCES = [
   "\u001b[1;3C",
   "\u001b[1;3D",
   "\u001b[3~",
+  "\u001b[5~",
+  "\u001b[6~",
+  "\u001b[1~",
+  "\u001b[4~",
   "\u001b[Z",
   "\u001b[A",
   "\u001b[B",
@@ -131,6 +138,7 @@ function resolveRuntimeOptions(options: TerminalMountOptions): ResolvedRuntimeOp
     stdout,
     alternateScreen: options.alternateScreen ?? ownsInteractiveTTY,
     hideCursor: options.hideCursor ?? ownsInteractiveTTY,
+    mouseReporting: ownsInteractiveTTY,
     writesAnsi: runtime === "app" && Boolean(stdout)
   };
 }
@@ -150,6 +158,8 @@ function applyInteractiveState(
   inputStateById: Map<string, InputInteractionState>,
   editorStateById: Map<string, EditorState>,
   listIndexById: Map<string, number>,
+  listSelectedIndexById: Map<string, number | null>,
+  listViewportOffsetById: Map<string, number>,
   scrollOffsetById: Map<string, number>,
   listHoverById: Map<string, number>,
   scrollHoverRowById: Map<string, number>
@@ -176,7 +186,23 @@ function applyInteractiveState(
       node.props.__editorState = current;
     }
     if (node.tag === "terminal-list" && id) {
-      node.props.__selectedIndex = listIndexById.get(id) || 0;
+      const items = Array.isArray(node.props.items) ? node.props.items : [];
+      const activeIndex = listIndexById.get(id) || 0;
+      const clampedActiveIndex = Math.max(0, Math.min(Math.max(0, items.length - 1), activeIndex));
+      if (!listIndexById.has(id)) {
+        listIndexById.set(id, clampedActiveIndex);
+      }
+      const selectedIndex = node.props.showActive === false
+        ? null
+        : listSelectedIndexById.has(id)
+          ? listSelectedIndexById.get(id)!
+          : clampedActiveIndex;
+      if (!listSelectedIndexById.has(id)) {
+        listSelectedIndexById.set(id, selectedIndex === null ? null : Math.max(0, Math.min(Math.max(0, items.length - 1), selectedIndex)));
+      }
+      node.props.__activeIndex = clampedActiveIndex;
+      node.props.__selectedIndex = selectedIndex === null ? null : Math.max(0, Math.min(Math.max(0, items.length - 1), selectedIndex));
+      node.props.__scrollOffset = listViewportOffsetById.get(id) || 0;
       if (listHoverById.has(id)) {
         node.props.__hoveredIndex = listHoverById.get(id);
       }
@@ -187,7 +213,7 @@ function applyInteractiveState(
         node.props.__hoveredRow = scrollHoverRowById.get(id);
       }
     }
-    applyInteractiveState(node.children, focusedId, inputStateById, editorStateById, listIndexById, scrollOffsetById, listHoverById, scrollHoverRowById);
+    applyInteractiveState(node.children, focusedId, inputStateById, editorStateById, listIndexById, listSelectedIndexById, listViewportOffsetById, scrollOffsetById, listHoverById, scrollHoverRowById);
   }
 }
 
@@ -208,6 +234,8 @@ export function mountTerminal(input: any, options: TerminalMountOptions = {}): T
   const inputStateById = new Map<string, InputInteractionState>();
   const editorStateById = new Map<string, EditorState>();
   const listIndexById = new Map<string, number>();
+  const listSelectedIndexById = new Map<string, number | null>();
+  const listViewportOffsetById = new Map<string, number>();
   const scrollOffsetById = new Map<string, number>();
   const listHoverById = new Map<string, number>();
   const scrollHoverRowById = new Map<string, number>();
@@ -221,7 +249,7 @@ export function mountTerminal(input: any, options: TerminalMountOptions = {}): T
     renderNow();
   });
   let currentTree = terminalRuntime.project();
-  applyInteractiveState(currentTree, focusedId, inputStateById, editorStateById, listIndexById, scrollOffsetById, listHoverById, scrollHoverRowById);
+  applyInteractiveState(currentTree, focusedId, inputStateById, editorStateById, listIndexById, listSelectedIndexById, listViewportOffsetById, scrollOffsetById, listHoverById, scrollHoverRowById);
   let currentFrame = renderTreeFrame(currentTree);
   let currentOutput = formatPlainFrame(currentFrame, { theme: options.theme }).trimEnd();
   let currentHitboxes = currentFrame.hitboxes;
@@ -250,6 +278,9 @@ export function mountTerminal(input: any, options: TerminalMountOptions = {}): T
     if (runtimeOptions.hideCursor) {
       writes.push(ANSI_HIDE_CURSOR);
     }
+    if (runtimeOptions.mouseReporting) {
+      writes.push(ANSI_ENABLE_MOUSE_REPORTING);
+    }
     if (writes.length > 0) {
       outputWriter.write(writes.join(""), { force: true });
     }
@@ -260,6 +291,9 @@ export function mountTerminal(input: any, options: TerminalMountOptions = {}): T
       return;
     }
     const writes: string[] = [];
+    if (runtimeOptions.mouseReporting) {
+      writes.push(ANSI_DISABLE_MOUSE_REPORTING);
+    }
     if (runtimeOptions.hideCursor) {
       writes.push(ANSI_SHOW_CURSOR);
     }
@@ -290,7 +324,7 @@ export function mountTerminal(input: any, options: TerminalMountOptions = {}): T
       focusedId = activeFocusables[0]?.props.id || null;
     }
     skipFocusContainmentOnce = false;
-    applyInteractiveState(currentTree, focusedId, inputStateById, editorStateById, listIndexById, scrollOffsetById, listHoverById, scrollHoverRowById);
+    applyInteractiveState(currentTree, focusedId, inputStateById, editorStateById, listIndexById, listSelectedIndexById, listViewportOffsetById, scrollOffsetById, listHoverById, scrollHoverRowById);
     currentFrame = renderTreeFrame(currentTree);
     currentOutput = formatPlainFrame(currentFrame, { theme: options.theme }).trimEnd();
     currentHitboxes = currentFrame.hitboxes;
@@ -444,12 +478,22 @@ export function mountTerminal(input: any, options: TerminalMountOptions = {}): T
     return 1;
   }
 
-  function sourceRowFromHitbox(node: TerminalFocusNode, hitbox: { itemOffset?: number; y1: number }, y: number) {
-    const visibleRow = Math.max(1, y - hitbox.y1 + 1);
+  function sourceRowFromHitbox(node: TerminalFocusNode, hitbox: { itemOffset?: number; itemIndexes?: number[]; y1: number; y2: number; contentY?: number; __listItemIndex?: number }, y: number) {
+    if (node.tag === "terminal-list" && typeof hitbox.__listItemIndex === "number" && y >= hitbox.y1 && y <= hitbox.y2) {
+      return Math.max(1, Math.min(rowCountForNode(node), hitbox.__listItemIndex + 1));
+    }
+
+    const sourceY = hitbox.contentY ?? hitbox.y1;
+    const visibleRow = Math.max(1, y - sourceY + 1);
     if (node.tag !== "terminal-list") {
       return Math.max(1, Math.min(rowCountForNode(node), visibleRow));
     }
 
+    const mappedIndex = hitbox.itemIndexes?.[visibleRow - 1];
+    if (typeof mappedIndex === "number") {
+      return Math.max(1, Math.min(rowCountForNode(node), mappedIndex + 1));
+    }
+
     return Math.max(1, Math.min(rowCountForNode(node), visibleRow + (hitbox.itemOffset || 0)));
   }
 
@@ -496,6 +540,110 @@ export function mountTerminal(input: any, options: TerminalMountOptions = {}): T
   }
 
 
+  function listItemKey(node: TerminalFocusNode, index: number) {
+    const items = Array.isArray(node.props.items) ? node.props.items : [];
+    const item = items[index];
+    if (typeof node.props.itemKey === "function" && typeof item !== "undefined") {
+      const key = node.props.itemKey(item, index);
+      if (typeof key === "string" || typeof key === "number") {
+        return String(key);
+      }
+    }
+    return undefined;
+  }
+
+  function listViewportRows(node: TerminalFocusNode) {
+    const context = renderContext();
+    const items = Array.isArray(node.props.items) ? node.props.items : [];
+    const hitbox = node.props.id ? currentHitboxes.find((box) => box.id === node.props.id) : null;
+    const overscan = typeof node.props.overscan === "number" ? Math.max(0, Math.floor(node.props.overscan)) : 0;
+    const renderedRows = hitbox ? Math.max(1, hitbox.y2 - hitbox.y1 + 1 - overscan * 2) : null;
+    const sourceRows = Number(node.props.height || renderedRows || context.rows || items.length || 1);
+    if (!Number.isFinite(sourceRows) || !Number.isInteger(sourceRows) || sourceRows <= 0) {
+      return Math.max(1, items.length || 1);
+    }
+    return Math.max(1, Math.min(items.length || 1, sourceRows));
+  }
+
+  function clampListIndex(node: TerminalFocusNode, index: number) {
+    const items = Array.isArray(node.props.items) ? node.props.items : [];
+    if (items.length === 0) {
+      return 0;
+    }
+    return Math.max(0, Math.min(items.length - 1, index));
+  }
+
+  function currentListActiveIndex(node: TerminalFocusNode) {
+    return clampListIndex(node, listIndexById.get(node.props.id || "") || 0);
+  }
+
+  function currentListSelectedIndex(node: TerminalFocusNode) {
+    const id = node.props.id || "";
+    if (node.props.showActive === false) {
+      return null;
+    }
+    if (listSelectedIndexById.has(id)) {
+      const selectedIndex = listSelectedIndexById.get(id);
+      return typeof selectedIndex === "number" ? clampListIndex(node, selectedIndex) : null;
+    }
+    return currentListActiveIndex(node);
+  }
+
+  function currentListViewportOffset(node: TerminalFocusNode) {
+    const id = node.props.id || "";
+    return Math.max(0, Math.min(listMaxViewportOffset(node), listViewportOffsetById.get(id) || 0));
+  }
+
+  function listStatePayload(node: TerminalFocusNode) {
+    return {
+      activeIndex: currentListActiveIndex(node),
+      selectedIndex: currentListSelectedIndex(node),
+      viewportOffset: currentListViewportOffset(node),
+      viewportRows: listViewportRows(node)
+    };
+  }
+
+  function listMaxViewportOffset(node: TerminalFocusNode) {
+    const items = Array.isArray(node.props.items) ? node.props.items : [];
+    return Math.max(0, items.length - listViewportRows(node));
+  }
+
+  function setListViewportOffset(node: TerminalFocusNode, offset: number, emit = true) {
+    const id = node.props.id;
+    if (!id) {
+      return;
+    }
+    const nextOffset = Math.max(0, Math.min(listMaxViewportOffset(node), offset));
+    const previous = listViewportOffsetById.get(id) || 0;
+    listViewportOffsetById.set(id, nextOffset);
+    if (emit && nextOffset !== previous) {
+      const payload: TerminalListViewportChangeEventPayload = {
+        type: "viewportchange",
+        id,
+        offset: nextOffset,
+        rows: listViewportRows(node),
+        ...listStatePayload(node)
+      };
+      dispatchNodeEvent(node, "viewportchange", payload);
+    }
+  }
+
+  function ensureListActiveVisible(node: TerminalFocusNode, activeIndex: number) {
+    const id = node.props.id;
+    if (!id || !node.props.virtualized) {
+      return;
+    }
+    const currentOffset = listViewportOffsetById.get(id) || 0;
+    const rows = listViewportRows(node);
+    if (activeIndex < currentOffset) {
+      setListViewportOffset(node, activeIndex);
+      return;
+    }
+    if (activeIndex >= currentOffset + rows) {
+      setListViewportOffset(node, activeIndex - rows + 1);
+    }
+  }
+
   function dispatchListPressEvent(node: TerminalFocusNode, type: TerminalListPressEventPayload["type"], index: number) {
     const id = node.props.id;
     if (!id) {
@@ -505,7 +653,10 @@ export function mountTerminal(input: any, options: TerminalMountOptions = {}): T
     if (typeof items[index] === "undefined") {
       return false;
     }
-    const payload: TerminalListPressEventPayload = { type, id, index, value: items[index] };
+    const key = listItemKey(node, index);
+    const payload: TerminalListPressEventPayload = typeof key === "undefined"
+      ? { type, id, index, value: items[index], ...listStatePayload(node) }
+      : { type, id, index, key, value: items[index], ...listStatePayload(node) };
     return dispatchNodeEvent(node, type, payload);
   }
 
@@ -517,6 +668,14 @@ export function mountTerminal(input: any, options: TerminalMountOptions = {}): T
     return dispatchNodeEvent(node, type, { type, id });
   }
 
+  function dispatchHitboxButtonPressEvent(hitbox: TerminalHitbox, type: "press" | "doublepress" | "contextpress") {
+    if (type !== "press" || typeof hitbox.__pressHandler !== "function") {
+      return false;
+    }
+    hitbox.__pressHandler({ type, id: hitbox.id });
+    return true;
+  }
+
   function dispatchListPointerPressEvent(node: TerminalFocusNode, type: "doublepress" | "contextpress", row: number) {
     const items = Array.isArray(node.props.items) ? node.props.items : [];
     const index = Math.max(0, Math.min(items.length - 1, row - 1));
@@ -557,7 +716,10 @@ export function mountTerminal(input: any, options: TerminalMountOptions = {}): T
       if (typeof items[index] === "undefined") {
         return;
       }
-      const payload: TerminalRowPointerEventPayload = { type, id: node.props.id, row: index + 1, index, value: items[index], x, y };
+      const key = listItemKey(node, index);
+      const payload: TerminalRowPointerEventPayload = typeof key === "undefined"
+        ? { type, id: node.props.id, row: index + 1, index, value: items[index], x, y }
+        : { type, id: node.props.id, row: index + 1, index, key, value: items[index], x, y };
       dispatchNodeEvent(node, type, payload);
       return;
     }
@@ -656,30 +818,80 @@ export function mountTerminal(input: any, options: TerminalMountOptions = {}): T
     return rerender();
   }
 
-  function changeListSelection(node: TerminalFocusNode, direction: -1 | 1) {
+  function moveListActiveTo(node: TerminalFocusNode, nextIndex: number) {
     const id = node.props.id;
     if (!id) {
       return currentOutput;
     }
     const items = Array.isArray(node.props.items) ? node.props.items : [];
-    const currentIndex = listIndexById.get(id) || 0;
-    const nextIndex = direction < 0 ? Math.max(0, currentIndex - 1) : Math.min(items.length - 1, currentIndex + 1);
+    const clampedIndex = clampListIndex(node, nextIndex);
+    listIndexById.set(id, clampedIndex);
+    ensureListActiveVisible(node, clampedIndex);
+    const key = listItemKey(node, clampedIndex);
+    const payload: TerminalListChangeEventPayload = typeof key === "undefined"
+      ? { type: "change", id, index: clampedIndex, value: items[clampedIndex], ...listStatePayload(node) }
+      : { type: "change", id, index: clampedIndex, key, value: items[clampedIndex], ...listStatePayload(node) };
+    dispatchNodeEvent(node, "change", payload);
+    return rerender();
+  }
+
+  function changeListSelection(node: TerminalFocusNode, direction: -1 | 1) {
+    return moveListActiveTo(node, currentListActiveIndex(node) + direction);
+  }
+
+  function pageListSelection(node: TerminalFocusNode, direction: -1 | 1) {
+    const id = node.props.id;
+    if (!id) {
+      return currentOutput;
+    }
+    const nextIndex = clampListIndex(node, currentListActiveIndex(node) + direction * listViewportRows(node));
     listIndexById.set(id, nextIndex);
-    const payload: TerminalListChangeEventPayload = { type: "change", id, index: nextIndex, value: items[nextIndex] };
+    setListViewportOffset(node, nextIndex);
+    const items = Array.isArray(node.props.items) ? node.props.items : [];
+    const key = listItemKey(node, nextIndex);
+    const payload: TerminalListChangeEventPayload = typeof key === "undefined"
+      ? { type: "change", id, index: nextIndex, value: items[nextIndex], ...listStatePayload(node) }
+      : { type: "change", id, index: nextIndex, key, value: items[nextIndex], ...listStatePayload(node) };
     dispatchNodeEvent(node, "change", payload);
     return rerender();
   }
 
+  function moveListSelectionToBoundary(node: TerminalFocusNode, boundary: "start" | "end") {
+    const items = Array.isArray(node.props.items) ? node.props.items : [];
+    return moveListActiveTo(node, boundary === "start" ? 0 : Math.max(0, items.length - 1));
+  }
+
   function pressListSelection(node: TerminalFocusNode) {
     const id = node.props.id;
     if (!id) {
       return currentOutput;
     }
-    const currentIndex = listIndexById.get(id) || 0;
+    const currentIndex = currentListActiveIndex(node);
+    if (node.props.showActive !== false) {
+      listSelectedIndexById.set(id, currentIndex);
+    }
     dispatchListPressEvent(node, "press", currentIndex);
     return rerender();
   }
 
+  function pressListPointerSelection(node: TerminalFocusNode, row: number) {
+    const id = node.props.id;
+    if (!id) {
+      return currentOutput;
+    }
+    const items = Array.isArray(node.props.items) ? node.props.items : [];
+    const index = Math.max(0, Math.min(items.length - 1, row - 1));
+    if (typeof items[index] === "undefined") {
+      return currentOutput;
+    }
+    listIndexById.set(id, index);
+    if (node.props.showActive !== false) {
+      listSelectedIndexById.set(id, index);
+    }
+    dispatchListPressEvent(node, "press", index);
+    return rerender();
+  }
+
   function scrollFocusedNode(node: TerminalFocusNode, direction: -1 | 1) {
     const id = node.props.id;
     if (!id) {
@@ -706,7 +918,9 @@ export function mountTerminal(input: any, options: TerminalMountOptions = {}): T
       return scrollFocusedNode(node, direction);
     }
     if (node?.tag === "terminal-list" && node.props.virtualized) {
-      return changeListSelection(node, direction);
+      const currentOffset = listViewportOffsetById.get(node.props.id || "") || 0;
+      setListViewportOffset(node, currentOffset + direction);
+      return rerender();
     }
     return rerender();
   }
@@ -881,6 +1095,14 @@ export function mountTerminal(input: any, options: TerminalMountOptions = {}): T
         return node?.tag === "terminal-list" ? changeListSelection(node, -1) : currentOutput;
       case "list.next":
         return node?.tag === "terminal-list" ? changeListSelection(node, 1) : currentOutput;
+      case "list.pageUp":
+        return node?.tag === "terminal-list" ? pageListSelection(node, -1) : currentOutput;
+      case "list.pageDown":
+        return node?.tag === "terminal-list" ? pageListSelection(node, 1) : currentOutput;
+      case "list.home":
+        return node?.tag === "terminal-list" ? moveListSelectionToBoundary(node, "start") : currentOutput;
+      case "list.end":
+        return node?.tag === "terminal-list" ? moveListSelectionToBoundary(node, "end") : currentOutput;
       case "list.press":
         return node?.tag === "terminal-list" ? pressListSelection(node) : currentOutput;
       case "scroll.up":
@@ -917,6 +1139,18 @@ export function mountTerminal(input: any, options: TerminalMountOptions = {}): T
         return;
       }
       terminalSize = nextSize;
+      const focusedNode = findFocused(currentTree, focusedId);
+      if (focusedNode?.tag === "terminal-list" && focusedNode.props.id && focusedNode.props.virtualized) {
+        const items = Array.isArray(focusedNode.props.items) ? focusedNode.props.items : [];
+        const rows = Math.max(1, Math.min(items.length || 1, Number(focusedNode.props.height || terminalSize.rows || items.length || 1)));
+        const activeIndex = currentListActiveIndex(focusedNode);
+        const currentOffset = listViewportOffsetById.get(focusedNode.props.id) || 0;
+        if (activeIndex < currentOffset) {
+          listViewportOffsetById.set(focusedNode.props.id, activeIndex);
+        } else if (activeIndex >= currentOffset + rows) {
+          listViewportOffsetById.set(focusedNode.props.id, Math.max(0, activeIndex - rows + 1));
+        }
+      }
       rerender();
     },
     update() {
@@ -1007,7 +1241,14 @@ export function mountTerminal(input: any, options: TerminalMountOptions = {}): T
         return currentOutput;
       }
       if (hitbox.tag === "terminal-button") {
-        return this.click(hitbox.id);
+        const node = findFocusableById(currentTree, hitbox.id);
+        if (node?.tag === "terminal-button") {
+          return this.click(hitbox.id);
+        }
+        if (dispatchHitboxButtonPressEvent(hitbox, "press")) {
+          return rerender();
+        }
+        return currentOutput;
       }
       setSemanticHoverFromHitbox(hitbox.id, x, y);
       focusedId = hitbox.id;
@@ -1015,6 +1256,12 @@ export function mountTerminal(input: any, options: TerminalMountOptions = {}): T
         mouseSelectionId = hitbox.id;
         return setCursorFromHitbox(hitbox.id, x, false);
       }
+      if (hitbox.tag === "terminal-list") {
+        const node = findFocusableById(currentTree, hitbox.id);
+        if (node?.tag === "terminal-list") {
+          return pressListPointerSelection(node, sourceRowFromHitbox(node, hitbox, y));
+        }
+      }
       rerender();
       return currentOutput;
     },
@@ -1173,7 +1420,7 @@ export function mountTerminal(input: any, options: TerminalMountOptions = {}): T
     return isDouble;
   }
 
-  function doublePressAt(hitbox: { id: string; tag: string; y1: number }, x: number, y: number) {
+  function doublePressAt(hitbox: TerminalHitbox, x: number, y: number) {
     const node = findFocusableById(currentTree, hitbox.id);
     if (!node) {
       return currentOutput;
@@ -1222,65 +1469,7 @@ export function mountTerminal(input: any, options: TerminalMountOptions = {}): T
     return currentOutput;
   }
 
-  function processInputStream(value: string) {
-    if (!value) {
-      return;
-    }
-
-    if (pendingPasteChunk) {
-      pendingPasteChunk += value;
-      const paste = parseBracketedPaste(pendingPasteChunk);
-      if (!paste && isBracketedPasteStartPrefix(pendingPasteChunk)) {
-        return;
-      }
-      if (!paste) {
-        const buffered = pendingPasteChunk;
-        pendingPasteChunk = "";
-        processKeyStream(buffered);
-        return;
-      }
-      pendingPasteChunk = "";
-      dispatchPasteText(paste.text);
-      processInputStream(paste.rest);
-      return;
-    }
-
-    if (pendingKeyChunk) {
-      if (pendingKeyChunk === ESCAPE && !canContinueEscapeSequence(value)) {
-        flushPendingEscape();
-        processInputStream(value);
-        return;
-      }
-      const buffered = pendingKeyChunk + value;
-      cancelPendingEscapeFlush();
-      pendingKeyChunk = "";
-      processKeyStream(buffered);
-      return;
-    }
-
-    if (value === ESCAPE) {
-      processKeyStream(value);
-      return;
-    }
-
-    if (isBracketedPasteStartPrefix(value)) {
-      pendingPasteChunk = value;
-      return;
-    }
-
-    if (value.startsWith(BRACKETED_PASTE_START)) {
-      const paste = parseBracketedPaste(value);
-      if (!paste) {
-        pendingPasteChunk = value;
-        return;
-      }
-      dispatchPasteText(paste.text);
-      processInputStream(paste.rest);
-      return;
-    }
-
-    const parsed = parseTerminalInput(value);
-    if (parsed.type === "mouse") {
+  function processParsedMouseInput(parsed: Extract<ParsedTerminalInput, { type: "mouse" }>) {
       if (parsed.action === "press") {
         const hitbox = resolvePointerTarget(currentHitboxes, parsed.x, parsed.y);
         if (isContextMouseButton(parsed.button)) {
@@ -1313,9 +1502,13 @@ export function mountTerminal(input: any, options: TerminalMountOptions = {}): T
         if (isPrimaryPress && !isDoublePressEligible) {
           lastPrimaryPress = null;
         }
-        session.clickAt(parsed.x, parsed.y);
-        if (hitbox && shouldDispatchDoublePress) {
+        if (hitbox && shouldDispatchDoublePress && hitbox.tag === "terminal-list") {
           doublePressAt(hitbox, parsed.x, parsed.y);
+        } else {
+          session.clickAt(parsed.x, parsed.y);
+          if (hitbox && shouldDispatchDoublePress) {
+            doublePressAt(hitbox, parsed.x, parsed.y);
+          }
         }
       } else if (parsed.action === "drag") {
         if (mouseSelectionId) {
@@ -1345,6 +1538,75 @@ export function mountTerminal(input: any, options: TerminalMountOptions = {}): T
       } else if (parsed.action === "wheel-down") {
         wheelAt(parsed.x, parsed.y, 1);
       }
+  }
+
+  function processInputStream(value: string) {
+    if (!value) {
+      return;
+    }
+
+    if (pendingPasteChunk) {
+      pendingPasteChunk += value;
+      const paste = parseBracketedPaste(pendingPasteChunk);
+      if (!paste && isBracketedPasteStartPrefix(pendingPasteChunk)) {
+        return;
+      }
+      if (!paste) {
+        const buffered = pendingPasteChunk;
+        pendingPasteChunk = "";
+        processKeyStream(buffered);
+        return;
+      }
+      pendingPasteChunk = "";
+      dispatchPasteText(paste.text);
+      processInputStream(paste.rest);
+      return;
+    }
+
+    if (pendingKeyChunk) {
+      if (pendingKeyChunk === ESCAPE && !canContinueEscapeSequence(value)) {
+        flushPendingEscape();
+        processInputStream(value);
+        return;
+      }
+      const buffered = pendingKeyChunk + value;
+      cancelPendingEscapeFlush();
+      pendingKeyChunk = "";
+      processKeyStream(buffered);
+      return;
+    }
+
+    if (value === ESCAPE) {
+      processKeyStream(value);
+      return;
+    }
+
+    if (isBracketedPasteStartPrefix(value)) {
+      pendingPasteChunk = value;
+      return;
+    }
+
+    if (value.startsWith(BRACKETED_PASTE_START)) {
+      const paste = parseBracketedPaste(value);
+      if (!paste) {
+        pendingPasteChunk = value;
+        return;
+      }
+      dispatchPasteText(paste.text);
+      processInputStream(paste.rest);
+      return;
+    }
+
+    const parsedMouse = parseTerminalMousePrefix(value);
+    if (parsedMouse) {
+      processParsedMouseInput(parsedMouse.input);
+      processInputStream(parsedMouse.rest);
+      return;
+    }
+
+    const parsed = parseTerminalInput(value);
+    if (parsed.type === "mouse") {
+      processParsedMouseInput(parsed);
       return;
     }
 

package/src/theme.ts

@@ -101,6 +101,9 @@ export const defaultTerminalTheme: TerminalTheme = {
     "list.current": {
       plainPrefix: "> "
     },
+    "list.selected": {
+      plainPrefix: "* "
+    },
     focus: {
       background: "#1f2328"
     },

package/src/tree.ts

@@ -54,12 +54,27 @@ export function resolveToTerminalNodes(input: any): TerminalNode[] {
       return resolveToTerminalNodes(resolveComponent(input.tag, input.props || {}, input.children || []));
     }
 
+    const tag = input.tag as TerminalPrimitiveTag;
+    const props = { ...(input.props || {}) } as Record<string, any>;
+    const vnodeChildren = input.children || [];
+    if (tag === "terminal-list" && vnodeChildren.length === 1 && typeof vnodeChildren[0] === "function") {
+      props.__childrenRenderer = vnodeChildren[0];
+      return [
+        {
+          type: "element",
+          tag,
+          props,
+          children: []
+        }
+      ];
+    }
+
     return [
       {
         type: "element",
-        tag: input.tag as TerminalPrimitiveTag,
-        props: (input.props || {}) as Record<string, any>,
-        children: normalizeChildren(input.children || [])
+        tag,
+        props,
+        children: normalizeChildren(vnodeChildren)
       }
     ];
   }
@@ -106,7 +121,7 @@ export function collectDirectOverlayFocusableNodes(nodes: TerminalNode[], out: T
 
     const overlayChildren = node.children.filter((child) => child.type === "element" && child.tag === "terminal-overlay" && child.props.trapFocus !== false);
     if (overlayChildren.length) {
-      collectFocusableNodes(overlayChildren, out);
+      collectFocusableNodes(overlayChildren.slice().reverse(), out);
       continue;
     }