@fern-api/replay 0.12.0 → 0.13.0

package/dist/index.d.cts

@@ -210,6 +210,31 @@ declare class ReplayDetector {
     readonly warnings: string[];
     constructor(git: GitClient, lockManager: LockfileManager, sdkOutputDir: string);
     detectNewPatches(): Promise<DetectionResult>;
+    /**
+     * FER-10201 — 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).
+     */
+    private detectPatchesViaMergeBase;
+    /**
+     * FER-10201 — Walk `${rangeStart}..HEAD`, classify each commit, emit one
+     * `StoredPatch` per customer commit. Body shared by the linear path
+     * (rangeStart = lastGen.commit_sha) and the merge-base path.
+     *
+     * Patch `base_generation` is always `lastGen.commit_sha` — the
+     * lockfile-tracked reference the applicator uses to fetch base file
+     * content, regardless of where the walk actually started.
+     */
+    private detectPatchesInRange;
     /**
      * Compute content hash for deduplication.
      *

package/dist/index.d.ts

@@ -210,6 +210,31 @@ declare class ReplayDetector {
     readonly warnings: string[];
     constructor(git: GitClient, lockManager: LockfileManager, sdkOutputDir: string);
     detectNewPatches(): Promise<DetectionResult>;
+    /**
+     * FER-10201 — 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).
+     */
+    private detectPatchesViaMergeBase;
+    /**
+     * FER-10201 — Walk `${rangeStart}..HEAD`, classify each commit, emit one
+     * `StoredPatch` per customer commit. Body shared by the linear path
+     * (rangeStart = lastGen.commit_sha) and the merge-base path.
+     *
+     * Patch `base_generation` is always `lastGen.commit_sha` — the
+     * lockfile-tracked reference the applicator uses to fetch base file
+     * content, regardless of where the walk actually started.
+     */
+    private detectPatchesInRange;
     /**
      * Compute content hash for deduplication.
      *

package/dist/index.js

@@ -708,17 +708,57 @@ var ReplayDetector = class {
     }
     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);
+  }
+  /**
+   * FER-10201 — 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);
+  }
+  /**
+   * FER-10201 — Walk `${rangeStart}..HEAD`, classify each commit, emit one
+   * `StoredPatch` per customer commit. Body shared by the linear path
+   * (rangeStart = lastGen.commit_sha) and the merge-base path.
+   *
+   * Patch `base_generation` is always `lastGen.commit_sha` — the
+   * lockfile-tracked reference the applicator uses to fetch base file
+   * content, regardless of where the walk actually started.
+   */
+  async detectPatchesInRange(rangeStart, lastGen, lock) {
     const log = await this.git.exec([
       "log",
       "--first-parent",
       "--format=%H%x00%an%x00%ae%x00%s",
-      `${lastGen.commit_sha}..HEAD`,
+      `${rangeStart}..HEAD`,
       "--",
       this.sdkOutputDir
     ]);