@fern-api/fern-api-dev 5.17.1-1-g545030fdd96 → 5.17.1

package/cli.cjs

@@ -354406,9 +354406,9 @@ var require_diff3 = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/@fern-api+replay@0.15.0/node_modules/@fern-api/replay/dist/index.cjs
+// ../../../node_modules/.pnpm/@fern-api+replay@0.14.1/node_modules/@fern-api/replay/dist/index.cjs
 var require_dist13 = __commonJS({
-  "../../../node_modules/.pnpm/@fern-api+replay@0.15.0/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
+  "../../../node_modules/.pnpm/@fern-api+replay@0.14.1/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
     "use strict";
     var __defProp4 = Object.defineProperty;
     var __getOwnPropDesc4 = Object.getOwnPropertyDescriptor;
@@ -357919,66 +357919,6 @@ 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 log4 = await this.git.exec([
-          "log",
-          `${fromSha}..${toSha}`,
-          "--grep=\\[fern-autoversion\\]",
-          "--extended-regexp",
-          "--format=%H%x09%aN%x09%ae%x09%s",
-          "--",
-          ...files
-        ]).catch(() => "");
-        if (!log4.trim()) return false;
-        for (const line of log4.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(patch5, currentGen) {
-        if (!patch5.theirs_snapshot) return null;
-        if (Object.keys(patch5.theirs_snapshot).length === 0) return null;
-        for (const file4 of patch5.files) {
-          if (patch5.theirs_snapshot[file4] == null) return null;
-        }
-        const fragments = [];
-        for (const file4 of patch5.files) {
-          const theirsContent = patch5.theirs_snapshot[file4];
-          const oursContent = await this.git.showFile(currentGen, file4).catch(() => null);
-          if (oursContent == null) {
-            fragments.push(synthesizeNewFileDiff(file4, theirsContent));
-            continue;
-          }
-          if (oursContent === theirsContent) continue;
-          const fileDiff = await unifiedDiff(oursContent, theirsContent, file4);
-          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
@@ -358244,41 +358184,6 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
           }
           if (patch5.base_generation === currentGen) {
             try {
-              const contaminated = await this.hasAutoversionContamination(
-                currentGen,
-                "HEAD",
-                patch5.files
-              );
-              if (contaminated) {
-                const snapshotDiff = await this.computeSnapshotBasedPatchDiff(
-                  patch5,
-                  currentGen
-                );
-                if (snapshotDiff === null) continue;
-                if (!snapshotDiff.trim()) {
-                  if (await allPatchFilesUserOwned(patch5)) continue;
-                  this.lockManager.removePatch(patch5.id);
-                  contentRefreshed++;
-                  continue;
-                }
-                const snapHasStaleMarkers = snapshotDiff.split("\n").some(
-                  (l9) => l9.startsWith("+<<<<<<< Generated") || l9.startsWith("+>>>>>>> Your customization")
-                );
-                if (snapHasStaleMarkers) continue;
-                const isProtectedSnap = patch5.files.some(
-                  (file4) => file4 === ".fernignore" || fernignorePatterns.some((p14) => file4 === p14 || (0, import_minimatch22.minimatch)(file4, p14))
-                );
-                if (isProtectedSnap) continue;
-                const snapHash = this.detector.computeContentHash(snapshotDiff);
-                if (snapHash !== patch5.content_hash) {
-                  this.lockManager.updatePatch(patch5.id, {
-                    patch_content: snapshotDiff,
-                    content_hash: snapHash
-                  });
-                  contentRefreshed++;
-                }
-                continue;
-              }
               const ppResult = await computePerPatchDiffWithFallback(
                 patch5,
                 (f4) => this.git.showFile(currentGen, f4),
@@ -358330,42 +358235,6 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
           try {
             const markerFiles = await this.git.exec(["grep", "-l", "<<<<<<< Generated", "HEAD", "--", ...patch5.files]).catch(() => "");
             if (markerFiles.trim()) continue;
-            const contaminated = await this.hasAutoversionContamination(
-              currentGen,
-              "HEAD",
-              patch5.files
-            );
-            if (contaminated) {
-              const snapshotDiff = await this.computeSnapshotBasedPatchDiff(
-                patch5,
-                currentGen
-              );
-              if (snapshotDiff === null) continue;
-              if (!snapshotDiff.trim()) {
-                if (await allPatchFilesUserOwned(patch5)) {
-                  try {
-                    this.lockManager.updatePatch(patch5.id, { base_generation: currentGen });
-                  } catch {
-                  }
-                  continue;
-                }
-                this.lockManager.removePatch(patch5.id);
-                conflictAbsorbed++;
-                continue;
-              }
-              const snapHasStaleMarkers = snapshotDiff.split("\n").some(
-                (l9) => l9.startsWith("+<<<<<<< Generated") || l9.startsWith("+>>>>>>> Your customization")
-              );
-              if (snapHasStaleMarkers) continue;
-              const snapHash = this.detector.computeContentHash(snapshotDiff);
-              this.lockManager.updatePatch(patch5.id, {
-                base_generation: currentGen,
-                patch_content: snapshotDiff,
-                content_hash: snapHash
-              });
-              conflictResolved++;
-              continue;
-            }
             const ppResult = await computePerPatchDiffWithFallback(
               patch5,
               (f4) => this.git.showFile(currentGen, f4),
@@ -661011,7 +660880,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.17.1-1-g545030fdd96",
+          version: "5.17.1",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -661066,7 +660935,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.17.1-1-g545030fdd96",
+        version: "5.17.1",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -852049,7 +851918,7 @@ var LOCAL_STORAGE_FOLDER4 = ".fern-dev";
 var LOGS_FOLDER_NAME = "logs";
 var MAX_LOGS_DIR_SIZE_BYTES = 100 * 1024 * 1024;
 function getCliSource() {
-  const version7 = "5.17.1-1-g545030fdd96";
+  const version7 = "5.17.1";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -864858,7 +864727,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.17.1-1-g545030fdd96",
+        cliVersion: "5.17.1",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -939436,7 +939305,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.17.1-1-g545030fdd96";
+    return "5.17.1";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.17.1-1-g545030fdd96",
+  "version": "5.17.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",