@dboio/cli 0.20.0 → 0.20.4

package/src/lib/toe-stepping.js

@@ -1,11 +1,11 @@
 import chalk from 'chalk';
 import { dirname, basename, join } from 'path';
-import { readFile } from 'fs/promises';
-import { findBaselineEntry, shouldSkipColumn, normalizeValue, isReference, resolveReferencePath } from './delta.js';
+import { readFile, writeFile } from 'fs/promises';
+import { findBaselineEntry, shouldSkipColumn, normalizeValue, isReference, resolveReferencePath, saveBaseline } from './delta.js';
 import { resolveContentValue } from '../commands/clone.js';
 import { computeLineDiff, formatDiff } from './diff.js';
 import { parseMetaFilename } from './filenames.js';
-import { parseServerDate } from './timestamps.js';
+import { parseServerDate, setFileTimestamps } from './timestamps.js';
 import { log } from './logger.js';
 
 /**
@@ -335,6 +335,7 @@ export async function checkToeStepping(records, client, baseline, options, appSh
   let skippedUIDs = new Set();
   let bulkAction = null; // 'push_all' | 'skip_all'
   let hasConflicts = false;
+  let baselineModified = false;
 
   for (const { meta, metaPath } of records) {
     const uid = meta.UID;
@@ -381,6 +382,14 @@ export async function checkToeStepping(records, client, baseline, options, appSh
     if (options.yes || bulkAction === 'push_all') {
       continue; // push this record
     }
+    if (bulkAction === 'pull_all') {
+      await applyServerToLocal(serverEntry, meta, metaPath, serverTz);
+      _updateBaselineEntry(baseline, entity, uid, serverEntry);
+      baselineModified = true;
+      log.success(`  Pulled server version of "${label}" to local`);
+      skippedUIDs.add(uid);
+      continue;
+    }
     if (bulkAction === 'skip_all') {
       skippedUIDs.add(uid);
       continue;
@@ -395,9 +404,11 @@ export async function checkToeStepping(records, client, baseline, options, appSh
         message: `"${label}" has server changes. How to proceed?`,
         choices: [
           { name: 'Push anyway (overwrite server changes)', value: 'push' },
+          { name: 'Pull from server (overwrite local changes)', value: 'pull' },
           { name: 'Compare differences', value: 'compare' },
           { name: 'Skip this record', value: 'skip' },
           { name: 'Push all remaining (overwrite all)', value: 'push_all' },
+          { name: 'Pull all remaining (overwrite all local)', value: 'pull_all' },
           { name: 'Skip all remaining', value: 'skip_all' },
           { name: 'Cancel entire push', value: 'cancel' },
         ],
@@ -414,6 +425,14 @@ export async function checkToeStepping(records, client, baseline, options, appSh
       log.info('Push cancelled. Run "dbo pull" to fetch server changes first.');
       return false;
     }
+    if (action === 'pull' || action === 'pull_all') {
+      await applyServerToLocal(serverEntry, meta, metaPath, serverTz);
+      _updateBaselineEntry(baseline, entity, uid, serverEntry);
+      baselineModified = true;
+      log.success(`  Pulled server version of "${label}" to local`);
+      skippedUIDs.add(uid);
+      if (action === 'pull_all') bulkAction = 'pull_all';
+    }
     if (action === 'skip' || action === 'skip_all') {
       skippedUIDs.add(uid);
       if (action === 'skip_all') bulkAction = 'skip_all';
@@ -423,6 +442,12 @@ export async function checkToeStepping(records, client, baseline, options, appSh
     }
   }
 
+  if (baselineModified) {
+    try {
+      await saveBaseline(baseline);
+    } catch { /* non-critical — next push will re-detect */ }
+  }
+
   if (!hasConflicts) return true;
 
   // Return skipped UIDs so the caller can filter them out
@@ -496,3 +521,78 @@ async function showPushDiff(serverEntry, localMeta, metaPath) {
 
   log.plain('');
 }
+
+/**
+ * Update the in-memory baseline entry for a record with the server's current
+ * values. Called after pulling from server so the next toe-stepping check
+ * sees the pulled state as the new baseline and does not re-raise the conflict.
+ *
+ * @param {Object} baseline    - Loaded baseline object (mutated in place)
+ * @param {string} entity      - Entity type (e.g., "content")
+ * @param {string} uid         - Record UID
+ * @param {Object} serverEntry - Live server record
+ */
+function _updateBaselineEntry(baseline, entity, uid, serverEntry) {
+  if (!baseline?.children) return;
+  const arr = baseline.children[entity];
+  if (!Array.isArray(arr)) return;
+  const idx = arr.findIndex(e => e.UID === uid);
+  if (idx < 0) return;
+
+  const SKIP = new Set(['_entity', '_companionReferenceColumns', '_contentColumns',
+    '_mediaFile', '_pathConfirmed', 'children', '_id']);
+  for (const [col, rawVal] of Object.entries(serverEntry)) {
+    if (SKIP.has(col)) continue;
+    const decoded = resolveContentValue(rawVal);
+    arr[idx][col] = decoded !== null ? decoded : rawVal;
+  }
+}
+
+/**
+ * Overwrite local metadata and companion content files with server values.
+ *
+ * Called when the user chooses "Pull from server" during conflict resolution.
+ * Updates:
+ *   - companion content files (columns listed in _companionReferenceColumns)
+ *   - all non-system metadata fields
+ *   - _LastUpdated / _CreatedOn timestamps in the metadata JSON
+ *   - file timestamps on both the metadata file and any companion files
+ *
+ * @param {Object} serverEntry - Live server record (from fetchServerRecord*)
+ * @param {Object} localMeta   - Currently loaded metadata object
+ * @param {string} metaPath    - Absolute path to the .metadata.json file
+ * @param {string} [serverTz]  - Server timezone string (e.g. "America/Chicago")
+ */
+async function applyServerToLocal(serverEntry, localMeta, metaPath, serverTz) {
+  const metaDir = dirname(metaPath);
+  const companions = new Set(localMeta._companionReferenceColumns || []);
+
+  // Write companion content files from server values
+  for (const col of companions) {
+    const ref = localMeta[col];
+    if (!ref || !String(ref).startsWith('@')) continue;
+    const filePath = join(metaDir, String(ref).substring(1));
+    const serverValue = resolveContentValue(serverEntry[col]);
+    if (serverValue !== null) {
+      await writeFile(filePath, serverValue, 'utf8');
+      try {
+        await setFileTimestamps(filePath, serverEntry._CreatedOn, serverEntry._LastUpdated, serverTz);
+      } catch { /* non-critical */ }
+    }
+  }
+
+  // Merge non-system, non-companion server columns into localMeta
+  const skipMeta = new Set(['_entity', '_companionReferenceColumns', '_contentColumns', '_mediaFile',
+    '_pathConfirmed', 'children', '_id']);
+  for (const [col, rawVal] of Object.entries(serverEntry)) {
+    if (skipMeta.has(col)) continue;
+    if (companions.has(col)) continue; // companion already handled as a file
+    const decoded = resolveContentValue(rawVal);
+    localMeta[col] = decoded !== null ? decoded : rawVal;
+  }
+
+  await writeFile(metaPath, JSON.stringify(localMeta, null, 2) + '\n');
+  try {
+    await setFileTimestamps(metaPath, serverEntry._CreatedOn, serverEntry._LastUpdated, serverTz);
+  } catch { /* non-critical */ }
+}