@fern-api/replay 0.15.2 → 0.16.1

package/dist/index.cjs

@@ -554,9 +554,22 @@ function isGenerationCommit(commit) {
   const hasGenerationMarker = commit.message.startsWith("[fern-generated]") || commit.message.startsWith("[fern-replay]") || commit.message.startsWith("[fern-autoversion]") || commit.message.includes("Generated by Fern") || commit.message.includes("\u{1F916} Generated with Fern") || // Squash merge of a Fern-generated PR uses the PR title as commit message.
   // The default PR title is "SDK Generation" (from GithubStep's commitMessage default).
   // GitHub appends "(#N)" for the PR number, e.g. "SDK Generation (#70)".
-  commit.message.startsWith("SDK Generation");
+  commit.message.startsWith("SDK Generation") || // Merge commit (GitHub's "Create a merge commit" option) of a fern-bot
+  // regen PR. First-parent walking lands on this commit, not on the
+  // generation commit on the side branch, so the classifier must treat
+  // it as a generation boundary. GitHub's default subject is
+  // "Merge pull request #N from <owner>/<branch>"; fern-bot branches are
+  // named "<owner>/fern-bot/<...>".
+  /^Merge pull request #\d+ from [^/]+\/fern-bot\//.test(commit.message);
   return isBotAuthor || hasGenerationMarker;
 }
+function isGenerationBoundary(commit) {
+  const isFernSupport = FERN_SUPPORT_NAMES.includes(commit.authorName);
+  const isBotAuthor = !isFernSupport && (commit.authorLogin === FERN_BOT_LOGIN || commit.authorEmail === FERN_BOT_EMAIL || commit.authorName === FERN_BOT_NAME);
+  const isAutoversion = commit.message.startsWith("[fern-autoversion]");
+  const hasBoundaryMarker = commit.message.startsWith("[fern-generated]") || commit.message.startsWith("[fern-replay]") || commit.message.includes("Generated by Fern") || commit.message.includes("\u{1F916} Generated with Fern") || commit.message.startsWith("SDK Generation");
+  return isBotAuthor && !isAutoversion || hasBoundaryMarker;
+}
 function isReplayCommit(commit) {
   return commit.message.startsWith("[fern-replay]");
 }
@@ -575,6 +588,7 @@ function parseRevertedMessage(subject) {
 // src/LockfileManager.ts
 var import_node_fs = require("fs");
 var import_node_path = require("path");
+var import_minimatch = require("minimatch");
 var import_yaml = require("yaml");
 var LOCKFILE_HEADER = "# DO NOT EDIT MANUALLY - Managed by Fern Replay\n";
 var LockfileNotFoundError = class extends Error {
@@ -586,10 +600,23 @@ var LockfileNotFoundError = class extends Error {
 var LockfileManager = class {
   outputDir;
   lock = null;
+  fernignorePatterns = [];
   warnings = [];
   constructor(outputDir) {
     this.outputDir = outputDir;
   }
+  /**
+   * Inform the lockfile of the customer's `.fernignore` patterns so that
+   * `save()` can suppress its "Patch X removed from lockfile" warning when
+   * every file in the stripped patch is already `.fernignore`-protected.
+   * The strip itself still happens (credentials never persist); only the
+   * customer-visible warning is suppressed in that case, because the
+   * protected files survive the generator wipe regardless of whether the
+   * lockfile tracks them, so there's nothing for the customer to action.
+   */
+  setFernignorePatterns(patterns) {
+    this.fernignorePatterns = patterns;
+  }
   get lockfilePath() {
     return (0, import_node_path.join)(this.outputDir, ".fern", "replay.lock");
   }
@@ -658,9 +685,14 @@ var LockfileManager = class {
         if (sensitiveFiles.length > 0) {
           reasons.push(`sensitive files: ${sensitiveFiles.join(", ")}`);
         }
-        this.warnings.push(
-          `Patch ${patch.id} removed from lockfile: ${reasons.join("; ")}. This prevents credential exposure in committed lockfiles.`
+        const allProtected = patch.files.length > 0 && patch.files.every(
+          (f) => this.fernignorePatterns.some((p) => f === p || (0, import_minimatch.minimatch)(f, p))
         );
+        if (!allProtected) {
+          this.warnings.push(
+            `Patch ${patch.id} removed from lockfile: ${reasons.join("; ")}. This prevents credential exposure in committed lockfiles.`
+          );
+        }
       } else {
         cleanPatches.push(patch);
       }
@@ -884,8 +916,48 @@ var ReplayDetector = class {
     this.lockManager = lockManager;
     this.sdkOutputDir = sdkOutputDir;
   }
+  /**
+   * Derive the previous-generation SHA from git history instead of trusting
+   * `lock.current_generation`.
+   *
+   * Walks `git log HEAD --first-parent` and returns the SHA of the most recent
+   * commit that `isGenerationBoundary` classifies as a customization-baseline
+   * boundary, or null if no such commit is reachable from HEAD on the mainline.
+   *
+   * `isGenerationBoundary` is intentionally narrower than `isGenerationCommit`:
+   * it excludes `[fern-autoversion]` (lightweight bumps that don't reset the
+   * baseline) and the GitHub merge-commit subject for fern-bot regen PRs
+   * (which sits on first-parent but where the customer fix-up commits live
+   * on second-parent — stopping at the merge would hide them).
+   *
+   * See docs/adr/0001-derived-scan-boundary.md.
+   */
+  async findPreviousGenerationFromHistory() {
+    let log;
+    try {
+      log = await this.git.exec([
+        "log",
+        "--first-parent",
+        "--format=%H%x00%an%x00%ae%x00%s",
+        "HEAD"
+      ]);
+    } catch {
+      return null;
+    }
+    for (const commit of this.parseGitLog(log)) {
+      if (isGenerationBoundary(commit)) {
+        return commit.sha;
+      }
+    }
+    return null;
+  }
   async detectNewPatches() {
     const lock = this.lockManager.read();
+    const derivedSha = await this.findPreviousGenerationFromHistory();
+    if (derivedSha !== null) {
+      const derivedRecord = await this.synthesizeGenerationRecord(derivedSha);
+      return this.detectPatchesInRange(derivedSha, derivedRecord, lock);
+    }
     const lastGen = this.getLastGeneration(lock);
     if (!lastGen) {
       return { patches: [], revertedPatchIds: [] };
@@ -893,7 +965,7 @@ var ReplayDetector = class {
     const exists = await this.git.commitExists(lastGen.commit_sha);
     if (!exists) {
       this.warnings.push(
-        `Generation commit ${lastGen.commit_sha.slice(0, 7)} not found in git history. Falling back to alternate detection.`
+        `Generation commit ${lastGen.commit_sha.slice(0, 7)} not found in git history. Falling back to tree-diff detection (likely a shallow clone).`
       );
       return this.detectPatchesViaTreeDiff(
         lastGen,
@@ -901,44 +973,8 @@ var ReplayDetector = class {
         true
       );
     }
-    const isAncestor = await this.git.isAncestor(lastGen.commit_sha, "HEAD");
-    if (!isAncestor) {
-      return this.detectPatchesViaMergeBase(lastGen, lock);
-    }
     return this.detectPatchesInRange(lastGen.commit_sha, lastGen, lock);
   }
-  /**
-   * Non-linear-history detection via `merge-base(prevGen, HEAD)`.
-   *
-   * After a squash-merge of a Fern-bot PR, `lastGen.commit_sha` (the previous
-   * `[fern-generated]`) is orphaned but still in git's object database. The
-   * merge-base is the commit on main from which the bot's branch was created —
-   * a reachable ancestor of HEAD. Walking that range and classifying each
-   * commit via `isGenerationCommit` mirrors the linear path and eliminates
-   * the bug class where pipeline-driven changes (autoversion, replay,
-   * generation) get bundled as customer customizations.
-   *
-   * Falls through to the legacy composite path when no common ancestor exists
-   * (truly disjoint history — orphan branches with no shared root).
-   */
-  async detectPatchesViaMergeBase(lastGen, lock) {
-    let mergeBase = "";
-    try {
-      mergeBase = (await this.git.exec(["merge-base", lastGen.commit_sha, "HEAD"])).trim();
-    } catch {
-    }
-    if (!mergeBase) {
-      this.warnings.push(
-        `No common ancestor between previous generation ${lastGen.commit_sha.slice(0, 7)} and HEAD. Falling back to composite tree-diff detection.`
-      );
-      return this.detectPatchesViaTreeDiff(
-        lastGen,
-        /* commitKnownMissing */
-        false
-      );
-    }
-    return this.detectPatchesInRange(mergeBase, lastGen, lock);
-  }
   /**
    * Walk `${rangeStart}..HEAD`, classify each commit, emit one
    * `StoredPatch` per customer commit. Body shared by the linear path
@@ -1374,6 +1410,26 @@ var ReplayDetector = class {
   getLastGeneration(lock) {
     return lock.generations.find((g) => g.commit_sha === lock.current_generation);
   }
+  /**
+   * Build a transient `GenerationRecord` from a SHA derived by walking git
+   * history. Only `commit_sha` (and `tree_hash` when needed downstream) is
+   * load-bearing here; the rest are filled with defensible placeholders.
+   * This record is consumed by `detectPatchesInRange` and is never persisted.
+   */
+  async synthesizeGenerationRecord(sha) {
+    let tree_hash = "";
+    try {
+      tree_hash = await this.git.getTreeHash(sha);
+    } catch {
+    }
+    return {
+      commit_sha: sha,
+      tree_hash,
+      timestamp: (/* @__PURE__ */ new Date(0)).toISOString(),
+      cli_version: "",
+      generator_versions: {}
+    };
+  }
 };
 
 // src/ThreeWayMerge.ts
@@ -1519,7 +1575,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_minimatch = require("minimatch");
+var import_minimatch2 = require("minimatch");
 
 // src/accumulator/MergeAccumulator.ts
 var MergeAccumulator = class {
@@ -2235,13 +2291,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_minimatch.minimatch)(file, pattern)));
+    return patch.files.some((file) => config.exclude.some((pattern) => (0, import_minimatch2.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_minimatch.minimatch)(filePath, move.from) || filePath === move.from) {
+        if ((0, import_minimatch2.minimatch)(filePath, move.from) || filePath === move.from) {
           if (filePath === move.from) {
             return move.to;
           }
@@ -2513,8 +2569,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
       tree_hash: treeHash,
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       cli_version: options?.cliVersion ?? "unknown",
-      generator_versions: options?.generatorVersions ?? {},
-      base_branch_head: options?.baseBranchHead
+      generator_versions: options?.generatorVersions ?? {}
     };
   }
   async stageAll() {
@@ -2533,7 +2588,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_minimatch3 = require("minimatch");
+var import_minimatch4 = require("minimatch");
 init_GitClient();
 
 // src/PatchRegionDiff.ts
@@ -2644,12 +2699,23 @@ async function computePerPatchDiff(patch, getCurrentGenContent, getWorkingTreeCo
       unlocatableFiles.push(file);
       continue;
     }
-    const locInCurrentGen = locInCurrentGenRaw.map(
-      (l) => resolveSpan(l, currentGenLines, "old")
-    );
-    const locInWorkingTree = locInWorkingTreeRaw.map(
-      (l) => resolveSpan(l, workingTreeLines, "new")
-    );
+    const locInCurrentGen = [];
+    const locInWorkingTree = [];
+    let spanResolutionFailed = false;
+    for (let i = 0; i < locInCurrentGenRaw.length; i++) {
+      const cg = resolveSpan(locInCurrentGenRaw[i], currentGenLines, "old");
+      const wt = resolveSpan(locInWorkingTreeRaw[i], workingTreeLines, "new");
+      if (cg === null || wt === null) {
+        spanResolutionFailed = true;
+        break;
+      }
+      locInCurrentGen.push(cg);
+      locInWorkingTree.push(wt);
+    }
+    if (spanResolutionFailed) {
+      unlocatableFiles.push(file);
+      continue;
+    }
     const overlay = overlayRegions(
       currentGenLines,
       locInCurrentGen,
@@ -2711,11 +2777,11 @@ function resolveSpan(loc, oursLines, prefer) {
   if (prefer === "old") {
     if (oldFits) return { ...loc, oursSpan: hunk.oldCount };
     if (newFits) return { ...loc, oursSpan: hunk.newCount };
-  } else {
-    if (newFits) return { ...loc, oursSpan: hunk.newCount };
-    if (oldFits) return { ...loc, oursSpan: hunk.oldCount };
+    return loc;
   }
-  return loc;
+  if (newFits) return { ...loc, oursSpan: hunk.newCount };
+  if (oldFits) return { ...loc, oursSpan: hunk.oldCount };
+  return null;
 }
 function sequenceMatches(needle, haystack, offset) {
   if (offset + needle.length > haystack.length) return false;
@@ -2829,7 +2895,7 @@ function synthesizeDeleteFileDiff(file, content) {
 }
 
 // src/classifier/FileOwnership.ts
-var import_minimatch2 = require("minimatch");
+var import_minimatch3 = require("minimatch");
 var FileOwnership = class {
   constructor(git) {
     this.git = git;
@@ -2853,7 +2919,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_minimatch2.minimatch)(file, p))) return true;
+    if (fernignorePatterns.some((p) => file === p || (0, import_minimatch3.minimatch)(file, p))) return true;
     if (fileIsCreationInPatchContent(patch.patch_content, originalFileName ?? file)) {
       return true;
     }
@@ -2901,7 +2967,6 @@ var FirstGenerationFlow = class {
         flow: "first-generation",
         previousGenerationSha: null,
         currentGenerationSha: headSha,
-        baseBranchHead: options.baseBranchHead ?? null,
         _prepared: {
           kind: "terminal",
           flow: "first-generation",
@@ -2911,8 +2976,7 @@ var FirstGenerationFlow = class {
     }
     const commitOpts = options ? {
       cliVersion: options.cliVersion ?? "unknown",
-      generatorVersions: options.generatorVersions ?? {},
-      baseBranchHead: options.baseBranchHead
+      generatorVersions: options.generatorVersions ?? {}
     } : void 0;
     await this.service.committer.commitGeneration("Initial SDK generation", commitOpts);
     const genRecord = await this.service.committer.createGenerationRecord(commitOpts);
@@ -2921,7 +2985,6 @@ var FirstGenerationFlow = class {
       flow: "first-generation",
       previousGenerationSha: null,
       currentGenerationSha: genRecord.commit_sha,
-      baseBranchHead: options?.baseBranchHead ?? null,
       _prepared: {
         kind: "active",
         flow: "first-generation",
@@ -2935,6 +2998,7 @@ var FirstGenerationFlow = class {
     };
   }
   async apply(_prep) {
+    this.service.lockManager.setFernignorePatterns(this.service.readFernignorePatterns());
     this.service.lockManager.save();
     return firstGenerationReport();
   }
@@ -2958,8 +3022,7 @@ var SkipApplicationFlow = class {
   async prepare(options) {
     const commitOpts = options ? {
       cliVersion: options.cliVersion ?? "unknown",
-      generatorVersions: options.generatorVersions ?? {},
-      baseBranchHead: options.baseBranchHead
+      generatorVersions: options.generatorVersions ?? {}
     } : void 0;
     await this.service.committer.commitGeneration("Update SDK (replay skipped)", commitOpts);
     await this.service.cleanupStaleConflictMarkers();
@@ -2981,7 +3044,6 @@ var SkipApplicationFlow = class {
       flow: "skip-application",
       previousGenerationSha,
       currentGenerationSha: genRecord.commit_sha,
-      baseBranchHead: options?.baseBranchHead ?? null,
       _prepared: {
         kind: "active",
         flow: "skip-application",
@@ -2995,6 +3057,7 @@ var SkipApplicationFlow = class {
     };
   }
   async apply(_prep, options) {
+    this.service.lockManager.setFernignorePatterns(this.service.readFernignorePatterns());
     this.service.lockManager.save();
     const credentialWarnings = [...this.service.lockManager.warnings];
     if (!options?.stageOnly) {
@@ -3042,7 +3105,6 @@ var NoPatchesFlow = class {
         flow: "no-patches",
         previousGenerationSha,
         currentGenerationSha: headSha,
-        baseBranchHead: options.baseBranchHead ?? null,
         _prepared: {
           kind: "terminal",
           flow: "no-patches",
@@ -3074,8 +3136,7 @@ var NoPatchesFlow = class {
     }
     const commitOpts = options ? {
       cliVersion: options.cliVersion ?? "unknown",
-      generatorVersions: options.generatorVersions ?? {},
-      baseBranchHead: options.baseBranchHead
+      generatorVersions: options.generatorVersions ?? {}
     } : void 0;
     await this.service.committer.commitGeneration("Update SDK", commitOpts);
     await this.service.cleanupStaleConflictMarkers();
@@ -3085,7 +3146,6 @@ var NoPatchesFlow = class {
       flow: "no-patches",
       previousGenerationSha,
       currentGenerationSha: genRecord.commit_sha,
-      baseBranchHead: options?.baseBranchHead ?? null,
       _prepared: {
         kind: "active",
         flow: "no-patches",
@@ -3121,6 +3181,7 @@ var NoPatchesFlow = class {
         this.service.lockManager.addPatch(patch);
       }
     }
+    this.service.lockManager.setFernignorePatterns(this.service.readFernignorePatterns());
     this.service.lockManager.save();
     this.service.warnings.push(...this.service.lockManager.warnings);
     if (newPatches.length > 0) {
@@ -3175,7 +3236,6 @@ var NormalRegenerationFlow = class {
         flow: "normal-regeneration",
         previousGenerationSha,
         currentGenerationSha: headSha,
-        baseBranchHead: options.baseBranchHead ?? null,
         _prepared: {
           kind: "terminal",
           flow: "normal-regeneration",
@@ -3193,14 +3253,16 @@ var NormalRegenerationFlow = class {
     existingPatches = this.service.lockManager.getPatches();
     const seenHashes = /* @__PURE__ */ new Map();
     for (const p of existingPatches) {
-      const priorPatchId = seenHashes.get(p.content_hash);
-      if (priorPatchId !== void 0) {
-        this.service.lockManager.removePatch(p.id);
-        this.service.warnings.push(
-          `Consolidated patch ${p.id} (commit ${(p.original_commit || "<missing>").slice(0, 7)}) into prior patch ${priorPatchId}: byte-identical patch_content. Per-commit attribution preserved in git log; lockfile collapsed to avoid duplicate-apply corruption on next regen.`
-        );
-      } else {
-        seenHashes.set(p.content_hash, p.id);
+      if (!p.original_commit || p.original_commit === "") {
+        const priorPatchId = seenHashes.get(p.content_hash);
+        if (priorPatchId !== void 0) {
+          this.service.lockManager.removePatch(p.id);
+          this.service.warnings.push(
+            `Consolidated patch ${p.id} into prior patch ${priorPatchId}: byte-identical patch_content. Lockfile collapsed to avoid duplicate-apply corruption on next regen.`
+          );
+        } else {
+          seenHashes.set(p.content_hash, p.id);
+        }
       }
     }
     existingPatches = this.service.lockManager.getPatches();
@@ -3229,8 +3291,7 @@ var NormalRegenerationFlow = class {
     const allPatches = [...existingPatches, ...newPatches];
     const commitOpts = options ? {
       cliVersion: options.cliVersion ?? "unknown",
-      generatorVersions: options.generatorVersions ?? {},
-      baseBranchHead: options.baseBranchHead
+      generatorVersions: options.generatorVersions ?? {}
     } : void 0;
     await this.service.committer.commitGeneration("Update SDK", commitOpts);
     await this.service.cleanupStaleConflictMarkers();
@@ -3240,7 +3301,6 @@ var NormalRegenerationFlow = class {
       flow: "normal-regeneration",
       previousGenerationSha,
       currentGenerationSha: genRecord.commit_sha,
-      baseBranchHead: options?.baseBranchHead ?? null,
       _prepared: {
         kind: "active",
         flow: "normal-regeneration",
@@ -3284,6 +3344,7 @@ var NormalRegenerationFlow = class {
         }
       }
     }
+    this.service.lockManager.setFernignorePatterns(this.service.readFernignorePatterns());
     this.service.lockManager.save();
     this.service.warnings.push(...this.service.lockManager.warnings);
     if (options?.stageOnly) {
@@ -3433,68 +3494,6 @@ var ReplayService = class {
     const prep = await this.prepareReplay(options);
     return this.applyPreparedReplay(prep, options);
   }
-  /**
-   * Sync the lockfile after a divergent PR was squash-merged.
-   * Call this BEFORE runReplay() when the CLI detects a merged divergent PR.
-   *
-   * After updating the generation record, re-detects customer patches via
-   * tree diff between the generation tag (pure generation tree) and HEAD
-   * (which includes customer customizations after squash merge). This ensures
-   * patches survive the squash merge → regenerate cycle even when the lockfile
-   * was restored from the base branch during conflict PR creation.
-   */
-  async syncFromDivergentMerge(generationCommitSha, options) {
-    const treeHash = await this.git.getTreeHash(generationCommitSha);
-    const timestamp = (await this.git.exec(["log", "-1", "--format=%aI", generationCommitSha])).trim();
-    const record = {
-      commit_sha: generationCommitSha,
-      tree_hash: treeHash,
-      timestamp,
-      cli_version: options?.cliVersion ?? "unknown",
-      generator_versions: options?.generatorVersions ?? {},
-      base_branch_head: options?.baseBranchHead
-    };
-    let resolvedPatches;
-    if (!this.lockManager.exists()) {
-      this.lockManager.initializeInMemory(record);
-    } else {
-      this.lockManager.read();
-      const unresolvedPatches = [
-        ...this.lockManager.getUnresolvedPatches(),
-        ...this.lockManager.getResolvingPatches()
-      ];
-      resolvedPatches = this.lockManager.getPatches().filter((p) => p.status == null);
-      this.lockManager.addGeneration(record);
-      this.lockManager.clearPatches();
-      for (const patch of unresolvedPatches) {
-        this.lockManager.addPatch(patch);
-      }
-    }
-    try {
-      const { patches: redetectedPatches } = await this.detector.detectNewPatches();
-      if (redetectedPatches.length > 0) {
-        const redetectedFiles = new Set(redetectedPatches.flatMap((p) => p.files));
-        const currentPatches = this.lockManager.getPatches();
-        for (const patch of currentPatches) {
-          if (patch.status != null && patch.files.some((f) => redetectedFiles.has(f))) {
-            this.lockManager.removePatch(patch.id);
-          }
-        }
-        for (const patch of redetectedPatches) {
-          this.lockManager.addPatch(patch);
-        }
-      }
-    } catch (error) {
-      for (const patch of resolvedPatches ?? []) {
-        this.lockManager.addPatch(patch);
-      }
-      this.detector.warnings.push(
-        `Patch re-detection failed after divergent merge sync. ${(resolvedPatches ?? []).length} previously resolved patch(es) preserved. Error: ${error instanceof Error ? error.message : String(error)}`
-      );
-    }
-    this.lockManager.save();
-    this.detector.warnings.push(...this.lockManager.warnings);
-  }
   determineFlow() {
     try {
       const lock = this.lockManager.read();
@@ -3579,7 +3578,7 @@ var ReplayService = class {
           )
         );
         const hasProtectedFiles = patch.files.some(
-          (file) => file === ".fernignore" || fernignorePatterns.some((p) => file === p || (0, import_minimatch3.minimatch)(file, p))
+          (file) => file === ".fernignore" || fernignorePatterns.some((p) => file === p || (0, import_minimatch4.minimatch)(file, p))
         );
         const allUserOwned = isUserOwnedPerFile.every(Boolean);
         if (allUserOwned && patch.files.length > 0) {
@@ -4019,7 +4018,7 @@ var ReplayService = class {
             );
             if (snapHasStaleMarkers) continue;
             const isProtectedSnap = patch.files.some(
-              (file) => file === ".fernignore" || fernignorePatterns.some((p) => file === p || (0, import_minimatch3.minimatch)(file, p))
+              (file) => file === ".fernignore" || fernignorePatterns.some((p) => file === p || (0, import_minimatch4.minimatch)(file, p))
             );
             if (isProtectedSnap) continue;
             const snapHash = this.detector.computeContentHash(snapshotDiff);
@@ -4039,6 +4038,11 @@ var ReplayService = class {
             (files) => this.git.exec(["diff", currentGen, "HEAD", "--", ...files]).catch(() => null)
           );
           if (ppResult === null) continue;
+          if (ppResult.hadFallback) {
+            this.warnings.push(
+              `Patch ${patch.id}: couldn't fully isolate ${ppResult.fallbackFiles.join(", ")} \u2014 customization preserved, attribution may have merged with another patch.`
+            );
+          }
           const diff = ppResult.diff;
           if (!diff.trim()) {
             if (await allPatchFilesUserOwned(patch)) continue;
@@ -4054,7 +4058,7 @@ var ReplayService = class {
             continue;
           }
           const isProtected = patch.files.some(
-            (file) => file === ".fernignore" || fernignorePatterns.some((p) => file === p || (0, import_minimatch3.minimatch)(file, p))
+            (file) => file === ".fernignore" || fernignorePatterns.some((p) => file === p || (0, import_minimatch4.minimatch)(file, p))
           );
           if (isProtected) {
             continue;
@@ -4126,6 +4130,11 @@ var ReplayService = class {
           (files) => this.git.exec(["diff", currentGen, "HEAD", "--", ...files]).catch(() => null)
         );
         if (ppResult === null) continue;
+        if (ppResult.hadFallback) {
+          this.warnings.push(
+            `Patch ${patch.id}: couldn't fully isolate ${ppResult.fallbackFiles.join(", ")} \u2014 customization preserved, attribution may have merged with another patch.`
+          );
+        }
         const diff = ppResult.diff;
         if (!diff.trim()) {
           if (await allPatchFilesUserOwned(patch)) {
@@ -4213,13 +4222,14 @@ 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_minimatch3.minimatch)(file, pattern))) continue;
+      if (fernignorePatterns.some((pattern) => (0, import_minimatch4.minimatch)(file, pattern))) continue;
       try {
         await this.git.exec(["checkout", "HEAD", "--", file]);
       } catch {
       }
     }
   }
+  /** @internal Used by Flow implementations in `src/flows/`. */
   readFernignorePatterns() {
     const fernignorePath = (0, import_node_path8.join)(this.outputDir, ".fernignore");
     if (!(0, import_node_fs2.existsSync)(fernignorePath)) return [];
@@ -4302,7 +4312,7 @@ function computeCommitBuckets(results, absorbedPatchIds, patchesPassedToCommit)
 var import_node_crypto2 = require("crypto");
 var import_node_fs3 = require("fs");
 var import_node_path9 = require("path");
-var import_minimatch4 = require("minimatch");
+var import_minimatch5 = require("minimatch");
 var import_yaml2 = require("yaml");
 var FernignoreMigrator = class {
   git;
@@ -4334,7 +4344,7 @@ var FernignoreMigrator = class {
     const commitsOnly = [];
     const syntheticPatches = [];
     for (const pattern of patterns) {
-      const matchingPatch = patches.find((p) => p.files.some((f) => (0, import_minimatch4.minimatch)(f, pattern) || f === pattern));
+      const matchingPatch = patches.find((p) => p.files.some((f) => (0, import_minimatch5.minimatch)(f, pattern) || f === pattern));
       if (matchingPatch) {
         trackedByBoth.push({
           file: pattern,
@@ -4407,7 +4417,7 @@ var FernignoreMigrator = class {
       fernignoreOnly.push(...remainingFernignoreOnly);
     }
     for (const patch of patches) {
-      const hasUnprotectedFiles = patch.files.some((f) => !patterns.some((p) => (0, import_minimatch4.minimatch)(f, p) || f === p));
+      const hasUnprotectedFiles = patch.files.some((f) => !patterns.some((p) => (0, import_minimatch5.minimatch)(f, p) || f === p));
       if (hasUnprotectedFiles) {
         commitsOnly.push(patch);
       }
@@ -4419,7 +4429,7 @@ var FernignoreMigrator = class {
     const results = [];
     for (const pattern of patterns) {
       const matching = allFiles.filter(
-        (f) => (0, import_minimatch4.minimatch)(f, pattern) || f === pattern || f.startsWith(pattern + "/")
+        (f) => (0, import_minimatch5.minimatch)(f, pattern) || f === pattern || f.startsWith(pattern + "/")
       );
       results.push({ pattern, files: matching.length > 0 ? matching : [pattern] });
     }
@@ -4732,7 +4742,7 @@ function computeContentHash(patchContent) {
 }
 
 // src/commands/forget.ts
-var import_minimatch5 = require("minimatch");
+var import_minimatch6 = require("minimatch");
 function parseDiffStat(patchContent) {
   let additions = 0;
   let deletions = 0;
@@ -4762,7 +4772,7 @@ function toMatchedPatch(patch) {
 }
 function matchesPatch(patch, pattern) {
   const fileMatch = patch.files.some(
-    (file) => file === pattern || (0, import_minimatch5.minimatch)(file, pattern)
+    (file) => file === pattern || (0, import_minimatch6.minimatch)(file, pattern)
   );
   if (fileMatch) return true;
   return patch.original_message.toLowerCase().includes(pattern.toLowerCase());