@dboio/cli 0.4.2 → 0.6.0

package/src/lib/save-to-disk.js

@@ -1,6 +1,7 @@
 import { writeFile, mkdir, access, readFile } from 'fs/promises';
 import { join, dirname, basename, extname } from 'path';
 import { log } from './logger.js';
+import { setFileTimestamps } from './timestamps.js';
 
 /**
  * Resolve a column value for file writing.
@@ -32,6 +33,8 @@ function resolveContentValue(value) {
  *   saveExtension: column name for extension, or literal extension
  *   nonInteractive: skip all prompts
  *   contentFileMap: object mapping column → { suffix, extension } per column
+ *   changeDetection: enable smart change detection (compares timestamps)
+ *   config: loaded config object (needed for ServerTimezone)
  */
 export async function saveToDisk(rows, columns, options = {}) {
   if (!rows || rows.length === 0) {
@@ -158,7 +161,14 @@ export async function saveToDisk(rows, columns, options = {}) {
     extensionSource = useExtCol ? extCol : null;
   }
 
+  // Lazy-load change detection functions only if needed
+  let diffModule = null;
+  if (options.changeDetection) {
+    diffModule = await import('./diff.js');
+  }
+
   let savedCount = 0;
+  let bulkAction = null; // Track 'overwrite_all' or 'skip_all' across records
   const usedNames = new Map(); // track dir+name to avoid collisions
 
   for (const row of rows) {
@@ -210,10 +220,53 @@ export async function saveToDisk(rows, columns, options = {}) {
       } catch { /* ignore parse errors */ }
     }
 
+    // ── Change detection ────────────────────────────────────────────────
+    if (options.changeDetection && existingMeta && !options.nonInteractive && diffModule) {
+      // Handle bulk actions from previous iterations
+      if (bulkAction === 'skip_all') {
+        log.dim(`  Skipped ${finalName}`);
+        continue;
+      }
+
+      if (bulkAction !== 'overwrite_all') {
+        const localSyncTime = await diffModule.getLocalSyncTime(metaPath);
+        const serverIsNewer = diffModule.isServerNewer(localSyncTime, row._LastUpdated, options.config || {});
+
+        if (serverIsNewer) {
+          const action = await diffModule.promptChangeDetection(finalName, row, options.config || {});
+
+          if (action === 'skip') {
+            log.dim(`  Skipped ${finalName}`);
+            continue;
+          }
+          if (action === 'skip_all') {
+            bulkAction = 'skip_all';
+            log.dim(`  Skipped ${finalName}`);
+            continue;
+          }
+          if (action === 'overwrite_all') {
+            bulkAction = 'overwrite_all';
+            // Fall through to write
+          }
+          if (action === 'compare') {
+            // Run inline diff and merge
+            const mergeResult = await diffModule.inlineDiffAndMerge(row, metaPath, options.config || {});
+            if (!mergeResult.skipped) {
+              savedCount++;
+            }
+            continue; // inlineDiffAndMerge handles writing
+          }
+          // 'overwrite' falls through to normal write
+        }
+      }
+    }
+
+    // ── Write content files ─────────────────────────────────────────────
     // Build metadata with @filename placeholders
     const meta = { ...row };
     if (options.entity) meta._entity = options.entity;
     const contentColumnsList = [];
+    const writtenFilePaths = []; // Track files for timestamp setting
 
     for (const col of contentCols) {
       const content = row[col];
@@ -235,8 +288,8 @@ export async function saveToDisk(rows, columns, options = {}) {
 
       const filePath = join(dir, fileName);
 
-      // Prompt before overwriting
-      if (await fileExists(filePath) && !options.nonInteractive) {
+      // Prompt before overwriting (only if NOT using change detection — change detection handles its own prompts)
+      if (!options.changeDetection && await fileExists(filePath) && !options.nonInteractive) {
         const inquirer = (await import('inquirer')).default;
         const { overwrite } = await inquirer.prompt([{
           type: 'confirm', name: 'overwrite',
@@ -253,6 +306,7 @@ export async function saveToDisk(rows, columns, options = {}) {
 
       await writeFile(filePath, resolveContentValue(content));
       log.success(`Saved ${filePath}`);
+      writtenFilePaths.push(filePath);
       savedCount++;
 
       meta[col] = `@${fileName}`;
@@ -263,8 +317,9 @@ export async function saveToDisk(rows, columns, options = {}) {
       meta._contentColumns = contentColumnsList;
     }
 
-    // Save metadata — prompt if exists
-    if (await fileExists(metaPath) && !options.nonInteractive) {
+    // ── Save metadata ───────────────────────────────────────────────────
+    // Prompt before overwriting (only if NOT using change detection)
+    if (!options.changeDetection && await fileExists(metaPath) && !options.nonInteractive) {
       const inquirer = (await import('inquirer')).default;
       const { overwrite } = await inquirer.prompt([{
         type: 'confirm', name: 'overwrite',
@@ -279,7 +334,19 @@ export async function saveToDisk(rows, columns, options = {}) {
 
     await writeFile(metaPath, JSON.stringify(meta, null, 2) + '\n');
     log.dim(`  → ${metaPath}`);
+    writtenFilePaths.push(metaPath);
     savedCount++;
+
+    // ── Set file timestamps ─────────────────────────────────────────────
+    // Sync file mtime to server's _LastUpdated (establishes sync point)
+    const serverTz = options.config?.ServerTimezone;
+    if (serverTz && (row._CreatedOn || row._LastUpdated)) {
+      for (const fp of writtenFilePaths) {
+        try {
+          await setFileTimestamps(fp, row._CreatedOn, row._LastUpdated, serverTz);
+        } catch { /* non-critical */ }
+      }
+    }
   }
 
   log.info(`Saved ${savedCount} file(s) for ${rows.length} record(s)`);

package/src/lib/structure.js

@@ -9,13 +9,27 @@ export const BINS_DIR = 'Bins';
 /** Default top-level directories created at project root during clone */
 export const DEFAULT_PROJECT_DIRS = [
   BINS_DIR,
+  'Automations',
   'App Versions',
   'Documentation',
   'Sites',
   'Extensions',
   'Data Sources',
+  'Groups',
+  'Integrations',
 ];
 
+/** Map from server entity key → local project directory name */
+export const ENTITY_DIR_MAP = {
+  extension:    'Extensions',
+  app_version:  'App Versions',
+  data_source:  'Data Sources',
+  site:         'Sites',
+  group:        'Groups',
+  integration:  'Integrations',
+  automation:   'Automations',
+};
+
 /**
  * Build a bin hierarchy from an array of bin objects.
  * Filters by targetAppId and resolves full directory paths via ParentBinID traversal.
@@ -127,3 +141,25 @@ export function getBinName(binId, structure) {
   const entry = structure[binId];
   return entry ? entry.name : null;
 }
+
+/**
+ * Reverse-lookup: find a bin entry by its directory path.
+ * Accepts paths with or without the "Bins/" prefix.
+ * Returns { binId, name, path, segment, parentBinID, uid, fullPath } or null.
+ */
+export function findBinByPath(dirPath, structure) {
+  const normalized = dirPath.replace(/^Bins\//, '').replace(/^\/+|\/+$/g, '');
+  for (const [binId, entry] of Object.entries(structure)) {
+    if (entry.fullPath === normalized) {
+      return { binId: Number(binId), ...entry };
+    }
+  }
+  return null;
+}
+
+/**
+ * Find all direct child bins of a given BinID.
+ */
+export function findChildBins(binId, structure) {
+  return Object.values(structure).filter(e => e.parentBinID === binId);
+}

package/src/plugins/claudecommands/dbo.md

@@ -33,10 +33,11 @@ Here are the available commands:
 | push      | Push local files back to DBO.io                  |
 | add       | Add a new file to DBO.io                         |
 | clone     | Clone an app to local project structure           |
+| diff      | Compare local files with server versions          |
+| rm        | Remove a file and stage server deletion           |
 | deploy    | Deploy via manifest                              |
 | cache     | Manage cache                                     |
-| install   | Install components                               |
-| update    | Update CLI or plugins                            |
+| install   | Install or upgrade CLI, plugins, Claude commands (shorthand: `i`) |
 
 Just tell me what you'd like to do and I'll help you build the right command!
 
@@ -71,9 +72,36 @@ Available subcommands:
 - `cache list|refresh` — Manage cache
 - `clone [source]` — Clone an app to local project (from file or server)
 - `clone --app <name>` — Clone by app short name from server
+- `diff [path]` — Compare local files against server and selectively merge changes
+- `diff -y` — Accept all server changes without prompting
+- `diff --no-interactive` — Show diffs without prompting to accept
+- `rm <file>` — Remove a file locally and stage server deletion for next push
+- `rm <directory>` — Remove a directory, all files, and sub-directories recursively
+- `rm -f <path>` — Remove without confirmation prompts
+- `rm --keep-local <path>` — Stage server deletions without deleting local files/directories
 - `deploy [name]` — Deploy via dbo.deploy.json manifest
-- `install` — Install components (claudecode, claudecommands)
-- `update` — Update CLI, plugins, or Claude commands
+- `install` (alias: `i`) — Install or upgrade CLI, plugins, or Claude commands
+- `i dbo` or `i dbo@latest` — Install/upgrade the CLI from npm
+- `i dbo@0.4.1` — Install a specific CLI version
+- `install /path/to/src` — Install CLI from local source
+- `install plugins` — Install/upgrade Claude command plugins
+- `install plugins --global` — Install plugins to `~/.claude/commands/` (shared across projects)
+- `install plugins --local` — Install plugins to `.claude/commands/` (project only)
+- `install claudecommands` — Install/upgrade Claude Code commands
+- `install claudecode` — Install Claude Code CLI + commands
+- `install --claudecommand dbo --global` — Install a specific command globally
+
+## Change Detection (pull, clone, diff)
+
+When pulling or cloning records that already exist locally, the CLI compares file modification times against the server's `_LastUpdated` timestamp. If the server has newer data, you'll be prompted with options:
+
+1. **Overwrite** — Replace local files with server version
+2. **Compare** — Show a line-by-line diff and selectively merge
+3. **Skip** — Keep local files unchanged
+4. **Overwrite all** — Accept all remaining server changes
+5. **Skip all** — Skip all remaining files
+
+Use `dbo diff [path]` to compare without pulling. Use `-y` to auto-accept all changes.
 
 ## Smart Command Building
 
@@ -91,6 +119,8 @@ When helping the user build a command interactively:
 - **"I want to deploy/update a file"** → Check if `.metadata.json` exists → `dbo push` or `dbo content deploy`
 - **"I want to add a new file"** → `dbo add <path>` (will create metadata interactively)
 - **"I want to pull files from the server"** → `dbo pull` or `dbo pull -e <entity>`
+- **"I want to delete/remove a file"** → `dbo rm <file>` (stages deletion for next `dbo push`)
+- **"I want to delete a directory"** → `dbo rm <directory>` (removes all files + sub-dirs, stages bin deletions)
 - **"I want to see what's on the server"** → `dbo output -e <entity> --format json`
 - **"I need to set up this project"** → `dbo init` → `dbo login` → `dbo status`
 - **"I want to clone an app"** → `dbo clone --app <name>` or `dbo clone <local.json>`
@@ -211,8 +241,9 @@ Flags: `--app <name>`, `--domain <host>`, `-y/--yes`, `-v/--verbose`
 4. Creates directory structure from `children.bin` hierarchy → saves `.dbo/structure.json`
 5. Writes content files (decodes base64) with `*.metadata.json` into bin directories
 6. Downloads media files from server via `/api/media/{uid}` with `*.metadata.json`
-7. Processes other entities with BinID into corresponding directories
-8. Saves `app.json` to project root with `@path/to/*.metadata.json` references
+7. Processes entity-dir records (`extension`, `app_version`, `data_source`, `site`, `group`, `integration`, `automation`) into project directories (`Extensions/`, `Data Sources/`, etc.) as `.metadata.json` files with optional companion content files
+8. Processes remaining entities with BinID into corresponding bin directories
+9. Saves `app.json` to project root with `@path/to/*.metadata.json` references
 
 ### Placement preferences
 

package/src/commands/update.js

@@ -1,168 +0,0 @@
-import { Command } from 'commander';
-import { readdir, readFile, copyFile, access, mkdir } from 'fs/promises';
-import { join, dirname } from 'path';
-import { fileURLToPath } from 'url';
-import { execSync } from 'child_process';
-import { createHash } from 'crypto';
-import { installClaudeCommands } from './install.js';
-import { log } from '../lib/logger.js';
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const CLI_ROOT = join(__dirname, '..', '..');
-const PLUGINS_DIR = join(__dirname, '..', 'plugins', 'claudecommands');
-
-async function fileExists(path) {
-  try { await access(path); return true; } catch { return false; }
-}
-
-function fileHash(content) {
-  return createHash('md5').update(content).digest('hex');
-}
-
-export const updateCommand = new Command('update')
-  .description('Update dbo-cli, plugins, or Claude Code commands')
-  .argument('[target]', 'What to update: cli, plugins, claudecommands')
-  .option('--claudecommand <name>', 'Update a specific Claude command by name')
-  .action(async (target, options) => {
-    try {
-      if (options.claudecommand) {
-        await updateSpecificCommand(options.claudecommand);
-      } else if (target === 'cli') {
-        await updateCli();
-      } else if (target === 'plugins') {
-        await updatePlugins();
-      } else if (target === 'claudecommands') {
-        await updateClaudeCommands();
-      } else {
-        // No target: update CLI + ask about claude commands
-        await updateCli();
-        const inquirer = (await import('inquirer')).default;
-        const { updateCmds } = await inquirer.prompt([{
-          type: 'confirm', name: 'updateCmds',
-          message: 'Also update Claude Code commands?',
-          default: true,
-        }]);
-        if (updateCmds) await updateClaudeCommands();
-      }
-    } catch (err) {
-      log.error(err.message);
-      process.exit(1);
-    }
-  });
-
-async function updateCli() {
-  // Detect install method: git repo or npm global
-  const isGitRepo = await fileExists(join(CLI_ROOT, '.git'));
-  const isInNodeModules = CLI_ROOT.includes('node_modules');
-
-  if (isGitRepo && !isInNodeModules) {
-    log.info('Updating dbo-cli from git...');
-    try {
-      execSync('git pull', { cwd: CLI_ROOT, stdio: 'inherit' });
-      execSync('npm install', { cwd: CLI_ROOT, stdio: 'inherit' });
-      log.success('dbo-cli updated from git');
-    } catch (err) {
-      log.error(`Git update failed: ${err.message}`);
-    }
-  } else {
-    log.info('Updating dbo-cli via npm...');
-    try {
-      execSync('npm update -g @dboio/cli', { stdio: 'inherit' });
-      log.success('dbo-cli updated via npm');
-    } catch (err) {
-      log.error(`npm update failed: ${err.message}`);
-    }
-  }
-
-  // Show current version
-  try {
-    const pkg = JSON.parse(await readFile(join(CLI_ROOT, 'package.json'), 'utf8'));
-    log.label('Version', pkg.version);
-  } catch { /* ignore */ }
-}
-
-async function updatePlugins() {
-  log.info('Updating all plugins...');
-  await updateClaudeCommands();
-}
-
-async function updateClaudeCommands() {
-  const commandsDir = join(process.cwd(), '.claude', 'commands');
-
-  if (!await fileExists(commandsDir)) {
-    log.info('No .claude/commands/ directory found. Installing...');
-    await installClaudeCommands();
-    return;
-  }
-
-  let pluginFiles;
-  try {
-    pluginFiles = (await readdir(PLUGINS_DIR)).filter(f => f.endsWith('.md'));
-  } catch {
-    log.error(`Plugin source not found: ${PLUGINS_DIR}`);
-    return;
-  }
-
-  let updated = 0;
-  let upToDate = 0;
-
-  for (const file of pluginFiles) {
-    const srcPath = join(PLUGINS_DIR, file);
-    const destPath = join(commandsDir, file);
-
-    const srcContent = await readFile(srcPath, 'utf8');
-
-    if (await fileExists(destPath)) {
-      const destContent = await readFile(destPath, 'utf8');
-      if (fileHash(srcContent) === fileHash(destContent)) {
-        upToDate++;
-        continue;
-      }
-      await copyFile(srcPath, destPath);
-      log.success(`Updated .claude/commands/${file}`);
-      updated++;
-    } else {
-      await copyFile(srcPath, destPath);
-      log.success(`Installed .claude/commands/${file} (new)`);
-      updated++;
-    }
-  }
-
-  if (updated > 0) {
-    log.info(`${updated} command(s) updated`);
-    log.warn('Note: Updated commands will be available in new Claude Code sessions (restart any active session).');
-  }
-  if (upToDate > 0) {
-    log.dim(`${upToDate} command(s) already up to date`);
-  }
-}
-
-async function updateSpecificCommand(name) {
-  const fileName = name.endsWith('.md') ? name : `${name}.md`;
-  const srcPath = join(PLUGINS_DIR, fileName);
-  const destPath = join(process.cwd(), '.claude', 'commands', fileName);
-
-  if (!await fileExists(srcPath)) {
-    log.error(`Command plugin "${name}" not found in source`);
-    const available = (await readdir(PLUGINS_DIR)).filter(f => f.endsWith('.md')).map(f => f.replace('.md', ''));
-    if (available.length > 0) log.dim(`  Available: ${available.join(', ')}`);
-    return;
-  }
-
-  if (!await fileExists(destPath)) {
-    log.warn(`"${fileName}" not installed. Run "dbo install --claudecommand ${name}" first.`);
-    return;
-  }
-
-  const srcContent = await readFile(srcPath, 'utf8');
-  const destContent = await readFile(destPath, 'utf8');
-
-  if (fileHash(srcContent) === fileHash(destContent)) {
-    log.success(`${fileName} is already up to date`);
-    return;
-  }
-
-  await copyFile(srcPath, destPath);
-  log.success(`Updated .claude/commands/${fileName}`);
-  log.warn('Note: Updated commands will be available in new Claude Code sessions (restart any active session).');
-}