@dboio/cli 0.9.2 → 0.9.4

package/package.json

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

package/src/commands/push.js

@@ -15,7 +15,7 @@ import { stripUidFromFilename, renameToUidConvention, hasUidInFilename } from '.
 import { findMetadataFiles } from '../lib/diff.js';
 import { loadIgnore } from '../lib/ignore.js';
 import { detectChangedColumns, findBaselineEntry } from '../lib/delta.js';
-import { BINS_DIR } from '../lib/structure.js';
+import { BINS_DIR, ENTITY_DIR_NAMES } from '../lib/structure.js';
 
 /**
  * Resolve an @reference file path to an absolute filesystem path.
@@ -450,9 +450,10 @@ async function pushFromMetadata(meta, metaPath, client, options, changedColumns
     throw new Error(`No _entity found in ${metaPath}`);
   }
 
-  // Detect path mismatch
+  // Detect path mismatch (only for content, media, output, bin entities —
+  // entity-dir types use structural directories unrelated to server Path)
   if (meta.Path) {
-    await checkPathMismatch(meta, metaPath, options);
+    await checkPathMismatch(meta, metaPath, entity, options);
   }
 
   const dataExprs = [];
@@ -721,7 +722,12 @@ function normalizePathForComparison(localPath) {
 /**
  * Detect if a file has been moved to a different directory than its metadata Path suggests
  */
-async function checkPathMismatch(meta, metaPath, options) {
+async function checkPathMismatch(meta, metaPath, entity, options) {
+  // Skip entity-dir types (extension, site, group, etc.) — their local
+  // directory placement is structural and unrelated to the server Path column.
+  // Only compare paths for content, media, output, and bin-placed entities.
+  if (ENTITY_DIR_NAMES.has(entity)) return;
+
   const metaDir = dirname(metaPath);
   const metaBase = basename(metaPath, '.metadata.json');
 
@@ -738,8 +744,12 @@ async function checkPathMismatch(meta, metaPath, options) {
 
   if (!contentFileName) return;
 
-  // Compute the current path based on where the file actually is
-  const currentFilePath = join(metaDir, contentFileName);
+  // Compute the current path based on where the file actually is.
+  // Strip the ~UID from the filename — the metadata Path is the canonical
+  // server path and never contains the local ~UID suffix.
+  const uid = meta.UID;
+  const serverFileName = uid ? stripUidFromFilename(contentFileName, uid) : contentFileName;
+  const currentFilePath = join(metaDir, serverFileName);
   const currentRelPath = relative(process.cwd(), currentFilePath);
 
   // Normalize both paths for comparison