@fern-api/replay 0.15.1 → 0.16.0

package/dist/index.cjs

@@ -554,9 +554,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]");
 }
@@ -884,8 +897,48 @@ var ReplayDetector = class {
     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: [] };
@@ -893,7 +946,7 @@ var ReplayDetector = class {
     const exists = await this.git.commitExists(lastGen.commit_sha);
     if (!exists) {
       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,
@@ -901,44 +954,8 @@ var ReplayDetector = class {
         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
@@ -951,7 +968,7 @@ var ReplayDetector = class {
   async detectPatchesInRange(rangeStart, lastGen, lock) {
     const log = await this.git.exec([
       "log",
-      "--first-parent",
+      "--no-merges",
       "--format=%H%x00%an%x00%ae%x00%s",
       `${rangeStart}..HEAD`,
       "--",
@@ -971,18 +988,6 @@ var ReplayDetector = class {
         continue;
       }
       const parents = await this.git.getCommitParents(commit.sha);
-      if (parents.length > 1) {
-        const compositePatch = await this.createMergeCompositePatch({
-          mergeCommit: commit,
-          firstParent: parents[0],
-          lastGen,
-          lock
-        });
-        if (compositePatch) {
-          newPatches.push(compositePatch);
-        }
-        continue;
-      }
       let patchContent;
       try {
         patchContent = await this.git.formatPatch(commit.sha);
@@ -1120,9 +1125,7 @@ var ReplayDetector = class {
    * within the current linear detection window, and are absent from
    * HEAD at the end of the window.
    *
-   * Rationale: on a merge commit, createMergeCompositePatch already diffs
-   * firstParent..mergeCommit so net-zero files never enter the composite. On
-   * linear history each commit becomes its own patch, so a file that was
+   * Rationale: each commit becomes its own patch, so a file that was
    * briefly added and later removed survives as a create+delete pair whose
    * cumulative diff is empty. We drop such patches before they reach the
    * lockfile.
@@ -1189,54 +1192,6 @@ var ReplayDetector = class {
       return /* @__PURE__ */ new Set();
     }
   }
-  /**
-   * Create a single composite patch for a merge commit by diffing the merge
-   * commit against its first parent. This captures the net change of the
-   * entire merged branch as one patch, eliminating accumulator chaining and
-   * zero-net-change ghost conflicts.
-   */
-  async createMergeCompositePatch(input) {
-    const { mergeCommit, firstParent, lastGen, lock } = input;
-    const forgottenHashes = new Set(lock.forgotten_hashes ?? []);
-    const filesOutput = await this.git.exec([
-      "diff",
-      "--name-only",
-      firstParent,
-      mergeCommit.sha
-    ]);
-    const { files, sensitiveFiles } = filterInfrastructureAndSensitiveFiles(filesOutput);
-    if (sensitiveFiles.length > 0) {
-      this.warnings.push(
-        `Sensitive file(s) excluded from merge patch for commit ${mergeCommit.sha.slice(0, 7)}: ${sensitiveFiles.join(", ")}. These files will not be tracked by replay.`
-      );
-    }
-    if (files.length === 0) return null;
-    const diff = await this.git.exec([
-      "diff",
-      firstParent,
-      mergeCommit.sha,
-      "--",
-      ...files
-    ]);
-    if (!diff.trim()) return null;
-    const contentHash = this.computeContentHash(diff);
-    if (lock.patches.some((p) => p.content_hash === contentHash) || forgottenHashes.has(contentHash)) {
-      return null;
-    }
-    const theirsSnapshot = await capturePatchSnapshot(this.git, files, mergeCommit.sha);
-    return {
-      id: `patch-merge-${mergeCommit.sha.slice(0, 8)}`,
-      content_hash: contentHash,
-      original_commit: mergeCommit.sha,
-      original_message: mergeCommit.message,
-      original_author: `${mergeCommit.authorName} <${mergeCommit.authorEmail}>`,
-      base_generation: lastGen.commit_sha,
-      files,
-      patch_content: diff,
-      ...Object.keys(theirsSnapshot).length > 0 ? { theirs_snapshot: theirsSnapshot } : {},
-      ...this.isCreationOnlyPatch(diff) ? { user_owned: true } : {}
-    };
-  }
   /**
    * Detect patches via tree diff for non-linear history. Returns a composite patch.
    * Revert reconciliation is skipped here because tree-diff produces a single composite
@@ -1436,6 +1391,26 @@ var ReplayDetector = class {
   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: {}
+    };
+  }
 };
 
 // src/ThreeWayMerge.ts
@@ -2575,8 +2550,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() {
@@ -2963,7 +2937,6 @@ var FirstGenerationFlow = class {
         flow: "first-generation",
         previousGenerationSha: null,
         currentGenerationSha: headSha,
-        baseBranchHead: options.baseBranchHead ?? null,
         _prepared: {
           kind: "terminal",
           flow: "first-generation",
@@ -2973,8 +2946,7 @@ var FirstGenerationFlow = class {
     }
     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);
@@ -2983,7 +2955,6 @@ var FirstGenerationFlow = class {
       flow: "first-generation",
       previousGenerationSha: null,
       currentGenerationSha: genRecord.commit_sha,
-      baseBranchHead: options?.baseBranchHead ?? null,
       _prepared: {
         kind: "active",
         flow: "first-generation",
@@ -3020,8 +2991,7 @@ var SkipApplicationFlow = class {
   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();
@@ -3043,7 +3013,6 @@ var SkipApplicationFlow = class {
       flow: "skip-application",
       previousGenerationSha,
       currentGenerationSha: genRecord.commit_sha,
-      baseBranchHead: options?.baseBranchHead ?? null,
       _prepared: {
         kind: "active",
         flow: "skip-application",
@@ -3104,7 +3073,6 @@ var NoPatchesFlow = class {
         flow: "no-patches",
         previousGenerationSha,
         currentGenerationSha: headSha,
-        baseBranchHead: options.baseBranchHead ?? null,
         _prepared: {
           kind: "terminal",
           flow: "no-patches",
@@ -3136,8 +3104,7 @@ var NoPatchesFlow = class {
     }
     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();
@@ -3147,7 +3114,6 @@ var NoPatchesFlow = class {
       flow: "no-patches",
       previousGenerationSha,
       currentGenerationSha: genRecord.commit_sha,
-      baseBranchHead: options?.baseBranchHead ?? null,
       _prepared: {
         kind: "active",
         flow: "no-patches",
@@ -3237,7 +3203,6 @@ var NormalRegenerationFlow = class {
         flow: "normal-regeneration",
         previousGenerationSha,
         currentGenerationSha: headSha,
-        baseBranchHead: options.baseBranchHead ?? null,
         _prepared: {
           kind: "terminal",
           flow: "normal-regeneration",
@@ -3255,14 +3220,16 @@ var NormalRegenerationFlow = class {
     existingPatches = this.service.lockManager.getPatches();
     const seenHashes = /* @__PURE__ */ new Map();
     for (const p of existingPatches) {
-      const priorPatchId = seenHashes.get(p.content_hash);
-      if (priorPatchId !== void 0) {
-        this.service.lockManager.removePatch(p.id);
-        this.service.warnings.push(
-          `Consolidated patch ${p.id} (commit ${(p.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(p.content_hash, p.id);
+      if (!p.original_commit || p.original_commit === "") {
+        const priorPatchId = seenHashes.get(p.content_hash);
+        if (priorPatchId !== void 0) {
+          this.service.lockManager.removePatch(p.id);
+          this.service.warnings.push(
+            `Consolidated patch ${p.id} into prior patch ${priorPatchId}: byte-identical patch_content. Lockfile collapsed to avoid duplicate-apply corruption on next regen.`
+          );
+        } else {
+          seenHashes.set(p.content_hash, p.id);
+        }
       }
     }
     existingPatches = this.service.lockManager.getPatches();
@@ -3291,8 +3258,7 @@ var NormalRegenerationFlow = class {
     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();
@@ -3302,7 +3268,6 @@ var NormalRegenerationFlow = class {
       flow: "normal-regeneration",
       previousGenerationSha,
       currentGenerationSha: genRecord.commit_sha,
-      baseBranchHead: options?.baseBranchHead ?? null,
       _prepared: {
         kind: "active",
         flow: "normal-regeneration",
@@ -3495,68 +3460,6 @@ var ReplayService = class {
     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 record = {
-      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(record);
-    } else {
-      this.lockManager.read();
-      const unresolvedPatches = [
-        ...this.lockManager.getUnresolvedPatches(),
-        ...this.lockManager.getResolvingPatches()
-      ];
-      resolvedPatches = this.lockManager.getPatches().filter((p) => p.status == null);
-      this.lockManager.addGeneration(record);
-      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((p) => p.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();