relq 1.0.2 → 1.0.3

package/dist/cjs/cli/commands/history.cjs

@@ -37,27 +37,19 @@ exports.historyCommand = historyCommand;
 const fs = __importStar(require("fs"));
 const config_loader_1 = require("../utils/config-loader.cjs");
 const env_loader_1 = require("../utils/env-loader.cjs");
-const colors = {
-    reset: '\x1b[0m',
-    bold: '\x1b[1m',
-    dim: '\x1b[2m',
-    red: '\x1b[31m',
-    green: '\x1b[32m',
-    yellow: '\x1b[33m',
-    cyan: '\x1b[36m',
-};
+const cli_utils_1 = require("../utils/cli-utils.cjs");
+const pool_manager_1 = require("../utils/pool-manager.cjs");
 async function historyCommand(context) {
     const { config, flags } = context;
     if (!config) {
-        console.error('Error: No configuration found.');
-        process.exit(1);
+        (0, cli_utils_1.fatal)('No configuration found', `run ${cli_utils_1.colors.cyan('relq init')} to create a configuration file`);
     }
-    (0, config_loader_1.requireValidConfig)(config);
+    await (0, config_loader_1.requireValidConfig)(config, { calledFrom: 'history' });
     const connection = config.connection;
     const migrationsDir = config.migrations?.directory || './migrations';
     const tableName = config.migrations?.tableName || '_relq_migrations';
     const limit = parseInt(flags['n']) || 20;
-    console.log(`${colors.bold}Migration History${colors.reset}`);
+    console.log('Migration History');
     console.log(`Database: ${(0, env_loader_1.getConnectionDescription)(connection)}`);
     console.log('');
     try {
@@ -76,42 +68,41 @@ async function historyCommand(context) {
         const toShow = history.slice(0, limit);
         const pendingCount = history.filter(h => h.pending).length;
         const appliedCount = history.filter(h => !h.pending).length;
-        console.log(`${colors.dim}Showing ${toShow.length} of ${history.length} migrations${colors.reset}`);
-        console.log(`${colors.green}${appliedCount} applied${colors.reset}, ${colors.yellow}${pendingCount} pending${colors.reset}`);
+        console.log(`Showing ${toShow.length} of ${history.length} migrations`);
+        console.log(`${appliedCount} applied, ${pendingCount} pending`);
         console.log('');
         for (const record of toShow) {
             if (record.pending) {
-                console.log(`${colors.yellow}○ ${record.name}${colors.reset} ${colors.dim}(pending)${colors.reset}`);
+                console.log(`${cli_utils_1.colors.yellow}○ ${record.name}${cli_utils_1.colors.reset} ${cli_utils_1.colors.dim}(pending)${cli_utils_1.colors.reset}`);
             }
             else {
                 const date = record.appliedAt ? formatDate(record.appliedAt) : '';
-                console.log(`${colors.green}● ${record.name}${colors.reset} ${colors.dim}${date}${colors.reset}`);
+                console.log(`${cli_utils_1.colors.green}● ${record.name}${cli_utils_1.colors.reset} ${cli_utils_1.colors.dim}${date}${cli_utils_1.colors.reset}`);
             }
         }
         if (history.length > limit) {
             console.log('');
-            console.log(`${colors.dim}Use "relq history -n ${history.length}" to see all.${colors.reset}`);
+            console.log(`${cli_utils_1.colors.dim}Use "relq history -n ${history.length}" to see all.${cli_utils_1.colors.reset}`);
         }
     }
     catch (error) {
         if (error?.code === '42P01') {
-            console.log(`${colors.yellow}No migration table found.${colors.reset}`);
-            console.log(`Run "${colors.cyan}relq push${colors.reset}" to initialize.`);
+            console.log(`${cli_utils_1.colors.yellow}No migration table found.${cli_utils_1.colors.reset}`);
+            console.log(`Run "${cli_utils_1.colors.cyan}relq push${cli_utils_1.colors.reset}" to initialize.`);
             console.log('');
             const files = getMigrationFiles(migrationsDir);
             if (files.length > 0) {
-                console.log(`${colors.bold}Pending migrations:${colors.reset}`);
+                console.log(`${cli_utils_1.colors.bold}Pending migrations:${cli_utils_1.colors.reset}`);
                 for (const file of files.slice(0, limit)) {
-                    console.log(`  ${colors.yellow}○ ${file}${colors.reset}`);
+                    console.log(`  ${cli_utils_1.colors.yellow}○ ${file}${cli_utils_1.colors.reset}`);
                 }
             }
             else {
-                console.log(`${colors.dim}No migration files found.${colors.reset}`);
+                console.log(`${cli_utils_1.colors.dim}No migration files found.${cli_utils_1.colors.reset}`);
             }
             return;
         }
-        console.error('Error:', error instanceof Error ? error.message : error);
-        process.exit(1);
+        (0, cli_utils_1.fatal)('Failed to load history', error instanceof Error ? error.message : String(error));
     }
 }
 function getMigrationFiles(migrationsDir) {
@@ -123,29 +114,17 @@ function getMigrationFiles(migrationsDir) {
         .sort();
 }
 async function getAppliedMigrations(connection, tableName) {
-    const { Pool } = await Promise.resolve().then(() => __importStar(require("../../addon/pg/index.cjs")));
-    const pool = new Pool({
-        host: connection.host,
-        port: connection.port || 5432,
-        database: connection.database,
-        user: connection.user,
-        password: connection.password,
-        connectionString: connection.url,
-    });
-    try {
+    return (0, pool_manager_1.withPool)(connection, async (pool) => {
         const result = await pool.query(`
             SELECT name, applied_at 
             FROM "${tableName}" 
             ORDER BY id DESC;
         `);
-        return result.rows.map(r => ({
+        return result.rows.map((r) => ({
             name: r.name,
             appliedAt: new Date(r.applied_at),
         }));
-    }
-    finally {
-        await pool.end();
-    }
+    });
 }
 function formatDate(date) {
     const now = new Date();

package/dist/cjs/cli/commands/import.cjs

@@ -43,26 +43,22 @@ const schema_comparator_1 = require("../utils/schema-comparator.cjs");
 const change_tracker_1 = require("../utils/change-tracker.cjs");
 const relqignore_1 = require("../utils/relqignore.cjs");
 const git_utils_1 = require("../utils/git-utils.cjs");
-async function importCommand(sqlFilePath, options = {}) {
+async function importCommand(sqlFilePath, options = {}, projectRoot = process.cwd()) {
     const { includeFunctions = false, includeTriggers = false, force = false, dryRun = false } = options;
-    const projectRoot = process.cwd();
     const spinner = (0, git_utils_1.createSpinner)();
     console.log('');
     if (!sqlFilePath) {
-        (0, git_utils_1.error)('No SQL file specified.');
-        console.log('');
-        console.log('usage: relq import <sql-file> [options]');
-        console.log('');
-        console.log('Options:');
-        console.log('    --output <path>       Output schema file path');
-        console.log('    --force               Force import, overwrite local changes');
-        console.log('    --dry-run             Preview changes without applying');
-        console.log('    --theirs              Accept all incoming changes');
-        console.log('    --ours                Keep all local changes (reject incoming)');
-        console.log('    --abort               Abort the import operation');
-        console.log('    --include-functions   Include functions in import');
-        console.log('    --include-triggers    Include triggers in import');
-        process.exit(1);
+        (0, git_utils_1.fatal)('No SQL file specified', 'usage: relq import <sql-file> [options]\n\n' +
+            'Options:\n' +
+            '    --output <path>       Output schema file path\n' +
+            '    --force               Force import, overwrite local changes\n' +
+            '    --dry-run             Preview changes without applying\n' +
+            '    --theirs              Accept all incoming changes\n' +
+            '    --ours                Keep all local changes (reject incoming)\n' +
+            '    --abort               Abort the import operation\n' +
+            '    --include-functions   Include functions in import\n' +
+            '    --include-triggers    Include triggers in import');
+        return;
     }
     if (options.abort) {
         console.log('Aborting import...');
@@ -85,11 +81,8 @@ async function importCommand(sqlFilePath, options = {}) {
         (0, git_utils_1.warning)(warn);
     }
     if (!validation.valid) {
-        (0, git_utils_1.error)('Invalid PostgreSQL SQL file:');
-        for (const err of validation.errors) {
-            console.log(`  - ${err}`);
-        }
-        process.exit(1);
+        (0, git_utils_1.fatal)('Invalid PostgreSQL SQL file', validation.errors.join('\n  - '));
+        return;
     }
     console.log(`Importing ${git_utils_1.colors.cyan(path.basename(sqlFilePath))} ${git_utils_1.colors.gray(`(${(0, git_utils_1.formatBytes)(sqlContent.length)})`)}`);
     console.log('');
@@ -104,7 +97,8 @@ async function importCommand(sqlFilePath, options = {}) {
             (0, git_utils_1.printDirtyWorkingTreeError)(status, 'import');
             console.log('');
             (0, git_utils_1.printMergeStrategyHelp)();
-            process.exit(1);
+            (0, git_utils_1.fatal)('Working tree is not clean', 'Commit or stash your changes before importing.');
+            return;
         }
     }
     spinner.start('Parsing SQL schema');
@@ -232,7 +226,7 @@ async function importCommand(sqlFilePath, options = {}) {
         partitions: parsedSchema.partitions,
     };
     if (ignoredCount > 0) {
-        console.log(`${git_utils_1.colors.gray(`ℹ ${ignoredCount} object(s) ignored by .relqignore`)}`);
+        console.log(`${ignoredCount} object(s) ignored by .relqignore`);
     }
     const dependencyErrors = (0, relqignore_1.validateIgnoreDependencies)({
         tables: filteredTables.map(t => ({
@@ -250,14 +244,9 @@ async function importCommand(sqlFilePath, options = {}) {
     }, ignorePatterns);
     if (dependencyErrors.length > 0) {
         spinner.stop();
-        (0, git_utils_1.error)('Dependency validation failed:');
-        console.log('');
-        for (const depError of dependencyErrors) {
-            console.log(`  ${git_utils_1.colors.red('✗')} ${depError.message}`);
-        }
-        console.log('');
-        (0, git_utils_1.hint)('Either un-ignore the type or add the column to .relqignore');
-        process.exit(1);
+        const errorMessages = dependencyErrors.map(e => e.message).join('\n  ');
+        (0, git_utils_1.fatal)('Dependency validation failed', `${errorMessages}\n\nEither un-ignore the type or add the column to .relqignore`);
+        return;
     }
     spinner.start('Generating TypeScript schema');
     const dbSchema = convertToDbSchema(filteredSchema, filteredFunctions, triggers, comments);
@@ -313,7 +302,7 @@ async function importCommand(sqlFilePath, options = {}) {
                 }
                 else {
                     console.log('');
-                    console.log(`${git_utils_1.colors.gray(`ℹ ${drops.length} object(s) only in existing schema (preserved)`)}`);
+                    console.log(`${drops.length} object(s) only in existing schema (preserved)`);
                 }
             }
             console.log('');
@@ -340,8 +329,10 @@ async function importCommand(sqlFilePath, options = {}) {
         console.log(`${git_utils_1.colors.yellow('Dry run mode')} - no files written`);
         console.log('');
         console.log('Would write:');
-        console.log(`  ${git_utils_1.colors.cyan(options.output || './db/schema.ts')} ${git_utils_1.colors.gray(`(${(0, git_utils_1.formatBytes)(finalTypescriptContent.length)})`)}`);
-        console.log(`  ${git_utils_1.colors.cyan('.relq/snapshot.json')}`);
+        const dryRunOutputPath = options.output || './db/schema.ts';
+        const dryRunAbsPath = path.resolve(projectRoot, dryRunOutputPath);
+        console.log(`  ${git_utils_1.colors.cyan(dryRunAbsPath)} ${git_utils_1.colors.gray(`(${(0, git_utils_1.formatBytes)(finalTypescriptContent.length)})`)}`);
+        console.log(`  ${git_utils_1.colors.cyan(path.join(projectRoot, '.relq/snapshot.json'))}`);
         if (changes.length > 0) {
             console.log(`  Stage ${changes.length} change(s)`);
         }
@@ -349,29 +340,29 @@ async function importCommand(sqlFilePath, options = {}) {
         return;
     }
     const outputPath = options.output || './db/schema.ts';
-    const absoluteOutputPath = path.resolve(outputPath);
+    const absoluteOutputPath = path.resolve(projectRoot, outputPath);
     const outputDir = path.dirname(absoluteOutputPath);
     if (!fs.existsSync(outputDir)) {
         fs.mkdirSync(outputDir, { recursive: true });
     }
     fs.writeFileSync(absoluteOutputPath, finalTypescriptContent, 'utf-8');
-    console.log(`Written ${git_utils_1.colors.cyan(outputPath)} ${git_utils_1.colors.gray(`(${(0, git_utils_1.formatBytes)(finalTypescriptContent.length)})`)}`);
+    console.log(`Written ${git_utils_1.colors.cyan(absoluteOutputPath)} ${git_utils_1.colors.gray(`(${(0, git_utils_1.formatBytes)(finalTypescriptContent.length)})`)}`);
     (0, repo_manager_1.saveSnapshot)(mergedSchema, projectRoot);
     if (changes.length > 0) {
         (0, repo_manager_1.addUnstagedChanges)(changes, projectRoot);
         (0, repo_manager_1.stageChanges)(['.'], projectRoot);
         console.log('');
-        console.log(`${git_utils_1.colors.green('✓')} ${changes.length} change(s) staged for commit`);
+        console.log(`${changes.length} change(s) staged for commit`);
     }
     console.log('');
-    console.log(`${git_utils_1.colors.green('Import successful.')}`);
+    console.log('Import successful.');
     console.log('');
     if (changes.length > 0) {
-        (0, git_utils_1.hint)('Run "relq status" to see staged changes');
-        (0, git_utils_1.hint)('Run "relq commit -m <message>" to commit');
+        (0, git_utils_1.hint)("run 'relq status' to see staged changes");
+        (0, git_utils_1.hint)("run 'relq commit -m <message>' to commit");
     }
     else {
-        (0, git_utils_1.hint)('Run "relq status" to see current state');
+        (0, git_utils_1.hint)("run 'relq status' to see current state");
     }
     console.log('');
 }
@@ -468,6 +459,7 @@ function convertToDbSchema(parsed, functions = [], triggers = [], comments = [])
             cycle: s.cycle,
             ownedBy: s.ownedBy,
         })) || [],
+        collations: [],
         extensions: parsed.extensions,
         partitions: parsed.partitions,
         functions: functions.map(f => ({
@@ -736,6 +728,7 @@ function snapshotToDbSchemaForGeneration(snapshot) {
             cycle: s.cycle,
             ownedBy: s.ownedBy ?? undefined,
         })) || [],
+        collations: [],
         extensions: (snapshot.extensions || []).map(e => typeof e === 'string' ? e : e.name),
         partitions: [],
         functions: snapshot.functions?.map(f => ({

package/dist/cjs/cli/commands/init.cjs

@@ -40,9 +40,9 @@ const readline = __importStar(require("readline"));
 const env_loader_1 = require("../utils/env-loader.cjs");
 const repo_manager_1 = require("../utils/repo-manager.cjs");
 const relqignore_1 = require("../utils/relqignore.cjs");
-const spinner_1 = require("../utils/spinner.cjs");
+const cli_utils_1 = require("../utils/cli-utils.cjs");
 function ask(rl, question, defaultValue) {
-    const suffix = defaultValue ? ` ${spinner_1.colors.muted(`[${defaultValue}]`)}` : '';
+    const suffix = defaultValue ? ` ${cli_utils_1.colors.muted(`[${defaultValue}]`)}` : '';
     return new Promise((resolve) => {
         rl.question(`${question}${suffix}: `, (answer) => {
             resolve(answer.trim() || defaultValue || '');
@@ -50,7 +50,7 @@ function ask(rl, question, defaultValue) {
     });
 }
 function askYesNo(rl, question, defaultYes = true) {
-    const suffix = defaultYes ? spinner_1.colors.muted('[Y/n]') : spinner_1.colors.muted('[y/N]');
+    const suffix = defaultYes ? cli_utils_1.colors.muted('[Y/n]') : cli_utils_1.colors.muted('[y/N]');
     return new Promise((resolve) => {
         rl.question(`${question} ${suffix}: `, (answer) => {
             const a = answer.trim().toLowerCase();
@@ -154,13 +154,11 @@ ${connectionBlock}
 }
 async function initCommand(context) {
     const cwd = process.cwd();
-    const spinner = (0, spinner_1.createSpinner)();
-    console.log('');
-    console.log(`${spinner_1.colors.bold('Relq')} - Git-like schema versioning for PostgreSQL`);
+    const spinner = (0, cli_utils_1.createSpinner)();
     console.log('');
     const { findConfigFileRecursive } = await Promise.resolve().then(() => __importStar(require("../utils/config-loader.cjs")));
+    const { findProjectRoot } = await Promise.resolve().then(() => __importStar(require("../utils/project-root.cjs")));
     const existingConfig = findConfigFileRecursive(cwd);
-    const localRelqExists = (0, repo_manager_1.isInitialized)(cwd);
     let projectRoot = cwd;
     let existingConfigValues = null;
     if (existingConfig) {
@@ -172,28 +170,35 @@ async function initCommand(context) {
         catch {
         }
         if (existingConfig.directory !== cwd) {
-            console.log(`${spinner_1.colors.cyan('ℹ')}  Found ${spinner_1.colors.cyan('relq.config.ts')} in parent directory:`);
-            console.log(`   ${spinner_1.colors.muted(existingConfig.path)}`);
+            (0, cli_utils_1.hint)(`Found relq.config.ts in: ${cli_utils_1.colors.cyan(existingConfig.directory)}`);
+            console.log(`   Initializing at project root...`);
             console.log('');
-            console.log(`${spinner_1.colors.muted('Run commands from project root:')} ${spinner_1.colors.cyan(existingConfig.directory)}`);
+        }
+    }
+    else {
+        const packageRoot = findProjectRoot(cwd);
+        if (packageRoot && packageRoot !== cwd) {
+            projectRoot = packageRoot;
+            (0, cli_utils_1.hint)(`Found package.json in: ${cli_utils_1.colors.cyan(packageRoot)}`);
+            console.log(`   Initializing at project root...`);
             console.log('');
-            return;
         }
+    }
+    if (existingConfig && existingConfig.directory === projectRoot) {
         const relqFolderExists = (0, repo_manager_1.isInitialized)(projectRoot);
         if (relqFolderExists) {
-            console.log(`${spinner_1.colors.green('✓')} Relq is already initialized.`);
+            console.log(`${cli_utils_1.colors.green('Relq is already initialized.')}`);
             console.log('');
-            console.log(`   ${spinner_1.colors.green('●')} ${spinner_1.colors.muted('relq.config.ts')}`);
-            console.log(`   ${spinner_1.colors.green('●')} ${spinner_1.colors.muted('.relq/')} folder`);
+            console.log(`   ${cli_utils_1.colors.dim('-')} relq.config.ts`);
+            console.log(`   ${cli_utils_1.colors.dim('-')} .relq/ folder`);
             console.log('');
-            console.log(`${spinner_1.colors.muted('Use')} ${spinner_1.colors.cyan('relq status')} ${spinner_1.colors.muted('to see current state.')}`);
-            console.log(`${spinner_1.colors.muted('Use')} ${spinner_1.colors.cyan('relq pull')} ${spinner_1.colors.muted('to sync with database.')}`);
+            (0, cli_utils_1.hint)(`Use ${cli_utils_1.colors.cyan('relq status')} to see current state`);
+            (0, cli_utils_1.hint)(`Use ${cli_utils_1.colors.cyan('relq pull')} to sync with database`);
             return;
         }
         else {
-            console.log(`${spinner_1.colors.yellow('⚠')}  Found ${spinner_1.colors.cyan('relq.config.ts')} but ${spinner_1.colors.cyan('.relq/')} folder is missing.`);
-            console.log('');
-            console.log(`${spinner_1.colors.muted('This could mean the setup was incomplete.')}`);
+            (0, cli_utils_1.warning)('Found relq.config.ts but .relq/ folder is missing');
+            (0, cli_utils_1.hint)('This could mean the setup was incomplete');
             console.log('');
             const rl = readline.createInterface({
                 input: process.stdin,
@@ -217,12 +222,12 @@ async function initCommand(context) {
                     }
                     if (missingFields.length > 0) {
                         console.log('');
-                        console.log(`${spinner_1.colors.yellow('⚠')}  Your config is missing required fields:`);
+                        (0, cli_utils_1.warning)('Your config is missing required fields:');
                         for (const field of missingFields) {
-                            console.log(`   ${spinner_1.colors.red('●')} ${field}`);
+                            console.log(`   ${cli_utils_1.colors.dim('-')} ${field}`);
                         }
                         console.log('');
-                        console.log(`${spinner_1.colors.cyan('●')} Let's fill in the missing fields:`);
+                        console.log(`${cli_utils_1.colors.dim("Let's fill in the missing fields:")}`);
                         console.log('');
                         let authorValue = existingConfigValues?.author;
                         let schemaValue = existingConfigValues?.schema;
@@ -234,9 +239,9 @@ async function initCommand(context) {
                         }
                         if (missingFields.includes('connection')) {
                             console.log('');
-                            console.log(`${spinner_1.colors.red('●')} Connection not configured.`);
-                            console.log(`   ${spinner_1.colors.muted('Set DATABASE_* environment variables in .env')}`);
-                            console.log(`   ${spinner_1.colors.muted('or update relq.config.ts with connection details.')}`);
+                            console.log('Connection not configured.');
+                            console.log('   Set DATABASE_* environment variables in .env');
+                            console.log('   or update relq.config.ts with connection details.');
                             rl.close();
                             return;
                         }
@@ -262,18 +267,18 @@ async function initCommand(context) {
                     }
                     rl.close();
                     console.log('');
-                    console.log(`${spinner_1.colors.cyan('●')} Completing setup...`);
+                    console.log('Completing setup...');
                     console.log('');
                     (0, repo_manager_1.initRepository)(projectRoot);
-                    console.log(`   ${spinner_1.colors.green('✓')} Created ${spinner_1.colors.cyan('.relq/')} folder`);
+                    console.log('   Created .relq/ folder');
                     (0, relqignore_1.createDefaultRelqignore)(projectRoot);
-                    console.log(`   ${spinner_1.colors.green('✓')} Created ${spinner_1.colors.cyan('.relqignore')}`);
+                    console.log('   Created .relqignore');
                     const gitignorePath = path.join(projectRoot, '.gitignore');
                     if (fs.existsSync(gitignorePath)) {
                         const gitignore = fs.readFileSync(gitignorePath, 'utf-8');
                         if (!gitignore.includes('.relq')) {
                             fs.appendFileSync(gitignorePath, '\n# Relq local state\n.relq/\n');
-                            console.log(`   ${spinner_1.colors.green('✓')} Added ${spinner_1.colors.cyan('.relq/')} to .gitignore`);
+                            console.log('   Added .relq/ to .gitignore');
                         }
                     }
                     if (existingConfigValues?.connection) {
@@ -287,14 +292,20 @@ async function initCommand(context) {
                         }
                     }
                     console.log('');
-                    console.log(`${spinner_1.colors.green('✓')} Setup complete!`);
+                    console.log('Setup complete!');
                     console.log('');
-                    console.log(`${spinner_1.colors.muted('Run')} ${spinner_1.colors.cyan('relq pull')} ${spinner_1.colors.muted('to sync with database.')}`);
+                    const calledFrom = context.flags['called-from'];
+                    if (calledFrom) {
+                        console.log(`Continuing with ${calledFrom}...`);
+                    }
+                    else {
+                        console.log('Run "relq pull" to sync with database.');
+                    }
                     return;
                 }
                 rl.close();
                 console.log('');
-                console.log(`${spinner_1.colors.muted('Cancelled.')}`);
+                console.log(`${cli_utils_1.colors.muted('Cancelled.')}`);
                 return;
             }
             catch {
@@ -308,7 +319,7 @@ async function initCommand(context) {
         output: process.stdout,
     });
     try {
-        console.log(`${spinner_1.colors.cyan('●')} Checking for database connection...`);
+        console.log('Checking for database connection...');
         console.log('');
         const envCheck = checkEnvVars();
         let useEnv = false;
@@ -318,28 +329,28 @@ async function initCommand(context) {
         let user = 'postgres';
         let password = '';
         if (envCheck.found) {
-            console.log(`${spinner_1.colors.green('✓')} Found database environment variables:`);
+            console.log('Found database environment variables:');
             if (envCheck.vars.RELQ_PG_CONN_URL) {
-                console.log(`   ${spinner_1.colors.green('✓')} RELQ_PG_CONN_URL`);
+                console.log('   RELQ_PG_CONN_URL');
             }
             else {
                 if (envCheck.vars.DATABASE_HOST)
-                    console.log(`   ${spinner_1.colors.green('✓')} DATABASE_HOST: ${envCheck.vars.DATABASE_HOST}`);
+                    console.log(`   DATABASE_HOST: ${envCheck.vars.DATABASE_HOST}`);
                 if (envCheck.vars.DATABASE_PORT)
-                    console.log(`   ${spinner_1.colors.green('✓')} DATABASE_PORT: ${envCheck.vars.DATABASE_PORT}`);
+                    console.log(`   DATABASE_PORT: ${envCheck.vars.DATABASE_PORT}`);
                 if (envCheck.vars.DATABASE_NAME)
-                    console.log(`   ${spinner_1.colors.green('✓')} DATABASE_NAME: ${envCheck.vars.DATABASE_NAME}`);
+                    console.log(`   DATABASE_NAME: ${envCheck.vars.DATABASE_NAME}`);
                 if (envCheck.vars.DATABASE_USER)
-                    console.log(`   ${spinner_1.colors.green('✓')} DATABASE_USER: ${envCheck.vars.DATABASE_USER}`);
+                    console.log(`   DATABASE_USER: ${envCheck.vars.DATABASE_USER}`);
                 if (envCheck.vars.DATABASE_PASSWORD)
-                    console.log(`   ${spinner_1.colors.green('✓')} DATABASE_PASSWORD: ***`);
+                    console.log('   DATABASE_PASSWORD: ***');
             }
             console.log('');
             useEnv = await askYesNo(rl, 'Use these environment variables?', true);
             console.log('');
         }
         if (!useEnv) {
-            console.log(`${spinner_1.colors.cyan('●')} Database Connection`);
+            console.log('Database Connection');
             console.log('');
             host = await ask(rl, '  Host', 'localhost');
             port = await ask(rl, '  Port', '5432');
@@ -349,21 +360,21 @@ async function initCommand(context) {
             console.log('');
         }
         const detectedPath = detectSchemaPath();
-        console.log(`${spinner_1.colors.cyan('●')} Schema Configuration`);
+        console.log('Schema Configuration');
         console.log('');
         const schemaPath = await ask(rl, '  Schema file path', detectedPath);
         console.log('');
-        console.log(`${spinner_1.colors.cyan('●')} Author (for commit history)`);
+        console.log('Author (for commit history)');
         console.log('');
         const author = await ask(rl, '  Name <email>', 'Developer <dev@example.com>');
         console.log('');
-        console.log(`${spinner_1.colors.cyan('●')} Features to track`);
+        console.log('Features to track');
         console.log('');
         const includeFunctions = await askYesNo(rl, '  Include functions?', false);
         const includeTriggers = await askYesNo(rl, '  Include triggers?', false);
         console.log('');
         rl.close();
-        console.log(`${spinner_1.colors.cyan('●')} Creating files...`);
+        console.log('Creating files...');
         console.log('');
         const configPath = path.join(cwd, 'relq.config.ts');
         if (!fs.existsSync(configPath)) {
@@ -380,26 +391,26 @@ async function initCommand(context) {
                 includeTriggers,
             });
             fs.writeFileSync(configPath, configContent, 'utf-8');
-            console.log(`   ${spinner_1.colors.green('✓')} Created ${spinner_1.colors.cyan('relq.config.ts')}`);
+            console.log('   Created relq.config.ts');
         }
         else {
-            console.log(`   ${spinner_1.colors.yellow('○')} ${spinner_1.colors.cyan('relq.config.ts')} already exists`);
+            console.log('   relq.config.ts already exists');
         }
         (0, repo_manager_1.initRepository)(cwd);
-        console.log(`   ${spinner_1.colors.green('✓')} Created ${spinner_1.colors.cyan('.relq/')} folder`);
+        console.log('   Created .relq/ folder');
         (0, relqignore_1.createDefaultRelqignore)(cwd);
-        console.log(`   ${spinner_1.colors.green('✓')} Created ${spinner_1.colors.cyan('.relqignore')}`);
+        console.log('   Created .relqignore');
         const schemaDir = path.dirname(schemaPath);
         if (!fs.existsSync(schemaDir)) {
             fs.mkdirSync(schemaDir, { recursive: true });
-            console.log(`   ${spinner_1.colors.green('✓')} Created ${spinner_1.colors.cyan(schemaDir + '/')}`);
+            console.log(`   Created ${schemaDir}/`);
         }
         const gitignorePath = path.join(cwd, '.gitignore');
         if (fs.existsSync(gitignorePath)) {
             const gitignore = fs.readFileSync(gitignorePath, 'utf-8');
             if (!gitignore.includes('.relq')) {
                 fs.appendFileSync(gitignorePath, '\n# Relq local state\n.relq/\n');
-                console.log(`   ${spinner_1.colors.green('✓')} Added ${spinner_1.colors.cyan('.relq/')} to ${spinner_1.colors.cyan('.gitignore')}`);
+                console.log('   Added .relq/ to .gitignore');
             }
         }
         console.log('');
@@ -418,20 +429,19 @@ async function initCommand(context) {
         }
         catch (error) {
             spinner.fail('Could not connect to database');
-            console.log(`   ${spinner_1.colors.yellow('⚠')}  ${spinner_1.colors.muted('Run relq pull after fixing connection')}`);
+            (0, cli_utils_1.hint)("run 'relq pull' after fixing connection");
         }
         console.log('');
-        console.log(`${spinner_1.colors.green('✓')} ${spinner_1.colors.bold('Relq initialized successfully!')}`);
+        console.log('Relq initialized successfully!');
         console.log('');
-        console.log(`${spinner_1.colors.bold('Next steps:')}`);
-        console.log(`  1. Review ${spinner_1.colors.cyan('relq.config.ts')}`);
-        console.log(`  2. Run ${spinner_1.colors.cyan('relq pull')} to sync with database`);
-        console.log(`  3. Run ${spinner_1.colors.cyan('relq status')} to see current state`);
+        console.log('Next steps:');
+        console.log("  1. Review 'relq.config.ts'");
+        console.log("  2. Run 'relq pull' to sync with database");
+        console.log("  3. Run 'relq status' to see current state");
         console.log('');
     }
     catch (error) {
         rl.close();
-        console.error(spinner_1.colors.red(`Error: ${error instanceof Error ? error.message : error}`));
-        process.exit(1);
+        (0, cli_utils_1.fatal)('Initialization failed', error instanceof Error ? error.message : String(error));
     }
 }

package/dist/cjs/cli/commands/introspect.cjs

@@ -37,6 +37,7 @@ exports.introspectCommand = introspectCommand;
 const fs = __importStar(require("fs"));
 const readline = __importStar(require("readline"));
 const index_1 = require("../../introspect/index.cjs");
+const cli_utils_1 = require("../utils/cli-utils.cjs");
 function readStdin() {
     return new Promise((resolve) => {
         let data = '';
@@ -79,8 +80,7 @@ async function introspectCommand(context) {
     let sql;
     if (filePath) {
         if (!fs.existsSync(filePath)) {
-            console.error(`Error: File not found: ${filePath}`);
-            process.exit(1);
+            (0, cli_utils_1.fatal)(`File not found: ${filePath}`, 'Check the file path and try again.');
         }
         sql = fs.readFileSync(filePath, 'utf-8');
         console.log(`📄 Reading from: ${filePath}\n`);
@@ -92,10 +92,7 @@ async function introspectCommand(context) {
         sql = await readInteractive();
     }
     if (!sql.trim()) {
-        console.error('Error: No SQL input provided.');
-        console.error('Usage: relq introspect --file schema.sql');
-        console.error('   or: cat schema.sql | relq introspect');
-        process.exit(1);
+        (0, cli_utils_1.fatal)('No SQL input provided', 'Usage: relq introspect --file schema.sql\n   or: cat schema.sql | relq introspect');
     }
     console.log('🔍 Parsing SQL...\n');
     try {
@@ -116,8 +113,7 @@ async function introspectCommand(context) {
         console.log(output.join('\n'));
     }
     catch (error) {
-        console.error('Error parsing SQL:', error instanceof Error ? error.message : error);
-        process.exit(1);
+        (0, cli_utils_1.fatal)('Error parsing SQL', error instanceof Error ? error.message : String(error));
     }
 }
 function generateDefineTableCode(table) {