@fern-api/fern-api-dev 4.48.1 → 4.49.0-5-gc7a93e39202

package/cli.cjs

@@ -297401,9 +297401,9 @@ var require_array_flatten = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/path-to-regexp@0.1.12/node_modules/path-to-regexp/index.js
+// ../../../node_modules/.pnpm/path-to-regexp@0.1.13/node_modules/path-to-regexp/index.js
 var require_path_to_regexp = __commonJS({
-  "../../../node_modules/.pnpm/path-to-regexp@0.1.12/node_modules/path-to-regexp/index.js"(exports2, module4) {
+  "../../../node_modules/.pnpm/path-to-regexp@0.1.13/node_modules/path-to-regexp/index.js"(exports2, module4) {
     "use strict";
     module4.exports = pathToRegexp2;
     var MATCHING_GROUP_REGEXP = /\\.|\((?:\?<(.*?)>)?(?!\?)/g;
@@ -297462,6 +297462,7 @@ var require_path_to_regexp = __commonJS({
           }
           pos = offset2 + match3.length;
           if (match3 === "*") {
+            backtrack = "";
             extraOffset += 3;
             return "(.*)";
           }
@@ -297482,6 +297483,7 @@ var require_path_to_regexp = __commonJS({
             offset: offset2 + extraOffset
           });
           var result = "(?:" + format3 + slash + capture + (star3 ? "((?:[/" + format3 + "].+?)?)" : "") + ")" + optional20;
+          backtrack = "";
           extraOffset += result.length - match3.length;
           return result;
         }
@@ -363450,9 +363452,9 @@ var require_diff3 = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/@fern-api+replay@0.7.0/node_modules/@fern-api/replay/dist/index.cjs
+// ../../../node_modules/.pnpm/@fern-api+replay@0.8.0/node_modules/@fern-api/replay/dist/index.cjs
 var require_dist11 = __commonJS({
-  "../../../node_modules/.pnpm/@fern-api+replay@0.7.0/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
+  "../../../node_modules/.pnpm/@fern-api+replay@0.8.0/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
     "use strict";
     var __defProp4 = Object.defineProperty;
     var __getOwnPropDesc4 = Object.getOwnPropertyDescriptor;
@@ -363577,6 +363579,9 @@ var require_dist11 = __commonJS({
               return false;
             }
           }
+          async getCommitBody(commitSha) {
+            return this.exec(["log", "-1", "--format=%B", commitSha]);
+          }
           getRepoPath() {
             return this.repoPath;
           }
@@ -363599,6 +363604,9 @@ var require_dist11 = __commonJS({
       forget: () => forget,
       isGenerationCommit: () => isGenerationCommit,
       isReplayCommit: () => isReplayCommit,
+      isRevertCommit: () => isRevertCommit,
+      parseRevertedMessage: () => parseRevertedMessage,
+      parseRevertedSha: () => parseRevertedSha,
       reset: () => reset2,
       resolve: () => resolve13,
       status: () => status,
@@ -363622,6 +363630,17 @@ var require_dist11 = __commonJS({
     function isReplayCommit(commit) {
       return commit.message.startsWith("[fern-replay]");
     }
+    function isRevertCommit(message) {
+      return message.startsWith('Revert "');
+    }
+    function parseRevertedSha(fullBody) {
+      const match3 = fullBody.match(/This reverts commit ([0-9a-f]{40})\./);
+      return match3?.[1];
+    }
+    function parseRevertedMessage(subject) {
+      const match3 = subject.match(/^Revert "(.+)"$/);
+      return match3?.[1];
+    }
     var import_node_fs32 = require("fs");
     var import_node_path41 = require("path");
     var import_yaml18 = require_dist8();
@@ -363780,14 +363799,14 @@ var require_dist11 = __commonJS({
         const lock = this.lockManager.read();
         const lastGen = this.getLastGeneration(lock);
         if (!lastGen) {
-          return [];
+          return { patches: [], revertedPatchIds: [] };
         }
         const exists2 = await this.git.commitExists(lastGen.commit_sha);
         if (!exists2) {
           this.warnings.push(
             `Generation commit ${lastGen.commit_sha.slice(0, 7)} not found in git history. Skipping new patch detection. Existing lockfile patches will still be applied.`
           );
-          return [];
+          return { patches: [], revertedPatchIds: [] };
         }
         const isAncestor = await this.git.isAncestor(lastGen.commit_sha, "HEAD");
         if (!isAncestor) {
@@ -363801,7 +363820,7 @@ var require_dist11 = __commonJS({
           this.sdkOutputDir
         ]);
         if (!log4.trim()) {
-          return [];
+          return { patches: [], revertedPatchIds: [] };
         }
         const commits = this.parseGitLog(log4);
         const newPatches = [];
@@ -363837,7 +363856,60 @@ var require_dist11 = __commonJS({
             patch_content: patchContent
           });
         }
-        return newPatches.reverse();
+        newPatches.reverse();
+        const revertedPatchIdSet = /* @__PURE__ */ new Set();
+        const revertIndicesToRemove = /* @__PURE__ */ new Set();
+        for (let i11 = 0; i11 < newPatches.length; i11++) {
+          const patch5 = newPatches[i11];
+          if (!isRevertCommit(patch5.original_message)) continue;
+          let body = "";
+          try {
+            body = await this.git.getCommitBody(patch5.original_commit);
+          } catch {
+          }
+          const revertedSha = parseRevertedSha(body);
+          const revertedMessage = parseRevertedMessage(patch5.original_message);
+          let matchedExisting = false;
+          if (revertedSha) {
+            const existing = lock.patches.find((p10) => p10.original_commit === revertedSha);
+            if (existing) {
+              revertedPatchIdSet.add(existing.id);
+              revertIndicesToRemove.add(i11);
+              matchedExisting = true;
+            }
+          }
+          if (!matchedExisting && revertedMessage) {
+            const existing = lock.patches.find((p10) => p10.original_message === revertedMessage);
+            if (existing) {
+              revertedPatchIdSet.add(existing.id);
+              revertIndicesToRemove.add(i11);
+              matchedExisting = true;
+            }
+          }
+          if (matchedExisting) continue;
+          let matchedNew = false;
+          if (revertedSha) {
+            const idx = newPatches.findIndex(
+              (p10, j16) => j16 !== i11 && !revertIndicesToRemove.has(j16) && p10.original_commit === revertedSha
+            );
+            if (idx !== -1) {
+              revertIndicesToRemove.add(i11);
+              revertIndicesToRemove.add(idx);
+              matchedNew = true;
+            }
+          }
+          if (!matchedNew && revertedMessage) {
+            const idx = newPatches.findIndex(
+              (p10, j16) => j16 !== i11 && !revertIndicesToRemove.has(j16) && p10.original_message === revertedMessage
+            );
+            if (idx !== -1) {
+              revertIndicesToRemove.add(i11);
+              revertIndicesToRemove.add(idx);
+            }
+          }
+        }
+        const filteredPatches = newPatches.filter((_16, i11) => !revertIndicesToRemove.has(i11));
+        return { patches: filteredPatches, revertedPatchIds: [...revertedPatchIdSet] };
       }
       /**
        * Compute content hash for deduplication.
@@ -363848,31 +363920,34 @@ var require_dist11 = __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")}`;
       }
-      /** Detect patches via tree diff for non-linear history. Returns a composite patch. */
+      /**
+       * 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
+       * patch from the aggregate diff — individual revert commits are not distinguishable.
+       */
       async detectPatchesViaTreeDiff(lastGen) {
         const filesOutput = await this.git.exec(["diff", "--name-only", lastGen.commit_sha, "HEAD"]);
         const files = filesOutput.trim().split("\n").filter(Boolean).filter((f10) => !INFRASTRUCTURE_FILES.has(f10)).filter((f10) => !f10.startsWith(".fern/"));
-        if (files.length === 0) return [];
+        if (files.length === 0) return { patches: [], revertedPatchIds: [] };
         const diff2 = await this.git.exec(["diff", lastGen.commit_sha, "HEAD", "--", ...files]);
-        if (!diff2.trim()) return [];
+        if (!diff2.trim()) return { patches: [], revertedPatchIds: [] };
         const contentHash = this.computeContentHash(diff2);
         const lock = this.lockManager.read();
         if (lock.patches.some((p10) => p10.content_hash === contentHash)) {
-          return [];
+          return { patches: [], revertedPatchIds: [] };
         }
         const headSha = (await this.git.exec(["rev-parse", "HEAD"])).trim();
-        return [
-          {
-            id: `patch-composite-${headSha.slice(0, 8)}`,
-            content_hash: contentHash,
-            original_commit: headSha,
-            original_message: "Customer customizations (composite)",
-            original_author: "composite",
-            base_generation: lastGen.commit_sha,
-            files,
-            patch_content: diff2
-          }
-        ];
+        const compositePatch = {
+          id: `patch-composite-${headSha.slice(0, 8)}`,
+          content_hash: contentHash,
+          original_commit: headSha,
+          original_message: "Customer customizations (composite)",
+          original_author: "composite",
+          base_generation: lastGen.commit_sha,
+          files,
+          patch_content: diff2
+        };
+        return { patches: [compositePatch], revertedPatchIds: [] };
       }
       parseGitLog(log4) {
         return log4.trim().split("\n").map((line) => {
@@ -364466,6 +364541,32 @@ CLI Version: ${options2.cliVersion}`;
     var import_node_path310 = require("path");
     var import_minimatch22 = require_commonjs3();
     init_GitClient();
+    function stripConflictMarkers(content5) {
+      const lines = content5.split("\n");
+      const result = [];
+      let inConflict = false;
+      let inOurs = false;
+      for (const line of lines) {
+        if (line.startsWith("<<<<<<< ")) {
+          inConflict = true;
+          inOurs = true;
+          continue;
+        }
+        if (inConflict && line === "=======") {
+          inOurs = false;
+          continue;
+        }
+        if (inConflict && line.startsWith(">>>>>>> ")) {
+          inConflict = false;
+          inOurs = false;
+          continue;
+        }
+        if (!inConflict || inOurs) {
+          result.push(line);
+        }
+      }
+      return result.join("\n");
+    }
     var ReplayService = class {
       git;
       detector;
@@ -364533,7 +364634,7 @@ CLI Version: ${options2.cliVersion}`;
         }
         this.lockManager.save();
         try {
-          const redetectedPatches = await this.detector.detectNewPatches();
+          const { patches: redetectedPatches } = await this.detector.detectNewPatches();
           if (redetectedPatches.length > 0) {
             const redetectedFiles = new Set(redetectedPatches.flatMap((p10) => p10.files));
             const currentPatches = this.lockManager.getPatches();
@@ -364624,7 +364725,7 @@ CLI Version: ${options2.cliVersion}`;
         };
       }
       async handleNoPatchesRegeneration(options2) {
-        const newPatches = await this.detector.detectNewPatches();
+        const { patches: newPatches, revertedPatchIds } = await this.detector.detectNewPatches();
         const warnings = [...this.detector.warnings];
         if (options2?.dryRun) {
           return {
@@ -364633,11 +364734,18 @@ CLI Version: ${options2.cliVersion}`;
             patchesApplied: 0,
             patchesWithConflicts: 0,
             patchesSkipped: 0,
+            patchesReverted: revertedPatchIds.length,
             conflicts: [],
             wouldApply: newPatches,
             warnings: warnings.length > 0 ? warnings : void 0
           };
         }
+        for (const id2 of revertedPatchIds) {
+          try {
+            this.lockManager.removePatch(id2);
+          } catch {
+          }
+        }
         const commitOpts = options2 ? {
           cliVersion: options2.cliVersion ?? "unknown",
           generatorVersions: options2.generatorVersions ?? {},
@@ -364671,12 +364779,12 @@ CLI Version: ${options2.cliVersion}`;
             await this.committer.stageAll();
           }
         }
-        return this.buildReport("no-patches", newPatches, results, options2, warnings, rebaseCounts);
+        return this.buildReport("no-patches", newPatches, results, options2, warnings, rebaseCounts, void 0, revertedPatchIds.length);
       }
       async handleNormalRegeneration(options2) {
         if (options2?.dryRun) {
           const existingPatches2 = this.lockManager.getPatches();
-          const newPatches2 = await this.detector.detectNewPatches();
+          const { patches: newPatches2, revertedPatchIds: dryRunReverted } = await this.detector.detectNewPatches();
           const warnings2 = [...this.detector.warnings];
           const allPatches2 = [...existingPatches2, ...newPatches2];
           return {
@@ -364685,13 +364793,19 @@ CLI Version: ${options2.cliVersion}`;
             patchesApplied: 0,
             patchesWithConflicts: 0,
             patchesSkipped: 0,
+            patchesReverted: dryRunReverted.length,
             conflicts: [],
             wouldApply: allPatches2,
             warnings: warnings2.length > 0 ? warnings2 : void 0
           };
         }
         let existingPatches = this.lockManager.getPatches();
+        const preRebasePatchIds = new Set(existingPatches.map((p10) => p10.id));
         const preRebaseCounts = await this.preGenerationRebase(existingPatches);
+        const postRebasePatchIds = new Set(this.lockManager.getPatches().map((p10) => p10.id));
+        const removedByPreRebase = existingPatches.filter(
+          (p10) => preRebasePatchIds.has(p10.id) && !postRebasePatchIds.has(p10.id)
+        );
         existingPatches = this.lockManager.getPatches();
         const seenHashes = /* @__PURE__ */ new Set();
         for (const p10 of existingPatches) {
@@ -364702,8 +364816,28 @@ CLI Version: ${options2.cliVersion}`;
           }
         }
         existingPatches = this.lockManager.getPatches();
-        const newPatches = await this.detector.detectNewPatches();
+        let { patches: newPatches, revertedPatchIds } = await this.detector.detectNewPatches();
         const warnings = [...this.detector.warnings];
+        if (removedByPreRebase.length > 0) {
+          const removedOriginalCommits = new Set(removedByPreRebase.map((p10) => p10.original_commit));
+          const removedOriginalMessages = new Set(removedByPreRebase.map((p10) => p10.original_message));
+          newPatches = newPatches.filter((p10) => {
+            if (removedOriginalCommits.has(p10.original_commit)) return false;
+            if (isRevertCommit(p10.original_message)) {
+              const revertedMsg = parseRevertedMessage(p10.original_message);
+              if (revertedMsg && removedOriginalMessages.has(revertedMsg)) return false;
+            }
+            return true;
+          });
+        }
+        for (const id2 of revertedPatchIds) {
+          try {
+            this.lockManager.removePatch(id2);
+          } catch {
+          }
+        }
+        const revertedSet = new Set(revertedPatchIds);
+        existingPatches = existingPatches.filter((p10) => !revertedSet.has(p10.id));
         const allPatches = [...existingPatches, ...newPatches];
         const commitOpts = options2 ? {
           cliVersion: options2.cliVersion ?? "unknown",
@@ -364748,7 +364882,8 @@ CLI Version: ${options2.cliVersion}`;
           options2,
           warnings,
           rebaseCounts,
-          preRebaseCounts
+          preRebaseCounts,
+          revertedPatchIds.length
         );
       }
       /**
@@ -364941,36 +365076,6 @@ CLI Version: ${options2.cliVersion}`;
         }
         return { conflictResolved, conflictAbsorbed, contentRefreshed };
       }
-      /**
-       * Strip conflict markers from file content, keeping the OURS (Generated) side.
-       * Preserves clean patches' non-conflicting changes on shared files.
-       */
-      stripConflictMarkers(content5) {
-        const lines = content5.split("\n");
-        const result = [];
-        let inConflict = false;
-        let inOurs = false;
-        for (const line of lines) {
-          if (line.startsWith("<<<<<<< ")) {
-            inConflict = true;
-            inOurs = true;
-            continue;
-          }
-          if (inConflict && line === "=======") {
-            inOurs = false;
-            continue;
-          }
-          if (inConflict && line.startsWith(">>>>>>> ")) {
-            inConflict = false;
-            inOurs = false;
-            continue;
-          }
-          if (!inConflict || inOurs) {
-            result.push(line);
-          }
-        }
-        return result.join("\n");
-      }
       /**
        * After applyPatches(), strip conflict markers from conflicting files
        * so only clean content is committed. Keeps the Generated (OURS) side.
@@ -364983,7 +365088,7 @@ CLI Version: ${options2.cliVersion}`;
             const filePath = (0, import_node_path310.join)(this.outputDir, fileResult.file);
             try {
               const content5 = (0, import_node_fs210.readFileSync)(filePath, "utf-8");
-              const stripped = this.stripConflictMarkers(content5);
+              const stripped = stripConflictMarkers(content5);
               (0, import_node_fs210.writeFileSync)(filePath, stripped);
             } catch {
             }
@@ -364995,7 +365100,7 @@ CLI Version: ${options2.cliVersion}`;
         if (!(0, import_node_fs210.existsSync)(fernignorePath)) return [];
         return (0, import_node_fs210.readFileSync)(fernignorePath, "utf-8").split("\n").map((line) => line.trim()).filter((line) => line && !line.startsWith("#"));
       }
-      buildReport(flow4, patches, results, options2, warnings, rebaseCounts, preRebaseCounts) {
+      buildReport(flow4, patches, results, options2, warnings, rebaseCounts, preRebaseCounts, patchesReverted) {
         const conflictResults = results.filter((r23) => r23.status === "conflict");
         const conflictDetails = conflictResults.map((r23) => {
           const conflictFiles = r23.fileResults?.filter((f10) => f10.status === "conflict") ?? [];
@@ -365020,6 +365125,7 @@ CLI Version: ${options2.cliVersion}`;
           patchesRepointed: rebaseCounts && rebaseCounts.repointed > 0 ? rebaseCounts.repointed : void 0,
           patchesContentRebased: rebaseCounts && rebaseCounts.contentRebased > 0 ? rebaseCounts.contentRebased : void 0,
           patchesKeptAsUserOwned: rebaseCounts && rebaseCounts.keptAsUserOwned > 0 ? rebaseCounts.keptAsUserOwned : void 0,
+          patchesReverted: patchesReverted && patchesReverted > 0 ? patchesReverted : void 0,
           patchesConflictResolved: preRebaseCounts && preRebaseCounts.conflictResolved + preRebaseCounts.conflictAbsorbed > 0 ? preRebaseCounts.conflictResolved + preRebaseCounts.conflictAbsorbed : void 0,
           patchesRefreshed: preRebaseCounts && preRebaseCounts.contentRefreshed > 0 ? preRebaseCounts.contentRefreshed : void 0,
           conflicts: conflictResults.flatMap((r23) => r23.fileResults?.filter((f10) => f10.status === "conflict") ?? []),
@@ -365064,7 +365170,7 @@ CLI Version: ${options2.cliVersion}`;
       async analyzeMigration() {
         const patterns = this.readFernignorePatterns();
         const detector = new ReplayDetector(this.git, this.lockManager, this.outputDir);
-        const patches = await detector.detectNewPatches();
+        const { patches } = await detector.detectNewPatches();
         const trackedByBoth = [];
         const fernignoreOnly = [];
         const commitsOnly = [];
@@ -365189,7 +365295,7 @@ CLI Version: ${options2.cliVersion}`;
       async migrate() {
         const analysis = await this.analyzeMigration();
         const detector = new ReplayDetector(this.git, this.lockManager, this.outputDir);
-        const patches = await detector.detectNewPatches();
+        const { patches } = await detector.detectNewPatches();
         const warnings = [];
         let patchesCreated = 0;
         for (const patch5 of patches) {
@@ -463670,6 +463776,7 @@ __export(schemas_exports2, {
   UnionDiscriminatorContext: () => UnionDiscriminatorContext,
   WebSocketOrigin: () => WebSocketOrigin,
   WebhookMethodSchema: () => WebhookMethodSchema,
+  WebhookPayloadBodySortSchema: () => WebhookPayloadBodySortSchema,
   WebhookPayloadComponentSchema: () => WebhookPayloadComponentSchema,
   WebhookSignatureAlgorithmSchema: () => WebhookSignatureAlgorithmSchema,
   WebhookSignatureEncodingSchema: () => WebhookSignatureEncodingSchema,
@@ -463826,6 +463933,7 @@ var webhooks_exports = {};
 __export(webhooks_exports, {
   AsymmetricAlgorithmSchema: () => AsymmetricAlgorithmSchema,
   WebhookMethodSchema: () => WebhookMethodSchema,
+  WebhookPayloadBodySortSchema: () => WebhookPayloadBodySortSchema,
   WebhookPayloadComponentSchema: () => WebhookPayloadComponentSchema,
   WebhookSignatureAlgorithmSchema: () => WebhookSignatureAlgorithmSchema,
   WebhookSignatureEncodingSchema: () => WebhookSignatureEncodingSchema,
@@ -463849,6 +463957,11 @@ var WebhookMethodSchema = {
   Get: "GET"
 };
 
+// ../fern-definition/schema/lib/schemas/api/resources/webhooks/types/WebhookPayloadBodySortSchema.js
+var WebhookPayloadBodySortSchema = {
+  Alphabetical: "alphabetical"
+};
+
 // ../fern-definition/schema/lib/schemas/api/resources/webhooks/types/WebhookPayloadComponentSchema.js
 var WebhookPayloadComponentSchema = {
   Body: "body",
@@ -464056,6 +464169,7 @@ __export(serialization_exports, {
   WebSocketOrigin: () => WebSocketOrigin2,
   WebhookInlinedPayloadSchema: () => WebhookInlinedPayloadSchema,
   WebhookMethodSchema: () => WebhookMethodSchema2,
+  WebhookPayloadBodySortSchema: () => WebhookPayloadBodySortSchema2,
   WebhookPayloadComponentSchema: () => WebhookPayloadComponentSchema2,
   WebhookPayloadFormatSchema: () => WebhookPayloadFormatSchema,
   WebhookPayloadSchema: () => WebhookPayloadSchema,
@@ -466476,13 +466590,17 @@ var AsymmetricSignatureSchema = schemas_exports.object({
   timestamp: WebhookTimestampSchema.optional()
 });
 
+// ../fern-definition/schema/lib/schemas/serialization/resources/webhooks/types/WebhookPayloadBodySortSchema.js
+var WebhookPayloadBodySortSchema2 = schemas_exports.enum_(["alphabetical"]);
+
 // ../fern-definition/schema/lib/schemas/serialization/resources/webhooks/types/WebhookPayloadComponentSchema.js
 var WebhookPayloadComponentSchema2 = schemas_exports.enum_(["body", "timestamp", "notification-url", "message-id"]);
 
 // ../fern-definition/schema/lib/schemas/serialization/resources/webhooks/types/WebhookPayloadFormatSchema.js
 var WebhookPayloadFormatSchema = schemas_exports.object({
   components: schemas_exports.list(WebhookPayloadComponentSchema2),
-  delimiter: schemas_exports.string().optional()
+  delimiter: schemas_exports.string().optional(),
+  "body-sort": WebhookPayloadBodySortSchema2.optional()
 });
 
 // ../fern-definition/schema/lib/schemas/serialization/resources/webhooks/types/WebhookSignatureAlgorithmSchema.js
@@ -466824,6 +466942,7 @@ __export(webhooks_exports2, {
   HmacSignatureSchema: () => HmacSignatureSchema,
   WebhookInlinedPayloadSchema: () => WebhookInlinedPayloadSchema,
   WebhookMethodSchema: () => WebhookMethodSchema2,
+  WebhookPayloadBodySortSchema: () => WebhookPayloadBodySortSchema2,
   WebhookPayloadComponentSchema: () => WebhookPayloadComponentSchema2,
   WebhookPayloadFormatSchema: () => WebhookPayloadFormatSchema,
   WebhookPayloadSchema: () => WebhookPayloadSchema,
@@ -467054,6 +467173,7 @@ __export(api_exports, {
   WebSocketMessageOrigin: () => WebSocketMessageOrigin,
   WebhookHttpMethod: () => WebhookHttpMethod,
   WebhookPayload: () => WebhookPayload,
+  WebhookPayloadBodySort: () => WebhookPayloadBodySort,
   WebhookPayloadComponent: () => WebhookPayloadComponent,
   WebhookSignatureEncoding: () => WebhookSignatureEncoding,
   WebhookSignatureVerification: () => WebhookSignatureVerification,
@@ -471312,6 +471432,7 @@ __export(webhooks_exports3, {
   HmacAlgorithm: () => HmacAlgorithm,
   WebhookHttpMethod: () => WebhookHttpMethod,
   WebhookPayload: () => WebhookPayload,
+  WebhookPayloadBodySort: () => WebhookPayloadBodySort,
   WebhookPayloadComponent: () => WebhookPayloadComponent,
   WebhookSignatureEncoding: () => WebhookSignatureEncoding,
   WebhookSignatureVerification: () => WebhookSignatureVerification,
@@ -471460,6 +471581,22 @@ var WebhookPayload = {
   }
 };
 
+// ../../ir-sdk/lib/sdk/api/resources/webhooks/types/WebhookPayloadBodySort.js
+var WebhookPayloadBodySortValues = {
+  Alphabetical: "ALPHABETICAL"
+};
+var WebhookPayloadBodySort = {
+  ...WebhookPayloadBodySortValues,
+  _visit: (value, visitor) => {
+    switch (value) {
+      case WebhookPayloadBodySort.Alphabetical:
+        return visitor.alphabetical();
+      default:
+        return visitor._other();
+    }
+  }
+};
+
 // ../../ir-sdk/lib/sdk/api/resources/webhooks/types/WebhookPayloadComponent.js
 var WebhookPayloadComponentValues = {
   /**
@@ -471970,6 +472107,7 @@ __export(serialization_exports2, {
   WebhookId: () => WebhookId,
   WebhookName: () => WebhookName,
   WebhookPayload: () => WebhookPayload2,
+  WebhookPayloadBodySort: () => WebhookPayloadBodySort2,
   WebhookPayloadComponent: () => WebhookPayloadComponent2,
   WebhookPayloadFormat: () => WebhookPayloadFormat,
   WebhookPayloadReference: () => WebhookPayloadReference,
@@ -477373,13 +477511,17 @@ var AsymmetricKeySignatureVerification = schemas_exports3.objectWithoutOptionalP
 // ../../ir-sdk/lib/sdk/serialization/resources/webhooks/types/HmacAlgorithm.js
 var HmacAlgorithm2 = schemas_exports3.enum_(["SHA256", "SHA1", "SHA384", "SHA512"]);
 
+// ../../ir-sdk/lib/sdk/serialization/resources/webhooks/types/WebhookPayloadBodySort.js
+var WebhookPayloadBodySort2 = schemas_exports3.enum_(["ALPHABETICAL"]);
+
 // ../../ir-sdk/lib/sdk/serialization/resources/webhooks/types/WebhookPayloadComponent.js
 var WebhookPayloadComponent2 = schemas_exports3.enum_(["BODY", "TIMESTAMP", "NOTIFICATION_URL", "MESSAGE_ID"]);
 
 // ../../ir-sdk/lib/sdk/serialization/resources/webhooks/types/WebhookPayloadFormat.js
 var WebhookPayloadFormat = schemas_exports3.objectWithoutOptionalProperties({
   components: schemas_exports3.list(WebhookPayloadComponent2),
-  delimiter: schemas_exports3.string()
+  delimiter: schemas_exports3.string(),
+  bodySort: WebhookPayloadBodySort2.optional()
 });
 
 // ../../ir-sdk/lib/sdk/serialization/resources/webhooks/types/HmacSignatureVerification.js
@@ -478225,6 +478367,7 @@ __export(webhooks_exports4, {
   WebhookHttpMethod: () => WebhookHttpMethod2,
   WebhookName: () => WebhookName,
   WebhookPayload: () => WebhookPayload2,
+  WebhookPayloadBodySort: () => WebhookPayloadBodySort2,
   WebhookPayloadComponent: () => WebhookPayloadComponent2,
   WebhookPayloadFormat: () => WebhookPayloadFormat,
   WebhookPayloadReference: () => WebhookPayloadReference,
@@ -502877,6 +503020,7 @@ __export(finalIr_exports, {
   Schema: () => Schema,
   SupportedSdkLanguage: () => SupportedSdkLanguage3,
   WebhookHttpMethod: () => WebhookHttpMethod3,
+  WebhookPayloadBodySort: () => WebhookPayloadBodySort3,
   WebhookPayloadComponent: () => WebhookPayloadComponent3,
   WebhookSignatureAlgorithm: () => WebhookSignatureAlgorithm,
   WebhookSignatureEncoding: () => WebhookSignatureEncoding3,
@@ -503778,6 +503922,22 @@ var WebhookHttpMethod3 = {
   }
 };
 
+// ../api-importers/openapi/openapi-ir/lib/sdk/api/resources/finalIr/types/WebhookPayloadBodySort.js
+var WebhookPayloadBodySortValues2 = {
+  Alphabetical: "alphabetical"
+};
+var WebhookPayloadBodySort3 = {
+  ...WebhookPayloadBodySortValues2,
+  _visit: (value, visitor) => {
+    switch (value) {
+      case WebhookPayloadBodySort3.Alphabetical:
+        return visitor.alphabetical();
+      default:
+        return visitor._other();
+    }
+  }
+};
+
 // ../api-importers/openapi/openapi-ir/lib/sdk/api/resources/finalIr/types/WebhookPayloadComponent.js
 var WebhookPayloadComponentValues2 = {
   Body: "body",
@@ -504525,6 +504685,7 @@ __export(serialization_exports5, {
   Webhook: () => Webhook2,
   WebhookExampleCall: () => WebhookExampleCall,
   WebhookHttpMethod: () => WebhookHttpMethod4,
+  WebhookPayloadBodySort: () => WebhookPayloadBodySort4,
   WebhookPayloadComponent: () => WebhookPayloadComponent4,
   WebhookPayloadFormat: () => WebhookPayloadFormat2,
   WebhookSignatureAlgorithm: () => WebhookSignatureAlgorithm2,
@@ -506532,6 +506693,7 @@ __export(finalIr_exports2, {
   Webhook: () => Webhook2,
   WebhookExampleCall: () => WebhookExampleCall,
   WebhookHttpMethod: () => WebhookHttpMethod4,
+  WebhookPayloadBodySort: () => WebhookPayloadBodySort4,
   WebhookPayloadComponent: () => WebhookPayloadComponent4,
   WebhookPayloadFormat: () => WebhookPayloadFormat2,
   WebhookSignatureAlgorithm: () => WebhookSignatureAlgorithm2,
@@ -507068,13 +507230,17 @@ var GlobalHeader = schemas_exports9.objectWithoutOptionalProperties({
 // ../api-importers/openapi/openapi-ir/lib/sdk/serialization/resources/finalIr/types/GlobalSecurity.js
 var GlobalSecurity = schemas_exports9.list(schemas_exports9.record(SecuritySchemeId, schemas_exports9.list(schemas_exports9.string())));
 
+// ../api-importers/openapi/openapi-ir/lib/sdk/serialization/resources/finalIr/types/WebhookPayloadBodySort.js
+var WebhookPayloadBodySort4 = schemas_exports9.enum_(["alphabetical"]);
+
 // ../api-importers/openapi/openapi-ir/lib/sdk/serialization/resources/finalIr/types/WebhookPayloadComponent.js
 var WebhookPayloadComponent4 = schemas_exports9.enum_(["body", "timestamp", "notification-url", "message-id"]);
 
 // ../api-importers/openapi/openapi-ir/lib/sdk/serialization/resources/finalIr/types/WebhookPayloadFormat.js
 var WebhookPayloadFormat2 = schemas_exports9.objectWithoutOptionalProperties({
   components: schemas_exports9.list(WebhookPayloadComponent4),
-  delimiter: schemas_exports9.string().optional()
+  delimiter: schemas_exports9.string().optional(),
+  bodySort: WebhookPayloadBodySort4.optional()
 });
 
 // ../api-importers/openapi/openapi-ir/lib/sdk/serialization/resources/finalIr/types/WebhookSignatureAlgorithm.js
@@ -512777,9 +512943,21 @@ function convertPayloadFormat(payloadFormat) {
   }
   return {
     components: payloadFormat.components.map(convertPayloadComponent),
-    delimiter: payloadFormat.delimiter
+    delimiter: payloadFormat.delimiter,
+    "body-sort": convertBodySort(payloadFormat.bodySort)
   };
 }
+function convertBodySort(bodySort) {
+  if (bodySort == null) {
+    return void 0;
+  }
+  switch (bodySort) {
+    case "alphabetical":
+      return "alphabetical";
+    default:
+      return void 0;
+  }
+}
 function convertPayloadComponent(component) {
   switch (component) {
     case "body":
@@ -530514,9 +530692,19 @@ function convertPayloadFormat2(payloadFormat) {
           return finalIr_exports.WebhookPayloadComponent.MessageId;
       }
     }),
-    delimiter: payloadFormat.delimiter
+    delimiter: payloadFormat.delimiter,
+    bodySort: convertBodySort2(payloadFormat["body-sort"])
   };
 }
+function convertBodySort2(bodySort) {
+  if (bodySort == null) {
+    return void 0;
+  }
+  switch (bodySort) {
+    case "alphabetical":
+      return finalIr_exports.WebhookPayloadBodySort.Alphabetical;
+  }
+}
 function convertAlgorithm(algorithm) {
   if (algorithm == null) {
     return void 0;
@@ -547909,14 +548097,24 @@ function convertPayloadFormat3(payloadFormat) {
   if (payloadFormat == null) {
     return {
       components: [WebhookPayloadComponent.Body],
-      delimiter: ""
+      delimiter: "",
+      bodySort: void 0
     };
   }
   return {
     components: payloadFormat.components.map(convertPayloadComponent2),
-    delimiter: payloadFormat.delimiter ?? ""
+    delimiter: payloadFormat.delimiter ?? "",
+    bodySort: convertBodySort3(payloadFormat["body-sort"])
   };
 }
+function convertBodySort3(bodySort) {
+  switch (bodySort) {
+    case "alphabetical":
+      return WebhookPayloadBodySort.Alphabetical;
+    case void 0:
+      return void 0;
+  }
+}
 function convertPayloadComponent2(component) {
   switch (component) {
     case "body":
@@ -574778,6 +574976,12 @@ var definitions2 = {
       "message-id"
     ]
   },
+  "webhooks.WebhookPayloadBodySortSchema": {
+    type: "string",
+    enum: [
+      "alphabetical"
+    ]
+  },
   "webhooks.WebhookPayloadFormatSchema": {
     type: "object",
     properties: {
@@ -574796,6 +575000,16 @@ var definitions2 = {
             type: "null"
           }
         ]
+      },
+      "body-sort": {
+        oneOf: [
+          {
+            $ref: "#/definitions/webhooks.WebhookPayloadBodySortSchema"
+          },
+          {
+            type: "null"
+          }
+        ]
       }
     },
     required: [
@@ -578868,6 +579082,12 @@ var definitions3 = {
       "message-id"
     ]
   },
+  "webhooks.WebhookPayloadBodySortSchema": {
+    type: "string",
+    enum: [
+      "alphabetical"
+    ]
+  },
   "webhooks.WebhookPayloadFormatSchema": {
     type: "object",
     properties: {
@@ -578886,6 +579106,16 @@ var definitions3 = {
             type: "null"
           }
         ]
+      },
+      "body-sort": {
+        oneOf: [
+          {
+            $ref: "#/definitions/webhooks.WebhookPayloadBodySortSchema"
+          },
+          {
+            type: "null"
+          }
+        ]
       }
     },
     required: [
@@ -601952,7 +602182,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.48.1",
+          version: "4.49.0-5-gc7a93e39202",
           usingAccessToken: true
         }
       });
@@ -602003,7 +602233,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.48.1",
+        version: "4.49.0-5-gc7a93e39202",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -825858,7 +826088,7 @@ var import_path54 = __toESM(require("path"), 1);
 var LOCAL_STORAGE_FOLDER4 = ".fern-dev";
 var LOGS_FOLDER_NAME = "logs";
 function getCliSource() {
-  const version7 = "4.48.1";
+  const version7 = "4.49.0-5-gc7a93e39202";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -836860,7 +837090,7 @@ var LegacyDocsPublisher = class {
         previewId: void 0,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.48.1"
+        cliVersion: "4.49.0-5-gc7a93e39202"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
         return { success: false };
@@ -909975,7 +910205,7 @@ var CliContext = class {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.48.1";
+    return "4.49.0-5-gc7a93e39202";
   }
   getCliName() {
     if (false) {

package/package.json

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