@fern-api/generator-cli 0.9.30 → 0.9.32

package/dist/api.d.ts

@@ -580,8 +580,6 @@ interface ReplayRunResult {
     previousGenerationSha: string | null;
     /** SHA of the [fern-generated] commit created by this replay run (null if replay didn't run or unreadable) */
     currentGenerationSha: string | null;
-    /** SHA of main's HEAD before replay ran. Always on main's lineage, stable after squash merges. */
-    baseBranchHead: string | null;
     /** True when this run inlined `bootstrap()` to create the lockfile (auto-init from `fern generate`). */
     autoBootstrapped: boolean;
     /**

package/dist/api.js

@@ -10356,19 +10356,10 @@ async function replayResolve(params) {
 
 // src/replay/replay-run.ts
 var import_replay4 = require("@fern-api/replay");
-var import_child_process3 = require("child_process");
 var import_fs3 = require("fs");
 var import_path5 = require("path");
 async function replayPrepare(params, state) {
-  const {
-    outputDir,
-    cliVersion,
-    generatorVersions,
-    stageOnly = false,
-    generatorName,
-    skipApplication,
-    logger
-  } = params;
+  const { outputDir, cliVersion, generatorVersions, stageOnly = false, skipApplication, logger } = params;
   const lockfilePath = (0, import_path5.join)(outputDir, ".fern", "replay.lock");
   let autoBootstrapped = false;
   let bootstrapAttempted = false;
@@ -10401,63 +10392,6 @@ async function replayPrepare(params, state) {
       return null;
     }
   }
-  const baseBranchHead = gitRevParse(outputDir, "HEAD");
-  let previousGenerationSha = null;
-  let prevBaseBranchHead = null;
-  try {
-    const lockManager = new import_replay4.LockfileManager(outputDir);
-    if (lockManager.exists()) {
-      const lock = lockManager.read();
-      previousGenerationSha = lock.current_generation;
-      const latestGen = lock.generations.find((g) => g.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)) {
-        logger?.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 import_replay4.ReplayService(outputDir, { enabled: true });
-          await syncService.syncFromDivergentMerge(tagSha, {
-            cliVersion,
-            generatorVersions,
-            baseBranchHead: baseBranchHead ?? void 0
-          });
-        } catch (error) {
-          logger?.warn("Replay divergent-merge sync failed, continuing without sync: " + String(error));
-          throw new ReplayPrepareError(String(error), error);
-        }
-        try {
-          const freshLockManager = new import_replay4.LockfileManager(outputDir);
-          if (freshLockManager.exists()) {
-            previousGenerationSha = freshLockManager.read().current_generation;
-          }
-        } catch {
-        }
-      }
-    }
-  }
   const service = new import_replay4.ReplayService(outputDir, { enabled: true });
   let preparation;
   try {
@@ -10465,8 +10399,7 @@ async function replayPrepare(params, state) {
       cliVersion,
       generatorVersions,
       stageOnly,
-      skipApplication,
-      baseBranchHead: baseBranchHead ?? void 0
+      skipApplication
     });
   } catch (error) {
     logger?.warn("Replay prepare failed, continuing without replay: " + String(error));
@@ -10477,9 +10410,8 @@ async function replayPrepare(params, state) {
     _preparation: preparation,
     outputDir,
     flow: preparation.flow,
-    previousGenerationSha,
+    previousGenerationSha: preparation.previousGenerationSha,
     currentGenerationSha: preparation.currentGenerationSha,
-    baseBranchHead,
     autoBootstrapped,
     bootstrapAttempted
   };
@@ -10496,24 +10428,11 @@ async function replayApply(prepared, params = {}) {
       fernignoreUpdated: false,
       previousGenerationSha: prepared.previousGenerationSha,
       currentGenerationSha: prepared.currentGenerationSha,
-      baseBranchHead: prepared.baseBranchHead,
       autoBootstrapped: prepared.autoBootstrapped,
       bootstrapAttempted: prepared.bootstrapAttempted,
       failureReason: String(error)
     };
   }
-  let resolvedBaseBranchHead = prepared.baseBranchHead;
-  try {
-    const freshLockManager = new import_replay4.LockfileManager(prepared.outputDir);
-    if (freshLockManager.exists()) {
-      const freshLock = freshLockManager.read();
-      const latestGen = freshLock.generations.find((g) => g.commit_sha === freshLock.current_generation);
-      if (latestGen?.base_branch_head) {
-        resolvedBaseBranchHead = latestGen.base_branch_head;
-      }
-    }
-  } catch {
-  }
   const fernignoreUpdated = await ensureReplayFernignoreEntries(prepared.outputDir);
   await ensureGitattributesEntries(prepared.outputDir);
   return {
@@ -10521,7 +10440,6 @@ async function replayApply(prepared, params = {}) {
     fernignoreUpdated,
     previousGenerationSha: prepared.previousGenerationSha,
     currentGenerationSha: prepared.currentGenerationSha,
-    baseBranchHead: resolvedBaseBranchHead,
     autoBootstrapped: prepared.autoBootstrapped,
     bootstrapAttempted: prepared.bootstrapAttempted
   };
@@ -10537,7 +10455,6 @@ async function replayRun(params) {
       fernignoreUpdated: false,
       previousGenerationSha: null,
       currentGenerationSha: null,
-      baseBranchHead: null,
       autoBootstrapped: false,
       bootstrapAttempted: prepareState.bootstrapAttempted,
       failureReason: error instanceof ReplayPrepareError ? error.reason : String(error)
@@ -10549,7 +10466,6 @@ async function replayRun(params) {
       fernignoreUpdated: false,
       previousGenerationSha: null,
       currentGenerationSha: null,
-      baseBranchHead: null,
       autoBootstrapped: false,
       bootstrapAttempted: prepareState.bootstrapAttempted
     };
@@ -10568,53 +10484,6 @@ var ReplayPrepareError = class extends Error {
     this.reason = reason;
   }
 };
-function isTagMergedIntoHead(cwd2, tagSha) {
-  try {
-    (0, import_child_process3.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, import_child_process3.execFileSync)("git", ["log", "HEAD", "--format=%T", "--max-count=500"], {
-      cwd: cwd2,
-      encoding: "utf-8",
-      stdio: "pipe"
-    });
-    return trees.split("\n").some((t2) => t2.trim() === tagTree);
-  } catch {
-    return false;
-  }
-}
-function gitRevParse(cwd2, rev) {
-  try {
-    return (0, import_child_process3.execFileSync)("git", ["rev-parse", "--verify", rev], {
-      cwd: cwd2,
-      encoding: "utf-8",
-      stdio: "pipe"
-    }).trim();
-  } catch {
-    return null;
-  }
-}
-function gitDiffNameOnly(cwd2, from, to) {
-  try {
-    const output = (0, import_child_process3.execFileSync)("git", ["diff", "--name-only", from, to], {
-      cwd: cwd2,
-      encoding: "utf-8",
-      stdio: "pipe"
-    });
-    return output.trim().split("\n").filter(Boolean);
-  } catch {
-    return [];
-  }
-}
 
 // src/replay/replay-status.ts
 var import_replay5 = require("@fern-api/replay");

package/dist/cli.js

@@ -2021,7 +2021,7 @@ var init_esm = __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(str) {
   return !isNaN(str) ? parseInt(str, 10) : str.charCodeAt(0);
 }
@@ -2124,7 +2124,7 @@ function expand_(str, max, isTop) {
       }
       const pad = n.some(isPadded);
       N2 = [];
-      for (let i2 = x2; test(i2, y2); i2 += incr) {
+      for (let i2 = x2; test(i2, y2) && N2.length < max; i2 += incr) {
         let c3;
         if (isAlphaSequence) {
           c3 = String.fromCharCode(i2);
@@ -2166,7 +2166,7 @@ function expand_(str, max, isTop) {
 }
 var escSlash, escOpen, escClose, escComma, escPeriod, escSlashPattern, escOpenPattern, escClosePattern, escCommaPattern, escPeriodPattern, slashPattern, openPattern, closePattern, commaPattern, periodPattern, EXPANSION_MAX;
 var init_esm2 = __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_esm();
     escSlash = "\0SLASH" + Math.random() + "\0";
@@ -22126,7 +22126,7 @@ var init_diff3 = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/@fern-api+replay@0.15.2/node_modules/@fern-api/replay/dist/index.js
+// ../../node_modules/.pnpm/@fern-api+replay@0.16.0/node_modules/@fern-api/replay/dist/index.js
 var dist_exports = {};
 __export(dist_exports, {
   CREDENTIAL_PATTERNS: () => CREDENTIAL_PATTERNS,
@@ -22451,9 +22451,22 @@ function isGenerationCommit(commit) {
   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]");
 }
@@ -23934,7 +23947,7 @@ function status(outputDir) {
 }
 var import_promises3, import_os, import_path7, import_fs6, import_path8, import_yaml, import_crypto, import_path9, import_promises4, import_os2, import_path10, import_promises5, import_path11, import_promises6, import_path12, import_fs7, import_promises7, import_path13, import_promises8, import_os3, import_path14, import_child_process3, import_crypto2, import_fs8, import_path15, import_yaml2, import_crypto3, import_fs9, import_path16, import_fs10, import_promises9, import_path17, __defProp3, __getOwnPropNames3, __esm3, __export3, GitClient_exports, GitClient, init_GitClient, HybridReconstruction_exports, init_HybridReconstruction, PatchApplyTheirs_exports, init_PatchApplyTheirs, CREDENTIAL_PATTERNS, SENSITIVE_FILE_PATTERNS, FERN_BOT_NAME, FERN_BOT_EMAIL, FERN_BOT_LOGIN, FERN_SUPPORT_NAMES, LOCKFILE_HEADER, LockfileNotFoundError, LockfileManager, BINARY_EXTENSIONS, INFRASTRUCTURE_FILES, ReplayDetector, MergeAccumulator, CONFLICT_OPENER, CONFLICT_SEPARATOR, CONFLICT_CLOSER, ReplayApplicator, ReplayCommitter, FileOwnership, FirstGenerationFlow, SkipApplicationFlow, NoPatchesFlow, NormalRegenerationFlow, ReplayService, FernignoreMigrator, REPLAY_FERNIGNORE_ENTRIES, GITATTRIBUTES_ENTRIES, EMPTY_RESULT;
 var init_dist3 = __esm({
-  "../../node_modules/.pnpm/@fern-api+replay@0.15.2/node_modules/@fern-api/replay/dist/index.js"() {
+  "../../node_modules/.pnpm/@fern-api+replay@0.16.0/node_modules/@fern-api/replay/dist/index.js"() {
     "use strict";
     init_esm4();
     import_promises3 = require("fs/promises");
@@ -24414,8 +24427,48 @@ var init_dist3 = __esm({
         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 log;
+        try {
+          log = 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(log)) {
+          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: [] };
@@ -24423,7 +24476,7 @@ var init_dist3 = __esm({
         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,
@@ -24431,44 +24484,8 @@ var init_dist3 = __esm({
             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
@@ -24904,6 +24921,26 @@ var init_dist3 = __esm({
       getLastGeneration(lock) {
         return lock.generations.find((g) => g.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: {}
+        };
+      }
     };
     MergeAccumulator = class {
       constructor(mode, sharedFiles) {
@@ -25526,8 +25563,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
           tree_hash: treeHash,
           timestamp: (/* @__PURE__ */ new Date()).toISOString(),
           cli_version: options?.cliVersion ?? "unknown",
-          generator_versions: options?.generatorVersions ?? {},
-          base_branch_head: options?.baseBranchHead
+          generator_versions: options?.generatorVersions ?? {}
         };
       }
       async stageAll() {
@@ -25598,7 +25634,6 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
             flow: "first-generation",
             previousGenerationSha: null,
             currentGenerationSha: headSha,
-            baseBranchHead: options.baseBranchHead ?? null,
             _prepared: {
               kind: "terminal",
               flow: "first-generation",
@@ -25608,8 +25643,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         }
         const commitOpts = options ? {
           cliVersion: options.cliVersion ?? "unknown",
-          generatorVersions: options.generatorVersions ?? {},
-          baseBranchHead: options.baseBranchHead
+          generatorVersions: options.generatorVersions ?? {}
         } : void 0;
         await this.service.committer.commitGeneration("Initial SDK generation", commitOpts);
         const genRecord = await this.service.committer.createGenerationRecord(commitOpts);
@@ -25618,7 +25652,6 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
           flow: "first-generation",
           previousGenerationSha: null,
           currentGenerationSha: genRecord.commit_sha,
-          baseBranchHead: options?.baseBranchHead ?? null,
           _prepared: {
             kind: "active",
             flow: "first-generation",
@@ -25643,8 +25676,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
       async prepare(options) {
         const commitOpts = options ? {
           cliVersion: options.cliVersion ?? "unknown",
-          generatorVersions: options.generatorVersions ?? {},
-          baseBranchHead: options.baseBranchHead
+          generatorVersions: options.generatorVersions ?? {}
         } : void 0;
         await this.service.committer.commitGeneration("Update SDK (replay skipped)", commitOpts);
         await this.service.cleanupStaleConflictMarkers();
@@ -25666,7 +25698,6 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
           flow: "skip-application",
           previousGenerationSha,
           currentGenerationSha: genRecord.commit_sha,
-          baseBranchHead: options?.baseBranchHead ?? null,
           _prepared: {
             kind: "active",
             flow: "skip-application",
@@ -25725,7 +25756,6 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
             flow: "no-patches",
             previousGenerationSha,
             currentGenerationSha: headSha,
-            baseBranchHead: options.baseBranchHead ?? null,
             _prepared: {
               kind: "terminal",
               flow: "no-patches",
@@ -25757,8 +25787,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         }
         const commitOpts = options ? {
           cliVersion: options.cliVersion ?? "unknown",
-          generatorVersions: options.generatorVersions ?? {},
-          baseBranchHead: options.baseBranchHead
+          generatorVersions: options.generatorVersions ?? {}
         } : void 0;
         await this.service.committer.commitGeneration("Update SDK", commitOpts);
         await this.service.cleanupStaleConflictMarkers();
@@ -25768,7 +25797,6 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
           flow: "no-patches",
           previousGenerationSha,
           currentGenerationSha: genRecord.commit_sha,
-          baseBranchHead: options?.baseBranchHead ?? null,
           _prepared: {
             kind: "active",
             flow: "no-patches",
@@ -25856,7 +25884,6 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
             flow: "normal-regeneration",
             previousGenerationSha,
             currentGenerationSha: headSha,
-            baseBranchHead: options.baseBranchHead ?? null,
             _prepared: {
               kind: "terminal",
               flow: "normal-regeneration",
@@ -25874,14 +25901,16 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         existingPatches = this.service.lockManager.getPatches();
         const seenHashes = /* @__PURE__ */ new Map();
         for (const p2 of existingPatches) {
-          const priorPatchId = seenHashes.get(p2.content_hash);
-          if (priorPatchId !== void 0) {
-            this.service.lockManager.removePatch(p2.id);
-            this.service.warnings.push(
-              `Consolidated patch ${p2.id} (commit ${(p2.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(p2.content_hash, p2.id);
+          if (!p2.original_commit || p2.original_commit === "") {
+            const priorPatchId = seenHashes.get(p2.content_hash);
+            if (priorPatchId !== void 0) {
+              this.service.lockManager.removePatch(p2.id);
+              this.service.warnings.push(
+                `Consolidated patch ${p2.id} into prior patch ${priorPatchId}: byte-identical patch_content. Lockfile collapsed to avoid duplicate-apply corruption on next regen.`
+              );
+            } else {
+              seenHashes.set(p2.content_hash, p2.id);
+            }
           }
         }
         existingPatches = this.service.lockManager.getPatches();
@@ -25910,8 +25939,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         const allPatches = [...existingPatches, ...newPatches];
         const commitOpts = options ? {
           cliVersion: options.cliVersion ?? "unknown",
-          generatorVersions: options.generatorVersions ?? {},
-          baseBranchHead: options.baseBranchHead
+          generatorVersions: options.generatorVersions ?? {}
         } : void 0;
         await this.service.committer.commitGeneration("Update SDK", commitOpts);
         await this.service.cleanupStaleConflictMarkers();
@@ -25921,7 +25949,6 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
           flow: "normal-regeneration",
           previousGenerationSha,
           currentGenerationSha: genRecord.commit_sha,
-          baseBranchHead: options?.baseBranchHead ?? null,
           _prepared: {
             kind: "active",
             flow: "normal-regeneration",
@@ -26105,68 +26132,6 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         const prep = await this.prepareReplay(options);
         return this.applyPreparedReplay(prep, options);
       }
-      /**
-       * 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, options) {
-        const treeHash = await this.git.getTreeHash(generationCommitSha);
-        const timestamp = (await this.git.exec(["log", "-1", "--format=%aI", generationCommitSha])).trim();
-        const record2 = {
-          commit_sha: generationCommitSha,
-          tree_hash: treeHash,
-          timestamp,
-          cli_version: options?.cliVersion ?? "unknown",
-          generator_versions: options?.generatorVersions ?? {},
-          base_branch_head: options?.baseBranchHead
-        };
-        let resolvedPatches;
-        if (!this.lockManager.exists()) {
-          this.lockManager.initializeInMemory(record2);
-        } else {
-          this.lockManager.read();
-          const unresolvedPatches = [
-            ...this.lockManager.getUnresolvedPatches(),
-            ...this.lockManager.getResolvingPatches()
-          ];
-          resolvedPatches = this.lockManager.getPatches().filter((p2) => p2.status == null);
-          this.lockManager.addGeneration(record2);
-          this.lockManager.clearPatches();
-          for (const patch of unresolvedPatches) {
-            this.lockManager.addPatch(patch);
-          }
-        }
-        try {
-          const { patches: redetectedPatches } = await this.detector.detectNewPatches();
-          if (redetectedPatches.length > 0) {
-            const redetectedFiles = new Set(redetectedPatches.flatMap((p2) => p2.files));
-            const currentPatches = this.lockManager.getPatches();
-            for (const patch of currentPatches) {
-              if (patch.status != null && patch.files.some((f) => redetectedFiles.has(f))) {
-                this.lockManager.removePatch(patch.id);
-              }
-            }
-            for (const patch of redetectedPatches) {
-              this.lockManager.addPatch(patch);
-            }
-          }
-        } catch (error) {
-          for (const patch of resolvedPatches ?? []) {
-            this.lockManager.addPatch(patch);
-          }
-          this.detector.warnings.push(
-            `Patch re-detection failed after divergent merge sync. ${(resolvedPatches ?? []).length} previously resolved patch(es) preserved. Error: ${error instanceof Error ? error.message : String(error)}`
-          );
-        }
-        this.lockManager.save();
-        this.detector.warnings.push(...this.lockManager.warnings);
-      }
       determineFlow() {
         try {
           const lock = this.lockManager.read();
@@ -39645,19 +39610,10 @@ init_dist3();
 
 // src/replay/replay-run.ts
 init_dist3();
-var import_child_process4 = require("child_process");
 var import_fs12 = require("fs");
 var import_path20 = require("path");
 async function replayPrepare(params, state) {
-  const {
-    outputDir,
-    cliVersion,
-    generatorVersions,
-    stageOnly = false,
-    generatorName,
-    skipApplication,
-    logger
-  } = params;
+  const { outputDir, cliVersion, generatorVersions, stageOnly = false, skipApplication, logger } = params;
   const lockfilePath = (0, import_path20.join)(outputDir, ".fern", "replay.lock");
   let autoBootstrapped = false;
   let bootstrapAttempted = false;
@@ -39690,63 +39646,6 @@ async function replayPrepare(params, state) {
       return null;
     }
   }
-  const baseBranchHead = gitRevParse(outputDir, "HEAD");
-  let previousGenerationSha = null;
-  let prevBaseBranchHead = null;
-  try {
-    const lockManager = new LockfileManager(outputDir);
-    if (lockManager.exists()) {
-      const lock = lockManager.read();
-      previousGenerationSha = lock.current_generation;
-      const latestGen = lock.generations.find((g) => g.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)) {
-        logger?.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 ReplayService(outputDir, { enabled: true });
-          await syncService.syncFromDivergentMerge(tagSha, {
-            cliVersion,
-            generatorVersions,
-            baseBranchHead: baseBranchHead ?? void 0
-          });
-        } catch (error) {
-          logger?.warn("Replay divergent-merge sync failed, continuing without sync: " + String(error));
-          throw new ReplayPrepareError(String(error), error);
-        }
-        try {
-          const freshLockManager = new LockfileManager(outputDir);
-          if (freshLockManager.exists()) {
-            previousGenerationSha = freshLockManager.read().current_generation;
-          }
-        } catch {
-        }
-      }
-    }
-  }
   const service = new ReplayService(outputDir, { enabled: true });
   let preparation;
   try {
@@ -39754,8 +39653,7 @@ async function replayPrepare(params, state) {
       cliVersion,
       generatorVersions,
       stageOnly,
-      skipApplication,
-      baseBranchHead: baseBranchHead ?? void 0
+      skipApplication
     });
   } catch (error) {
     logger?.warn("Replay prepare failed, continuing without replay: " + String(error));
@@ -39766,9 +39664,8 @@ async function replayPrepare(params, state) {
     _preparation: preparation,
     outputDir,
     flow: preparation.flow,
-    previousGenerationSha,
+    previousGenerationSha: preparation.previousGenerationSha,
     currentGenerationSha: preparation.currentGenerationSha,
-    baseBranchHead,
     autoBootstrapped,
     bootstrapAttempted
   };
@@ -39785,24 +39682,11 @@ async function replayApply(prepared, params = {}) {
       fernignoreUpdated: false,
       previousGenerationSha: prepared.previousGenerationSha,
       currentGenerationSha: prepared.currentGenerationSha,
-      baseBranchHead: prepared.baseBranchHead,
       autoBootstrapped: prepared.autoBootstrapped,
       bootstrapAttempted: prepared.bootstrapAttempted,
       failureReason: String(error)
     };
   }
-  let resolvedBaseBranchHead = prepared.baseBranchHead;
-  try {
-    const freshLockManager = new LockfileManager(prepared.outputDir);
-    if (freshLockManager.exists()) {
-      const freshLock = freshLockManager.read();
-      const latestGen = freshLock.generations.find((g) => g.commit_sha === freshLock.current_generation);
-      if (latestGen?.base_branch_head) {
-        resolvedBaseBranchHead = latestGen.base_branch_head;
-      }
-    }
-  } catch {
-  }
   const fernignoreUpdated = await ensureReplayFernignoreEntries(prepared.outputDir);
   await ensureGitattributesEntries2(prepared.outputDir);
   return {
@@ -39810,7 +39694,6 @@ async function replayApply(prepared, params = {}) {
     fernignoreUpdated,
     previousGenerationSha: prepared.previousGenerationSha,
     currentGenerationSha: prepared.currentGenerationSha,
-    baseBranchHead: resolvedBaseBranchHead,
     autoBootstrapped: prepared.autoBootstrapped,
     bootstrapAttempted: prepared.bootstrapAttempted
   };
@@ -39826,7 +39709,6 @@ async function replayRun(params) {
       fernignoreUpdated: false,
       previousGenerationSha: null,
       currentGenerationSha: null,
-      baseBranchHead: null,
       autoBootstrapped: false,
       bootstrapAttempted: prepareState.bootstrapAttempted,
       failureReason: error instanceof ReplayPrepareError ? error.reason : String(error)
@@ -39838,7 +39720,6 @@ async function replayRun(params) {
       fernignoreUpdated: false,
       previousGenerationSha: null,
       currentGenerationSha: null,
-      baseBranchHead: null,
       autoBootstrapped: false,
       bootstrapAttempted: prepareState.bootstrapAttempted
     };
@@ -39857,53 +39738,6 @@ var ReplayPrepareError = class extends Error {
     this.reason = reason;
   }
 };
-function isTagMergedIntoHead(cwd2, tagSha) {
-  try {
-    (0, import_child_process4.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, import_child_process4.execFileSync)("git", ["log", "HEAD", "--format=%T", "--max-count=500"], {
-      cwd: cwd2,
-      encoding: "utf-8",
-      stdio: "pipe"
-    });
-    return trees.split("\n").some((t2) => t2.trim() === tagTree);
-  } catch {
-    return false;
-  }
-}
-function gitRevParse(cwd2, rev) {
-  try {
-    return (0, import_child_process4.execFileSync)("git", ["rev-parse", "--verify", rev], {
-      cwd: cwd2,
-      encoding: "utf-8",
-      stdio: "pipe"
-    }).trim();
-  } catch {
-    return null;
-  }
-}
-function gitDiffNameOnly(cwd2, from, to) {
-  try {
-    const output = (0, import_child_process4.execFileSync)("git", ["diff", "--name-only", from, to], {
-      cwd: cwd2,
-      encoding: "utf-8",
-      stdio: "pipe"
-    });
-    return output.trim().split("\n").filter(Boolean);
-  } catch {
-    return [];
-  }
-}
 
 // src/replay/replay-status.ts
 init_dist3();
@@ -39951,7 +39785,7 @@ var consolePipelineLogger = {
 };
 
 // src/pipeline/PostGenerationPipeline.ts
-var import_child_process7 = require("child_process");
+var import_child_process6 = require("child_process");
 
 // src/pipeline/github/constants.ts
 var FERN_BOT_NAME2 = "fern-api";
@@ -39959,7 +39793,7 @@ var FERN_BOT_EMAIL2 = "115122769+fern-api[bot]@users.noreply.github.com";
 var FERN_BOT_LOGIN2 = "fern-api[bot]";
 
 // src/pipeline/steps/AutoVersionStep.ts
-var import_child_process5 = require("child_process");
+var import_child_process4 = require("child_process");
 var import_fs14 = require("fs");
 var import_promises15 = require("fs/promises");
 var import_path22 = require("path");
@@ -41333,7 +41167,7 @@ var AutoVersionStep = class extends BaseStep {
   }
   async readVersionFromMetadata() {
     try {
-      const output = (0, import_child_process5.execFileSync)("git", ["show", "HEAD~1:.fern/metadata.json"], {
+      const output = (0, import_child_process4.execFileSync)("git", ["show", "HEAD~1:.fern/metadata.json"], {
         cwd: this.outputDir,
         encoding: "utf-8",
         stdio: "pipe"
@@ -41349,7 +41183,7 @@ var AutoVersionStep = class extends BaseStep {
     return mappedMagicVersion.startsWith("v") ? `v${stripped}` : stripped;
   }
   gitDiff(from, to) {
-    return (0, import_child_process5.execFileSync)("git", ["diff", from, to, "--", ".", ":(exclude).fern/metadata.json"], {
+    return (0, import_child_process4.execFileSync)("git", ["diff", from, to, "--", ".", ":(exclude).fern/metadata.json"], {
       cwd: this.outputDir,
       encoding: "utf-8",
       stdio: "pipe",
@@ -41362,12 +41196,12 @@ var AutoVersionStep = class extends BaseStep {
     const fullMessage = body.length > 0 ? `${COMMIT_MARKER} ${subject}
 
 ${body}` : `${COMMIT_MARKER} ${subject}`;
-    (0, import_child_process5.execFileSync)("git", ["add", "-A"], { cwd: this.outputDir, stdio: "pipe" });
-    (0, import_child_process5.execFileSync)("git", ["commit", "--allow-empty", "-m", fullMessage], {
+    (0, import_child_process4.execFileSync)("git", ["add", "-A"], { cwd: this.outputDir, stdio: "pipe" });
+    (0, import_child_process4.execFileSync)("git", ["commit", "--allow-empty", "-m", fullMessage], {
       cwd: this.outputDir,
       stdio: "pipe"
     });
-    return (0, import_child_process5.execFileSync)("git", ["rev-parse", "HEAD"], {
+    return (0, import_child_process4.execFileSync)("git", ["rev-parse", "HEAD"], {
       cwd: this.outputDir,
       encoding: "utf-8",
       stdio: "pipe"
@@ -41542,19 +41376,17 @@ ${newBlock}${remainder}`;
 };
 
 // src/pipeline/steps/GenerationCommitStep.ts
-var import_child_process6 = require("child_process");
+var import_child_process5 = require("child_process");
 var GenerationCommitStep = class extends BaseStep {
-  constructor(outputDir, logger, config, cliVersion, generatorVersions, generatorName) {
+  constructor(outputDir, logger, config, cliVersion, generatorVersions) {
     super(outputDir, logger);
     this.config = config;
     this.cliVersion = cliVersion;
     this.generatorVersions = generatorVersions;
-    this.generatorName = generatorName;
   }
   config;
   cliVersion;
   generatorVersions;
-  generatorName;
   name = "generationCommit";
   async execute(_context) {
     const headBeforePrepare = tryRevParse(this.outputDir, "HEAD");
@@ -41566,7 +41398,6 @@ var GenerationCommitStep = class extends BaseStep {
           outputDir: this.outputDir,
           cliVersion: this.cliVersion,
           generatorVersions: this.generatorVersions,
-          generatorName: this.generatorName,
           skipApplication: this.config.skipApplication,
           logger: this.logger
         },
@@ -41576,7 +41407,7 @@ var GenerationCommitStep = class extends BaseStep {
       const reason = error instanceof ReplayPrepareError ? error.reason : String(error);
       if (headBeforePrepare != null) {
         try {
-          (0, import_child_process6.execFileSync)("git", ["reset", "--hard", headBeforePrepare], {
+          (0, import_child_process5.execFileSync)("git", ["reset", "--hard", headBeforePrepare], {
             cwd: this.outputDir,
             stdio: "pipe"
           });
@@ -41605,7 +41436,6 @@ var GenerationCommitStep = class extends BaseStep {
       preparedReplay: prepared,
       previousGenerationSha: prepared.previousGenerationSha ?? void 0,
       currentGenerationSha: prepared.currentGenerationSha,
-      baseBranchHead: prepared.baseBranchHead ?? void 0,
       flow: prepared.flow,
       bootstrapAttempted: prepareState.bootstrapAttempted
     };
@@ -41613,7 +41443,7 @@ var GenerationCommitStep = class extends BaseStep {
 };
 function tryRevParse(cwd2, rev) {
   try {
-    return (0, import_child_process6.execFileSync)("git", ["rev-parse", "--verify", rev], {
+    return (0, import_child_process5.execFileSync)("git", ["rev-parse", "--verify", rev], {
       cwd: cwd2,
       encoding: "utf-8",
       stdio: "pipe"
@@ -41787,18 +41617,16 @@ async function pushSignedCommit({
     await repository.pushObjectToRef(localHeadSha, tempRef);
     tempRefPushed = true;
     for (let attempt2 = 0; attempt2 < MAX_CONCURRENT_PUSH_RETRIES; attempt2++) {
-      const commitAuthor = {
-        name: author?.name ?? FERN_BOT_NAME2,
-        email: author?.email ?? FERN_BOT_EMAIL2
-      };
+      const resolvedAuthor = author ?? { name: FERN_BOT_NAME2, email: FERN_BOT_EMAIL2 };
+      const committerField = author != null ? { committer: author } : {};
       const { data: signedCommit } = await octokit.git.createCommit({
         owner,
         repo,
         message,
         tree: treeSha,
         parents,
-        author: commitAuthor,
-        committer: commitAuthor
+        author: resolvedAuthor,
+        ...committerField
       });
       const signedSha = signedCommit.sha;
       try {
@@ -42360,17 +42188,15 @@ function resolveBranchAction({
 
 // src/pipeline/steps/ReplayStep.ts
 var ReplayStep = class extends BaseStep {
-  constructor(outputDir, logger, config, cliVersion, generatorVersions, generatorName) {
+  constructor(outputDir, logger, config, cliVersion, generatorVersions) {
     super(outputDir, logger);
     this.config = config;
     this.cliVersion = cliVersion;
     this.generatorVersions = generatorVersions;
-    this.generatorName = generatorName;
   }
   config;
   cliVersion;
   generatorVersions;
-  generatorName;
   name = "replay";
   async execute(context) {
     const generationCommit = context.previousStepResults.generationCommit;
@@ -42409,7 +42235,6 @@ var ReplayStep = class extends BaseStep {
       cliVersion: this.cliVersion,
       generatorVersions: this.generatorVersions,
       stageOnly: this.config.stageOnly ?? false,
-      generatorName: this.generatorName,
       skipApplication: this.config.skipApplication,
       logger: this.logger
     });
@@ -42421,7 +42246,6 @@ var ReplayStep = class extends BaseStep {
         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",
@@ -42436,7 +42260,6 @@ var ReplayStep = class extends BaseStep {
         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",
@@ -42451,7 +42274,6 @@ var ReplayStep = class extends BaseStep {
       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,
@@ -42723,8 +42545,7 @@ var PostGenerationPipeline = class {
           this.logger,
           { enabled: true, skipApplication: config.replay.skipApplication },
           config.cliVersion,
-          config.generatorVersions,
-          config.generatorName
+          config.generatorVersions
         )
       );
     }
@@ -42738,8 +42559,7 @@ var PostGenerationPipeline = class {
           this.logger,
           config.replay,
           config.cliVersion,
-          config.generatorVersions,
-          config.generatorName
+          config.generatorVersions
         )
       );
     }
@@ -42764,8 +42584,8 @@ var PostGenerationPipeline = class {
   async run() {
     if (this.config.github?.enabled) {
       try {
-        (0, import_child_process7.execFileSync)("git", ["config", "user.name", FERN_BOT_NAME2], { cwd: this.config.outputDir });
-        (0, import_child_process7.execFileSync)("git", ["config", "user.email", FERN_BOT_EMAIL2], { cwd: this.config.outputDir });
+        (0, import_child_process6.execFileSync)("git", ["config", "user.name", FERN_BOT_NAME2], { cwd: this.config.outputDir });
+        (0, import_child_process6.execFileSync)("git", ["config", "user.email", FERN_BOT_EMAIL2], { cwd: this.config.outputDir });
       } catch {
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fern-api/generator-cli",
-  "version": "0.9.30",
+  "version": "0.9.32",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",
@@ -23,7 +23,7 @@
   ],
   "dependencies": {
     "@boundaryml/baml": "^0.219.0",
-    "@fern-api/replay": "0.15.2",
+    "@fern-api/replay": "0.16.0",
     "@octokit/rest": "^22.0.1",
     "es-toolkit": "^1.45.1",
     "semver": "^7.6.3",