@dboio/cli 0.15.0 → 0.15.2

package/package.json

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

package/plugins/claude/dbo/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "dbo",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "DBO.io CLI integration for Claude Code",
   "author": {
     "name": "DBO.io"

package/src/commands/push.js

@@ -20,17 +20,7 @@ import { BINS_DIR, ENTITY_DIR_NAMES, loadStructureFile, findBinByPath } from '..
 import { ensureTrashIcon, setFileTag } from '../lib/tagging.js';
 import { checkToeStepping } from '../lib/toe-stepping.js';
 import { runPendingMigrations } from '../lib/migrations.js';
-import { findUnaddedFiles, detectBinFile, submitAdd } from './add.js';
-
-function _getMetaCompanionPaths(meta, metaPath) {
-  const dir = dirname(metaPath);
-  const paths = [];
-  for (const col of (meta._contentColumns || [])) {
-    const ref = meta[col];
-    if (ref && String(ref).startsWith('@')) paths.push(join(dir, String(ref).substring(1)));
-  }
-  return paths;
-}
+// AUTO-ADD DISABLED: import { findUnaddedFiles, detectBinFile, submitAdd } from './add.js';
 
 /**
  * Resolve an @reference file path to an absolute filesystem path.
@@ -96,7 +86,7 @@ export const pushCommand = new Command('push')
       const transactionKey = await resolveTransactionKey(options);
 
       // Process pending deletions from synchronize.json
-      await processPendingDeletes(client, options, modifyKey, transactionKey);
+      const deletedCount = await processPendingDeletes(client, options, modifyKey, transactionKey) || 0;
 
       // ── Resolution order ──────────────────────────────────────────
       // 1. Commas → UID list
@@ -135,7 +125,7 @@ export const pushCommand = new Command('push')
             log.dim(`  Found: ${relative(process.cwd(), resolved)}`);
             const resolvedStat = await stat(resolved);
             if (resolvedStat.isDirectory()) {
-              await pushDirectory(resolved, client, options, modifyKey, transactionKey);
+              await pushDirectory(resolved, client, options, modifyKey, transactionKey, deletedCount);
             } else {
               await pushSingleFile(resolved, client, options, modifyKey, transactionKey);
             }
@@ -156,7 +146,7 @@ export const pushCommand = new Command('push')
       }
 
       if (pathStat.isDirectory()) {
-        await pushDirectory(targetPath, client, options, modifyKey, transactionKey);
+        await pushDirectory(targetPath, client, options, modifyKey, transactionKey, deletedCount);
       } else {
         await pushSingleFile(targetPath, client, options, modifyKey, transactionKey);
       }
@@ -171,18 +161,27 @@ export const pushCommand = new Command('push')
  */
 async function processPendingDeletes(client, options, modifyKey = null, transactionKey = 'RowUID') {
   const sync = await loadSynchronize();
-  if (!sync.delete || sync.delete.length === 0) return;
+  if (!sync.delete || sync.delete.length === 0) return 0;
 
   log.info(`Processing ${sync.delete.length} pending deletion(s)...`);
 
   const remaining = [];
   const deletedUids = [];
 
+  // Load stored ticket once for all deletions (same as main push loop)
+  const { getGlobalTicket, getRecordTicket } = await import('../lib/ticketing.js');
+  const globalTicket = !options.ticket ? await getGlobalTicket() : null;
+
   for (const entry of sync.delete) {
     log.info(`Deleting "${entry.name}" (${entry.entity}:${entry.RowID})`);
 
     const extraParams = { '_confirm': options.confirm || 'true' };
-    if (options.ticket) extraParams['_OverrideTicketID'] = options.ticket;
+    if (options.ticket) {
+      extraParams['_OverrideTicketID'] = options.ticket;
+    } else {
+      const ticket = await getRecordTicket(entry.UID) || globalTicket;
+      if (ticket) extraParams['_OverrideTicketID'] = ticket;
+    }
     if (modifyKey) extraParams['_modify_key'] = modifyKey;
     const cachedUser2 = getSessionUserOverride();
     if (cachedUser2) extraParams['_OverrideUserID'] = cachedUser2;
@@ -244,6 +243,8 @@ async function processPendingDeletes(client, options, modifyKey = null, transact
   if (remaining.length > 0) {
     log.warn(`${remaining.length} deletion(s) failed and remain staged.`);
   }
+
+  return deletedUids.length;
 }
 
 /**
@@ -343,27 +344,12 @@ async function pushSingleFile(filePath, client, options, modifyKey = null, trans
       try { meta = JSON.parse(await readFile(metaPath, 'utf8')); } catch {}
     }
     if (!meta) {
-      // Try auto-detecting as a bin content/media file and add it first
-      const binMeta = await detectBinFile(filePath);
-      if (binMeta) {
-        log.info(`No metadata found — auto-adding "${basename(filePath)}" first`);
-        try {
-          await submitAdd(binMeta.meta, binMeta.metaPath, filePath, client, options);
-          // After successful add, re-read the metadata (now has UID)
-          metaPath = binMeta.metaPath;
-          // The metadata file may have been renamed with ~UID, so scan for it
-          const updatedMeta = await findMetadataForCompanion(filePath);
-          if (updatedMeta) metaPath = updatedMeta;
-          meta = JSON.parse(await readFile(metaPath, 'utf8'));
-          log.info(`Successfully added — now pushing updates`);
-        } catch (err) {
-          log.error(`Auto-add failed for "${basename(filePath)}": ${err.message}`);
-          process.exit(1);
-        }
-      } else {
-        log.error(`No metadata found for "${basename(filePath)}". Pull the record first with "dbo pull".`);
-        process.exit(1);
-      }
+      // AUTO-ADD DISABLED: local-file-first approach is being replaced by server-first workflow.
+      // New records should be created via the DBO REST API first, then `dbo pull` to populate locally.
+      // The auto-add code (detectBinFile + submitAdd) has been commented out intentionally.
+      // See: .claude/2_specs/auto-deploy-config-generation.md — "server-first approach"
+      log.error(`No metadata found for "${basename(filePath)}". Create the record on the server first, then run "dbo pull".`);
+      process.exit(1);
     }
   }
 
@@ -473,61 +459,16 @@ async function ensureManifestMetadata() {
 /**
  * Push all records found in a directory (recursive)
  */
-async function pushDirectory(dirPath, client, options, modifyKey = null, transactionKey = 'RowUID') {
+async function pushDirectory(dirPath, client, options, modifyKey = null, transactionKey = 'RowUID', deletedCount = 0) {
   // Auto-create manifest.metadata.json if manifest.json exists at root without companion metadata
   await ensureManifestMetadata();
 
-  // ── Auto-add: detect un-added files and create+submit them before push ──
-  const ig = await loadIgnore();
-  const justAddedUIDs = new Set(); // Track UIDs added in this invocation — skip from push loop
-
-  const unadded = await findUnaddedFiles(dirPath, ig);
-  if (unadded.length > 0) {
-    // Filter to files that detectBinFile can auto-classify (content/media in bins)
-    const autoAddable = [];
-    for (const filePath of unadded) {
-      const binMeta = await detectBinFile(filePath);
-      if (binMeta) autoAddable.push({ filePath, ...binMeta });
-    }
-
-    if (autoAddable.length > 0) {
-      log.info(`Found ${autoAddable.length} new file(s) to add before push:`);
-      for (const { filePath } of autoAddable) {
-        log.plain(`  ${relative(process.cwd(), filePath)}`);
-      }
-
-      const doAdd = async () => {
-        for (const { meta, metaPath, filePath } of autoAddable) {
-          try {
-            await submitAdd(meta, metaPath, filePath, client, options);
-            // After submitAdd, meta.UID is set if successful
-            if (meta.UID) justAddedUIDs.add(meta.UID);
-          } catch (err) {
-            log.error(`Failed to add ${relative(process.cwd(), filePath)}: ${err.message}`);
-          }
-        }
-      };
-
-      if (!options.yes) {
-        const inquirer = (await import('inquirer')).default;
-        const { proceed } = await inquirer.prompt([{
-          type: 'confirm',
-          name: 'proceed',
-          message: `Add ${autoAddable.length} file(s) to the server before pushing?`,
-          default: true,
-        }]);
-        if (!proceed) {
-          log.dim('Skipping auto-add — continuing with push');
-        } else {
-          await doAdd();
-        }
-      } else {
-        await doAdd();
-      }
-      if (justAddedUIDs.size > 0) log.plain('');
-    }
-  }
+  // AUTO-ADD DISABLED: local-file-first approach is being replaced by server-first workflow.
+  // New records should be created via the DBO REST API first, then `dbo pull` to populate locally.
+  // The auto-add code (findUnaddedFiles + detectBinFile + submitAdd) has been commented out.
+  // See: .claude/2_specs/auto-deploy-config-generation.md — "server-first approach"
 
+  const ig = await loadIgnore();
   const metaFiles = await findMetadataFiles(dirPath, ig);
 
   // ── Load scripts config early (before delta detection) ──────────────
@@ -614,16 +555,16 @@ async function pushDirectory(dirPath, client, options, modifyKey = null, transac
       continue;
     }
 
-    // Skip records that were just auto-added in this invocation — they're already on the server
-    if (meta.UID && justAddedUIDs.has(meta.UID)) {
-      log.dim(`  Skipped (just added): ${basename(metaPath)}`);
-      continue;
-    }
+    // AUTO-ADD DISABLED: justAddedUIDs skip removed (server-first workflow)
 
-    // Compound output files: handle root + all inline children together
-    // These have _entity='output' and inline children under .children
-    if (meta._entity === 'output' && meta.children) {
-      outputCompoundFiles.push({ meta, metaPath });
+    // Output hierarchy entities: only push compound output files (root with inline children).
+    // Flat output metadata without .children are skipped — they are pushed as part of
+    // their parent compound file, or via `dbo deploy`. Never as standalone records.
+    if (meta._entity === 'output' || meta._entity === 'output_value'
+        || meta._entity === 'output_value_filter' || meta._entity === 'output_value_entity_column_rel') {
+      if (meta._entity === 'output' && meta.children) {
+        outputCompoundFiles.push({ meta, metaPath });
+      }
       continue;
     }
 
@@ -719,23 +660,44 @@ async function pushDirectory(dirPath, client, options, modifyKey = null, transac
     }
   } catch { /* structure file missing or bin lookup failed — skip */ }
 
-  if (toPush.length === 0 && outputCompoundFiles.length === 0 && binPushItems.length === 0) {
-    if (metaFiles.length === 0) {
+  // Pre-filter compound output files: run delta detection early so unchanged outputs
+  // are excluded from the record count and ticket prompt (avoids false-positive prompts).
+  const outputsWithChanges = [];
+  for (const item of outputCompoundFiles) {
+    if (baseline) {
+      try {
+        const delta = await detectOutputChanges(item.metaPath, baseline);
+        const totalChanges = delta.root.length +
+          (delta.children ? Object.values(delta.children).reduce((s, c) => s + c.length, 0) : 999);
+        if (totalChanges === 0) {
+          log.dim(`  Skipping ${basename(item.metaPath)} — no changes detected`);
+          skipped++;
+          continue;
+        }
+      } catch { /* delta detection failed — include in push for safety */ }
+    }
+    outputsWithChanges.push(item);
+  }
+
+  if (toPush.length === 0 && outputsWithChanges.length === 0 && binPushItems.length === 0) {
+    if (metaFiles.length === 0 && deletedCount === 0) {
       log.warn(`No .metadata.json files found in "${dirPath}".`);
+    } else if (deletedCount > 0) {
+      log.info(`${deletedCount} deletion(s) processed. No other changes to push.`);
     } else {
       log.info('No changes to push');
     }
     return;
   }
 
-  log.info(`Found ${metaFiles.length} record(s) to push`);
+  log.info(`Found ${toPush.length + outputsWithChanges.length + binPushItems.length} record(s) to push`);
 
   // Pre-flight ticket validation (only if no --ticket flag)
-  const totalRecords = toPush.length + outputCompoundFiles.length + binPushItems.length;
+  const totalRecords = toPush.length + outputsWithChanges.length + binPushItems.length;
   if (!options.ticket && totalRecords > 0) {
     const recordSummary = [
       ...toPush.map(r => { const p = parseMetaFilename(basename(r.metaPath)); return p ? p.naturalBase : basename(r.metaPath, '.metadata.json'); }),
-      ...outputCompoundFiles.map(r => basename(r.metaPath, '.json')),
+      ...outputsWithChanges.map(r => basename(r.metaPath, '.json')),
       ...binPushItems.map(r => `bin:${r.meta.Name}`),
     ].join(', ');
     const ticketCheck = await checkStoredTicket(options, `${totalRecords} record(s): ${recordSummary}`);
@@ -835,8 +797,8 @@ async function pushDirectory(dirPath, client, options, modifyKey = null, transac
     }
   }
 
-  // Process compound output files (root + inline children)
-  for (const { meta, metaPath } of outputCompoundFiles) {
+  // Process compound output files (root + inline children) — already pre-filtered for changes
+  for (const { meta, metaPath } of outputsWithChanges) {
     try {
       const result = await pushOutputCompound(meta, metaPath, client, options, baseline, modifyKey, transactionKey);
       if (result.pushed > 0) {
@@ -878,11 +840,9 @@ async function pushDirectory(dirPath, client, options, modifyKey = null, transac
     await updateBaselineAfterPush(baseline, successfulPushes);
   }
 
-  // Re-tag successfully pushed files as Synced (best-effort)
-  for (const { meta, metaPath } of successfulPushes) {
-    for (const filePath of _getMetaCompanionPaths(meta, metaPath)) {
-      setFileTag(filePath, 'synced').catch(() => {});
-    }
+  // Re-tag successfully pushed metadata files as Synced (best-effort)
+  for (const { metaPath } of successfulPushes) {
+    setFileTag(metaPath, 'synced').catch(() => {});
   }
 
   log.info(`Push complete: ${succeeded} succeeded, ${failed} failed, ${skipped} skipped`);

package/src/lib/tagging.js

@@ -80,12 +80,15 @@ export async function tagProjectFiles(options = {}) {
   const counts = { synced: 0, modified: 0, untracked: 0, conflict: 0, trashed: 0 };
 
   if (clearAll) {
-    const companions = (await Promise.all(metaPaths.map(mp => _getCompanionPaths(mp)))).flat();
-    await _bulkApplyTags(companions.map(fp => ({ filePath: fp, clear: true })));
+    // Clear tags from ALL files in the project: metadata, companions, and any
+    // legacy-tagged content files (from old untracked detection).
+    const contentFiles = await _collectContentFiles(dir, ig);
+    const allFiles = [...metaPaths, ...contentFiles];
+    await _bulkApplyTags(allFiles.map(fp => ({ filePath: fp, clear: true })));
     return null;
   }
-
-  // Collect file→status pairs from metadata
+  // Tag metadata files — the source of truth for sync status.
+  // Companion files are dependent artifacts and should not carry their own tags.
   const toTag = [];
   for (const metaPath of metaPaths) {
     const inTrash = metaPath.replace(/\\/g, '/').includes('/trash/');
@@ -93,20 +96,9 @@ export async function tagProjectFiles(options = {}) {
       ? 'trashed'
       : (await hasLocalModifications(metaPath, config).catch(() => false)) ? 'modified'
       : 'synced';
-    const companions = await _getCompanionPaths(metaPath);
-    for (const filePath of companions) {
-      toTag.push({ filePath, status });
-      counts[status]++;
-      if (verbose) console.log(`  ${status.padEnd(10)} ${relative(dir, filePath)}`);
-    }
-  }
-
-  // Detect untracked files (content files without any metadata)
-  const untrackedFiles = await _findUntrackedFiles(dir, ig, metaPaths);
-  for (const filePath of untrackedFiles) {
-    toTag.push({ filePath, status: 'untracked' });
-    counts.untracked++;
-    if (verbose) console.log(`  untracked  ${relative(dir, filePath)}`);
+    toTag.push({ filePath: metaPath, status });
+    counts[status]++;
+    if (verbose) console.log(`  ${status.padEnd(10)} ${relative(dir, metaPath)}`);
   }
 
   await _bulkApplyTags(toTag);
@@ -132,6 +124,11 @@ async function _getCompanionPaths(metaPath) {
         try { await stat(candidate); paths.push(candidate); } catch { /* missing */ }
       }
     }
+    // Check _mediaFile (single media companion reference)
+    if (meta._mediaFile && String(meta._mediaFile).startsWith("@")) {
+      const candidate = join(dir, String(meta._mediaFile).substring(1));
+      try { await stat(candidate); paths.push(candidate); } catch { /* missing */ }
+    }
     for (const col of (meta._mediaColumns || [])) {
       const ref = meta[col];
       if (ref && String(ref).startsWith('@')) {