spindb 0.27.1 → 0.27.3

package/cli/commands/backups.ts

@@ -11,6 +11,7 @@ import { join, extname } from 'path'
 import { homedir } from 'os'
 import chalk from 'chalk'
 import { formatBytes } from '../ui/theme'
+import { getEngineIcon } from '../constants'
 
 type BackupInfo = {
   filename: string
@@ -132,22 +133,10 @@ function formatRelativeTime(date: Date): string {
   return date.toLocaleDateString()
 }
 
-// Get engine icon
-function getEngineIcon(engine: string | null): string {
-  switch (engine) {
-    case 'postgresql':
-      return '🐘'
-    case 'mysql':
-      return '🐬'
-    case 'sqlite':
-      return '🗄️'
-    case 'mongodb':
-      return '🍃'
-    case 'redis':
-      return '🔴'
-    default:
-      return '📦'
-  }
+// Get engine icon - wraps the shared function with fallback for null/unknown engines
+function getBackupEngineIcon(engine: string | null): string {
+  if (!engine) return '📦 '
+  return getEngineIcon(engine)
 }
 
 export const backupsCommand = new Command('backups')
@@ -230,7 +219,7 @@ export const backupsCommand = new Command('backups')
       )
 
       for (const backup of limitedBackups) {
-        const icon = getEngineIcon(backup.engine)
+        const icon = getBackupEngineIcon(backup.engine)
         const filename =
           backup.filename.length > maxFilename
             ? backup.filename.slice(0, maxFilename - 3) + '...'

package/cli/commands/config.ts

@@ -10,6 +10,7 @@ import {
 } from '../../core/config-manager'
 import { updateManager } from '../../core/update-manager'
 import { uiError, uiSuccess, header, uiInfo } from '../ui/theme'
+import { getEngineIcon } from '../constants'
 import { createSpinner } from '../ui/spinner'
 import type { BinaryTool } from '../../types'
 
@@ -58,7 +59,7 @@ export const configCommand = new Command('config')
           console.log()
 
           // PostgreSQL tools
-          console.log(chalk.bold('  🐘 PostgreSQL Tools:'))
+          console.log(chalk.bold(`  ${getEngineIcon('postgresql')}PostgreSQL Tools:`))
           console.log(chalk.gray('  ' + '─'.repeat(60)))
           for (const tool of POSTGRESQL_TOOLS) {
             displayToolConfig(tool, config.binaries[tool])
@@ -66,7 +67,7 @@ export const configCommand = new Command('config')
           console.log()
 
           // MySQL tools
-          console.log(chalk.bold('  🐬 MySQL Tools:'))
+          console.log(chalk.bold(`  ${getEngineIcon('mysql')}MySQL Tools:`))
           console.log(chalk.gray('  ' + '─'.repeat(60)))
           for (const tool of MYSQL_TOOLS) {
             displayToolConfig(tool, config.binaries[tool])
@@ -156,13 +157,13 @@ export const configCommand = new Command('config')
 
           await displayCategory(
             'PostgreSQL Tools',
-            '🐘',
+            getEngineIcon('postgresql'),
             result.postgresql.found,
             result.postgresql.missing,
           )
           await displayCategory(
             'MySQL Tools',
-            '🐬',
+            getEngineIcon('mysql'),
             result.mysql.found,
             result.mysql.missing,
           )

package/cli/commands/engines.ts

@@ -29,7 +29,7 @@ import type { BinaryTool } from '../../types'
 import { promptConfirm } from '../ui/prompts'
 import { createSpinner } from '../ui/spinner'
 import { uiError, uiWarning, uiInfo, uiSuccess, formatBytes } from '../ui/theme'
-import { getEngineIcon, ENGINE_ICONS } from '../constants'
+import { getEngineIcon } from '../constants'
 import {
   getInstalledEngines,
   getInstalledPostgresEngines,
@@ -70,13 +70,6 @@ import {
   normalizeDocumentDBVersion,
 } from '../../engines/ferretdb/version-maps'
 
-// Pad string to width, accounting for emoji taking 2 display columns
-function padWithEmoji(str: string, width: number): string {
-  // Count emojis using Extended_Pictographic (excludes digits/symbols that \p{Emoji} matches)
-  const emojiCount = (str.match(/\p{Extended_Pictographic}/gu) || []).length
-  return str.padEnd(width + emojiCount)
-}
-
 // Display manual installation instructions for missing dependencies
 function displayManualInstallInstructions(
   missingDeps: Array<{ dependency: { name: string }; installed: boolean }>,
@@ -482,13 +475,13 @@ async function listEngines(options: { json?: boolean }): Promise<void> {
 
   // PostgreSQL rows
   for (const engine of pgEngines) {
-    const icon = getEngineIcon(engine.engine)
     const platformInfo = `${engine.platform}-${engine.arch}`
-    const engineDisplay = `${icon} ${engine.engine}`
+    // getEngineIcon() includes trailing space for consistent alignment
+    const engineDisplay = `${getEngineIcon(engine.engine)}${engine.engine}`
 
     console.log(
       chalk.gray('  ') +
-        chalk.cyan(padWithEmoji(engineDisplay, 13)) +
+        chalk.cyan(engineDisplay.padEnd(14)) +
         chalk.yellow(engine.version.padEnd(12)) +
         chalk.gray(platformInfo.padEnd(18)) +
         chalk.white(formatBytes(engine.sizeBytes)),
@@ -497,13 +490,12 @@ async function listEngines(options: { json?: boolean }): Promise<void> {
 
   // MySQL rows
   for (const mysqlEngine of mysqlEngines) {
-    const icon = ENGINE_ICONS.mysql
     const platformInfo = `${mysqlEngine.platform}-${mysqlEngine.arch}`
-    const engineDisplay = `${icon} mysql`
+    const engineDisplay = `${getEngineIcon('mysql')}mysql`
 
     console.log(
       chalk.gray('  ') +
-        chalk.cyan(padWithEmoji(engineDisplay, 13)) +
+        chalk.cyan(engineDisplay.padEnd(14)) +
         chalk.yellow(mysqlEngine.version.padEnd(12)) +
         chalk.gray(platformInfo.padEnd(18)) +
         chalk.white(formatBytes(mysqlEngine.sizeBytes)),
@@ -512,12 +504,11 @@ async function listEngines(options: { json?: boolean }): Promise<void> {
 
   // SQLite row
   if (sqliteEngine) {
-    const icon = ENGINE_ICONS.sqlite
-    const engineDisplay = `${icon}  sqlite`
+    const engineDisplay = `${getEngineIcon('sqlite')}sqlite`
 
     console.log(
       chalk.gray('  ') +
-        chalk.cyan(padWithEmoji(engineDisplay, 13)) +
+        chalk.cyan(engineDisplay.padEnd(14)) +
         chalk.yellow(sqliteEngine.version.padEnd(12)) +
         chalk.gray('system'.padEnd(18)) +
         chalk.gray('(system-installed)'),
@@ -526,13 +517,12 @@ async function listEngines(options: { json?: boolean }): Promise<void> {
 
   // DuckDB rows
   for (const engine of duckdbEngines) {
-    const icon = ENGINE_ICONS.duckdb
     const platformInfo = `${engine.platform}-${engine.arch}`
-    const engineDisplay = `${icon} duckdb`
+    const engineDisplay = `${getEngineIcon('duckdb')}duckdb`
 
     console.log(
       chalk.gray('  ') +
-        chalk.cyan(padWithEmoji(engineDisplay, 13)) +
+        chalk.cyan(engineDisplay.padEnd(14)) +
         chalk.yellow(engine.version.padEnd(12)) +
         chalk.gray(platformInfo.padEnd(18)) +
         chalk.white(formatBytes(engine.sizeBytes)),
@@ -541,13 +531,12 @@ async function listEngines(options: { json?: boolean }): Promise<void> {
 
   // MongoDB rows
   for (const engine of mongodbEngines) {
-    const icon = ENGINE_ICONS.mongodb
     const platformInfo = `${engine.platform}-${engine.arch}`
-    const engineDisplay = `${icon} mongodb`
+    const engineDisplay = `${getEngineIcon('mongodb')}mongodb`
 
     console.log(
       chalk.gray('  ') +
-        chalk.cyan(padWithEmoji(engineDisplay, 13)) +
+        chalk.cyan(engineDisplay.padEnd(14)) +
         chalk.yellow(engine.version.padEnd(12)) +
         chalk.gray(platformInfo.padEnd(18)) +
         chalk.white(formatBytes(engine.sizeBytes)),
@@ -556,13 +545,12 @@ async function listEngines(options: { json?: boolean }): Promise<void> {
 
   // FerretDB rows
   for (const engine of ferretdbEngines) {
-    const icon = ENGINE_ICONS.ferretdb
     const platformInfo = `${engine.platform}-${engine.arch}`
-    const engineDisplay = `${icon} ferretdb`
+    const engineDisplay = `${getEngineIcon('ferretdb')}ferretdb`
 
     console.log(
       chalk.gray('  ') +
-        chalk.cyan(padWithEmoji(engineDisplay, 13)) +
+        chalk.cyan(engineDisplay.padEnd(14)) +
         chalk.yellow(engine.version.padEnd(12)) +
         chalk.gray(platformInfo.padEnd(18)) +
         chalk.white(formatBytes(engine.sizeBytes)),
@@ -571,13 +559,12 @@ async function listEngines(options: { json?: boolean }): Promise<void> {
 
   // Redis rows
   for (const engine of redisEngines) {
-    const icon = ENGINE_ICONS.redis
     const platformInfo = `${engine.platform}-${engine.arch}`
-    const engineDisplay = `${icon} redis`
+    const engineDisplay = `${getEngineIcon('redis')}redis`
 
     console.log(
       chalk.gray('  ') +
-        chalk.cyan(padWithEmoji(engineDisplay, 13)) +
+        chalk.cyan(engineDisplay.padEnd(14)) +
         chalk.yellow(engine.version.padEnd(12)) +
         chalk.gray(platformInfo.padEnd(18)) +
         chalk.white(formatBytes(engine.sizeBytes)),
@@ -586,13 +573,12 @@ async function listEngines(options: { json?: boolean }): Promise<void> {
 
   // Valkey rows
   for (const engine of valkeyEngines) {
-    const icon = ENGINE_ICONS.valkey
     const platformInfo = `${engine.platform}-${engine.arch}`
-    const engineDisplay = `${icon} valkey`
+    const engineDisplay = `${getEngineIcon('valkey')}valkey`
 
     console.log(
       chalk.gray('  ') +
-        chalk.cyan(padWithEmoji(engineDisplay, 13)) +
+        chalk.cyan(engineDisplay.padEnd(14)) +
         chalk.yellow(engine.version.padEnd(12)) +
         chalk.gray(platformInfo.padEnd(18)) +
         chalk.white(formatBytes(engine.sizeBytes)),
@@ -601,13 +587,12 @@ async function listEngines(options: { json?: boolean }): Promise<void> {
 
   // Qdrant rows
   for (const engine of qdrantEngines) {
-    const icon = ENGINE_ICONS.qdrant
     const platformInfo = `${engine.platform}-${engine.arch}`
-    const engineDisplay = `${icon} qdrant`
+    const engineDisplay = `${getEngineIcon('qdrant')}qdrant`
 
     console.log(
       chalk.gray('  ') +
-        chalk.cyan(padWithEmoji(engineDisplay, 13)) +
+        chalk.cyan(engineDisplay.padEnd(14)) +
         chalk.yellow(engine.version.padEnd(12)) +
         chalk.gray(platformInfo.padEnd(18)) +
         chalk.white(formatBytes(engine.sizeBytes)),
@@ -616,13 +601,12 @@ async function listEngines(options: { json?: boolean }): Promise<void> {
 
   // Meilisearch rows
   for (const engine of meilisearchEngines) {
-    const icon = ENGINE_ICONS.meilisearch
     const platformInfo = `${engine.platform}-${engine.arch}`
-    const engineDisplay = `${icon} meilisearch`
+    const engineDisplay = `${getEngineIcon('meilisearch')}meilisearch`
 
     console.log(
       chalk.gray('  ') +
-        chalk.cyan(padWithEmoji(engineDisplay, 13)) +
+        chalk.cyan(engineDisplay.padEnd(14)) +
         chalk.yellow(engine.version.padEnd(12)) +
         chalk.gray(platformInfo.padEnd(18)) +
         chalk.white(formatBytes(engine.sizeBytes)),
@@ -631,13 +615,12 @@ async function listEngines(options: { json?: boolean }): Promise<void> {
 
   // CouchDB rows
   for (const engine of couchdbEngines) {
-    const icon = ENGINE_ICONS.couchdb
     const platformInfo = `${engine.platform}-${engine.arch}`
-    const engineDisplay = `${icon} couchdb`
+    const engineDisplay = `${getEngineIcon('couchdb')}couchdb`
 
     console.log(
       chalk.gray('  ') +
-        chalk.cyan(padWithEmoji(engineDisplay, 13)) +
+        chalk.cyan(engineDisplay.padEnd(14)) +
         chalk.yellow(engine.version.padEnd(12)) +
         chalk.gray(platformInfo.padEnd(18)) +
         chalk.white(formatBytes(engine.sizeBytes)),
@@ -778,7 +761,7 @@ async function deleteEngine(
   // Interactive selection if not provided
   if (!engineName || !engineVersion) {
     const choices = pgEngines.map((e) => ({
-      name: `${getEngineIcon(e.engine)} ${e.engine} ${e.version} ${chalk.gray(`(${formatBytes(e.sizeBytes)})`)}`,
+      name: `${getEngineIcon(e.engine)}${e.engine} ${e.version} ${chalk.gray(`(${formatBytes(e.sizeBytes)})`)}`,
       value: `${e.engine}:${e.version}:${e.path}`,
     }))
 

package/cli/commands/info.ts

@@ -81,7 +81,7 @@ async function displayContainerInfo(
   console.log(
     chalk.gray('  ') +
       chalk.white('Engine:'.padEnd(14)) +
-      chalk.cyan(`${icon} ${config.engine} ${config.version}`),
+      chalk.cyan(`${icon}${config.engine} ${config.version}`),
   )
   console.log(
     chalk.gray('  ') + chalk.white('Status:'.padEnd(14)) + statusDisplay,
@@ -192,8 +192,8 @@ async function displayAllContainersInfo(
           : chalk.gray('○ stopped')
     }
 
-    const icon = getEngineIcon(container.engine)
-    const engineDisplay = `${icon} ${container.engine}`
+    // getEngineIcon() includes trailing space for consistent alignment
+    const engineDisplay = `${getEngineIcon(container.engine)}${container.engine}`
 
     // Show truncated file path for SQLite instead of port
     let portOrPath: string
@@ -290,7 +290,7 @@ export const infoCommand = new Command('info')
             choices: [
               { name: 'All containers', value: 'all' },
               ...containers.map((c) => ({
-                name: `${c.name} ${chalk.gray(`(${getEngineIcon(c.engine)} ${c.engine})`)}`,
+                name: `${c.name} ${chalk.gray(`(${getEngineIcon(c.engine)}${c.engine})`)}`,
                 value: c.name,
               })),
             ],

package/cli/commands/list.ts

@@ -14,12 +14,6 @@ import {
   deriveContainerName,
 } from '../../engines/sqlite/scanner'
 
-// Pad string to width, accounting for emoji taking 2 display columns
-function padWithEmoji(str: string, width: number): string {
-  // Count emojis using Extended_Pictographic (excludes digits/symbols that \p{Emoji} matches)
-  const emojiCount = (str.match(/\p{Extended_Pictographic}/gu) || []).length
-  return str.padEnd(width + emojiCount)
-}
 
 /**
  * Prompt user about unregistered SQLite files in CWD
@@ -194,8 +188,8 @@ export const listCommand = new Command('list')
               : chalk.gray('○ stopped')
         }
 
-        const engineIcon = getEngineIcon(container.engine)
-        const engineDisplay = `${engineIcon} ${container.engine}`
+        // getEngineIcon() includes trailing space for consistent alignment
+        const engineDisplay = `${getEngineIcon(container.engine)}${container.engine}`
 
         const sizeDisplay = size !== null ? formatBytes(size) : chalk.gray('—')
 
@@ -213,7 +207,7 @@ export const listCommand = new Command('list')
         console.log(
           chalk.gray('  ') +
             chalk.cyan(container.name.padEnd(20)) +
-            chalk.white(padWithEmoji(engineDisplay, 14)) +
+            chalk.white(engineDisplay.padEnd(15)) +
             chalk.yellow(container.version.padEnd(10)) +
             chalk.green(portOrPath.padEnd(8)) +
             chalk.magenta(sizeDisplay.padEnd(10)) +

package/cli/commands/menu/backup-handlers.ts

@@ -347,7 +347,7 @@ export async function handleRestore(): Promise<void> {
 
     const choices = [
       ...running.map((c) => ({
-        name: `${c.name} ${chalk.gray(`(${getEngineIcon(c.engine)} ${c.engine} ${c.version}, port ${c.port})`)} ${chalk.green('● running')}`,
+        name: `${c.name} ${chalk.gray(`(${getEngineIcon(c.engine)}${c.engine} ${c.version}, port ${c.port})`)} ${chalk.green('● running')}`,
         value: c.name,
         short: c.name,
       })),
@@ -442,7 +442,7 @@ export async function handleRestore(): Promise<void> {
     ]
 
     restoreChoices.push({
-      name: `${chalk.cyan('🔗')} Connection string (pull from remote database)`,
+      name: `${chalk.cyan('↗')} Connection string ${chalk.gray('(pull from remote database)')}`,
       value: 'connection',
     })
 
@@ -1118,7 +1118,7 @@ export async function handleRestoreForContainer(
       value: 'file',
     },
     {
-      name: `${chalk.cyan('🔗')} Connection string (pull from remote database)`,
+      name: `${chalk.cyan('↗')} Connection string ${chalk.gray('(pull from remote database)')}`,
       value: 'connection',
     },
   ]

package/cli/commands/menu/container-handlers.ts

@@ -31,6 +31,8 @@ import {
   promptDatabaseName,
   promptFileDatabasePath,
   escapeablePrompt,
+  filterableListPrompt,
+  type FilterableChoice,
   BACK_VALUE,
   MAIN_MENU_VALUE,
 } from '../../ui/prompts'
@@ -468,7 +470,7 @@ export async function handleList(
   const COL_SIZE = 9
 
   // Build selectable choices with formatted display (like engines menu)
-  const containerChoices: MenuChoice[] = containers.map((c, i) => {
+  const containerChoices: FilterableChoice[] = containers.map((c, i) => {
     const size = sizes[i]
     const isFileBased = isFileBasedEngine(c.engine)
 
@@ -532,26 +534,27 @@ export async function handleList(
     )
   }
 
-  // Add separator with summary and actions
-  containerChoices.push(new inquirer.Separator(chalk.gray('─'.repeat(60))))
-  containerChoices.push(
+  // Build the full choice list with footer items
+  const allChoices: (FilterableChoice | inquirer.Separator)[] = [
+    ...containerChoices,
+    new inquirer.Separator(chalk.gray('─'.repeat(60))),
     new inquirer.Separator(
-      chalk.gray(`${containers.length} container(s): ${parts.join('; ')}`),
+      `${containers.length} container(s): ${parts.join('; ')} ${chalk.gray('— type to filter')}`,
     ),
-  )
-  containerChoices.push(new inquirer.Separator())
-  containerChoices.push({ name: `${chalk.green('+')} Create new`, value: 'create' })
-  containerChoices.push({ name: `${chalk.blue('←')} Back to main menu ${chalk.gray('(esc)')}`, value: 'back' })
+    new inquirer.Separator(),
+    { name: `${chalk.green('+')} Create new`, value: 'create' },
+    { name: `${chalk.blue('←')} Back to main menu ${chalk.gray('(esc)')}`, value: 'back' },
+  ]
 
-  const { selectedContainer } = await escapeablePrompt<{ selectedContainer: string }>([
+  const selectedContainer = await filterableListPrompt(
+    allChoices,
+    'Select a container:',
     {
-      type: 'list',
-      name: 'selectedContainer',
-      message: 'Select a container:',
-      choices: containerChoices,
+      filterableCount: containerChoices.length,
       pageSize: 15,
+      emptyText: 'No containers match filter',
     },
-  ])
+  )
 
   // Back returns to main menu (escape is handled globally)
   if (selectedContainer === 'back') {
@@ -630,19 +633,21 @@ export async function showContainerSubmenu(
     }
   }
 
+  // Helper for disabled menu items - includes grayed hint in the name
+  const disabledItem = (icon: string, label: string, hint: string) => ({
+    name: chalk.gray(`${icon} ${label}`) + chalk.gray(` (${hint})`),
+    value: '_disabled_',
+    disabled: true, // true hides inquirer's default reason text
+  })
+
   // Open shell - always enabled for file-based DBs (if file exists), server databases need to be running
   const canOpenShell = isFileBasedDB ? existsSync(config.database) : isRunning
-  actionChoices.push({
-    name: canOpenShell
-      ? `${chalk.blue('⌘')} Open shell`
-      : chalk.gray('⌘ Open shell'),
-    value: 'shell',
-    disabled: canOpenShell
-      ? false
-      : isFileBasedDB
-        ? 'Database file missing'
-        : 'Start container first',
-  })
+  const shellHint = isFileBasedDB ? 'Database file missing' : 'Start container first'
+  actionChoices.push(
+    canOpenShell
+      ? { name: `${chalk.blue('>')} Open shell`, value: 'shell' }
+      : disabledItem('>', 'Open shell', shellHint),
+  )
 
   // Run SQL/script - always enabled for file-based DBs (if file exists), server databases need to be running
   // REST API engines (Qdrant, Meilisearch, CouchDB) don't support script files - hide the option entirely
@@ -657,38 +662,29 @@ export async function showContainerSubmenu(
           : config.engine === Engine.SurrealDB
             ? 'Run SurrealQL file'
             : 'Run SQL file'
-    actionChoices.push({
-      name: canRunSql
-        ? `${chalk.yellow('▷')} ${runScriptLabel}`
-        : chalk.gray(`▷ ${runScriptLabel}`),
-      value: 'run-sql',
-      disabled: canRunSql
-        ? false
-        : isFileBasedDB
-          ? 'Database file missing'
-          : 'Start container first',
-    })
+    const runSqlHint = isFileBasedDB ? 'Database file missing' : 'Start container first'
+    actionChoices.push(
+      canRunSql
+        ? { name: `${chalk.yellow('▷')} ${runScriptLabel}`, value: 'run-sql' }
+        : disabledItem('▷', runScriptLabel, runSqlHint),
+    )
   }
 
   // Edit container - file-based DBs can always edit (no running state), server databases must be stopped
   const canEdit = isFileBasedDB ? true : !isRunning
-  actionChoices.push({
-    name: canEdit
-      ? `${chalk.white('⚙')} Edit container`
-      : chalk.gray('⚙ Edit container'),
-    value: 'edit',
-    disabled: canEdit ? false : 'Stop container first',
-  })
+  actionChoices.push(
+    canEdit
+      ? { name: `${chalk.yellow('⚙')} Edit container`, value: 'edit' }
+      : disabledItem('⚙', 'Edit container', 'Stop container first'),
+  )
 
   // Clone container - file-based DBs can always clone, server databases must be stopped
   const canClone = isFileBasedDB ? true : !isRunning
-  actionChoices.push({
-    name: canClone
-      ? `${chalk.cyan('⧉')} Clone container`
-      : chalk.gray('⧉ Clone container'),
-    value: 'clone',
-    disabled: canClone ? false : 'Stop container first',
-  })
+  actionChoices.push(
+    canClone
+      ? { name: `${chalk.cyan('◇')} Clone container`, value: 'clone' }
+      : disabledItem('◇', 'Clone container', 'Stop container first'),
+  )
 
   actionChoices.push({
     name: `${chalk.magenta('⊕')} Copy connection string`,
@@ -697,31 +693,21 @@ export async function showContainerSubmenu(
 
   // Backup - requires running for server databases, file exists for file-based DBs
   const canBackup = isFileBasedDB ? existsSync(config.database) : isRunning
-  actionChoices.push({
-    name: canBackup
-      ? `${chalk.magenta('↓')} Backup database`
-      : chalk.gray('↓ Backup database'),
-    value: 'backup',
-    disabled: canBackup
-      ? false
-      : isFileBasedDB
-        ? 'Database file missing'
-        : 'Start container first',
-  })
+  const backupHint = isFileBasedDB ? 'Database file missing' : 'Start container first'
+  actionChoices.push(
+    canBackup
+      ? { name: `${chalk.magenta('↓')} Backup database`, value: 'backup' }
+      : disabledItem('↓', 'Backup database', backupHint),
+  )
 
   // Restore - requires running for server databases, file exists for file-based DBs
   const canRestore = isFileBasedDB ? existsSync(config.database) : isRunning
-  actionChoices.push({
-    name: canRestore
-      ? `${chalk.magenta('↑')} Restore from backup`
-      : chalk.gray('↑ Restore from backup'),
-    value: 'restore',
-    disabled: canRestore
-      ? false
-      : isFileBasedDB
-        ? 'Database file missing'
-        : 'Start container first',
-  })
+  const restoreHint = isFileBasedDB ? 'Database file missing' : 'Start container first'
+  actionChoices.push(
+    canRestore
+      ? { name: `${chalk.magenta('↑')} Restore from backup`, value: 'restore' }
+      : disabledItem('↑', 'Restore from backup', restoreHint),
+  )
 
   // View logs - not available for file-based DBs (no log file)
   if (!isFileBasedDB) {
@@ -741,13 +727,11 @@ export async function showContainerSubmenu(
 
   // Delete container - file-based DBs can always delete, server databases must be stopped
   const canDelete = isFileBasedDB ? true : !isRunning
-  actionChoices.push({
-    name: canDelete
-      ? `${chalk.red('✕')} Delete container`
-      : chalk.gray('✕ Delete container'),
-    value: 'delete',
-    disabled: canDelete ? false : 'Stop container first',
-  })
+  actionChoices.push(
+    canDelete
+      ? { name: `${chalk.red('✕')} Delete container`, value: 'delete' }
+      : disabledItem('✕', 'Delete container', 'Stop container first'),
+  )
 
   actionChoices.push(
     new inquirer.Separator(),

package/cli/commands/menu/engine-handlers.ts

@@ -5,7 +5,12 @@ import { join, dirname, basename } from 'path'
 import { containerManager } from '../../../core/container-manager'
 import { createSpinner } from '../../ui/spinner'
 import { header, uiError, uiWarning, uiInfo, formatBytes } from '../../ui/theme'
-import { promptConfirm, escapeablePrompt } from '../../ui/prompts'
+import {
+  promptConfirm,
+  escapeablePrompt,
+  filterableListPrompt,
+  type FilterableChoice,
+} from '../../ui/prompts'
 import { getEngineIcon, getEngineIconPadded } from '../../constants'
 import {
   getInstalledEngines,
@@ -93,7 +98,7 @@ export async function handleEngines(): Promise<void> {
   const COL_SIZE = 10
 
   // Build selectable choices with formatted display
-  const choices: MenuChoice[] = allEnginesSorted.map((e) => {
+  const engineChoices: FilterableChoice[] = allEnginesSorted.map((e) => {
     // Use getEngineIconPadded to handle emoji width inconsistencies
     // Icons like 🦭 and 🪶 render at width 1, others at width 2
     const icon = getEngineIconPadded(e.engine)
@@ -114,25 +119,26 @@ export async function handleEngines(): Promise<void> {
     }
   })
 
-  choices.push(new inquirer.Separator(chalk.gray('─'.repeat(52))))
-  choices.push(
+  // Build full choice list with footer
+  const allChoices: (FilterableChoice | inquirer.Separator)[] = [
+    ...engineChoices,
+    new inquirer.Separator(chalk.gray('─'.repeat(52))),
     new inquirer.Separator(
-      chalk.gray(`Total: ${engines.length} engine(s), ${formatBytes(totalSize)}`),
+      `Total: ${engines.length} engine(s), ${formatBytes(totalSize)} ${chalk.gray('— type to filter')}`,
     ),
-  )
-  choices.push(new inquirer.Separator())
-  choices.push({ name: `${chalk.blue('←')} Back to main menu ${chalk.gray('(esc)')}`, value: 'back' })
-  choices.push(new inquirer.Separator()) // Separator for when list wraps around
+    new inquirer.Separator(),
+    { name: `${chalk.blue('←')} Back to main menu ${chalk.gray('(esc)')}`, value: 'back' },
+  ]
 
-  const { action } = await escapeablePrompt<{ action: string }>([
+  const action = await filterableListPrompt(
+    allChoices,
+    'Select an engine:',
     {
-      type: 'list',
-      name: 'action',
-      message: 'Select an engine:',
-      choices,
+      filterableCount: engineChoices.length,
       pageSize: 18,
+      emptyText: 'No engines match filter',
     },
-  ])
+  )
 
   // Back returns to main menu (escape is handled globally)
   if (action === 'back') {
@@ -176,7 +182,7 @@ async function showEngineSubmenu(
   console.log()
   console.log(
     chalk.cyan(
-      `  ${getEngineIcon(engineName)} ${engineName} ${engineVersion} ${chalk.gray(`(${formatBytes(sizeBytes)})`)}`,
+      `  ${getEngineIcon(engineName)}${engineName} ${engineVersion} ${chalk.gray(`(${formatBytes(sizeBytes)})`)}`,
     ),
   )
   console.log()