@fern-api/fern-api-dev 5.28.1 → 5.28.3

package/cli.cjs

@@ -11036,9 +11036,9 @@ var require_commonjs = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/brace-expansion@5.0.5/node_modules/brace-expansion/dist/commonjs/index.js
+// ../../../node_modules/.pnpm/brace-expansion@5.0.6/node_modules/brace-expansion/dist/commonjs/index.js
 var require_commonjs2 = __commonJS({
-  "../../../node_modules/.pnpm/brace-expansion@5.0.5/node_modules/brace-expansion/dist/commonjs/index.js"(exports2) {
+  "../../../node_modules/.pnpm/brace-expansion@5.0.6/node_modules/brace-expansion/dist/commonjs/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.EXPANSION_MAX = void 0;
@@ -11162,7 +11162,7 @@ var require_commonjs2 = __commonJS({
           }
           const pad3 = n19.some(isPadded2);
           N4 = [];
-          for (let i9 = x5; test2(i9, y7); i9 += incr) {
+          for (let i9 = x5; test2(i9, y7) && N4.length < max; i9 += incr) {
             let c6;
             if (isAlphaSequence) {
               c6 = String.fromCharCode(i9);
@@ -45171,7 +45171,7 @@ var init_esm9 = __esm({
   }
 });
 
-// ../../../node_modules/.pnpm/brace-expansion@5.0.5/node_modules/brace-expansion/dist/esm/index.js
+// ../../../node_modules/.pnpm/brace-expansion@5.0.6/node_modules/brace-expansion/dist/esm/index.js
 function numeric(str3) {
   return !isNaN(str3) ? parseInt(str3, 10) : str3.charCodeAt(0);
 }
@@ -45274,7 +45274,7 @@ function expand_(str3, max, isTop) {
       }
       const pad3 = n19.some(isPadded);
       N4 = [];
-      for (let i9 = x5; test2(i9, y7); i9 += incr) {
+      for (let i9 = x5; test2(i9, y7) && N4.length < max; i9 += incr) {
         let c6;
         if (isAlphaSequence) {
           c6 = String.fromCharCode(i9);
@@ -45316,7 +45316,7 @@ function expand_(str3, max, isTop) {
 }
 var escSlash, escOpen, escClose, escComma, escPeriod, escSlashPattern, escOpenPattern, escClosePattern, escCommaPattern, escPeriodPattern, slashPattern, openPattern, closePattern, commaPattern, periodPattern, EXPANSION_MAX;
 var init_esm10 = __esm({
-  "../../../node_modules/.pnpm/brace-expansion@5.0.5/node_modules/brace-expansion/dist/esm/index.js"() {
+  "../../../node_modules/.pnpm/brace-expansion@5.0.6/node_modules/brace-expansion/dist/esm/index.js"() {
     "use strict";
     init_esm9();
     escSlash = "\0SLASH" + Math.random() + "\0";
@@ -332299,9 +332299,9 @@ var require_express3 = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/constants.js
+// ../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/lib/constants.js
 var require_constants2 = __commonJS({
-  "../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/constants.js"(exports2, module4) {
+  "../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/lib/constants.js"(exports2, module4) {
     "use strict";
     var BINARY_TYPES = ["nodebuffer", "arraybuffer", "fragments"];
     var hasBlob = typeof Blob !== "undefined";
@@ -332322,9 +332322,9 @@ var require_constants2 = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/buffer-util.js
+// ../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/lib/buffer-util.js
 var require_buffer_util = __commonJS({
-  "../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/buffer-util.js"(exports2, module4) {
+  "../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/lib/buffer-util.js"(exports2, module4) {
     "use strict";
     var { EMPTY_BUFFER } = require_constants2();
     var FastBuffer = Buffer[Symbol.species];
@@ -332397,9 +332397,9 @@ var require_buffer_util = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/limiter.js
+// ../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/lib/limiter.js
 var require_limiter2 = __commonJS({
-  "../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/limiter.js"(exports2, module4) {
+  "../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/lib/limiter.js"(exports2, module4) {
     "use strict";
     var kDone = /* @__PURE__ */ Symbol("kDone");
     var kRun = /* @__PURE__ */ Symbol("kRun");
@@ -332447,9 +332447,9 @@ var require_limiter2 = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/permessage-deflate.js
+// ../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/lib/permessage-deflate.js
 var require_permessage_deflate = __commonJS({
-  "../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/permessage-deflate.js"(exports2, module4) {
+  "../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/lib/permessage-deflate.js"(exports2, module4) {
     "use strict";
     var zlib4 = require("zlib");
     var bufferUtil = require_buffer_util();
@@ -332830,9 +332830,9 @@ var require_permessage_deflate = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/validation.js
+// ../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/lib/validation.js
 var require_validation4 = __commonJS({
-  "../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/validation.js"(exports2, module4) {
+  "../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/lib/validation.js"(exports2, module4) {
     "use strict";
     var { isUtf8 } = require("buffer");
     var { hasBlob } = require_constants2();
@@ -333031,9 +333031,9 @@ var require_validation4 = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/receiver.js
+// ../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/lib/receiver.js
 var require_receiver = __commonJS({
-  "../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/receiver.js"(exports2, module4) {
+  "../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/lib/receiver.js"(exports2, module4) {
     "use strict";
     var { Writable: Writable2 } = require("stream");
     var PerMessageDeflate2 = require_permessage_deflate();
@@ -333623,12 +333623,15 @@ var require_receiver = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/sender.js
+// ../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/lib/sender.js
 var require_sender = __commonJS({
-  "../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/sender.js"(exports2, module4) {
+  "../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/lib/sender.js"(exports2, module4) {
     "use strict";
     var { Duplex } = require("stream");
     var { randomFillSync } = require("crypto");
+    var {
+      types: { isUint8Array: isUint8Array3 }
+    } = require("util");
     var PerMessageDeflate2 = require_permessage_deflate();
     var { EMPTY_BUFFER, kWebSocket, NOOP: NOOP3 } = require_constants2();
     var { isBlob: isBlob5, isValidStatusCode } = require_validation4();
@@ -333782,8 +333785,10 @@ var require_sender = __commonJS({
           buf.writeUInt16BE(code5, 0);
           if (typeof data2 === "string") {
             buf.write(data2, 2);
-          } else {
+          } else if (isUint8Array3(data2)) {
             buf.set(data2, 2);
+          } else {
+            throw new TypeError("Second argument must be a string or a Uint8Array");
           }
         }
         const options2 = {
@@ -334111,9 +334116,9 @@ var require_sender = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/event-target.js
+// ../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/lib/event-target.js
 var require_event_target = __commonJS({
-  "../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/event-target.js"(exports2, module4) {
+  "../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/lib/event-target.js"(exports2, module4) {
     "use strict";
     var { kForOnEventAttribute, kListener } = require_constants2();
     var kCode = /* @__PURE__ */ Symbol("kCode");
@@ -334340,9 +334345,9 @@ var require_event_target = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/extension.js
+// ../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/lib/extension.js
 var require_extension = __commonJS({
-  "../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/extension.js"(exports2, module4) {
+  "../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/lib/extension.js"(exports2, module4) {
     "use strict";
     var { tokenChars } = require_validation4();
     function push3(dest, name2, elem) {
@@ -334493,9 +334498,9 @@ var require_extension = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/websocket.js
+// ../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/lib/websocket.js
 var require_websocket = __commonJS({
-  "../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/websocket.js"(exports2, module4) {
+  "../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/lib/websocket.js"(exports2, module4) {
     "use strict";
     var EventEmitter9 = require("events");
     var https5 = require("https");
@@ -335379,9 +335384,9 @@ var require_websocket = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/stream.js
+// ../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/lib/stream.js
 var require_stream3 = __commonJS({
-  "../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/stream.js"(exports2, module4) {
+  "../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/lib/stream.js"(exports2, module4) {
     "use strict";
     var WebSocket3 = require_websocket();
     var { Duplex } = require("stream");
@@ -335477,9 +335482,9 @@ var require_stream3 = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/subprotocol.js
+// ../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/lib/subprotocol.js
 var require_subprotocol = __commonJS({
-  "../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/subprotocol.js"(exports2, module4) {
+  "../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/lib/subprotocol.js"(exports2, module4) {
     "use strict";
     var { tokenChars } = require_validation4();
     function parse19(header) {
@@ -335522,9 +335527,9 @@ var require_subprotocol = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/websocket-server.js
+// ../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/lib/websocket-server.js
 var require_websocket_server = __commonJS({
-  "../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/websocket-server.js"(exports2, module4) {
+  "../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/lib/websocket-server.js"(exports2, module4) {
     "use strict";
     var EventEmitter9 = require("events");
     var http13 = require("http");
@@ -335915,10 +335920,10 @@ var require_websocket_server = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/wrapper.mjs
+// ../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/wrapper.mjs
 var import_stream16, import_extension, import_permessage_deflate, import_receiver, import_sender, import_subprotocol, import_websocket, import_websocket_server, wrapper_default;
 var init_wrapper = __esm({
-  "../../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/wrapper.mjs"() {
+  "../../../node_modules/.pnpm/ws@8.20.1/node_modules/ws/wrapper.mjs"() {
     "use strict";
     import_stream16 = __toESM(require_stream3(), 1);
     import_extension = __toESM(require_extension(), 1);
@@ -360342,9 +360347,9 @@ var require_diff3 = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/@fern-api+replay@0.15.2/node_modules/@fern-api/replay/dist/index.cjs
+// ../../../node_modules/.pnpm/@fern-api+replay@0.16.0/node_modules/@fern-api/replay/dist/index.cjs
 var require_dist14 = __commonJS({
-  "../../../node_modules/.pnpm/@fern-api+replay@0.15.2/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
+  "../../../node_modules/.pnpm/@fern-api+replay@0.16.0/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
     "use strict";
     var __defProp4 = Object.defineProperty;
     var __getOwnPropDesc4 = Object.getOwnPropertyDescriptor;
@@ -360880,9 +360885,22 @@ var require_dist14 = __commonJS({
       const hasGenerationMarker = commit.message.startsWith("[fern-generated]") || commit.message.startsWith("[fern-replay]") || commit.message.startsWith("[fern-autoversion]") || commit.message.includes("Generated by Fern") || commit.message.includes("\u{1F916} Generated with Fern") || // Squash merge of a Fern-generated PR uses the PR title as commit message.
       // The default PR title is "SDK Generation" (from GithubStep's commitMessage default).
       // GitHub appends "(#N)" for the PR number, e.g. "SDK Generation (#70)".
-      commit.message.startsWith("SDK Generation");
+      commit.message.startsWith("SDK Generation") || // Merge commit (GitHub's "Create a merge commit" option) of a fern-bot
+      // regen PR. First-parent walking lands on this commit, not on the
+      // generation commit on the side branch, so the classifier must treat
+      // it as a generation boundary. GitHub's default subject is
+      // "Merge pull request #N from <owner>/<branch>"; fern-bot branches are
+      // named "<owner>/fern-bot/<...>".
+      /^Merge pull request #\d+ from [^/]+\/fern-bot\//.test(commit.message);
       return isBotAuthor || hasGenerationMarker;
     }
+    function isGenerationBoundary(commit) {
+      const isFernSupport = FERN_SUPPORT_NAMES.includes(commit.authorName);
+      const isBotAuthor = !isFernSupport && (commit.authorLogin === FERN_BOT_LOGIN || commit.authorEmail === FERN_BOT_EMAIL || commit.authorName === FERN_BOT_NAME);
+      const isAutoversion = commit.message.startsWith("[fern-autoversion]");
+      const hasBoundaryMarker = commit.message.startsWith("[fern-generated]") || commit.message.startsWith("[fern-replay]") || commit.message.includes("Generated by Fern") || commit.message.includes("\u{1F916} Generated with Fern") || commit.message.startsWith("SDK Generation");
+      return isBotAuthor && !isAutoversion || hasBoundaryMarker;
+    }
     function isReplayCommit(commit) {
       return commit.message.startsWith("[fern-replay]");
     }
@@ -361202,8 +361220,48 @@ var require_dist14 = __commonJS({
         this.lockManager = lockManager;
         this.sdkOutputDir = sdkOutputDir;
       }
+      /**
+       * Derive the previous-generation SHA from git history instead of trusting
+       * `lock.current_generation`.
+       *
+       * Walks `git log HEAD --first-parent` and returns the SHA of the most recent
+       * commit that `isGenerationBoundary` classifies as a customization-baseline
+       * boundary, or null if no such commit is reachable from HEAD on the mainline.
+       *
+       * `isGenerationBoundary` is intentionally narrower than `isGenerationCommit`:
+       * it excludes `[fern-autoversion]` (lightweight bumps that don't reset the
+       * baseline) and the GitHub merge-commit subject for fern-bot regen PRs
+       * (which sits on first-parent but where the customer fix-up commits live
+       * on second-parent — stopping at the merge would hide them).
+       *
+       * See docs/adr/0001-derived-scan-boundary.md.
+       */
+      async findPreviousGenerationFromHistory() {
+        let log4;
+        try {
+          log4 = await this.git.exec([
+            "log",
+            "--first-parent",
+            "--format=%H%x00%an%x00%ae%x00%s",
+            "HEAD"
+          ]);
+        } catch {
+          return null;
+        }
+        for (const commit of this.parseGitLog(log4)) {
+          if (isGenerationBoundary(commit)) {
+            return commit.sha;
+          }
+        }
+        return null;
+      }
       async detectNewPatches() {
         const lock = this.lockManager.read();
+        const derivedSha = await this.findPreviousGenerationFromHistory();
+        if (derivedSha !== null) {
+          const derivedRecord = await this.synthesizeGenerationRecord(derivedSha);
+          return this.detectPatchesInRange(derivedSha, derivedRecord, lock);
+        }
         const lastGen = this.getLastGeneration(lock);
         if (!lastGen) {
           return { patches: [], revertedPatchIds: [] };
@@ -361211,7 +361269,7 @@ var require_dist14 = __commonJS({
         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. Falling back to alternate detection.`
+            `Generation commit ${lastGen.commit_sha.slice(0, 7)} not found in git history. Falling back to tree-diff detection (likely a shallow clone).`
           );
           return this.detectPatchesViaTreeDiff(
             lastGen,
@@ -361219,44 +361277,8 @@ var require_dist14 = __commonJS({
             true
           );
         }
-        const isAncestor = await this.git.isAncestor(lastGen.commit_sha, "HEAD");
-        if (!isAncestor) {
-          return this.detectPatchesViaMergeBase(lastGen, lock);
-        }
         return this.detectPatchesInRange(lastGen.commit_sha, lastGen, lock);
       }
-      /**
-       * Non-linear-history detection via `merge-base(prevGen, HEAD)`.
-       *
-       * After a squash-merge of a Fern-bot PR, `lastGen.commit_sha` (the previous
-       * `[fern-generated]`) is orphaned but still in git's object database. The
-       * merge-base is the commit on main from which the bot's branch was created —
-       * a reachable ancestor of HEAD. Walking that range and classifying each
-       * commit via `isGenerationCommit` mirrors the linear path and eliminates
-       * the bug class where pipeline-driven changes (autoversion, replay,
-       * generation) get bundled as customer customizations.
-       *
-       * Falls through to the legacy composite path when no common ancestor exists
-       * (truly disjoint history — orphan branches with no shared root).
-       */
-      async detectPatchesViaMergeBase(lastGen, lock) {
-        let mergeBase = "";
-        try {
-          mergeBase = (await this.git.exec(["merge-base", lastGen.commit_sha, "HEAD"])).trim();
-        } catch {
-        }
-        if (!mergeBase) {
-          this.warnings.push(
-            `No common ancestor between previous generation ${lastGen.commit_sha.slice(0, 7)} and HEAD. Falling back to composite tree-diff detection.`
-          );
-          return this.detectPatchesViaTreeDiff(
-            lastGen,
-            /* commitKnownMissing */
-            false
-          );
-        }
-        return this.detectPatchesInRange(mergeBase, lastGen, lock);
-      }
       /**
        * Walk `${rangeStart}..HEAD`, classify each commit, emit one
        * `StoredPatch` per customer commit. Body shared by the linear path
@@ -361692,6 +361714,26 @@ var require_dist14 = __commonJS({
       getLastGeneration(lock) {
         return lock.generations.find((g8) => g8.commit_sha === lock.current_generation);
       }
+      /**
+       * Build a transient `GenerationRecord` from a SHA derived by walking git
+       * history. Only `commit_sha` (and `tree_hash` when needed downstream) is
+       * load-bearing here; the rest are filled with defensible placeholders.
+       * This record is consumed by `detectPatchesInRange` and is never persisted.
+       */
+      async synthesizeGenerationRecord(sha) {
+        let tree_hash = "";
+        try {
+          tree_hash = await this.git.getTreeHash(sha);
+        } catch {
+        }
+        return {
+          commit_sha: sha,
+          tree_hash,
+          timestamp: (/* @__PURE__ */ new Date(0)).toISOString(),
+          cli_version: "",
+          generator_versions: {}
+        };
+      }
     };
     var import_node_diff3 = require_diff3();
     function threeWayMerge(base4, ours, theirs) {
@@ -362813,8 +362855,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
           tree_hash: treeHash,
           timestamp: (/* @__PURE__ */ new Date()).toISOString(),
           cli_version: options2?.cliVersion ?? "unknown",
-          generator_versions: options2?.generatorVersions ?? {},
-          base_branch_head: options2?.baseBranchHead
+          generator_versions: options2?.generatorVersions ?? {}
         };
       }
       async stageAll() {
@@ -363193,7 +363234,6 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
             flow: "first-generation",
             previousGenerationSha: null,
             currentGenerationSha: headSha,
-            baseBranchHead: options2.baseBranchHead ?? null,
             _prepared: {
               kind: "terminal",
               flow: "first-generation",
@@ -363203,8 +363243,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         }
         const commitOpts = options2 ? {
           cliVersion: options2.cliVersion ?? "unknown",
-          generatorVersions: options2.generatorVersions ?? {},
-          baseBranchHead: options2.baseBranchHead
+          generatorVersions: options2.generatorVersions ?? {}
         } : void 0;
         await this.service.committer.commitGeneration("Initial SDK generation", commitOpts);
         const genRecord = await this.service.committer.createGenerationRecord(commitOpts);
@@ -363213,7 +363252,6 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
           flow: "first-generation",
           previousGenerationSha: null,
           currentGenerationSha: genRecord.commit_sha,
-          baseBranchHead: options2?.baseBranchHead ?? null,
           _prepared: {
             kind: "active",
             flow: "first-generation",
@@ -363248,8 +363286,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
       async prepare(options2) {
         const commitOpts = options2 ? {
           cliVersion: options2.cliVersion ?? "unknown",
-          generatorVersions: options2.generatorVersions ?? {},
-          baseBranchHead: options2.baseBranchHead
+          generatorVersions: options2.generatorVersions ?? {}
         } : void 0;
         await this.service.committer.commitGeneration("Update SDK (replay skipped)", commitOpts);
         await this.service.cleanupStaleConflictMarkers();
@@ -363271,7 +363308,6 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
           flow: "skip-application",
           previousGenerationSha,
           currentGenerationSha: genRecord.commit_sha,
-          baseBranchHead: options2?.baseBranchHead ?? null,
           _prepared: {
             kind: "active",
             flow: "skip-application",
@@ -363330,7 +363366,6 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
             flow: "no-patches",
             previousGenerationSha,
             currentGenerationSha: headSha,
-            baseBranchHead: options2.baseBranchHead ?? null,
             _prepared: {
               kind: "terminal",
               flow: "no-patches",
@@ -363362,8 +363397,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         }
         const commitOpts = options2 ? {
           cliVersion: options2.cliVersion ?? "unknown",
-          generatorVersions: options2.generatorVersions ?? {},
-          baseBranchHead: options2.baseBranchHead
+          generatorVersions: options2.generatorVersions ?? {}
         } : void 0;
         await this.service.committer.commitGeneration("Update SDK", commitOpts);
         await this.service.cleanupStaleConflictMarkers();
@@ -363373,7 +363407,6 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
           flow: "no-patches",
           previousGenerationSha,
           currentGenerationSha: genRecord.commit_sha,
-          baseBranchHead: options2?.baseBranchHead ?? null,
           _prepared: {
             kind: "active",
             flow: "no-patches",
@@ -363461,7 +363494,6 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
             flow: "normal-regeneration",
             previousGenerationSha,
             currentGenerationSha: headSha,
-            baseBranchHead: options2.baseBranchHead ?? null,
             _prepared: {
               kind: "terminal",
               flow: "normal-regeneration",
@@ -363479,14 +363511,16 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         existingPatches = this.service.lockManager.getPatches();
         const seenHashes = /* @__PURE__ */ new Map();
         for (const p14 of existingPatches) {
-          const priorPatchId = seenHashes.get(p14.content_hash);
-          if (priorPatchId !== void 0) {
-            this.service.lockManager.removePatch(p14.id);
-            this.service.warnings.push(
-              `Consolidated patch ${p14.id} (commit ${(p14.original_commit || "<missing>").slice(0, 7)}) into prior patch ${priorPatchId}: byte-identical patch_content. Per-commit attribution preserved in git log; lockfile collapsed to avoid duplicate-apply corruption on next regen.`
-            );
-          } else {
-            seenHashes.set(p14.content_hash, p14.id);
+          if (!p14.original_commit || p14.original_commit === "") {
+            const priorPatchId = seenHashes.get(p14.content_hash);
+            if (priorPatchId !== void 0) {
+              this.service.lockManager.removePatch(p14.id);
+              this.service.warnings.push(
+                `Consolidated patch ${p14.id} into prior patch ${priorPatchId}: byte-identical patch_content. Lockfile collapsed to avoid duplicate-apply corruption on next regen.`
+              );
+            } else {
+              seenHashes.set(p14.content_hash, p14.id);
+            }
           }
         }
         existingPatches = this.service.lockManager.getPatches();
@@ -363515,8 +363549,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         const allPatches = [...existingPatches, ...newPatches];
         const commitOpts = options2 ? {
           cliVersion: options2.cliVersion ?? "unknown",
-          generatorVersions: options2.generatorVersions ?? {},
-          baseBranchHead: options2.baseBranchHead
+          generatorVersions: options2.generatorVersions ?? {}
         } : void 0;
         await this.service.committer.commitGeneration("Update SDK", commitOpts);
         await this.service.cleanupStaleConflictMarkers();
@@ -363526,7 +363559,6 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
           flow: "normal-regeneration",
           previousGenerationSha,
           currentGenerationSha: genRecord.commit_sha,
-          baseBranchHead: options2?.baseBranchHead ?? null,
           _prepared: {
             kind: "active",
             flow: "normal-regeneration",
@@ -363717,68 +363749,6 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         const prep = await this.prepareReplay(options2);
         return this.applyPreparedReplay(prep, options2);
       }
-      /**
-       * Sync the lockfile after a divergent PR was squash-merged.
-       * Call this BEFORE runReplay() when the CLI detects a merged divergent PR.
-       *
-       * After updating the generation record, re-detects customer patches via
-       * tree diff between the generation tag (pure generation tree) and HEAD
-       * (which includes customer customizations after squash merge). This ensures
-       * patches survive the squash merge → regenerate cycle even when the lockfile
-       * was restored from the base branch during conflict PR creation.
-       */
-      async syncFromDivergentMerge(generationCommitSha, options2) {
-        const treeHash = await this.git.getTreeHash(generationCommitSha);
-        const timestamp2 = (await this.git.exec(["log", "-1", "--format=%aI", generationCommitSha])).trim();
-        const record23 = {
-          commit_sha: generationCommitSha,
-          tree_hash: treeHash,
-          timestamp: timestamp2,
-          cli_version: options2?.cliVersion ?? "unknown",
-          generator_versions: options2?.generatorVersions ?? {},
-          base_branch_head: options2?.baseBranchHead
-        };
-        let resolvedPatches;
-        if (!this.lockManager.exists()) {
-          this.lockManager.initializeInMemory(record23);
-        } else {
-          this.lockManager.read();
-          const unresolvedPatches = [
-            ...this.lockManager.getUnresolvedPatches(),
-            ...this.lockManager.getResolvingPatches()
-          ];
-          resolvedPatches = this.lockManager.getPatches().filter((p14) => p14.status == null);
-          this.lockManager.addGeneration(record23);
-          this.lockManager.clearPatches();
-          for (const patch5 of unresolvedPatches) {
-            this.lockManager.addPatch(patch5);
-          }
-        }
-        try {
-          const { patches: redetectedPatches } = await this.detector.detectNewPatches();
-          if (redetectedPatches.length > 0) {
-            const redetectedFiles = new Set(redetectedPatches.flatMap((p14) => p14.files));
-            const currentPatches = this.lockManager.getPatches();
-            for (const patch5 of currentPatches) {
-              if (patch5.status != null && patch5.files.some((f4) => redetectedFiles.has(f4))) {
-                this.lockManager.removePatch(patch5.id);
-              }
-            }
-            for (const patch5 of redetectedPatches) {
-              this.lockManager.addPatch(patch5);
-            }
-          }
-        } catch (error50) {
-          for (const patch5 of resolvedPatches ?? []) {
-            this.lockManager.addPatch(patch5);
-          }
-          this.detector.warnings.push(
-            `Patch re-detection failed after divergent merge sync. ${(resolvedPatches ?? []).length} previously resolved patch(es) preserved. Error: ${error50 instanceof Error ? error50.message : String(error50)}`
-          );
-        }
-        this.lockManager.save();
-        this.detector.warnings.push(...this.lockManager.warnings);
-      }
       determineFlow() {
         try {
           const lock = this.lockManager.read();
@@ -365476,14 +365446,12 @@ var require_replay_run = __commonJS({
     exports2.replayPrepare = replayPrepare;
     exports2.replayApply = replayApply;
     exports2.replayRun = replayRun;
-    exports2.isTagMergedIntoHead = isTagMergedIntoHead;
     var replay_1 = require_dist14();
-    var child_process_1 = require("child_process");
     var fs_1 = require("fs");
     var path_1 = require("path");
     var fernignore_1 = require_fernignore();
     async function replayPrepare(params2, state) {
-      const { outputDir, cliVersion, generatorVersions, stageOnly = false, generatorName, skipApplication, logger: logger4 } = params2;
+      const { outputDir, cliVersion, generatorVersions, stageOnly = false, skipApplication, logger: logger4 } = params2;
       const lockfilePath = (0, path_1.join)(outputDir, ".fern", "replay.lock");
       let autoBootstrapped = false;
       let bootstrapAttempted = false;
@@ -365516,57 +365484,6 @@ var require_replay_run = __commonJS({
           return null;
         }
       }
-      const baseBranchHead = gitRevParse(outputDir, "HEAD");
-      let previousGenerationSha = null;
-      let prevBaseBranchHead = null;
-      try {
-        const lockManager = new replay_1.LockfileManager(outputDir);
-        if (lockManager.exists()) {
-          const lock = lockManager.read();
-          previousGenerationSha = lock.current_generation;
-          const latestGen = lock.generations.find((g8) => g8.commit_sha === lock.current_generation);
-          prevBaseBranchHead = latestGen?.base_branch_head ?? null;
-        }
-      } catch {
-      }
-      if (previousGenerationSha != null) {
-        const sanitizedName = generatorName?.replace(/\//g, "--");
-        const namespacedTag = sanitizedName != null ? `fern-generation-base--${sanitizedName}` : null;
-        const tagSha = (namespacedTag != null ? gitRevParse(outputDir, namespacedTag) : null) ?? gitRevParse(outputDir, "fern-generation-base");
-        let shouldSync = false;
-        if (tagSha != null) {
-          const tagParent = gitRevParse(outputDir, `${tagSha}^`);
-          if (tagParent === prevBaseBranchHead || tagParent === previousGenerationSha) {
-            const tagDistance = gitDiffNameOnly(outputDir, tagSha, "HEAD").length;
-            const lockDistance = gitDiffNameOnly(outputDir, prevBaseBranchHead ?? previousGenerationSha, "HEAD").length;
-            shouldSync = tagDistance < lockDistance;
-          }
-        }
-        if (shouldSync && tagSha != null) {
-          if (!isTagMergedIntoHead(outputDir, tagSha)) {
-            logger4?.warn(`fern-generation-base tag ${tagSha} is not reachable from HEAD \u2014 skipping divergent-merge sync. The tag likely points at an unmerged generation (PR closed without merge).`);
-          } else {
-            try {
-              const syncService = new replay_1.ReplayService(outputDir, { enabled: true });
-              await syncService.syncFromDivergentMerge(tagSha, {
-                cliVersion,
-                generatorVersions,
-                baseBranchHead: baseBranchHead ?? void 0
-              });
-            } catch (error50) {
-              logger4?.warn("Replay divergent-merge sync failed, continuing without sync: " + String(error50));
-              throw new ReplayPrepareError(String(error50), error50);
-            }
-            try {
-              const freshLockManager = new replay_1.LockfileManager(outputDir);
-              if (freshLockManager.exists()) {
-                previousGenerationSha = freshLockManager.read().current_generation;
-              }
-            } catch {
-            }
-          }
-        }
-      }
       const service = new replay_1.ReplayService(outputDir, { enabled: true });
       let preparation;
       try {
@@ -365574,8 +365491,7 @@ var require_replay_run = __commonJS({
           cliVersion,
           generatorVersions,
           stageOnly,
-          skipApplication,
-          baseBranchHead: baseBranchHead ?? void 0
+          skipApplication
         });
       } catch (error50) {
         logger4?.warn("Replay prepare failed, continuing without replay: " + String(error50));
@@ -365586,9 +365502,8 @@ var require_replay_run = __commonJS({
         _preparation: preparation,
         outputDir,
         flow: preparation.flow,
-        previousGenerationSha,
+        previousGenerationSha: preparation.previousGenerationSha,
         currentGenerationSha: preparation.currentGenerationSha,
-        baseBranchHead,
         autoBootstrapped,
         bootstrapAttempted
       };
@@ -365605,24 +365520,11 @@ var require_replay_run = __commonJS({
           fernignoreUpdated: false,
           previousGenerationSha: prepared.previousGenerationSha,
           currentGenerationSha: prepared.currentGenerationSha,
-          baseBranchHead: prepared.baseBranchHead,
           autoBootstrapped: prepared.autoBootstrapped,
           bootstrapAttempted: prepared.bootstrapAttempted,
           failureReason: String(error50)
         };
       }
-      let resolvedBaseBranchHead = prepared.baseBranchHead;
-      try {
-        const freshLockManager = new replay_1.LockfileManager(prepared.outputDir);
-        if (freshLockManager.exists()) {
-          const freshLock = freshLockManager.read();
-          const latestGen = freshLock.generations.find((g8) => g8.commit_sha === freshLock.current_generation);
-          if (latestGen?.base_branch_head) {
-            resolvedBaseBranchHead = latestGen.base_branch_head;
-          }
-        }
-      } catch {
-      }
       const fernignoreUpdated = await (0, fernignore_1.ensureReplayFernignoreEntries)(prepared.outputDir);
       await (0, fernignore_1.ensureGitattributesEntries)(prepared.outputDir);
       return {
@@ -365630,7 +365532,6 @@ var require_replay_run = __commonJS({
         fernignoreUpdated,
         previousGenerationSha: prepared.previousGenerationSha,
         currentGenerationSha: prepared.currentGenerationSha,
-        baseBranchHead: resolvedBaseBranchHead,
         autoBootstrapped: prepared.autoBootstrapped,
         bootstrapAttempted: prepared.bootstrapAttempted
       };
@@ -365646,7 +365547,6 @@ var require_replay_run = __commonJS({
           fernignoreUpdated: false,
           previousGenerationSha: null,
           currentGenerationSha: null,
-          baseBranchHead: null,
           autoBootstrapped: false,
           bootstrapAttempted: prepareState.bootstrapAttempted,
           failureReason: error50 instanceof ReplayPrepareError ? error50.reason : String(error50)
@@ -365658,7 +365558,6 @@ var require_replay_run = __commonJS({
           fernignoreUpdated: false,
           previousGenerationSha: null,
           currentGenerationSha: null,
-          baseBranchHead: null,
           autoBootstrapped: false,
           bootstrapAttempted: prepareState.bootstrapAttempted
         };
@@ -365678,53 +365577,6 @@ var require_replay_run = __commonJS({
       }
     };
     exports2.ReplayPrepareError = ReplayPrepareError;
-    function isTagMergedIntoHead(cwd2, tagSha) {
-      try {
-        (0, child_process_1.execFileSync)("git", ["merge-base", "--is-ancestor", tagSha, "HEAD"], {
-          cwd: cwd2,
-          stdio: "pipe"
-        });
-        return true;
-      } catch {
-      }
-      const tagTree = gitRevParse(cwd2, `${tagSha}^{tree}`);
-      if (tagTree == null) {
-        return false;
-      }
-      try {
-        const trees = (0, child_process_1.execFileSync)("git", ["log", "HEAD", "--format=%T", "--max-count=500"], {
-          cwd: cwd2,
-          encoding: "utf-8",
-          stdio: "pipe"
-        });
-        return trees.split("\n").some((t3) => t3.trim() === tagTree);
-      } catch {
-        return false;
-      }
-    }
-    function gitRevParse(cwd2, rev) {
-      try {
-        return (0, child_process_1.execFileSync)("git", ["rev-parse", "--verify", rev], {
-          cwd: cwd2,
-          encoding: "utf-8",
-          stdio: "pipe"
-        }).trim();
-      } catch {
-        return null;
-      }
-    }
-    function gitDiffNameOnly(cwd2, from4, to10) {
-      try {
-        const output2 = (0, child_process_1.execFileSync)("git", ["diff", "--name-only", from4, to10], {
-          cwd: cwd2,
-          encoding: "utf-8",
-          stdio: "pipe"
-        });
-        return output2.trim().split("\n").filter(Boolean);
-      } catch {
-        return [];
-      }
-    }
   }
 });
 
@@ -365741,14 +365593,12 @@ var require_GenerationCommitStep = __commonJS({
       config;
       cliVersion;
       generatorVersions;
-      generatorName;
       name = "generationCommit";
-      constructor(outputDir, logger4, config5, cliVersion, generatorVersions, generatorName) {
+      constructor(outputDir, logger4, config5, cliVersion, generatorVersions) {
         super(outputDir, logger4);
         this.config = config5;
         this.cliVersion = cliVersion;
         this.generatorVersions = generatorVersions;
-        this.generatorName = generatorName;
       }
       async execute(_context) {
         const headBeforePrepare = tryRevParse(this.outputDir, "HEAD");
@@ -365759,7 +365609,6 @@ var require_GenerationCommitStep = __commonJS({
             outputDir: this.outputDir,
             cliVersion: this.cliVersion,
             generatorVersions: this.generatorVersions,
-            generatorName: this.generatorName,
             skipApplication: this.config.skipApplication,
             logger: this.logger
           }, prepareState);
@@ -365796,7 +365645,6 @@ var require_GenerationCommitStep = __commonJS({
           preparedReplay: prepared,
           previousGenerationSha: prepared.previousGenerationSha ?? void 0,
           currentGenerationSha: prepared.currentGenerationSha,
-          baseBranchHead: prepared.baseBranchHead ?? void 0,
           flow: prepared.flow,
           bootstrapAttempted: prepareState.bootstrapAttempted
         };
@@ -370467,14 +370315,12 @@ var require_ReplayStep = __commonJS({
       config;
       cliVersion;
       generatorVersions;
-      generatorName;
       name = "replay";
-      constructor(outputDir, logger4, config5, cliVersion, generatorVersions, generatorName) {
+      constructor(outputDir, logger4, config5, cliVersion, generatorVersions) {
         super(outputDir, logger4);
         this.config = config5;
         this.cliVersion = cliVersion;
         this.generatorVersions = generatorVersions;
-        this.generatorName = generatorName;
       }
       async execute(context3) {
         const generationCommit = context3.previousStepResults.generationCommit;
@@ -370513,7 +370359,6 @@ var require_ReplayStep = __commonJS({
           cliVersion: this.cliVersion,
           generatorVersions: this.generatorVersions,
           stageOnly: this.config.stageOnly ?? false,
-          generatorName: this.generatorName,
           skipApplication: this.config.skipApplication,
           logger: this.logger
         });
@@ -370525,7 +370370,6 @@ var require_ReplayStep = __commonJS({
             errorMessage: result.failureReason,
             previousGenerationSha: result.previousGenerationSha ?? void 0,
             currentGenerationSha: result.currentGenerationSha ?? void 0,
-            baseBranchHead: result.baseBranchHead ?? void 0,
             autoBootstrapped: result.autoBootstrapped,
             bootstrapAttempted: result.bootstrapAttempted,
             flow: "normal-regeneration",
@@ -370540,7 +370384,6 @@ var require_ReplayStep = __commonJS({
             success: true,
             previousGenerationSha: result.previousGenerationSha ?? void 0,
             currentGenerationSha: result.currentGenerationSha ?? void 0,
-            baseBranchHead: result.baseBranchHead ?? void 0,
             autoBootstrapped: result.autoBootstrapped,
             bootstrapAttempted: result.bootstrapAttempted,
             flow: "first-generation",
@@ -370555,7 +370398,6 @@ var require_ReplayStep = __commonJS({
           success: true,
           previousGenerationSha: result.previousGenerationSha ?? void 0,
           currentGenerationSha: result.currentGenerationSha ?? void 0,
-          baseBranchHead: result.baseBranchHead ?? void 0,
           autoBootstrapped: result.autoBootstrapped,
           bootstrapAttempted: result.bootstrapAttempted,
           flow: report.flow,
@@ -370948,13 +370790,13 @@ var require_PostGenerationPipeline = __commonJS({
           autoVersionEnabled = false;
         }
         if (replayEnabled && config5.replay != null) {
-          this.steps.push(new GenerationCommitStep_1.GenerationCommitStep(config5.outputDir, this.logger, { enabled: true, skipApplication: config5.replay.skipApplication }, config5.cliVersion, config5.generatorVersions, config5.generatorName));
+          this.steps.push(new GenerationCommitStep_1.GenerationCommitStep(config5.outputDir, this.logger, { enabled: true, skipApplication: config5.replay.skipApplication }, config5.cliVersion, config5.generatorVersions));
         }
         if (autoVersionEnabled && config5.autoVersion != null) {
           this.steps.push(new AutoVersionStep_1.AutoVersionStep(config5.outputDir, this.logger, config5.autoVersion));
         }
         if (replayEnabled && config5.replay != null) {
-          this.steps.push(new ReplayStep_1.ReplayStep(config5.outputDir, this.logger, config5.replay, config5.cliVersion, config5.generatorVersions, config5.generatorName));
+          this.steps.push(new ReplayStep_1.ReplayStep(config5.outputDir, this.logger, config5.replay, config5.cliVersion, config5.generatorVersions));
         }
         if (config5.verify?.enabled) {
           this.steps.push(new VerificationStep_1.VerificationStep(config5.outputDir, this.logger, config5.verify, config5.generatorName, config5.generatorVersions));
@@ -668113,7 +667955,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.28.1",
+          version: "5.28.3",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -668177,7 +668019,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.28.1",
+        version: "5.28.3",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -670976,6 +670818,8 @@ var Cache = class _Cache {
   docsPreview;
   /** Directory for downloaded generator migration packages. */
   migrations;
+  /** Directory for downloaded tool binaries (buf, protoc-gen-openapi). Shared with CLI v1. */
+  bin;
   constructor({ logger: logger4 } = {}) {
     this.absoluteFilePath = _Cache.resolveAbsoluteFilePathStatic();
     this.ir = new IrCache({
@@ -670990,6 +670834,9 @@ var Cache = class _Cache {
     this.migrations = {
       absoluteFilePath: join8(this.getVersionedPath(), RelativeFilePath2.of("migrations"))
     };
+    this.bin = {
+      absoluteFilePath: join8(this.absoluteFilePath, RelativeFilePath2.of("bin"))
+    };
   }
   /**
    * Get the versioned cache directory path.
@@ -859868,7 +859715,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.28.1";
+  const version7 = "5.28.3";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -873877,7 +873724,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.28.1",
+        cliVersion: "5.28.3",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -948282,7 +948129,7 @@ function getAutomationContextFromEnv() {
     config_branch: process.env.FERN_CONFIG_BRANCH,
     config_pr_number: process.env.FERN_CONFIG_PR_NUMBER,
     trigger: process.env.GITHUB_EVENT_NAME,
-    cli_version: "5.28.1"
+    cli_version: "5.28.3"
   };
 }
 function isAutomationMode() {
@@ -949108,7 +948955,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.28.1";
+    return "5.28.3";
   }
   getCliName() {
     if (false) {

package/package.json

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