relq 1.0.2 → 1.0.4

package/dist/cjs/cli/commands/cherry-pick.cjs

@@ -39,8 +39,7 @@ const path = __importStar(require("path"));
 const spinner_1 = require("../utils/spinner.cjs");
 const repo_manager_1 = require("../utils/repo-manager.cjs");
 async function cherryPickCommand(context) {
-    const { config, args, flags } = context;
-    const projectRoot = process.cwd();
+    const { config, args, flags, projectRoot } = context;
     console.log('');
     if (!(0, repo_manager_1.isInitialized)(projectRoot)) {
         console.log(`${spinner_1.colors.red('fatal:')} not a relq repository`);
@@ -51,10 +50,10 @@ async function cherryPickCommand(context) {
     if (abort) {
         if (fs.existsSync(cherryPickStatePath)) {
             fs.unlinkSync(cherryPickStatePath);
-            console.log(`${spinner_1.colors.green('✓')} Cherry-pick aborted`);
+            console.log('Cherry-pick aborted');
         }
         else {
-            console.log(`${spinner_1.colors.muted('No cherry-pick in progress.')}`);
+            console.log('No cherry-pick in progress.');
         }
         console.log('');
         return;

package/dist/cjs/cli/commands/commit.cjs

@@ -35,33 +35,29 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.commitCommand = commitCommand;
 const crypto = __importStar(require("crypto"));
-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");
+const config_1 = require("../../config/config.cjs");
 const change_tracker_1 = require("../utils/change-tracker.cjs");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 async function commitCommand(context) {
-    const { config, flags, args } = context;
-    const projectRoot = process.cwd();
+    const { config, flags, args, projectRoot } = context;
     const author = config?.author || 'Developer <dev@example.com>';
     console.log('');
     if (!(0, repo_manager_1.isInitialized)(projectRoot)) {
-        console.log(`${spinner_1.colors.red('error:')} relq not initialized`);
-        console.log('');
-        console.log(`${spinner_1.colors.muted('Run')} ${spinner_1.colors.cyan('relq init')} ${spinner_1.colors.muted('first.')}`);
-        return;
+        (0, cli_utils_1.fatal)('not a relq repository (or any parent directories): .relq', "run 'relq init' to initialize");
     }
     const staged = (0, repo_manager_1.getStagedChanges)(projectRoot);
     if (staged.length === 0) {
-        console.log(`${spinner_1.colors.yellow('Nothing to commit')}`);
-        console.log('');
+        console.log('nothing to commit, working tree clean');
         const unstaged = (0, repo_manager_1.getUnstagedChanges)(projectRoot);
         if (unstaged.length > 0) {
-            console.log(`${spinner_1.colors.muted(`${unstaged.length} unstaged change(s).`)}`);
-            console.log(`${spinner_1.colors.muted('Use')} ${spinner_1.colors.cyan('relq add .')} ${spinner_1.colors.muted('to stage all changes.')}`);
+            console.log(`${unstaged.length} unstaged change(s).`);
+            (0, cli_utils_1.hint)("run 'relq add .' to stage all changes");
         }
         else {
-            console.log(`${spinner_1.colors.muted('Use')} ${spinner_1.colors.cyan('relq add <table>')} ${spinner_1.colors.muted('to stage changes.')}`);
+            (0, cli_utils_1.hint)("run 'relq add <table>' to stage changes");
         }
         return;
     }
@@ -71,10 +67,7 @@ async function commitCommand(context) {
             message = args.join(' ');
         }
         else {
-            console.log(`${spinner_1.colors.red('error:')} commit message required`);
-            console.log('');
-            console.log(`${spinner_1.colors.muted('Usage:')} relq commit -m "message"`);
-            return;
+            (0, cli_utils_1.fatal)('commit message required', "usage: relq commit -m '<message>'");
         }
     }
     const sortedChanges = (0, change_tracker_1.sortChangesByDependency)(staged);
@@ -113,7 +106,7 @@ async function commitCommand(context) {
     fs.writeFileSync(path.join(commitsDir, `${hash}.json`), JSON.stringify(commit, null, 2), 'utf-8');
     fs.writeFileSync(path.join(projectRoot, '.relq', 'HEAD'), hash, 'utf-8');
     const workingPath = path.join(projectRoot, '.relq', 'working.json');
-    const unstaged = (0, repo_manager_1.getUnstagedChanges)(projectRoot);
+    const unstaged = (0, repo_manager_1.getUnstagedChanges)(projectRoot).filter(c => c.objectType !== 'SCHEMA_FILE');
     if (unstaged.length > 0) {
         fs.writeFileSync(workingPath, JSON.stringify({
             timestamp: new Date().toISOString(),
@@ -126,20 +119,19 @@ async function commitCommand(context) {
             fs.unlinkSync(workingPath);
         }
     }
-    console.log(`${spinner_1.colors.yellow(`[${(0, repo_manager_1.shortHash)(hash)}]`)} ${message}`);
-    console.log('');
-    if (creates > 0) {
-        console.log(` ${spinner_1.colors.green(`${creates} created`)}`);
-    }
-    if (alters > 0) {
-        console.log(` ${spinner_1.colors.yellow(`${alters} altered`)}`);
-    }
-    if (drops > 0) {
-        console.log(` ${spinner_1.colors.red(`${drops} dropped`)}`);
+    const commitConfig = await (0, config_1.loadConfig)();
+    const schemaPathRaw = typeof commitConfig.schema === 'string' ? commitConfig.schema : './db/schema.ts';
+    const schemaFilePath = path.resolve(projectRoot, schemaPathRaw);
+    if (fs.existsSync(schemaFilePath)) {
+        const currentContent = fs.readFileSync(schemaFilePath, 'utf-8');
+        const currentHash = (0, repo_manager_1.hashFileContent)(currentContent);
+        (0, repo_manager_1.saveFileHash)(currentHash, projectRoot);
     }
+    console.log(`[${(0, repo_manager_1.shortHash)(hash)}] ${message}`);
+    console.log(` ${creates} create(s), ${alters} alter(s), ${drops} drop(s)`);
     console.log('');
-    console.log(`${spinner_1.colors.muted('Run')} ${spinner_1.colors.cyan('relq push')} ${spinner_1.colors.muted('to apply changes to database.')}`);
-    console.log(`${spinner_1.colors.muted('Run')} ${spinner_1.colors.cyan('relq export')} ${spinner_1.colors.muted('to export as SQL file.')}`);
+    (0, cli_utils_1.hint)("run 'relq push' to apply changes to database");
+    (0, cli_utils_1.hint)("run 'relq export' to export as SQL file");
     console.log('');
 }
 exports.default = commitCommand;

package/dist/cjs/cli/commands/diff.cjs

@@ -4,17 +4,14 @@ exports.diffCommand = diffCommand;
 const config_loader_1 = require("../utils/config-loader.cjs");
 const fast_introspect_1 = require("../utils/fast-introspect.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 repo_manager_1 = require("../utils/repo-manager.cjs");
 const change_tracker_1 = require("../utils/change-tracker.cjs");
 async function diffCommand(context) {
-    const { config, args, flags } = context;
-    const projectRoot = process.cwd();
+    const { config, args, flags, projectRoot } = context;
     console.log('');
     if (!(0, repo_manager_1.isInitialized)(projectRoot)) {
-        console.log(`${spinner_1.colors.red('fatal:')} not a relq repository`);
-        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 showSQL = flags['sql'] === true;
     const staged = flags['staged'] === true;
@@ -25,10 +22,9 @@ async function diffCommand(context) {
     }
     if (target === 'remote/live' || target === 'remote' || target === 'live' || target === 'origin') {
         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: 'diff' });
         await showOriginDiff(config, projectRoot, showSQL);
         return;
     }
@@ -36,20 +32,20 @@ async function diffCommand(context) {
 }
 function getSymbol(change) {
     if (change.type === 'CREATE')
-        return spinner_1.colors.green('+');
+        return cli_utils_1.colors.green('+');
     if (change.type === 'DROP')
-        return spinner_1.colors.red('-');
-    return spinner_1.colors.yellow('~');
+        return cli_utils_1.colors.red('-');
+    return cli_utils_1.colors.yellow('~');
 }
 async function showUnstagedDiff(projectRoot, showSQL) {
     const unstaged = (0, repo_manager_1.getUnstagedChanges)(projectRoot);
     if (unstaged.length === 0) {
-        console.log(`${spinner_1.colors.green('No unstaged changes.')}`);
-        console.log(`${spinner_1.colors.muted('Use')} ${spinner_1.colors.cyan('relq diff remote/live')} ${spinner_1.colors.muted('to compare with remote.')}`);
+        console.log(`${cli_utils_1.colors.green('No unstaged changes.')}`);
+        console.log(`${cli_utils_1.colors.muted('Use')} ${cli_utils_1.colors.cyan('relq diff remote/live')} ${cli_utils_1.colors.muted('to compare with remote.')}`);
         console.log('');
         return;
     }
-    console.log(`${spinner_1.colors.bold('Unstaged changes:')}`);
+    console.log(`${cli_utils_1.colors.bold('Unstaged changes:')}`);
     console.log('');
     const sorted = (0, change_tracker_1.sortChangesByDependency)(unstaged);
     for (const change of sorted) {
@@ -57,26 +53,26 @@ async function showUnstagedDiff(projectRoot, showSQL) {
     }
     if (showSQL) {
         console.log('');
-        console.log(`${spinner_1.colors.bold('SQL:')}`);
+        console.log(`${cli_utils_1.colors.bold('SQL:')}`);
         for (const change of sorted) {
             const sql = (0, change_tracker_1.generateChangeSQL)(change);
             if (sql)
-                console.log(`${spinner_1.colors.cyan(sql)}`);
+                console.log(`${cli_utils_1.colors.cyan(sql)}`);
         }
     }
     console.log('');
-    console.log(`${spinner_1.colors.muted('Use')} ${spinner_1.colors.cyan('relq add .')} ${spinner_1.colors.muted('to stage all.')}`);
+    console.log(`${cli_utils_1.colors.muted('Use')} ${cli_utils_1.colors.cyan('relq add .')} ${cli_utils_1.colors.muted('to stage all.')}`);
     console.log('');
 }
 async function showStagedDiff(projectRoot, showSQL) {
     const staged = (0, repo_manager_1.getStagedChanges)(projectRoot);
     if (staged.length === 0) {
-        console.log(`${spinner_1.colors.green('No staged changes.')}`);
-        console.log(`${spinner_1.colors.muted('Use')} ${spinner_1.colors.cyan('relq add .')} ${spinner_1.colors.muted('to stage changes.')}`);
+        console.log(`${cli_utils_1.colors.green('No staged changes.')}`);
+        console.log(`${cli_utils_1.colors.muted('Use')} ${cli_utils_1.colors.cyan('relq add .')} ${cli_utils_1.colors.muted('to stage changes.')}`);
         console.log('');
         return;
     }
-    console.log(`${spinner_1.colors.bold('Staged changes:')}`);
+    console.log(`${cli_utils_1.colors.bold('Staged changes:')}`);
     console.log('');
     const sorted = (0, change_tracker_1.sortChangesByDependency)(staged);
     for (const change of sorted) {
@@ -84,24 +80,24 @@ async function showStagedDiff(projectRoot, showSQL) {
     }
     if (showSQL) {
         console.log('');
-        console.log(`${spinner_1.colors.bold('SQL:')}`);
+        console.log(`${cli_utils_1.colors.bold('SQL:')}`);
         for (const change of sorted) {
             const sql = (0, change_tracker_1.generateChangeSQL)(change);
             if (sql)
-                console.log(`${spinner_1.colors.cyan(sql)}`);
+                console.log(`${cli_utils_1.colors.cyan(sql)}`);
         }
     }
     console.log('');
-    console.log(`${spinner_1.colors.muted('Use')} ${spinner_1.colors.cyan('relq commit -m "message"')} ${spinner_1.colors.muted('to commit.')}`);
+    console.log(`${cli_utils_1.colors.muted('Use')} ${cli_utils_1.colors.cyan('relq commit -m "message"')} ${cli_utils_1.colors.muted('to commit.')}`);
     console.log('');
 }
 async function showOriginDiff(config, projectRoot, showSQL) {
     const connection = config.connection;
-    const spinner = (0, spinner_1.createSpinner)();
+    const spinner = (0, cli_utils_1.createSpinner)();
     const snapshot = (0, repo_manager_1.loadSnapshot)(projectRoot);
     if (!snapshot) {
-        console.log(`${spinner_1.colors.yellow('No local snapshot.')}`);
-        console.log(`${spinner_1.colors.muted('Run')} ${spinner_1.colors.cyan('relq pull')} ${spinner_1.colors.muted('first.')}`);
+        console.log(`${cli_utils_1.colors.yellow('No local snapshot.')}`);
+        console.log(`${cli_utils_1.colors.muted('Run')} ${cli_utils_1.colors.cyan('relq pull')} ${cli_utils_1.colors.muted('first.')}`);
         console.log('');
         return;
     }
@@ -114,22 +110,22 @@ async function showOriginDiff(config, projectRoot, showSQL) {
     const diffs = compareSchemas(snapshot, remoteDb);
     if (diffs.length === 0) {
         console.log('');
-        console.log(`${spinner_1.colors.green('✓ Local and remote are in sync.')}`);
+        console.log('Local and remote are in sync.');
         console.log('');
         return;
     }
     console.log('');
-    console.log(`${spinner_1.colors.bold('Differences:')}`);
+    console.log(`${cli_utils_1.colors.bold('Differences:')}`);
     console.log('');
     for (const d of diffs.slice(0, 20)) {
-        const sym = d.type === 'added' ? spinner_1.colors.green('+') : d.type === 'removed' ? spinner_1.colors.red('-') : spinner_1.colors.yellow('~');
+        const sym = d.type === 'added' ? cli_utils_1.colors.green('+') : d.type === 'removed' ? cli_utils_1.colors.red('-') : cli_utils_1.colors.yellow('~');
         console.log(`   ${sym} ${d.description}`);
     }
     if (diffs.length > 20) {
-        console.log(`   ${spinner_1.colors.muted(`... and ${diffs.length - 20} more`)}`);
+        console.log(`   ${cli_utils_1.colors.muted(`... and ${diffs.length - 20} more`)}`);
     }
     console.log('');
-    console.log(`${spinner_1.colors.muted('Use')} ${spinner_1.colors.cyan('relq pull')} ${spinner_1.colors.muted('to sync local with remote.')}`);
+    console.log(`${cli_utils_1.colors.muted('Use')} ${cli_utils_1.colors.cyan('relq pull')} ${cli_utils_1.colors.muted('to sync local with remote.')}`);
     console.log('');
 }
 function compareSchemas(local, remote) {

package/dist/cjs/cli/commands/export.cjs

@@ -45,8 +45,7 @@ const relqignore_1 = require("../utils/relqignore.cjs");
 const config_1 = require("../../config/config.cjs");
 async function exportCommand(context) {
     const spinner = (0, spinner_1.createSpinner)();
-    const { args, flags } = context;
-    const projectRoot = process.cwd();
+    const { args, flags, projectRoot } = context;
     const changesOnly = Boolean(flags['changes']);
     const stagedOnly = Boolean(flags['staged']);
     const fromDb = Boolean(flags['db']);
@@ -111,7 +110,7 @@ async function exportFromSnapshot(projectRoot, absoluteOutputPath, options) {
         console.log(`  ${spinner_1.colors.green('•')} Triggers: ${filteredSnapshot.triggers.length}`);
     }
     if (ignoredCount > 0) {
-        console.log(`  ${spinner_1.colors.muted(`ℹ ${ignoredCount} object(s) filtered by .relqignore`)}`);
+        console.log(`  ${spinner_1.colors.muted(`${ignoredCount} object(s) filtered by .relqignore`)}`);
     }
     spinner.start('Generating SQL statements');
     const sqlContent = generateFullSQL(schema, options);
@@ -123,7 +122,7 @@ async function exportFromSnapshot(projectRoot, absoluteOutputPath, options) {
     fs.writeFileSync(absoluteOutputPath, sqlContent, 'utf-8');
     spinner.succeed(`Written ${options.output} (${(sqlContent.length / 1024).toFixed(1)} KB)`);
     console.log('');
-    console.log(spinner_1.colors.green('✓ Export completed!'));
+    console.log('Export completed');
     console.log(`  Source: ${spinner_1.colors.muted('snapshot (local)')}`);
     console.log(`  Output: ${spinner_1.colors.muted(options.output || '')}`);
 }
@@ -163,7 +162,7 @@ async function exportFromDatabase(context, absoluteOutputPath, options) {
         fs.writeFileSync(absoluteOutputPath, sqlContent, 'utf-8');
         spinner.succeed(`Written ${options.output} (${(sqlContent.length / 1024).toFixed(1)} KB)`);
         console.log('');
-        console.log(spinner_1.colors.green('✓ Export completed!'));
+        console.log('Export completed');
         console.log(`  Source: ${spinner_1.colors.muted('database (live)')}`);
         console.log(`  Output: ${spinner_1.colors.muted(options.output || '')}`);
     }
@@ -249,6 +248,7 @@ function normalizedToDbSchema(normalized) {
             cycle: s.cycle,
             ownedBy: s.ownedBy || undefined,
         })),
+        collations: [],
         extensions: normalized.extensions.map(e => e.name),
         functions: (normalized.functions || []).map(f => ({
             name: f.name,
@@ -296,7 +296,7 @@ async function exportChanges(projectRoot, flags, args, stagedOnly) {
         modeLabel = 'uncommitted';
     }
     if (changes.length === 0) {
-        console.log(`${spinner_1.colors.yellow('⚠')} No ${modeLabel} changes to export`);
+        (0, spinner_1.warning)(`No ${modeLabel} changes to export`);
         console.log('');
         if (stagedOnly) {
             console.log(`${spinner_1.colors.muted('Run')} ${spinner_1.colors.cyan('relq add .')} ${spinner_1.colors.muted('to stage changes.')}`);
@@ -325,7 +325,7 @@ async function exportChanges(projectRoot, flags, args, stagedOnly) {
         fs.mkdirSync(outputDir, { recursive: true });
     }
     fs.writeFileSync(absoluteOutputPath, sqlContent, 'utf-8');
-    console.log(`${spinner_1.colors.green('✓')} Exported ${changes.length} ${modeLabel} change(s) to ${outputPath}`);
+    console.log(`Exported ${changes.length} ${modeLabel} change(s) to ${outputPath}`);
     console.log(`${spinner_1.colors.muted(`${(sqlContent.length / 1024).toFixed(1)} KB`)}`);
     console.log('');
 }

package/dist/cjs/cli/commands/fetch.cjs

@@ -3,33 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchCommand = fetchCommand;
 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 repo_manager_1 = require("../utils/repo-manager.cjs");
 async function fetchCommand(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: 'fetch' });
     const connection = config.connection;
-    const projectRoot = process.cwd();
+    const { projectRoot } = context;
     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 'relq init' to initialize");
     }
-    const spinner = (0, spinner_1.createSpinner)();
+    const spinner = (0, cli_utils_1.createSpinner)();
     spinner.start(`Fetching from ${(0, env_loader_1.getConnectionDescription)(connection)}...`);
     try {
         await (0, repo_manager_1.ensureRemoteTable)(connection);
         const remoteCommits = await (0, repo_manager_1.fetchRemoteCommits)(connection, 100);
         if (remoteCommits.length === 0) {
             spinner.succeed('No remote commits found');
-            console.log('');
-            console.log(`${spinner_1.colors.muted('Run')} ${spinner_1.colors.cyan('relq push')} ${spinner_1.colors.muted('to push your commits.')}`);
+            (0, cli_utils_1.hint)("run 'relq push' to push your commits");
             return;
         }
         let newCommits = 0;
@@ -50,25 +45,24 @@ async function fetchCommand(context) {
         const ahead = [...localCommits].filter(h => !remoteHashes.has(h)).length;
         console.log('');
         if (behind > 0 && ahead > 0) {
-            console.log(`Your branch and 'origin/main' have diverged.`);
-            console.log(`  ${spinner_1.colors.yellow(String(ahead))} commit(s) ahead, ${spinner_1.colors.yellow(String(behind))} commit(s) behind`);
+            console.log(`Your branch and 'origin/main' have diverged,`);
+            console.log(`and have ${ahead} and ${behind} different commits each, respectively.`);
         }
         else if (behind > 0) {
-            console.log(`Your branch is ${spinner_1.colors.yellow(String(behind))} commit(s) behind 'origin/main'.`);
-            console.log(`  ${spinner_1.colors.muted('Use')} ${spinner_1.colors.cyan('relq pull')} ${spinner_1.colors.muted('to update.')}`);
+            console.log(`Your branch is behind 'origin/main' by ${behind} commit(s).`);
+            (0, cli_utils_1.hint)("run 'relq pull' to update your local branch");
         }
         else if (ahead > 0) {
-            console.log(`Your branch is ${spinner_1.colors.green(String(ahead))} commit(s) ahead of 'origin/main'.`);
-            console.log(`  ${spinner_1.colors.muted('Use')} ${spinner_1.colors.cyan('relq push')} ${spinner_1.colors.muted('to publish.')}`);
+            console.log(`Your branch is ahead of 'origin/main' by ${ahead} commit(s).`);
+            (0, cli_utils_1.hint)("run 'relq push' to publish your local commits");
         }
         else {
-            console.log(`${spinner_1.colors.green('✓')} Your branch is up to date with 'origin/main'.`);
+            console.log("Your branch is up to date with 'origin/main'.");
         }
     }
     catch (error) {
         spinner.fail('Fetch failed');
-        console.error(spinner_1.colors.red(`Error: ${error instanceof Error ? error.message : error}`));
-        process.exit(1);
+        (0, cli_utils_1.fatal)('Fetch failed', error instanceof Error ? error.message : String(error));
     }
     console.log('');
 }

package/dist/cjs/cli/commands/generate.cjs

@@ -44,32 +44,7 @@ const schema_diff_1 = require("../utils/schema-diff.cjs");
 const schema_hash_1 = require("../utils/schema-hash.cjs");
 const migration_generator_1 = require("../utils/migration-generator.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',
-};
-function askConfirm(question, defaultYes = false) {
-    const rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout,
-    });
-    const suffix = defaultYes ? '[Y/n]' : '[y/N]';
-    return new Promise((resolve) => {
-        rl.question(`${question} ${suffix}: `, (answer) => {
-            rl.close();
-            const a = answer.trim().toLowerCase();
-            if (!a)
-                resolve(defaultYes);
-            else
-                resolve(a === 'y' || a === 'yes');
-        });
-    });
-}
+const cli_utils_1 = require("../utils/cli-utils.cjs");
 function askInput(question) {
     const rl = readline.createInterface({
         input: process.stdin,
@@ -85,10 +60,10 @@ function askInput(question) {
 async function generateCommand(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: 'generate' });
     const connection = config.connection;
     const migrationsDir = config.migrations?.directory || './migrations';
     const snapshotPath = config.sync?.snapshot || '.relq/snapshot.json';
@@ -111,10 +86,10 @@ async function generateCommand(context) {
         migrationName = message.replace(/\s+/g, '_').toLowerCase();
     }
     if (!migrationName && !isEmpty) {
-        migrationName = await askInput(`${colors.cyan}Migration name:${colors.reset} `);
+        migrationName = await askInput('Migration name: ');
         if (!migrationName) {
-            console.error('Error: Migration name is required.');
-            process.exit(1);
+            (0, cli_utils_1.fatal)('Migration name is required');
+            return;
         }
     }
     if (isEmpty) {
@@ -122,48 +97,48 @@ async function generateCommand(context) {
         await createEmptyMigration(migrationsDir, migrationName, format, dryRun);
         return;
     }
-    console.log(`${colors.bold}Generating migration...${colors.reset}`);
+    console.log('Generating migration...');
     console.log(`   Connection: ${(0, env_loader_1.getConnectionDescription)(connection)}`);
     console.log('');
     try {
         const dbSchema = await (0, schema_introspect_1.introspectDatabase)(connection);
         const snapshot = (0, snapshot_manager_1.loadSnapshot)(snapshotPath);
         if (!snapshot) {
-            console.log(`${colors.yellow}No snapshot found.${colors.reset}`);
-            console.log(`Run "${colors.cyan}relq pull${colors.reset}" first to create initial snapshot.`);
+            (0, cli_utils_1.warning)('No snapshot found.');
+            console.log('Run "relq pull" first to create initial snapshot.');
             return;
         }
         const localSchema = (0, snapshot_manager_1.snapshotToDatabaseSchema)(snapshot);
         const diff = (0, schema_diff_1.diffSchemas)((0, schema_hash_1.normalizeSchema)(localSchema), (0, schema_hash_1.normalizeSchema)(dbSchema));
         const filteredDiff = (0, schema_diff_1.filterDiff)(diff, ignorePatterns);
         if (!filteredDiff.hasChanges) {
-            console.log(`${colors.green}No changes to generate.${colors.reset}`);
+            console.log('No changes to generate.');
             return;
         }
         const s = filteredDiff.summary;
-        console.log(`${colors.bold}Changes to include:${colors.reset}`);
+        console.log('Changes to include:');
         if (s.tablesAdded > 0)
-            console.log(`  ${colors.green}+ ${s.tablesAdded} table(s)${colors.reset}`);
+            console.log(`  + ${s.tablesAdded} table(s)`);
         if (s.tablesRemoved > 0)
-            console.log(`  ${colors.red}- ${s.tablesRemoved} table(s)${colors.reset}`);
+            console.log(`  - ${s.tablesRemoved} table(s)`);
         if (s.tablesModified > 0)
-            console.log(`  ${colors.yellow}~ ${s.tablesModified} table(s) modified${colors.reset}`);
+            console.log(`  ~ ${s.tablesModified} table(s) modified`);
         if (s.columnsAdded > 0)
-            console.log(`  ${colors.green}+ ${s.columnsAdded} column(s)${colors.reset}`);
+            console.log(`  + ${s.columnsAdded} column(s)`);
         if (s.columnsRemoved > 0)
-            console.log(`  ${colors.red}- ${s.columnsRemoved} column(s)${colors.reset}`);
+            console.log(`  - ${s.columnsRemoved} column(s)`);
         if (s.columnsModified > 0)
-            console.log(`  ${colors.yellow}~ ${s.columnsModified} column(s)${colors.reset}`);
+            console.log(`  ~ ${s.columnsModified} column(s)`);
         console.log('');
         if ((0, schema_diff_1.hasDestructiveChanges)(filteredDiff)) {
             const tables = (0, schema_diff_1.getDestructiveTables)(filteredDiff);
-            console.log(`${colors.red}${colors.bold}⚠️  Destructive changes:${colors.reset}`);
+            (0, cli_utils_1.warning)('Destructive changes:');
             for (const t of tables) {
-                console.log(`   ${colors.red}• ${t}${colors.reset}`);
+                console.log(`   - ${t}`);
             }
             console.log('');
             if (!autoStage) {
-                const proceed = await askConfirm('Include destructive changes?', false);
+                const proceed = await (0, cli_utils_1.confirm)('Include destructive changes?', false);
                 if (!proceed) {
                     console.log('Cancelled.');
                     return;
@@ -185,7 +160,7 @@ async function generateCommand(context) {
         }
         const filePath = path.join(migrationsDir, fileName);
         if (dryRun) {
-            console.log(`${colors.cyan}[dry-run] Would create: ${filePath}${colors.reset}`);
+            console.log(`[dry-run] Would create: ${filePath}`);
             console.log('');
             console.log('--- Generated SQL ---');
             console.log(migrationFile.content);
@@ -196,16 +171,15 @@ async function generateCommand(context) {
                 fs.mkdirSync(migrationsDir, { recursive: true });
             }
             fs.writeFileSync(filePath, migrationFile.content, 'utf-8');
-            console.log(`${colors.green}✓ Created:${colors.reset} ${filePath}`);
+            console.log(`Created: ${filePath}`);
             (0, snapshot_manager_1.saveSnapshot)(dbSchema, snapshotPath, connection.database);
-            console.log(`${colors.dim}Updated snapshot.${colors.reset}`);
+            console.log('Updated snapshot.');
         }
         console.log('');
-        console.log(`${colors.dim}Run "relq push" to apply this migration.${colors.reset}`);
+        console.log('Run "relq push" to apply this migration.');
     }
     catch (error) {
-        console.error('Error:', error instanceof Error ? error.message : error);
-        process.exit(1);
+        (0, cli_utils_1.fatal)('Generation failed', error instanceof Error ? error.message : String(error));
     }
 }
 async function createEmptyMigration(migrationsDir, name, format, dryRun) {
@@ -230,13 +204,13 @@ async function createEmptyMigration(migrationsDir, name, format, dryRun) {
 
 `;
     if (dryRun) {
-        console.log(`${colors.cyan}[dry-run] Would create: ${filePath}${colors.reset}`);
+        console.log(`[dry-run] Would create: ${filePath}`);
     }
     else {
         if (!fs.existsSync(migrationsDir)) {
             fs.mkdirSync(migrationsDir, { recursive: true });
         }
         fs.writeFileSync(filePath, content, 'utf-8');
-        console.log(`${colors.green}✓ Created empty migration:${colors.reset} ${filePath}`);
+        console.log(`Created empty migration: ${filePath}`);
     }
 }