@biffo/cli 0.298.6 → 0.298.8

package/dist/index.js

@@ -813,6 +813,9 @@ async function classify(path, base, ours, theirs, opts, mergeFile, isDeclaredDiv
   const inOurs = ours.has(path);
   const inTheirs = theirs.has(path);
   if (!inBase && !inTheirs) {
+    if (isDeclaredDivergent(path)) {
+      return { path, status: "keep-ours", conflicted: false, orphaned: false };
+    }
     return { path, status: "keep-ours", conflicted: false, orphaned: true };
   }
   if (!inBase && inTheirs) {
@@ -12151,13 +12154,20 @@ function findWorkflowFiles(repoRoot) {
       return;
     }
     for (const entry of entries) {
-      if (entry === "node_modules" || entry === ".git" || entry === ".worktrees") continue;
+      if (entry === "node_modules" || entry === ".git" || entry === ".worktrees" || entry === ".venv")
+        continue;
       if (entry === ".github" && relative11.startsWith("services/") && vendoredPluginDirs.has(relative11.slice("services/".length))) {
         continue;
       }
       const full = join49(dir, entry);
       const rel = relative11 ? `${relative11}/${entry}` : entry;
-      if (statSync13(full).isDirectory()) {
+      let isDir;
+      try {
+        isDir = statSync13(full).isDirectory();
+      } catch {
+        continue;
+      }
+      if (isDir) {
         walk2(full, rel);
       } else if (/\.ya?ml$/.test(entry) && relative11.endsWith(".github/workflows")) {
         found.push(rel);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@biffo/cli",
-  "version": "0.298.6",
+  "version": "0.298.8",
   "description": "Biffo project scaffolding CLI",
   "license": "MIT",
   "type": "module",