@fern-api/replay 0.7.0 → 0.8.0

package/dist/index.d.cts

@@ -100,6 +100,7 @@ declare class GitClient {
     }>>;
     isAncestor(commit: string, descendant: string): Promise<boolean>;
     commitExists(sha: string): Promise<boolean>;
+    getCommitBody(commitSha: string): Promise<string>;
     getRepoPath(): string;
 }
 
@@ -108,6 +109,12 @@ declare const FERN_BOT_EMAIL = "115122769+fern-api[bot]@users.noreply.github.com
 declare const FERN_BOT_LOGIN = "fern-api[bot]";
 declare function isGenerationCommit(commit: CommitInfo): boolean;
 declare function isReplayCommit(commit: CommitInfo): boolean;
+/** Check if a commit message indicates a git revert */
+declare function isRevertCommit(message: string): boolean;
+/** Extract the reverted commit SHA from a full commit body containing "This reverts commit SHA." */
+declare function parseRevertedSha(fullBody: string): string | undefined;
+/** Extract the original commit message from a revert subject like 'Revert "original message"' */
+declare function parseRevertedMessage(subject: string): string | undefined;
 
 declare class LockfileManager {
     private outputDir;
@@ -143,20 +150,28 @@ declare class LockfileManager {
     private ensureLoaded;
 }
 
+interface DetectionResult {
+    patches: StoredPatch[];
+    revertedPatchIds: string[];
+}
 declare class ReplayDetector {
     private git;
     private lockManager;
     private sdkOutputDir;
     readonly warnings: string[];
     constructor(git: GitClient, lockManager: LockfileManager, sdkOutputDir: string);
-    detectNewPatches(): Promise<StoredPatch[]>;
+    detectNewPatches(): Promise<DetectionResult>;
     /**
      * Compute content hash for deduplication.
      * Removes commit SHA line and index lines before hashing,
      * so rebased commits with same content produce the same hash.
      */
     computeContentHash(patchContent: string): string;
-    /** Detect patches via tree diff for non-linear history. Returns a composite patch. */
+    /**
+     * 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
+     * patch from the aggregate diff — individual revert commits are not distinguishable.
+     */
     private detectPatchesViaTreeDiff;
     private parseGitLog;
     private getLastGeneration;
@@ -242,6 +257,7 @@ interface ReplayReport {
     patchesKeptAsUserOwned?: number;
     patchesPartiallyApplied?: number;
     patchesConflictResolved?: number;
+    patchesReverted?: number;
     patchesRefreshed?: number;
     conflicts: FileResult[];
     conflictDetails?: ConflictDetail[];
@@ -319,11 +335,6 @@ declare class ReplayService {
      * Called BEFORE commitGeneration() while HEAD has customer code.
      */
     private preGenerationRebase;
-    /**
-     * Strip conflict markers from file content, keeping the OURS (Generated) side.
-     * Preserves clean patches' non-conflicting changes on shared files.
-     */
-    private stripConflictMarkers;
     /**
      * After applyPatches(), strip conflict markers from conflicting files
      * so only clean content is committed. Keeps the Generated (OURS) side.
@@ -492,4 +503,4 @@ interface StatusGeneration {
 }
 declare function status(outputDir: string): StatusResult;
 
-export { type BootstrapOptions, type BootstrapResult, type CommitInfo, type CommitOptions, type ConflictDetail, type ConflictMetadata, type ConflictReason, type ConflictRegion, type CustomizationsConfig, FERN_BOT_EMAIL, FERN_BOT_LOGIN, FERN_BOT_NAME, FernignoreMigrator, type FileResult, type ForgetOptions, type ForgetResult, type GenerationLock, type GenerationRecord, GitClient, LockfileManager, type MergeResult, type MigrationAnalysis, type MigrationResult, type MoveDeclaration, ReplayApplicator, ReplayCommitter, type ReplayConfig, ReplayDetector, type ReplayOptions, type ReplayReport, type ReplayResult, ReplayService, type ResetOptions, type ResetResult, type ResolveOptions, type ResolveResult, type StatusGeneration, type StatusPatch, type StatusResult, type StoredPatch, type UnresolvedPatchInfo, bootstrap, forget, isGenerationCommit, isReplayCommit, reset, resolve, status, threeWayMerge };
+export { type BootstrapOptions, type BootstrapResult, type CommitInfo, type CommitOptions, type ConflictDetail, type ConflictMetadata, type ConflictReason, type ConflictRegion, type CustomizationsConfig, type DetectionResult, FERN_BOT_EMAIL, FERN_BOT_LOGIN, FERN_BOT_NAME, FernignoreMigrator, type FileResult, type ForgetOptions, type ForgetResult, type GenerationLock, type GenerationRecord, GitClient, LockfileManager, type MergeResult, type MigrationAnalysis, type MigrationResult, type MoveDeclaration, ReplayApplicator, ReplayCommitter, type ReplayConfig, ReplayDetector, type ReplayOptions, type ReplayReport, type ReplayResult, ReplayService, type ResetOptions, type ResetResult, type ResolveOptions, type ResolveResult, type StatusGeneration, type StatusPatch, type StatusResult, type StoredPatch, type UnresolvedPatchInfo, bootstrap, forget, isGenerationCommit, isReplayCommit, isRevertCommit, parseRevertedMessage, parseRevertedSha, reset, resolve, status, threeWayMerge };

package/dist/index.d.ts

@@ -100,6 +100,7 @@ declare class GitClient {
     }>>;
     isAncestor(commit: string, descendant: string): Promise<boolean>;
     commitExists(sha: string): Promise<boolean>;
+    getCommitBody(commitSha: string): Promise<string>;
     getRepoPath(): string;
 }
 
@@ -108,6 +109,12 @@ declare const FERN_BOT_EMAIL = "115122769+fern-api[bot]@users.noreply.github.com
 declare const FERN_BOT_LOGIN = "fern-api[bot]";
 declare function isGenerationCommit(commit: CommitInfo): boolean;
 declare function isReplayCommit(commit: CommitInfo): boolean;
+/** Check if a commit message indicates a git revert */
+declare function isRevertCommit(message: string): boolean;
+/** Extract the reverted commit SHA from a full commit body containing "This reverts commit SHA." */
+declare function parseRevertedSha(fullBody: string): string | undefined;
+/** Extract the original commit message from a revert subject like 'Revert "original message"' */
+declare function parseRevertedMessage(subject: string): string | undefined;
 
 declare class LockfileManager {
     private outputDir;
@@ -143,20 +150,28 @@ declare class LockfileManager {
     private ensureLoaded;
 }
 
+interface DetectionResult {
+    patches: StoredPatch[];
+    revertedPatchIds: string[];
+}
 declare class ReplayDetector {
     private git;
     private lockManager;
     private sdkOutputDir;
     readonly warnings: string[];
     constructor(git: GitClient, lockManager: LockfileManager, sdkOutputDir: string);
-    detectNewPatches(): Promise<StoredPatch[]>;
+    detectNewPatches(): Promise<DetectionResult>;
     /**
      * Compute content hash for deduplication.
      * Removes commit SHA line and index lines before hashing,
      * so rebased commits with same content produce the same hash.
      */
     computeContentHash(patchContent: string): string;
-    /** Detect patches via tree diff for non-linear history. Returns a composite patch. */
+    /**
+     * 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
+     * patch from the aggregate diff — individual revert commits are not distinguishable.
+     */
     private detectPatchesViaTreeDiff;
     private parseGitLog;
     private getLastGeneration;
@@ -242,6 +257,7 @@ interface ReplayReport {
     patchesKeptAsUserOwned?: number;
     patchesPartiallyApplied?: number;
     patchesConflictResolved?: number;
+    patchesReverted?: number;
     patchesRefreshed?: number;
     conflicts: FileResult[];
     conflictDetails?: ConflictDetail[];
@@ -319,11 +335,6 @@ declare class ReplayService {
      * Called BEFORE commitGeneration() while HEAD has customer code.
      */
     private preGenerationRebase;
-    /**
-     * Strip conflict markers from file content, keeping the OURS (Generated) side.
-     * Preserves clean patches' non-conflicting changes on shared files.
-     */
-    private stripConflictMarkers;
     /**
      * After applyPatches(), strip conflict markers from conflicting files
      * so only clean content is committed. Keeps the Generated (OURS) side.
@@ -492,4 +503,4 @@ interface StatusGeneration {
 }
 declare function status(outputDir: string): StatusResult;
 
-export { type BootstrapOptions, type BootstrapResult, type CommitInfo, type CommitOptions, type ConflictDetail, type ConflictMetadata, type ConflictReason, type ConflictRegion, type CustomizationsConfig, FERN_BOT_EMAIL, FERN_BOT_LOGIN, FERN_BOT_NAME, FernignoreMigrator, type FileResult, type ForgetOptions, type ForgetResult, type GenerationLock, type GenerationRecord, GitClient, LockfileManager, type MergeResult, type MigrationAnalysis, type MigrationResult, type MoveDeclaration, ReplayApplicator, ReplayCommitter, type ReplayConfig, ReplayDetector, type ReplayOptions, type ReplayReport, type ReplayResult, ReplayService, type ResetOptions, type ResetResult, type ResolveOptions, type ResolveResult, type StatusGeneration, type StatusPatch, type StatusResult, type StoredPatch, type UnresolvedPatchInfo, bootstrap, forget, isGenerationCommit, isReplayCommit, reset, resolve, status, threeWayMerge };
+export { type BootstrapOptions, type BootstrapResult, type CommitInfo, type CommitOptions, type ConflictDetail, type ConflictMetadata, type ConflictReason, type ConflictRegion, type CustomizationsConfig, type DetectionResult, FERN_BOT_EMAIL, FERN_BOT_LOGIN, FERN_BOT_NAME, FernignoreMigrator, type FileResult, type ForgetOptions, type ForgetResult, type GenerationLock, type GenerationRecord, GitClient, LockfileManager, type MergeResult, type MigrationAnalysis, type MigrationResult, type MoveDeclaration, ReplayApplicator, ReplayCommitter, type ReplayConfig, ReplayDetector, type ReplayOptions, type ReplayReport, type ReplayResult, ReplayService, type ResetOptions, type ResetResult, type ResolveOptions, type ResolveResult, type StatusGeneration, type StatusPatch, type StatusResult, type StoredPatch, type UnresolvedPatchInfo, bootstrap, forget, isGenerationCommit, isReplayCommit, isRevertCommit, parseRevertedMessage, parseRevertedSha, reset, resolve, status, threeWayMerge };

package/dist/index.js

@@ -111,6 +111,9 @@ var init_GitClient = __esm({
           return false;
         }
       }
+      async getCommitBody(commitSha) {
+        return this.exec(["log", "-1", "--format=%B", commitSha]);
+      }
       getRepoPath() {
         return this.repoPath;
       }
@@ -138,6 +141,17 @@ function isGenerationCommit(commit) {
 function isReplayCommit(commit) {
   return commit.message.startsWith("[fern-replay]");
 }
+function isRevertCommit(message) {
+  return message.startsWith('Revert "');
+}
+function parseRevertedSha(fullBody) {
+  const match = fullBody.match(/This reverts commit ([0-9a-f]{40})\./);
+  return match?.[1];
+}
+function parseRevertedMessage(subject) {
+  const match = subject.match(/^Revert "(.+)"$/);
+  return match?.[1];
+}
 
 // src/LockfileManager.ts
 import { readFileSync, writeFileSync, existsSync, mkdirSync, renameSync } from "fs";
@@ -300,14 +314,14 @@ var ReplayDetector = class {
     const lock = this.lockManager.read();
     const lastGen = this.getLastGeneration(lock);
     if (!lastGen) {
-      return [];
+      return { patches: [], revertedPatchIds: [] };
     }
     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. Skipping new patch detection. Existing lockfile patches will still be applied.`
       );
-      return [];
+      return { patches: [], revertedPatchIds: [] };
     }
     const isAncestor = await this.git.isAncestor(lastGen.commit_sha, "HEAD");
     if (!isAncestor) {
@@ -321,7 +335,7 @@ var ReplayDetector = class {
       this.sdkOutputDir
     ]);
     if (!log.trim()) {
-      return [];
+      return { patches: [], revertedPatchIds: [] };
     }
     const commits = this.parseGitLog(log);
     const newPatches = [];
@@ -357,7 +371,60 @@ var ReplayDetector = class {
         patch_content: patchContent
       });
     }
-    return newPatches.reverse();
+    newPatches.reverse();
+    const revertedPatchIdSet = /* @__PURE__ */ new Set();
+    const revertIndicesToRemove = /* @__PURE__ */ new Set();
+    for (let i = 0; i < newPatches.length; i++) {
+      const patch = newPatches[i];
+      if (!isRevertCommit(patch.original_message)) continue;
+      let body = "";
+      try {
+        body = await this.git.getCommitBody(patch.original_commit);
+      } catch {
+      }
+      const revertedSha = parseRevertedSha(body);
+      const revertedMessage = parseRevertedMessage(patch.original_message);
+      let matchedExisting = false;
+      if (revertedSha) {
+        const existing = lock.patches.find((p) => p.original_commit === revertedSha);
+        if (existing) {
+          revertedPatchIdSet.add(existing.id);
+          revertIndicesToRemove.add(i);
+          matchedExisting = true;
+        }
+      }
+      if (!matchedExisting && revertedMessage) {
+        const existing = lock.patches.find((p) => p.original_message === revertedMessage);
+        if (existing) {
+          revertedPatchIdSet.add(existing.id);
+          revertIndicesToRemove.add(i);
+          matchedExisting = true;
+        }
+      }
+      if (matchedExisting) continue;
+      let matchedNew = false;
+      if (revertedSha) {
+        const idx = newPatches.findIndex(
+          (p, j) => j !== i && !revertIndicesToRemove.has(j) && p.original_commit === revertedSha
+        );
+        if (idx !== -1) {
+          revertIndicesToRemove.add(i);
+          revertIndicesToRemove.add(idx);
+          matchedNew = true;
+        }
+      }
+      if (!matchedNew && revertedMessage) {
+        const idx = newPatches.findIndex(
+          (p, j) => j !== i && !revertIndicesToRemove.has(j) && p.original_message === revertedMessage
+        );
+        if (idx !== -1) {
+          revertIndicesToRemove.add(i);
+          revertIndicesToRemove.add(idx);
+        }
+      }
+    }
+    const filteredPatches = newPatches.filter((_, i) => !revertIndicesToRemove.has(i));
+    return { patches: filteredPatches, revertedPatchIds: [...revertedPatchIdSet] };
   }
   /**
    * Compute content hash for deduplication.
@@ -368,31 +435,34 @@ var ReplayDetector = class {
     const normalized = patchContent.split("\n").filter((line) => !line.startsWith("From ") && !line.startsWith("index ") && !line.startsWith("Date: ")).join("\n");
     return `sha256:${createHash("sha256").update(normalized).digest("hex")}`;
   }
-  /** Detect patches via tree diff for non-linear history. Returns a composite patch. */
+  /**
+   * 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
+   * patch from the aggregate diff — individual revert commits are not distinguishable.
+   */
   async detectPatchesViaTreeDiff(lastGen) {
     const filesOutput = await this.git.exec(["diff", "--name-only", lastGen.commit_sha, "HEAD"]);
     const files = filesOutput.trim().split("\n").filter(Boolean).filter((f) => !INFRASTRUCTURE_FILES.has(f)).filter((f) => !f.startsWith(".fern/"));
-    if (files.length === 0) return [];
+    if (files.length === 0) return { patches: [], revertedPatchIds: [] };
     const diff = await this.git.exec(["diff", lastGen.commit_sha, "HEAD", "--", ...files]);
-    if (!diff.trim()) return [];
+    if (!diff.trim()) return { patches: [], revertedPatchIds: [] };
     const contentHash = this.computeContentHash(diff);
     const lock = this.lockManager.read();
     if (lock.patches.some((p) => p.content_hash === contentHash)) {
-      return [];
+      return { patches: [], revertedPatchIds: [] };
     }
     const headSha = (await this.git.exec(["rev-parse", "HEAD"])).trim();
-    return [
-      {
-        id: `patch-composite-${headSha.slice(0, 8)}`,
-        content_hash: contentHash,
-        original_commit: headSha,
-        original_message: "Customer customizations (composite)",
-        original_author: "composite",
-        base_generation: lastGen.commit_sha,
-        files,
-        patch_content: diff
-      }
-    ];
+    const compositePatch = {
+      id: `patch-composite-${headSha.slice(0, 8)}`,
+      content_hash: contentHash,
+      original_commit: headSha,
+      original_message: "Customer customizations (composite)",
+      original_author: "composite",
+      base_generation: lastGen.commit_sha,
+      files,
+      patch_content: diff
+    };
+    return { patches: [compositePatch], revertedPatchIds: [] };
   }
   parseGitLog(log) {
     return log.trim().split("\n").map((line) => {
@@ -990,10 +1060,40 @@ CLI Version: ${options.cliVersion}`;
 };
 
 // src/ReplayService.ts
-init_GitClient();
 import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
 import { join as join3 } from "path";
 import { minimatch as minimatch2 } from "minimatch";
+init_GitClient();
+
+// src/conflict-utils.ts
+function stripConflictMarkers(content) {
+  const lines = content.split("\n");
+  const result = [];
+  let inConflict = false;
+  let inOurs = false;
+  for (const line of lines) {
+    if (line.startsWith("<<<<<<< ")) {
+      inConflict = true;
+      inOurs = true;
+      continue;
+    }
+    if (inConflict && line === "=======") {
+      inOurs = false;
+      continue;
+    }
+    if (inConflict && line.startsWith(">>>>>>> ")) {
+      inConflict = false;
+      inOurs = false;
+      continue;
+    }
+    if (!inConflict || inOurs) {
+      result.push(line);
+    }
+  }
+  return result.join("\n");
+}
+
+// src/ReplayService.ts
 var ReplayService = class {
   git;
   detector;
@@ -1061,7 +1161,7 @@ var ReplayService = class {
     }
     this.lockManager.save();
     try {
-      const redetectedPatches = await this.detector.detectNewPatches();
+      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();
@@ -1152,7 +1252,7 @@ var ReplayService = class {
     };
   }
   async handleNoPatchesRegeneration(options) {
-    const newPatches = await this.detector.detectNewPatches();
+    const { patches: newPatches, revertedPatchIds } = await this.detector.detectNewPatches();
     const warnings = [...this.detector.warnings];
     if (options?.dryRun) {
       return {
@@ -1161,11 +1261,18 @@ var ReplayService = class {
         patchesApplied: 0,
         patchesWithConflicts: 0,
         patchesSkipped: 0,
+        patchesReverted: revertedPatchIds.length,
         conflicts: [],
         wouldApply: newPatches,
         warnings: warnings.length > 0 ? warnings : void 0
       };
     }
+    for (const id of revertedPatchIds) {
+      try {
+        this.lockManager.removePatch(id);
+      } catch {
+      }
+    }
     const commitOpts = options ? {
       cliVersion: options.cliVersion ?? "unknown",
       generatorVersions: options.generatorVersions ?? {},
@@ -1199,12 +1306,12 @@ var ReplayService = class {
         await this.committer.stageAll();
       }
     }
-    return this.buildReport("no-patches", newPatches, results, options, warnings, rebaseCounts);
+    return this.buildReport("no-patches", newPatches, results, options, warnings, rebaseCounts, void 0, revertedPatchIds.length);
   }
   async handleNormalRegeneration(options) {
     if (options?.dryRun) {
       const existingPatches2 = this.lockManager.getPatches();
-      const newPatches2 = await this.detector.detectNewPatches();
+      const { patches: newPatches2, revertedPatchIds: dryRunReverted } = await this.detector.detectNewPatches();
       const warnings2 = [...this.detector.warnings];
       const allPatches2 = [...existingPatches2, ...newPatches2];
       return {
@@ -1213,13 +1320,19 @@ var ReplayService = class {
         patchesApplied: 0,
         patchesWithConflicts: 0,
         patchesSkipped: 0,
+        patchesReverted: dryRunReverted.length,
         conflicts: [],
         wouldApply: allPatches2,
         warnings: warnings2.length > 0 ? warnings2 : void 0
       };
     }
     let existingPatches = this.lockManager.getPatches();
+    const preRebasePatchIds = new Set(existingPatches.map((p) => p.id));
     const preRebaseCounts = await this.preGenerationRebase(existingPatches);
+    const postRebasePatchIds = new Set(this.lockManager.getPatches().map((p) => p.id));
+    const removedByPreRebase = existingPatches.filter(
+      (p) => preRebasePatchIds.has(p.id) && !postRebasePatchIds.has(p.id)
+    );
     existingPatches = this.lockManager.getPatches();
     const seenHashes = /* @__PURE__ */ new Set();
     for (const p of existingPatches) {
@@ -1230,8 +1343,28 @@ var ReplayService = class {
       }
     }
     existingPatches = this.lockManager.getPatches();
-    const newPatches = await this.detector.detectNewPatches();
+    let { patches: newPatches, revertedPatchIds } = await this.detector.detectNewPatches();
     const warnings = [...this.detector.warnings];
+    if (removedByPreRebase.length > 0) {
+      const removedOriginalCommits = new Set(removedByPreRebase.map((p) => p.original_commit));
+      const removedOriginalMessages = new Set(removedByPreRebase.map((p) => p.original_message));
+      newPatches = newPatches.filter((p) => {
+        if (removedOriginalCommits.has(p.original_commit)) return false;
+        if (isRevertCommit(p.original_message)) {
+          const revertedMsg = parseRevertedMessage(p.original_message);
+          if (revertedMsg && removedOriginalMessages.has(revertedMsg)) return false;
+        }
+        return true;
+      });
+    }
+    for (const id of revertedPatchIds) {
+      try {
+        this.lockManager.removePatch(id);
+      } catch {
+      }
+    }
+    const revertedSet = new Set(revertedPatchIds);
+    existingPatches = existingPatches.filter((p) => !revertedSet.has(p.id));
     const allPatches = [...existingPatches, ...newPatches];
     const commitOpts = options ? {
       cliVersion: options.cliVersion ?? "unknown",
@@ -1276,7 +1409,8 @@ var ReplayService = class {
       options,
       warnings,
       rebaseCounts,
-      preRebaseCounts
+      preRebaseCounts,
+      revertedPatchIds.length
     );
   }
   /**
@@ -1469,36 +1603,6 @@ var ReplayService = class {
     }
     return { conflictResolved, conflictAbsorbed, contentRefreshed };
   }
-  /**
-   * Strip conflict markers from file content, keeping the OURS (Generated) side.
-   * Preserves clean patches' non-conflicting changes on shared files.
-   */
-  stripConflictMarkers(content) {
-    const lines = content.split("\n");
-    const result = [];
-    let inConflict = false;
-    let inOurs = false;
-    for (const line of lines) {
-      if (line.startsWith("<<<<<<< ")) {
-        inConflict = true;
-        inOurs = true;
-        continue;
-      }
-      if (inConflict && line === "=======") {
-        inOurs = false;
-        continue;
-      }
-      if (inConflict && line.startsWith(">>>>>>> ")) {
-        inConflict = false;
-        inOurs = false;
-        continue;
-      }
-      if (!inConflict || inOurs) {
-        result.push(line);
-      }
-    }
-    return result.join("\n");
-  }
   /**
    * After applyPatches(), strip conflict markers from conflicting files
    * so only clean content is committed. Keeps the Generated (OURS) side.
@@ -1511,7 +1615,7 @@ var ReplayService = class {
         const filePath = join3(this.outputDir, fileResult.file);
         try {
           const content = readFileSync2(filePath, "utf-8");
-          const stripped = this.stripConflictMarkers(content);
+          const stripped = stripConflictMarkers(content);
           writeFileSync2(filePath, stripped);
         } catch {
         }
@@ -1523,7 +1627,7 @@ var ReplayService = class {
     if (!existsSync2(fernignorePath)) return [];
     return readFileSync2(fernignorePath, "utf-8").split("\n").map((line) => line.trim()).filter((line) => line && !line.startsWith("#"));
   }
-  buildReport(flow, patches, results, options, warnings, rebaseCounts, preRebaseCounts) {
+  buildReport(flow, patches, results, options, warnings, rebaseCounts, preRebaseCounts, patchesReverted) {
     const conflictResults = results.filter((r) => r.status === "conflict");
     const conflictDetails = conflictResults.map((r) => {
       const conflictFiles = r.fileResults?.filter((f) => f.status === "conflict") ?? [];
@@ -1548,6 +1652,7 @@ var ReplayService = class {
       patchesRepointed: rebaseCounts && rebaseCounts.repointed > 0 ? rebaseCounts.repointed : void 0,
       patchesContentRebased: rebaseCounts && rebaseCounts.contentRebased > 0 ? rebaseCounts.contentRebased : void 0,
       patchesKeptAsUserOwned: rebaseCounts && rebaseCounts.keptAsUserOwned > 0 ? rebaseCounts.keptAsUserOwned : void 0,
+      patchesReverted: patchesReverted && patchesReverted > 0 ? patchesReverted : void 0,
       patchesConflictResolved: preRebaseCounts && preRebaseCounts.conflictResolved + preRebaseCounts.conflictAbsorbed > 0 ? preRebaseCounts.conflictResolved + preRebaseCounts.conflictAbsorbed : void 0,
       patchesRefreshed: preRebaseCounts && preRebaseCounts.contentRefreshed > 0 ? preRebaseCounts.contentRefreshed : void 0,
       conflicts: conflictResults.flatMap((r) => r.fileResults?.filter((f) => f.status === "conflict") ?? []),
@@ -1594,7 +1699,7 @@ var FernignoreMigrator = class {
   async analyzeMigration() {
     const patterns = this.readFernignorePatterns();
     const detector = new ReplayDetector(this.git, this.lockManager, this.outputDir);
-    const patches = await detector.detectNewPatches();
+    const { patches } = await detector.detectNewPatches();
     const trackedByBoth = [];
     const fernignoreOnly = [];
     const commitsOnly = [];
@@ -1719,7 +1824,7 @@ var FernignoreMigrator = class {
   async migrate() {
     const analysis = await this.analyzeMigration();
     const detector = new ReplayDetector(this.git, this.lockManager, this.outputDir);
-    const patches = await detector.detectNewPatches();
+    const { patches } = await detector.detectNewPatches();
     const warnings = [];
     let patchesCreated = 0;
     for (const patch of patches) {
@@ -2135,6 +2240,9 @@ export {
   forget,
   isGenerationCommit,
   isReplayCommit,
+  isRevertCommit,
+  parseRevertedMessage,
+  parseRevertedSha,
   reset,
   resolve,
   status,