@biffo/cli 0.150.0 → 0.151.1

package/dist/index.js

@@ -1566,6 +1566,7 @@ function planMigrationCarry(options) {
   const recognised = [];
   const declinedIndex = new Map((options.declined ?? []).map((d) => [d.file, d]));
   const declined = [];
+  const divergedBodies = [];
   let head = instanceHead;
   for (const m of chainOrder(template)) {
     const decline = declinedIndex.get(m.file);
@@ -1583,6 +1584,13 @@ function planMigrationCarry(options) {
       if (already.how !== "filename") {
         recognised.push({ file: m.file, instanceFile: already.instance.file, how: already.how });
       }
+      if (migrationBodyHash(m.content) !== migrationBodyHash(already.instance.content)) {
+        divergedBodies.push({
+          file: m.file,
+          instanceFile: already.instance.file,
+          how: already.how
+        });
+      }
       continue;
     }
     let revision = m.revision;
@@ -1625,7 +1633,31 @@ function planMigrationCarry(options) {
   );
   const templateFiles = new Set(template.map((m) => m.file));
   const staleDeclines = [...declinedIndex.keys()].filter((f) => !templateFiles.has(f));
-  return { entries, instanceHead, skipped, recognised, declined, staleDeclines };
+  return {
+    entries,
+    instanceHead,
+    skipped,
+    recognised,
+    declined,
+    staleDeclines,
+    divergedBodies
+  };
+}
+var TEST_PATH_RE = /(^|\/)tests?\/.*\btest_[^/]*\.py$/;
+function findMigrationTestPairings(changes, divergedBodies) {
+  if (divergedBodies.length === 0) return [];
+  const pairings = [];
+  for (const change of changes) {
+    if (!TEST_PATH_RE.test(change.path)) continue;
+    const content = change.content;
+    if (content === void 0) continue;
+    for (const d of divergedBodies) {
+      if (content.includes(d.file)) {
+        pairings.push({ testPath: change.path, migration: d.file, instanceFile: d.instanceFile });
+      }
+    }
+  }
+  return pairings;
 }
 function indexInstanceMigrations(instance) {
   const index = {
@@ -2513,6 +2545,10 @@ async function runCoreUpgradeResolved(options, deps, cleanups) {
   printBreakingChanges(breaking, options.apply === true);
   printPlan(plan);
   printMigrationCarry(migrations);
+  printMigrationBodyDrift(
+    migrations,
+    findMigrationTestPairings(plan.changes, migrations.divergedBodies)
+  );
   printCoreVersionCleanup(coreVersionCleanup, options.apply === true);
   warnStaleFirstPartyCopies(options.cwd);
   console.log(
@@ -2757,6 +2793,39 @@ function printMigrationCarry(migrations) {
     console.log(`  ${chalk4.green("migration".padEnd(15))} ${e.path}${suffix}`);
   }
 }
+function printMigrationBodyDrift(migrations, pairings) {
+  if (migrations.divergedBodies.length === 0) return;
+  console.log();
+  for (const d of migrations.divergedBodies) {
+    const alias = d.instanceFile === d.file ? "" : chalk4.dim(` (this instance calls it ${d.instanceFile})`);
+    console.log(
+      `  ${chalk4.yellow("body drift".padEnd(15))} ${d.file}${alias}
+` + chalk4.dim(
+        "                  The template has changed this migration since you carried it.\n                  An applied migration cannot be re-run, so the carry left yours\n                  alone and this change will NOT reach you."
+      )
+    );
+  }
+  if (pairings.length === 0) {
+    console.log(
+      chalk4.dim(
+        "\n  No arriving test asserts the new body, so this upgrade should still go green.\n  It stays a convergence gap: fresh environments get the new body, you keep the old."
+      )
+    );
+    return;
+  }
+  console.log(
+    `
+  ${chalk4.red.bold("This upgrade will not go green.")} ${pairings.length} arriving test(s) assert a migration body you will not receive:`
+  );
+  for (const p of pairings) {
+    console.log(`    ${chalk4.red(p.testPath)} ${chalk4.dim(`\u2192 asserts ${p.migration}`)}`);
+  }
+  console.log(
+    chalk4.dim(
+      "\n  Resolve before merging, by one of:\n    - port the migration body change into your copy by hand, keeping its\n      `# biffo:carried-from:` marker \u2014 safe only if re-stating the DDL is a\n      no-op against your already-migrated database;\n    - drop the arriving test from this PR and raise it upstream, if the\n      property it asserts cannot hold here;\n    - ask upstream to ship the change as a follow-on migration instead, which\n      is the only option that actually converges an applied chain.\n"
+    )
+  );
+}
 function printCoreVersionCleanup(cleanup, applying) {
   if (cleanup === null) return;
   if (cleanup.action === "delete") {

package/package.json

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