@jmoyers/harness 0.1.10 → 0.1.20

package/src/mux/live-mux/modal-command-menu-handler.ts

@@ -1,11 +1,13 @@
 import {
-  COMMAND_MENU_MAX_RESULTS,
   clampCommandMenuState,
+  moveSelectionByDelta,
   reduceCommandMenuInput,
   resolveCommandMenuMatches,
+  resolveCommandMenuPage,
   type CommandMenuActionDescriptor,
   type CommandMenuState,
 } from './command-menu.ts';
+import { parseMuxInputChunk, wheelDeltaRowsFromCode } from '../dual-pane-core.ts';
 
 interface HandleCommandMenuInputOptions {
   readonly input: Buffer;
@@ -28,29 +30,45 @@ const COMMAND_MENU_BODY_ROW_OFFSET = 2;
 const COMMAND_MENU_ACTION_ROW_START = 2;
 const THEME_PICKER_SCOPE = 'theme-select';
 
+function selectionDeltaFromWheelInput(input: Buffer): number {
+  if (!input.includes(0x1b) || !input.includes(0x3c)) {
+    return 0;
+  }
+  const parsed = parseMuxInputChunk('', input);
+  let selectionDelta = 0;
+  for (const token of parsed.tokens) {
+    if (token.kind !== 'mouse') {
+      continue;
+    }
+    const wheelDelta = wheelDeltaRowsFromCode(token.event.code);
+    if (wheelDelta !== null) {
+      selectionDelta += wheelDelta;
+    }
+  }
+  return selectionDelta;
+}
+
 function resolveCommandMenuActionIdByRow(
   menu: CommandMenuState,
   actions: readonly CommandMenuActionDescriptor[],
   overlayTopRowZeroBased: number,
   rowOneBased: number,
 ): string | null {
-  const matches = resolveCommandMenuMatches(actions, menu.query, null);
-  if (matches.length === 0) {
+  const page = resolveCommandMenuPage(actions, menu);
+  if (page.matches.length === 0) {
     return null;
   }
-  const selectedIndex = clampCommandMenuState(menu, matches.length).selectedIndex;
-  const pageStart = Math.floor(selectedIndex / COMMAND_MENU_MAX_RESULTS) * COMMAND_MENU_MAX_RESULTS;
-  const visibleMatches = matches.slice(pageStart, pageStart + COMMAND_MENU_MAX_RESULTS);
   const actionStartBodyLine = COMMAND_MENU_ACTION_ROW_START;
   const clickedBodyLine = rowOneBased - 1 - (overlayTopRowZeroBased + COMMAND_MENU_BODY_ROW_OFFSET);
   if (clickedBodyLine < actionStartBodyLine) {
     return null;
   }
-  const visibleIndex = clickedBodyLine - actionStartBodyLine;
-  if (visibleIndex < 0 || visibleIndex >= visibleMatches.length) {
+  const displayEntryIndex = clickedBodyLine - actionStartBodyLine;
+  if (displayEntryIndex < 0 || displayEntryIndex >= page.displayEntries.length) {
     return null;
   }
-  return visibleMatches[visibleIndex]?.action.id ?? null;
+  const entry = page.displayEntries[displayEntryIndex]!;
+  return entry.action.id;
 }
 
 export function handleCommandMenuInput(options: HandleCommandMenuInputOptions): boolean {
@@ -82,6 +100,25 @@ export function handleCommandMenuInput(options: HandleCommandMenuInputOptions):
     markDirty();
     return true;
   }
+  const wheelSelectionDelta = selectionDeltaFromWheelInput(input);
+  if (wheelSelectionDelta !== 0) {
+    const currentMatches = resolveCommandMenuMatches(resolveActions(), menu.query, null);
+    const clampedMenu = clampCommandMenuState(menu, currentMatches.length);
+    const nextSelectedIndex = moveSelectionByDelta(
+      clampedMenu.selectedIndex,
+      currentMatches.length,
+      wheelSelectionDelta,
+    );
+    if (nextSelectedIndex !== menu.selectedIndex) {
+      setMenu({
+        scope: menu.scope,
+        query: menu.query,
+        selectedIndex: nextSelectedIndex,
+      });
+      markDirty();
+    }
+    return true;
+  }
   const maybeMouseSequence = input.includes(0x3c);
   if (
     maybeMouseSequence &&

package/src/mux/live-mux/modal-conversation-handlers.ts

@@ -56,6 +56,8 @@ interface HandleNewThreadPromptInputOptions {
   setPrompt: (prompt: NewThreadPromptState | null) => void;
 }
 
+const MOUSE_EVENT_PREFIX = Buffer.from('\u001b[<', 'utf8');
+
 export function handleConversationTitleEditInput(
   options: HandleConversationTitleEditInputOptions,
 ): boolean {
@@ -92,7 +94,9 @@ export function handleConversationTitleEditInput(
     markDirty();
     return true;
   }
+  const maybeMouseSequence = input.includes(MOUSE_EVENT_PREFIX);
   if (
+    maybeMouseSequence &&
     dismissOnOutsideClick(
       input,
       () => {
@@ -165,7 +169,7 @@ export function handleNewThreadPromptInput(options: HandleNewThreadPromptInputOp
     markDirty();
     return true;
   }
-  const maybeMouseSequence = input.includes(0x3c);
+  const maybeMouseSequence = input.includes(MOUSE_EVENT_PREFIX);
   if (
     maybeMouseSequence &&
     dismissOnOutsideClick(

package/src/mux/live-mux/modal-input-reducers.ts

@@ -1,6 +1,6 @@
 export interface TaskEditorPromptInputState {
   title: string;
-  description: string;
+  body: string;
   repositoryIds: readonly string[];
   repositoryIndex: number;
   fieldIndex: 0 | 1 | 2;
@@ -8,7 +8,7 @@ export interface TaskEditorPromptInputState {
 
 interface TaskEditorPromptReduction {
   title: string;
-  description: string;
+  body: string;
   repositoryIndex: number;
   fieldIndex: 0 | 1 | 2;
   submit: boolean;
@@ -19,10 +19,98 @@ interface LinePromptReduction {
   submit: boolean;
 }
 
-export function reduceLinePromptInput(value: string, input: Buffer): LinePromptReduction {
+export interface LinePromptInputState {
+  readonly inBracketedPaste: boolean;
+  readonly pendingSequence: Buffer;
+}
+
+interface StatefulLinePromptReduction extends LinePromptReduction {
+  readonly lineInputState: LinePromptInputState;
+}
+
+const BRACKETED_PASTE_START = Buffer.from('\u001b[200~', 'utf8');
+const BRACKETED_PASTE_END = Buffer.from('\u001b[201~', 'utf8');
+const EMPTY_BUFFER = Buffer.alloc(0);
+
+export function createLinePromptInputState(): LinePromptInputState {
+  return {
+    inBracketedPaste: false,
+    pendingSequence: EMPTY_BUFFER,
+  };
+}
+
+function matchesSequence(input: Buffer, startIndex: number, sequence: Buffer): boolean {
+  if (startIndex < 0 || startIndex + sequence.length > input.length) {
+    return false;
+  }
+  for (let index = 0; index < sequence.length; index += 1) {
+    if (input[startIndex + index] !== sequence[index]) {
+      return false;
+    }
+  }
+  return true;
+}
+
+function isTruncatedSequencePrefix(input: Buffer, startIndex: number, sequence: Buffer): boolean {
+  const remaining = input.length - startIndex;
+  if (remaining >= sequence.length) {
+    return false;
+  }
+  for (let index = 0; index < remaining; index += 1) {
+    if (input[startIndex + index] !== sequence[index]) {
+      return false;
+    }
+  }
+  return true;
+}
+
+export function reduceLinePromptInput(value: string, input: Buffer): LinePromptReduction;
+export function reduceLinePromptInput(
+  value: string,
+  input: Buffer,
+  lineInputState: LinePromptInputState,
+): StatefulLinePromptReduction;
+export function reduceLinePromptInput(
+  value: string,
+  input: Buffer,
+  lineInputState?: LinePromptInputState,
+): LinePromptReduction | StatefulLinePromptReduction {
+  const activeState = lineInputState ?? createLinePromptInputState();
+  const mergedInput =
+    activeState.pendingSequence.length === 0
+      ? input
+      : Buffer.concat([activeState.pendingSequence, input]);
+
   let nextValue = value;
   let submit = false;
-  for (const byte of input) {
+  let inBracketedPaste = activeState.inBracketedPaste;
+  let pendingSequence = EMPTY_BUFFER;
+  for (let index = 0; index < mergedInput.length; index += 1) {
+    if (!inBracketedPaste && matchesSequence(mergedInput, index, BRACKETED_PASTE_START)) {
+      inBracketedPaste = true;
+      index += BRACKETED_PASTE_START.length - 1;
+      continue;
+    }
+    if (matchesSequence(mergedInput, index, BRACKETED_PASTE_END)) {
+      inBracketedPaste = false;
+      index += BRACKETED_PASTE_END.length - 1;
+      continue;
+    }
+    if (
+      isTruncatedSequencePrefix(mergedInput, index, BRACKETED_PASTE_START) ||
+      isTruncatedSequencePrefix(mergedInput, index, BRACKETED_PASTE_END)
+    ) {
+      pendingSequence = Buffer.from(mergedInput.subarray(index));
+      break;
+    }
+
+    const byte = mergedInput[index]!;
+    if (inBracketedPaste) {
+      if (byte >= 32 && byte <= 126) {
+        nextValue += String.fromCharCode(byte);
+      }
+      continue;
+    }
     if (byte === 0x0d || byte === 0x0a) {
       submit = true;
       break;
@@ -35,9 +123,19 @@ export function reduceLinePromptInput(value: string, input: Buffer): LinePromptR
       nextValue += String.fromCharCode(byte);
     }
   }
+  if (lineInputState === undefined) {
+    return {
+      value: nextValue,
+      submit,
+    };
+  }
   return {
     value: nextValue,
     submit,
+    lineInputState: {
+      inBracketedPaste,
+      pendingSequence,
+    },
   };
 }
 
@@ -46,7 +144,7 @@ export function reduceTaskEditorPromptInput(
   input: Buffer,
 ): TaskEditorPromptReduction {
   let nextTitle = prompt.title;
-  let nextDescription = prompt.description;
+  let nextBody = prompt.body;
   let nextFieldIndex = prompt.fieldIndex;
   let nextRepositoryIndex = prompt.repositoryIndex;
   let submit = false;
@@ -71,7 +169,7 @@ export function reduceTaskEditorPromptInput(
         if (nextFieldIndex === 0) {
           nextTitle = nextTitle.slice(0, -1);
         } else if (nextFieldIndex === 2) {
-          nextDescription = nextDescription.slice(0, -1);
+          nextBody = nextBody.slice(0, -1);
         }
         continue;
       }
@@ -79,14 +177,14 @@ export function reduceTaskEditorPromptInput(
         if (nextFieldIndex === 0) {
           nextTitle += String.fromCharCode(byte);
         } else if (nextFieldIndex === 2) {
-          nextDescription += String.fromCharCode(byte);
+          nextBody += String.fromCharCode(byte);
         }
       }
     }
   }
   return {
     title: nextTitle,
-    description: nextDescription,
+    body: nextBody,
     repositoryIndex: nextRepositoryIndex,
     fieldIndex: nextFieldIndex,
     submit,

package/src/mux/live-mux/modal-overlays.ts

@@ -8,22 +8,27 @@ import {
   resolveGoldenModalSize,
 } from '../harness-core-ui.ts';
 import {
-  COMMAND_MENU_MAX_RESULTS,
-  resolveCommandMenuMatches,
+  resolveCommandMenuPage,
   type CommandMenuActionDescriptor,
   type CommandMenuState,
 } from './command-menu.ts';
 import type { createNewThreadPromptState } from '../new-thread-prompt.ts';
 import { newThreadPromptBodyLines } from '../new-thread-prompt.ts';
-import { buildUiModalOverlay } from '../../ui/kit.ts';
+import { UiKit, type UiModalOverlayOptions } from '../../../packages/harness-ui/src/kit.ts';
 
 type NewThreadPromptState = ReturnType<typeof createNewThreadPromptState>;
+const uiKit = new UiKit();
+
+function buildUiModalOverlay(options: UiModalOverlayOptions) {
+  return uiKit.buildModalOverlay(options);
+}
+
 type UiModalThemeInput = NonNullable<Parameters<typeof buildUiModalOverlay>[0]['theme']>;
 
 interface TaskEditorPromptOverlayState {
   mode: 'create' | 'edit';
   title: string;
-  description: string;
+  body: string;
   repositoryIds: readonly string[];
   repositoryIndex: number;
   fieldIndex: 0 | 1 | 2;
@@ -36,6 +41,14 @@ interface RepositoryPromptOverlayState {
   readonly error: string | null;
 }
 
+interface ApiKeyPromptOverlayState {
+  readonly keyName: string;
+  readonly displayName: string;
+  readonly value: string;
+  readonly error: string | null;
+  readonly hasExistingValue: boolean;
+}
+
 interface ConversationTitleOverlayState {
   value: string;
   lastSavedValue: string;
@@ -43,6 +56,69 @@ interface ConversationTitleOverlayState {
   persistInFlight: boolean;
 }
 
+interface ReleaseNotesOverlayState {
+  readonly currentVersion: string;
+  readonly latestTag: string;
+  readonly releasesPageUrl: string;
+  readonly releases: readonly {
+    tag: string;
+    name: string;
+    url: string;
+    previewLines: readonly string[];
+    previewTruncated: boolean;
+  }[];
+}
+
+const RELEASE_NOTES_UPDATE_ACTION_BODY_LINE_INDEX = 2;
+const RELEASE_NOTES_BODY_START_ROW_OFFSET = 2;
+export const RELEASE_NOTES_UPDATE_ACTION_ROW_OFFSET =
+  RELEASE_NOTES_BODY_START_ROW_OFFSET + RELEASE_NOTES_UPDATE_ACTION_BODY_LINE_INDEX;
+export const RELEASE_NOTES_UPDATE_ACTION_LABEL = '[ click to update now ]';
+const COMMAND_PALETTE_MODAL_SIZE = {
+  preferredHeight: 18,
+  minWidth: 48,
+  maxWidth: 96,
+} as const;
+
+function truncateColumn(value: string, width: number): string {
+  const safeWidth = Math.max(1, width);
+  const normalized = value.trim();
+  if (normalized.length <= safeWidth) {
+    return normalized.padEnd(safeWidth, ' ');
+  }
+  return safeWidth <= 1 ? normalized.slice(0, safeWidth) : `${normalized.slice(0, safeWidth - 1)}…`;
+}
+
+function renderShortcutsTableRows(
+  page: ReturnType<typeof resolveCommandMenuPage>,
+  totalWidth: number,
+): readonly string[] {
+  const tableWidth = Math.max(30, totalWidth - 2);
+  const separatorWidth = 6;
+  const baseColumnWidth = Math.max(6, Math.floor((tableWidth - separatorWidth) / 3));
+  const leftWidth = baseColumnWidth;
+  const middleWidth = baseColumnWidth;
+  const rightWidth = Math.max(8, tableWidth - leftWidth - middleWidth - separatorWidth);
+  const rows: string[] = [];
+  rows.push(
+    `${truncateColumn('screen', leftWidth)} | ${truncateColumn('action', middleWidth)} | ${truncateColumn('bindings', rightWidth)}`,
+  );
+  for (const entry of page.displayEntries) {
+    const prefix = entry.absoluteIndex === page.selectedIndex ? '>' : ' ';
+    const screen = entry.action.screenLabel ?? 'Global';
+    const action = `${prefix} ${entry.action.title}`;
+    const bindingText =
+      entry.action.bindingHint?.trim() ??
+      entry.action.detail?.trim() ??
+      entry.action.sectionLabel?.trim() ??
+      '';
+    rows.push(
+      `${truncateColumn(screen, leftWidth)} | ${truncateColumn(action, middleWidth)} | ${truncateColumn(bindingText, rightWidth)}`,
+    );
+  }
+  return rows;
+}
+
 export function buildNewThreadModalOverlay(
   layoutCols: number,
   viewportRows: number,
@@ -88,37 +164,43 @@ export function buildCommandMenuModalOverlay(
     return null;
   }
   const isThemePicker = menu.scope === 'theme-select';
+  const isShortcutsScope = menu.scope === 'shortcuts';
   const modalSize = resolveGoldenModalSize(layoutCols, viewportRows, {
-    preferredHeight: 18,
-    minWidth: 48,
-    maxWidth: 96,
+    preferredHeight: isShortcutsScope ? 24 : COMMAND_PALETTE_MODAL_SIZE.preferredHeight,
+    minWidth: isShortcutsScope ? 84 : COMMAND_PALETTE_MODAL_SIZE.minWidth,
+    maxWidth: isShortcutsScope ? 132 : COMMAND_PALETTE_MODAL_SIZE.maxWidth,
   });
-  const matches = resolveCommandMenuMatches(actions, menu.query, null);
-  const selectedIndex =
-    matches.length === 0 ? 0 : Math.max(0, Math.min(matches.length - 1, menu.selectedIndex));
-  const pageStart =
-    matches.length === 0
-      ? 0
-      : Math.floor(selectedIndex / COMMAND_MENU_MAX_RESULTS) * COMMAND_MENU_MAX_RESULTS;
-  const visibleMatches = matches.slice(pageStart, pageStart + COMMAND_MENU_MAX_RESULTS);
-  const bodyLines: string[] = [`${isThemePicker ? 'theme' : 'search'}: ${menu.query}_`, ''];
-  if (matches.length === 0) {
+  const page = resolveCommandMenuPage(actions, menu);
+  const bodyLines: string[] = [
+    `${isThemePicker ? 'theme' : isShortcutsScope ? 'shortcuts' : 'search'}: ${menu.query}_`,
+    '',
+  ];
+  if (page.matches.length === 0) {
     bodyLines.push('no actions match');
   } else {
-    for (let index = 0; index < visibleMatches.length; index += 1) {
-      const match = visibleMatches[index]!;
-      const absoluteIndex = pageStart + index;
-      const prefix = absoluteIndex === selectedIndex ? '>' : ' ';
-      const detail = match.action.detail?.trim() ?? '';
-      bodyLines.push(
-        detail.length > 0
-          ? `${prefix} ${match.action.title} - ${detail}`
-          : `${prefix} ${match.action.title}`,
-      );
+    if (isShortcutsScope) {
+      bodyLines.push(...renderShortcutsTableRows(page, modalSize.width));
+    } else {
+      for (const entry of page.displayEntries) {
+        const prefix = entry.absoluteIndex === page.selectedIndex ? '>' : ' ';
+        const detail = entry.action.detail?.trim() ?? '';
+        bodyLines.push(
+          detail.length > 0
+            ? `${prefix} ${entry.action.title} - ${detail}`
+            : `${prefix} ${entry.action.title}`,
+        );
+      }
     }
   }
-  bodyLines.push('', isThemePicker ? 'type to filter themes' : 'type to filter');
-  const title = isThemePicker ? 'Choose Theme' : 'Command Menu';
+  bodyLines.push(
+    '',
+    isThemePicker
+      ? 'type to filter themes'
+      : isShortcutsScope
+        ? 'type to filter keybindings'
+        : 'type to filter',
+  );
+  const title = isThemePicker ? 'Choose Theme' : isShortcutsScope ? 'Shortcuts' : 'Command Menu';
   return buildUiModalOverlay({
     viewportCols: layoutCols,
     viewportRows,
@@ -128,7 +210,11 @@ export function buildCommandMenuModalOverlay(
     marginRows: 1,
     title,
     bodyLines,
-    footer: isThemePicker ? 'enter apply  esc cancel' : 'enter run  esc',
+    footer: isThemePicker
+      ? 'enter apply  esc cancel'
+      : isShortcutsScope
+        ? 'enter close  esc'
+        : 'enter run  esc',
     theme,
   });
 }
@@ -191,7 +277,7 @@ export function buildTaskEditorModalOverlay(
   const taskBody = [
     `${prompt.fieldIndex === 0 ? '>' : ' '} title: ${prompt.title}${prompt.fieldIndex === 0 ? '_' : ''}`,
     `${prompt.fieldIndex === 1 ? '>' : ' '} repository: ${selectedRepositoryName}`,
-    `${prompt.fieldIndex === 2 ? '>' : ' '} description: ${prompt.description}${
+    `${prompt.fieldIndex === 2 ? '>' : ' '} body: ${prompt.body}${
       prompt.fieldIndex === 2 ? '_' : ''
     }`,
     '',
@@ -252,6 +338,43 @@ export function buildRepositoryModalOverlay(
   });
 }
 
+export function buildApiKeyModalOverlay(
+  layoutCols: number,
+  viewportRows: number,
+  prompt: ApiKeyPromptOverlayState | null,
+  theme: UiModalThemeInput,
+): ReturnType<typeof buildUiModalOverlay> | null {
+  if (prompt === null) {
+    return null;
+  }
+  const modalSize = resolveGoldenModalSize(layoutCols, viewportRows, {
+    preferredHeight: COMMAND_PALETTE_MODAL_SIZE.preferredHeight,
+    minWidth: COMMAND_PALETTE_MODAL_SIZE.minWidth,
+    maxWidth: COMMAND_PALETTE_MODAL_SIZE.maxWidth,
+  });
+  const promptValue = prompt.value.length > 0 ? prompt.value : '(enter value)';
+  const bodyLines = [`${prompt.keyName}: ${promptValue}_`];
+  if (prompt.error !== null && prompt.error.length > 0) {
+    bodyLines.push(`error: ${prompt.error}`);
+  } else if (prompt.hasExistingValue) {
+    bodyLines.push('warning: existing value detected (submit will overwrite)');
+  } else {
+    bodyLines.push('value is saved to user-global secrets.env');
+  }
+  return buildUiModalOverlay({
+    viewportCols: layoutCols,
+    viewportRows,
+    width: modalSize.width,
+    height: modalSize.height,
+    anchor: 'center',
+    marginRows: 1,
+    title: `Set ${prompt.displayName}`,
+    bodyLines,
+    footer: 'enter save  esc',
+    theme,
+  });
+}
+
 export function buildConversationTitleModalOverlay(
   layoutCols: number,
   viewportRows: number,
@@ -293,3 +416,59 @@ export function buildConversationTitleModalOverlay(
     theme,
   });
 }
+
+export function buildReleaseNotesModalOverlay(
+  layoutCols: number,
+  viewportRows: number,
+  prompt: ReleaseNotesOverlayState | null,
+  theme: UiModalThemeInput,
+): ReturnType<typeof buildUiModalOverlay> | null {
+  if (prompt === null) {
+    return null;
+  }
+  const modalSize = resolveGoldenModalSize(layoutCols, viewportRows, {
+    preferredHeight: 24,
+    minWidth: 48,
+    maxWidth: 110,
+  });
+  const bodyLines: string[] = [
+    `installed: v${prompt.currentVersion}`,
+    `latest: ${prompt.latestTag}`,
+    RELEASE_NOTES_UPDATE_ACTION_LABEL,
+    '',
+  ];
+  const hasPreviewContent = prompt.releases.some(
+    (release) => release.previewLines.length > 0 || release.previewTruncated,
+  );
+  if (!hasPreviewContent) {
+    bodyLines.push(`version available: ${prompt.latestTag}`);
+    bodyLines.push('release notes not published yet');
+    bodyLines.push(`cmd+click: ${prompt.releases[0]?.url ?? prompt.releasesPageUrl}`, '');
+  } else {
+    for (const release of prompt.releases) {
+      const heading =
+        release.name.trim().length > 0 ? `${release.tag} - ${release.name}` : release.tag;
+      bodyLines.push(heading);
+      for (const line of release.previewLines) {
+        bodyLines.push(`  ${line}`);
+      }
+      if (release.previewTruncated) {
+        bodyLines.push('  ...');
+      }
+      bodyLines.push(`  cmd+click: ${release.url}`, '');
+    }
+  }
+  bodyLines.push(`all releases: ${prompt.releasesPageUrl}`);
+  return buildUiModalOverlay({
+    viewportCols: layoutCols,
+    viewportRows,
+    width: modalSize.width,
+    height: modalSize.height,
+    anchor: 'center',
+    marginRows: 1,
+    title: "What's New",
+    bodyLines,
+    footer: 'click update  enter dismiss  u update  n never  o open latest',
+    theme,
+  });
+}

package/src/mux/live-mux/modal-pointer.ts

@@ -1,18 +1,14 @@
 import { parseMuxInputChunk } from '../dual-pane-core.ts';
-import { type buildUiModalOverlay } from '../../ui/kit.ts';
+import type { UiModalOverlay } from '../../../packages/harness-ui/src/kit.ts';
 import { isMotionMouseCode, isWheelMouseCode } from './selection.ts';
 
 interface DismissModalOnOutsideClickOptions {
   input: Buffer;
   inputRemainder: string;
   dismiss: () => void;
-  buildCurrentModalOverlay: () => ReturnType<typeof buildUiModalOverlay> | null;
+  buildCurrentModalOverlay: () => UiModalOverlay | null;
   onInsidePointerPress?: (col: number, row: number) => boolean;
-  isOverlayHit: (
-    overlay: ReturnType<typeof buildUiModalOverlay>,
-    col: number,
-    row: number,
-  ) => boolean;
+  isOverlayHit: (overlay: UiModalOverlay, col: number, row: number) => boolean;
 }
 
 interface DismissModalOnOutsideClickResult {