@dboio/cli 0.9.5 → 0.9.8

package/package.json

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

package/src/commands/clone.js

@@ -2533,12 +2533,9 @@ async function processRecord(entityName, record, structure, options, usedNames,
     meta._contentColumns = ['Content'];
   }
 
-  // If the extension picker chose an extension (record.Extension was null),
-  // set it in metadata only — not in the record — so the baseline preserves
-  // the server's null and push detects the change.
-  if (ext && !record.Extension) {
-    meta.Extension = ext;
-  }
+  // Extension was derived from Name/Path for local filename purposes only.
+  // Do NOT write it to metadata or baseline when the server doesn't have it —
+  // this prevents delta detection from flagging a false change on push.
 
   await writeFile(metaPath, JSON.stringify(meta, null, 2) + '\n');
   log.dim(`  → ${metaPath}`);

package/src/lib/delta.js

@@ -48,12 +48,31 @@ export function findBaselineEntry(baseline, entity, uid) {
     return null;
   }
 
+  // Check top-level array first
   const entityArray = baseline.children[entity];
-  if (!Array.isArray(entityArray)) {
-    return null;
+  if (Array.isArray(entityArray)) {
+    const found = entityArray.find(item => item.UID === uid);
+    if (found) return found;
+  }
+
+  // For output hierarchy entities (output_value, output_value_filter,
+  // output_value_entity_column_rel), also search nested inside each
+  // output record's .children — server nests them per-output.
+  if (entity !== 'output') {
+    const outputs = baseline.children.output;
+    if (Array.isArray(outputs)) {
+      for (const o of outputs) {
+        if (!o.children) continue;
+        const nested = o.children[entity];
+        if (Array.isArray(nested)) {
+          const found = nested.find(item => item.UID === uid);
+          if (found) return found;
+        }
+      }
+    }
   }
 
-  return entityArray.find(item => item.UID === uid) || null;
+  return null;
 }
 
 /**
@@ -127,6 +146,13 @@ export async function detectChangedColumns(metaPath, baseline) {
       const baselineValue = normalizeValue(baselineEntry[columnName]);
 
       if (currentValue !== baselineValue) {
+        // Skip Extension column when baseline is null/empty — clone derives
+        // it from the filename for local use but it's not a user change.
+        if (columnName === 'Extension'
+            && !baselineValue
+            && (baselineEntry[columnName] === null || baselineEntry[columnName] === undefined)) {
+          continue;
+        }
         changedColumns.push(columnName);
       }
     }
@@ -183,13 +209,17 @@ function isReference(value) {
 
 /**
  * Resolve a @reference path to absolute file path.
+ * @/ prefix means relative to project root (cwd), plain @ is relative to baseDir.
  *
- * @param {string} reference - Reference string starting with @ (e.g., "@file.html")
+ * @param {string} reference - Reference string starting with @ (e.g., "@file.html" or "@/docs/file.md")
  * @param {string} baseDir - Base directory containing metadata
  * @returns {string} - Absolute file path
  */
 function resolveReferencePath(reference, baseDir) {
   const refPath = reference.substring(1); // Strip leading @
+  if (refPath.startsWith('/')) {
+    return join(process.cwd(), refPath);
+  }
   return join(baseDir, refPath);
 }