spindb 0.9.0 → 0.9.2

package/cli/commands/create.ts

@@ -13,16 +13,17 @@ import {
   promptConfirm,
 } from '../ui/prompts'
 import { createSpinner } from '../ui/spinner'
-import { header, error, connectionBox } from '../ui/theme'
+import { header, uiError, connectionBox } from '../ui/theme'
 import { tmpdir } from 'os'
 import { join } from 'path'
 import { getMissingDependencies } from '../../core/dependency-manager'
 import { platformService } from '../../core/platform-service'
 import { startWithRetry } from '../../core/start-with-retry'
 import { TransactionManager } from '../../core/transaction-manager'
+import { isValidDatabaseName } from '../../core/error-handler'
+import { resolve } from 'path'
 import { Engine } from '../../types'
 import type { BaseEngine } from '../../engines/base-engine'
-import { resolve } from 'path'
 
 /**
  * Simplified SQLite container creation flow
@@ -32,9 +33,9 @@ async function createSqliteContainer(
   containerName: string,
   dbEngine: BaseEngine,
   version: string,
-  options: { path?: string; from?: string | null },
+  options: { path?: string; from?: string | null; connect?: boolean },
 ): Promise<void> {
-  const { path: filePath, from: restoreLocation } = options
+  const { path: filePath, from: restoreLocation, connect } = options
 
   // Check dependencies
   const depsSpinner = createSpinner('Checking required tools...')
@@ -42,8 +43,13 @@ async function createSqliteContainer(
 
   const missingDeps = await getMissingDependencies('sqlite')
   if (missingDeps.length > 0) {
-    depsSpinner.warn(`Missing tools: ${missingDeps.map((d) => d.name).join(', ')}`)
-    const installed = await promptInstallDependencies(missingDeps[0].binary, 'sqlite')
+    depsSpinner.warn(
+      `Missing tools: ${missingDeps.map((d) => d.name).join(', ')}`,
+    )
+    const installed = await promptInstallDependencies(
+      missingDeps[0].binary,
+      'sqlite',
+    )
     if (!installed) {
       process.exit(1)
     }
@@ -63,7 +69,7 @@ async function createSqliteContainer(
 
   // Check if file already exists
   if (existsSync(absolutePath)) {
-    console.error(error(`File already exists: ${absolutePath}`))
+    console.error(uiError(`File already exists: ${absolutePath}`))
     process.exit(1)
   }
 
@@ -74,9 +80,9 @@ async function createSqliteContainer(
     // Initialize the SQLite database file and register in registry
     await dbEngine.initDataDir(containerName, version, { path: absolutePath })
     createSpinnerInstance.succeed('SQLite database created')
-  } catch (err) {
+  } catch (error) {
     createSpinnerInstance.fail('Failed to create SQLite database')
-    throw err
+    throw error
   }
 
   // Handle --from restore
@@ -84,15 +90,17 @@ async function createSqliteContainer(
     const config = await containerManager.getConfig(containerName)
     if (config) {
       const format = await dbEngine.detectBackupFormat(restoreLocation)
-      const restoreSpinner = createSpinner(`Restoring from ${format.description}...`)
+      const restoreSpinner = createSpinner(
+        `Restoring from ${format.description}...`,
+      )
       restoreSpinner.start()
 
       try {
         await dbEngine.restore(config, restoreLocation)
         restoreSpinner.succeed('Backup restored successfully')
-      } catch (err) {
+      } catch (error) {
         restoreSpinner.fail('Failed to restore backup')
-        throw err
+        throw error
       }
     }
   }
@@ -107,9 +115,20 @@ async function createSqliteContainer(
   console.log(chalk.gray('  Connection string:'))
   console.log(chalk.cyan(`    sqlite:///${absolutePath}`))
   console.log()
-  console.log(chalk.gray('  Connect with:'))
-  console.log(chalk.cyan(`    spindb connect ${containerName}`))
-  console.log()
+
+  // Connect if requested
+  if (connect) {
+    const config = await containerManager.getConfig(containerName)
+    if (config) {
+      console.log(chalk.gray('  Opening shell...'))
+      console.log()
+      await dbEngine.connect(config)
+    }
+  } else {
+    console.log(chalk.gray('  Connect with:'))
+    console.log(chalk.cyan(`    spindb connect ${containerName}`))
+    console.log()
+  }
 }
 
 function detectLocationType(location: string): {
@@ -132,8 +151,13 @@ function detectLocationType(location: string): {
   }
 
   if (existsSync(location)) {
-    // Check if it's a SQLite file
-    if (location.endsWith('.sqlite') || location.endsWith('.db') || location.endsWith('.sqlite3')) {
+    // Check if it's a SQLite file (case-insensitive)
+    const lowerLocation = location.toLowerCase()
+    if (
+      lowerLocation.endsWith('.sqlite') ||
+      lowerLocation.endsWith('.db') ||
+      lowerLocation.endsWith('.sqlite3')
+    ) {
       return { type: 'file', inferredEngine: Engine.SQLite }
     }
     return { type: 'file' }
@@ -145,7 +169,10 @@ function detectLocationType(location: string): {
 export const createCommand = new Command('create')
   .description('Create a new database container')
   .argument('[name]', 'Container name')
-  .option('-e, --engine <engine>', 'Database engine (postgresql, mysql, sqlite)')
+  .option(
+    '-e, --engine <engine>',
+    'Database engine (postgresql, mysql, sqlite)',
+  )
   .option('-v, --version <version>', 'Database version')
   .option('-d, --database <database>', 'Database name')
   .option('-p, --port <port>', 'Port number')
@@ -157,7 +184,9 @@ export const createCommand = new Command('create')
     '--max-connections <number>',
     'Maximum number of database connections (default: 200)',
   )
+  .option('--start', 'Start the container after creation (skip prompt)')
   .option('--no-start', 'Do not start the container after creation')
+  .option('--connect', 'Open a shell connection after creation')
   .option(
     '--from <location>',
     'Restore from a dump file or connection string after creation',
@@ -172,7 +201,8 @@ export const createCommand = new Command('create')
         port?: string
         path?: string
         maxConnections?: string
-        start: boolean
+        start?: boolean
+        connect?: boolean
         from?: string
       },
     ) => {
@@ -191,7 +221,7 @@ export const createCommand = new Command('create')
           const locationInfo = detectLocationType(options.from)
 
           if (locationInfo.type === 'not_found') {
-            console.error(error(`Location not found: ${options.from}`))
+            console.error(uiError(`Location not found: ${options.from}`))
             console.log(
               chalk.gray(
                 '  Provide a valid file path or connection string (postgresql://, mysql://)',
@@ -214,7 +244,7 @@ export const createCommand = new Command('create')
 
           if (options.start === false) {
             console.error(
-              error(
+              uiError(
                 'Cannot use --no-start with --from (restore requires running container)',
               ),
             )
@@ -238,6 +268,16 @@ export const createCommand = new Command('create')
 
         database = database ?? containerName
 
+        // Validate database name to prevent SQL injection
+        if (!isValidDatabaseName(database)) {
+          console.error(
+            uiError(
+              'Database name must start with a letter and contain only letters, numbers, hyphens, and underscores',
+            ),
+          )
+          process.exit(1)
+        }
+
         console.log(header('Creating Database Container'))
         console.log()
 
@@ -248,10 +288,34 @@ export const createCommand = new Command('create')
           await createSqliteContainer(containerName, dbEngine, version, {
             path: options.path,
             from: restoreLocation,
+            connect: options.connect,
           })
           return
         }
 
+        // For server databases, validate --connect with --no-start
+        if (options.connect && options.start === false) {
+          console.error(
+            uiError(
+              'Cannot use --no-start with --connect (connection requires running container)',
+            ),
+          )
+          process.exit(1)
+        }
+
+        // Validate --max-connections if provided
+        if (options.maxConnections) {
+          const parsed = parseInt(options.maxConnections, 10)
+          if (!Number.isFinite(parsed) || parsed <= 0) {
+            console.error(
+              uiError(
+                'Invalid --max-connections value: must be a positive integer',
+              ),
+            )
+            process.exit(1)
+          }
+        }
+
         const depsSpinner = createSpinner('Checking required tools...')
         depsSpinner.start()
 
@@ -273,7 +337,7 @@ export const createCommand = new Command('create')
           missingDeps = await getMissingDependencies(engine)
           if (missingDeps.length > 0) {
             console.error(
-              error(
+              uiError(
                 `Still missing tools: ${missingDeps.map((d) => d.name).join(', ')}`,
               ),
             )
@@ -362,9 +426,9 @@ export const createCommand = new Command('create')
           })
 
           createSpinnerInstance.succeed('Container created')
-        } catch (err) {
+        } catch (error) {
           createSpinnerInstance.fail('Failed to create container')
-          throw err
+          throw error
         }
 
         const initSpinner = createSpinner('Initializing database cluster...')
@@ -378,15 +442,18 @@ export const createCommand = new Command('create')
               : undefined,
           })
           initSpinner.succeed('Database cluster initialized')
-        } catch (err) {
+        } catch (error) {
           initSpinner.fail('Failed to initialize database cluster')
           await tx.rollback()
-          throw err
+          throw error
         }
 
-        // --from requires start, --no-start skips, otherwise ask user
+        // --from requires start, --start forces start, --no-start skips, otherwise ask user
+        // --connect implies --start for server databases
         let shouldStart = false
-        if (restoreLocation) {
+        if (restoreLocation || options.connect) {
+          shouldStart = true
+        } else if (options.start === true) {
           shouldStart = true
         } else if (options.start === false) {
           shouldStart = false
@@ -444,14 +511,14 @@ export const createCommand = new Command('create')
             } else {
               startSpinner.succeed(`${dbEngine.displayName} started`)
             }
-          } catch (err) {
+          } catch (error) {
             if (!startSpinner.isSpinning) {
               // Error was already handled above
             } else {
               startSpinner.fail(`Failed to start ${dbEngine.displayName}`)
             }
             await tx.rollback()
-            throw err
+            throw error
           }
 
           const defaultDb = engineDefaults.superuser
@@ -464,10 +531,10 @@ export const createCommand = new Command('create')
             try {
               await dbEngine.createDatabase(config, database)
               dbSpinner.succeed(`Database "${database}" created`)
-            } catch (err) {
+            } catch (error) {
               dbSpinner.fail(`Failed to create database "${database}"`)
               await tx.rollback()
-              throw err
+              throw error
             }
           }
         }
@@ -498,8 +565,8 @@ export const createCommand = new Command('create')
                 dumpSpinner.succeed('Dump created from remote database')
                 backupPath = tempDumpPath
                 dumpSuccess = true
-              } catch (err) {
-                const e = err as Error
+              } catch (error) {
+                const e = error as Error
                 dumpSpinner.fail('Failed to create dump')
 
                 if (
@@ -514,14 +581,14 @@ export const createCommand = new Command('create')
                 }
 
                 console.log()
-                console.error(error('pg_dump error:'))
+                console.error(uiError('pg_dump error:'))
                 console.log(chalk.gray(`  ${e.message}`))
                 process.exit(1)
               }
             }
 
             if (!dumpSuccess) {
-              console.error(error('Failed to create dump after retries'))
+              console.error(uiError('Failed to create dump after retries'))
               process.exit(1)
             }
           } else {
@@ -542,7 +609,7 @@ export const createCommand = new Command('create')
             createDatabase: false,
           })
 
-          if (result.code === 0 || !result.stderr) {
+          if (result.code === 0) {
             restoreSpinner.succeed('Backup restored successfully')
           } else {
             restoreSpinner.warn('Restore completed with warnings')
@@ -573,7 +640,17 @@ export const createCommand = new Command('create')
           )
           console.log()
 
-          if (shouldStart) {
+          if (options.connect && shouldStart) {
+            // --connect flag: open shell directly
+            const copied =
+              await platformService.copyToClipboard(connectionString)
+            if (copied) {
+              console.log(chalk.gray('  Connection string copied to clipboard'))
+            }
+            console.log(chalk.gray('  Opening shell...'))
+            console.log()
+            await dbEngine.connect(finalConfig, database)
+          } else if (shouldStart) {
             console.log(chalk.gray('  Connect with:'))
             console.log(chalk.cyan(`  spindb connect ${containerName}`))
 
@@ -582,15 +659,15 @@ export const createCommand = new Command('create')
             if (copied) {
               console.log(chalk.gray('  Connection string copied to clipboard'))
             }
+            console.log()
           } else {
             console.log(chalk.gray('  Start the container:'))
             console.log(chalk.cyan(`  spindb start ${containerName}`))
+            console.log()
           }
-
-          console.log()
         }
-      } catch (err) {
-        const e = err as Error
+      } catch (error) {
+        const e = error as Error
 
         const missingToolPatterns = [
           'pg_restore not found',
@@ -616,7 +693,7 @@ export const createCommand = new Command('create')
           process.exit(1)
         }
 
-        console.error(error(e.message))
+        console.error(uiError(e.message))
         process.exit(1)
       } finally {
         if (tempDumpPath) {

package/cli/commands/delete.ts

@@ -4,7 +4,7 @@ import { processManager } from '../../core/process-manager'
 import { getEngine } from '../../engines'
 import { promptContainerSelect, promptConfirm } from '../ui/prompts'
 import { createSpinner } from '../ui/spinner'
-import { error, warning } from '../ui/theme'
+import { uiError, uiWarning } from '../ui/theme'
 
 export const deleteCommand = new Command('delete')
   .alias('rm')
@@ -24,7 +24,7 @@ export const deleteCommand = new Command('delete')
           const containers = await containerManager.list()
 
           if (containers.length === 0) {
-            console.log(warning('No containers found'))
+            console.log(uiWarning('No containers found'))
             return
           }
 
@@ -38,7 +38,7 @@ export const deleteCommand = new Command('delete')
 
         const config = await containerManager.getConfig(containerName)
         if (!config) {
-          console.error(error(`Container "${containerName}" not found`))
+          console.error(uiError(`Container "${containerName}" not found`))
           process.exit(1)
         }
 
@@ -48,7 +48,7 @@ export const deleteCommand = new Command('delete')
             false,
           )
           if (!confirmed) {
-            console.log(warning('Deletion cancelled'))
+            console.log(uiWarning('Deletion cancelled'))
             return
           }
         }
@@ -67,7 +67,7 @@ export const deleteCommand = new Command('delete')
             stopSpinner.succeed(`Stopped "${containerName}"`)
           } else {
             console.error(
-              error(
+              uiError(
                 `Container "${containerName}" is running. Stop it first or use --force`,
               ),
             )
@@ -81,9 +81,9 @@ export const deleteCommand = new Command('delete')
         await containerManager.delete(containerName, { force: true })
 
         deleteSpinner.succeed(`Container "${containerName}" deleted`)
-      } catch (err) {
-        const e = err as Error
-        console.error(error(e.message))
+      } catch (error) {
+        const e = error as Error
+        console.error(uiError(e.message))
         process.exit(1)
       }
     },

package/cli/commands/deps.ts

@@ -1,6 +1,6 @@
 import { Command } from 'commander'
 import chalk from 'chalk'
-import { header, success, warning, error } from '../ui/theme'
+import { header, uiSuccess, uiWarning, uiError } from '../ui/theme'
 import { createSpinner } from '../ui/spinner'
 import {
   detectPackageManager,
@@ -84,7 +84,7 @@ depsCommand
       // Check specific engine
       const engineConfig = getEngineDependencies(options.engine)
       if (!engineConfig) {
-        console.error(error(`Unknown engine: ${options.engine}`))
+        console.error(uiError(`Unknown engine: ${options.engine}`))
         console.log(
           chalk.gray(
             `  Available engines: ${engineDependencies.map((e) => e.engine).join(', ')}`,
@@ -104,9 +104,9 @@ depsCommand
       const total = statuses.length
       console.log()
       if (installed === total) {
-        console.log(success(`All ${total} dependencies installed`))
+        console.log(uiSuccess(`All ${total} dependencies installed`))
       } else {
-        console.log(warning(`${installed}/${total} dependencies installed`))
+        console.log(uiWarning(`${installed}/${total} dependencies installed`))
         console.log()
         console.log(
           chalk.gray(`  Run: spindb deps install --engine ${options.engine}`),
@@ -132,7 +132,7 @@ depsCommand
     const packageManager = await detectPackageManager()
 
     if (!packageManager) {
-      console.log(error('No supported package manager detected'))
+      console.log(uiError('No supported package manager detected'))
       console.log()
 
       const platform = getCurrentPlatform()
@@ -161,7 +161,7 @@ depsCommand
       const missing = await getAllMissingDependencies()
 
       if (missing.length === 0) {
-        console.log(success('All dependencies are already installed'))
+        console.log(uiSuccess('All dependencies are already installed'))
         return
       }
 
@@ -182,14 +182,14 @@ depsCommand
         spinner.warn('Some dependencies failed to install')
         console.log()
         for (const f of failed) {
-          console.log(error(`  ${f.dependency.name}: ${f.error}`))
+          console.log(uiError(`  ${f.dependency.name}: ${f.error}`))
         }
       }
 
       if (succeeded.length > 0) {
         console.log()
         console.log(
-          success(
+          uiSuccess(
             `Installed: ${succeeded.map((r) => r.dependency.name).join(', ')}`,
           ),
         )
@@ -198,7 +198,7 @@ depsCommand
       // Install dependencies for specific engine
       const engineConfig = getEngineDependencies(options.engine)
       if (!engineConfig) {
-        console.error(error(`Unknown engine: ${options.engine}`))
+        console.error(uiError(`Unknown engine: ${options.engine}`))
         console.log(
           chalk.gray(
             `  Available engines: ${engineDependencies.map((e) => e.engine).join(', ')}`,
@@ -211,7 +211,9 @@ depsCommand
 
       if (missing.length === 0) {
         console.log(
-          success(`All ${engineConfig.displayName} dependencies are installed`),
+          uiSuccess(
+            `All ${engineConfig.displayName} dependencies are installed`,
+          ),
         )
         return
       }
@@ -241,7 +243,7 @@ depsCommand
         spinner.warn('Some dependencies failed to install')
         console.log()
         for (const f of failed) {
-          console.log(error(`  ${f.dependency.name}: ${f.error}`))
+          console.log(uiError(`  ${f.dependency.name}: ${f.error}`))
         }
 
         // Show manual instructions
@@ -259,7 +261,7 @@ depsCommand
       if (succeeded.length > 0) {
         console.log()
         console.log(
-          success(
+          uiSuccess(
             `Installed: ${succeeded.map((r) => r.dependency.name).join(', ')}`,
           ),
         )
@@ -276,7 +278,7 @@ depsCommand
       const missing = await getMissingDependencies('postgresql')
 
       if (missing.length === 0) {
-        console.log(success('All PostgreSQL dependencies are installed'))
+        console.log(uiSuccess('All PostgreSQL dependencies are installed'))
         return
       }
 
@@ -300,14 +302,14 @@ depsCommand
         spinner.warn('Some dependencies failed to install')
         console.log()
         for (const f of failed) {
-          console.log(error(`  ${f.dependency.name}: ${f.error}`))
+          console.log(uiError(`  ${f.dependency.name}: ${f.error}`))
         }
       }
 
       if (succeeded.length > 0) {
         console.log()
         console.log(
-          success(
+          uiSuccess(
             `Installed: ${succeeded.map((r) => r.dependency.name).join(', ')}`,
           ),
         )

package/cli/commands/doctor.ts

@@ -18,7 +18,7 @@ import { sqliteRegistry } from '../../engines/sqlite/registry'
 import { paths } from '../../config/paths'
 import { getSupportedEngines } from '../../config/engine-defaults'
 import { checkEngineDependencies } from '../../core/dependency-manager'
-import { header, success } from '../ui/theme'
+import { header, uiSuccess } from '../ui/theme'
 import { Engine } from '../../types'
 
 type HealthCheckResult = {
@@ -61,7 +61,7 @@ async function checkConfiguration(): Promise<HealthCheckResult> {
           label: 'Refresh binary cache',
           handler: async () => {
             await configManager.refreshAllBinaries()
-            console.log(success('Binary cache refreshed'))
+            console.log(uiSuccess('Binary cache refreshed'))
           },
         },
       }
@@ -73,12 +73,12 @@ async function checkConfiguration(): Promise<HealthCheckResult> {
       message: 'Configuration valid',
       details: [`Binary tools cached: ${binaryCount}`],
     }
-  } catch (err) {
+  } catch (error) {
     return {
       name: 'Configuration',
       status: 'error',
       message: 'Configuration file is corrupted',
-      details: [(err as Error).message],
+      details: [(error as Error).message],
     }
   }
 }
@@ -125,12 +125,12 @@ async function checkContainers(): Promise<HealthCheckResult> {
       message: `${containers.length} container(s)`,
       details,
     }
-  } catch (err) {
+  } catch (error) {
     return {
       name: 'Containers',
       status: 'error',
       message: 'Failed to list containers',
-      details: [(err as Error).message],
+      details: [(error as Error).message],
     }
   }
 }
@@ -162,7 +162,7 @@ async function checkSqliteRegistry(): Promise<HealthCheckResult> {
           label: 'Remove orphaned entries from registry',
           handler: async () => {
             const count = await sqliteRegistry.removeOrphans()
-            console.log(success(`Removed ${count} orphaned entries`))
+            console.log(uiSuccess(`Removed ${count} orphaned entries`))
           },
         },
       }
@@ -173,12 +173,12 @@ async function checkSqliteRegistry(): Promise<HealthCheckResult> {
       status: 'ok',
       message: `${entries.length} database(s) registered, all files exist`,
     }
-  } catch (err) {
+  } catch (error) {
     return {
       name: 'SQLite Registry',
       status: 'warning',
       message: 'Could not check registry',
-      details: [(err as Error).message],
+      details: [(error as Error).message],
     }
   }
 }
@@ -211,12 +211,12 @@ async function checkBinaries(): Promise<HealthCheckResult> {
       message: hasWarning ? 'Some tools missing' : 'All tools available',
       details: results,
     }
-  } catch (err) {
+  } catch (error) {
     return {
       name: 'Database Tools',
       status: 'error',
       message: 'Failed to check tools',
-      details: [(err as Error).message],
+      details: [(error as Error).message],
     }
   }
 }
@@ -247,10 +247,6 @@ export const doctorCommand = new Command('doctor')
   .description('Check system health and fix common issues')
   .option('--json', 'Output as JSON')
   .action(async (options: { json?: boolean }) => {
-    console.log()
-    console.log(header('SpinDB Health Check'))
-    console.log()
-
     const checks = [
       await checkConfiguration(),
       await checkContainers(),
@@ -265,6 +261,11 @@ export const doctorCommand = new Command('doctor')
       return
     }
 
+    // Human-readable output - print header first
+    console.log()
+    console.log(header('SpinDB Health Check'))
+    console.log()
+
     // Display results
     for (const check of checks) {
       displayResult(check)