@biffo/cli 0.69.1 → 0.69.3

package/dist/index.js

@@ -125,6 +125,31 @@ function readInstanceCoreVersion(cwd) {
   }
   return result.data.version;
 }
+function planCoreVersionCleanup(cwd) {
+  const path = join(cwd, CORE_VERSION_FILE);
+  if (!existsSync(path)) return null;
+  const found = readFileSync(path, "utf8").trim();
+  if (!existsSync(join(cwd, INSTANCE_CORE_FILE))) {
+    return { path, action: "keep", found, reason: "no-authority" };
+  }
+  let authority;
+  try {
+    authority = readInstanceCoreVersion(cwd);
+  } catch {
+    return { path, action: "keep", found, reason: "no-authority" };
+  }
+  if (authority !== null && coreVersionsEqual(found, authority)) {
+    return { path, action: "delete", found };
+  }
+  return { path, action: "keep", found, reason: "repurposed" };
+}
+function coreVersionsEqual(a, b) {
+  try {
+    return compareCoreVersions(a, b) === 0;
+  } catch {
+    return false;
+  }
+}
 function serializeInstanceCoreVersion(version) {
   parseCoreVersion(version);
   return `${JSON.stringify({ version }, null, 2)}
@@ -407,7 +432,7 @@ async function runCoreStatus(options) {
 
 // src/commands/core-upgrade.ts
 import { execSync as execSync2 } from "child_process";
-import { existsSync as existsSync10 } from "fs";
+import { existsSync as existsSync10, rmSync as rmSync5 } from "fs";
 import { join as join11, resolve as resolve3 } from "path";
 import chalk4 from "chalk";
 import { execa as execa3 } from "execa";
@@ -2182,6 +2207,7 @@ async function runCoreUpgradeResolved(options, deps, cleanups) {
   console.log(`  target:          ${toVersion}
 `);
   const migrations = planMigrationCarry({ templateDir: theirsDir, instanceDir: options.cwd });
+  const coreVersionCleanup = planCoreVersionCleanup(options.cwd);
   if (plan.changes.length === 0 && migrations.entries.length === 0) {
     log.success("Nothing to upgrade \u2014 the instance already matches the target for all core files.");
     return;
@@ -2196,6 +2222,7 @@ async function runCoreUpgradeResolved(options, deps, cleanups) {
   printBreakingChanges(breaking, options.apply === true);
   printPlan(plan);
   printMigrationCarry(migrations);
+  printCoreVersionCleanup(coreVersionCleanup, options.apply === true);
   warnStaleFirstPartyCopies(options.cwd);
   console.log(
     `
@@ -2210,9 +2237,19 @@ async function runCoreUpgradeResolved(options, deps, cleanups) {
     );
     return;
   }
-  await applyAndOpenPr(options, deps, plan, migrations, fromVersion, toVersion, breaking, theirsDir);
+  await applyAndOpenPr(
+    options,
+    deps,
+    plan,
+    migrations,
+    fromVersion,
+    toVersion,
+    breaking,
+    theirsDir,
+    coreVersionCleanup
+  );
 }
-async function applyAndOpenPr(options, deps, plan, migrations, fromVersion, toVersion, breaking, theirsDir) {
+async function applyAndOpenPr(options, deps, plan, migrations, fromVersion, toVersion, breaking, theirsDir, coreVersionCleanup) {
   if (breaking.length > 0 && !options.acknowledgeBreaking) {
     throw new Error(
       `This upgrade crosses ${breaking.length} documented breaking change(s): ${breaking.map((b) => b.version).join(", ")}. They are printed above and in ${UPGRADE_GUIDE_PATH}. Read what each one requires \u2014 some destroy data or need manual work after the deploy \u2014 then re-run with --acknowledge-breaking.`
@@ -2234,10 +2271,17 @@ async function applyAndOpenPr(options, deps, plan, migrations, fromVersion, toVe
   const applied = applyUpgradePlan(options.cwd, plan, theirsDir);
   const carried = applyMigrationCarry(options.cwd, migrations);
   writeInstanceCoreVersion(options.cwd, toVersion);
+  const cleanedCoreVersion = coreVersionCleanup?.action === "delete";
+  if (cleanedCoreVersion && existsSync10(coreVersionCleanup.path)) {
+    rmSync5(coreVersionCleanup.path);
+    log.info(
+      `Deleted orphaned ${CORE_VERSION_FILE} (inherited copy recording ${coreVersionCleanup.found}, superseded by biffo.core.json) \u2014 nothing reads it as an authority (#434).`
+    );
+  }
   log.step(
     2,
     4,
-    `Applied ${applied.written.length} change(s), ${applied.deleted.length} deletion(s), ${carried.length} new migration(s)`
+    `Applied ${applied.written.length} change(s), ${applied.deleted.length + (cleanedCoreVersion ? 1 : 0)} deletion(s), ${carried.length} new migration(s)`
   );
   const lockfiles = await refreshInstanceLockfiles(options.cwd, applied, deps);
   await git.add(options.cwd, ["-A"]);
@@ -2257,7 +2301,16 @@ async function applyAndOpenPr(options, deps, plan, migrations, fromVersion, toVe
     head: branch,
     base,
     title: `Upgrade Biffo core ${fromVersion} \u2192 ${toVersion}`,
-    body: buildPrBody(fromVersion, toVersion, plan, migrations, base, lockfiles, breaking)
+    body: buildPrBody(
+      fromVersion,
+      toVersion,
+      plan,
+      migrations,
+      base,
+      lockfiles,
+      breaking,
+      cleanedCoreVersion ? coreVersionCleanup : null
+    )
   });
   if (plan.conflicts.length > 0) {
     log.warn(`PR opened with ${plan.conflicts.length} conflict(s) to resolve: ${pr.url}`);
@@ -2265,7 +2318,7 @@ async function applyAndOpenPr(options, deps, plan, migrations, fromVersion, toVe
     log.success(`Opened PR #${pr.number}: ${pr.url}`);
   }
 }
-function buildPrBody(from, to, plan, migrations, base = GLOBAL_DISPATCH_REF, lockfiles = [], breaking = []) {
+function buildPrBody(from, to, plan, migrations, base = GLOBAL_DISPATCH_REF, lockfiles = [], breaking = [], coreVersionCleanup = null) {
   const lines = [];
   if (breaking.length > 0) {
     lines.push(
@@ -2304,6 +2357,14 @@ function buildPrBody(from, to, plan, migrations, base = GLOBAL_DISPATCH_REF, loc
       "Review the DDL before merging: merging this PR runs these migrations against the database on the next deploy."
     );
   }
+  if (coreVersionCleanup && coreVersionCleanup.action === "delete") {
+    lines.push(
+      "",
+      "## Cleanup \u2014 removed orphaned `core.version`",
+      "",
+      `This instance still carried a \`${CORE_VERSION_FILE}\` file (recording \`${coreVersionCleanup.found}\`), inherited through GitHub template generation before the template retired it (#423). It matched the version \`biffo.core.json\` records, so it was the un-repurposed inherited copy, and nothing reads it as an authority \u2014 \`biffo.core.json\` wins every lookup. This upgrade **deleted it** (#434). The fallback readers in \`deploy.ts\` and \`core-upgrade.ts\` still read \`${CORE_VERSION_FILE}\` when it is present elsewhere; only this orphaned instance copy was removed.`
+    );
+  }
   const globalWorkflowChanges = plan.changes.filter(
     (c) => GLOBAL_DISPATCH_WORKFLOW_PATHS.includes(c.path)
   );
@@ -2374,6 +2435,18 @@ function printMigrationCarry(migrations) {
     console.log(`  ${chalk4.green("migration".padEnd(15))} ${e.path}${suffix}`);
   }
 }
+function printCoreVersionCleanup(cleanup, applying) {
+  if (cleanup === null) return;
+  if (cleanup.action === "delete") {
+    const verb = applying ? "delete" : "will delete";
+    console.log(
+      `  ${chalk4.red("cleanup".padEnd(15))} ${CORE_VERSION_FILE} ` + chalk4.dim(`(orphaned inherited copy recording ${cleanup.found}) \u2014 ${verb}`)
+    );
+    return;
+  }
+  const why = cleanup.reason === "repurposed" ? `does not match biffo.core.json \u2014 looks repurposed, keeping ${CORE_VERSION_FILE}` : `biffo.core.json absent or unparseable \u2014 no authority to check, keeping ${CORE_VERSION_FILE}`;
+  console.log(`  ${chalk4.dim("cleanup".padEnd(15))} ${chalk4.dim(`${cleanup.found}: ${why}`)}`);
+}
 function printPlan(plan) {
   const ordered = [...plan.conflicts, ...plan.changes.filter((c) => !c.conflicted)];
   for (const e of ordered) {
@@ -2921,7 +2994,7 @@ import {
   mkdirSync as mkdirSync4,
   readdirSync as readdirSync4,
   readFileSync as readFileSync7,
-  rmSync as rmSync5,
+  rmSync as rmSync6,
   statSync as statSync2,
   writeFileSync as writeFileSync5
 } from "fs";
@@ -2989,7 +3062,7 @@ function markStepComplete(session, step) {
 }
 function deleteSession(projectName) {
   const path = sessionPath(projectName);
-  if (existsSync11(path)) rmSync5(path);
+  if (existsSync11(path)) rmSync6(path);
 }
 function projectsDir() {
   return process.env["BIFFO_PROJECTS_DIR"] ?? join12(homedir(), ".biffo", "projects");
@@ -3011,7 +3084,7 @@ function loadProjectConfig(name) {
 }
 function deleteProjectConfig(name) {
   const path = join12(projectsDir(), `${name}.json`);
-  if (existsSync11(path)) rmSync5(path);
+  if (existsSync11(path)) rmSync6(path);
 }
 function listProjectConfigs() {
   const dir = projectsDir();
@@ -4665,7 +4738,7 @@ import {
   mkdirSync as mkdirSync6,
   readdirSync as readdirSync8,
   readFileSync as readFileSync12,
-  rmSync as rmSync6,
+  rmSync as rmSync7,
   statSync as statSync5,
   writeFileSync as writeFileSync6
 } from "fs";
@@ -4710,7 +4783,7 @@ function markSiblingStepComplete(session, step) {
 }
 function deleteSiblingSession(projectName) {
   const path = sessionPath2(projectName);
-  if (existsSync18(path)) rmSync6(path);
+  if (existsSync18(path)) rmSync7(path);
 }
 
 // src/commands/sibling-create.ts
@@ -6717,7 +6790,7 @@ async function runPluginSyncMigrations(name, options, deps) {
 }
 
 // src/commands/plugin-uninstall.ts
-import { existsSync as existsSync26, readFileSync as readFileSync19, rmSync as rmSync7 } from "fs";
+import { existsSync as existsSync26, readFileSync as readFileSync19, rmSync as rmSync8 } from "fs";
 import { join as join27, resolve as resolve15 } from "path";
 import chalk18 from "chalk";
 import { Command as Command18 } from "commander";
@@ -6789,10 +6862,10 @@ async function runPluginUninstall(name, options, deps) {
       `${options.cwd} is not a git repository \u2014 biffo plugin uninstall must be run from a Biffo project checkout.`
     );
   }
-  rmSync7(targetDir, { recursive: true, force: true });
+  rmSync8(targetDir, { recursive: true, force: true });
   log.success(`Removed services/${name}/`);
   if (existsSync26(modulesDir)) {
-    rmSync7(modulesDir, { recursive: true, force: true });
+    rmSync8(modulesDir, { recursive: true, force: true });
     log.success(`Removed modules/plugins/${name}/`);
     const wiring = syncPluginTerraform(options.cwd);
     stagePaths.push(...wiring.changedPaths);
@@ -6864,7 +6937,7 @@ function printDryRun5(name, version, stagePaths, keepData) {
 }
 
 // src/commands/plugin-upgrade.ts
-import { cpSync as cpSync4, existsSync as existsSync27, mkdirSync as mkdirSync10, readFileSync as readFileSync20, rmSync as rmSync8 } from "fs";
+import { cpSync as cpSync4, existsSync as existsSync27, mkdirSync as mkdirSync10, readFileSync as readFileSync20, rmSync as rmSync9 } from "fs";
 import { join as join28, relative as relative5, resolve as resolve16 } from "path";
 import chalk19 from "chalk";
 import { Command as Command19 } from "commander";
@@ -6939,13 +7012,13 @@ async function runPluginUpgrade(target, options, deps) {
     log.success(
       `Manifest valid \u2014 ${manifest.tables.length} table(s), ${manifest.api_routes.length} route(s)`
     );
-    rmSync8(targetDir, { recursive: true, force: true });
+    rmSync9(targetDir, { recursive: true, force: true });
     mkdirSync10(targetDir, { recursive: true });
     cpSync4(tmpDir, targetDir, { recursive: true });
     log.success(`Upgraded plugin source at services/${entry.name}/`);
     const stagePaths = [`services/${entry.name}`];
     if (existsSync27(modulesDir)) {
-      rmSync8(modulesDir, { recursive: true, force: true });
+      rmSync9(modulesDir, { recursive: true, force: true });
     }
     const tfSourceDir = join28(targetDir, "terraform");
     if (existsSync27(tfSourceDir)) {

package/package.json

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