spindb 0.9.0 → 0.9.2

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

@@ -9,7 +9,7 @@ import { paths } from '../../../config/paths'
 import { getSupportedEngines } from '../../../config/engine-defaults'
 import { checkEngineDependencies } from '../../../core/dependency-manager'
 import { createSpinner } from '../../ui/spinner'
-import { header, success, error, warning, info } from '../../ui/theme'
+import { header, uiSuccess, uiError, uiWarning, uiInfo } from '../../ui/theme'
 import { pressEnterToContinue } from './shared'
 import { Engine } from '../../../types'
 
@@ -26,7 +26,7 @@ export async function handleCheckUpdate(): Promise<void> {
   if (!result) {
     spinner.fail('Could not reach npm registry')
     console.log()
-    console.log(info('Check your internet connection and try again.'))
+    console.log(uiInfo('Check your internet connection and try again.'))
     console.log(chalk.gray('  Manual update: npm install -g spindb@latest'))
     console.log()
     await pressEnterToContinue()
@@ -66,27 +66,29 @@ export async function handleCheckUpdate(): Promise<void> {
         updateSpinner.succeed('Update complete')
         console.log()
         console.log(
-          success(
+          uiSuccess(
             `Updated from ${updateResult.previousVersion} to ${updateResult.newVersion}`,
           ),
         )
         console.log()
         if (updateResult.previousVersion !== updateResult.newVersion) {
-          console.log(warning('Please restart spindb to use the new version.'))
+          console.log(
+            uiWarning('Please restart spindb to use the new version.'),
+          )
           console.log()
         }
       } else {
         updateSpinner.fail('Update failed')
         console.log()
-        console.log(error(updateResult.error || 'Unknown error'))
+        console.log(uiError(updateResult.error || 'Unknown error'))
         console.log()
-        console.log(info('Manual update: npm install -g spindb@latest'))
+        console.log(uiInfo('Manual update: npm install -g spindb@latest'))
       }
       await pressEnterToContinue()
     } else if (action === 'disable') {
       await updateManager.setAutoCheckEnabled(false)
       console.log()
-      console.log(info('Update checks disabled on startup.'))
+      console.log(uiInfo('Update checks disabled on startup.'))
       console.log(chalk.gray('  Re-enable with: spindb config update-check on'))
       console.log()
       await pressEnterToContinue()
@@ -138,7 +140,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'))
           },
         },
       }
@@ -150,12 +152,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],
     }
   }
 }
@@ -199,12 +201,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],
     }
   }
 }
@@ -233,7 +235,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`))
           },
         },
       }
@@ -244,12 +246,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],
     }
   }
 }
@@ -279,12 +281,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],
     }
   }
 }

package/cli/commands/restore.ts

@@ -11,11 +11,13 @@ import {
   promptInstallDependencies,
 } from '../ui/prompts'
 import { createSpinner } from '../ui/spinner'
-import { success, error, warning } from '../ui/theme'
+import { uiSuccess, uiError, uiWarning } from '../ui/theme'
 import { tmpdir } from 'os'
 import { join } from 'path'
 import { getMissingDependencies } from '../../core/dependency-manager'
 import { platformService } from '../../core/platform-service'
+import { TransactionManager } from '../../core/transaction-manager'
+import { logDebug } from '../../core/error-handler'
 
 export const restoreCommand = new Command('restore')
   .description('Restore a backup to a container')
@@ -48,11 +50,13 @@ export const restoreCommand = new Command('restore')
           if (running.length === 0) {
             if (containers.length === 0) {
               console.log(
-                warning('No containers found. Create one with: spindb create'),
+                uiWarning(
+                  'No containers found. Create one with: spindb create',
+                ),
               )
             } else {
               console.log(
-                warning(
+                uiWarning(
                   'No running containers. Start one first with: spindb start',
                 ),
               )
@@ -70,7 +74,7 @@ export const restoreCommand = new Command('restore')
 
         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)
         }
 
@@ -81,7 +85,7 @@ export const restoreCommand = new Command('restore')
         })
         if (!running) {
           console.error(
-            error(
+            uiError(
               `Container "${containerName}" is not running. Start it first.`,
             ),
           )
@@ -111,7 +115,7 @@ export const restoreCommand = new Command('restore')
           missingDeps = await getMissingDependencies(config.engine)
           if (missingDeps.length > 0) {
             console.error(
-              error(
+              uiError(
                 `Still missing tools: ${missingDeps.map((d) => d.name).join(', ')}`,
               ),
             )
@@ -132,7 +136,7 @@ export const restoreCommand = new Command('restore')
 
           if (engineName === 'postgresql' && !isPgUrl) {
             console.error(
-              error(
+              uiError(
                 'Connection string must start with postgresql:// or postgres:// for PostgreSQL containers',
               ),
             )
@@ -141,7 +145,7 @@ export const restoreCommand = new Command('restore')
 
           if (engineName === 'mysql' && !isMysqlUrl) {
             console.error(
-              error(
+              uiError(
                 'Connection string must start with mysql:// for MySQL containers',
               ),
             )
@@ -150,7 +154,7 @@ export const restoreCommand = new Command('restore')
 
           if (!isPgUrl && !isMysqlUrl) {
             console.error(
-              error(
+              uiError(
                 'Connection string must start with postgresql://, postgres://, or mysql://',
               ),
             )
@@ -179,8 +183,8 @@ export const restoreCommand = new Command('restore')
               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')
 
               const dumpTool = engineName === 'mysql' ? 'mysqldump' : 'pg_dump'
@@ -199,19 +203,19 @@ export const restoreCommand = new Command('restore')
               }
 
               console.log()
-              console.error(error(`${dumpTool} error:`))
+              console.error(uiError(`${dumpTool} 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 {
           if (!backupPath) {
-            console.error(error('Backup file path is required'))
+            console.error(uiError('Backup file path is required'))
             console.log(
               chalk.gray('  Usage: spindb restore <container> <backup-file>'),
             )
@@ -224,7 +228,7 @@ export const restoreCommand = new Command('restore')
           }
 
           if (!existsSync(backupPath)) {
-            console.error(error(`Backup file not found: ${backupPath}`))
+            console.error(uiError(`Backup file not found: ${backupPath}`))
             process.exit(1)
           }
         }
@@ -235,7 +239,7 @@ export const restoreCommand = new Command('restore')
         }
 
         if (!backupPath) {
-          console.error(error('No backup path specified'))
+          console.error(uiError('No backup path specified'))
           process.exit(1)
         }
 
@@ -245,41 +249,99 @@ export const restoreCommand = new Command('restore')
         const format = await engine.detectBackupFormat(backupPath)
         detectSpinner.succeed(`Detected: ${format.description}`)
 
+        // Use TransactionManager to ensure database is cleaned up on restore failure
+        const tx = new TransactionManager()
+        let databaseCreated = false
+
         const dbSpinner = createSpinner(
           `Creating database "${databaseName}"...`,
         )
         dbSpinner.start()
 
-        await engine.createDatabase(config, databaseName)
-        dbSpinner.succeed(`Database "${databaseName}" ready`)
+        try {
+          await engine.createDatabase(config, databaseName)
+          databaseCreated = true
+          dbSpinner.succeed(`Database "${databaseName}" ready`)
+
+          // Register rollback to drop database if restore fails
+          tx.addRollback({
+            description: `Drop database "${databaseName}"`,
+            execute: async () => {
+              try {
+                await engine.dropDatabase(config, databaseName)
+                logDebug(`Rolled back: dropped database "${databaseName}"`)
+              } catch (dropErr) {
+                logDebug(
+                  `Failed to drop database during rollback: ${dropErr instanceof Error ? dropErr.message : String(dropErr)}`,
+                )
+              }
+            },
+          })
+
+          await containerManager.addDatabase(containerName, databaseName)
+
+          // Register rollback to remove database from container tracking
+          tx.addRollback({
+            description: `Remove "${databaseName}" from container tracking`,
+            execute: async () => {
+              try {
+                await containerManager.removeDatabase(
+                  containerName,
+                  databaseName,
+                )
+                logDebug(
+                  `Rolled back: removed "${databaseName}" from container tracking`,
+                )
+              } catch (removeErr) {
+                logDebug(
+                  `Failed to remove database from tracking during rollback: ${removeErr instanceof Error ? removeErr.message : String(removeErr)}`,
+                )
+              }
+            },
+          })
 
-        await containerManager.addDatabase(containerName, databaseName)
+          const restoreSpinner = createSpinner('Restoring backup...')
+          restoreSpinner.start()
 
-        const restoreSpinner = createSpinner('Restoring backup...')
-        restoreSpinner.start()
+          const result = await engine.restore(config, backupPath, {
+            database: databaseName,
+            createDatabase: false,
+          })
 
-        const result = await engine.restore(config, backupPath, {
-          database: databaseName,
-          createDatabase: false,
-        })
+          // Check if restore completely failed (non-zero code with no data restored)
+          if (result.code !== 0 && result.stderr?.includes('FATAL')) {
+            restoreSpinner.fail('Restore failed')
+            throw new Error(result.stderr || 'Restore failed with fatal error')
+          }
 
-        if (result.code === 0 || !result.stderr) {
-          restoreSpinner.succeed('Backup restored successfully')
-        } else {
-          // pg_restore often returns warnings even on success
-          restoreSpinner.warn('Restore completed with warnings')
-          if (result.stderr) {
-            console.log(chalk.yellow('\n  Warnings:'))
-            const lines = result.stderr.split('\n').slice(0, 5)
-            lines.forEach((line) => {
-              if (line.trim()) {
-                console.log(chalk.gray(`    ${line}`))
+          if (result.code === 0) {
+            restoreSpinner.succeed('Backup restored successfully')
+          } else {
+            // pg_restore often returns warnings even on success
+            restoreSpinner.warn('Restore completed with warnings')
+            if (result.stderr) {
+              console.log(chalk.yellow('\n  Warnings:'))
+              const lines = result.stderr.split('\n').slice(0, 5)
+              lines.forEach((line) => {
+                if (line.trim()) {
+                  console.log(chalk.gray(`    ${line}`))
+                }
+              })
+              if (result.stderr.split('\n').length > 5) {
+                console.log(chalk.gray('    ...'))
               }
-            })
-            if (result.stderr.split('\n').length > 5) {
-              console.log(chalk.gray('    ...'))
             }
           }
+
+          // Restore succeeded - commit transaction (clear rollback actions)
+          tx.commit()
+        } catch (restoreErr) {
+          // Restore failed - execute rollbacks to clean up created database
+          if (databaseCreated) {
+            console.log(chalk.yellow('\n  Cleaning up after failed restore...'))
+            await tx.rollback()
+          }
+          throw restoreErr
         }
 
         const connectionString = engine.getConnectionString(
@@ -287,7 +349,7 @@ export const restoreCommand = new Command('restore')
           databaseName,
         )
         console.log()
-        console.log(success(`Database "${databaseName}" restored`))
+        console.log(uiSuccess(`Database "${databaseName}" restored`))
         console.log()
         console.log(chalk.gray('  Connection string:'))
         console.log(chalk.cyan(`  ${connectionString}`))
@@ -305,8 +367,8 @@ export const restoreCommand = new Command('restore')
           chalk.cyan(`  spindb connect ${containerName} -d ${databaseName}`),
         )
         console.log()
-      } catch (err) {
-        const e = err as Error
+      } catch (error) {
+        const e = error as Error
 
         const missingToolPatterns = [
           'pg_restore not found',
@@ -331,7 +393,7 @@ export const restoreCommand = new Command('restore')
           process.exit(1)
         }
 
-        console.error(error(e.message))
+        console.error(uiError(e.message))
         process.exit(1)
       } finally {
         if (tempDumpPath) {

package/cli/commands/run.ts

@@ -5,7 +5,7 @@ import { containerManager } from '../../core/container-manager'
 import { processManager } from '../../core/process-manager'
 import { getEngine } from '../../engines'
 import { promptInstallDependencies } from '../ui/prompts'
-import { error, warning } from '../ui/theme'
+import { uiError, uiWarning } from '../ui/theme'
 import { getMissingDependencies } from '../../core/dependency-manager'
 import { Engine } from '../../types'
 
@@ -26,7 +26,7 @@ export const runCommand = new Command('run')
 
         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)
         }
 
@@ -36,9 +36,7 @@ export const runCommand = new Command('run')
         if (engineName === Engine.SQLite) {
           if (!existsSync(config.database)) {
             console.error(
-              error(
-                `SQLite database file not found: ${config.database}`,
-              ),
+              uiError(`SQLite database file not found: ${config.database}`),
             )
             process.exit(1)
           }
@@ -49,7 +47,7 @@ export const runCommand = new Command('run')
           })
           if (!running) {
             console.error(
-              error(
+              uiError(
                 `Container "${containerName}" is not running. Start it first with: spindb start ${containerName}`,
               ),
             )
@@ -59,16 +57,16 @@ export const runCommand = new Command('run')
 
         if (file && options.sql) {
           console.error(
-            error('Cannot specify both a file and --sql option. Choose one.'),
+            uiError('Cannot specify both a file and --sql option. Choose one.'),
           )
           process.exit(1)
         }
 
         if (!file && !options.sql) {
-          console.error(error('Must provide either a SQL file or --sql option'))
-          console.log(
-            chalk.gray('  Usage: spindb run <container> <file.sql>'),
+          console.error(
+            uiError('Must provide either a SQL file or --sql option'),
           )
+          console.log(chalk.gray('  Usage: spindb run <container> <file.sql>'))
           console.log(
             chalk.gray('     or: spindb run <container> --sql "SELECT ..."'),
           )
@@ -76,7 +74,7 @@ export const runCommand = new Command('run')
         }
 
         if (file && !existsSync(file)) {
-          console.error(error(`SQL file not found: ${file}`))
+          console.error(uiError(`SQL file not found: ${file}`))
           process.exit(1)
         }
 
@@ -85,7 +83,7 @@ export const runCommand = new Command('run')
         let missingDeps = await getMissingDependencies(engineName)
         if (missingDeps.length > 0) {
           console.log(
-            warning(
+            uiWarning(
               `Missing tools: ${missingDeps.map((d) => d.name).join(', ')}`,
             ),
           )
@@ -102,7 +100,7 @@ export const runCommand = new Command('run')
           missingDeps = await getMissingDependencies(engineName)
           if (missingDeps.length > 0) {
             console.error(
-              error(
+              uiError(
                 `Still missing tools: ${missingDeps.map((d) => d.name).join(', ')}`,
               ),
             )
@@ -120,8 +118,8 @@ export const runCommand = new Command('run')
           sql: options.sql,
           database,
         })
-      } catch (err) {
-        const e = err as Error
+      } catch (error) {
+        const e = error as Error
 
         const missingToolPatterns = [
           'psql not found',
@@ -138,8 +136,12 @@ export const runCommand = new Command('run')
             .replace(' not found', '')
             .replace(' client', '')
           // Determine engine from the missing tool name
-          const toolEngine = missingTool === 'mysql' ? Engine.MySQL : Engine.PostgreSQL
-          const installed = await promptInstallDependencies(missingTool, toolEngine)
+          const toolEngine =
+            missingTool === 'mysql' ? Engine.MySQL : Engine.PostgreSQL
+          const installed = await promptInstallDependencies(
+            missingTool,
+            toolEngine,
+          )
           if (installed) {
             console.log(
               chalk.yellow('  Please re-run your command to continue.'),
@@ -148,7 +150,7 @@ export const runCommand = new Command('run')
           process.exit(1)
         }
 
-        console.error(error(e.message))
+        console.error(uiError(e.message))
         process.exit(1)
       }
     },

package/cli/commands/self-update.ts

@@ -3,7 +3,7 @@ import chalk from 'chalk'
 import inquirer from 'inquirer'
 import { updateManager } from '../../core/update-manager'
 import { createSpinner } from '../ui/spinner'
-import { success, error, info, header } from '../ui/theme'
+import { uiSuccess, uiError, uiInfo, header } from '../ui/theme'
 
 export const selfUpdateCommand = new Command('self-update')
   .alias('update')
@@ -24,7 +24,7 @@ export const selfUpdateCommand = new Command('self-update')
       if (!result) {
         checkSpinner.fail('Could not reach npm registry')
         console.log()
-        console.log(info('Check your internet connection and try again.'))
+        console.log(uiInfo('Check your internet connection and try again.'))
         console.log(chalk.gray('  Manual update: npm install -g spindb@latest'))
         process.exit(1)
       }
@@ -84,7 +84,7 @@ export const selfUpdateCommand = new Command('self-update')
         updateSpinner.succeed('Update complete')
         console.log()
         console.log(
-          success(
+          uiSuccess(
             `Updated from ${updateResult.previousVersion} to ${updateResult.newVersion}`,
           ),
         )
@@ -100,9 +100,9 @@ export const selfUpdateCommand = new Command('self-update')
       } else {
         updateSpinner.fail('Update failed')
         console.log()
-        console.log(error(updateResult.error || 'Unknown error'))
+        console.log(uiError(updateResult.error || 'Unknown error'))
         console.log()
-        console.log(info('Manual update: npm install -g spindb@latest'))
+        console.log(uiInfo('Manual update: npm install -g spindb@latest'))
         process.exit(1)
       }
     },

package/cli/commands/start.ts

@@ -7,7 +7,7 @@ import { getEngine } from '../../engines'
 import { getEngineDefaults } from '../../config/defaults'
 import { promptContainerSelect } from '../ui/prompts'
 import { createSpinner } from '../ui/spinner'
-import { error, warning } from '../ui/theme'
+import { uiError, uiWarning } from '../ui/theme'
 
 export const startCommand = new Command('start')
   .description('Start a container')
@@ -23,10 +23,10 @@ export const startCommand = new Command('start')
         if (stopped.length === 0) {
           if (containers.length === 0) {
             console.log(
-              warning('No containers found. Create one with: spindb create'),
+              uiWarning('No containers found. Create one with: spindb create'),
             )
           } else {
-            console.log(warning('All containers are already running'))
+            console.log(uiWarning('All containers are already running'))
           }
           return
         }
@@ -41,7 +41,7 @@ export const startCommand = new Command('start')
 
       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)
       }
 
@@ -51,7 +51,9 @@ export const startCommand = new Command('start')
         engine: engineName,
       })
       if (running) {
-        console.log(warning(`Container "${containerName}" is already running`))
+        console.log(
+          uiWarning(`Container "${containerName}" is already running`),
+        )
         return
       }
 
@@ -72,7 +74,7 @@ export const startCommand = new Command('start')
       if (!result.success) {
         spinner.fail(`Failed to start "${containerName}"`)
         if (result.error) {
-          console.error(error(result.error.message))
+          console.error(uiError(result.error.message))
         }
         process.exit(1)
       }
@@ -110,9 +112,9 @@ export const startCommand = new Command('start')
       console.log(chalk.gray('  Connect with:'))
       console.log(chalk.cyan(`  spindb connect ${containerName}`))
       console.log()
-    } 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)
     }
   })