@biffo/cli 0.199.1 → 0.199.2

package/dist/index.js

@@ -216,6 +216,34 @@ function latestCoreVersionFromTags(repo, git = defaultTagRunner, options = {}) {
 var CORE_TAG_PREFIX = "core-v";
 var defaultTagRunner = (args) => execFileSync("git", args, { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] });
 
+// src/lib/git-tracked-files.ts
+import { execFileSync as execFileSync2 } from "child_process";
+import { realpathSync } from "fs";
+var defaultGit = (args) => execFileSync2("git", args, { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] });
+function gitTrackedFiles(root, git = defaultGit) {
+  let top;
+  try {
+    top = git(["-C", root, "rev-parse", "--show-toplevel"]).trim();
+  } catch {
+    return null;
+  }
+  if (!top) return null;
+  try {
+    if (realpathSync(top) !== realpathSync(root)) return null;
+  } catch {
+    return null;
+  }
+  let out;
+  try {
+    out = git(["-C", root, "ls-files", "-z"]);
+  } catch {
+    return null;
+  }
+  const files = out.split("\0").filter((p) => p !== "");
+  if (files.length === 0) return null;
+  return new Set(files);
+}
+
 // src/lib/core-manifest.ts
 var CORE_MANIFEST_FILE = "core-manifest.json";
 var CoreManifestSchema2 = z2.object({
@@ -315,8 +343,9 @@ function isTemplateOwned(relPath, manifest) {
 function toPosix(p) {
   return sep === "/" ? p : p.split(sep).join("/");
 }
-function listTemplateOwnedFiles(root, manifest) {
+function listTemplateOwnedFiles(root, manifest, options = {}) {
   const out = [];
+  const tracked = options.trackedOnly ? options.git ? gitTrackedFiles(root, options.git) : gitTrackedFiles(root) : null;
   function walk(dir) {
     for (const entry of readdirSync(dir, { withFileTypes: true })) {
       if (entry.isDirectory() && HARD_EXCLUDED_DIRS.has(entry.name)) continue;
@@ -325,6 +354,7 @@ function listTemplateOwnedFiles(root, manifest) {
         walk(abs);
       } else if (entry.isFile()) {
         const rel = toPosix(relative(root, abs));
+        if (tracked && !tracked.has(rel)) continue;
         if (isTemplateOwned(rel, manifest)) out.push(rel);
       }
     }
@@ -335,10 +365,11 @@ function listTemplateOwnedFiles(root, manifest) {
 function sameFile(a, b) {
   return readFileSync2(a).equals(readFileSync2(b));
 }
-function computeCoreDiff(templateRoot, instanceRoot, manifest, baseRoot) {
-  const templateFiles = new Set(listTemplateOwnedFiles(templateRoot, manifest));
+function computeCoreDiff(templateRoot, instanceRoot, manifest, baseRoot, options = {}) {
+  const trackedOnly = options.git ? { trackedOnly: true, git: options.git } : { trackedOnly: true };
+  const templateFiles = new Set(listTemplateOwnedFiles(templateRoot, manifest, trackedOnly));
   const instanceFiles = new Set(listTemplateOwnedFiles(instanceRoot, manifest));
-  const baseFiles = baseRoot ? new Set(listTemplateOwnedFiles(baseRoot, manifest)) : void 0;
+  const baseFiles = baseRoot ? new Set(listTemplateOwnedFiles(baseRoot, manifest, trackedOnly)) : void 0;
   const diff = {
     added: [],
     removed: [],
@@ -687,9 +718,10 @@ var EMPTY_SUMMARY = () => ({
 });
 async function planCoreUpgrade(options) {
   const mergeFile = options.mergeFile ?? gitMergeFile;
-  const base = new Set(listTemplateOwnedFiles(options.baseDir, options.manifest));
+  const trackedOnly = { trackedOnly: true };
+  const base = new Set(listTemplateOwnedFiles(options.baseDir, options.manifest, trackedOnly));
   const ours = new Set(listTemplateOwnedFiles(options.oursDir, options.manifest));
-  const theirs = new Set(listTemplateOwnedFiles(options.theirsDir, options.manifest));
+  const theirs = new Set(listTemplateOwnedFiles(options.theirsDir, options.manifest, trackedOnly));
   const divergentPrefixes = readDivergenceConfig(options.oursDir).warnOnly.map((e) => e.prefix);
   const isDeclaredDivergent = (path) => divergentPrefixes.some((prefix) => path.startsWith(prefix));
   const paths = [.../* @__PURE__ */ new Set([...base, ...ours, ...theirs])].sort();
@@ -2401,7 +2433,7 @@ function applyMigrationCarry(instanceDir, plan) {
 }
 
 // src/lib/core-template-trees.ts
-import { execFileSync as execFileSync2 } from "child_process";
+import { execFileSync as execFileSync3 } from "child_process";
 import { mkdtempSync as mkdtempSync3, rmSync as rmSync3 } from "fs";
 import { tmpdir as tmpdir3 } from "os";
 import { join as join8 } from "path";
@@ -2409,8 +2441,8 @@ function coreTag(version) {
   parseCoreVersion(version);
   return `core-v${version}`;
 }
-var defaultGit = (args) => execFileSync2("git", args, { encoding: "utf8" });
-function workingTreeMatchesTag(repo, version, git = defaultGit) {
+var defaultGit2 = (args) => execFileSync3("git", args, { encoding: "utf8" });
+function workingTreeMatchesTag(repo, version, git = defaultGit2) {
   const tag = coreTag(version);
   try {
     const head = git(["-C", repo, "rev-parse", "HEAD"]).trim();
@@ -2430,7 +2462,7 @@ function tagExists(repo, tag, git) {
     return false;
   }
 }
-function materializeTemplateAtTag(repo, version, git = defaultGit) {
+function materializeTemplateAtTag(repo, version, git = defaultGit2) {
   const tag = coreTag(version);
   if (!tagExists(repo, tag, git)) {
     try {
@@ -2447,7 +2479,7 @@ function materializeTemplateAtTag(repo, version, git = defaultGit) {
   const tarball = join8(dir, ".tree.tar");
   try {
     git(["-C", repo, "archive", "--format=tar", "-o", tarball, tag]);
-    execFileSync2("tar", ["-x", "-f", tarball, "-C", dir]);
+    execFileSync3("tar", ["-x", "-f", tarball, "-C", dir]);
     rmSync3(tarball, { force: true });
   } catch (err) {
     rmSync3(dir, { recursive: true, force: true });

package/package.json

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