@dboio/cli 0.4.1 → 0.5.1

package/src/commands/diff.js

@@ -0,0 +1,246 @@
+import { Command } from 'commander';
+import { stat } from 'fs/promises';
+import { join, dirname, basename, extname } from 'path';
+import chalk from 'chalk';
+import { DboClient } from '../lib/client.js';
+import { loadConfig } from '../lib/config.js';
+import { formatError } from '../lib/formatter.js';
+import { log } from '../lib/logger.js';
+import {
+  compareRecord,
+  findMetadataFiles,
+  formatDiff,
+  applyServerChanges,
+} from '../lib/diff.js';
+
+export const diffCommand = new Command('diff')
+  .description('Compare local files with server versions and selectively merge changes')
+  .argument('[path]', 'File or directory to diff (default: current directory)', '.')
+  .option('--no-interactive', 'Show diffs without prompting to accept')
+  .option('-y, --yes', 'Accept all server changes without prompting')
+  .option('-v, --verbose', 'Show HTTP request details')
+  .option('--domain <host>', 'Override domain')
+  .action(async (targetPath, options) => {
+    try {
+      const client = new DboClient({ domain: options.domain, verbose: options.verbose });
+      const config = await loadConfig();
+
+      // Resolve target to metadata file(s)
+      const metaFiles = await resolveTargetToMetaFiles(targetPath);
+
+      if (metaFiles.length === 0) {
+        log.warn('No .metadata.json files found.');
+        log.dim('Pull records first with "dbo pull" or "dbo clone".');
+        return;
+      }
+
+      log.info(`Comparing ${metaFiles.length} record(s) against server...`);
+
+      let updated = 0;
+      let skipped = 0;
+      let unchanged = 0;
+      let errors = 0;
+      let bulkAction = null;
+
+      for (const metaPath of metaFiles) {
+        const metaBase = basename(metaPath, '.metadata.json');
+
+        const result = await compareRecord(metaPath, client, config);
+
+        if (result.error) {
+          log.warn(`${metaBase}: ${result.error}`);
+          errors++;
+          continue;
+        }
+
+        if (!result.hasChanges) {
+          log.dim(`${metaBase}: no changes`);
+          unchanged++;
+          continue;
+        }
+
+        // Count content vs metadata changes
+        const contentChanges = result.fieldDiffs.filter(d => d.isContentFile).length;
+        const metaChanges = result.fieldDiffs.filter(d => !d.isContentFile).length;
+        log.info(`${metaBase}: ${result.fieldDiffs.length} difference(s) (${contentChanges} content, ${metaChanges} metadata)`);
+
+        if (options.yes || bulkAction === 'accept_all') {
+          // Auto-accept all
+          const allFields = new Set(result.fieldDiffs.map(d => d.column));
+          await applyServerChanges(result, allFields, config);
+          log.success(`Updated ${metaBase}`);
+          updated++;
+          continue;
+        }
+
+        if (bulkAction === 'skip_all') {
+          log.dim(`Skipped ${metaBase}`);
+          skipped++;
+          continue;
+        }
+
+        // Display diffs
+        for (const fd of result.fieldDiffs) {
+          log.plain('');
+          if (fd.isContentFile && fd.diff) {
+            log.label('Field', `${fd.column} (${fd.localFilePath})`);
+            const formatted = formatDiff(fd.diff, {
+              localLabel: `local: ${fd.localFilePath}`,
+              serverLabel: `server: ${result.entity}:${result.uid}`,
+            });
+            for (const line of formatted) log.plain(line);
+          } else {
+            log.label('Field', fd.column);
+            if (fd.localValue) log.plain(chalk.red(`  - ${fd.localValue}`));
+            if (fd.serverValue) log.plain(chalk.green(`  + ${fd.serverValue}`));
+          }
+        }
+
+        if (!options.interactive) {
+          // Display-only mode
+          skipped++;
+          continue;
+        }
+
+        // Interactive: prompt for acceptance
+        log.plain('');
+        const inquirer = (await import('inquirer')).default;
+        const { action } = await inquirer.prompt([{
+          type: 'list',
+          name: 'action',
+          message: `Accept server changes for "${metaBase}"?`,
+          choices: [
+            { name: 'Accept all changes for this file', value: 'accept' },
+            { name: 'Cherry-pick individual fields', value: 'cherry_pick' },
+            { name: 'Skip this file', value: 'skip' },
+            { name: 'Accept all remaining files', value: 'accept_all' },
+            { name: 'Skip all remaining files', value: 'skip_all' },
+          ],
+        }]);
+
+        if (action === 'accept' || action === 'accept_all') {
+          const allFields = new Set(result.fieldDiffs.map(d => d.column));
+          await applyServerChanges(result, allFields, config);
+          log.success(`Updated ${metaBase}`);
+          updated++;
+          if (action === 'accept_all') bulkAction = 'accept_all';
+        } else if (action === 'cherry_pick') {
+          const accepted = await cherryPickFields(result, inquirer);
+          if (accepted.size > 0) {
+            await applyServerChanges(result, accepted, config);
+            log.success(`Updated ${metaBase} (${accepted.size} field(s))`);
+            updated++;
+          } else {
+            skipped++;
+          }
+        } else if (action === 'skip_all') {
+          bulkAction = 'skip_all';
+          skipped++;
+        } else {
+          skipped++;
+        }
+      }
+
+      // Summary
+      log.plain('');
+      const parts = [];
+      if (updated > 0) parts.push(`${updated} updated`);
+      if (skipped > 0) parts.push(`${skipped} skipped`);
+      if (unchanged > 0) parts.push(`${unchanged} unchanged`);
+      if (errors > 0) parts.push(`${errors} error(s)`);
+      log.info(`Diff complete: ${parts.join(', ')}`);
+
+    } catch (err) {
+      formatError(err);
+      process.exit(1);
+    }
+  });
+
+/**
+ * Resolve a target path to an array of .metadata.json file paths.
+ */
+async function resolveTargetToMetaFiles(targetPath) {
+  let pathStat;
+  try {
+    pathStat = await stat(targetPath);
+  } catch {
+    // Maybe it's a file without extension — try finding metadata
+    const metaPath = targetPath.endsWith('.metadata.json')
+      ? targetPath
+      : `${targetPath}.metadata.json`;
+
+    try {
+      await stat(metaPath);
+      return [metaPath];
+    } catch {
+      return [];
+    }
+  }
+
+  if (pathStat.isDirectory()) {
+    return findMetadataFiles(targetPath);
+  }
+
+  // Single file — find its companion metadata
+  if (targetPath.endsWith('.metadata.json')) {
+    return [targetPath];
+  }
+
+  // Content file: colors.css → colors.metadata.json
+  const dir = dirname(targetPath);
+  const base = basename(targetPath, extname(targetPath));
+  const metaPath = join(dir, `${base}.metadata.json`);
+
+  try {
+    await stat(metaPath);
+    return [metaPath];
+  } catch {
+    // Try with full filename for media: logo.png → logo.png.metadata.json
+    const mediaMetaPath = `${targetPath}.metadata.json`;
+    try {
+      await stat(mediaMetaPath);
+      return [mediaMetaPath];
+    } catch {
+      log.warn(`No metadata found for "${targetPath}"`);
+      return [];
+    }
+  }
+}
+
+/**
+ * Cherry-pick individual fields from a diff result.
+ * Returns Set of accepted column names.
+ */
+async function cherryPickFields(result, inquirer) {
+  const accepted = new Set();
+  let bulkAction = null;
+
+  for (const fd of result.fieldDiffs) {
+    if (bulkAction === 'accept_all') {
+      accepted.add(fd.column);
+      continue;
+    }
+    if (bulkAction === 'skip_all') continue;
+
+    const { action } = await inquirer.prompt([{
+      type: 'list',
+      name: 'action',
+      message: `Accept server change for "${fd.column}"?`,
+      choices: [
+        { name: 'Accept', value: 'accept' },
+        { name: 'Skip', value: 'skip' },
+        { name: 'Accept all remaining', value: 'accept_all' },
+        { name: 'Skip all remaining', value: 'skip_all' },
+      ],
+    }]);
+
+    if (action === 'accept' || action === 'accept_all') {
+      accepted.add(fd.column);
+    }
+    if (action === 'accept_all' || action === 'skip_all') {
+      bulkAction = action;
+    }
+  }
+
+  return accepted;
+}

package/src/commands/init.js

@@ -2,17 +2,23 @@ import { Command } from 'commander';
 import { access } from 'fs/promises';
 import { join } from 'path';
 import { isInitialized, hasLegacyConfig, readLegacyConfig, initConfig, saveCredentials, ensureGitignore } from '../lib/config.js';
-import { installClaudeCommands } from './install.js';
+import { installOrUpdateClaudeCommands } from './install.js';
 import { log } from '../lib/logger.js';
 
 export const initCommand = new Command('init')
   .description('Initialize DBO CLI configuration for the current directory')
-  .option('--domain <host>', 'DBO instance domain (e.g., beta-dev_model.dbo.io)')
+  .option('--domain <host>', 'DBO instance domain (e.g., my-domain.com)')
   .option('--username <user>', 'DBO username')
   .option('--force', 'Overwrite existing configuration')
   .option('--app <shortName>', 'App short name (for clone)')
   .option('--clone', 'Clone the app after initialization')
+  .option('-y, --yes', 'Skip all interactive prompts (alias for --non-interactive)')
+  .option('--non-interactive', 'Skip all interactive prompts')
+  .option('-g, --global', 'Install Claude commands to user home directory (~/.claude/commands/)')
+  .option('--local', 'Install Claude commands to project directory (.claude/commands/)')
   .action(async (options) => {
+    // Merge --yes into nonInteractive
+    if (options.yes) options.nonInteractive = true;
     try {
       if (await isInitialized() && !options.force) {
         log.warn('Already initialized. Use --force to overwrite.');
@@ -23,7 +29,7 @@ export const initCommand = new Command('init')
       let username = options.username;
 
       // Check for legacy config to offer migration
-      if (!domain && await hasLegacyConfig()) {
+      if (!options.nonInteractive && !domain && await hasLegacyConfig()) {
         const legacy = await readLegacyConfig();
         log.info('Legacy configuration detected (.domain, .username, .password)');
         const inquirer = (await import('inquirer')).default;
@@ -56,7 +62,7 @@ export const initCommand = new Command('init')
       }
 
       // Ensure sensitive files are gitignored
-      await ensureGitignore(['.dbo/credentials.json', '.dbo/cookies.txt']);
+      await ensureGitignore(['.dbo/credentials.json', '.dbo/cookies.txt', '.dbo/config.local.json']);
 
       log.success(`Initialized .dbo/ for ${domain}`);
       log.dim('  Run "dbo login" to authenticate.');
@@ -77,26 +83,28 @@ export const initCommand = new Command('init')
         await performClone(null, { app: appShortName, domain });
       }
 
-      // Offer Claude Code integration
-      const claudeDir = join(process.cwd(), '.claude');
-      const inquirer = (await import('inquirer')).default;
-      let hasClaudeDir = false;
-      try { await access(claudeDir); hasClaudeDir = true; } catch {}
+      // Offer Claude Code integration (skip in non-interactive mode)
+      if (!options.nonInteractive) {
+        const claudeDir = join(process.cwd(), '.claude');
+        const inquirer = (await import('inquirer')).default;
+        let hasClaudeDir = false;
+        try { await access(claudeDir); hasClaudeDir = true; } catch {}
 
-      if (hasClaudeDir) {
-        const { installCmds } = await inquirer.prompt([{
-          type: 'confirm', name: 'installCmds',
-          message: 'Install DBO commands for Claude Code? (adds /dbo slash command)',
-          default: true,
-        }]);
-        if (installCmds) await installClaudeCommands();
-      } else {
-        const { setupClaude } = await inquirer.prompt([{
-          type: 'confirm', name: 'setupClaude',
-          message: 'Set up Claude Code integration? (creates .claude/commands/)',
-          default: false,
-        }]);
-        if (setupClaude) await installClaudeCommands();
+        if (hasClaudeDir) {
+          const { installCmds } = await inquirer.prompt([{
+            type: 'confirm', name: 'installCmds',
+            message: 'Install DBO commands for Claude Code? (adds /dbo slash command)',
+            default: true,
+          }]);
+          if (installCmds) await installOrUpdateClaudeCommands(options);
+        } else {
+          const { setupClaude } = await inquirer.prompt([{
+            type: 'confirm', name: 'setupClaude',
+            message: 'Set up Claude Code integration? (creates .claude/commands/)',
+            default: false,
+          }]);
+          if (setupClaude) await installOrUpdateClaudeCommands(options);
+        }
       }
     } catch (err) {
       log.error(err.message);