@dboio/cli 0.10.1 → 0.11.2

package/src/commands/content.js

@@ -9,6 +9,7 @@ import { checkModifyKey, isModifyKeyError, handleModifyKeyError } from '../lib/m
 import { checkStoredTicket, applyStoredTicketToSubmission, clearGlobalTicket, getGlobalTicket, getRecordTicket } from '../lib/ticketing.js';
 import { resolveTransactionKey } from '../lib/transaction-key.js';
 import { log } from '../lib/logger.js';
+import { runPendingMigrations } from '../lib/migrations.js';
 
 function collect(value, previous) {
   return previous.concat([value]);
@@ -18,7 +19,7 @@ export const contentCommand = new Command('content')
   .description('Get, deploy, or pull content from DBO.io')
   .argument('[uid]', 'Content UID')
   .option('-o, --output <path>', 'Save content to local file')
-  .option('--format <type>', 'Output format')
+  .option('--template <value>', 'Output template (e.g., json_raw, html, txt, or a content UID)')
   .option('--no-minify', 'Disable minification')
   .option('--json', 'Output raw JSON')
   .option('-v, --verbose', 'Show HTTP request details')
@@ -37,8 +38,10 @@ const deployCmd = new Command('deploy')
   .option('--json', 'Output raw JSON')
   .option('-v, --verbose', 'Show HTTP request details')
   .option('--domain <host>', 'Override domain')
+  .option('--no-migrate', 'Skip pending migrations for this invocation')
   .action(async (uid, filepath, options) => {
     try {
+      await runPendingMigrations(options);
       const client = new DboClient({ domain: options.domain, verbose: options.verbose });
 
       // ModifyKey guard
@@ -130,6 +133,7 @@ const deployCmd = new Command('deploy')
         result = await submit();
       }
 
+      if (result.successful) await client.voidCache();
       formatResponse(result, { json: options.json });
       if (!result.successful) process.exit(1);
     } catch (err) {
@@ -150,7 +154,7 @@ const pullCmd = new Command('pull')
   .action(async (uid, options) => {
     try {
       const client = new DboClient({ domain: options.domain, verbose: options.verbose });
-      const params = { '_format': 'json_raw' };
+      const params = { '_template': 'json_raw' };
       if (options.maxrows) params['_maxrows'] = options.maxrows;
 
       for (const f of options.filter) {
@@ -216,7 +220,7 @@ contentCommand.action(async (uid, options) => {
     }
     const client = new DboClient({ domain: options.domain, verbose: options.verbose });
     const params = {};
-    if (options.format) params['_format'] = options.format;
+    if (options.template) params['_template'] = options.template;
     if (options.noMinify) params['_no_minify'] = 'true';
 
     const result = await client.get(`/api/content/${uid}`, params);

package/src/commands/deploy.js

@@ -7,12 +7,14 @@ import { checkModifyKey, isModifyKeyError, handleModifyKeyError } from '../lib/m
 import { checkStoredTicket, applyStoredTicketToSubmission, clearGlobalTicket, getGlobalTicket, getRecordTicket } from '../lib/ticketing.js';
 import { resolveTransactionKey } from '../lib/transaction-key.js';
 import { log } from '../lib/logger.js';
+import { runPendingMigrations } from '../lib/migrations.js';
 
-const MANIFEST_FILE = 'dbo.deploy.json';
+const MANIFEST_FILE = '.dbo/deploy_config.json';
+const LEGACY_MANIFEST_FILE = 'dbo.deploy.json';
 
 export const deployCommand = new Command('deploy')
   .description('Deploy files to DBO.io using a manifest or direct arguments')
-  .argument('[name]', 'Deployment name from dbo.deploy.json (e.g., css:colors)')
+  .argument('[name]', 'Deployment name from .dbo/deploy_config.json (e.g., css:colors)')
   .option('--all', 'Deploy all entries in the manifest')
   .option('-C, --confirm <value>', 'Commit: true (default) or false', 'true')
   .option('--ticket <id>', 'Override ticket ID')
@@ -21,20 +23,32 @@ export const deployCommand = new Command('deploy')
   .option('--json', 'Output raw JSON')
   .option('-v, --verbose', 'Show HTTP request details')
   .option('--domain <host>', 'Override domain')
+  .option('--no-migrate', 'Skip pending migrations for this invocation')
   .action(async (name, options) => {
     try {
+      await runPendingMigrations(options);
       const client = new DboClient({ domain: options.domain, verbose: options.verbose });
 
-      // Load manifest
+      // Load manifest — try .dbo/deploy_config.json first, fall back to legacy dbo.deploy.json
       let manifest;
+      let manifestSource;
       try {
         const raw = await readFile(MANIFEST_FILE, 'utf8');
         manifest = JSON.parse(raw);
+        manifestSource = MANIFEST_FILE;
       } catch {
-        if (!name) {
-          log.error(`No ${MANIFEST_FILE} found and no deployment name specified.`);
-          log.dim('  Create a dbo.deploy.json or use: dbo content deploy <uid> <filepath>');
-          process.exit(1);
+        // Fall back to legacy location
+        try {
+          const raw = await readFile(LEGACY_MANIFEST_FILE, 'utf8');
+          manifest = JSON.parse(raw);
+          manifestSource = LEGACY_MANIFEST_FILE;
+          log.dim(`  Using legacy ${LEGACY_MANIFEST_FILE} — run \`dbo\` to migrate it to ${MANIFEST_FILE}`);
+        } catch {
+          if (!name) {
+            log.error(`No ${MANIFEST_FILE} found and no deployment name specified.`);
+            log.dim(`  Create ${MANIFEST_FILE} or use: dbo content deploy <uid> <filepath>`);
+            process.exit(1);
+          }
         }
       }
 
@@ -175,6 +189,7 @@ export const deployCommand = new Command('deploy')
         }
 
         if (result.successful) {
+          await client.voidCache();
           log.success(`${entryName} deployed`);
         } else {
           log.error(`${entryName} failed`);

package/src/commands/diff.js

@@ -1,9 +1,9 @@
 import { Command } from 'commander';
-import { stat } from 'fs/promises';
+import { readFile, 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 { loadConfig, loadAppConfig, loadAppJsonBaseline } from '../lib/config.js';
 import { formatError } from '../lib/formatter.js';
 import { log } from '../lib/logger.js';
 import {
@@ -12,6 +12,9 @@ import {
   formatDiff,
   applyServerChanges,
 } from '../lib/diff.js';
+import { fetchServerRecordsBatch } from '../lib/toe-stepping.js';
+import { findBaselineEntry } from '../lib/delta.js';
+import { runPendingMigrations } from '../lib/migrations.js';
 
 export const diffCommand = new Command('diff')
   .description('Compare local files with server versions and selectively merge changes')
@@ -20,8 +23,10 @@ export const diffCommand = new Command('diff')
   .option('-y, --yes', 'Accept all server changes without prompting')
   .option('-v, --verbose', 'Show HTTP request details')
   .option('--domain <host>', 'Override domain')
+  .option('--no-migrate', 'Skip pending migrations for this invocation')
   .action(async (targetPath, options) => {
     try {
+      await runPendingMigrations(options);
       const client = new DboClient({ domain: options.domain, verbose: options.verbose });
       const config = await loadConfig();
 
@@ -36,6 +41,39 @@ export const diffCommand = new Command('diff')
 
       log.info(`Comparing ${metaFiles.length} record(s) against server...`);
 
+      // Batch-fetch server records via /api/app/object/ with UpdatedAfter
+      const ora = (await import('ora')).default;
+      let serverRecordsMap = new Map();
+      const appConfig = await loadAppConfig();
+      if (appConfig?.AppShortName) {
+        // Find oldest baseline _LastUpdated across all files to diff
+        const baseline = await loadAppJsonBaseline();
+        let oldestDate = null;
+        for (const metaPath of metaFiles) {
+          try {
+            const meta = JSON.parse(await readFile(metaPath, 'utf8'));
+            const uid = meta.UID || meta._id;
+            const entity = meta._entity;
+            if (!uid || !entity || !baseline) continue;
+            const entry = findBaselineEntry(baseline, entity, uid);
+            if (!entry?._LastUpdated) continue;
+            const d = new Date(entry._LastUpdated);
+            if (!isNaN(d) && (!oldestDate || d < oldestDate)) oldestDate = d;
+          } catch { /* skip unreadable */ }
+        }
+
+        if (oldestDate) {
+          const updatedAfter = oldestDate.toISOString();
+          const spinner = ora('Fetching server state for comparison...').start();
+          serverRecordsMap = await fetchServerRecordsBatch(client, appConfig.AppShortName, updatedAfter);
+          if (serverRecordsMap.size > 0) {
+            spinner.succeed(`Fetched ${serverRecordsMap.size} record(s) from server`);
+          } else {
+            spinner.warn('No server records returned');
+          }
+        }
+      }
+
       let updated = 0;
       let skipped = 0;
       let unchanged = 0;
@@ -45,7 +83,7 @@ export const diffCommand = new Command('diff')
       for (const metaPath of metaFiles) {
         const metaBase = basename(metaPath, '.metadata.json');
 
-        const result = await compareRecord(metaPath, client, config);
+        const result = await compareRecord(metaPath, config, serverRecordsMap);
 
         if (result.error) {
           log.warn(`${metaBase}: ${result.error}`);

package/src/commands/init.js

@@ -1,13 +1,14 @@
 import { Command } from 'commander';
-import { readdir, mkdir } from 'fs/promises';
+import { mkdir } from 'fs/promises';
 import { join } from 'path';
-import { isInitialized, hasLegacyConfig, readLegacyConfig, initConfig, saveCredentials, ensureGitignore, saveTransactionKeyPreset, saveTicketSuggestionOutput, loadConfig } from '../lib/config.js';
+import { isInitialized, hasLegacyConfig, readLegacyConfig, initConfig, saveCredentials, ensureGitignore, saveTransactionKeyPreset, saveTicketSuggestionOutput } from '../lib/config.js';
 import { installOrUpdateClaudeCommands } from './install.js';
 import { scaffoldProjectDirs, logScaffoldResult } from '../lib/scaffold.js';
-import { createDboignore, loadIgnore } from '../lib/ignore.js';
+import { createDboignore } from '../lib/ignore.js';
 import { log } from '../lib/logger.js';
 import { checkDomainChange, writeAppJsonDomain } from '../lib/domain-guard.js';
 import { performLogin } from './login.js';
+import { runPendingMigrations } from '../lib/migrations.js';
 
 export const initCommand = new Command('init')
   .description('Initialize DBO CLI configuration for the current directory')
@@ -23,10 +24,12 @@ export const initCommand = new Command('init')
   .option('--scaffold', 'Create standard project directories (app_version, automation, bins, …)')
   .option('--dboignore', 'Create or reset .dboignore to defaults (use with --force to overwrite)')
   .option('--media-placement <placement>', 'Set media placement when cloning: fullpath or binpath (default: bin)')
+  .option('--no-migrate', 'Skip pending migrations for this invocation')
   .action(async (options) => {
     // Merge --yes into nonInteractive
     if (options.yes) options.nonInteractive = true;
     try {
+      await runPendingMigrations(options);
       // --dboignore: standalone operation, works regardless of init state
       if (options.dboignore) {
         const created = await createDboignore(process.cwd(), { force: options.force });
@@ -40,13 +43,7 @@ export const initCommand = new Command('init')
 
       if (await isInitialized() && !options.force) {
         if (options.scaffold) {
-          // Try to pass app short name for media sub-directory creation
-          let shortName;
-          try {
-            const cfg = await loadConfig();
-            shortName = cfg.AppShortName;
-          } catch { /* no config yet */ }
-          const result = await scaffoldProjectDirs(process.cwd(), { appShortName: shortName });
+          const result = await scaffoldProjectDirs();
           logScaffoldResult(result);
           return;
         }
@@ -105,7 +102,7 @@ export const initCommand = new Command('init')
       }
 
       // Ensure sensitive files are gitignored
-      await ensureGitignore(['.dbo/credentials.json', '.dbo/cookies.txt', '.dbo/config.local.json', '.dbo/ticketing.local.json', 'trash/', 'Icon\\r']);
+      await ensureGitignore(['.dbo/credentials.json', '.dbo/cookies.txt', '.dbo/config.local.json', '.dbo/ticketing.local.json', '.dbo/errors.log', 'trash/', 'Icon\\r']);
 
       const createdIgnore = await createDboignore();
       if (createdIgnore) log.dim('  Created .dboignore');
@@ -124,59 +121,27 @@ export const initCommand = new Command('init')
         await performLogin(domain, username);
       }
 
-      // Prompt for TransactionKeyPreset
-      if (!options.nonInteractive) {
-        const inquirer = (await import('inquirer')).default;
-        const { preset } = await inquirer.prompt([{
-          type: 'list',
-          name: 'preset',
-          message: 'Which row key should the CLI use when building input expressions?',
-          choices: [
-            { name: 'RowUID (recommended — stable across domains)', value: 'RowUID' },
-            { name: 'RowID (numeric IDs)', value: 'RowID' },
-          ],
-        }]);
-        await saveTransactionKeyPreset(preset);
-        log.dim(`  TransactionKeyPreset: ${preset}`);
-      } else {
-        await saveTransactionKeyPreset('RowUID');
-      }
+      // TransactionKeyPreset — always RowUID (stable across domains)
+      await saveTransactionKeyPreset('RowUID');
+      log.dim('  TransactionKeyPreset: RowUID');
 
-      // Prompt for TicketSuggestionOutput
+      // TicketSuggestionOutput — auto-set default
       const DEFAULT_TICKET_SUGGESTION_OUTPUT = 'ojaie9t3o0kfvliahnuuda';
-      if (!options.nonInteractive) {
-        const inquirer = (await import('inquirer')).default;
-        const { ticketSuggestionOutput } = await inquirer.prompt([{
-          type: 'input',
-          name: 'ticketSuggestionOutput',
-          message: 'Output UID for ticket suggestions (leave blank to skip):',
-          default: DEFAULT_TICKET_SUGGESTION_OUTPUT,
-        }]);
-        const tsVal = ticketSuggestionOutput.trim();
-        if (tsVal) {
-          await saveTicketSuggestionOutput(tsVal);
-          log.dim(`  TicketSuggestionOutput: ${tsVal}`);
-        }
-      } else {
-        await saveTicketSuggestionOutput(DEFAULT_TICKET_SUGGESTION_OUTPUT);
-      }
+      await saveTicketSuggestionOutput(DEFAULT_TICKET_SUGGESTION_OUTPUT);
+      log.dim(`  TicketSuggestionOutput: ${DEFAULT_TICKET_SUGGESTION_OUTPUT}`);
 
       // ─── Scaffold ─────────────────────────────────────────────────────────────
-      let shouldScaffold = options.scaffold;
-
-      if (!shouldScaffold && !options.nonInteractive) {
-        const entries = await readdir(process.cwd(), { withFileTypes: true });
-        const ig = await loadIgnore();
-        const isEmpty = entries.every(e => ig.ignores(e.isDirectory() ? e.name + '/' : e.name));
-
-        const inquirer = (await import('inquirer')).default;
-        const { doScaffold } = await inquirer.prompt([{
-          type: 'confirm',
-          name: 'doScaffold',
-          message: 'Would you like to scaffold the standard project directory structure?',
-          default: isEmpty,
-        }]);
-        shouldScaffold = doScaffold;
+      // Auto-scaffold if standard directories don't exist yet
+      let shouldScaffold = true;
+
+      if (!options.scaffold && !options.nonInteractive) {
+        // Check if already scaffolded (bins/ exists = already done)
+        try {
+          const s = await (await import('fs/promises')).stat(join(process.cwd(), 'lib/bins'));
+          if (s.isDirectory()) shouldScaffold = false; // already scaffolded
+        } catch {
+          // bins/ doesn't exist — scaffold needed
+        }
       }
 
       if (shouldScaffold) {

package/src/commands/input.js

@@ -6,6 +6,7 @@ import { loadAppConfig } from '../lib/config.js';
 import { checkStoredTicket, clearGlobalTicket } from '../lib/ticketing.js';
 import { checkModifyKey, isModifyKeyError, handleModifyKeyError } from '../lib/modify-key.js';
 import { log } from '../lib/logger.js';
+import { runPendingMigrations } from '../lib/migrations.js';
 
 function collect(value, previous) {
   return previous.concat([value]);
@@ -25,8 +26,10 @@ export const inputCommand = new Command('input')
   .option('--jq <expr>', 'Filter JSON response with jq-like expression (implies --json)')
   .option('-v, --verbose', 'Show HTTP request details')
   .option('--domain <host>', 'Override domain')
+  .option('--no-migrate', 'Skip pending migrations for this invocation')
   .action(async (options) => {
     try {
+      await runPendingMigrations(options);
       const client = new DboClient({ domain: options.domain, verbose: options.verbose });
 
       const extraParams = {};
@@ -124,6 +127,7 @@ export const inputCommand = new Command('input')
           result = await client.postMultipart('/api/input/submit', fields, files);
         }
 
+        if (result.successful) await client.voidCache();
         formatResponse(result, { json: options.json, jq: options.jq, verbose: options.verbose });
         if (!result.successful) process.exit(1);
       } else {
@@ -153,6 +157,7 @@ export const inputCommand = new Command('input')
           result = await client.postUrlEncoded('/api/input/submit', body);
         }
 
+        if (result.successful) await client.voidCache();
         formatResponse(result, { json: options.json, jq: options.jq, verbose: options.verbose });
         if (!result.successful) process.exit(1);
       }

package/src/commands/login.js

@@ -42,7 +42,7 @@ export async function performLogin(domain, knownUsername) {
 
   // Fetch and store user info (non-critical)
   try {
-    const userResult = await client.get('/api/output/31799e38f0854956a47f10', { '_format': 'json_raw' });
+    const userResult = await client.get('/api/output/31799e38f0854956a47f10', { '_template': 'json_raw' });
     const userData = userResult.payload || userResult.data;
     const rows = Array.isArray(userData) ? userData : (userData?.Rows || userData?.rows || []);
     if (rows.length > 0) {
@@ -121,7 +121,7 @@ export const loginCommand = new Command('login')
 
         // Fetch current user info to store ID for future submissions
         try {
-          const userResult = await client.get('/api/output/31799e38f0854956a47f10', { '_format': 'json_raw' });
+          const userResult = await client.get('/api/output/31799e38f0854956a47f10', { '_template': 'json_raw' });
           const userData = userResult.payload || userResult.data;
           const rows = Array.isArray(userData) ? userData : (userData?.Rows || userData?.rows || []);
           if (rows.length > 0) {

package/src/commands/mv.js

@@ -13,6 +13,7 @@ import {
   BINS_DIR
 } from '../lib/structure.js';
 import { findMetadataFiles } from '../lib/diff.js';
+import { runPendingMigrations } from '../lib/migrations.js';
 
 export const mvCommand = new Command('mv')
   .description('Move files or bins to a new location and update metadata')
@@ -22,8 +23,10 @@ export const mvCommand = new Command('mv')
   .option('-v, --verbose', 'Show detailed operations')
   .option('--dry-run', 'Preview changes without executing')
   .option('-C, --confirm <value>', 'Commit changes (true|false)', 'true')
+  .option('--no-migrate', 'Skip pending migrations for this invocation')
   .action(async (source, destination, options) => {
     try {
+      await runPendingMigrations(options);
       // Only items inside Bins/ are moveable
       const relSource = isAbsolute(source) ? relative(process.cwd(), source) : source;
       const normalized = relSource.replace(/\/+$/, '');

package/src/commands/output.js

@@ -15,14 +15,13 @@ export const outputCommand = new Command('output')
   .option('-e, --entity <uid>', 'Query by entity UID')
   .option('--row <id>', 'Specific row ID')
   .option('--filter <expr>', 'Filter expression (repeatable)', collect, [])
-  .option('--format <type>', 'Output format: json, html, csv, xml, txt, pdf')
+  .option('--template <value>', 'Output template: json_raw (default), json_indented, json, html, csv, xml, txt, pdf, or a content UID')
   .option('--sort <expr>', 'Sort expression (repeatable)', collect, [])
   .option('--search <expr>', 'Full-text search')
   .option('--page <n>', 'Page number')
   .option('--rows-per-page <n>', 'Rows per page')
   .option('--maxrows <n>', 'Maximum rows')
   .option('--rows <range>', 'Row range (e.g., 1-10)')
-  .option('--template <value>', 'Custom template')
   .option('--debug', 'Include debug info')
   .option('--debug-sql', 'Include SQL debug info')
   .option('--debug-verbose', 'Verbose debug output')
@@ -30,7 +29,7 @@ export const outputCommand = new Command('output')
   .option('--limit <n>', 'Maximum rows to return (_limit)')
   .option('--rowcount <bool>', 'Include row count: true (default) or false for performance')
   .option('--display <expr>', 'Show/hide template tags (repeatable), e.g., "sidebar=hide"', collect, [])
-  .option('--format-values', 'Enable value formatting in json_raw output')
+  .option('--format-values', 'Enable value formatting with json_raw template')
   .option('--empty-response-code <code>', 'HTTP status code when output returns no results')
   .option('--fallback-content <expr>', 'Fallback content UID for error codes, e.g., "404=contentUID"')
   .option('--escape-html <bool>', 'Control HTML escaping: true or false')
@@ -75,13 +74,12 @@ export const outputCommand = new Command('output')
       }
 
       // Build query params — default to json_raw for normalized data
-      const params = { '_format': options.format || 'json_raw' };
+      const params = { '_template': options.template || 'json_raw' };
       if (options.search) params['_search'] = options.search;
       if (options.page) params['_page'] = options.page;
       if (options.rowsPerPage) params['_RowsPerPage'] = options.rowsPerPage;
       if (options.maxrows) params['_maxrows'] = options.maxrows;
       if (options.rows) params['_rows'] = options.rows;
-      if (options.template) params['_template'] = options.template;
       if (options.limit) params['_limit'] = options.limit;
       if (options.rowcount !== undefined) params['_rowcount'] = options.rowcount;
       if (options.debug) params['_debug'] = 'true';
@@ -142,9 +140,9 @@ export const outputCommand = new Command('output')
         params['_sort'] = options.sort;
       }
 
-      // For save mode or jq mode, force json_raw if user didn't set a custom format
-      if ((options.save || options.saveFilename || options.jq) && !options.format) {
-        params['_format'] = 'json_raw';
+      // For save mode or jq mode, force json_raw if user didn't set a custom template
+      if ((options.save || options.saveFilename || options.jq) && !options.template) {
+        params['_template'] = 'json_raw';
       }
 
       const result = await client.get(path, params);
@@ -171,8 +169,8 @@ export const outputCommand = new Command('output')
         return;
       }
 
-      // Default to colorized JSON when using json_raw (no explicit --format, --json, or --jq)
-      const jq = options.jq || (!options.format && !options.json ? '.' : undefined);
+      // Default to colorized JSON when using json_raw (no explicit --template, --json, or --jq)
+      const jq = options.jq || (!options.template && !options.json ? '.' : undefined);
       formatResponse(result, { json: options.json, jq, columns: options.columns });
       if (!result.successful && !result.ok) process.exit(1);
     } catch (err) {

package/src/commands/pull.js

@@ -4,11 +4,12 @@ import { join } from 'path';
 import chalk from 'chalk';
 import { performClone, resolveRecordPaths, resolveMediaPaths, resolveEntityDirPaths, resolveEntityFilter, buildOutputFilename } from './clone.js';
 import { loadConfig, loadClonePlacement } from '../lib/config.js';
-import { loadStructureFile, resolveBinPath, BINS_DIR, ENTITY_DIR_NAMES, EXTENSION_DESCRIPTORS_DIR, EXTENSION_UNSUPPORTED_DIR } from '../lib/structure.js';
+import { loadStructureFile, resolveBinPath, BINS_DIR, EXTENSION_DESCRIPTORS_DIR, EXTENSION_UNSUPPORTED_DIR, resolveEntityDirPath } from '../lib/structure.js';
 import { log } from '../lib/logger.js';
 import { formatError } from '../lib/formatter.js';
-import { getLocalSyncTime, isServerNewer } from '../lib/diff.js';
+import { getLocalSyncTime, isServerNewer, loadBaselineForComparison } from '../lib/diff.js';
 import { DboClient } from '../lib/client.js';
+import { runPendingMigrations } from '../lib/migrations.js';
 
 async function fileExists(path) {
   try { await access(path); return true; } catch { return false; }
@@ -117,10 +118,12 @@ async function dryRunScan(appJson, options) {
   const serverTz = config.ServerTimezone || 'America/Los_Angeles';
   const configWithTz = { ...config, ServerTimezone: serverTz };
 
+  // Pre-load baseline for fast _LastUpdated string comparison in isServerNewer
+  await loadBaselineForComparison();
+
   const structure = await loadStructureFile();
   const saved = await loadClonePlacement();
   const contentPlacement = saved.contentPlacement || 'bin';
-  const mediaPlacement = saved.mediaPlacement || 'bin';
 
   const entityFilter = resolveEntityFilter(options.entity);
 
@@ -138,7 +141,7 @@ async function dryRunScan(appJson, options) {
   // Scan media records
   if (!entityFilter || entityFilter.has('media')) {
     for (const record of (appJson.children.media || [])) {
-      const { metaPath } = resolveMediaPaths(record, structure, mediaPlacement);
+      const { metaPath } = resolveMediaPaths(record, structure);
       await scanRecord(record, metaPath, serverTz, configWithTz, counts, details, 'media');
     }
   }
@@ -156,13 +159,12 @@ async function dryRunScan(appJson, options) {
         const { metaPath } = resolveEntityDirPaths(entityName, record, dirName);
         await scanRecord(record, metaPath, serverTz, configWithTz, counts, details, entityName);
       }
-    } else if (ENTITY_DIR_NAMES.has(entityName)) {
+    } else {
       for (const record of entries) {
-        const { metaPath } = resolveEntityDirPaths(entityName, record, entityName);
+        const { metaPath } = resolveEntityDirPaths(entityName, record, resolveEntityDirPath(entityName));
         await scanRecord(record, metaPath, serverTz, configWithTz, counts, details, entityName);
       }
     }
-    // Generic entities in bins — skip for simplicity in dry-run (they use content placement)
   }
 
   // Scan output hierarchy (compound single-file format)
@@ -229,7 +231,7 @@ async function scanRecord(record, metaPath, _serverTz, configWithTz, counts, det
   }
 
   const localSyncTime = await getLocalSyncTime(metaPath);
-  if (record._LastUpdated && isServerNewer(localSyncTime, record._LastUpdated, configWithTz)) {
+  if (record._LastUpdated && isServerNewer(localSyncTime, record._LastUpdated, configWithTz, entityName, record.UID)) {
     counts.changed++;
     details.changed.push({ entity: entityName, name });
   } else {
@@ -258,8 +260,10 @@ export const pullCommand = new Command('pull')
   .option('--force', 'Force re-processing, skip change detection')
   .option('--descriptor-types <bool>', 'Sort extensions into descriptor sub-directories (default: true)', 'true')
   .option('--documentation-only', 'When used with -e extension, pull only documentation extensions')
+  .option('--no-migrate', 'Skip pending migrations for this invocation')
   .action(async (options) => {
     try {
+      await runPendingMigrations(options);
       const config = await loadConfig();
 
       if (!config.AppShortName) {