spindb 0.31.3 → 0.31.4

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

@@ -444,6 +444,7 @@ export async function handleCreate(): Promise<'main' | string | void> {
 
 export async function handleList(
   showMainMenu: () => Promise<void>,
+  options?: { focusContainer?: string },
 ): Promise<void> {
   console.clear()
   console.log(header('Containers'))
@@ -570,19 +571,19 @@ export async function handleList(
     (c) => !isFileBasedEngine(c.engine),
   )
 
-  // Build the full choice list with header hint and footer items
+  // Build the full choice list with footer items
+  // IMPORTANT: Containers must come FIRST because filterableCount slices from index 0
   const summary = `${containers.length} container(s): ${parts.join('; ')}`
   const allChoices: (FilterableChoice | inquirer.Separator)[] = [
-    // Show toggle hint at top when server-based containers exist
+    ...containerChoices,
+    // Show toggle hint after containers (before footer) when server-based containers exist
     ...(hasServerContainers
       ? [
           new inquirer.Separator(
             chalk.cyan('── [Shift+Tab] toggle start/stop ──'),
           ),
         ]
-      : []),
-    ...containerChoices,
-    new inquirer.Separator(),
+      : [new inquirer.Separator()]),
     new inquirer.Separator(summary),
     new inquirer.Separator(),
     { name: `${chalk.green('+')} Create new`, value: 'create' },
@@ -601,6 +602,7 @@ export async function handleList(
       pageSize: getPageSize(),
       emptyText: 'No containers match filter',
       enableToggle: hasServerContainers,
+      defaultValue: options?.focusContainer,
     },
   )
 
@@ -614,27 +616,21 @@ export async function handleList(
         engine: config.engine,
       })
 
-      // Clear screen and show brief status
-      console.clear()
-      console.log(header('Containers'))
-
+      // Show inline status without clearing screen
+      console.log()
       if (isRunning) {
         await handleStopContainer(containerName)
-        // Brief pause so user can see the result
-        await new Promise((resolve) => setTimeout(resolve, 300))
       } else {
         const result = await handleStartContainer(containerName)
         if (result === 'home') {
           await showMainMenu()
           return
         }
-        // Brief pause so user can see the result (for 'started' or 'back')
-        await new Promise((resolve) => setTimeout(resolve, 300))
       }
     }
 
-    // Refresh the container list
-    await handleList(showMainMenu)
+    // Refresh the container list with cursor on the same container
+    await handleList(showMainMenu, { focusContainer: containerName })
     return
   }
 

package/cli/ui/prompts.ts

@@ -41,14 +41,14 @@ export const TOGGLE_PREFIX = '__toggle__:'
 let globalEscapeEnabled = false
 let escapeTriggered = false
 let escapeReject: ((error: Error) => void) | null = null
-let currentPromptUi: { close?: () => void } | null = null
+// Store the raw UI object so we can access activePrompt dynamically
+// (activePrompt may not be set at capture time due to async initialization)
+let currentPromptUi: Record<string, unknown> | null = null
 
 // Toggle handler state (Shift+Tab to toggle container start/stop)
 let toggleEnabled = false
-let toggleCursorPosition = 0
-let toggleCurrentItems: FilterableChoice[] = []
-let toggleTriggered = false
-let toggleTargetValue: string | null = null
+// Set of values that are valid toggle targets (container names)
+let toggleValidTargets: Set<string> = new Set()
 
 // Custom error class for escape
 export class EscapeError extends Error {
@@ -82,45 +82,61 @@ function onEscapeData(data: Buffer): void {
   if (data.length === 3 && data[0] === 27 && data[1] === 91) {
     const keyCode = data[2]
 
-    // Arrow Up: \x1b[A (27, 91, 65)
-    if (keyCode === 65 && toggleEnabled) {
-      toggleCursorPosition = Math.max(0, toggleCursorPosition - 1)
-      return // Let inquirer handle the actual cursor movement
-    }
+    // Shift+Tab: \x1b[Z (27, 91, 90)
+    // Access inquirer's internal state to get the currently highlighted value
+    if (keyCode === 90 && toggleEnabled && currentPromptUi) {
+      try {
+        // Access activePrompt dynamically (it may not be set at capture time)
+        // inquirer-autocomplete-prompt uses 'selected' for cursor index
+        // and currentChoices.getChoice(index) to get the choice object
+        const activePrompt = currentPromptUi.activePrompt as
+          | {
+              selected?: number
+              currentChoices?: {
+                getChoice?: (
+                  index: number,
+                ) => { value?: string; type?: string } | undefined
+              }
+            }
+          | undefined
 
-    // Arrow Down: \x1b[B (27, 91, 66)
-    if (keyCode === 66 && toggleEnabled) {
-      toggleCursorPosition = Math.min(
-        toggleCurrentItems.length - 1,
-        toggleCursorPosition + 1,
-      )
-      return // Let inquirer handle the actual cursor movement
-    }
+        if (
+          activePrompt?.currentChoices?.getChoice &&
+          activePrompt.selected !== undefined
+        ) {
+          const currentChoice = activePrompt.currentChoices.getChoice(
+            activePrompt.selected,
+          )
 
-    // Shift+Tab: \x1b[Z (27, 91, 90)
-    if (keyCode === 90 && toggleEnabled && toggleCurrentItems.length > 0) {
-      // Get the currently highlighted item's value
-      const currentItem = toggleCurrentItems[toggleCursorPosition]
-      if (currentItem) {
-        toggleTriggered = true
-        toggleTargetValue = currentItem.value
-
-        // Reject the prompt to interrupt it
-        if (escapeReject) {
-          const reject = escapeReject
-          escapeReject = null
-          reject(new ToggleError(currentItem.value))
-        }
+          // Check if the highlighted item is a valid toggle target (a container)
+          // Skip separators (type === 'separator') and non-container items
+          if (
+            currentChoice &&
+            currentChoice.value &&
+            currentChoice.type !== 'separator' &&
+            toggleValidTargets.has(currentChoice.value)
+          ) {
+            // Reject the prompt with the container value to toggle
+            if (escapeReject) {
+              const reject = escapeReject
+              escapeReject = null
+              reject(new ToggleError(currentChoice.value))
+            }
 
-        // Close the prompt UI
-        if (currentPromptUi?.close) {
-          try {
-            currentPromptUi.close()
-          } catch {
-            // Swallow errors from inquirer internals
+            // Close the prompt UI
+            if (typeof currentPromptUi.close === 'function') {
+              try {
+                currentPromptUi.close()
+              } catch {
+                // Swallow errors from inquirer internals
+              }
+              currentPromptUi = null
+            }
           }
-          currentPromptUi = null
         }
+      } catch {
+        // Ignore errors accessing inquirer internals - the prompt state
+        // may be inconsistent during filtering or other operations
       }
       return
     }
@@ -141,7 +157,7 @@ function onEscapeData(data: Buffer): void {
     // Then close the prompt UI to stop it from rendering
     // Do this after rejecting so the error propagates first
     // Wrap in try/catch as inquirer internals may change between versions
-    if (currentPromptUi?.close) {
+    if (currentPromptUi && typeof currentPromptUi.close === 'function') {
       try {
         currentPromptUi.close()
       } catch {
@@ -152,12 +168,6 @@ function onEscapeData(data: Buffer): void {
     // Clear the screen
     console.clear()
   }
-
-  // Any other input (typing to filter) resets cursor to 0
-  // This helps keep our tracking in sync when the list is filtered
-  if (toggleEnabled && data.length > 0 && data[0] !== 27) {
-    toggleCursorPosition = 0
-  }
 }
 
 /**
@@ -196,14 +206,11 @@ export function checkAndResetEscape(): boolean {
 
 /**
  * Enable toggle tracking for the container list.
- * This tracks arrow key movements and Shift+Tab presses.
+ * @param validTargets - Set of values that are valid toggle targets (container names)
  */
-export function enableToggleTracking(): void {
+export function enableToggleTracking(validTargets: Set<string>): void {
   toggleEnabled = true
-  toggleCursorPosition = 0
-  toggleCurrentItems = []
-  toggleTriggered = false
-  toggleTargetValue = null
+  toggleValidTargets = validTargets
 }
 
 /**
@@ -211,36 +218,7 @@ export function enableToggleTracking(): void {
  */
 export function disableToggleTracking(): void {
   toggleEnabled = false
-  toggleCursorPosition = 0
-  toggleCurrentItems = []
-  toggleTriggered = false
-  toggleTargetValue = null
-}
-
-/**
- * Update the current list of filterable items.
- * Called by filterableListPrompt when the source function returns new items.
- */
-export function updateToggleItems(items: FilterableChoice[]): void {
-  toggleCurrentItems = items
-  // Clamp cursor position to valid range
-  if (toggleCursorPosition >= items.length) {
-    toggleCursorPosition = Math.max(0, items.length - 1)
-  }
-}
-
-/**
- * Check if toggle was triggered and get the target value.
- * Resets the toggle state after reading.
- */
-export function checkAndResetToggle(): {
-  triggered: boolean
-  value: string | null
-} {
-  const result = { triggered: toggleTriggered, value: toggleTargetValue }
-  toggleTriggered = false
-  toggleTargetValue = null
-  return result
+  toggleValidTargets = new Set()
 }
 
 /**
@@ -279,7 +257,7 @@ export async function escapeablePrompt<T extends Record<string, unknown>>(
       promptWithUi.ui !== null &&
       typeof (promptWithUi.ui as Record<string, unknown>).close === 'function'
     ) {
-      currentPromptUi = promptWithUi.ui as { close: () => void }
+      currentPromptUi = promptWithUi.ui as Record<string, unknown>
     } else {
       currentPromptUi = null
     }
@@ -322,6 +300,7 @@ export async function filterableListPrompt(
     pageSize?: number
     emptyText?: string
     enableToggle?: boolean
+    defaultValue?: string // Pre-select this value (cursor starts here)
   },
 ): Promise<string> {
   // Split choices into filterable items and static footer (separators, back buttons, etc.)
@@ -332,9 +311,10 @@ export async function filterableListPrompt(
   const footerItems = choices.slice(options.filterableCount)
 
   // Enable toggle tracking if requested
+  // Build a set of valid toggle targets (the container values from filterable items)
   if (options.enableToggle) {
-    enableToggleTracking()
-    updateToggleItems(filterableItems)
+    const validTargets = new Set(filterableItems.map((item) => item.value))
+    enableToggleTracking(validTargets)
   }
 
   // Source function for autocomplete - filters items based on input
@@ -349,10 +329,6 @@ export async function filterableListPrompt(
     if (!searchTerm) {
       // No filter - show all items
       result = [...filterableItems, ...footerItems]
-      // Update toggle tracking with current filterable items
-      if (options.enableToggle) {
-        updateToggleItems(filterableItems)
-      }
     } else {
       // Filter items by matching search term against the display name
       // Strip ANSI codes for matching but keep them for display
@@ -372,16 +348,8 @@ export async function filterableListPrompt(
           ),
           ...footerItems,
         ]
-        // Update toggle tracking with empty list (no items to toggle)
-        if (options.enableToggle) {
-          updateToggleItems([])
-        }
       } else {
         result = [...filtered, ...footerItems]
-        // Update toggle tracking with filtered items
-        if (options.enableToggle) {
-          updateToggleItems(filtered)
-        }
       }
     }
 
@@ -406,10 +374,14 @@ export async function filterableListPrompt(
         // Suppress the default "(Use arrow keys or type to search)" suffix
         // since we include custom instructions in the message
         suffix: '',
+        // Pre-select a value (cursor starts on this item)
+        default: options.defaultValue,
       },
     ])
 
-    // Register the prompt UI for escape handling
+    // Register the prompt UI for escape and toggle handling
+    // Store the raw UI object so we can access activePrompt dynamically
+    // (activePrompt contains selected and currentChoices for the highlighted item)
     const promptWithUi = p as unknown as Record<string, unknown>
     if (
       promptWithUi.ui &&
@@ -417,7 +389,7 @@ export async function filterableListPrompt(
       promptWithUi.ui !== null &&
       typeof (promptWithUi.ui as Record<string, unknown>).close === 'function'
     ) {
-      currentPromptUi = promptWithUi.ui as { close: () => void }
+      currentPromptUi = promptWithUi.ui as Record<string, unknown>
     } else {
       currentPromptUi = null
     }

package/engines/ferretdb/index.ts

@@ -623,6 +623,9 @@ export class FerretDBEngine extends BaseEngine {
       const spawnOpts: SpawnOptions = {
         stdio: ['ignore', 'pipe', 'pipe'],
         detached: true,
+        // Run FerretDB in the container directory so telemetry.json/state.json
+        // are written there instead of polluting the user's cwd
+        cwd: containerDir,
       }
 
       const proc = spawn(ferretdbBinary, ferretArgs, spawnOpts)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spindb",
-  "version": "0.31.3",
+  "version": "0.31.4",
   "author": "Bob Bass <bob@bbass.co>",
   "license": "PolyForm-Noncommercial-1.0.0",
   "description": "Zero-config Docker-free local database containers. Create, backup, and clone a variety of popular databases.",
@@ -22,7 +22,10 @@
     "test:local:quick": "./scripts/test-local.sh --quick",
     "test:local:fresh": "./scripts/test-local.sh --fresh",
     "test:docker": "bash tests/docker/run-docker-test.sh",
-    "generate:qdrant-snapshot": "tsx scripts/generate-qdrant-snapshot.ts",
+    "generate:backup": "tsx scripts/generate/backup/index.ts",
+    "generate:db": "tsx scripts/generate/db/index.ts",
+    "generate:missing": "tsx scripts/generate/missing-databases.ts",
+    "delete:demos": "tsx scripts/generate/delete-demos.ts",
     "format": "prettier --write .",
     "lint": "tsc --noEmit && eslint .",
     "prepare": "husky"