@fern-api/replay 0.16.1 → 0.17.4

package/dist/index.cjs

@@ -801,6 +801,7 @@ var LockfileManager = class {
 
 // src/ReplayDetector.ts
 var import_node_crypto = require("crypto");
+var import_minimatch2 = require("minimatch");
 
 // src/shared/binary.ts
 var import_node_path2 = require("path");
@@ -860,6 +861,15 @@ function isBinaryFile(filePath) {
 
 // src/ReplayDetector.ts
 var INFRASTRUCTURE_FILES = /* @__PURE__ */ new Set([".fernignore"]);
+function matchesFernignorePattern(filePath, patterns) {
+  if (patterns.length === 0) return false;
+  return patterns.some((p) => {
+    if (filePath === p) return true;
+    if ((0, import_minimatch2.minimatch)(filePath, p)) return true;
+    if (!p.includes("*") && !p.includes("?") && filePath.startsWith(p + "/")) return true;
+    return false;
+  });
+}
 function parsePatchFileHeaders(patchContent) {
   const results = [];
   let currentPath = null;
@@ -900,21 +910,25 @@ async function capturePatchSnapshot(git, files, treeish) {
   }
   return snapshot;
 }
-function filterInfrastructureAndSensitiveFiles(rawFilesOutput) {
+function filterInfrastructureAndSensitiveFiles(rawFilesOutput, fernignorePatterns) {
   const allFiles = rawFilesOutput.trim().split("\n").filter(Boolean).filter((f) => !INFRASTRUCTURE_FILES.has(f)).filter((f) => !f.startsWith(".fern/"));
   const sensitiveFiles = allFiles.filter((f) => isSensitiveFile(f));
-  const files = allFiles.filter((f) => !isSensitiveFile(f));
-  return { files, sensitiveFiles };
+  const nonSensitive = allFiles.filter((f) => !isSensitiveFile(f));
+  const fernignoredFiles = nonSensitive.filter((f) => matchesFernignorePattern(f, fernignorePatterns));
+  const files = nonSensitive.filter((f) => !matchesFernignorePattern(f, fernignorePatterns));
+  return { files, sensitiveFiles, fernignoredFiles };
 }
 var ReplayDetector = class {
   git;
   lockManager;
   sdkOutputDir;
+  fernignorePatterns;
   warnings = [];
-  constructor(git, lockManager, sdkOutputDir) {
+  constructor(git, lockManager, sdkOutputDir, fernignorePatterns = []) {
     this.git = git;
     this.lockManager = lockManager;
     this.sdkOutputDir = sdkOutputDir;
+    this.fernignorePatterns = fernignorePatterns;
   }
   /**
    * Derive the previous-generation SHA from git history instead of trusting
@@ -949,6 +963,22 @@ var ReplayDetector = class {
         return commit.sha;
       }
     }
+    let fullLog;
+    try {
+      fullLog = await this.git.exec([
+        "log",
+        "--no-merges",
+        "--format=%H%x00%an%x00%ae%x00%s",
+        "HEAD"
+      ]);
+    } catch {
+      return null;
+    }
+    for (const commit of this.parseGitLog(fullLog)) {
+      if (isGenerationBoundary(commit)) {
+        return commit.sha;
+      }
+    }
     return null;
   }
   async detectNewPatches() {
@@ -960,6 +990,11 @@ var ReplayDetector = class {
     }
     const lastGen = this.getLastGeneration(lock);
     if (!lastGen) {
+      if (lock.current_generation) {
+        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.`
+        );
+      }
       return { patches: [], revertedPatchIds: [] };
     }
     const exists = await this.git.commitExists(lastGen.commit_sha);
@@ -1021,22 +1056,30 @@ var ReplayDetector = class {
         continue;
       }
       const filesOutput = await this.git.exec(["diff-tree", "--no-commit-id", "--name-only", "-r", commit.sha]);
-      const { files, sensitiveFiles } = filterInfrastructureAndSensitiveFiles(filesOutput);
+      const { files, sensitiveFiles, fernignoredFiles } = 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.`
         );
-        if (files.length > 0) {
-          const parentSha = parents[0];
-          if (parentSha) {
-            try {
-              patchContent = await this.git.exec(["diff", parentSha, commit.sha, "--", ...files]);
-            } catch {
-              continue;
-            }
-            if (!patchContent.trim()) continue;
-            contentHash = this.computeContentHash(patchContent);
+      }
+      if (fernignoredFiles.length > 0) {
+        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.`
+        );
+      }
+      if ((sensitiveFiles.length > 0 || fernignoredFiles.length > 0) && files.length > 0) {
+        const parentSha = parents[0];
+        if (parentSha) {
+          try {
+            patchContent = await this.git.exec(["diff", parentSha, commit.sha, "--", ...files]);
+          } catch {
+            continue;
           }
+          if (!patchContent.trim()) continue;
+          contentHash = this.computeContentHash(patchContent);
         }
       }
       if (files.length === 0) {
@@ -1235,12 +1278,20 @@ var ReplayDetector = class {
       resolvedBaseGeneration = fallback;
     }
     const filesOutput = await this.git.exec(["diff", "--name-only", diffBase, "HEAD"]);
-    const { files, sensitiveFiles } = filterInfrastructureAndSensitiveFiles(filesOutput);
+    const { files, sensitiveFiles, fernignoredFiles } = filterInfrastructureAndSensitiveFiles(
+      filesOutput,
+      this.fernignorePatterns
+    );
     if (sensitiveFiles.length > 0) {
       this.warnings.push(
         `Sensitive file(s) excluded from composite patch: ${sensitiveFiles.join(", ")}. These files will not be tracked by replay.`
       );
     }
+    if (fernignoredFiles.length > 0) {
+      this.warnings.push(
+        `.fernignore-protected file(s) excluded from composite patch: ${fernignoredFiles.join(", ")}. These files are managed by .fernignore, not Replay.`
+      );
+    }
     if (files.length === 0) return { patches: [], revertedPatchIds: [] };
     const diff = await this.git.exec(["diff", diffBase, "HEAD", "--", ...files]);
     if (!diff.trim()) return { patches: [], revertedPatchIds: [] };
@@ -1323,23 +1374,31 @@ var ReplayDetector = class {
         continue;
       }
       const filesOutput = await this.git.exec(["diff-tree", "--no-commit-id", "--name-only", "-r", commit.sha]);
-      const { files, sensitiveFiles } = filterInfrastructureAndSensitiveFiles(filesOutput);
+      const { files, sensitiveFiles, fernignoredFiles } = 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.`
         );
-        if (files.length > 0) {
-          if (parents.length === 0) {
-            continue;
-          }
-          try {
-            patchContent = await this.git.exec(["diff", parents[0], commit.sha, "--", ...files]);
-          } catch {
-            continue;
-          }
-          if (!patchContent.trim()) continue;
-          contentHash = this.computeContentHash(patchContent);
+      }
+      if (fernignoredFiles.length > 0) {
+        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.`
+        );
+      }
+      if ((sensitiveFiles.length > 0 || fernignoredFiles.length > 0) && files.length > 0) {
+        if (parents.length === 0) {
+          continue;
+        }
+        try {
+          patchContent = await this.git.exec(["diff", parents[0], commit.sha, "--", ...files]);
+        } catch {
+          continue;
         }
+        if (!patchContent.trim()) continue;
+        contentHash = this.computeContentHash(patchContent);
       }
       if (files.length === 0) {
         continue;
@@ -1575,7 +1634,7 @@ function applyBothPatches(baseLines, oursPatches, theirsPatches) {
 var import_promises3 = require("fs/promises");
 var import_node_os = require("os");
 var import_node_path5 = require("path");
-var import_minimatch2 = require("minimatch");
+var import_minimatch3 = require("minimatch");
 
 // src/accumulator/MergeAccumulator.ts
 var MergeAccumulator = class {
@@ -1690,16 +1749,20 @@ async function resolveInputs(args) {
   const oursPath = (0, import_node_path3.join)(outputDir, resolvedPath);
   const ours = await (0, import_promises.readFile)(oursPath, "utf-8").catch(() => null);
   let ghostTheirs = null;
-  if (!base && ours && !renameSourcePath) {
+  let baseTreeUnreachable = false;
+  if (!base && !renameSourcePath) {
     const treeReachable = await isTreeReachable(baseGen.tree_hash);
     if (!treeReachable) {
-      const fileDiff = extractFileDiff2(patch.patch_content, filePath);
-      if (fileDiff) {
-        const { reconstructFromGhostPatch: reconstructFromGhostPatch2 } = await Promise.resolve().then(() => (init_HybridReconstruction(), HybridReconstruction_exports));
-        const result = reconstructFromGhostPatch2(fileDiff, ours);
-        if (result) {
-          base = result.base;
-          ghostTheirs = result.theirs;
+      baseTreeUnreachable = true;
+      if (ours) {
+        const fileDiff = extractFileDiff2(patch.patch_content, filePath);
+        if (fileDiff) {
+          const { reconstructFromGhostPatch: reconstructFromGhostPatch2 } = await Promise.resolve().then(() => (init_HybridReconstruction(), HybridReconstruction_exports));
+          const result = reconstructFromGhostPatch2(fileDiff, ours);
+          if (result) {
+            base = result.base;
+            ghostTheirs = result.theirs;
+          }
         }
       }
     }
@@ -1711,7 +1774,11 @@ async function resolveInputs(args) {
     ours,
     oursPath,
     renameSourcePath,
-    ghostTheirs
+    ghostTheirs,
+    // Only meaningful when ghost reconstruction did NOT recover a base; if it
+    // did, `base` is non-null and the merge proceeds normally. We still set
+    // the flag truthfully (the tree IS unreachable) so Phase 3 can decide.
+    baseTreeUnreachable
   };
 }
 
@@ -1894,7 +1961,11 @@ async function buildMergePlan(args) {
     return { kind: "new-file-only-user", theirs: effective_theirs };
   }
   if (base == null && ours != null && effective_theirs != null && !useAccumulatorAsMergeBase) {
-    return { kind: "new-file-both", theirs: effective_theirs };
+    return {
+      kind: "new-file-both",
+      theirs: effective_theirs,
+      ...inputs.baseTreeUnreachable ? { baseTreeUnreachable: true } : {}
+    };
   }
   if (effective_theirs == null) {
     return { kind: "skipped", reason: "missing-content" };
@@ -1942,17 +2013,19 @@ async function runMergeAndRecord(args) {
     const merged2 = threeWayMerge("", ours, plan.theirs);
     await (0, import_promises2.mkdir)((0, import_node_path4.dirname)(oursPath), { recursive: true });
     await (0, import_promises2.writeFile)(oursPath, merged2.content);
+    const unreachableFlag = plan.baseTreeUnreachable ? { baseTreeUnreachable: true } : {};
     if (merged2.hasConflicts) {
       return {
         file: resolvedPath,
         status: "conflict",
         conflicts: merged2.conflicts,
         conflictReason: "new-file-both",
-        conflictMetadata: metadata
+        conflictMetadata: metadata,
+        ...unreachableFlag
       };
     }
     accumulator.recordMerge(resolvedPath, merged2.content, patch.base_generation);
-    return { file: resolvedPath, status: "merged" };
+    return { file: resolvedPath, status: "merged", ...unreachableFlag };
   }
   const merged = threeWayMerge(plan.mergeBase, ours, plan.theirs);
   await (0, import_promises2.mkdir)((0, import_node_path4.dirname)(oursPath), { recursive: true });
@@ -2291,13 +2364,13 @@ var ReplayApplicator = class {
   isExcluded(patch) {
     const config = this.lockManager.getCustomizationsConfig();
     if (!config.exclude) return false;
-    return patch.files.some((file) => config.exclude.some((pattern) => (0, import_minimatch2.minimatch)(file, pattern)));
+    return patch.files.some((file) => config.exclude.some((pattern) => (0, import_minimatch3.minimatch)(file, pattern)));
   }
   async resolveFilePath(filePath, baseTreeHash, currentTreeHash) {
     const config = this.lockManager.getCustomizationsConfig();
     if (config.moves) {
       for (const move of config.moves) {
-        if ((0, import_minimatch2.minimatch)(filePath, move.from) || filePath === move.from) {
+        if ((0, import_minimatch3.minimatch)(filePath, move.from) || filePath === move.from) {
           if (filePath === move.from) {
             return move.to;
           }
@@ -2588,7 +2661,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
 var import_node_fs2 = require("fs");
 var import_promises6 = require("fs/promises");
 var import_node_path8 = require("path");
-var import_minimatch4 = require("minimatch");
+var import_minimatch5 = require("minimatch");
 init_GitClient();
 
 // src/PatchRegionDiff.ts
@@ -2895,7 +2968,7 @@ function synthesizeDeleteFileDiff(file, content) {
 }
 
 // src/classifier/FileOwnership.ts
-var import_minimatch3 = require("minimatch");
+var import_minimatch4 = require("minimatch");
 var FileOwnership = class {
   constructor(git) {
     this.git = git;
@@ -2919,7 +2992,7 @@ var FileOwnership = class {
     const { file, originalFileName, patch, currentGenSha, fernignorePatterns, warnedGens, warnings } = ctx;
     if (patch.user_owned) return true;
     if (file === ".fernignore") return true;
-    if (fernignorePatterns.some((p) => file === p || (0, import_minimatch3.minimatch)(file, p))) return true;
+    if (fernignorePatterns.some((p) => file === p || (0, import_minimatch4.minimatch)(file, p))) return true;
     if (fileIsCreationInPatchContent(patch.patch_content, originalFileName ?? file)) {
       return true;
     }
@@ -3168,6 +3241,7 @@ var NoPatchesFlow = class {
       results = await this.service.applicator.applyPatches(newPatches);
       this.service._lastApplyResults = results;
       this.service.recordDroppedContextLineWarnings(results);
+      this.service.recordUnreachableBaseWarnings(results);
       this.service.revertConflictingFiles(results);
       for (const result of results) {
         if (result.status === "conflict") {
@@ -3323,6 +3397,7 @@ var NormalRegenerationFlow = class {
     const results = await this.service.applicator.applyPatches(allPatches);
     this.service._lastApplyResults = results;
     this.service.recordDroppedContextLineWarnings(results);
+    this.service.recordUnreachableBaseWarnings(results);
     this.service.revertConflictingFiles(results);
     for (const result of results) {
       if (result.status === "conflict") {
@@ -3425,7 +3500,8 @@ var ReplayService = class {
     this.git = git;
     this.outputDir = outputDir;
     this.lockManager = new LockfileManager(outputDir);
-    this.detector = new ReplayDetector(git, this.lockManager, outputDir);
+    const fernignorePatterns = this.readFernignorePatterns();
+    this.detector = new ReplayDetector(git, this.lockManager, outputDir, fernignorePatterns);
     this.applicator = new ReplayApplicator(git, this.lockManager, outputDir);
     this.committer = new ReplayCommitter(git, outputDir);
     this.fileOwnership = new FileOwnership(git);
@@ -3445,8 +3521,60 @@ var ReplayService = class {
   async prepareReplay(options) {
     this.warnings = [];
     this.detector.warnings.length = 0;
+    this.cleanseLegacyFernignoreEntries();
     return this.selectFlow(options).prepare(options);
   }
+  /**
+   * ADR 0002 migration step. Strips `.fernignore`-matched entries from
+   * `patch.files`, `patch.theirs_snapshot` keys, and `diff --git` sections
+   * in `patch.patch_content` for every patch in the lockfile. Patches that
+   * end up with no surviving files are removed entirely.
+   *
+   * Idempotent: a second run is a no-op because the first run already
+   * matches the contract. Per-patch try/catch ensures one bad patch does
+   * not block the rest. Each affected patch emits a warning naming the
+   * stripped paths. `patch_content` is left untouched if no parseable
+   * `diff --git` headers are found (fail-safe for exotic legacy formats).
+   */
+  cleanseLegacyFernignoreEntries() {
+    const patterns = this.readFernignorePatterns();
+    if (patterns.length === 0) return;
+    if (!this.lockManager.exists()) return;
+    this.lockManager.read();
+    let lockfileMutated = false;
+    const patches = this.lockManager.getPatches();
+    for (const patch of patches) {
+      try {
+        const result = computeLegacyFernignoreCleanse(
+          patch,
+          patterns,
+          (content) => this.detector.computeContentHash(content)
+        );
+        if (result.unchanged) continue;
+        if (result.remove) {
+          this.lockManager.removePatch(patch.id);
+          this.warnings.push(
+            `Cleansed legacy patch ${patch.id}: all referenced files match .fernignore \u2014 patch removed. Customer's on-disk content for those files is preserved by .fernignore. (ADR 0002: .fernignore-protected files are not tracked by Replay.)`
+          );
+        } else {
+          this.lockManager.updatePatch(patch.id, {
+            files: result.files,
+            patch_content: result.patch_content,
+            content_hash: result.content_hash,
+            ...result.theirs_snapshot !== void 0 ? { theirs_snapshot: result.theirs_snapshot } : {}
+          });
+          this.warnings.push(
+            `Cleansed legacy patch ${patch.id}: stripped .fernignore-matched entries (${result.strippedPaths.join(", ")}). Customer's on-disk content for those files is preserved by .fernignore. (ADR 0002.)`
+          );
+        }
+        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
@@ -3578,7 +3706,7 @@ var ReplayService = class {
           )
         );
         const hasProtectedFiles = patch.files.some(
-          (file) => file === ".fernignore" || fernignorePatterns.some((p) => file === p || (0, import_minimatch4.minimatch)(file, p))
+          (file) => file === ".fernignore" || fernignorePatterns.some((p) => file === p || (0, import_minimatch5.minimatch)(file, p))
         );
         const allUserOwned = isUserOwnedPerFile.every(Boolean);
         if (allUserOwned && patch.files.length > 0) {
@@ -4018,7 +4146,7 @@ var ReplayService = class {
             );
             if (snapHasStaleMarkers) continue;
             const isProtectedSnap = patch.files.some(
-              (file) => file === ".fernignore" || fernignorePatterns.some((p) => file === p || (0, import_minimatch4.minimatch)(file, p))
+              (file) => file === ".fernignore" || fernignorePatterns.some((p) => file === p || (0, import_minimatch5.minimatch)(file, p))
             );
             if (isProtectedSnap) continue;
             const snapHash = this.detector.computeContentHash(snapshotDiff);
@@ -4058,7 +4186,7 @@ var ReplayService = class {
             continue;
           }
           const isProtected = patch.files.some(
-            (file) => file === ".fernignore" || fernignorePatterns.some((p) => file === p || (0, import_minimatch4.minimatch)(file, p))
+            (file) => file === ".fernignore" || fernignorePatterns.some((p) => file === p || (0, import_minimatch5.minimatch)(file, p))
           );
           if (isProtected) {
             continue;
@@ -4189,6 +4317,37 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
       }
     }
   }
+  /**
+   * After applyPatches(), surface a warning for each (patch × file) where a
+   * customization's BASE could not be read because the patch's
+   * base-generation tree is unreachable in this clone (shallow-clone window
+   * too small / pruned history). In that state the merge pipeline falls
+   * through to `new-file-both` and the customer's edit can be dropped with NO
+   * conflict and NO error — the INC-866 silent-loss class. This converts that
+   * silence into an explicit, actionable warning naming the file and the
+   * likely cause (insufficient clone window).
+   *
+   * Mirrors `recordDroppedContextLineWarnings`'s "surface, never silently
+   * drop" contract. De-duplicated per file path so a single insufficient
+   * window doesn't spam one warning per touched file repeatedly.
+   */
+  /** @internal Used by Flow implementations in `src/flows/`. */
+  recordUnreachableBaseWarnings(results) {
+    const warned = /* @__PURE__ */ new Set();
+    for (const result of results) {
+      if (!result.fileResults) continue;
+      for (const fr of result.fileResults) {
+        if (!fr.baseTreeUnreachable) continue;
+        if (warned.has(fr.file)) continue;
+        warned.add(fr.file);
+        const base = fr.conflictMetadata?.baseGeneration;
+        const baseRef = base ? ` (base generation ${base.slice(0, 7)})` : "";
+        this.warnings.push(
+          `${fr.file}: could not read the prior generation's version of this file${baseRef} because that generation's tree is outside the clone window (insufficient shallow-clone depth or pruned history). The customization was treated as a new file, which can drop your edits silently. Re-run with the prior generation in the clone window \u2014 e.g. \`git fetch --shallow-since=<date just before the prior [fern-generated] commit>\` or \`git fetch --unshallow\` \u2014 then re-run replay.`
+        );
+      }
+    }
+  }
   /**
    * After applyPatches(), strip conflict markers from conflicting files
    * so only clean content is committed. Keeps the Generated (OURS) side.
@@ -4222,7 +4381,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
     if (files.length === 0) return;
     const fernignorePatterns = this.readFernignorePatterns();
     for (const file of files) {
-      if (fernignorePatterns.some((pattern) => (0, import_minimatch4.minimatch)(file, pattern))) continue;
+      if (fernignorePatterns.some((pattern) => (0, import_minimatch5.minimatch)(file, pattern))) continue;
       try {
         await this.git.exec(["checkout", "HEAD", "--", file]);
       } catch {
@@ -4307,12 +4466,99 @@ function computeCommitBuckets(results, absorbedPatchIds, patchesPassedToCommit)
   }
   return { applied, unresolved, absorbed };
 }
+function computeLegacyFernignoreCleanse(patch, fernignorePatterns, computeContentHash2) {
+  const matchesFernignore = (filePath) => fernignorePatterns.some((p) => {
+    if (filePath === p) return true;
+    if ((0, import_minimatch5.minimatch)(filePath, p)) return true;
+    if (!p.includes("*") && !p.includes("?") && filePath.startsWith(p + "/")) return true;
+    return false;
+  });
+  const strippedFromFiles = patch.files.filter(matchesFernignore);
+  const survivingFiles = patch.files.filter((f) => !matchesFernignore(f));
+  let survivingSnapshot = void 0;
+  let snapshotChanged = false;
+  if (patch.theirs_snapshot) {
+    survivingSnapshot = {};
+    for (const [key, value] of Object.entries(patch.theirs_snapshot)) {
+      if (matchesFernignore(key)) {
+        snapshotChanged = true;
+      } else {
+        survivingSnapshot[key] = value;
+      }
+    }
+  }
+  const { stripped: patchContentStripped, content: newPatchContent, strippedSectionPaths } = stripFernignoreDiffSections(patch.patch_content, matchesFernignore);
+  const unchanged = strippedFromFiles.length === 0 && !snapshotChanged && !patchContentStripped;
+  if (unchanged) {
+    return {
+      unchanged: true,
+      remove: false,
+      files: patch.files,
+      patch_content: patch.patch_content,
+      content_hash: patch.content_hash,
+      theirs_snapshot: patch.theirs_snapshot,
+      strippedPaths: []
+    };
+  }
+  const strippedPaths = Array.from(/* @__PURE__ */ new Set([...strippedFromFiles, ...strippedSectionPaths]));
+  if (survivingFiles.length === 0 || newPatchContent.trim() === "") {
+    return {
+      unchanged: false,
+      remove: true,
+      files: [],
+      patch_content: "",
+      content_hash: "",
+      strippedPaths
+    };
+  }
+  const newContentHash = patchContentStripped ? computeContentHash2(newPatchContent) : patch.content_hash;
+  return {
+    unchanged: false,
+    remove: false,
+    files: survivingFiles,
+    patch_content: newPatchContent,
+    content_hash: newContentHash,
+    ...survivingSnapshot !== void 0 ? { theirs_snapshot: survivingSnapshot } : {},
+    strippedPaths
+  };
+}
+function stripFernignoreDiffSections(patchContent, matchesFernignore) {
+  const lines = patchContent.split("\n");
+  const sectionStarts = [];
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    if (line.startsWith("diff --git ")) {
+      const match = line.match(/^diff --git a\/(.+?) b\/(.+?)$/);
+      const path = match ? match[2] : null;
+      sectionStarts.push({ idx: i, path });
+    }
+  }
+  if (sectionStarts.length === 0) {
+    return { stripped: false, content: patchContent, strippedSectionPaths: [] };
+  }
+  const preamble = lines.slice(0, sectionStarts[0].idx);
+  const newLines = [...preamble];
+  const strippedSectionPaths = [];
+  let stripped = false;
+  for (let i = 0; i < sectionStarts.length; i++) {
+    const section = sectionStarts[i];
+    const next = sectionStarts[i + 1];
+    const endIdx = next ? next.idx : lines.length;
+    if (section.path !== null && matchesFernignore(section.path)) {
+      stripped = true;
+      strippedSectionPaths.push(section.path);
+      continue;
+    }
+    newLines.push(...lines.slice(section.idx, endIdx));
+  }
+  return { stripped, content: newLines.join("\n"), strippedSectionPaths };
+}
 
 // src/FernignoreMigrator.ts
 var import_node_crypto2 = require("crypto");
 var import_node_fs3 = require("fs");
 var import_node_path9 = require("path");
-var import_minimatch5 = require("minimatch");
+var import_minimatch6 = require("minimatch");
 var import_yaml2 = require("yaml");
 var FernignoreMigrator = class {
   git;
@@ -4344,7 +4590,7 @@ var FernignoreMigrator = class {
     const commitsOnly = [];
     const syntheticPatches = [];
     for (const pattern of patterns) {
-      const matchingPatch = patches.find((p) => p.files.some((f) => (0, import_minimatch5.minimatch)(f, pattern) || f === pattern));
+      const matchingPatch = patches.find((p) => p.files.some((f) => (0, import_minimatch6.minimatch)(f, pattern) || f === pattern));
       if (matchingPatch) {
         trackedByBoth.push({
           file: pattern,
@@ -4417,7 +4663,7 @@ var FernignoreMigrator = class {
       fernignoreOnly.push(...remainingFernignoreOnly);
     }
     for (const patch of patches) {
-      const hasUnprotectedFiles = patch.files.some((f) => !patterns.some((p) => (0, import_minimatch5.minimatch)(f, p) || f === p));
+      const hasUnprotectedFiles = patch.files.some((f) => !patterns.some((p) => (0, import_minimatch6.minimatch)(f, p) || f === p));
       if (hasUnprotectedFiles) {
         commitsOnly.push(patch);
       }
@@ -4429,7 +4675,7 @@ var FernignoreMigrator = class {
     const results = [];
     for (const pattern of patterns) {
       const matching = allFiles.filter(
-        (f) => (0, import_minimatch5.minimatch)(f, pattern) || f === pattern || f.startsWith(pattern + "/")
+        (f) => (0, import_minimatch6.minimatch)(f, pattern) || f === pattern || f.startsWith(pattern + "/")
       );
       results.push({ pattern, files: matching.length > 0 ? matching : [pattern] });
     }
@@ -4742,7 +4988,7 @@ function computeContentHash(patchContent) {
 }
 
 // src/commands/forget.ts
-var import_minimatch6 = require("minimatch");
+var import_minimatch7 = require("minimatch");
 function parseDiffStat(patchContent) {
   let additions = 0;
   let deletions = 0;
@@ -4772,7 +5018,7 @@ function toMatchedPatch(patch) {
 }
 function matchesPatch(patch, pattern) {
   const fileMatch = patch.files.some(
-    (file) => file === pattern || (0, import_minimatch6.minimatch)(file, pattern)
+    (file) => file === pattern || (0, import_minimatch7.minimatch)(file, pattern)
   );
   if (fileMatch) return true;
   return patch.original_message.toLowerCase().includes(pattern.toLowerCase());