relq 1.0.2 → 1.0.4

package/dist/cjs/cli/commands/push.cjs

@@ -36,22 +36,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.pushCommand = pushCommand;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const readline = __importStar(require("readline"));
 const config_loader_1 = require("../utils/config-loader.cjs");
 const env_loader_1 = require("../utils/env-loader.cjs");
-const spinner_1 = require("../utils/spinner.cjs");
+const cli_utils_1 = require("../utils/cli-utils.cjs");
 const fast_introspect_1 = require("../utils/fast-introspect.cjs");
 const relqignore_1 = require("../utils/relqignore.cjs");
 const repo_manager_1 = require("../utils/repo-manager.cjs");
 async function pushCommand(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 one.`);
     }
-    (0, config_loader_1.requireValidConfig)(config);
+    await (0, config_loader_1.requireValidConfig)(config, { calledFrom: 'push' });
     const connection = config.connection;
-    const projectRoot = process.cwd();
+    const { projectRoot } = context;
     const force = flags['force'] === true;
     const dryRun = flags['dry-run'] === true;
     const applySQL = flags['apply'] === true;
@@ -62,23 +60,17 @@ async function pushCommand(context) {
     const includeViews = config.includeViews ?? false;
     console.log('');
     if (!(0, repo_manager_1.isInitialized)(projectRoot)) {
-        console.log(`${spinner_1.colors.red('fatal:')} not a relq repository`);
-        console.log('');
-        console.log(`${spinner_1.colors.muted('Run')} ${spinner_1.colors.cyan('relq init')} ${spinner_1.colors.muted('to initialize.')}`);
-        return;
+        (0, cli_utils_1.fatal)('not a relq repository (or any parent directories): .relq', `Run ${cli_utils_1.colors.cyan('relq init')} to initialize.`);
     }
     const localHead = (0, repo_manager_1.getHead)(projectRoot);
     if (!localHead) {
-        console.log(`${spinner_1.colors.red('error:')} no commits to push`);
-        console.log('');
-        console.log(`${spinner_1.colors.muted('Run')} ${spinner_1.colors.cyan('relq commit -m "message"')} ${spinner_1.colors.muted('to create a commit.')}`);
-        return;
+        (0, cli_utils_1.fatal)('no commits to push', `Run ${cli_utils_1.colors.cyan('relq commit -m "message"')} to create a commit.`);
     }
-    const spinner = (0, spinner_1.createSpinner)();
+    const spinner = (0, cli_utils_1.createSpinner)();
     try {
         spinner.start('Connecting to remote...');
         await (0, repo_manager_1.ensureRemoteTable)(connection);
-        spinner.succeed(`Connected to ${spinner_1.colors.cyan((0, env_loader_1.getConnectionDescription)(connection))}`);
+        spinner.succeed(`Connected to ${cli_utils_1.colors.cyan((0, env_loader_1.getConnectionDescription)(connection))}`);
         spinner.start('Checking remote commits...');
         const remoteCommits = await (0, repo_manager_1.fetchRemoteCommits)(connection, 100);
         const remoteHead = remoteCommits.length > 0 ? remoteCommits[0].hash : null;
@@ -96,9 +88,8 @@ async function pushCommand(context) {
         spinner.succeed(`Found ${remoteDb.tables.length} tables in remote`);
         const localSnapshot = (0, repo_manager_1.loadSnapshot)(projectRoot);
         if (!localSnapshot) {
-            console.log(`${spinner_1.colors.red('error:')} No local snapshot found`);
-            console.log(`${spinner_1.colors.muted('Run')} ${spinner_1.colors.cyan('relq pull')} ${spinner_1.colors.muted('or')} ${spinner_1.colors.cyan('relq import')} ${spinner_1.colors.muted('first.')}`);
-            return;
+            spinner.stop();
+            (0, cli_utils_1.fatal)('No local snapshot found', `Run ${cli_utils_1.colors.cyan('relq pull')} or ${cli_utils_1.colors.cyan('relq import')} first.`);
         }
         const ignorePatterns = (0, relqignore_1.loadRelqignore)(projectRoot);
         const analysis = analyzeSync(localSnapshot, remoteDb, ignorePatterns, { includeFunctions, includeTriggers, includeViews });
@@ -106,86 +97,69 @@ async function pushCommand(context) {
         const hasObjectsToDrop = analysis.objectsToDrop.length > 0;
         const hasSchemaDrift = analysis.schemaDrift.length > 0;
         if (hasRemoteAhead && !force) {
-            console.log('');
-            console.log(`${spinner_1.colors.red('error:')} Remote has ${remoteMissing.length} commit(s) you don't have locally`);
+            spinner.stop();
             console.log('');
             for (const commit of remoteMissing.slice(0, 3)) {
-                console.log(`   ${spinner_1.colors.yellow((0, repo_manager_1.shortHash)(commit.hash))} ${commit.message}`);
+                console.log(`   ${cli_utils_1.colors.yellow((0, repo_manager_1.shortHash)(commit.hash))} ${commit.message}`);
             }
             if (remoteMissing.length > 3) {
-                console.log(`   ${spinner_1.colors.muted(`... and ${remoteMissing.length - 3} more`)}`);
+                console.log(`   ${cli_utils_1.colors.muted(`... and ${remoteMissing.length - 3} more`)}`);
             }
-            console.log('');
-            console.log(`${spinner_1.colors.yellow('hint:')} Run ${spinner_1.colors.cyan('relq pull')} to integrate remote changes.`);
-            console.log(`${spinner_1.colors.yellow('hint:')} Use ${spinner_1.colors.cyan('relq push --force')} to override (may cause data loss).`);
-            console.log('');
-            return;
+            (0, cli_utils_1.fatal)(`Remote has ${remoteMissing.length} commit(s) you don't have locally`, `Run ${cli_utils_1.colors.cyan('relq pull')} to integrate remote changes.\nUse ${cli_utils_1.colors.cyan('relq push --force')} to override (may cause data loss).`);
         }
         if (hasObjectsToDrop) {
             console.log('');
-            console.log(`${spinner_1.colors.yellow('⚠')} Remote has ${analysis.objectsToDrop.length} object(s) not in your local schema:`);
+            (0, cli_utils_1.warning)(`Remote has ${analysis.objectsToDrop.length} object(s) not in your local schema:`);
             console.log('');
             for (const obj of analysis.objectsToDrop.slice(0, 10)) {
-                console.log(`   ${spinner_1.colors.red('DROP')} ${obj.type.toLowerCase()}: ${obj.name}`);
+                console.log(`   ${cli_utils_1.colors.red('DROP')} ${obj.type.toLowerCase()}: ${obj.name}`);
             }
             if (analysis.objectsToDrop.length > 10) {
-                console.log(`   ${spinner_1.colors.muted(`... and ${analysis.objectsToDrop.length - 10} more`)}`);
+                console.log(`   ${cli_utils_1.colors.muted(`... and ${analysis.objectsToDrop.length - 10} more`)}`);
             }
             console.log('');
             if (!force) {
-                console.log(`${spinner_1.colors.red('error:')} Cannot push - remote has objects not in your history`);
-                console.log('');
-                console.log(`${spinner_1.colors.yellow('hint:')} Run ${spinner_1.colors.cyan('relq pull')} first to sync your local schema.`);
-                console.log(`${spinner_1.colors.yellow('hint:')} Use ${spinner_1.colors.cyan('relq push --force')} to DROP these objects from remote.`);
-                console.log('');
-                return;
+                (0, cli_utils_1.fatal)('Cannot push - remote has objects not in your history', `Run ${cli_utils_1.colors.cyan('relq pull')} first to sync your local schema.\nUse ${cli_utils_1.colors.cyan('relq push --force')} to DROP these objects from remote.`);
             }
             const dependencyErrors = checkDropDependencies(analysis.objectsToDrop, remoteDb, ignorePatterns);
             if (dependencyErrors.length > 0) {
-                console.log(`${spinner_1.colors.red('error:')} Cannot drop objects due to dependencies:`);
                 console.log('');
                 for (const err of dependencyErrors) {
-                    console.log(`   ${spinner_1.colors.red('✗')} ${err}`);
+                    console.log(`   ${err}`);
                 }
-                console.log('');
-                console.log(`${spinner_1.colors.muted('These objects are used by non-ignored objects in your schema.')}`);
-                console.log(`${spinner_1.colors.muted('Either add them to .relqignore or import them with')} ${spinner_1.colors.cyan('relq pull')}`);
-                console.log('');
-                return;
+                (0, cli_utils_1.fatal)('Cannot drop objects due to dependencies', `These objects are used by non-ignored objects in your schema.\nEither add them to .relqignore or import them with ${cli_utils_1.colors.cyan('relq pull')}`);
             }
             if (!skipPrompt && !dryRun) {
-                console.log(`${spinner_1.colors.red('⚠  WARNING: This will DROP data from your database!')}`);
+                (0, cli_utils_1.warning)('This will DROP data from your database!');
                 console.log('');
-                const confirmed = await askConfirmation(`Drop ${analysis.objectsToDrop.length} object(s) from remote? [y/N] `);
+                const confirmed = await (0, cli_utils_1.confirm)(`Drop ${analysis.objectsToDrop.length} object(s) from remote?`, false);
                 if (!confirmed) {
-                    console.log(`${spinner_1.colors.muted('Cancelled.')}`);
-                    console.log('');
-                    return;
+                    (0, cli_utils_1.fatal)('Operation cancelled by user');
                 }
             }
         }
         if (toPush.length === 0 && !hasObjectsToDrop) {
-            console.log(`${spinner_1.colors.green('✓')} Everything up-to-date`);
+            console.log('Everything up-to-date');
             console.log('');
             return;
         }
         console.log('');
-        console.log(`Pushing to ${spinner_1.colors.cyan((0, env_loader_1.getConnectionDescription)(connection))}`);
+        console.log(`Pushing to ${cli_utils_1.colors.cyan((0, env_loader_1.getConnectionDescription)(connection))}`);
         console.log('');
         if (toPush.length > 0) {
-            console.log(`${spinner_1.colors.cyan('Commits:')} ${toPush.length}`);
+            console.log(`${cli_utils_1.colors.cyan('Commits:')} ${toPush.length}`);
             for (const commit of toPush.slice(0, 5)) {
-                console.log(`   ${spinner_1.colors.yellow((0, repo_manager_1.shortHash)(commit.hash))} ${commit.message}`);
+                console.log(`   ${cli_utils_1.colors.yellow((0, repo_manager_1.shortHash)(commit.hash))} ${commit.message}`);
             }
             if (toPush.length > 5) {
-                console.log(`   ${spinner_1.colors.muted(`... and ${toPush.length - 5} more`)}`);
+                console.log(`   ${cli_utils_1.colors.muted(`... and ${toPush.length - 5} more`)}`);
             }
             console.log('');
         }
         if (dryRun) {
-            console.log(`${spinner_1.colors.yellow('Dry run')} - no changes applied`);
+            console.log(`${cli_utils_1.colors.yellow('Dry run')} - no changes applied`);
             console.log('');
-            console.log(`${spinner_1.colors.muted('Use')} ${spinner_1.colors.cyan('relq push --apply')} ${spinner_1.colors.muted('to execute.')}`);
+            console.log(`${cli_utils_1.colors.muted('Use')} ${cli_utils_1.colors.cyan('relq push --apply')} ${cli_utils_1.colors.muted('to execute.')}`);
             console.log('');
             return;
         }
@@ -252,21 +226,20 @@ async function pushCommand(context) {
         }
         const oldHash = remoteHead ? (0, repo_manager_1.shortHash)(remoteHead) : '(none)';
         const newHash = (0, repo_manager_1.shortHash)(localHead);
-        console.log(`   ${oldHash}..${newHash}  ${spinner_1.colors.muted('main -> main')}`);
+        console.log(`   ${oldHash}..${newHash}  ${cli_utils_1.colors.muted('main -> main')}`);
         if (hasObjectsToDrop && force && applySQL) {
             console.log('');
-            console.log(`${spinner_1.colors.yellow('⚠')} Dropped ${analysis.objectsToDrop.length} object(s) from remote`);
+            (0, cli_utils_1.warning)(`Dropped ${analysis.objectsToDrop.length} object(s) from remote`);
         }
         if (!applySQL) {
             console.log('');
-            console.log(`${spinner_1.colors.muted('Use')} ${spinner_1.colors.cyan('relq push --apply')} ${spinner_1.colors.muted('to execute SQL.')}`);
+            console.log(`${cli_utils_1.colors.muted('Use')} ${cli_utils_1.colors.cyan('relq push --apply')} ${cli_utils_1.colors.muted('to execute SQL.')}`);
         }
         console.log('');
     }
-    catch (error) {
+    catch (err) {
         spinner.fail('Push failed');
-        console.error(spinner_1.colors.red(`Error: ${error instanceof Error ? error.message : error}`));
-        process.exit(1);
+        (0, cli_utils_1.fatal)(err instanceof Error ? err.message : String(err));
     }
 }
 function analyzeSync(local, remote, patterns, options) {
@@ -365,17 +338,4 @@ function generateDropSQL(obj) {
             return '';
     }
 }
-function askConfirmation(question) {
-    const rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout,
-    });
-    return new Promise((resolve) => {
-        rl.question(question, (answer) => {
-            rl.close();
-            const a = answer.trim().toLowerCase();
-            resolve(a === 'y' || a === 'yes');
-        });
-    });
-}
 exports.default = pushCommand;

package/dist/cjs/cli/commands/remote.cjs

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.remoteCommand = remoteCommand;
+const spinner_1 = require("../utils/spinner.cjs");
 async function remoteCommand(context) {
     console.log('');
-    console.log('⚠️  Remote tracking is coming soon.');
+    (0, spinner_1.warning)('Remote tracking is coming soon.');
     console.log('');
     console.log('This will allow you to:');
     console.log('  • Track multiple remote databases');

package/dist/cjs/cli/commands/reset.cjs

@@ -37,40 +37,26 @@ exports.resetCommand = resetCommand;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const readline = __importStar(require("readline"));
-const spinner_1 = require("../utils/spinner.cjs");
+const cli_utils_1 = require("../utils/cli-utils.cjs");
 const repo_manager_1 = require("../utils/repo-manager.cjs");
 async function resetCommand(context) {
-    const { flags, args } = context;
-    const projectRoot = process.cwd();
+    const { flags, args, projectRoot } = context;
     console.log('');
     if (!(0, repo_manager_1.isInitialized)(projectRoot)) {
-        console.log(`${spinner_1.colors.red('fatal:')} not a relq repository`);
-        return;
+        (0, cli_utils_1.fatal)('not a relq repository (or any parent directories): .relq', `Run ${cli_utils_1.colors.cyan('relq init')} to initialize.`);
     }
     const hard = flags['hard'] === true;
     const soft = flags['soft'] === true;
     const target = args[0];
     if (!target) {
-        console.log(`${spinner_1.colors.red('error:')} Please specify a target`);
-        console.log('');
-        console.log('Usage:');
-        console.log(`  ${spinner_1.colors.cyan('relq reset --hard HEAD~1')}   Reset to previous commit`);
-        console.log(`  ${spinner_1.colors.cyan('relq reset --hard <hash>')}   Reset to specific commit`);
-        console.log('');
-        return;
+        (0, cli_utils_1.fatal)('Please specify a target', `Usage:\n  ${cli_utils_1.colors.cyan('relq reset --hard HEAD~1')}   Reset to previous commit\n  ${cli_utils_1.colors.cyan('relq reset --hard <hash>')}   Reset to specific commit`);
     }
     if (!hard && !soft) {
-        console.log(`${spinner_1.colors.red('error:')} Please specify --hard or --soft`);
-        console.log('');
-        console.log(`  ${spinner_1.colors.cyan('--hard')}  Discard all changes (DANGEROUS)`);
-        console.log(`  ${spinner_1.colors.cyan('--soft')}  Keep changes unstaged`);
-        console.log('');
-        return;
+        (0, cli_utils_1.fatal)('Please specify --hard or --soft', `  ${cli_utils_1.colors.cyan('--hard')}  Discard all changes (DANGEROUS)\n  ${cli_utils_1.colors.cyan('--soft')}  Keep changes unstaged`);
     }
     const currentHead = (0, repo_manager_1.getHead)(projectRoot);
     if (!currentHead) {
-        console.log(`${spinner_1.colors.red('error:')} No commits yet`);
-        return;
+        (0, cli_utils_1.fatal)('No commits yet', `Run ${cli_utils_1.colors.cyan('relq pull')} or ${cli_utils_1.colors.cyan('relq import')} first.`);
     }
     const allCommits = (0, repo_manager_1.getAllCommits)(projectRoot);
     let targetHash = null;
@@ -91,23 +77,17 @@ async function resetCommand(context) {
         }
     }
     if (!targetHash) {
-        console.log(`${spinner_1.colors.red('error:')} Cannot find commit: ${target}`);
-        console.log('');
-        console.log('Available commits:');
-        for (const c of allCommits.slice(0, 5)) {
-            console.log(`   ${spinner_1.colors.yellow((0, repo_manager_1.shortHash)(c.hash))} ${c.message}`);
-        }
-        return;
+        const availableList = allCommits.slice(0, 5).map(c => `  ${cli_utils_1.colors.yellow((0, repo_manager_1.shortHash)(c.hash))} ${c.message}`).join('\n');
+        (0, cli_utils_1.fatal)(`Cannot find commit: ${target}`, `Available commits:\n${availableList}`);
     }
     const targetCommit = (0, repo_manager_1.loadCommit)(targetHash, projectRoot);
     if (!targetCommit) {
-        console.log(`${spinner_1.colors.red('error:')} Cannot load commit: ${targetHash}`);
-        return;
+        (0, cli_utils_1.fatal)(`Cannot load commit: ${targetHash}`);
     }
     if (hard) {
-        console.log(`${spinner_1.colors.red('⚠  WARNING: This will discard all local changes!')}`);
+        (0, cli_utils_1.warning)('This will discard all local changes!');
         console.log('');
-        console.log(`Reset to: ${spinner_1.colors.yellow((0, repo_manager_1.shortHash)(targetHash))} ${targetCommit.message}`);
+        console.log(`Reset to: ${cli_utils_1.colors.yellow((0, repo_manager_1.shortHash)(targetHash))} ${targetCommit.message}`);
         console.log('');
         const rl = readline.createInterface({
             input: process.stdin,
@@ -120,24 +100,24 @@ async function resetCommand(context) {
             });
         });
         if (!confirmed) {
-            console.log(`${spinner_1.colors.muted('Cancelled.')}`);
+            console.log(`${cli_utils_1.colors.muted('Cancelled.')}`);
             console.log('');
             return;
         }
     }
-    const spinner = (0, spinner_1.createSpinner)();
+    const spinner = (0, cli_utils_1.createSpinner)();
     try {
         spinner.start(`Resetting to ${(0, repo_manager_1.shortHash)(targetHash)}...`);
         const commitPath = path.join(projectRoot, '.relq', 'commits', `${targetHash}.json`);
         if (!fs.existsSync(commitPath)) {
-            spinner.fail('Cannot find commit data');
-            return;
+            spinner.stop();
+            (0, cli_utils_1.fatal)('Cannot find commit data - repository may be corrupt');
         }
         const commitData = JSON.parse(fs.readFileSync(commitPath, 'utf-8'));
         const targetSnapshot = commitData.snapshot;
         if (!targetSnapshot) {
-            spinner.fail('Commit has no snapshot data');
-            return;
+            spinner.stop();
+            (0, cli_utils_1.fatal)('Commit has no snapshot data - repository may be corrupt');
         }
         if (hard) {
             (0, repo_manager_1.saveSnapshot)(targetSnapshot, projectRoot);
@@ -152,18 +132,17 @@ async function resetCommand(context) {
             if (fs.existsSync(mergeStatePath))
                 fs.unlinkSync(mergeStatePath);
         }
-        spinner.succeed(`Reset to ${spinner_1.colors.yellow((0, repo_manager_1.shortHash)(targetHash))}`);
+        spinner.succeed(`Reset to ${cli_utils_1.colors.yellow((0, repo_manager_1.shortHash)(targetHash))}`);
         console.log('');
-        console.log(`HEAD is now at ${spinner_1.colors.yellow((0, repo_manager_1.shortHash)(targetHash))} ${targetCommit.message}`);
+        console.log(`HEAD is now at ${cli_utils_1.colors.yellow((0, repo_manager_1.shortHash)(targetHash))} ${targetCommit.message}`);
         console.log('');
         if (soft) {
-            console.log(`${spinner_1.colors.muted('Changes are unstaged. Use')} ${spinner_1.colors.cyan('relq status')} ${spinner_1.colors.muted('to see.')}`);
+            console.log(`${cli_utils_1.colors.muted('Changes are unstaged. Use')} ${cli_utils_1.colors.cyan('relq status')} ${cli_utils_1.colors.muted('to see.')}`);
         }
     }
-    catch (error) {
+    catch (err) {
         spinner.fail('Reset failed');
-        console.error(spinner_1.colors.red(`Error: ${error instanceof Error ? error.message : error}`));
-        process.exit(1);
+        (0, cli_utils_1.fatal)(err instanceof Error ? err.message : String(err));
     }
 }
 exports.default = resetCommand;

package/dist/cjs/cli/commands/resolve.cjs

@@ -39,23 +39,21 @@ const path = __importStar(require("path"));
 const spinner_1 = require("../utils/spinner.cjs");
 const repo_manager_1 = require("../utils/repo-manager.cjs");
 async function resolveCommand(context) {
-    const { flags, args } = context;
-    const projectRoot = process.cwd();
+    const { flags, args, projectRoot } = context;
     console.log('');
     if (!(0, repo_manager_1.isInitialized)(projectRoot)) {
-        console.log(`${spinner_1.colors.red('fatal:')} not a relq repository`);
-        return;
+        (0, spinner_1.fatal)('not a relq repository (or any parent directories): .relq', `Run ${spinner_1.colors.cyan('relq init')} to initialize.`);
     }
     const mergeStatePath = path.join(projectRoot, '.relq', 'MERGE_STATE');
     if (!fs.existsSync(mergeStatePath)) {
-        console.log(`${spinner_1.colors.green('✓')} No conflicts to resolve`);
+        console.log('No conflicts to resolve');
         console.log('');
         return;
     }
     const mergeState = JSON.parse(fs.readFileSync(mergeStatePath, 'utf-8'));
     if (mergeState.conflicts.length === 0) {
         fs.unlinkSync(mergeStatePath);
-        console.log(`${spinner_1.colors.green('✓')} All conflicts resolved`);
+        console.log('All conflicts resolved');
         console.log('');
         return;
     }
@@ -69,9 +67,9 @@ async function resolveCommand(context) {
         console.log('');
         (0, repo_manager_1.saveSnapshot)(mergeState.remoteSnapshot, projectRoot);
         fs.unlinkSync(mergeStatePath);
-        console.log(`${spinner_1.colors.green('✓')} Applied remote versions for all conflicts`);
+        console.log('Applied remote versions for all conflicts');
         console.log('');
-        console.log(`${spinner_1.colors.muted('Run')} ${spinner_1.colors.cyan('relq commit -m "Merge remote changes"')} ${spinner_1.colors.muted('to complete.')}`);
+        console.log(`hint: run 'relq commit -m "Merge remote changes"' to complete`);
         console.log('');
         return;
     }
@@ -79,9 +77,9 @@ async function resolveCommand(context) {
         console.log(`Resolving ${mergeState.conflicts.length} conflict(s) with --all-ours`);
         console.log('');
         fs.unlinkSync(mergeStatePath);
-        console.log(`${spinner_1.colors.green('✓')} Kept local versions for all conflicts`);
+        console.log('Kept local versions for all conflicts');
         console.log('');
-        console.log(`${spinner_1.colors.muted('Run')} ${spinner_1.colors.cyan('relq commit -m "Keep local changes"')} ${spinner_1.colors.muted('to complete.')}`);
+        console.log(`hint: run 'relq commit -m "Keep local changes"' to complete`);
         console.log('');
         return;
     }
@@ -111,17 +109,17 @@ async function resolveCommand(context) {
         mergeState.conflicts = mergeState.conflicts.filter(c => c !== conflict);
         if (mergeState.conflicts.length === 0) {
             fs.unlinkSync(mergeStatePath);
-            console.log(`${spinner_1.colors.green('✓')} All conflicts resolved`);
+            console.log('All conflicts resolved');
         }
         else {
             fs.writeFileSync(mergeStatePath, JSON.stringify(mergeState, null, 2));
-            console.log(`${spinner_1.colors.green('✓')} Resolved: ${conflict.objectType} ${objectName}`);
-            console.log(`${spinner_1.colors.yellow(String(mergeState.conflicts.length))} conflict(s) remaining`);
+            console.log(`Resolved: ${conflict.objectType} ${objectName}`);
+            console.log(`${mergeState.conflicts.length} conflict(s) remaining`);
         }
         console.log('');
         return;
     }
-    console.log(`${spinner_1.colors.yellow('⚠')} You have ${mergeState.conflicts.length} unresolved conflict(s):`);
+    (0, spinner_1.warning)(`You have ${mergeState.conflicts.length} unresolved conflict(s):`);
     console.log('');
     for (const conflict of mergeState.conflicts) {
         const name = conflict.parentName

package/dist/cjs/cli/commands/rollback.cjs

@@ -36,18 +36,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.rollbackCommand = rollbackCommand;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const readline = __importStar(require("readline"));
 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");
 function parseMigration(content) {
     const upMatch = content.match(/--\s*UP\s*\n([\s\S]*?)(?=--\s*DOWN|$)/i);
     const downMatch = content.match(/--\s*DOWN\s*\n([\s\S]*?)$/i);
@@ -56,32 +47,20 @@ function parseMigration(content) {
         down: downMatch?.[1]?.trim() || '',
     };
 }
-function askConfirm(question) {
-    const rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout,
-    });
-    return new Promise((resolve) => {
-        rl.question(`${question} [y/N]: `, (answer) => {
-            rl.close();
-            resolve(answer.trim().toLowerCase() === 'y');
-        });
-    });
-}
 async function rollbackCommand(context) {
     const { config, args, 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`);
+        return;
     }
-    (0, config_loader_1.requireValidConfig)(config);
+    await (0, config_loader_1.requireValidConfig)(config, { calledFrom: 'rollback' });
     const connection = config.connection;
     const migrationsDir = config.migrations?.directory || './migrations';
     const tableName = config.migrations?.tableName || '_relq_migrations';
     const count = parseInt(args[0]) || 1;
     const dryRun = flags['dry-run'] === true;
     const force = flags['force'] === true;
-    console.log(`${colors.bold}Rolling back ${count} migration(s)...${colors.reset}`);
+    console.log(`Rolling back ${count} migration(s)...`);
     console.log(`   Connection: ${(0, env_loader_1.getConnectionDescription)(connection)}`);
     console.log('');
     try {
@@ -101,17 +80,17 @@ async function rollbackCommand(context) {
                 LIMIT $1;
             `, [count]);
             if (result.rows.length === 0) {
-                console.log(`${colors.yellow}No migrations to rollback.${colors.reset}`);
+                console.log('No migrations to rollback.');
                 return;
             }
             const toRollback = result.rows.map(r => r.name);
-            console.log(`${colors.bold}Migrations to rollback:${colors.reset}`);
+            console.log('Migrations to rollback:');
             for (const name of toRollback) {
-                console.log(`  ${colors.red}• ${name}${colors.reset}`);
+                console.log(`  - ${name}`);
             }
             console.log('');
             if (!force && !dryRun) {
-                const proceed = await askConfirm(`${colors.red}This will undo ${toRollback.length} migration(s). Continue?${colors.reset}`);
+                const proceed = await (0, cli_utils_1.confirm)(`${cli_utils_1.colors.red('This will undo ' + toRollback.length + ' migration(s). Continue?')}`, false);
                 if (!proceed) {
                     console.log('Cancelled.');
                     return;
@@ -120,18 +99,18 @@ async function rollbackCommand(context) {
             for (const name of toRollback) {
                 const filePath = path.join(migrationsDir, name);
                 if (!fs.existsSync(filePath)) {
-                    console.log(`${colors.yellow}⚠️  Migration file not found: ${name}${colors.reset}`);
+                    (0, cli_utils_1.warning)(`Migration file not found: ${name}`);
                     continue;
                 }
                 const content = fs.readFileSync(filePath, 'utf-8');
                 const { down } = parseMigration(content);
                 if (!down) {
-                    console.log(`${colors.yellow}⚠️  No DOWN section in: ${name}${colors.reset}`);
+                    (0, cli_utils_1.warning)(`No DOWN section in: ${name}`);
                     continue;
                 }
                 if (dryRun) {
-                    console.log(`${colors.cyan}[dry-run] Would rollback: ${name}${colors.reset}`);
-                    console.log(`${colors.dim}${down}${colors.reset}`);
+                    console.log(`[dry-run] Would rollback: ${name}`);
+                    console.log(down);
                     console.log('');
                 }
                 else {
@@ -142,7 +121,7 @@ async function rollbackCommand(context) {
                         await client.query(down);
                         await client.query(`DELETE FROM "${tableName}" WHERE name = $1`, [name]);
                         await client.query('COMMIT');
-                        console.log(`   ${colors.green}✓ Rolled back${colors.reset}`);
+                        console.log('   Rolled back');
                     }
                     catch (error) {
                         await client.query('ROLLBACK');
@@ -155,7 +134,7 @@ async function rollbackCommand(context) {
             }
             if (!dryRun) {
                 console.log('');
-                console.log(`${colors.green}✓ Rolled back ${toRollback.length} migration(s).${colors.reset}`);
+                console.log(`Rolled back ${toRollback.length} migration(s).`);
             }
         }
         finally {
@@ -163,7 +142,6 @@ async function rollbackCommand(context) {
         }
     }
     catch (error) {
-        console.error('Error:', error instanceof Error ? error.message : error);
-        process.exit(1);
+        (0, cli_utils_1.fatal)('Rollback failed', error instanceof Error ? error.message : String(error));
     }
 }

package/dist/cjs/cli/commands/stash.cjs

@@ -39,13 +39,11 @@ const path = __importStar(require("path"));
 const spinner_1 = require("../utils/spinner.cjs");
 const repo_manager_1 = require("../utils/repo-manager.cjs");
 async function stashCommand(context) {
-    const { args, flags } = context;
-    const projectRoot = process.cwd();
+    const { args, flags, projectRoot } = context;
     const subcommand = args[0] || 'push';
     console.log('');
     if (!(0, repo_manager_1.isInitialized)(projectRoot)) {
-        console.log(`${spinner_1.colors.red('fatal:')} not a relq repository`);
-        return;
+        (0, spinner_1.fatal)('not a relq repository (or any parent directories): .relq', `Run ${spinner_1.colors.cyan('relq init')} to initialize.`);
     }
     const stashDir = path.join(projectRoot, '.relq', 'stash');
     switch (subcommand) {
@@ -92,7 +90,7 @@ async function stashPush(projectRoot, stashDir, message) {
         fs.writeFileSync(stagedPath, '[]');
     if (fs.existsSync(unstagedPath))
         fs.writeFileSync(unstagedPath, '[]');
-    console.log(`${spinner_1.colors.green('✓')} Saved working directory`);
+    console.log('Saved working directory');
     console.log(`   stash@{${stashIdx}}: ${message}`);
     console.log('');
 }
@@ -117,7 +115,7 @@ async function stashPop(projectRoot, stashDir) {
         fs.writeFileSync(unstagedPath, JSON.stringify(stash.unstaged, null, 2));
     }
     fs.unlinkSync(stashPath);
-    console.log(`${spinner_1.colors.green('✓')} Applied stash and dropped`);
+    console.log('Applied stash and dropped');
     console.log(`   ${stash.message}`);
     console.log('');
 }
@@ -148,7 +146,7 @@ async function stashDrop(stashDir) {
         return;
     }
     fs.unlinkSync(path.join(stashDir, stashFiles[0]));
-    console.log(`${spinner_1.colors.green('✓')} Dropped stash`);
+    console.log('Dropped stash');
     console.log('');
 }
 exports.default = stashCommand;