@fern-api/fern-api-dev 4.67.1-35-gb17435e183c → 4.67.1-37-g702136e1c88

package/cli.cjs

@@ -363248,9 +363248,9 @@ var require_diff3 = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/@fern-api+replay@0.10.3/node_modules/@fern-api/replay/dist/index.cjs
+// ../../../node_modules/.pnpm/@fern-api+replay@0.10.4/node_modules/@fern-api/replay/dist/index.cjs
 var require_dist14 = __commonJS({
-  "../../../node_modules/.pnpm/@fern-api+replay@0.10.3/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
+  "../../../node_modules/.pnpm/@fern-api+replay@0.10.4/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
     "use strict";
     var __defProp4 = Object.defineProperty;
     var __getOwnPropDesc4 = Object.getOwnPropertyDescriptor;
@@ -363893,6 +363893,7 @@ var require_dist14 = __commonJS({
         }
         const log4 = await this.git.exec([
           "log",
+          "--first-parent",
           "--format=%H%x00%an%x00%ae%x00%s",
           `${lastGen.commit_sha}..HEAD`,
           "--",
@@ -363908,11 +363909,20 @@ var require_dist14 = __commonJS({
           if (isGenerationCommit(commit)) {
             continue;
           }
-          const parents = await this.git.getCommitParents(commit.sha);
-          if (parents.length > 1) {
+          if (lock.patches.find((p10) => p10.original_commit === commit.sha)) {
             continue;
           }
-          if (lock.patches.find((p10) => p10.original_commit === commit.sha)) {
+          const parents = await this.git.getCommitParents(commit.sha);
+          if (parents.length > 1) {
+            const compositePatch = await this.createMergeCompositePatch({
+              mergeCommit: commit,
+              firstParent: parents[0],
+              lastGen,
+              lock
+            });
+            if (compositePatch) {
+              newPatches.push(compositePatch);
+            }
             continue;
           }
           let patchContent;
@@ -364011,6 +364021,46 @@ var require_dist14 = __commonJS({
         const normalized = patchContent.split("\n").filter((line) => !line.startsWith("From ") && !line.startsWith("index ") && !line.startsWith("Date: ")).join("\n");
         return `sha256:${(0, import_node_crypto7.createHash)("sha256").update(normalized).digest("hex")}`;
       }
+      /**
+       * Create a single composite patch for a merge commit by diffing the merge
+       * commit against its first parent. This captures the net change of the
+       * entire merged branch as one patch, eliminating accumulator chaining and
+       * zero-net-change ghost conflicts.
+       */
+      async createMergeCompositePatch(input3) {
+        const { mergeCommit, firstParent, lastGen, lock } = input3;
+        const forgottenHashes = new Set(lock.forgotten_hashes ?? []);
+        const filesOutput = await this.git.exec([
+          "diff",
+          "--name-only",
+          firstParent,
+          mergeCommit.sha
+        ]);
+        const files = filesOutput.trim().split("\n").filter(Boolean).filter((f10) => !INFRASTRUCTURE_FILES.has(f10)).filter((f10) => !f10.startsWith(".fern/"));
+        if (files.length === 0) return null;
+        const diff2 = await this.git.exec([
+          "diff",
+          firstParent,
+          mergeCommit.sha,
+          "--",
+          ...files
+        ]);
+        if (!diff2.trim()) return null;
+        const contentHash = this.computeContentHash(diff2);
+        if (lock.patches.some((p10) => p10.content_hash === contentHash) || forgottenHashes.has(contentHash)) {
+          return null;
+        }
+        return {
+          id: `patch-merge-${mergeCommit.sha.slice(0, 8)}`,
+          content_hash: contentHash,
+          original_commit: mergeCommit.sha,
+          original_message: mergeCommit.message,
+          original_author: `${mergeCommit.authorName} <${mergeCommit.authorEmail}>`,
+          base_generation: lastGen.commit_sha,
+          files,
+          patch_content: diff2
+        };
+      }
       /**
        * Detect patches via tree diff for non-linear history. Returns a composite patch.
        * Revert reconciliation is skipped here because tree-diff produces a single composite
@@ -627553,7 +627603,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.67.1-35-gb17435e183c",
+          version: "4.67.1-37-g702136e1c88",
           usingAccessToken: true
         }
       });
@@ -627604,7 +627654,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.67.1-35-gb17435e183c",
+        version: "4.67.1-37-g702136e1c88",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -843873,7 +843923,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 = "4.67.1-35-gb17435e183c";
+  const version7 = "4.67.1-37-g702136e1c88";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -855121,7 +855171,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.67.1-35-gb17435e183c"
+        cliVersion: "4.67.1-37-g702136e1c88"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
         return { success: false };
@@ -928863,7 +928913,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.67.1-35-gb17435e183c";
+    return "4.67.1-37-g702136e1c88";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.67.1-35-gb17435e183c",
+  "version": "4.67.1-37-g702136e1c88",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",