@fern-api/replay 0.16.0 → 0.16.1

package/dist/index.d.cts

@@ -214,8 +214,19 @@ declare class LockfileNotFoundError extends Error {
 declare class LockfileManager {
     private outputDir;
     private lock;
+    private fernignorePatterns;
     readonly warnings: string[];
     constructor(outputDir: string);
+    /**
+     * 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: string[]): void;
     get lockfilePath(): string;
     get customizationsPath(): string;
     exists(): boolean;
@@ -874,7 +885,8 @@ declare class ReplayService {
      */
     /** @internal Used by Flow implementations in `src/flows/`. */
     cleanupStaleConflictMarkers(): Promise<void>;
-    private readFernignorePatterns;
+    /** @internal Used by Flow implementations in `src/flows/`. */
+    readFernignorePatterns(): string[];
     /** @internal Used by Flow implementations in `src/flows/`. */
     buildReport(flow: "first-generation" | "no-patches" | "normal-regeneration" | "skip-application", patches: StoredPatch[], results: ReplayResult[], options?: ReplayOptions, warnings?: string[], rebaseCounts?: {
         absorbed: number;

package/dist/index.d.ts

@@ -214,8 +214,19 @@ declare class LockfileNotFoundError extends Error {
 declare class LockfileManager {
     private outputDir;
     private lock;
+    private fernignorePatterns;
     readonly warnings: string[];
     constructor(outputDir: string);
+    /**
+     * 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: string[]): void;
     get lockfilePath(): string;
     get customizationsPath(): string;
     exists(): boolean;
@@ -874,7 +885,8 @@ declare class ReplayService {
      */
     /** @internal Used by Flow implementations in `src/flows/`. */
     cleanupStaleConflictMarkers(): Promise<void>;
-    private readFernignorePatterns;
+    /** @internal Used by Flow implementations in `src/flows/`. */
+    readFernignorePatterns(): string[];
     /** @internal Used by Flow implementations in `src/flows/`. */
     buildReport(flow: "first-generation" | "no-patches" | "normal-regeneration" | "skip-application", patches: StoredPatch[], results: ReplayResult[], options?: ReplayOptions, warnings?: string[], rebaseCounts?: {
         absorbed: number;

package/dist/index.js

@@ -533,6 +533,7 @@ function parseRevertedMessage(subject) {
 // src/LockfileManager.ts
 import { readFileSync, writeFileSync, existsSync, mkdirSync, renameSync } from "fs";
 import { join, dirname } from "path";
+import { minimatch } from "minimatch";
 import { stringify, parse } from "yaml";
 var LOCKFILE_HEADER = "# DO NOT EDIT MANUALLY - Managed by Fern Replay\n";
 var LockfileNotFoundError = class extends Error {
@@ -544,10 +545,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 join(this.outputDir, ".fern", "replay.lock");
   }
@@ -616,9 +630,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 || 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);
       }
@@ -1501,7 +1520,7 @@ function applyBothPatches(baseLines, oursPatches, theirsPatches) {
 import { mkdir as mkdir2, mkdtemp, readFile as readFile2, rm, unlink, writeFile as writeFile2 } from "fs/promises";
 import { tmpdir } from "os";
 import { dirname as dirname3, join as join3 } from "path";
-import { minimatch } from "minimatch";
+import { minimatch as minimatch2 } from "minimatch";
 
 // src/accumulator/MergeAccumulator.ts
 var MergeAccumulator = class {
@@ -2217,13 +2236,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) => minimatch(file, pattern)));
+    return patch.files.some((file) => config.exclude.some((pattern) => minimatch2(file, pattern)));
   }
   async resolveFilePath(filePath, baseTreeHash, currentTreeHash) {
     const config = this.lockManager.getCustomizationsConfig();
     if (config.moves) {
       for (const move of config.moves) {
-        if (minimatch(filePath, move.from) || filePath === move.from) {
+        if (minimatch2(filePath, move.from) || filePath === move.from) {
           if (filePath === move.from) {
             return move.to;
           }
@@ -2514,7 +2533,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
 import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
 import { readFile as readFileAsync } from "fs/promises";
 import { join as join6 } from "path";
-import { minimatch as minimatch3 } from "minimatch";
+import { minimatch as minimatch4 } from "minimatch";
 init_GitClient();
 
 // src/PatchRegionDiff.ts
@@ -2625,12 +2644,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,
@@ -2692,11 +2722,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;
@@ -2810,7 +2840,7 @@ function synthesizeDeleteFileDiff(file, content) {
 }
 
 // src/classifier/FileOwnership.ts
-import { minimatch as minimatch2 } from "minimatch";
+import { minimatch as minimatch3 } from "minimatch";
 var FileOwnership = class {
   constructor(git) {
     this.git = git;
@@ -2834,7 +2864,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 || minimatch2(file, p))) return true;
+    if (fernignorePatterns.some((p) => file === p || minimatch3(file, p))) return true;
     if (fileIsCreationInPatchContent(patch.patch_content, originalFileName ?? file)) {
       return true;
     }
@@ -2913,6 +2943,7 @@ var FirstGenerationFlow = class {
     };
   }
   async apply(_prep) {
+    this.service.lockManager.setFernignorePatterns(this.service.readFernignorePatterns());
     this.service.lockManager.save();
     return firstGenerationReport();
   }
@@ -2971,6 +3002,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) {
@@ -3094,6 +3126,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) {
@@ -3256,6 +3289,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) {
@@ -3489,7 +3523,7 @@ var ReplayService = class {
           )
         );
         const hasProtectedFiles = patch.files.some(
-          (file) => file === ".fernignore" || fernignorePatterns.some((p) => file === p || minimatch3(file, p))
+          (file) => file === ".fernignore" || fernignorePatterns.some((p) => file === p || minimatch4(file, p))
         );
         const allUserOwned = isUserOwnedPerFile.every(Boolean);
         if (allUserOwned && patch.files.length > 0) {
@@ -3929,7 +3963,7 @@ var ReplayService = class {
             );
             if (snapHasStaleMarkers) continue;
             const isProtectedSnap = patch.files.some(
-              (file) => file === ".fernignore" || fernignorePatterns.some((p) => file === p || minimatch3(file, p))
+              (file) => file === ".fernignore" || fernignorePatterns.some((p) => file === p || minimatch4(file, p))
             );
             if (isProtectedSnap) continue;
             const snapHash = this.detector.computeContentHash(snapshotDiff);
@@ -3949,6 +3983,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;
@@ -3964,7 +4003,7 @@ var ReplayService = class {
             continue;
           }
           const isProtected = patch.files.some(
-            (file) => file === ".fernignore" || fernignorePatterns.some((p) => file === p || minimatch3(file, p))
+            (file) => file === ".fernignore" || fernignorePatterns.some((p) => file === p || minimatch4(file, p))
           );
           if (isProtected) {
             continue;
@@ -4036,6 +4075,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)) {
@@ -4123,13 +4167,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) => minimatch3(file, pattern))) continue;
+      if (fernignorePatterns.some((pattern) => minimatch4(file, pattern))) continue;
       try {
         await this.git.exec(["checkout", "HEAD", "--", file]);
       } catch {
       }
     }
   }
+  /** @internal Used by Flow implementations in `src/flows/`. */
   readFernignorePatterns() {
     const fernignorePath = join6(this.outputDir, ".fernignore");
     if (!existsSync2(fernignorePath)) return [];
@@ -4212,7 +4257,7 @@ function computeCommitBuckets(results, absorbedPatchIds, patchesPassedToCommit)
 import { createHash as createHash2 } from "crypto";
 import { existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync3, statSync, writeFileSync as writeFileSync3 } from "fs";
 import { dirname as dirname5, join as join7 } from "path";
-import { minimatch as minimatch4 } from "minimatch";
+import { minimatch as minimatch5 } from "minimatch";
 import { parse as parse2, stringify as stringify2 } from "yaml";
 var FernignoreMigrator = class {
   git;
@@ -4244,7 +4289,7 @@ var FernignoreMigrator = class {
     const commitsOnly = [];
     const syntheticPatches = [];
     for (const pattern of patterns) {
-      const matchingPatch = patches.find((p) => p.files.some((f) => minimatch4(f, pattern) || f === pattern));
+      const matchingPatch = patches.find((p) => p.files.some((f) => minimatch5(f, pattern) || f === pattern));
       if (matchingPatch) {
         trackedByBoth.push({
           file: pattern,
@@ -4317,7 +4362,7 @@ var FernignoreMigrator = class {
       fernignoreOnly.push(...remainingFernignoreOnly);
     }
     for (const patch of patches) {
-      const hasUnprotectedFiles = patch.files.some((f) => !patterns.some((p) => minimatch4(f, p) || f === p));
+      const hasUnprotectedFiles = patch.files.some((f) => !patterns.some((p) => minimatch5(f, p) || f === p));
       if (hasUnprotectedFiles) {
         commitsOnly.push(patch);
       }
@@ -4329,7 +4374,7 @@ var FernignoreMigrator = class {
     const results = [];
     for (const pattern of patterns) {
       const matching = allFiles.filter(
-        (f) => minimatch4(f, pattern) || f === pattern || f.startsWith(pattern + "/")
+        (f) => minimatch5(f, pattern) || f === pattern || f.startsWith(pattern + "/")
       );
       results.push({ pattern, files: matching.length > 0 ? matching : [pattern] });
     }
@@ -4642,7 +4687,7 @@ function computeContentHash(patchContent) {
 }
 
 // src/commands/forget.ts
-import { minimatch as minimatch5 } from "minimatch";
+import { minimatch as minimatch6 } from "minimatch";
 function parseDiffStat(patchContent) {
   let additions = 0;
   let deletions = 0;
@@ -4672,7 +4717,7 @@ function toMatchedPatch(patch) {
 }
 function matchesPatch(patch, pattern) {
   const fileMatch = patch.files.some(
-    (file) => file === pattern || minimatch5(file, pattern)
+    (file) => file === pattern || minimatch6(file, pattern)
   );
   if (fileMatch) return true;
   return patch.original_message.toLowerCase().includes(pattern.toLowerCase());