@fern-api/fern-api-dev 5.23.3-941-g239fc7b1855 → 5.23.3-947-ga9032a3d959

package/cli.cjs

@@ -569724,9 +569724,9 @@ var require_diff3 = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/@fern-api+replay@0.18.0/node_modules/@fern-api/replay/dist/index.cjs
+// ../../../node_modules/.pnpm/@fern-api+replay@0.19.0/node_modules/@fern-api/replay/dist/index.cjs
 var require_dist24 = __commonJS({
-  "../../../node_modules/.pnpm/@fern-api+replay@0.18.0/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
+  "../../../node_modules/.pnpm/@fern-api+replay@0.19.0/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
     "use strict";
     var __defProp5 = Object.defineProperty;
     var __getOwnPropDesc4 = Object.getOwnPropertyDescriptor;
@@ -570144,15 +570144,15 @@ var require_dist24 = __commonJS({
     async function applyPatchToContent(base4, patchContent, filePath) {
       const fileDiff = extractFileDiff(patchContent, filePath);
       if (!fileDiff) return null;
-      const tempDir2 = await (0, import_promises510.mkdtemp)((0, import_node_path72.join)((0, import_node_os32.tmpdir)(), "replay-migrate-"));
+      const tempDir2 = await (0, import_promises510.mkdtemp)((0, import_node_path82.join)((0, import_node_os32.tmpdir)(), "replay-migrate-"));
       const tempGit = new GitClient(tempDir2);
       try {
         await tempGit.exec(["init"]);
         await tempGit.exec(["config", "user.email", "migrate@fern.com"]);
         await tempGit.exec(["config", "user.name", "Fern Replay Migration"]);
         await tempGit.exec(["config", "commit.gpgSign", "false"]);
-        const tempFilePath = (0, import_node_path72.join)(tempDir2, filePath);
-        await (0, import_promises510.mkdir)((0, import_node_path72.dirname)(tempFilePath), { recursive: true });
+        const tempFilePath = (0, import_node_path82.join)(tempDir2, filePath);
+        await (0, import_promises510.mkdir)((0, import_node_path82.dirname)(tempFilePath), { recursive: true });
         await (0, import_promises510.writeFile)(tempFilePath, base4);
         await tempGit.exec(["add", filePath]);
         await tempGit.exec(["commit", "-m", `base for ${filePath}`, "--allow-empty"]);
@@ -570185,13 +570185,13 @@ var require_dist24 = __commonJS({
     }
     var import_promises510;
     var import_node_os32;
-    var import_node_path72;
+    var import_node_path82;
     var init_PatchApplyTheirs = __esm3({
       "src/PatchApplyTheirs.ts"() {
         "use strict";
         import_promises510 = require("fs/promises");
         import_node_os32 = require("os");
-        import_node_path72 = require("path");
+        import_node_path82 = require("path");
         init_GitClient();
       }
     });
@@ -570456,6 +570456,22 @@ var require_dist24 = __commonJS({
           this.lock.forgotten_hashes.push(hash5);
         }
       }
+      /**
+       * Record a dismissed customization: visibility metadata in `dismissals`
+       * plus a tombstone in `forgotten_hashes` for every content hash.
+       * `forgotten_hashes` stays the only list the detector consults; the
+       * metadata exists so `status` can show what was dismissed.
+       */
+      addDismissal(record23) {
+        this.ensureLoaded();
+        if (!this.lock.dismissals) {
+          this.lock.dismissals = [];
+        }
+        this.lock.dismissals.push(record23);
+        for (const hash5 of record23.content_hashes) {
+          this.addForgottenHash(hash5);
+        }
+      }
       getUnresolvedPatches() {
         this.ensureLoaded();
         return this.lock.patches.filter((p6) => p6.status === "unresolved");
@@ -570617,12 +570633,14 @@ var require_dist24 = __commonJS({
       return snapshot;
     }
     function filterInfrastructureAndSensitiveFiles(rawFilesOutput, fernignorePatterns) {
-      const allFiles = rawFilesOutput.trim().split("\n").filter(Boolean).filter((f3) => !INFRASTRUCTURE_FILES.has(f3)).filter((f3) => !f3.startsWith(".fern/"));
+      const rawFiles = rawFilesOutput.trim().split("\n").filter(Boolean);
+      const infrastructureFiles = rawFiles.filter((f3) => INFRASTRUCTURE_FILES.has(f3) || f3.startsWith(".fern/"));
+      const allFiles = rawFiles.filter((f3) => !INFRASTRUCTURE_FILES.has(f3) && !f3.startsWith(".fern/"));
       const sensitiveFiles = allFiles.filter((f3) => isSensitiveFile(f3));
       const nonSensitive = allFiles.filter((f3) => !isSensitiveFile(f3));
       const fernignoredFiles = nonSensitive.filter((f3) => matchesFernignorePattern(f3, fernignorePatterns));
       const files = nonSensitive.filter((f3) => !matchesFernignorePattern(f3, fernignorePatterns));
-      return { files, sensitiveFiles, fernignoredFiles };
+      return { files, sensitiveFiles, fernignoredFiles, infrastructureFiles };
     }
     var ReplayDetector = class {
       git;
@@ -570630,6 +570648,15 @@ var require_dist24 = __commonJS({
       sdkOutputDir;
       fernignorePatterns;
       warnings = [];
+      /**
+       * Structured degraded-state channel, mirroring `warnings`. Populated when
+       * detection cannot guarantee customizations were carried forward (baseline
+       * unreachable in this clone). Cleared per-run by `ReplayService.prepareReplay`
+       * alongside `warnings`. Merged into `ReplayReport.degradedReasons` by each
+       * flow handler. Degraded is observability only: detection results are
+       * unchanged.
+       */
+      degradedReasons = [];
       constructor(git, lockManager, sdkOutputDir, fernignorePatterns = []) {
         this.git = git;
         this.lockManager = lockManager;
@@ -570700,6 +570727,10 @@ var require_dist24 = __commonJS({
             this.warnings.push(
               `No generation boundary found in git history and the lockfile's recorded generation (${lock.current_generation.slice(0, 7)}) matches no entry in its generation records. Customer customizations may differ from the last known generation and could be lost on the next regeneration. Run \`fern-replay bootstrap --force\` to re-initialize tracking.`
             );
+            this.degradedReasons.push({
+              code: "baseline-unresolvable",
+              message: `The previous generation recorded in the lockfile (${lock.current_generation.slice(0, 7)}) could not be resolved to any reachable baseline during this run. Customizations may not have been carried forward \u2014 review the result before merging.`
+            });
           }
           return { patches: [], revertedPatchIds: [] };
         }
@@ -570708,6 +570739,12 @@ var require_dist24 = __commonJS({
           this.warnings.push(
             `Generation commit ${lastGen.commit_sha.slice(0, 7)} not found in git history. Falling back to tree-diff detection (likely a shallow clone).`
           );
+          if (lock.patches.length > 0) {
+            this.degradedReasons.push({
+              code: "generation-anchor-unreachable",
+              message: `The previous generation (${lastGen.commit_sha.slice(0, 7)}) was not reachable during this run, and ${lock.patches.length} tracked customization(s) could not be verified against it. Customizations may not have been carried forward \u2014 review the result before merging.`
+            });
+          }
           return this.detectPatchesViaTreeDiff(
             lastGen,
             /* commitKnownMissing */
@@ -570747,54 +570784,27 @@ var require_dist24 = __commonJS({
           if (lock.patches.find((p6) => p6.original_commit === commit.sha)) {
             continue;
           }
-          const parents = await this.git.getCommitParents(commit.sha);
-          let filesOutput;
-          try {
-            filesOutput = await this.git.exec(["diff-tree", "--no-commit-id", "--name-only", "-r", commit.sha]);
-          } catch {
+          const materialized = await this.materializeCommitPatch(commit.sha);
+          if (materialized.sensitiveFiles.length > 0) {
             this.warnings.push(
-              `Could not generate patch for commit ${commit.sha.slice(0, 7)} \u2014 it may be unreachable in a shallow clone. Skipping.`
+              `Sensitive file(s) excluded from patch for commit ${commit.sha.slice(0, 7)}: ${materialized.sensitiveFiles.join(", ")}. These files will not be tracked by replay.`
             );
-            continue;
           }
-          const { files, sensitiveFiles, fernignoredFiles } = filterInfrastructureAndSensitiveFiles(
-            filesOutput,
-            this.fernignorePatterns
-          );
-          if (sensitiveFiles.length > 0) {
+          if (materialized.fernignoredFiles.length > 0) {
             this.warnings.push(
-              `Sensitive file(s) excluded from patch for commit ${commit.sha.slice(0, 7)}: ${sensitiveFiles.join(", ")}. These files will not be tracked by replay.`
+              `.fernignore-protected file(s) excluded from patch for commit ${commit.sha.slice(0, 7)}: ${materialized.fernignoredFiles.join(", ")}. These files are managed by .fernignore, not Replay.`
             );
           }
-          if (fernignoredFiles.length > 0) {
+          if (materialized.status === "unreachable") {
             this.warnings.push(
-              `.fernignore-protected file(s) excluded from patch for commit ${commit.sha.slice(0, 7)}: ${fernignoredFiles.join(", ")}. These files are managed by .fernignore, not Replay.`
+              `Could not generate patch for commit ${commit.sha.slice(0, 7)} \u2014 it may be unreachable in a shallow clone. Skipping.`
             );
-          }
-          if (files.length === 0) {
             continue;
           }
-          const wasFiltered = sensitiveFiles.length > 0 || fernignoredFiles.length > 0;
-          const parentSha = parents[0];
-          let patchContent;
-          if (wasFiltered && parentSha) {
-            try {
-              patchContent = await this.git.exec(["diff", parentSha, commit.sha, "--", ...files]);
-            } catch {
-              continue;
-            }
-            if (!patchContent.trim()) continue;
-          } else {
-            try {
-              patchContent = await this.git.formatPatch(commit.sha);
-            } catch {
-              this.warnings.push(
-                `Could not generate patch for commit ${commit.sha.slice(0, 7)} \u2014 it may be unreachable in a shallow clone. Skipping.`
-              );
-              continue;
-            }
+          if (materialized.status === "empty") {
+            continue;
           }
-          const contentHash = this.computeContentHash(patchContent);
+          const { files, patchContent, contentHash } = materialized;
           if (lock.patches.find((p6) => p6.content_hash === contentHash) || forgottenHashes.has(contentHash)) {
             continue;
           }
@@ -570871,6 +570881,63 @@ var require_dist24 = __commonJS({
         const filteredPatches = survivingPatches.filter((_5, i5) => !revertIndicesToRemove.has(i5));
         return { patches: filteredPatches, revertedPatchIds: [...revertedPatchIdSet] };
       }
+      /**
+       * Materialize a commit into patch content exactly as detection does.
+       *
+       * Pipeline: `diff-tree --name-only` → filter infrastructure / sensitive /
+       * `.fernignore`d files → scoped `git diff` when files were stripped,
+       * otherwise full `git format-patch` → content hash.
+       *
+       * This is THE definition of a commit's re-emission identity: the content
+       * hash this method returns is what `detectPatchesInRange` will compute if
+       * the commit re-enters the scan range (e.g. after a regen PR is merged
+       * with a merge commit). Callers that tombstone a dismissed patch must use
+       * this hash — the stored `content_hash` drifts every time the patch is
+       * carried forward, so it does not identify the commit on re-detection.
+       *
+       * Never throws; failures are reported through the `status` discriminant.
+       */
+      async materializeCommitPatch(sha) {
+        let parents;
+        let filesOutput;
+        try {
+          parents = await this.git.getCommitParents(sha);
+          filesOutput = await this.git.exec(["diff-tree", "--no-commit-id", "--name-only", "-r", sha]);
+        } catch {
+          return { status: "unreachable", sensitiveFiles: [], fernignoredFiles: [] };
+        }
+        const { files, sensitiveFiles, fernignoredFiles, infrastructureFiles } = filterInfrastructureAndSensitiveFiles(filesOutput, this.fernignorePatterns);
+        if (files.length === 0) {
+          return { status: "empty", sensitiveFiles, fernignoredFiles };
+        }
+        const wasFiltered = sensitiveFiles.length > 0 || fernignoredFiles.length > 0 || infrastructureFiles.length > 0;
+        const parentSha = parents[0];
+        let patchContent;
+        if (wasFiltered && parentSha) {
+          try {
+            patchContent = await this.git.exec(["diff", parentSha, sha, "--", ...files]);
+          } catch {
+            return { status: "empty", sensitiveFiles, fernignoredFiles };
+          }
+          if (!patchContent.trim()) {
+            return { status: "empty", sensitiveFiles, fernignoredFiles };
+          }
+        } else {
+          try {
+            patchContent = await this.git.formatPatch(sha);
+          } catch {
+            return { status: "unreachable", sensitiveFiles, fernignoredFiles };
+          }
+        }
+        return {
+          status: "ok",
+          files,
+          sensitiveFiles,
+          fernignoredFiles,
+          patchContent,
+          contentHash: this.computeContentHash(patchContent)
+        };
+      }
       /**
        * Compute content hash for deduplication.
        *
@@ -570975,6 +571042,13 @@ var require_dist24 = __commonJS({
       async detectPatchesViaTreeDiff(lastGen, commitKnownMissing) {
         const diffBase = await this.resolveDiffBase(lastGen, commitKnownMissing);
         if (!diffBase) {
+          this.warnings.push(
+            `Neither the previous generation's commit (${lastGen.commit_sha.slice(0, 7)}) nor its recorded tree was reachable during this run. Falling back to a bounded commit scan, which cannot see customizations older than the clone window. Widen the clone window (e.g. \`git fetch --unshallow\`) and re-run replay to verify customizations were carried forward.`
+          );
+          this.degradedReasons.push({
+            code: "generation-tree-unreachable",
+            message: `The previous generation (${lastGen.commit_sha.slice(0, 7)}) was not reachable during this run \u2014 neither its commit nor its recorded tree. Customizations may not have been carried forward \u2014 review the result before merging, or widen the clone window and re-run replay.`
+          });
           return this.detectPatchesViaCommitScan();
         }
         const lockForGuard = this.lockManager.read();
@@ -571087,10 +571161,7 @@ var require_dist24 = __commonJS({
             continue;
           }
           const filesOutput = await this.git.exec(["diff-tree", "--no-commit-id", "--name-only", "-r", commit.sha]);
-          const { files, sensitiveFiles, fernignoredFiles } = filterInfrastructureAndSensitiveFiles(
-            filesOutput,
-            this.fernignorePatterns
-          );
+          const { files, sensitiveFiles, fernignoredFiles, infrastructureFiles } = filterInfrastructureAndSensitiveFiles(filesOutput, this.fernignorePatterns);
           if (sensitiveFiles.length > 0) {
             this.warnings.push(
               `Sensitive file(s) excluded from patch for commit ${commit.sha.slice(0, 7)}: ${sensitiveFiles.join(", ")}. These files will not be tracked by replay.`
@@ -571101,7 +571172,8 @@ var require_dist24 = __commonJS({
               `.fernignore-protected file(s) excluded from patch for commit ${commit.sha.slice(0, 7)}: ${fernignoredFiles.join(", ")}. These files are managed by .fernignore, not Replay.`
             );
           }
-          if ((sensitiveFiles.length > 0 || fernignoredFiles.length > 0) && files.length > 0) {
+          const wasFiltered = sensitiveFiles.length > 0 || fernignoredFiles.length > 0 || infrastructureFiles.length > 0;
+          if (wasFiltered && files.length > 0) {
             if (parents.length === 0) {
               continue;
             }
@@ -572351,14 +572423,21 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         return this.git.getTreeHash(commitSha);
       }
     };
-    var import_node_fs210 = require("fs");
+    var import_node_fs36 = require("fs");
     var import_promises610 = require("fs/promises");
-    var import_node_path82 = require("path");
+    var import_node_path92 = require("path");
     var import_minimatch52 = require_commonjs3();
     init_GitClient();
+    var import_node_fs210 = require("fs");
+    var import_node_path62 = require("path");
+    function readFernignorePatterns(outputDir) {
+      const fernignorePath = (0, import_node_path62.join)(outputDir, ".fernignore");
+      if (!(0, import_node_fs210.existsSync)(fernignorePath)) return [];
+      return (0, import_node_fs210.readFileSync)(fernignorePath, "utf-8").split("\n").map((line) => line.trim()).filter((line) => line && !line.startsWith("#"));
+    }
     var import_promises410 = require("fs/promises");
     var import_node_os22 = require("os");
-    var import_node_path62 = require("path");
+    var import_node_path72 = require("path");
     var import_node_child_process15 = require("child_process");
     init_HybridReconstruction();
     function normalizeHunkBody(hunk) {
@@ -572576,10 +572655,10 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
     }
     async function unifiedDiff(beforeContent, afterContent, filePath) {
       if (beforeContent === afterContent) return "";
-      const tmp20 = await (0, import_promises410.mkdtemp)((0, import_node_path62.join)((0, import_node_os22.tmpdir)(), "fern-replay-pp-"));
+      const tmp20 = await (0, import_promises410.mkdtemp)((0, import_node_path72.join)((0, import_node_os22.tmpdir)(), "fern-replay-pp-"));
       try {
-        const beforePath = (0, import_node_path62.join)(tmp20, "before");
-        const afterPath = (0, import_node_path62.join)(tmp20, "after");
+        const beforePath = (0, import_node_path72.join)(tmp20, "before");
+        const afterPath = (0, import_node_path72.join)(tmp20, "after");
         await (0, import_promises410.writeFile)(beforePath, beforeContent, "utf-8");
         await (0, import_promises410.writeFile)(afterPath, afterContent, "utf-8");
         const raw = await runGitDiffNoIndex(beforePath, afterPath);
@@ -572751,6 +572830,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
             patchesToApply: [],
             newPatchIds: /* @__PURE__ */ new Set(),
             detectorWarnings: [],
+            detectorDegraded: [],
             revertedCount: 0,
             genSha: genRecord.commit_sha,
             optionsSnapshot: options2
@@ -572808,6 +572888,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
             patchesToApply: [],
             newPatchIds: /* @__PURE__ */ new Set(),
             detectorWarnings: [],
+            detectorDegraded: [],
             revertedCount: 0,
             genSha: genRecord.commit_sha,
             optionsSnapshot: options2
@@ -572843,8 +572924,10 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         const previousGenerationSha = preLock.current_generation ?? null;
         let { patches: newPatches, revertedPatchIds } = await this.service.detector.detectNewPatches();
         const detectorWarnings = [...this.service.detector.warnings];
+        const detectorDegraded = [...this.service.detector.degradedReasons];
         if (options2?.dryRun) {
           const dryRunWarnings = [...detectorWarnings, ...this.service.warnings];
+          const dryRunDegraded = dedupeDegradedReasons([...detectorDegraded, ...this.service.degradedReasons]);
           const preparedReport = {
             flow: "no-patches",
             patchesDetected: newPatches.length,
@@ -572854,7 +572937,9 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
             patchesReverted: revertedPatchIds.length,
             conflicts: [],
             wouldApply: newPatches,
-            warnings: dryRunWarnings.length > 0 ? dryRunWarnings : void 0
+            warnings: dryRunWarnings.length > 0 ? dryRunWarnings : void 0,
+            degraded: dryRunDegraded.length > 0 ? true : void 0,
+            degradedReasons: dryRunDegraded.length > 0 ? dryRunDegraded : void 0
           };
           const headSha = await this.service.git.exec(["rev-parse", "HEAD"]).then((s5) => s5.trim()).catch(() => "");
           return {
@@ -572908,6 +572993,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
             patchesToApply: newPatches,
             newPatchIds: new Set(newPatches.map((p6) => p6.id)),
             detectorWarnings,
+            detectorDegraded,
             revertedCount: revertedPatchIds.length,
             genSha: genRecord.commit_sha,
             optionsSnapshot: options2
@@ -572951,6 +573037,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
           }
         }
         const warnings = [...detectorWarnings, ...this.service.warnings];
+        const degradedReasons = [...prep._prepared.detectorDegraded, ...this.service.degradedReasons];
         return this.service.buildReport(
           "no-patches",
           newPatches,
@@ -572959,7 +573046,8 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
           warnings,
           rebaseCounts,
           void 0,
-          prep._prepared.revertedCount
+          prep._prepared.revertedCount,
+          degradedReasons
         );
       }
     };
@@ -572974,6 +573062,10 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
           const existingPatches2 = this.service.lockManager.getPatches();
           const { patches: newPatches2, revertedPatchIds: dryRunReverted } = await this.service.detector.detectNewPatches();
           const warnings = [...this.service.detector.warnings, ...this.service.warnings];
+          const dryRunDegraded = dedupeDegradedReasons([
+            ...this.service.detector.degradedReasons,
+            ...this.service.degradedReasons
+          ]);
           const allPatches2 = [...existingPatches2, ...newPatches2];
           const preparedReport = {
             flow: "normal-regeneration",
@@ -572984,7 +573076,9 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
             patchesReverted: dryRunReverted.length,
             conflicts: [],
             wouldApply: allPatches2,
-            warnings: warnings.length > 0 ? warnings : void 0
+            warnings: warnings.length > 0 ? warnings : void 0,
+            degraded: dryRunDegraded.length > 0 ? true : void 0,
+            degradedReasons: dryRunDegraded.length > 0 ? dryRunDegraded : void 0
           };
           const headSha = await this.service.git.exec(["rev-parse", "HEAD"]).then((s5) => s5.trim()).catch(() => "");
           return {
@@ -573023,6 +573117,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         existingPatches = this.service.lockManager.getPatches();
         let { patches: newPatches, revertedPatchIds } = await this.service.detector.detectNewPatches();
         const detectorWarnings = [...this.service.detector.warnings];
+        const detectorDegraded = [...this.service.detector.degradedReasons];
         if (removedByPreRebase.length > 0) {
           const removedOriginalCommits = new Set(removedByPreRebase.map((p6) => p6.original_commit));
           const removedOriginalMessages = new Set(removedByPreRebase.map((p6) => p6.original_message));
@@ -573063,6 +573158,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
             newPatchIds: new Set(newPatches.map((p6) => p6.id)),
             preRebaseCounts,
             detectorWarnings,
+            detectorDegraded,
             revertedCount: revertedPatchIds.length,
             genSha: genRecord.commit_sha,
             optionsSnapshot: options2
@@ -573111,6 +573207,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
           await this.service.committer.commitReplay(appliedCount, allPatches, void 0, { buckets });
         }
         const warnings = [...detectorWarnings, ...this.service.warnings];
+        const degradedReasons = [...prep._prepared.detectorDegraded, ...this.service.degradedReasons];
         return this.service.buildReport(
           "normal-regeneration",
           allPatches,
@@ -573119,7 +573216,8 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
           warnings,
           rebaseCounts,
           prep._prepared.preRebaseCounts,
-          prep._prepared.revertedCount
+          prep._prepared.revertedCount,
+          degradedReasons
         );
       }
     };
@@ -573157,6 +573255,16 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
        * @internal Used by Flow implementations in `src/flows/`.
        */
       warnings = [];
+      /**
+       * Service-level structured degraded reasons, mirroring `warnings`.
+       * Populated at apply time (e.g. `recordUnreachableBaseWarnings` when a
+       * patch's base-generation tree is unreachable). Merged with
+       * `detector.degradedReasons` into `ReplayReport.degradedReasons` by each
+       * flow handler. Cleared at the top of `prepareReplay()`.
+       *
+       * @internal Used by Flow implementations in `src/flows/`.
+       */
+      degradedReasons = [];
       /**
        * @internal Test-only accessor.
        * Returns the ReplayApplicator instance used for the last run. Tests use this
@@ -573200,7 +573308,10 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
       async prepareReplay(options2) {
         this.warnings = [];
         this.detector.warnings.length = 0;
+        this.degradedReasons = [];
+        this.detector.degradedReasons.length = 0;
         this.cleanseLegacyFernignoreEntries();
+        this.cleanseInfrastructureFileEntries();
         return this.selectFlow(options2).prepare(options2);
       }
       /**
@@ -573254,6 +573365,50 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
           this.lockManager.save();
         }
       }
+      /**
+       * Migration step: strips infrastructure file diffs (`.fernignore`, `.fern/*`)
+       * from existing patches' `patch_content`. These diffs were bundled by older
+       * detection logic that did not scope `git diff` when only infrastructure files
+       * were stripped. Patches that end up with no surviving diff sections are
+       * removed entirely.
+       *
+       * Idempotent: a second run is a no-op because the first run already removed
+       * all infrastructure sections. Per-patch try/catch ensures isolation.
+       */
+      cleanseInfrastructureFileEntries() {
+        if (!this.lockManager.exists()) return;
+        this.lockManager.read();
+        let lockfileMutated = false;
+        const patches = this.lockManager.getPatches();
+        for (const patch5 of patches) {
+          try {
+            const result = computeInfrastructureFileCleanse(
+              patch5,
+              (content5) => this.detector.computeContentHash(content5)
+            );
+            if (result.unchanged) continue;
+            if (result.remove) {
+              this.lockManager.removePatch(patch5.id);
+              this.warnings.push(
+                `Stripped infrastructure file diffs from patch ${patch5.id}: patch contained only infrastructure file changes (${result.strippedPaths.join(", ")}) \u2014 removed.`
+              );
+            } else {
+              this.lockManager.updatePatch(patch5.id, {
+                patch_content: result.patch_content,
+                content_hash: result.content_hash
+              });
+              this.warnings.push(
+                `Stripped infrastructure file diffs from patch ${patch5.id}: removed bundled diffs for ${result.strippedPaths.join(", ")}.`
+              );
+            }
+            lockfileMutated = true;
+          } catch {
+          }
+        }
+        if (lockfileMutated) {
+          this.lockManager.save();
+        }
+      }
       /**
        * Phase 2 of the two-phase replay flow. Applies patches, rebases them against
        * the generation, saves the lockfile, and commits `[fern-replay]` (or stages
@@ -573509,7 +573664,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         for (const file4 of files) {
           if (isBinaryFile(file4)) continue;
           try {
-            const content5 = await (0, import_promises610.readFile)((0, import_node_path82.join)(this.outputDir, file4), "utf-8");
+            const content5 = await (0, import_promises610.readFile)((0, import_node_path92.join)(this.outputDir, file4), "utf-8");
             snapshot[file4] = content5;
           } catch {
           }
@@ -574026,6 +574181,12 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
             );
           }
         }
+        if (warned2.size > 0) {
+          this.degradedReasons.push({
+            code: "patch-base-unreachable",
+            message: `${warned2.size} customization file(s) could not be checked against the generation they were made on because that generation's tree was not reachable during this run. Customizations may not have been carried forward \u2014 review the result before merging, or widen the clone window and re-run replay.`
+          });
+        }
       }
       /**
        * After applyPatches(), strip conflict markers from conflicting files
@@ -574037,11 +574198,11 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
           if (result.status !== "conflict" || !result.fileResults) continue;
           for (const fileResult of result.fileResults) {
             if (fileResult.status !== "conflict") continue;
-            const filePath = (0, import_node_path82.join)(this.outputDir, fileResult.file);
+            const filePath = (0, import_node_path92.join)(this.outputDir, fileResult.file);
             try {
-              const content5 = (0, import_node_fs210.readFileSync)(filePath, "utf-8");
+              const content5 = (0, import_node_fs36.readFileSync)(filePath, "utf-8");
               const stripped = stripConflictMarkers(content5);
-              (0, import_node_fs210.writeFileSync)(filePath, stripped);
+              (0, import_node_fs36.writeFileSync)(filePath, stripped);
             } catch {
             }
           }
@@ -574069,12 +574230,11 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
       }
       /** @internal Used by Flow implementations in `src/flows/`. */
       readFernignorePatterns() {
-        const fernignorePath = (0, import_node_path82.join)(this.outputDir, ".fernignore");
-        if (!(0, import_node_fs210.existsSync)(fernignorePath)) return [];
-        return (0, import_node_fs210.readFileSync)(fernignorePath, "utf-8").split("\n").map((line) => line.trim()).filter((line) => line && !line.startsWith("#"));
+        return readFernignorePatterns(this.outputDir);
       }
       /** @internal Used by Flow implementations in `src/flows/`. */
-      buildReport(flow4, patches, results, options2, warnings, rebaseCounts, preRebaseCounts, patchesReverted) {
+      buildReport(flow4, patches, results, options2, warnings, rebaseCounts, preRebaseCounts, patchesReverted, degradedReasons) {
+        const degraded = dedupeDegradedReasons(degradedReasons ?? []);
         const conflictResults = results.filter((r4) => r4.status === "conflict");
         const conflictDetails = conflictResults.map((r4) => {
           const conflictFiles = r4.fileResults?.filter((f3) => f3.status === "conflict") ?? [];
@@ -574114,10 +574274,23 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
             conflictDetails: r4.fileResults?.filter((f3) => f3.status === "conflict") ?? []
           })) : void 0,
           wouldApply: options2?.dryRun ? patches : void 0,
-          warnings: warnings && warnings.length > 0 ? warnings : void 0
+          warnings: warnings && warnings.length > 0 ? warnings : void 0,
+          degraded: degraded.length > 0 ? true : void 0,
+          degradedReasons: degraded.length > 0 ? degraded : void 0
         };
       }
     };
+    function dedupeDegradedReasons(reasons) {
+      const seen = /* @__PURE__ */ new Set();
+      const out = [];
+      for (const reason of reasons) {
+        const key2 = `${reason.code}\0${reason.message}`;
+        if (seen.has(key2)) continue;
+        seen.add(key2);
+        out.push(reason);
+      }
+      return out;
+    }
     function computeCommitBuckets(results, absorbedPatchIds, patchesPassedToCommit) {
       const resultByPatchId = /* @__PURE__ */ new Map();
       for (const r4 of results) resultByPatchId.set(r4.patch.id, r4);
@@ -574166,7 +574339,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
           }
         }
       }
-      const { stripped: patchContentStripped, content: newPatchContent, strippedSectionPaths } = stripFernignoreDiffSections(patch5.patch_content, matchesFernignore);
+      const { stripped: patchContentStripped, content: newPatchContent, strippedSectionPaths } = stripDiffSectionsByPredicate(patch5.patch_content, matchesFernignore);
       const unchanged = strippedFromFiles.length === 0 && !snapshotChanged && !patchContentStripped;
       if (unchanged) {
         return {
@@ -574201,7 +574374,38 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
         strippedPaths
       };
     }
-    function stripFernignoreDiffSections(patchContent, matchesFernignore) {
+    function isInfrastructureFile(filePath) {
+      return filePath === ".fernignore" || filePath.startsWith(".fern/");
+    }
+    function computeInfrastructureFileCleanse(patch5, computeContentHash2) {
+      const { stripped, content: newPatchContent, strippedSectionPaths } = stripDiffSectionsByPredicate(patch5.patch_content, isInfrastructureFile);
+      if (!stripped) {
+        return {
+          unchanged: true,
+          remove: false,
+          patch_content: patch5.patch_content,
+          content_hash: patch5.content_hash,
+          strippedPaths: []
+        };
+      }
+      if (newPatchContent.trim() === "" || patch5.files.length === 0) {
+        return {
+          unchanged: false,
+          remove: true,
+          patch_content: "",
+          content_hash: "",
+          strippedPaths: strippedSectionPaths
+        };
+      }
+      return {
+        unchanged: false,
+        remove: false,
+        patch_content: newPatchContent,
+        content_hash: computeContentHash2(newPatchContent),
+        strippedPaths: strippedSectionPaths
+      };
+    }
+    function stripDiffSectionsByPredicate(patchContent, shouldStrip) {
       const lines = patchContent.split("\n");
       const sectionStarts = [];
       for (let i5 = 0; i5 < lines.length; i5++) {
@@ -574223,7 +574427,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
         const section = sectionStarts[i5];
         const next2 = sectionStarts[i5 + 1];
         const endIdx = next2 ? next2.idx : lines.length;
-        if (section.path !== null && matchesFernignore(section.path)) {
+        if (section.path !== null && shouldStrip(section.path)) {
           stripped = true;
           strippedSectionPaths.push(section.path);
           continue;
@@ -574233,8 +574437,8 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
       return { stripped, content: newLines.join("\n"), strippedSectionPaths };
     }
     var import_node_crypto22 = require("crypto");
-    var import_node_fs36 = require("fs");
-    var import_node_path92 = require("path");
+    var import_node_fs42 = require("fs");
+    var import_node_path102 = require("path");
     var import_minimatch62 = require_commonjs3();
     var import_yaml22 = require_dist11();
     var FernignoreMigrator = class {
@@ -574247,14 +574451,14 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
         this.outputDir = outputDir;
       }
       fernignoreExists() {
-        return (0, import_node_fs36.existsSync)((0, import_node_path92.join)(this.outputDir, ".fernignore"));
+        return (0, import_node_fs42.existsSync)((0, import_node_path102.join)(this.outputDir, ".fernignore"));
       }
       readFernignorePatterns() {
-        const fernignorePath = (0, import_node_path92.join)(this.outputDir, ".fernignore");
-        if (!(0, import_node_fs36.existsSync)(fernignorePath)) {
+        const fernignorePath = (0, import_node_path102.join)(this.outputDir, ".fernignore");
+        if (!(0, import_node_fs42.existsSync)(fernignorePath)) {
           return [];
         }
-        const content5 = (0, import_node_fs36.readFileSync)(fernignorePath, "utf-8");
+        const content5 = (0, import_node_fs42.readFileSync)(fernignorePath, "utf-8");
         return content5.split("\n").map((line) => line.trim()).filter((line) => line && !line.startsWith("#"));
       }
       /** Analyze .fernignore patterns vs git history. Creates synthetic patches for files differing from pristine generation. */
@@ -574359,16 +574563,16 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
         return results;
       }
       readFileContent(filePath) {
-        const fullPath = (0, import_node_path92.join)(this.outputDir, filePath);
-        if (!(0, import_node_fs36.existsSync)(fullPath)) {
+        const fullPath = (0, import_node_path102.join)(this.outputDir, filePath);
+        if (!(0, import_node_fs42.existsSync)(fullPath)) {
           return null;
         }
         try {
-          const stat7 = (0, import_node_fs36.statSync)(fullPath);
+          const stat7 = (0, import_node_fs42.statSync)(fullPath);
           if (stat7.isDirectory()) {
             return null;
           }
-          return (0, import_node_fs36.readFileSync)(fullPath, "utf-8");
+          return (0, import_node_fs42.readFileSync)(fullPath, "utf-8");
         } catch {
           return null;
         }
@@ -574424,25 +574628,25 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
         };
       }
       movePatternsToReplayYml(patterns) {
-        const replayYmlPath = (0, import_node_path92.join)(this.outputDir, ".fern", "replay.yml");
+        const replayYmlPath = (0, import_node_path102.join)(this.outputDir, ".fern", "replay.yml");
         let config5 = {};
-        if ((0, import_node_fs36.existsSync)(replayYmlPath)) {
-          const content5 = (0, import_node_fs36.readFileSync)(replayYmlPath, "utf-8");
+        if ((0, import_node_fs42.existsSync)(replayYmlPath)) {
+          const content5 = (0, import_node_fs42.readFileSync)(replayYmlPath, "utf-8");
           config5 = (0, import_yaml22.parse)(content5) ?? {};
         }
         const existing = config5.exclude ?? [];
         const merged = [.../* @__PURE__ */ new Set([...existing, ...patterns])];
         config5.exclude = merged;
-        const dir = (0, import_node_path92.dirname)(replayYmlPath);
-        if (!(0, import_node_fs36.existsSync)(dir)) {
-          (0, import_node_fs36.mkdirSync)(dir, { recursive: true });
+        const dir = (0, import_node_path102.dirname)(replayYmlPath);
+        if (!(0, import_node_fs42.existsSync)(dir)) {
+          (0, import_node_fs42.mkdirSync)(dir, { recursive: true });
         }
-        (0, import_node_fs36.writeFileSync)(replayYmlPath, (0, import_yaml22.stringify)(config5, { lineWidth: 0 }), "utf-8");
+        (0, import_node_fs42.writeFileSync)(replayYmlPath, (0, import_yaml22.stringify)(config5, { lineWidth: 0 }), "utf-8");
       }
     };
     var import_node_crypto32 = require("crypto");
-    var import_node_fs42 = require("fs");
-    var import_node_path102 = require("path");
+    var import_node_fs52 = require("fs");
+    var import_node_path112 = require("path");
     init_GitClient();
     async function bootstrap(outputDir, options2) {
       const git = new GitClient(outputDir);
@@ -574609,10 +574813,10 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
     }
     var REPLAY_FERNIGNORE_ENTRIES = [".fern/replay.lock", ".fern/replay.yml", ".gitattributes"];
     function ensureFernignoreEntries(outputDir) {
-      const fernignorePath = (0, import_node_path102.join)(outputDir, ".fernignore");
+      const fernignorePath = (0, import_node_path112.join)(outputDir, ".fernignore");
       let content5 = "";
-      if ((0, import_node_fs42.existsSync)(fernignorePath)) {
-        content5 = (0, import_node_fs42.readFileSync)(fernignorePath, "utf-8");
+      if ((0, import_node_fs52.existsSync)(fernignorePath)) {
+        content5 = (0, import_node_fs52.readFileSync)(fernignorePath, "utf-8");
       }
       const lines = content5.split("\n");
       const toAdd = [];
@@ -574628,15 +574832,15 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
         content5 += "\n";
       }
       content5 += toAdd.join("\n") + "\n";
-      (0, import_node_fs42.writeFileSync)(fernignorePath, content5, "utf-8");
+      (0, import_node_fs52.writeFileSync)(fernignorePath, content5, "utf-8");
       return true;
     }
     var GITATTRIBUTES_ENTRIES = [".fern/replay.lock linguist-generated=true"];
     function ensureGitattributesEntries(outputDir) {
-      const gitattributesPath = (0, import_node_path102.join)(outputDir, ".gitattributes");
+      const gitattributesPath = (0, import_node_path112.join)(outputDir, ".gitattributes");
       let content5 = "";
-      if ((0, import_node_fs42.existsSync)(gitattributesPath)) {
-        content5 = (0, import_node_fs42.readFileSync)(gitattributesPath, "utf-8");
+      if ((0, import_node_fs52.existsSync)(gitattributesPath)) {
+        content5 = (0, import_node_fs52.readFileSync)(gitattributesPath, "utf-8");
       }
       const lines = content5.split("\n");
       const toAdd = [];
@@ -574652,7 +574856,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
         content5 += "\n";
       }
       content5 += toAdd.join("\n") + "\n";
-      (0, import_node_fs42.writeFileSync)(gitattributesPath, content5, "utf-8");
+      (0, import_node_fs52.writeFileSync)(gitattributesPath, content5, "utf-8");
     }
     function computeContentHash(patchContent) {
       const lines = patchContent.split("\n");
@@ -574662,6 +574866,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
       return `sha256:${(0, import_node_crypto32.createHash)("sha256").update(normalized).digest("hex")}`;
     }
     var import_minimatch72 = require_commonjs3();
+    init_GitClient();
     function parseDiffStat(patchContent) {
       let additions = 0;
       let deletions = 0;
@@ -574720,7 +574925,28 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
       totalPatches: 0,
       warnings: []
     };
-    function forget(outputDir, options2) {
+    async function dismissPatches(outputDir, lockManager, patches) {
+      const git = new GitClient(outputDir);
+      const detector = new ReplayDetector(git, lockManager, outputDir, readFernignorePatterns(outputDir));
+      for (const patch5 of patches) {
+        const hashes = [patch5.content_hash];
+        if (patch5.original_commit) {
+          const materialized = await detector.materializeCommitPatch(patch5.original_commit);
+          if (materialized.status === "ok" && !hashes.includes(materialized.contentHash)) {
+            hashes.push(materialized.contentHash);
+          }
+        }
+        lockManager.addDismissal({
+          patch_id: patch5.id,
+          original_commit: patch5.original_commit,
+          original_message: patch5.original_message,
+          content_hashes: hashes,
+          dismissed_at: (/* @__PURE__ */ new Date()).toISOString(),
+          via: "forget"
+        });
+      }
+    }
+    async function forget(outputDir, options2) {
       const lockManager = new LockfileManager(outputDir);
       if (!lockManager.exists()) {
         return { ...EMPTY_RESULT };
@@ -574731,9 +574957,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
         const removed = lock.patches.map(toMatchedPatch);
         const warnings = buildWarnings(lock.patches);
         if (!options2.dryRun) {
-          for (const patch5 of lock.patches) {
-            lockManager.addForgottenHash(patch5.content_hash);
-          }
+          await dismissPatches(outputDir, lockManager, lock.patches);
           lockManager.clearPatches();
           lockManager.save();
         }
@@ -574762,8 +574986,8 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
         }
         const warnings = buildWarnings(patchesToRemove);
         if (!options2.dryRun) {
+          await dismissPatches(outputDir, lockManager, patchesToRemove);
           for (const patch5 of patchesToRemove) {
-            lockManager.addForgottenHash(patch5.content_hash);
             lockManager.removePatch(patch5.id);
           }
           lockManager.save();
@@ -574802,7 +575026,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
         matched: lock.patches.map(toMatchedPatch)
       };
     }
-    var import_node_fs52 = require("fs");
+    var import_node_fs62 = require("fs");
     function reset2(outputDir, options2) {
       const lockManager = new LockfileManager(outputDir);
       if (!lockManager.exists()) {
@@ -574816,7 +575040,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
       const lock = lockManager.read();
       const patchCount = lock.patches.length;
       if (!options2?.dryRun) {
-        (0, import_node_fs52.unlinkSync)(lockManager.lockfilePath);
+        (0, import_node_fs62.unlinkSync)(lockManager.lockfilePath);
       }
       return {
         success: true,
@@ -574826,7 +575050,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
       };
     }
     var import_promises710 = require("fs/promises");
-    var import_node_path112 = require("path");
+    var import_node_path122 = require("path");
     init_GitClient();
     async function resolve15(outputDir, options2) {
       const lockManager = new LockfileManager(outputDir);
@@ -574867,15 +575091,16 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
       const patchesToCommit = [...resolvingPatches, ...unresolvedPatches];
       if (patchesToCommit.length > 0) {
         const currentGen = lock.current_generation;
-        const detector = new ReplayDetector(git, lockManager, outputDir);
+        const detector = new ReplayDetector(git, lockManager, outputDir, readFernignorePatterns(outputDir));
         const warnings = [];
+        const patchesDismissed = [];
         let patchesResolved = 0;
         const pass1 = [];
         for (const patch5 of patchesToCommit) {
           const result = await computePerPatchDiffWithFallback(
             patch5,
             (f3) => git.showFile(currentGen, f3),
-            (f3) => (0, import_promises710.readFile)((0, import_node_path112.join)(outputDir, f3), "utf-8").catch(() => null),
+            (f3) => (0, import_promises710.readFile)((0, import_node_path122.join)(outputDir, f3), "utf-8").catch(() => null),
             (files) => git.exec(["diff", currentGen, "--", ...files]).catch(() => null)
           );
           if (result === null) {
@@ -574909,7 +575134,27 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
           const r4 = pass1[i5];
           if (r4.kind === "skip") continue;
           if (r4.kind === "revert") {
+            const hashes = [patch5.content_hash];
+            if (patch5.original_commit) {
+              const materialized = await detector.materializeCommitPatch(patch5.original_commit);
+              if (materialized.status === "ok" && !hashes.includes(materialized.contentHash)) {
+                hashes.push(materialized.contentHash);
+              } else if (materialized.status === "unreachable") {
+                warnings.push(
+                  `Patch ${patch5.id}: original commit ${patch5.original_commit.slice(0, 7)} is unreachable; dismissed using the stored content hash only. If this commit reappears in history, the customization may be re-detected once.`
+                );
+              }
+            }
+            lockManager.addDismissal({
+              patch_id: patch5.id,
+              original_commit: patch5.original_commit,
+              original_message: patch5.original_message,
+              content_hashes: hashes,
+              dismissed_at: (/* @__PURE__ */ new Date()).toISOString(),
+              via: "resolve"
+            });
             lockManager.removePatch(patch5.id);
+            patchesDismissed.push({ id: patch5.id, message: patch5.original_message });
             continue;
           }
           if (lastIndexByHash.get(r4.hash) !== i5) {
@@ -574931,7 +575176,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
           const theirsSnapshot = {};
           for (const file4 of filesForSnapshot) {
             if (isBinaryFile(file4)) continue;
-            const content5 = await (0, import_promises710.readFile)((0, import_node_path112.join)(outputDir, file4), "utf-8").catch(() => null);
+            const content5 = await (0, import_promises710.readFile)((0, import_node_path122.join)(outputDir, file4), "utf-8").catch(() => null);
             if (content5 != null) {
               theirsSnapshot[file4] = content5;
             }
@@ -574958,6 +575203,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
           commitSha: commitSha2,
           phase: "committed",
           patchesResolved,
+          patchesDismissed: patchesDismissed.length > 0 ? patchesDismissed : void 0,
           warnings: warnings.length > 0 ? warnings : void 0
         };
       }
@@ -575003,7 +575249,9 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
           lastGeneration: void 0,
           patches: [],
           unresolvedCount: 0,
-          excludePatterns: []
+          excludePatterns: [],
+          dismissed: [],
+          legacyDismissedCount: 0
         };
       }
       const lock = lockManager.read();
@@ -575032,13 +575280,24 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
       }
       const config5 = lockManager.getCustomizationsConfig();
       const excludePatterns = config5.exclude ?? [];
+      const dismissals = lock.dismissals ?? [];
+      const dismissed = dismissals.map((d2) => ({
+        message: d2.original_message,
+        sha: d2.original_commit.slice(0, 7),
+        via: d2.via,
+        dismissedAt: d2.dismissed_at
+      }));
+      const coveredHashes = new Set(dismissals.flatMap((d2) => d2.content_hashes));
+      const legacyDismissedCount = (lock.forgotten_hashes ?? []).filter((h4) => !coveredHashes.has(h4)).length;
       return {
         initialized: true,
         generationCount: lock.generations.length,
         lastGeneration,
         patches,
         unresolvedCount,
-        excludePatterns
+        excludePatterns,
+        dismissed,
+        legacyDismissedCount
       };
     }
   }
@@ -608315,7 +608574,7 @@ var require_replay_forget = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.replayForget = replayForget3;
     var replay_1 = require_dist24();
-    function replayForget3(params2) {
+    async function replayForget3(params2) {
       return (0, replay_1.forget)(params2.outputDir, params2.options);
     }
   }
@@ -686384,7 +686643,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.23.3-941-g239fc7b1855",
+          version: "5.23.3-947-ga9032a3d959",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -686450,7 +686709,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.23.3-941-g239fc7b1855",
+        version: "5.23.3-947-ga9032a3d959",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -867512,7 +867771,7 @@ var LOCAL_STORAGE_FOLDER4 = ".fern-dev";
 var LOGS_FOLDER_NAME = "logs";
 var MAX_LOGS_DIR_SIZE_BYTES = 100 * 1024 * 1024;
 function getCliSource() {
-  const version7 = "5.23.3-941-g239fc7b1855";
+  const version7 = "5.23.3-947-ga9032a3d959";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -899700,7 +899959,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.23.3-941-g239fc7b1855",
+        cliVersion: "5.23.3-947-ga9032a3d959",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -902297,7 +902556,7 @@ var ForgetCommand = class {
     const dryRun = args["dry-run"];
     try {
       if (args.all) {
-        const result2 = (0, import_generator_cli.replayForget)({ outputDir, options: { all: true, dryRun } });
+        const result2 = await (0, import_generator_cli.replayForget)({ outputDir, options: { all: true, dryRun } });
         if (!result2.initialized) {
           context3.stderr.info("Replay is not initialized. Nothing to forget.");
           return;
@@ -902320,7 +902579,7 @@ var ForgetCommand = class {
         return;
       }
       if (positionalArgs.length > 0 && positionalArgs.every((a3) => a3.startsWith("patch-"))) {
-        const result2 = (0, import_generator_cli.replayForget)({ outputDir, options: { patchIds: positionalArgs, dryRun } });
+        const result2 = await (0, import_generator_cli.replayForget)({ outputDir, options: { patchIds: positionalArgs, dryRun } });
         if (!result2.initialized) {
           context3.stderr.info("Replay is not initialized. Nothing to forget.");
           return;
@@ -902346,7 +902605,7 @@ var ForgetCommand = class {
         });
       }
       const pattern = positionalArgs.length === 1 ? positionalArgs[0] : void 0;
-      const result = (0, import_generator_cli.replayForget)({ outputDir, options: { pattern } });
+      const result = await (0, import_generator_cli.replayForget)({ outputDir, options: { pattern } });
       if (!result.initialized) {
         context3.stderr.info("Replay is not initialized. Nothing to forget.");
         return;
@@ -902389,7 +902648,7 @@ Remove ${matched.length} patch(es)? [y/N] `, resolvePrompt);
         }
       }
       const patchIds = matched.map((p6) => p6.id);
-      const removeResult = (0, import_generator_cli.replayForget)({ outputDir, options: { patchIds, dryRun: false } });
+      const removeResult = await (0, import_generator_cli.replayForget)({ outputDir, options: { patchIds, dryRun: false } });
       context3.stderr.info(`Removed ${removeResult.removed.length} patch(es). ${removeResult.remaining} remaining.`);
       for (const warning of removeResult.warnings) {
         context3.stderr.warn(warning);
@@ -965891,7 +966150,7 @@ function getAutomationContextFromEnv() {
     config_branch: process.env.FERN_CONFIG_BRANCH,
     config_pr_number: process.env.FERN_CONFIG_PR_NUMBER,
     trigger: process.env.GITHUB_EVENT_NAME,
-    cli_version: "5.23.3-941-g239fc7b1855"
+    cli_version: "5.23.3-947-ga9032a3d959"
   };
 }
 function isAutomationMode() {
@@ -966723,7 +966982,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.23.3-941-g239fc7b1855";
+    return "5.23.3-947-ga9032a3d959";
   }
   getCliName() {
     if (false) {
@@ -984893,7 +985152,7 @@ function addReplayForgetCommand(cli, cliContext) {
       const dryRun = argv.dryRun;
       try {
         if (argv.all) {
-          const result2 = (0, import_generator_cli5.replayForget)({ outputDir, options: { all: true, dryRun } });
+          const result2 = await (0, import_generator_cli5.replayForget)({ outputDir, options: { all: true, dryRun } });
           if (!result2.initialized) {
             cliContext.logger.info("Replay is not initialized. Nothing to forget.");
             return;
@@ -984916,7 +985175,7 @@ function addReplayForgetCommand(cli, cliContext) {
           return;
         }
         if (args.length > 0 && args.every((a3) => a3.startsWith("patch-"))) {
-          const result2 = (0, import_generator_cli5.replayForget)({ outputDir, options: { patchIds: args, dryRun } });
+          const result2 = await (0, import_generator_cli5.replayForget)({ outputDir, options: { patchIds: args, dryRun } });
           if (!result2.initialized) {
             cliContext.logger.info("Replay is not initialized. Nothing to forget.");
             return;
@@ -984936,7 +985195,7 @@ function addReplayForgetCommand(cli, cliContext) {
           return;
         }
         const pattern = args.length === 1 ? args[0] : void 0;
-        const result = (0, import_generator_cli5.replayForget)({ outputDir, options: { pattern } });
+        const result = await (0, import_generator_cli5.replayForget)({ outputDir, options: { pattern } });
         if (!result.initialized) {
           cliContext.logger.info("Replay is not initialized. Nothing to forget.");
           return;
@@ -984979,7 +985238,7 @@ Remove ${matched.length} patch(es)? [y/N] `, resolvePrompt);
           }
         }
         const patchIds = matched.map((p6) => p6.id);
-        const removeResult = (0, import_generator_cli5.replayForget)({ outputDir, options: { patchIds, dryRun: false } });
+        const removeResult = await (0, import_generator_cli5.replayForget)({ outputDir, options: { patchIds, dryRun: false } });
         cliContext.logger.info(
           `Removed ${removeResult.removed.length} patch(es). ${removeResult.remaining} remaining.`
         );

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.23.3-941-g239fc7b1855",
+  "version": "5.23.3-947-ga9032a3d959",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",