@fern-api/fern-api-dev 4.62.3-3-g2870783b556 → 4.62.3-30-g41b622156cc

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.1/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.1/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
     "use strict";
     var __defProp4 = Object.defineProperty;
     var __getOwnPropDesc4 = Object.getOwnPropertyDescriptor;
@@ -363579,6 +363579,14 @@ var require_dist11 = __commonJS({
               return false;
             }
           }
+          async treeExists(treeHash) {
+            try {
+              const type8 = await this.exec(["cat-file", "-t", treeHash]);
+              return type8.trim() === "tree";
+            } catch {
+              return false;
+            }
+          }
           async getCommitBody(commitSha) {
             return this.exec(["log", "-1", "--format=%B", commitSha]);
           }
@@ -363588,6 +363596,253 @@ var require_dist11 = __commonJS({
         };
       }
     });
+    var HybridReconstruction_exports = {};
+    __export4(HybridReconstruction_exports, {
+      assembleHybrid: () => assembleHybrid,
+      locateHunksInOurs: () => locateHunksInOurs,
+      parseHunks: () => parseHunks,
+      reconstructFromGhostPatch: () => reconstructFromGhostPatch
+    });
+    function parseHunks(fileDiff) {
+      const lines = fileDiff.split("\n");
+      const hunks = [];
+      let currentHunk = null;
+      for (const line of lines) {
+        const headerMatch = line.match(
+          /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/
+        );
+        if (headerMatch) {
+          if (currentHunk) {
+            hunks.push(currentHunk);
+          }
+          currentHunk = {
+            oldStart: parseInt(headerMatch[1], 10),
+            oldCount: headerMatch[2] != null ? parseInt(headerMatch[2], 10) : 1,
+            newStart: parseInt(headerMatch[3], 10),
+            newCount: headerMatch[4] != null ? parseInt(headerMatch[4], 10) : 1,
+            lines: []
+          };
+          continue;
+        }
+        if (!currentHunk) continue;
+        if (line.startsWith("diff --git") || line.startsWith("index ") || line.startsWith("---") || line.startsWith("+++") || line.startsWith("old mode") || line.startsWith("new mode") || line.startsWith("similarity index") || line.startsWith("rename from") || line.startsWith("rename to") || line.startsWith("new file mode") || line.startsWith("deleted file mode")) {
+          continue;
+        }
+        if (line === "\") {
+          continue;
+        }
+        if (line.startsWith("-")) {
+          currentHunk.lines.push({ type: "remove", content: line.slice(1) });
+        } else if (line.startsWith("+")) {
+          currentHunk.lines.push({ type: "add", content: line.slice(1) });
+        } else if (line.startsWith(" ") || line === "") {
+          currentHunk.lines.push({
+            type: "context",
+            content: line.startsWith(" ") ? line.slice(1) : line
+          });
+        }
+      }
+      if (currentHunk) {
+        hunks.push(currentHunk);
+      }
+      return hunks;
+    }
+    function extractLeadingContext(hunk) {
+      const result = [];
+      for (const line of hunk.lines) {
+        if (line.type !== "context") break;
+        result.push(line.content);
+      }
+      return result;
+    }
+    function extractTrailingContext(hunk) {
+      const result = [];
+      for (let i11 = hunk.lines.length - 1; i11 >= 0; i11--) {
+        if (hunk.lines[i11].type !== "context") break;
+        result.unshift(hunk.lines[i11].content);
+      }
+      return result;
+    }
+    function countOursLinesBeforeTrailing(hunk) {
+      let count = 0;
+      const trailingStart = findTrailingContextStart(hunk);
+      for (let i11 = 0; i11 < trailingStart; i11++) {
+        if (hunk.lines[i11].type === "context") count++;
+      }
+      return count;
+    }
+    function findTrailingContextStart(hunk) {
+      let i11 = hunk.lines.length - 1;
+      while (i11 >= 0 && hunk.lines[i11].type === "context") {
+        i11--;
+      }
+      return i11 + 1;
+    }
+    function matchesAt(needle, haystack, offset2) {
+      for (let i11 = 0; i11 < needle.length; i11++) {
+        if (haystack[offset2 + i11] !== needle[i11]) return false;
+      }
+      return true;
+    }
+    function findContextInOurs(contextLines, oursLines, minIndex, hint) {
+      const SEARCH_WINDOW = 200;
+      const maxStart = oursLines.length - contextLines.length;
+      const clampedHint = Math.max(minIndex, Math.min(hint, maxStart));
+      if (clampedHint >= minIndex && clampedHint <= maxStart) {
+        if (matchesAt(contextLines, oursLines, clampedHint)) {
+          return clampedHint;
+        }
+      }
+      for (let delta = 1; delta <= SEARCH_WINDOW; delta++) {
+        for (const sign2 of [1, -1]) {
+          const idx = clampedHint + delta * sign2;
+          if (idx < minIndex || idx > maxStart) continue;
+          if (matchesAt(contextLines, oursLines, idx)) {
+            return idx;
+          }
+        }
+      }
+      return -1;
+    }
+    function computeOursSpan(hunk, oursLines, oursOffset) {
+      const leading = extractLeadingContext(hunk);
+      const trailing = extractTrailingContext(hunk);
+      if (trailing.length === 0) {
+        const contextCount2 = hunk.lines.filter(
+          (l14) => l14.type === "context"
+        ).length;
+        return Math.min(contextCount2, oursLines.length - oursOffset);
+      }
+      const searchStart = oursOffset + leading.length;
+      for (let i11 = searchStart; i11 <= oursLines.length - trailing.length; i11++) {
+        if (matchesAt(trailing, oursLines, i11)) {
+          return i11 + trailing.length - oursOffset;
+        }
+      }
+      const contextCount = hunk.lines.filter(
+        (l14) => l14.type === "context"
+      ).length;
+      return Math.min(contextCount, oursLines.length - oursOffset);
+    }
+    function locateHunksInOurs(hunks, oursLines) {
+      const located = [];
+      let minOursIndex = 0;
+      for (const hunk of hunks) {
+        const contextLines = extractLeadingContext(hunk);
+        let oursOffset;
+        if (contextLines.length > 0) {
+          const found = findContextInOurs(
+            contextLines,
+            oursLines,
+            minOursIndex,
+            hunk.newStart - 1
+          );
+          if (found === -1) {
+            const trailingContext = extractTrailingContext(hunk);
+            if (trailingContext.length > 0) {
+              const trailingFound = findContextInOurs(
+                trailingContext,
+                oursLines,
+                minOursIndex,
+                hunk.newStart - 1
+              );
+              if (trailingFound === -1) return null;
+              const nonTrailingCount = countOursLinesBeforeTrailing(hunk);
+              oursOffset = trailingFound - nonTrailingCount;
+              if (oursOffset < minOursIndex) return null;
+            } else {
+              return null;
+            }
+          } else {
+            oursOffset = found;
+          }
+        } else if (hunk.oldStart === 1 && hunk.oldCount === 0) {
+          oursOffset = 0;
+        } else {
+          oursOffset = Math.max(hunk.newStart - 1, minOursIndex);
+        }
+        const oursSpan = computeOursSpan(hunk, oursLines, oursOffset);
+        located.push({ hunk, oursOffset, oursSpan });
+        minOursIndex = oursOffset + oursSpan;
+      }
+      return located;
+    }
+    function assembleHybrid(locatedHunks, oursLines) {
+      const baseLines = [];
+      const theirsLines = [];
+      let oursCursor = 0;
+      for (const { hunk, oursOffset, oursSpan } of locatedHunks) {
+        if (oursOffset > oursCursor) {
+          const gapLines = oursLines.slice(oursCursor, oursOffset);
+          baseLines.push(...gapLines);
+          theirsLines.push(...gapLines);
+        }
+        for (const line of hunk.lines) {
+          switch (line.type) {
+            case "context":
+              baseLines.push(line.content);
+              theirsLines.push(line.content);
+              break;
+            case "remove":
+              baseLines.push(line.content);
+              break;
+            case "add":
+              theirsLines.push(line.content);
+              break;
+          }
+        }
+        oursCursor = oursOffset + oursSpan;
+      }
+      if (oursCursor < oursLines.length) {
+        const gapLines = oursLines.slice(oursCursor);
+        baseLines.push(...gapLines);
+        theirsLines.push(...gapLines);
+      }
+      return {
+        base: baseLines.join("\n"),
+        theirs: theirsLines.join("\n")
+      };
+    }
+    function reconstructFromGhostPatch(fileDiff, ours) {
+      const hunks = parseHunks(fileDiff);
+      if (hunks.length === 0) {
+        return null;
+      }
+      const isPureAddition = hunks.every(
+        (h14) => h14.oldCount === 0 && h14.lines.every((l14) => l14.type !== "remove")
+      );
+      if (isPureAddition) {
+        return null;
+      }
+      const isPureDeletion = hunks.every(
+        (h14) => h14.newCount === 0 && h14.lines.every((l14) => l14.type !== "add")
+      );
+      if (isPureDeletion) {
+        const baseLines = [];
+        for (const hunk of hunks) {
+          for (const line of hunk.lines) {
+            if (line.type === "context" || line.type === "remove") {
+              baseLines.push(line.content);
+            }
+          }
+        }
+        return {
+          base: baseLines.join("\n"),
+          theirs: ""
+        };
+      }
+      const oursLines = ours.split("\n");
+      const located = locateHunksInOurs(hunks, oursLines);
+      if (!located) {
+        return null;
+      }
+      return assembleHybrid(located, oursLines);
+    }
+    var init_HybridReconstruction = __esm3({
+      "src/HybridReconstruction.ts"() {
+        "use strict";
+      }
+    });
     var index_exports = {};
     __export4(index_exports, {
       FERN_BOT_EMAIL: () => FERN_BOT_EMAIL,
@@ -363631,7 +363886,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 +363985,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 +364088,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 +364102,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 +364172,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 +364201,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 +364267,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",
@@ -364053,6 +364347,7 @@ var require_dist11 = __commonJS({
       lockManager;
       outputDir;
       renameCache = /* @__PURE__ */ new Map();
+      treeExistsCache = /* @__PURE__ */ new Map();
       fileTheirsAccumulator = /* @__PURE__ */ new Map();
       constructor(git, lockManager, outputDir) {
         this.git = git;
@@ -364070,7 +364365,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 +364377,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 +364422,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
@@ -364221,17 +364544,36 @@ var require_dist11 = __commonJS({
           }
           const oursPath = (0, import_node_path210.join)(this.outputDir, resolvedPath);
           const ours = await (0, import_promises181.readFile)(oursPath, "utf-8").catch(() => null);
-          let theirs = await this.applyPatchToContent(
-            base4,
-            patch5.patch_content,
-            filePath,
-            tempGit,
-            tempDir2,
-            renameSourcePath
-          );
+          let ghostReconstructed = false;
+          let theirs = null;
+          if (!base4 && ours && !renameSourcePath) {
+            const treeReachable = await this.isTreeReachable(baseGen.tree_hash);
+            if (!treeReachable) {
+              const fileDiff = this.extractFileDiff(patch5.patch_content, filePath);
+              if (fileDiff) {
+                const { reconstructFromGhostPatch: reconstructFromGhostPatch2 } = await Promise.resolve().then(() => (init_HybridReconstruction(), HybridReconstruction_exports));
+                const result = reconstructFromGhostPatch2(fileDiff, ours);
+                if (result) {
+                  base4 = result.base;
+                  theirs = result.theirs;
+                  ghostReconstructed = true;
+                }
+              }
+            }
+          }
+          if (!ghostReconstructed) {
+            theirs = await this.applyPatchToContent(
+              base4,
+              patch5.patch_content,
+              filePath,
+              tempGit,
+              tempDir2,
+              renameSourcePath
+            );
+          }
           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,
@@ -364261,13 +364603,13 @@ var require_dist11 = __commonJS({
               baseMismatchSkipped = true;
             }
           }
-          if (!base4 && !ours && effective_theirs) {
+          if (base4 == null && !ours && effective_theirs) {
             const outDir2 = (0, import_node_path210.dirname)(oursPath);
             await (0, import_promises181.mkdir)(outDir2, { recursive: true });
             await (0, import_promises181.writeFile)(oursPath, effective_theirs);
             return { file: resolvedPath, status: "merged", reason: "new-file" };
           }
-          if (!base4 && ours && effective_theirs) {
+          if (base4 == null && ours && effective_theirs) {
             const merged2 = threeWayMerge("", ours, effective_theirs);
             const outDir2 = (0, import_node_path210.dirname)(oursPath);
             await (0, import_promises181.mkdir)(outDir2, { recursive: true });
@@ -364290,7 +364632,7 @@ var require_dist11 = __commonJS({
               reason: "missing-content"
             };
           }
-          if (!base4 || !ours) {
+          if (base4 == null && !useAccumulatorAsMergeBase || !ours) {
             return {
               file: resolvedPath,
               status: "skipped",
@@ -364298,11 +364640,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
@@ -364326,6 +364675,14 @@ var require_dist11 = __commonJS({
           };
         }
       }
+      async isTreeReachable(treeHash) {
+        let result = this.treeExistsCache.get(treeHash);
+        if (result === void 0) {
+          result = await this.git.treeExists(treeHash);
+          this.treeExistsCache.set(treeHash, result);
+        }
+        return result;
+      }
       isExcluded(patch5) {
         const config5 = this.lockManager.getCustomizationsConfig();
         if (!config5.exclude) return false;
@@ -364541,32 +364898,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;
@@ -365418,6 +365749,7 @@ CLI Version: ${options2.cliVersion}`;
       }
       lockManager.save();
       const fernignoreUpdated = ensureFernignoreEntries(outputDir);
+      ensureGitattributesEntries(outputDir);
       if (migrator.fernignoreExists() && fernignorePatterns.length > 0) {
         const action = options2?.fernignoreAction ?? "skip";
         if (action === "migrate") {
@@ -365499,7 +365831,7 @@ CLI Version: ${options2.cliVersion}`;
         return { sha, authorName, authorEmail, message };
       });
     }
-    var REPLAY_FERNIGNORE_ENTRIES = [".fern/replay.lock", ".fern/replay.yml"];
+    var REPLAY_FERNIGNORE_ENTRIES = [".fern/replay.lock", ".fern/replay.yml", ".gitattributes"];
     function ensureFernignoreEntries(outputDir) {
       const fernignorePath = (0, import_node_path52.join)(outputDir, ".fernignore");
       let content5 = "";
@@ -365523,35 +365855,173 @@ CLI Version: ${options2.cliVersion}`;
       (0, import_node_fs42.writeFileSync)(fernignorePath, content5, "utf-8");
       return true;
     }
+    var GITATTRIBUTES_ENTRIES = [".fern/replay.lock linguist-generated=true"];
+    function ensureGitattributesEntries(outputDir) {
+      const gitattributesPath = (0, import_node_path52.join)(outputDir, ".gitattributes");
+      let content5 = "";
+      if ((0, import_node_fs42.existsSync)(gitattributesPath)) {
+        content5 = (0, import_node_fs42.readFileSync)(gitattributesPath, "utf-8");
+      }
+      const lines = content5.split("\n");
+      const toAdd = [];
+      for (const entry of GITATTRIBUTES_ENTRIES) {
+        if (!lines.some((line) => line.trim() === entry)) {
+          toAdd.push(entry);
+        }
+      }
+      if (toAdd.length === 0) {
+        return;
+      }
+      if (content5 && !content5.endsWith("\n")) {
+        content5 += "\n";
+      }
+      content5 += toAdd.join("\n") + "\n";
+      (0, import_node_fs42.writeFileSync)(gitattributesPath, content5, "utf-8");
+    }
     function computeContentHash(patchContent) {
       const normalized = patchContent.split("\n").filter((line) => !line.startsWith("From ") && !line.startsWith("index ") && !line.startsWith("Date: ")).join("\n");
       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
+        };
+      }
+      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 { removed, notFound: false };
+      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 +366137,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 +366539,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 +366716,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 +366774,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 +366793,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;
+    } });
   }
 });
 
@@ -546920,11 +547449,19 @@ var DynamicSnippetsConverter = class {
     }
     const scheme = auth8.schemes[0];
     switch (scheme.type) {
-      case "basic":
-        return dynamic_exports.Auth.basic({
+      case "basic": {
+        const basicAuth = {
           username: this.inflateName(scheme.username),
           password: this.inflateName(scheme.password)
-        });
+        };
+        if (scheme.usernameOmit) {
+          basicAuth.usernameOmit = scheme.usernameOmit;
+        }
+        if (scheme.passwordOmit) {
+          basicAuth.passwordOmit = scheme.passwordOmit;
+        }
+        return dynamic_exports.Auth.basic(basicAuth);
+      }
       case "bearer":
         return dynamic_exports.Auth.bearer({
           token: this.inflateName(scheme.token)
@@ -588535,7 +589072,7 @@ var RequestBodyConverter = class extends converters_exports.AbstractConverters.A
       contentType
     });
     if (convertedSchema == null) {
-      return void 0;
+      return this.handleSchemalessJsonContent({ contentType, mediaTypeObject });
     }
     const requestBodyTypeShape = convertedSchema.schema?.typeDeclaration.shape;
     if (requestBodyTypeShape?.type === "object") {
@@ -588591,6 +589128,55 @@ var RequestBodyConverter = class extends converters_exports.AbstractConverters.A
       };
     }
   }
+  /**
+   * Handles JSON request bodies that have no schema but DO have native OpenAPI
+   * examples. Creates an unknown-typed reference request body so that examples
+   * are preserved for docs rendering and code snippet generation.
+   */
+  handleSchemalessJsonContent({ contentType, mediaTypeObject }) {
+    const hasExamples = mediaTypeObject.example != null || mediaTypeObject.examples != null && Object.keys(mediaTypeObject.examples).length > 0;
+    if (!hasExamples) {
+      return void 0;
+    }
+    const v2Examples = {
+      userSpecifiedExamples: {},
+      autogeneratedExamples: {}
+    };
+    const examples = this.context.getNamedExamplesFromMediaTypeObject({
+      mediaTypeObject,
+      breadcrumbs: this.breadcrumbs,
+      defaultExampleName: `${[...this.group, this.method].join("_")}_example`
+    });
+    const usedExampleNames = /* @__PURE__ */ new Set();
+    for (const [key2, example] of examples) {
+      const resolvedExample = this.context.resolveExampleWithValue(example);
+      const resolvedExampleObject = this.context.resolveExampleRecursively({
+        example,
+        breadcrumbs: this.breadcrumbs
+      });
+      let exampleName = key2;
+      if (this.context.isExampleWithSummary(resolvedExampleObject)) {
+        const summary = resolvedExampleObject.summary;
+        if (!usedExampleNames.has(summary)) {
+          exampleName = summary;
+        }
+      }
+      usedExampleNames.add(exampleName);
+      if (resolvedExample != null) {
+        v2Examples.userSpecifiedExamples[exampleName] = resolvedExample;
+      }
+    }
+    return {
+      requestBody: HttpRequestBody.reference({
+        contentType,
+        docs: this.description,
+        requestBodyType: TypeReference2.unknown(),
+        v2Examples
+      }),
+      streamRequestBody: void 0,
+      inlinedTypes: {}
+    };
+  }
   handleMultipartContent({ contentType }) {
     const mediaTypeObject = this.mediaType;
     if (mediaTypeObject == null || mediaTypeObject.schema == null) {
@@ -590440,6 +591026,18 @@ var OperationConverter = class _OperationConverter extends AbstractOperationConv
       httpMethod,
       baseUrl
     });
+    if (Object.keys(fernExamples.examples).length === 0 && Object.keys(fernExamples.streamExamples).length === 0) {
+      const nativeExamples = this.synthesizeEndpointExamplesFromNativeRequestBody({
+        httpPath: path97,
+        httpMethod,
+        baseUrl
+      });
+      if (nativeExamples != null) {
+        for (const [name2, example] of Object.entries(nativeExamples)) {
+          fernExamples.examples[name2] = example;
+        }
+      }
+    }
     const endpointLevelSecuritySchemes = new Set(this.operation.security?.flatMap((securityRequirement) => Object.keys(securityRequirement)) ?? []);
     const securityHeaders = this.authSchemeToHeaders(Array.from(endpointLevelSecuritySchemes));
     if (securityHeaders.length > 0) {
@@ -590876,6 +591474,107 @@ var OperationConverter = class _OperationConverter extends AbstractOperationConv
       streamExamples: {}
     };
   }
+  /**
+   * Synthesizes endpoint-level v2Examples from native OpenAPI request body
+   * examples (mediaType.example / mediaType.examples) when no x-fern-examples
+   * or x-code-samples extensions are present.
+   *
+   * This ensures that specs like Close's, which have native examples on
+   * schemaless request bodies, get rendered in docs and code snippets.
+   *
+   * Also extracts native response examples from the operation's successful (2xx)
+   * responses so that the 200 response panel is preserved in docs.
+   */
+  synthesizeEndpointExamplesFromNativeRequestBody({ httpPath, httpMethod, baseUrl }) {
+    if (this.operation.requestBody == null) {
+      return void 0;
+    }
+    const resolvedRequestBody = this.context.resolveMaybeReference({
+      schemaOrReference: this.operation.requestBody,
+      breadcrumbs: [...this.breadcrumbs, "requestBody"]
+    });
+    if (resolvedRequestBody == null) {
+      return void 0;
+    }
+    const responseExample = this.extractNativeResponseExample();
+    const result = {};
+    for (const [, mediaType] of Object.entries(resolvedRequestBody.content)) {
+      if (mediaType.schema != null) {
+        continue;
+      }
+      const namedExamples = this.context.getNamedExamplesFromMediaTypeObject({
+        mediaTypeObject: mediaType,
+        breadcrumbs: [...this.breadcrumbs, "requestBody"],
+        defaultExampleName: "Example"
+      });
+      for (const [name2, example] of namedExamples) {
+        const resolvedValue = this.context.resolveExampleWithValue(example);
+        if (resolvedValue != null) {
+          result[name2] = {
+            displayName: void 0,
+            request: {
+              docs: void 0,
+              endpoint: {
+                method: httpMethod,
+                path: this.buildExamplePath(httpPath, {})
+              },
+              baseUrl: void 0,
+              environment: baseUrl,
+              auth: void 0,
+              pathParameters: {},
+              queryParameters: {},
+              headers: {},
+              requestBody: resolvedValue
+            },
+            response: responseExample,
+            codeSamples: void 0
+          };
+        }
+      }
+    }
+    return Object.keys(result).length > 0 ? result : void 0;
+  }
+  /**
+   * Extracts the first native example from the operation's successful (2xx) response.
+   * This is used to populate the response body in synthesized endpoint examples
+   * so that the 200 response panel is preserved in docs.
+   */
+  extractNativeResponseExample() {
+    if (this.operation.responses == null) {
+      return void 0;
+    }
+    for (const [statusCode, response] of Object.entries(this.operation.responses)) {
+      const statusCodeNum = parseInt(statusCode);
+      if (isNaN(statusCodeNum) || statusCodeNum < 200 || statusCodeNum >= 300) {
+        continue;
+      }
+      const resolvedResponse = this.context.resolveMaybeReference({
+        schemaOrReference: response,
+        breadcrumbs: [...this.breadcrumbs, "responses", statusCode]
+      });
+      if (resolvedResponse?.content == null) {
+        continue;
+      }
+      for (const [, responseMediaType] of Object.entries(resolvedResponse.content)) {
+        const namedExamples = this.context.getNamedExamplesFromMediaTypeObject({
+          mediaTypeObject: responseMediaType,
+          breadcrumbs: [...this.breadcrumbs, "responses", statusCode],
+          defaultExampleName: "Example"
+        });
+        for (const [, example] of namedExamples) {
+          const resolvedValue = this.context.resolveExampleWithValue(example);
+          if (resolvedValue != null) {
+            return {
+              docs: void 0,
+              statusCode: statusCodeNum,
+              body: api_exports.V2HttpEndpointResponseBody.json(resolvedValue)
+            };
+          }
+        }
+      }
+    }
+    return void 0;
+  }
   convertStreamConditionExamples({ httpPath, httpMethod, baseUrl, fernExamples }) {
     const filteredJsonExamples = fernExamples.filter((example) => !(example.response != null && "stream" in example.response));
     const filteredStreamExamples = fernExamples.filter((example) => example.response != null && "stream" in example.response);
@@ -602754,7 +603453,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.62.3-3-g2870783b556",
+          version: "4.62.3-30-g41b622156cc",
           usingAccessToken: true
         }
       });
@@ -602805,7 +603504,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.62.3-3-g2870783b556",
+        version: "4.62.3-30-g41b622156cc",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -622192,7 +622891,7 @@ function getClientOptions(options2, getDefaultIntegrationsImpl) {
   const tracesSampleRate = getTracesSampleRate(options2.tracesSampleRate);
   const mergedOptions = {
     ...options2,
-    dsn: options2.dsn ?? "https://84f58b5e457f06999d92f11ce4b79158@o4509504076185600.ingest.us.sentry.io/4511021546602496",
+    dsn: options2.dsn ?? "",
     environment: options2.environment ?? "development",
     sendClientReports: options2.sendClientReports ?? true,
     transport: options2.transport ?? makeNodeTransport,
@@ -626786,7 +627485,7 @@ var TelemetryClient = class {
       usingAccessToken: process.env.FERN_TOKEN != null
     };
     this.posthog = apiKey != null && apiKey.length > 0 && isTelemetryEnabled ? new PostHog(apiKey) : void 0;
-    const sentryDsn = "https://84f58b5e457f06999d92f11ce4b79158@o4509504076185600.ingest.us.sentry.io/4511021546602496";
+    const sentryDsn = "";
     if (sentryDsn != null && sentryDsn.length > 0 && isTelemetryEnabled) {
       const sentryEnvironment = "development";
       if (sentryEnvironment == null || sentryEnvironment.length === 0) {
@@ -752793,7 +753492,7 @@ var V66_TO_V65_MIGRATION = {
     [GeneratorName.JAVA_SDK]: GeneratorWasNeverUpdatedToConsumeNewIR,
     [GeneratorName.JAVA_SPRING]: GeneratorWasNeverUpdatedToConsumeNewIR,
     [GeneratorName.OPENAPI_PYTHON_CLIENT]: GeneratorWasNeverUpdatedToConsumeNewIR,
-    [GeneratorName.OPENAPI]: GeneratorWasNeverUpdatedToConsumeNewIR,
+    [GeneratorName.OPENAPI]: "0.4.0-rc.0",
     [GeneratorName.PYTHON_FASTAPI]: GeneratorWasNeverUpdatedToConsumeNewIR,
     [GeneratorName.PYTHON_PYDANTIC]: GeneratorWasNeverUpdatedToConsumeNewIR,
     [GeneratorName.PYTHON_SDK]: GeneratorWasNeverUpdatedToConsumeNewIR,
@@ -752808,8 +753507,8 @@ var V66_TO_V65_MIGRATION = {
     [GeneratorName.SWIFT_SDK]: GeneratorWasNeverUpdatedToConsumeNewIR,
     [GeneratorName.PHP_MODEL]: "0.1.0-rc.0",
     [GeneratorName.PHP_SDK]: "2.3.2-rc.0",
-    [GeneratorName.RUST_MODEL]: GeneratorWasNeverUpdatedToConsumeNewIR,
-    [GeneratorName.RUST_SDK]: GeneratorWasNeverUpdatedToConsumeNewIR
+    [GeneratorName.RUST_MODEL]: "0.5.0-rc.0",
+    [GeneratorName.RUST_SDK]: "0.32.0-rc.0"
   },
   jsonifyEarlierVersion: (ir15) => IrSerialization_exports.V65.IntermediateRepresentation.jsonOrThrow(ir15, {
     unrecognizedObjectKeys: "passthrough",
@@ -756093,7 +756792,7 @@ function addLogoutCommand(cli) {
 
 // ../cli-v2/lib/constants.js
 var FERN_TOKEN_ENV_VAR2 = "FERN_TOKEN";
-var FETCH_API_SPEC_REQUEST_TIMEOUT_MS = 3e3;
+var FETCH_API_SPEC_REQUEST_TIMEOUT_MS = 3e4;
 var GENERATE_COMMAND_TIMEOUT_MS = 10 * 60 * 1e3;
 
 // ../cli-v2/lib/commands/auth/status/command.js
@@ -840101,7 +840800,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-3-g2870783b556";
+  const version7 = "4.62.3-30-g41b622156cc";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -851209,7 +851908,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.62.3-3-g2870783b556"
+        cliVersion: "4.62.3-30-g41b622156cc"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
         return { success: false };
@@ -872469,16 +873168,23 @@ var EndpointSnippetGenerator2 = class extends WithGeneration {
     this.context.errors.add({ severity: Severity.Warning, message });
   }
   getConstructorBasicAuthArg({ auth: auth8, values: values2 }) {
-    return [
-      {
+    const authRecord = auth8;
+    const usernameOmitted = !!authRecord.usernameOmit;
+    const passwordOmitted = !!authRecord.passwordOmit;
+    const args = [];
+    if (!usernameOmitted) {
+      args.push({
         name: this.context.getParameterName(auth8.username),
         assignment: this.csharp.Literal.string(values2.username)
-      },
-      {
+      });
+    }
+    if (!passwordOmitted) {
+      args.push({
         name: this.context.getParameterName(auth8.password),
         assignment: this.csharp.Literal.string(values2.password)
-      }
-    ];
+      });
+    }
+    return args;
   }
   getConstructorBearerAuthArgs({ auth: auth8, values: values2 }) {
     return [
@@ -923948,7 +924654,7 @@ var SentryClient = class {
   sentry;
   constructor({ release: release2 }) {
     const isTelemetryEnabled = process.env.FERN_DISABLE_TELEMETRY !== "true";
-    const sentryDsn = "https://84f58b5e457f06999d92f11ce4b79158@o4509504076185600.ingest.us.sentry.io/4511021546602496";
+    const sentryDsn = "";
     if (isTelemetryEnabled && sentryDsn != null && sentryDsn.length > 0) {
       const sentryEnvironment = "development";
       if (sentryEnvironment == null || sentryEnvironment.length === 0) {
@@ -924509,7 +925215,7 @@ var CliContext = class {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.62.3-3-g2870783b556";
+    return "4.62.3-30-g41b622156cc";
   }
   getCliName() {
     if (false) {
@@ -944317,6 +945023,8 @@ function addReplayCommand(cli, cliContext) {
     builder: (yargs) => {
       addReplayInitCommand(yargs, cliContext);
       addReplayResolveCommand(yargs, cliContext);
+      addReplayStatusCommand(yargs, cliContext);
+      addReplayForgetCommand(yargs, cliContext);
       return yargs;
     },
     handler: () => {
@@ -944507,6 +945215,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("/");