@fern-api/replay 0.15.1 → 0.15.2

package/dist/cli.cjs

@@ -13739,7 +13739,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`,
       "--",
@@ -13759,18 +13759,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);
@@ -13908,9 +13896,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.
@@ -13977,54 +13963,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