@dboio/cli 0.15.1 → 0.15.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dboio/cli",
-  "version": "0.15.1",
+  "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

@@ -22,16 +22,6 @@ import { checkToeStepping } from '../lib/toe-stepping.js';
 import { runPendingMigrations } from '../lib/migrations.js';
 // AUTO-ADD DISABLED: 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;
-}
-
 /**
  * Resolve an @reference file path to an absolute filesystem path.
  * "@filename.ext"         → relative to the metadata file's directory (existing behaviour)
@@ -850,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('@')) {