@fern-api/replay 0.16.2 → 0.18.0

package/dist/index.cjs

@@ -62,6 +62,11 @@ var init_GitClient = __esm({
           proc.stderr.on("data", (data) => {
             stderr += data.toString();
           });
+          proc.on("error", (err) => {
+            reject(new Error(`git ${args.join(" ")} failed to spawn: ${err.message}`));
+          });
+          proc.stdin.on("error", () => {
+          });
           proc.on("close", (code) => {
             if (code === 0) {
               resolve2(stdout);
@@ -863,7 +868,8 @@ function isBinaryFile(filePath) {
 var INFRASTRUCTURE_FILES = /* @__PURE__ */ new Set([".fernignore"]);
 function matchesFernignorePattern(filePath, patterns) {
   if (patterns.length === 0) return false;
-  return patterns.some((p) => {
+  return patterns.some((rawPattern) => {
+    const p = rawPattern.endsWith("/") ? rawPattern.slice(0, -1) : rawPattern;
     if (filePath === p) return true;
     if ((0, import_minimatch2.minimatch)(filePath, p)) return true;
     if (!p.includes("*") && !p.includes("?") && filePath.startsWith(p + "/")) return true;
@@ -963,6 +969,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() {
@@ -974,6 +996,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,20 +1048,15 @@ var ReplayDetector = class {
         continue;
       }
       const parents = await this.git.getCommitParents(commit.sha);
-      let patchContent;
+      let filesOutput;
       try {
-        patchContent = await this.git.formatPatch(commit.sha);
+        filesOutput = await this.git.exec(["diff-tree", "--no-commit-id", "--name-only", "-r", commit.sha]);
       } catch {
         this.warnings.push(
           `Could not generate patch for commit ${commit.sha.slice(0, 7)} \u2014 it may be unreachable in a shallow clone. Skipping.`
         );
         continue;
       }
-      let contentHash = this.computeContentHash(patchContent);
-      if (lock.patches.find((p) => p.content_hash === contentHash) || forgottenHashes.has(contentHash)) {
-        continue;
-      }
-      const filesOutput = await this.git.exec(["diff-tree", "--no-commit-id", "--name-only", "-r", commit.sha]);
       const { files, sensitiveFiles, fernignoredFiles } = filterInfrastructureAndSensitiveFiles(
         filesOutput,
         this.fernignorePatterns
@@ -1049,19 +1071,31 @@ var ReplayDetector = class {
           `.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) {
+        continue;
+      }
+      const wasFiltered = sensitiveFiles.length > 0 || fernignoredFiles.length > 0;
+      const parentSha = parents[0];
+      let patchContent;
+      if (wasFiltered && parentSha) {
+        try {
+          patchContent = await this.git.exec(["diff", parentSha, commit.sha, "--", ...files]);
+        } catch {
+          continue;
+        }
+        if (!patchContent.trim()) continue;
+      } else {
+        try {
+          patchContent = await this.git.formatPatch(commit.sha);
+        } catch {
+          this.warnings.push(
+            `Could not generate patch for commit ${commit.sha.slice(0, 7)} \u2014 it may be unreachable in a shallow clone. Skipping.`
+          );
+          continue;
         }
       }
-      if (files.length === 0) {
+      const contentHash = this.computeContentHash(patchContent);
+      if (lock.patches.find((p) => p.content_hash === contentHash) || forgottenHashes.has(contentHash)) {
         continue;
       }
       const theirsSnapshot = await capturePatchSnapshot(this.git, files, commit.sha);
@@ -1728,16 +1762,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;
+          }
         }
       }
     }
@@ -1749,7 +1787,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
   };
 }
 
@@ -1932,7 +1974,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" };
@@ -1980,17 +2026,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 });
@@ -3206,6 +3254,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") {
@@ -3361,6 +3410,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") {
@@ -4280,6 +4330,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.