@fern-api/generator-cli 0.9.25 → 0.9.26

package/dist/cli.js

@@ -22126,7 +22126,7 @@ var init_diff3 = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/@fern-api+replay@0.14.1/node_modules/@fern-api/replay/dist/index.js
+// ../../node_modules/.pnpm/@fern-api+replay@0.15.0/node_modules/@fern-api/replay/dist/index.js
 var dist_exports = {};
 __export(dist_exports, {
   CREDENTIAL_PATTERNS: () => CREDENTIAL_PATTERNS,
@@ -23630,7 +23630,7 @@ function status(outputDir) {
 }
 var import_promises3, import_os, import_path7, import_fs6, import_path8, import_yaml, import_crypto, import_promises4, import_os2, import_path9, import_fs7, import_promises5, import_path10, import_promises6, import_os3, import_path11, import_child_process3, import_crypto2, import_fs8, import_path12, import_yaml2, import_crypto3, import_fs9, import_path13, import_fs10, import_promises7, import_path14, __defProp3, __getOwnPropNames3, __esm3, __export3, GitClient_exports, GitClient, init_GitClient, HybridReconstruction_exports, init_HybridReconstruction, PatchApplyTheirs_exports, init_PatchApplyTheirs, CREDENTIAL_PATTERNS, SENSITIVE_FILE_PATTERNS, FERN_BOT_NAME, FERN_BOT_EMAIL, FERN_BOT_LOGIN, FERN_SUPPORT_NAMES, LOCKFILE_HEADER, LockfileNotFoundError, LockfileManager, CONFLICT_OPENER, CONFLICT_SEPARATOR, CONFLICT_CLOSER, BINARY_EXTENSIONS, ReplayApplicator, INFRASTRUCTURE_FILES, ReplayDetector, ReplayCommitter, ReplayService, FernignoreMigrator, REPLAY_FERNIGNORE_ENTRIES, GITATTRIBUTES_ENTRIES, EMPTY_RESULT;
 var init_dist3 = __esm({
-  "../../node_modules/.pnpm/@fern-api+replay@0.14.1/node_modules/@fern-api/replay/dist/index.js"() {
+  "../../node_modules/.pnpm/@fern-api+replay@0.15.0/node_modules/@fern-api/replay/dist/index.js"() {
     "use strict";
     init_esm4();
     import_promises3 = require("fs/promises");
@@ -26243,6 +26243,66 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         }
         return snapshot;
       }
+      /**
+       * FER-10203: returns true when a `[fern-autoversion]` commit between
+       * `fromSha` and `toSha` touched any of the patch's `files`. Re-classifies
+       * each grep match via `isGenerationCommit` so a customer commit that
+       * merely quotes the marker in its body doesn't false-positive.
+       */
+      async hasAutoversionContamination(fromSha, toSha, files) {
+        if (files.length === 0) return false;
+        const log = await this.git.exec([
+          "log",
+          `${fromSha}..${toSha}`,
+          "--grep=\\[fern-autoversion\\]",
+          "--extended-regexp",
+          "--format=%H%x09%aN%x09%ae%x09%s",
+          "--",
+          ...files
+        ]).catch(() => "");
+        if (!log.trim()) return false;
+        for (const line of log.trim().split("\n")) {
+          const [sha, authorName, authorEmail, message] = line.split("	");
+          if (sha == null) continue;
+          if (isGenerationCommit({
+            sha,
+            authorName: authorName ?? "",
+            authorEmail: authorEmail ?? "",
+            message: message ?? ""
+          })) {
+            return true;
+          }
+        }
+        return false;
+      }
+      /**
+       * FER-10203: rebuild patch_content from `theirs_snapshot` (captured at
+       * detection time, predates pipeline content) rather than a HEAD-relative
+       * diff. Returns `null` when snapshot is missing or doesn't cover every
+       * file in `patch.files` — caller leaves the patch unchanged.
+       */
+      async computeSnapshotBasedPatchDiff(patch, currentGen) {
+        if (!patch.theirs_snapshot) return null;
+        if (Object.keys(patch.theirs_snapshot).length === 0) return null;
+        for (const file of patch.files) {
+          if (patch.theirs_snapshot[file] == null) return null;
+        }
+        const fragments = [];
+        for (const file of patch.files) {
+          const theirsContent = patch.theirs_snapshot[file];
+          const oursContent = await this.git.showFile(currentGen, file).catch(() => null);
+          if (oursContent == null) {
+            fragments.push(synthesizeNewFileDiff(file, theirsContent));
+            continue;
+          }
+          if (oursContent === theirsContent) continue;
+          const fileDiff = await unifiedDiff(oursContent, theirsContent, file);
+          if (fileDiff.trim()) {
+            fragments.push(fileDiff);
+          }
+        }
+        return fragments.join("");
+      }
       /**
        * Read THEIRS snapshot from a git tree-ish (commit, branch, or tree).
        * Used when the diff that produced `patch_content` was relative to that
@@ -26508,6 +26568,41 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
           }
           if (patch.base_generation === currentGen) {
             try {
+              const contaminated = await this.hasAutoversionContamination(
+                currentGen,
+                "HEAD",
+                patch.files
+              );
+              if (contaminated) {
+                const snapshotDiff = await this.computeSnapshotBasedPatchDiff(
+                  patch,
+                  currentGen
+                );
+                if (snapshotDiff === null) continue;
+                if (!snapshotDiff.trim()) {
+                  if (await allPatchFilesUserOwned(patch)) continue;
+                  this.lockManager.removePatch(patch.id);
+                  contentRefreshed++;
+                  continue;
+                }
+                const snapHasStaleMarkers = snapshotDiff.split("\n").some(
+                  (l) => l.startsWith("+<<<<<<< Generated") || l.startsWith("+>>>>>>> Your customization")
+                );
+                if (snapHasStaleMarkers) continue;
+                const isProtectedSnap = patch.files.some(
+                  (file) => file === ".fernignore" || fernignorePatterns.some((p2) => file === p2 || minimatch(file, p2))
+                );
+                if (isProtectedSnap) continue;
+                const snapHash = this.detector.computeContentHash(snapshotDiff);
+                if (snapHash !== patch.content_hash) {
+                  this.lockManager.updatePatch(patch.id, {
+                    patch_content: snapshotDiff,
+                    content_hash: snapHash
+                  });
+                  contentRefreshed++;
+                }
+                continue;
+              }
               const ppResult = await computePerPatchDiffWithFallback(
                 patch,
                 (f) => this.git.showFile(currentGen, f),
@@ -26559,6 +26654,42 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
           try {
             const markerFiles = await this.git.exec(["grep", "-l", "<<<<<<< Generated", "HEAD", "--", ...patch.files]).catch(() => "");
             if (markerFiles.trim()) continue;
+            const contaminated = await this.hasAutoversionContamination(
+              currentGen,
+              "HEAD",
+              patch.files
+            );
+            if (contaminated) {
+              const snapshotDiff = await this.computeSnapshotBasedPatchDiff(
+                patch,
+                currentGen
+              );
+              if (snapshotDiff === null) continue;
+              if (!snapshotDiff.trim()) {
+                if (await allPatchFilesUserOwned(patch)) {
+                  try {
+                    this.lockManager.updatePatch(patch.id, { base_generation: currentGen });
+                  } catch {
+                  }
+                  continue;
+                }
+                this.lockManager.removePatch(patch.id);
+                conflictAbsorbed++;
+                continue;
+              }
+              const snapHasStaleMarkers = snapshotDiff.split("\n").some(
+                (l) => l.startsWith("+<<<<<<< Generated") || l.startsWith("+>>>>>>> Your customization")
+              );
+              if (snapHasStaleMarkers) continue;
+              const snapHash = this.detector.computeContentHash(snapshotDiff);
+              this.lockManager.updatePatch(patch.id, {
+                base_generation: currentGen,
+                patch_content: snapshotDiff,
+                content_hash: snapHash
+              });
+              conflictResolved++;
+              continue;
+            }
             const ppResult = await computePerPatchDiffWithFallback(
               patch,
               (f) => this.git.showFile(currentGen, f),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fern-api/generator-cli",
-  "version": "0.9.25",
+  "version": "0.9.26",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",
@@ -23,7 +23,7 @@
   ],
   "dependencies": {
     "@boundaryml/baml": "^0.219.0",
-    "@fern-api/replay": "0.14.1",
+    "@fern-api/replay": "0.15.0",
     "@octokit/rest": "^22.0.1",
     "es-toolkit": "^1.45.1",
     "semver": "^7.6.3",