@fern-api/fern-api-dev 4.62.3-9-g975ac7af925 → 4.62.4

package/cli.cjs

@@ -363452,9 +363452,9 @@ var require_diff3 = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/@fern-api+replay@0.8.0/node_modules/@fern-api/replay/dist/index.cjs
+// ../../../node_modules/.pnpm/@fern-api+replay@0.9.0/node_modules/@fern-api/replay/dist/index.cjs
 var require_dist11 = __commonJS({
-  "../../../node_modules/.pnpm/@fern-api+replay@0.8.0/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
+  "../../../node_modules/.pnpm/@fern-api+replay@0.9.0/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
     "use strict";
     var __defProp4 = Object.defineProperty;
     var __getOwnPropDesc4 = Object.getOwnPropertyDescriptor;
@@ -363631,7 +363631,7 @@ var require_dist11 = __commonJS({
       return commit.message.startsWith("[fern-replay]");
     }
     function isRevertCommit(message) {
-      return message.startsWith('Revert "');
+      return /^Revert ".+"$/.test(message);
     }
     function parseRevertedSha(fullBody) {
       const match3 = fullBody.match(/This reverts commit ([0-9a-f]{40})\./);
@@ -363730,6 +363730,15 @@ var require_dist11 = __commonJS({
         this.ensureLoaded();
         this.lock.patches = [];
       }
+      addForgottenHash(hash5) {
+        this.ensureLoaded();
+        if (!this.lock.forgotten_hashes) {
+          this.lock.forgotten_hashes = [];
+        }
+        if (!this.lock.forgotten_hashes.includes(hash5)) {
+          this.lock.forgotten_hashes.push(hash5);
+        }
+      }
       getUnresolvedPatches() {
         this.ensureLoaded();
         return this.lock.patches.filter((p10) => p10.status === "unresolved");
@@ -363824,6 +363833,7 @@ var require_dist11 = __commonJS({
         }
         const commits = this.parseGitLog(log4);
         const newPatches = [];
+        const forgottenHashes = new Set(lock.forgotten_hashes ?? []);
         for (const commit of commits) {
           if (isGenerationCommit(commit)) {
             continue;
@@ -363837,7 +363847,7 @@ var require_dist11 = __commonJS({
           }
           const patchContent = await this.git.formatPatch(commit.sha);
           const contentHash = this.computeContentHash(patchContent);
-          if (lock.patches.find((p10) => p10.content_hash === contentHash)) {
+          if (lock.patches.find((p10) => p10.content_hash === contentHash) || forgottenHashes.has(contentHash)) {
             continue;
           }
           const filesOutput = await this.git.exec(["diff-tree", "--no-commit-id", "--name-only", "-r", commit.sha]);
@@ -363907,6 +363917,9 @@ var require_dist11 = __commonJS({
               revertIndicesToRemove.add(idx);
             }
           }
+          if (!matchedExisting && !matchedNew) {
+            revertIndicesToRemove.add(i11);
+          }
         }
         const filteredPatches = newPatches.filter((_16, i11) => !revertIndicesToRemove.has(i11));
         return { patches: filteredPatches, revertedPatchIds: [...revertedPatchIdSet] };
@@ -363933,7 +363946,7 @@ var require_dist11 = __commonJS({
         if (!diff2.trim()) return { patches: [], revertedPatchIds: [] };
         const contentHash = this.computeContentHash(diff2);
         const lock = this.lockManager.read();
-        if (lock.patches.some((p10) => p10.content_hash === contentHash)) {
+        if (lock.patches.some((p10) => p10.content_hash === contentHash) || (lock.forgotten_hashes ?? []).includes(contentHash)) {
           return { patches: [], revertedPatchIds: [] };
         }
         const headSha = (await this.git.exec(["rev-parse", "HEAD"])).trim();
@@ -363999,6 +364012,32 @@ var require_dist11 = __commonJS({
     var import_node_os15 = require("os");
     var import_node_path210 = require("path");
     var import_minimatch8 = require_commonjs3();
+    function stripConflictMarkers(content5) {
+      const lines = content5.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");
+    }
     var BINARY_EXTENSIONS2 = /* @__PURE__ */ new Set([
       ".png",
       ".jpg",
@@ -364070,7 +364109,8 @@ var require_dist11 = __commonJS({
       async applyPatches(patches) {
         this.resetAccumulator();
         const results = [];
-        for (const patch5 of patches) {
+        for (let i11 = 0; i11 < patches.length; i11++) {
+          const patch5 = patches[i11];
           if (this.isExcluded(patch5)) {
             results.push({
               patch: patch5,
@@ -364081,6 +364121,33 @@ var require_dist11 = __commonJS({
           }
           const result = await this.applyPatchWithFallback(patch5);
           results.push(result);
+          if (result.status === "conflict" && result.fileResults) {
+            const laterFiles = /* @__PURE__ */ new Set();
+            for (let j16 = i11 + 1; j16 < patches.length; j16++) {
+              for (const f10 of patches[j16].files) {
+                laterFiles.add(f10);
+              }
+            }
+            const resolvedToOriginal = /* @__PURE__ */ new Map();
+            if (result.resolvedFiles) {
+              for (const [orig, resolved] of Object.entries(result.resolvedFiles)) {
+                resolvedToOriginal.set(resolved, orig);
+              }
+            }
+            for (const fileResult of result.fileResults) {
+              if (fileResult.status !== "conflict") continue;
+              const originalPath = resolvedToOriginal.get(fileResult.file) ?? fileResult.file;
+              if (laterFiles.has(fileResult.file) || laterFiles.has(originalPath)) {
+                const filePath = (0, import_node_path210.join)(this.outputDir, fileResult.file);
+                try {
+                  const content5 = await (0, import_promises181.readFile)(filePath, "utf-8");
+                  const stripped = stripConflictMarkers(content5);
+                  await (0, import_promises181.writeFile)(filePath, stripped);
+                } catch {
+                }
+              }
+            }
+          }
         }
         return results;
       }
@@ -364099,7 +364166,7 @@ var require_dist11 = __commonJS({
             const resolvedPath = await this.resolveFilePath(filePath, baseGen.tree_hash, currentTreeHash);
             const base4 = await this.git.showFile(baseGen.tree_hash, filePath);
             const theirs = await this.applyPatchToContent(base4, patch5.patch_content, filePath, tempGit, tempDir2);
-            if (theirs && base4) {
+            if (theirs) {
               this.fileTheirsAccumulator.set(resolvedPath, {
                 content: theirs,
                 baseGeneration: patch5.base_generation
@@ -364231,7 +364298,7 @@ var require_dist11 = __commonJS({
           );
           let useAccumulatorAsMergeBase = false;
           const accumulatorEntry = this.fileTheirsAccumulator.get(resolvedPath);
-          if (!theirs && base4 && accumulatorEntry) {
+          if (!theirs && accumulatorEntry) {
             theirs = await this.applyPatchToContent(
               accumulatorEntry.content,
               patch5.patch_content,
@@ -364290,7 +364357,7 @@ var require_dist11 = __commonJS({
               reason: "missing-content"
             };
           }
-          if (!base4 || !ours) {
+          if (!base4 && !useAccumulatorAsMergeBase || !ours) {
             return {
               file: resolvedPath,
               status: "skipped",
@@ -364298,11 +364365,18 @@ var require_dist11 = __commonJS({
             };
           }
           const mergeBase = useAccumulatorAsMergeBase && accumulatorEntry ? accumulatorEntry.content : base4;
+          if (mergeBase == null) {
+            return {
+              file: resolvedPath,
+              status: "skipped",
+              reason: "missing-content"
+            };
+          }
           const merged = threeWayMerge(mergeBase, ours, effective_theirs);
           const outDir = (0, import_node_path210.dirname)(oursPath);
           await (0, import_promises181.mkdir)(outDir, { recursive: true });
           await (0, import_promises181.writeFile)(oursPath, merged.content);
-          if (effective_theirs && base4) {
+          if (effective_theirs) {
             this.fileTheirsAccumulator.set(resolvedPath, {
               content: effective_theirs,
               baseGeneration: patch5.base_generation
@@ -364541,32 +364615,6 @@ CLI Version: ${options2.cliVersion}`;
     var import_node_path310 = require("path");
     var import_minimatch22 = require_commonjs3();
     init_GitClient();
-    function stripConflictMarkers(content5) {
-      const lines = content5.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");
-    }
     var ReplayService = class {
       git;
       detector;
@@ -365528,30 +365576,145 @@ CLI Version: ${options2.cliVersion}`;
       return `sha256:${(0, import_node_crypto32.createHash)("sha256").update(normalized).digest("hex")}`;
     }
     var import_minimatch42 = require_commonjs3();
-    function forget(outputDir, filePattern, options2) {
+    function parseDiffStat(patchContent) {
+      let additions = 0;
+      let deletions = 0;
+      let inDiffHunk = false;
+      for (const line of patchContent.split("\n")) {
+        if (line.startsWith("diff --git ")) {
+          inDiffHunk = true;
+          continue;
+        }
+        if (!inDiffHunk) continue;
+        if (line.startsWith("+") && !line.startsWith("+++")) {
+          additions++;
+        } else if (line.startsWith("-") && !line.startsWith("---")) {
+          deletions++;
+        }
+      }
+      return { additions, deletions };
+    }
+    function toMatchedPatch(patch5) {
+      return {
+        id: patch5.id,
+        message: patch5.original_message,
+        files: patch5.files,
+        diffstat: parseDiffStat(patch5.patch_content),
+        ...patch5.status ? { status: patch5.status } : {}
+      };
+    }
+    function matchesPatch(patch5, pattern) {
+      const fileMatch = patch5.files.some(
+        (file4) => file4 === pattern || (0, import_minimatch42.minimatch)(file4, pattern)
+      );
+      if (fileMatch) return true;
+      return patch5.original_message.toLowerCase().includes(pattern.toLowerCase());
+    }
+    function buildWarnings(patches) {
+      const warnings = [];
+      for (const patch5 of patches) {
+        if (patch5.status === "resolving") {
+          warnings.push(
+            `patch ${patch5.id} has conflict markers in these files: ${patch5.files.join(", ")}. Run \`git checkout -- <files>\` to restore the generated versions.`
+          );
+        } else if (patch5.status === "unresolved") {
+          warnings.push(
+            `patch ${patch5.id} had unresolved conflicts (files: ${patch5.files.join(", ")}).`
+          );
+        }
+      }
+      return warnings;
+    }
+    var EMPTY_RESULT = {
+      initialized: false,
+      removed: [],
+      remaining: 0,
+      notFound: false,
+      alreadyForgotten: [],
+      totalPatches: 0,
+      warnings: []
+    };
+    function forget(outputDir, options2) {
       const lockManager = new LockfileManager(outputDir);
       if (!lockManager.exists()) {
-        return { removed: [], notFound: true };
+        return { ...EMPTY_RESULT };
       }
       const lock = lockManager.read();
-      const matchingPatches = lock.patches.filter(
-        (patch5) => patch5.files.some((file4) => file4 === filePattern || (0, import_minimatch42.minimatch)(file4, filePattern))
-      );
-      if (matchingPatches.length === 0) {
-        return { removed: [], notFound: true };
+      const totalPatches = lock.patches.length;
+      if (options2?.all) {
+        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);
+          }
+          lockManager.clearPatches();
+          lockManager.save();
+        }
+        return {
+          initialized: true,
+          removed,
+          remaining: 0,
+          notFound: false,
+          alreadyForgotten: [],
+          totalPatches,
+          warnings
+        };
       }
-      const removed = matchingPatches.map((p10) => ({
-        id: p10.id,
-        message: p10.original_message,
-        files: p10.files
-      }));
-      if (!options2?.dryRun) {
-        for (const patch5 of matchingPatches) {
-          lockManager.removePatch(patch5.id);
+      if (options2?.patchIds && options2.patchIds.length > 0) {
+        const removed = [];
+        const alreadyForgotten = [];
+        const patchesToRemove = [];
+        for (const id2 of options2.patchIds) {
+          const patch5 = lock.patches.find((p10) => p10.id === id2);
+          if (patch5) {
+            removed.push(toMatchedPatch(patch5));
+            patchesToRemove.push(patch5);
+          } else {
+            alreadyForgotten.push(id2);
+          }
         }
-        lockManager.save();
+        const warnings = buildWarnings(patchesToRemove);
+        if (!options2.dryRun) {
+          for (const patch5 of patchesToRemove) {
+            lockManager.addForgottenHash(patch5.content_hash);
+            lockManager.removePatch(patch5.id);
+          }
+          lockManager.save();
+        }
+        return {
+          initialized: true,
+          removed,
+          remaining: totalPatches - removed.length,
+          notFound: removed.length === 0 && alreadyForgotten.length > 0,
+          alreadyForgotten,
+          totalPatches,
+          warnings
+        };
       }
-      return { removed, notFound: false };
+      if (options2?.pattern) {
+        const matched = lock.patches.filter((p10) => matchesPatch(p10, options2.pattern)).map(toMatchedPatch);
+        return {
+          initialized: true,
+          removed: [],
+          remaining: totalPatches,
+          notFound: matched.length === 0,
+          alreadyForgotten: [],
+          totalPatches,
+          warnings: [],
+          matched
+        };
+      }
+      return {
+        initialized: true,
+        removed: [],
+        remaining: totalPatches,
+        notFound: totalPatches === 0,
+        alreadyForgotten: [],
+        totalPatches,
+        warnings: [],
+        matched: lock.patches.map(toMatchedPatch)
+      };
     }
     var import_node_fs52 = require("fs");
     function reset2(outputDir, options2) {
@@ -365667,24 +365830,49 @@ CLI Version: ${options2.cliVersion}`;
     function status(outputDir) {
       const lockManager = new LockfileManager(outputDir);
       if (!lockManager.exists()) {
-        return { initialized: false, patches: [], lastGeneration: void 0 };
+        return {
+          initialized: false,
+          generationCount: 0,
+          lastGeneration: void 0,
+          patches: [],
+          unresolvedCount: 0,
+          excludePatterns: []
+        };
       }
       const lock = lockManager.read();
       const patches = lock.patches.map((patch5) => ({
-        sha: patch5.original_commit.slice(0, 7),
-        author: patch5.original_author.split("<")[0]?.trim() ?? "unknown",
+        id: patch5.id,
+        type: patch5.patch_content.includes("new file mode") ? "added" : "modified",
         message: patch5.original_message,
-        files: patch5.files
+        author: patch5.original_author.split("<")[0]?.trim() || "unknown",
+        sha: patch5.original_commit.slice(0, 7),
+        files: patch5.files,
+        fileCount: patch5.files.length,
+        ...patch5.status ? { status: patch5.status } : {}
       }));
+      const unresolvedCount = lock.patches.filter(
+        (p10) => p10.status === "unresolved" || p10.status === "resolving"
+      ).length;
       let lastGeneration;
       const lastGen = lock.generations.find((g19) => g19.commit_sha === lock.current_generation);
       if (lastGen) {
         lastGeneration = {
-          sha: lastGen.commit_sha,
-          timestamp: lastGen.timestamp
+          sha: lastGen.commit_sha.slice(0, 7),
+          timestamp: lastGen.timestamp,
+          cliVersion: lastGen.cli_version,
+          generatorVersions: lastGen.generator_versions
         };
       }
-      return { initialized: true, patches, lastGeneration };
+      const config5 = lockManager.getCustomizationsConfig();
+      const excludePatterns = config5.exclude ?? [];
+      return {
+        initialized: true,
+        generationCount: lock.generations.length,
+        lastGeneration,
+        patches,
+        unresolvedCount,
+        excludePatterns
+      };
     }
   }
 });
@@ -366044,6 +366232,19 @@ var require_pipeline2 = __commonJS({
   }
 });
 
+// ../../generator-cli/lib/replay/replay-forget.js
+var require_replay_forget = __commonJS({
+  "../../generator-cli/lib/replay/replay-forget.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.replayForget = replayForget2;
+    var replay_1 = require_dist11();
+    function replayForget2(params2) {
+      return (0, replay_1.forget)(params2.outputDir, params2.options);
+    }
+  }
+});
+
 // ../../generator-cli/lib/replay/replay-init.js
 var require_replay_init = __commonJS({
   "../../generator-cli/lib/replay/replay-init.js"(exports2) {
@@ -366208,12 +366409,25 @@ var require_replay_resolve = __commonJS({
   }
 });
 
+// ../../generator-cli/lib/replay/replay-status.js
+var require_replay_status = __commonJS({
+  "../../generator-cli/lib/replay/replay-status.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.replayStatus = replayStatus2;
+    var replay_1 = require_dist11();
+    function replayStatus2(params2) {
+      return (0, replay_1.status)(params2.outputDir);
+    }
+  }
+});
+
 // ../../generator-cli/lib/api.js
 var require_api5 = __commonJS({
   "../../generator-cli/lib/api.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.replayRun = exports2.replayResolve = exports2.replayInit = exports2.formatBootstrapSummary = exports2.PostGenerationPipeline = exports2.logReplaySummary = exports2.formatReplayPrBody = exports2.consolePipelineLogger = exports2.githubRelease = exports2.githubPush = exports2.githubPr = exports2.generateReferenceToStream = exports2.generateReference = exports2.generateReadmeToStream = exports2.generateReadme = void 0;
+    exports2.replayStatus = exports2.replayRun = exports2.replayResolve = exports2.replayInit = exports2.formatBootstrapSummary = exports2.replayForget = exports2.PostGenerationPipeline = exports2.logReplaySummary = exports2.formatReplayPrBody = exports2.consolePipelineLogger = exports2.githubRelease = exports2.githubPush = exports2.githubPr = exports2.generateReferenceToStream = exports2.generateReference = exports2.generateReadmeToStream = exports2.generateReadme = void 0;
     var generate_readme_js_1 = require_generate_readme();
     Object.defineProperty(exports2, "generateReadme", { enumerable: true, get: function() {
       return generate_readme_js_1.generateReadme;
@@ -366253,6 +366467,10 @@ var require_api5 = __commonJS({
     Object.defineProperty(exports2, "PostGenerationPipeline", { enumerable: true, get: function() {
       return index_js_1.PostGenerationPipeline;
     } });
+    var replay_forget_js_1 = require_replay_forget();
+    Object.defineProperty(exports2, "replayForget", { enumerable: true, get: function() {
+      return replay_forget_js_1.replayForget;
+    } });
     var replay_init_js_1 = require_replay_init();
     Object.defineProperty(exports2, "formatBootstrapSummary", { enumerable: true, get: function() {
       return replay_init_js_1.formatBootstrapSummary;
@@ -366268,6 +366486,10 @@ var require_api5 = __commonJS({
     Object.defineProperty(exports2, "replayRun", { enumerable: true, get: function() {
       return replay_run_js_1.replayRun;
     } });
+    var replay_status_js_1 = require_replay_status();
+    Object.defineProperty(exports2, "replayStatus", { enumerable: true, get: function() {
+      return replay_status_js_1.replayStatus;
+    } });
   }
 });
 
@@ -602916,7 +603138,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.62.3-9-g975ac7af925",
+          version: "4.62.4",
           usingAccessToken: true
         }
       });
@@ -602967,7 +603189,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.62.3-9-g975ac7af925",
+        version: "4.62.4",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -840263,7 +840485,7 @@ var import_path54 = __toESM(require("path"), 1);
 var LOCAL_STORAGE_FOLDER4 = ".fern-dev";
 var LOGS_FOLDER_NAME = "logs";
 function getCliSource() {
-  const version7 = "4.62.3-9-g975ac7af925";
+  const version7 = "4.62.4";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -851371,7 +851593,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.62.3-9-g975ac7af925"
+        cliVersion: "4.62.4"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
         return { success: false };
@@ -924671,7 +924893,7 @@ var CliContext = class {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.62.3-9-g975ac7af925";
+    return "4.62.4";
   }
   getCliName() {
     if (false) {
@@ -944479,6 +944701,8 @@ function addReplayCommand(cli, cliContext) {
     builder: (yargs) => {
       addReplayInitCommand(yargs, cliContext);
       addReplayResolveCommand(yargs, cliContext);
+      addReplayStatusCommand(yargs, cliContext);
+      addReplayForgetCommand(yargs, cliContext);
       return yargs;
     },
     handler: () => {
@@ -944669,6 +944893,211 @@ Resolve the conflicts in your editor, then run \`fern replay resolve\` again to
     }
   );
 }
+function addReplayStatusCommand(cli, cliContext) {
+  cli.command(
+    "status [directory]",
+    false,
+    // hidden from --help
+    (yargs) => yargs.positional("directory", {
+      type: "string",
+      default: ".",
+      description: "SDK directory containing .fern/replay.lock"
+    }).option("verbose", {
+      type: "boolean",
+      alias: "v",
+      default: false,
+      description: "Show all patches with full details"
+    }),
+    async (argv) => {
+      await cliContext.instrumentPostHogEvent({
+        command: "fern replay status"
+      });
+      const outputDir = resolve5(cwd(), argv.directory ?? ".");
+      try {
+        const result = (0, import_generator_cli2.replayStatus)({ outputDir });
+        if (!result.initialized) {
+          cliContext.logger.info("Replay is not initialized. Run `fern replay init` to get started.");
+          return;
+        }
+        cliContext.logger.info(
+          `Replay: ${result.patches.length} customization(s) tracked, ${result.generationCount} generation(s)`
+        );
+        if (result.lastGeneration) {
+          cliContext.logger.info(
+            `Last generation: ${result.lastGeneration.sha} (${result.lastGeneration.timestamp})`
+          );
+        }
+        if (result.patches.length === 0) {
+          cliContext.logger.info("No customizations tracked.");
+          return;
+        }
+        const patchesToShow = argv.verbose ? result.patches : result.patches.slice(0, 10);
+        for (const patch5 of patchesToShow) {
+          const statusTag = patch5.status ? ` [${patch5.status}]` : "";
+          if (argv.verbose) {
+            cliContext.logger.info(
+              `
+  ${patch5.id} (${patch5.type})${statusTag}
+    ${patch5.message}
+    Author: ${patch5.author} (${patch5.sha})
+    Files (${patch5.fileCount}): ${patch5.files.join(", ")}`
+            );
+          } else {
+            cliContext.logger.info(
+              `  ${patch5.id}: ${patch5.message} (${patch5.fileCount} file(s))${statusTag}`
+            );
+          }
+        }
+        if (!argv.verbose && result.patches.length > 10) {
+          cliContext.logger.info(`  ... and ${result.patches.length - 10} more (use --verbose to see all)`);
+        }
+        if (result.unresolvedCount > 0) {
+          cliContext.logger.warn(
+            `
+${result.unresolvedCount} patch(es) have unresolved conflicts. Run \`fern replay resolve\` to fix.`
+          );
+        }
+        if (result.excludePatterns.length > 0) {
+          cliContext.logger.info(`
+Exclude patterns: ${result.excludePatterns.join(", ")}`);
+        }
+      } catch (error50) {
+        cliContext.failAndThrow(`Failed to get Replay status: ${extractErrorMessage(error50)}`);
+      }
+    }
+  );
+}
+function addReplayForgetCommand(cli, cliContext) {
+  cli.command(
+    "forget [args..]",
+    false,
+    // hidden from --help
+    (yargs) => yargs.positional("args", {
+      type: "string",
+      array: true,
+      description: "Patch IDs (e.g. patch-abc12345) or a search pattern"
+    }).option("dry-run", {
+      type: "boolean",
+      default: false,
+      description: "Show what would be removed without actually removing"
+    }).option("yes", {
+      type: "boolean",
+      alias: "y",
+      default: false,
+      description: "Skip confirmation prompts"
+    }).option("all", {
+      type: "boolean",
+      default: false,
+      description: "Remove all tracked patches"
+    }),
+    async (argv) => {
+      await cliContext.instrumentPostHogEvent({
+        command: "fern replay forget"
+      });
+      const outputDir = resolve5(cwd(), ".");
+      const args = argv.args ?? [];
+      const dryRun = argv.dryRun;
+      try {
+        if (argv.all) {
+          const result2 = (0, import_generator_cli2.replayForget)({ outputDir, options: { all: true, dryRun } });
+          if (!result2.initialized) {
+            cliContext.logger.info("Replay is not initialized. Nothing to forget.");
+            return;
+          }
+          if (result2.removed.length === 0) {
+            cliContext.logger.info("No patches to remove.");
+            return;
+          }
+          if (dryRun) {
+            cliContext.logger.info(`Would remove ${result2.removed.length} patch(es):`);
+          } else {
+            cliContext.logger.info(`Removed ${result2.removed.length} patch(es):`);
+          }
+          for (const patch5 of result2.removed) {
+            cliContext.logger.info(`  ${patch5.id}: ${patch5.message}`);
+          }
+          for (const warning of result2.warnings) {
+            cliContext.logger.warn(warning);
+          }
+          return;
+        }
+        if (args.length > 0 && args.every((a10) => a10.startsWith("patch-"))) {
+          const result2 = (0, import_generator_cli2.replayForget)({ outputDir, options: { patchIds: args, dryRun } });
+          if (!result2.initialized) {
+            cliContext.logger.info("Replay is not initialized. Nothing to forget.");
+            return;
+          }
+          if (result2.removed.length > 0) {
+            const verb = dryRun ? "Would remove" : "Removed";
+            for (const patch5 of result2.removed) {
+              cliContext.logger.info(`${verb}: ${patch5.id} \u2014 ${patch5.message}`);
+            }
+          }
+          for (const id2 of result2.alreadyForgotten) {
+            cliContext.logger.info(`Already forgotten: ${id2}`);
+          }
+          for (const warning of result2.warnings) {
+            cliContext.logger.warn(warning);
+          }
+          return;
+        }
+        const pattern = args.length === 1 ? args[0] : void 0;
+        const result = (0, import_generator_cli2.replayForget)({ outputDir, options: { pattern } });
+        if (!result.initialized) {
+          cliContext.logger.info("Replay is not initialized. Nothing to forget.");
+          return;
+        }
+        const matched = result.matched ?? [];
+        if (matched.length === 0) {
+          if (pattern) {
+            cliContext.logger.info(`No patches matching "${pattern}".`);
+          } else {
+            cliContext.logger.info("No patches tracked.");
+          }
+          return;
+        }
+        cliContext.logger.info(`${matched.length} patch(es) matched:`);
+        for (const patch5 of matched) {
+          const stat6 = `+${patch5.diffstat.additions}/-${patch5.diffstat.deletions}`;
+          cliContext.logger.info(`  ${patch5.id}: ${patch5.message} (${stat6})`);
+        }
+        if (dryRun) {
+          cliContext.logger.info("\nDry run \u2014 no patches removed.");
+          return;
+        }
+        if (!argv.yes) {
+          if (!process.stdout.isTTY) {
+            cliContext.failAndThrow(
+              "Confirmation required. Use --yes to skip confirmation in non-interactive mode."
+            );
+            return;
+          }
+          const readline7 = await import("readline");
+          const rl3 = readline7.createInterface({ input: process.stdin, output: process.stderr });
+          const answer = await new Promise((resolvePrompt) => {
+            rl3.question(`
+Remove ${matched.length} patch(es)? [y/N] `, resolvePrompt);
+          });
+          rl3.close();
+          if (answer.toLowerCase() !== "y") {
+            cliContext.logger.info("Cancelled.");
+            return;
+          }
+        }
+        const patchIds = matched.map((p10) => p10.id);
+        const removeResult = (0, import_generator_cli2.replayForget)({ outputDir, options: { patchIds, dryRun: false } });
+        cliContext.logger.info(
+          `Removed ${removeResult.removed.length} patch(es). ${removeResult.remaining} remaining.`
+        );
+        for (const warning of removeResult.warnings) {
+          cliContext.logger.warn(warning);
+        }
+      } catch (error50) {
+        cliContext.failAndThrow(`Failed to forget patches: ${extractErrorMessage(error50)}`);
+      }
+    }
+  );
+}
 function parseOwnerRepo(githubRepo) {
   const cleaned = githubRepo.replace(/^https?:\/\//, "").replace(/\.git$/, "").replace(/^github\.com\//, "");
   const parts = cleaned.split("/");

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.62.3-9-g975ac7af925",
+  "version": "4.62.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",