@biffo/cli 0.73.0 → 0.73.2

package/dist/index.js

@@ -1737,6 +1737,18 @@ function coreTag(version) {
   return `core-v${version}`;
 }
 var defaultGit = (args) => execFileSync2("git", args, { encoding: "utf8" });
+function workingTreeMatchesTag(repo, version, git = defaultGit) {
+  const tag = coreTag(version);
+  try {
+    const head = git(["-C", repo, "rev-parse", "HEAD"]).trim();
+    const tagCommit = git(["-C", repo, "rev-parse", `${tag}^{commit}`]).trim();
+    if (!head || head !== tagCommit) return false;
+    const dirty = git(["-C", repo, "status", "--porcelain", "--untracked-files=no"]).trim();
+    return dirty === "";
+  } catch {
+    return false;
+  }
+}
 function tagExists(repo, tag, git) {
   try {
     git(["-C", repo, "rev-parse", "-q", "--verify", `refs/tags/${tag}`]);
@@ -2108,7 +2120,8 @@ function defaultDeps() {
     git: new GitAdapter(),
     makeGitHub: (token) => new GitHubAdapter(token),
     resolveToken: resolveGitHubToken,
-    materialize: materializeTemplateAtTag
+    materialize: materializeTemplateAtTag,
+    workingTreeMatchesTag
   };
 }
 function resolveGitHubToken() {
@@ -2157,6 +2170,7 @@ async function checkInstanceCurrency(git, cwd, allowDirty) {
 async function runCoreUpgradeResolved(options, deps, cleanups) {
   await checkInstanceCurrency(deps.git, options.cwd, options.allowDirty ?? false);
   const materialize = deps.materialize ?? materializeTemplateAtTag;
+  const treeMatchesTag = deps.workingTreeMatchesTag ?? workingTreeMatchesTag;
   const templateRepo = options.templateRepo ? resolve3(options.templateRepo) : resolveTemplateRoot({ guidance: MISSING_TEMPLATE_ROOT_GUIDANCE2 });
   const instanceVersion = readInstanceCoreVersion(options.cwd);
   let theirsDir;
@@ -2167,7 +2181,7 @@ async function runCoreUpgradeResolved(options, deps, cleanups) {
   } else {
     const workingVersion = latestCoreVersion(templateRepo);
     toVersion = options.toVersion ?? workingVersion;
-    if (toVersion === workingVersion) {
+    if (toVersion === workingVersion && treeMatchesTag(templateRepo, toVersion)) {
       theirsDir = templateRepo;
     } else {
       const t = materialize(templateRepo, toVersion);

package/package.json

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