spindb 0.5.3 → 0.5.4

package/cli/commands/menu.ts

@@ -33,7 +33,19 @@ import { defaults } from '../../config/defaults'
 import { getPostgresHomebrewPackage } from '../../config/engine-defaults'
 import type { EngineName } from '../../types'
 import inquirer from 'inquirer'
-import { getMissingDependencies } from '../../core/dependency-manager'
+import {
+  getMissingDependencies,
+  isUsqlInstalled,
+  isPgcliInstalled,
+  isMycliInstalled,
+  detectPackageManager,
+  installUsql,
+  installPgcli,
+  installMycli,
+  getUsqlManualInstructions,
+  getPgcliManualInstructions,
+  getMycliManualInstructions,
+} from '../../core/dependency-manager'
 import {
   getMysqldPath,
   getMysqlVersion,
@@ -57,6 +69,19 @@ const engineIcons: Record<string, string> = {
   mysql: '🐬',
 }
 
+/**
+ * Helper to pause and wait for user to press Enter
+ */
+async function pressEnterToContinue(): Promise<void> {
+  await inquirer.prompt([
+    {
+      type: 'input',
+      name: 'continue',
+      message: chalk.gray('Press Enter to continue...'),
+    },
+  ])
+}
+
 async function showMainMenu(): Promise<void> {
   console.clear()
   console.log(header('SpinDB - Local Database Manager'))
@@ -88,12 +113,12 @@ async function showMainMenu(): Promise<void> {
   const choices: MenuChoice[] = [
     ...(hasContainers
       ? [
-          { name: `${chalk.cyan('◉')} List containers`, value: 'list' },
+          { name: `${chalk.cyan('◉')} Containers`, value: 'list' },
           { name: `${chalk.green('+')} Create new container`, value: 'create' },
         ]
       : [
           { name: `${chalk.green('+')} Create new container`, value: 'create' },
-          { name: `${chalk.cyan('◉')} List containers`, value: 'list' },
+          { name: `${chalk.cyan('◉')} Containers`, value: 'list' },
         ]),
     {
       name: canStart
@@ -415,7 +440,7 @@ async function handleList(): Promise<void> {
   console.log()
   const containerChoices = [
     ...containers.map((c) => ({
-      name: `${c.name} ${chalk.gray(`(${engineIcons[c.engine] || '🗄️'} ${c.engine} ${c.version}, port ${c.port})`)} ${
+      name: `${c.name} ${chalk.gray(`(${engineIcons[c.engine] || '▣'} ${c.engine} ${c.version}, port ${c.port})`)} ${
         c.status === 'running'
           ? chalk.green('● running')
           : chalk.gray('○ stopped')
@@ -435,6 +460,7 @@ async function handleList(): Promise<void> {
       name: 'selectedContainer',
       message: 'Select a container for more options:',
       choices: containerChoices,
+      pageSize: 15,
     },
   ])
 
@@ -473,7 +499,7 @@ async function showContainerSubmenu(containerName: string): Promise<void> {
     // Start or Stop depending on current state
     !isRunning
       ? { name: `${chalk.green('▶')} Start container`, value: 'start' }
-      : { name: `${chalk.yellow('■')} Stop container`, value: 'stop' },
+      : { name: `${chalk.red('■')} Stop container`, value: 'stop' },
     {
       name: isRunning
         ? `${chalk.blue('⌘')} Open shell`
@@ -496,10 +522,16 @@ async function showContainerSubmenu(containerName: string): Promise<void> {
       disabled: !isRunning ? false : 'Stop container first',
     },
     { name: `${chalk.magenta('⎘')} Copy connection string`, value: 'copy' },
-    { name: `${chalk.red('✕')} Delete container`, value: 'delete' },
+    {
+      name: !isRunning
+        ? `${chalk.red('✕')} Delete container`
+        : chalk.gray('✕ Delete container'),
+      value: 'delete',
+      disabled: !isRunning ? false : 'Stop container first',
+    },
     new inquirer.Separator(),
-    { name: `${chalk.blue('←')} Back to container list`, value: 'back' },
-    { name: `${chalk.blue('🏠')} Back to main menu`, value: 'main' },
+    { name: `${chalk.blue('←')} Back to containers`, value: 'back' },
+    { name: `${chalk.blue('⌂')} Back to main menu`, value: 'main' },
   ]
 
   const { action } = await inquirer.prompt<{ action: string }>([
@@ -508,6 +540,7 @@ async function showContainerSubmenu(containerName: string): Promise<void> {
       name: 'action',
       message: 'What would you like to do?',
       choices: actionChoices,
+      pageSize: 15,
     },
   ])
 
@@ -680,15 +713,222 @@ async function handleOpenShell(containerName: string): Promise<void> {
   const engine = getEngine(config.engine)
   const connectionString = engine.getConnectionString(config)
 
+  // Check which enhanced shells are installed
+  const usqlInstalled = await isUsqlInstalled()
+  const pgcliInstalled = await isPgcliInstalled()
+  const mycliInstalled = await isMycliInstalled()
+
+  type ShellChoice =
+    | 'default'
+    | 'usql'
+    | 'install-usql'
+    | 'pgcli'
+    | 'install-pgcli'
+    | 'mycli'
+    | 'install-mycli'
+    | 'back'
+
+  const defaultShellName = config.engine === 'mysql' ? 'mysql' : 'psql'
+  const engineSpecificCli = config.engine === 'mysql' ? 'mycli' : 'pgcli'
+  const engineSpecificInstalled =
+    config.engine === 'mysql' ? mycliInstalled : pgcliInstalled
+
+  const choices: Array<{ name: string; value: ShellChoice }> = [
+    {
+      name: `>_ Use default shell (${defaultShellName})`,
+      value: 'default',
+    },
+  ]
+
+  // Engine-specific enhanced CLI (pgcli for PostgreSQL, mycli for MySQL)
+  if (engineSpecificInstalled) {
+    choices.push({
+      name: `⚡ Use ${engineSpecificCli} (enhanced features, recommended)`,
+      value: config.engine === 'mysql' ? 'mycli' : 'pgcli',
+    })
+  } else {
+    choices.push({
+      name: `↓ Install ${engineSpecificCli} (enhanced features, recommended)`,
+      value: config.engine === 'mysql' ? 'install-mycli' : 'install-pgcli',
+    })
+  }
+
+  // usql - universal option
+  if (usqlInstalled) {
+    choices.push({
+      name: '⚡ Use usql (universal SQL client)',
+      value: 'usql',
+    })
+  } else {
+    choices.push({
+      name: '↓ Install usql (universal SQL client)',
+      value: 'install-usql',
+    })
+  }
+
+  choices.push({
+    name: `${chalk.blue('←')} Back`,
+    value: 'back',
+  })
+
+  const { shellChoice } = await inquirer.prompt<{ shellChoice: ShellChoice }>([
+    {
+      type: 'list',
+      name: 'shellChoice',
+      message: 'Select shell option:',
+      choices,
+      pageSize: 10,
+    },
+  ])
+
+  if (shellChoice === 'back') {
+    return
+  }
+
+  // Handle pgcli installation
+  if (shellChoice === 'install-pgcli') {
+    console.log()
+    console.log(info('Installing pgcli for enhanced PostgreSQL shell...'))
+    const pm = await detectPackageManager()
+    if (pm) {
+      const result = await installPgcli(pm)
+      if (result.success) {
+        console.log(success('pgcli installed successfully!'))
+        console.log()
+        await launchShell(containerName, config, connectionString, 'pgcli')
+      } else {
+        console.error(error(`Failed to install pgcli: ${result.error}`))
+        console.log()
+        console.log(chalk.gray('Manual installation:'))
+        for (const instruction of getPgcliManualInstructions()) {
+          console.log(chalk.cyan(`  ${instruction}`))
+        }
+        console.log()
+        await pressEnterToContinue()
+      }
+    } else {
+      console.error(error('No supported package manager found'))
+      console.log()
+      console.log(chalk.gray('Manual installation:'))
+      for (const instruction of getPgcliManualInstructions()) {
+        console.log(chalk.cyan(`  ${instruction}`))
+      }
+      console.log()
+      await pressEnterToContinue()
+    }
+    return
+  }
+
+  // Handle mycli installation
+  if (shellChoice === 'install-mycli') {
+    console.log()
+    console.log(info('Installing mycli for enhanced MySQL shell...'))
+    const pm = await detectPackageManager()
+    if (pm) {
+      const result = await installMycli(pm)
+      if (result.success) {
+        console.log(success('mycli installed successfully!'))
+        console.log()
+        await launchShell(containerName, config, connectionString, 'mycli')
+      } else {
+        console.error(error(`Failed to install mycli: ${result.error}`))
+        console.log()
+        console.log(chalk.gray('Manual installation:'))
+        for (const instruction of getMycliManualInstructions()) {
+          console.log(chalk.cyan(`  ${instruction}`))
+        }
+        console.log()
+        await pressEnterToContinue()
+      }
+    } else {
+      console.error(error('No supported package manager found'))
+      console.log()
+      console.log(chalk.gray('Manual installation:'))
+      for (const instruction of getMycliManualInstructions()) {
+        console.log(chalk.cyan(`  ${instruction}`))
+      }
+      console.log()
+      await pressEnterToContinue()
+    }
+    return
+  }
+
+  // Handle usql installation
+  if (shellChoice === 'install-usql') {
+    console.log()
+    console.log(info('Installing usql for enhanced shell experience...'))
+    const pm = await detectPackageManager()
+    if (pm) {
+      const result = await installUsql(pm)
+      if (result.success) {
+        console.log(success('usql installed successfully!'))
+        console.log()
+        await launchShell(containerName, config, connectionString, 'usql')
+      } else {
+        console.error(error(`Failed to install usql: ${result.error}`))
+        console.log()
+        console.log(chalk.gray('Manual installation:'))
+        for (const instruction of getUsqlManualInstructions()) {
+          console.log(chalk.cyan(`  ${instruction}`))
+        }
+        console.log()
+        await pressEnterToContinue()
+      }
+    } else {
+      console.error(error('No supported package manager found'))
+      console.log()
+      console.log(chalk.gray('Manual installation:'))
+      for (const instruction of getUsqlManualInstructions()) {
+        console.log(chalk.cyan(`  ${instruction}`))
+      }
+      console.log()
+      await pressEnterToContinue()
+    }
+    return
+  }
+
+  // Launch the selected shell
+  await launchShell(containerName, config, connectionString, shellChoice)
+}
+
+async function launchShell(
+  containerName: string,
+  config: NonNullable<Awaited<ReturnType<typeof containerManager.getConfig>>>,
+  connectionString: string,
+  shellType: 'default' | 'usql' | 'pgcli' | 'mycli',
+): Promise<void> {
   console.log(info(`Connecting to ${containerName}...`))
   console.log()
 
-  // Determine shell command based on engine
+  // Determine shell command based on engine and shell type
   let shellCmd: string
   let shellArgs: string[]
   let installHint: string
 
-  if (config.engine === 'mysql') {
+  if (shellType === 'pgcli') {
+    // pgcli accepts connection strings
+    shellCmd = 'pgcli'
+    shellArgs = [connectionString]
+    installHint = 'brew install pgcli'
+  } else if (shellType === 'mycli') {
+    // mycli: mycli -h host -P port -u user database
+    shellCmd = 'mycli'
+    shellArgs = [
+      '-h',
+      '127.0.0.1',
+      '-P',
+      String(config.port),
+      '-u',
+      'root',
+      config.database,
+    ]
+    installHint = 'brew install mycli'
+  } else if (shellType === 'usql') {
+    // usql accepts connection strings directly for both PostgreSQL and MySQL
+    shellCmd = 'usql'
+    shellArgs = [connectionString]
+    installHint = 'brew tap xo/xo && brew install xo/xo/usql'
+  } else if (config.engine === 'mysql') {
     shellCmd = 'mysql'
     // MySQL connection: mysql -u root -h 127.0.0.1 -P port database
     shellArgs = [
@@ -719,7 +959,7 @@ async function handleOpenShell(containerName: string): Promise<void> {
       console.log(chalk.gray('  Connect manually with:'))
       console.log(chalk.cyan(`  ${connectionString}`))
       console.log()
-      console.log(chalk.gray(`  Install ${config.engine} client:`))
+      console.log(chalk.gray(`  Install ${shellCmd}:`))
       console.log(chalk.cyan(`  ${installHint}`))
     }
   })
@@ -842,7 +1082,7 @@ async function handleRestore(): Promise<void> {
   // Build choices: running containers + create new option
   const choices = [
     ...running.map((c) => ({
-      name: `${c.name} ${chalk.gray(`(${engineIcons[c.engine] || '🗄️'} ${c.engine} ${c.version}, port ${c.port})`)} ${chalk.green('● running')}`,
+      name: `${c.name} ${chalk.gray(`(${engineIcons[c.engine] || '▣'} ${c.engine} ${c.version}, port ${c.port})`)} ${chalk.green('● running')}`,
       value: c.name,
       short: c.name,
     })),
@@ -862,6 +1102,7 @@ async function handleRestore(): Promise<void> {
       name: 'selectedContainer',
       message: 'Select container to restore to:',
       choices,
+      pageSize: 15,
     },
   ])
 
@@ -1056,7 +1297,7 @@ async function handleRestore(): Promise<void> {
     backupPath = stripQuotes(rawBackupPath)
   }
 
-  const databaseName = await promptDatabaseName(containerName)
+  const databaseName = await promptDatabaseName(containerName, config.engine)
 
   const engine = getEngine(config.engine)
 
@@ -1437,7 +1678,7 @@ async function handleEditContainer(
     },
     new inquirer.Separator(),
     { name: `${chalk.blue('←')} Back to container`, value: 'back' },
-    { name: `${chalk.blue('🏠')} Back to main menu`, value: 'main' },
+    { name: `${chalk.blue('⌂')} Back to main menu`, value: 'main' },
   ]
 
   const { field } = await inquirer.prompt<{ field: string }>([
@@ -1446,6 +1687,7 @@ async function handleEditContainer(
       name: 'field',
       message: 'Select field to edit:',
       choices: editChoices,
+      pageSize: 10,
     },
   ])
 
@@ -1809,7 +2051,7 @@ async function handleEngines(): Promise<void> {
 
   // PostgreSQL rows
   for (const engine of pgEngines) {
-    const icon = engineIcons[engine.engine] || '🗄️'
+    const icon = engineIcons[engine.engine] || '▣'
     const platformInfo = `${engine.platform}-${engine.arch}`
 
     console.log(

package/cli/commands/restore.ts

@@ -246,7 +246,7 @@ export const restoreCommand = new Command('restore')
         // Get database name
         let databaseName = options.database
         if (!databaseName) {
-          databaseName = await promptDatabaseName(containerName)
+          databaseName = await promptDatabaseName(containerName, engineName)
         }
 
         // At this point backupPath is guaranteed to be set

package/cli/ui/prompts.ts

@@ -53,7 +53,7 @@ export async function promptEngine(): Promise<string> {
 
   // Build choices from available engines
   const choices = engines.map((e) => ({
-    name: `${engineIcons[e.name] || '🗄️'} ${e.displayName} ${chalk.gray(`(versions: ${e.supportedVersions.join(', ')})`)}`,
+    name: `${engineIcons[e.name] || '▣'} ${e.displayName} ${chalk.gray(`(versions: ${e.supportedVersions.join(', ')})`)}`,
     value: e.name,
     short: e.displayName,
   }))
@@ -227,7 +227,7 @@ export async function promptContainerSelect(
       name: 'container',
       message,
       choices: containers.map((c) => ({
-        name: `${c.name} ${chalk.gray(`(${engineIcons[c.engine] || '🗄️'} ${c.engine} ${c.version}, port ${c.port})`)} ${
+        name: `${c.name} ${chalk.gray(`(${engineIcons[c.engine] || '▣'} ${c.engine} ${c.version}, port ${c.port})`)} ${
           c.status === 'running'
             ? chalk.green('● running')
             : chalk.gray('○ stopped')
@@ -243,19 +243,25 @@ export async function promptContainerSelect(
 
 /**
  * Prompt for database name
+ * @param defaultName - Default value for the database name
+ * @param engine - Database engine (mysql shows "schema" terminology)
  */
 export async function promptDatabaseName(
   defaultName?: string,
+  engine?: string,
 ): Promise<string> {
+  // MySQL uses "schema" terminology (database and schema are synonymous)
+  const label = engine === 'mysql' ? 'Database (schema) name:' : 'Database name:'
+
   const { database } = await inquirer.prompt<{ database: string }>([
     {
       type: 'input',
       name: 'database',
-      message: 'Database name:',
+      message: label,
       default: defaultName,
       validate: (input: string) => {
         if (!input) return 'Database name is required'
-        // PostgreSQL database naming rules
+        // PostgreSQL database naming rules (also valid for MySQL)
         if (!/^[a-zA-Z_][a-zA-Z0-9_-]*$/.test(input)) {
           return 'Database name must start with a letter or underscore and contain only letters, numbers, underscores, and hyphens'
         }
@@ -282,12 +288,12 @@ export type CreateOptions = {
  * Full interactive create flow
  */
 export async function promptCreateOptions(): Promise<CreateOptions> {
-  console.log(chalk.cyan('\n  🗄️  Create New Database Container\n'))
+  console.log(chalk.cyan('\n  ▣  Create New Database Container\n'))
 
   const engine = await promptEngine()
   const version = await promptVersion(engine)
   const name = await promptContainerName()
-  const database = await promptDatabaseName(name) // Default to container name
+  const database = await promptDatabaseName(name, engine) // Default to container name
 
   // Get engine-specific default port
   const engineDefaults = getEngineDefaults(engine)

package/cli/ui/theme.ts

@@ -40,7 +40,7 @@ export const theme = {
     info: chalk.blue('ℹ'),
     arrow: chalk.cyan('→'),
     bullet: chalk.gray('•'),
-    database: '🗄️',
+    database: '▣',
     postgres: '🐘',
   },
 }

package/config/os-dependencies.ts

@@ -289,6 +289,98 @@ const mysqlDependencies: EngineDependencies = {
   ],
 }
 
+// =============================================================================
+// Optional Tools (engine-agnostic)
+// =============================================================================
+
+/**
+ * usql - Universal SQL client
+ * Works with PostgreSQL, MySQL, SQLite, and 20+ other databases
+ * https://github.com/xo/usql
+ */
+export const usqlDependency: Dependency = {
+  name: 'usql',
+  binary: 'usql',
+  description:
+    'Universal SQL client with auto-completion, syntax highlighting, and multi-database support',
+  packages: {
+    brew: {
+      package: 'xo/xo/usql',
+      preInstall: ['brew tap xo/xo'],
+    },
+    // Note: usql is not in standard Linux package repos, must use manual install
+  },
+  manualInstall: {
+    darwin: [
+      'Install Homebrew: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"',
+      'Then run: brew tap xo/xo && brew install xo/xo/usql',
+    ],
+    linux: [
+      'Download from GitHub releases: https://github.com/xo/usql/releases',
+      'Extract and move to PATH: sudo mv usql /usr/local/bin/',
+      'Or install via Go: go install github.com/xo/usql@latest',
+    ],
+  },
+}
+
+/**
+ * pgcli - PostgreSQL CLI with auto-completion and syntax highlighting
+ * https://github.com/dbcli/pgcli
+ */
+export const pgcliDependency: Dependency = {
+  name: 'pgcli',
+  binary: 'pgcli',
+  description:
+    'PostgreSQL CLI with intelligent auto-completion and syntax highlighting',
+  packages: {
+    brew: { package: 'pgcli' },
+    apt: { package: 'pgcli' },
+    dnf: { package: 'pgcli' },
+    yum: { package: 'pgcli' },
+    pacman: { package: 'pgcli' },
+  },
+  manualInstall: {
+    darwin: [
+      'Install with Homebrew: brew install pgcli',
+      'Or with pip: pip install pgcli',
+    ],
+    linux: [
+      'Debian/Ubuntu: sudo apt install pgcli',
+      'Fedora: sudo dnf install pgcli',
+      'Or with pip: pip install pgcli',
+    ],
+  },
+}
+
+/**
+ * mycli - MySQL CLI with auto-completion and syntax highlighting
+ * https://github.com/dbcli/mycli
+ */
+export const mycliDependency: Dependency = {
+  name: 'mycli',
+  binary: 'mycli',
+  description:
+    'MySQL/MariaDB CLI with intelligent auto-completion and syntax highlighting',
+  packages: {
+    brew: { package: 'mycli' },
+    apt: { package: 'mycli' },
+    dnf: { package: 'mycli' },
+    yum: { package: 'mycli' },
+    pacman: { package: 'mycli' },
+  },
+  manualInstall: {
+    darwin: [
+      'Install with Homebrew: brew install mycli',
+      'Or with pip: pip install mycli',
+    ],
+    linux: [
+      'Debian/Ubuntu: sudo apt install mycli',
+      'Fedora: sudo dnf install mycli',
+      'Or with pip: pip install mycli',
+    ],
+  },
+}
+
 // =============================================================================
 // Registry
 // =============================================================================

package/core/binary-manager.ts

@@ -54,26 +54,19 @@ export class BinaryManager {
     return version
   }
 
-  /**
-   * Get major version from any version string (e.g., "17.7.0" -> "17", "16" -> "16")
-   * Used for directory naming to ensure one directory per major version.
-   */
-  getMajorVersion(version: string): string {
-    return version.split('.')[0]
-  }
-
   /**
    * Check if binaries for a specific version are already installed
+   * Uses full version for directory naming (e.g., postgresql-17.7.0-darwin-arm64)
    */
   async isInstalled(
     version: string,
     platform: string,
     arch: string,
   ): Promise<boolean> {
-    const majorVersion = this.getMajorVersion(version)
+    const fullVersion = this.getFullVersion(version)
     const binPath = paths.getBinaryPath({
       engine: 'postgresql',
-      version: majorVersion,
+      version: fullVersion,
       platform,
       arch,
     })
@@ -122,15 +115,15 @@ export class BinaryManager {
     arch: string,
     onProgress?: ProgressCallback,
   ): Promise<string> {
-    const majorVersion = this.getMajorVersion(version)
+    const fullVersion = this.getFullVersion(version)
     const url = this.getDownloadUrl(version, platform, arch)
     const binPath = paths.getBinaryPath({
       engine: 'postgresql',
-      version: majorVersion,
+      version: fullVersion,
       platform,
       arch,
     })
-    const tempDir = join(paths.bin, `temp-${majorVersion}-${platform}-${arch}`)
+    const tempDir = join(paths.bin, `temp-${fullVersion}-${platform}-${arch}`)
     const jarFile = join(tempDir, 'postgres.jar')
 
     // Ensure directories exist
@@ -210,10 +203,10 @@ export class BinaryManager {
     platform: string,
     arch: string,
   ): Promise<boolean> {
-    const majorVersion = this.getMajorVersion(version)
+    const fullVersion = this.getFullVersion(version)
     const binPath = paths.getBinaryPath({
       engine: 'postgresql',
-      version: majorVersion,
+      version: fullVersion,
       platform,
       arch,
     })
@@ -267,10 +260,10 @@ export class BinaryManager {
     arch: string,
     binary: string,
   ): string {
-    const majorVersion = this.getMajorVersion(version)
+    const fullVersion = this.getFullVersion(version)
     const binPath = paths.getBinaryPath({
       engine: 'postgresql',
-      version: majorVersion,
+      version: fullVersion,
       platform,
       arch,
     })
@@ -286,7 +279,7 @@ export class BinaryManager {
     arch: string,
     onProgress?: ProgressCallback,
   ): Promise<string> {
-    const majorVersion = this.getMajorVersion(version)
+    const fullVersion = this.getFullVersion(version)
     if (await this.isInstalled(version, platform, arch)) {
       onProgress?.({
         stage: 'cached',
@@ -294,7 +287,7 @@ export class BinaryManager {
       })
       return paths.getBinaryPath({
         engine: 'postgresql',
-        version: majorVersion,
+        version: fullVersion,
         platform,
         arch,
       })