@dboio/cli 0.11.3 → 0.11.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dboio/cli",
-  "version": "0.11.3",
+  "version": "0.11.4",
   "description": "CLI for the DBO.io framework",
   "type": "module",
   "bin": {

package/src/lib/client.js

@@ -124,15 +124,12 @@ export class DboClient {
   }
 
   /**
-   * Clear the server-side cache so that subsequent GET requests return fresh data.
-   * Called before comparison fetches (toe-stepping, diff) and after POST submissions.
+   * No-op placeholder. Server-side cache voiding (/?voidcache=true) has been
+   * disabled as it was causing server issues. Callers remain unchanged so the
+   * hook can be re-enabled later if needed.
    */
   async voidCache() {
-    try {
-      const baseUrl = await this.getBaseUrl();
-      if (this.verbose) log.verbose(`VoidCache: ${baseUrl}/?voidcache=true`);
-      await this.request('/?voidcache=true');
-    } catch { /* best-effort — don't block on failure */ }
+    // intentionally empty
   }
 
   /**

package/src/lib/toe-stepping.js

@@ -14,6 +14,14 @@ import { log } from './logger.js';
  */
 const DIFF_ALLOW = new Set(['_LastUpdated', '_LastUpdatedUserID']);
 
+/**
+ * Metadata-only columns that don't represent real user edits.
+ * When the server diff contains ONLY these columns, the conflict is
+ * considered a timestamp-only change and is silently resolved by accepting
+ * the server values without prompting the user.
+ */
+const METADATA_ONLY_COLS = new Set(['_LastUpdated', '_LastUpdatedUserID', '_children']);
+
 /**
  * Fetch a single record from the server by entity name + row UID.
  *
@@ -348,12 +356,19 @@ export async function checkToeStepping(records, client, baseline, options, appSh
     if (isNaN(serverDate) || isNaN(baselineDate)) continue; // unparseable — skip
     if (serverDate <= baselineDate) continue; // server is same or older — no conflict
 
-    hasConflicts = true;
-
     // Conflict detected: server changed since our baseline
     const metaDir = dirname(metaPath);
     const label = basename(metaPath, '.metadata.json');
     const diffColumns = await buildRecordDiff(serverEntry, baselineEntry, meta, metaDir);
+
+    // If the only server-side changes are metadata columns (_LastUpdated,
+    // _LastUpdatedUserID) with no real data edits, silently accept the
+    // server timestamps — no conflict to resolve.
+    const realChanges = diffColumns.filter(d => !METADATA_ONLY_COLS.has(d.col));
+    if (realChanges.length === 0) continue;
+
+    hasConflicts = true;
+
     const serverUser = serverEntry._LastUpdatedUserID || 'unknown';
 
     displayConflict(label, serverUser, serverTs, diffColumns);