@fern-api/fern-api-dev 4.67.1-5-g6f7f6d50210 → 4.67.1-57-gcb2da2e3a5f

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
@@ -405313,9 +405363,9 @@ var require_file2 = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/parseControlResponse.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/parseControlResponse.js
 var require_parseControlResponse = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/parseControlResponse.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/parseControlResponse.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.parseControlResponse = parseControlResponse;
@@ -405365,9 +405415,9 @@ var require_parseControlResponse = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/FtpContext.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/FtpContext.js
 var require_FtpContext = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/FtpContext.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/FtpContext.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.FTPContext = exports2.FTPError = void 0;
@@ -405509,6 +405559,9 @@ var require_FtpContext = __commonJS({
        * Send an FTP command without waiting for or handling the result.
        */
       send(command3) {
+        if (/[\r\n\0]/.test(command3)) {
+          throw new Error(`Invalid command: Contains control characters. (${command3})`);
+        }
         const containsPassword = command3.startsWith("PASS");
         const message = containsPassword ? "> PASS ###" : `> ${command3}`;
         this.log(message);
@@ -405682,9 +405735,9 @@ Closing reason: ${this._closingError.stack}`;
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/FileInfo.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/FileInfo.js
 var require_FileInfo = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/FileInfo.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/FileInfo.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.FileInfo = exports2.FileType = void 0;
@@ -405739,9 +405792,9 @@ var require_FileInfo = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/parseListDOS.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/parseListDOS.js
 var require_parseListDOS = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/parseListDOS.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/parseListDOS.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.testLine = testLine;
@@ -405782,9 +405835,9 @@ var require_parseListDOS = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/parseListUnix.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/parseListUnix.js
 var require_parseListUnix = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/parseListUnix.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/parseListUnix.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.testLine = testLine;
@@ -405868,9 +405921,9 @@ var require_parseListUnix = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/parseListMLSD.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/parseListMLSD.js
 var require_parseListMLSD = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/parseListMLSD.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/parseListMLSD.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.testLine = testLine;
@@ -406033,9 +406086,9 @@ var require_parseListMLSD = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/parseList.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/parseList.js
 var require_parseList = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/parseList.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/parseList.js"(exports2) {
     "use strict";
     var __createBinding2 = exports2 && exports2.__createBinding || (Object.create ? (function(o14, m11, k19, k23) {
       if (k23 === void 0) k23 = k19;
@@ -406111,9 +406164,9 @@ var require_parseList = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/ProgressTracker.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/ProgressTracker.js
 var require_ProgressTracker = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/ProgressTracker.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/ProgressTracker.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.ProgressTracker = void 0;
@@ -406182,9 +406235,9 @@ var require_ProgressTracker = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/StringWriter.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/StringWriter.js
 var require_StringWriter = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/StringWriter.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/StringWriter.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.StringWriter = void 0;
@@ -406210,9 +406263,9 @@ var require_StringWriter = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/netUtils.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/netUtils.js
 var require_netUtils = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/netUtils.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/netUtils.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.describeTLS = describeTLS;
@@ -406261,9 +406314,9 @@ var require_netUtils = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/transfer.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/transfer.js
 var require_transfer = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/transfer.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/transfer.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.enterPassiveModeIPv6 = enterPassiveModeIPv6;
@@ -406513,9 +406566,9 @@ var require_transfer = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/Client.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/Client.js
 var require_Client14 = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/Client.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/Client.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.Client = void 0;
@@ -407147,9 +407200,6 @@ var require_Client14 = __commonJS({
        * a given path to fix that issue for most cases.
        */
       async protectWhitespace(path97) {
-        if (/[\r\n\0]/.test(path97)) {
-          throw new Error("Invalid path: Contains control characters");
-        }
         if (!path97.startsWith(" ")) {
           return path97;
         }
@@ -407249,17 +407299,17 @@ var require_Client14 = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/StringEncoding.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/StringEncoding.js
 var require_StringEncoding = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/StringEncoding.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/StringEncoding.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/index.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/index.js
 var require_dist17 = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/index.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/index.js"(exports2) {
     "use strict";
     var __createBinding2 = exports2 && exports2.__createBinding || (Object.create ? (function(o14, m11, k19, k23) {
       if (k23 === void 0) k23 = k19;
@@ -627553,7 +627603,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.67.1-5-g6f7f6d50210",
+          version: "4.67.1-57-gcb2da2e3a5f",
           usingAccessToken: true
         }
       });
@@ -627604,7 +627654,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.67.1-5-g6f7f6d50210",
+        version: "4.67.1-57-gcb2da2e3a5f",
         ...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-5-g6f7f6d50210";
+  const version7 = "4.67.1-57-gcb2da2e3a5f";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -855121,7 +855171,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.67.1-5-g6f7f6d50210"
+        cliVersion: "4.67.1-57-gcb2da2e3a5f"
       });
       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-5-g6f7f6d50210";
+    return "4.67.1-57-gcb2da2e3a5f";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.67.1-5-g6f7f6d50210",
+  "version": "4.67.1-57-gcb2da2e3a5f",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",