@fern-api/fern-api-dev 5.23.3-662-g4952e03526c → 5.23.3-665-g0932ac24e1f

package/cli.cjs

@@ -428332,9 +428332,9 @@ var require_diff3 = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/@fern-api+replay@0.16.2/node_modules/@fern-api/replay/dist/index.cjs
+// ../../../node_modules/.pnpm/@fern-api+replay@0.18.0/node_modules/@fern-api/replay/dist/index.cjs
 var require_dist24 = __commonJS({
-  "../../../node_modules/.pnpm/@fern-api+replay@0.16.2/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
+  "../../../node_modules/.pnpm/@fern-api+replay@0.18.0/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
     "use strict";
     var __defProp4 = Object.defineProperty;
     var __getOwnPropDesc3 = Object.getOwnPropertyDescriptor;
@@ -428388,6 +428388,11 @@ var require_dist24 = __commonJS({
               proc2.stderr.on("data", (data2) => {
                 stderr += data2.toString();
               });
+              proc2.on("error", (err) => {
+                reject(new Error(`git ${args.join(" ")} failed to spawn: ${err.message}`));
+              });
+              proc2.stdin.on("error", () => {
+              });
               proc2.on("close", (code5) => {
                 if (code5 === 0) {
                   resolve22(stdout);
@@ -429171,7 +429176,8 @@ var require_dist24 = __commonJS({
     var INFRASTRUCTURE_FILES = /* @__PURE__ */ new Set([".fernignore"]);
     function matchesFernignorePattern(filePath, patterns) {
       if (patterns.length === 0) return false;
-      return patterns.some((p14) => {
+      return patterns.some((rawPattern) => {
+        const p14 = rawPattern.endsWith("/") ? rawPattern.slice(0, -1) : rawPattern;
         if (filePath === p14) return true;
         if ((0, import_minimatch22.minimatch)(filePath, p14)) return true;
         if (!p14.includes("*") && !p14.includes("?") && filePath.startsWith(p14 + "/")) return true;
@@ -429271,6 +429277,22 @@ var require_dist24 = __commonJS({
             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() {
@@ -429282,6 +429304,11 @@ var require_dist24 = __commonJS({
         }
         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 exists2 = await this.git.commitExists(lastGen.commit_sha);
@@ -429329,20 +429356,15 @@ var require_dist24 = __commonJS({
             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((p14) => p14.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
@@ -429357,19 +429379,31 @@ var require_dist24 = __commonJS({
               `.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((p14) => p14.content_hash === contentHash) || forgottenHashes.has(contentHash)) {
             continue;
           }
           const theirsSnapshot = await capturePatchSnapshot(this.git, files, commit.sha);
@@ -430028,16 +430062,20 @@ var require_dist24 = __commonJS({
       const oursPath = (0, import_node_path310.join)(outputDir, resolvedPath);
       const ours = await (0, import_promises208.readFile)(oursPath, "utf-8").catch(() => null);
       let ghostTheirs = null;
-      if (!base4 && ours && !renameSourcePath) {
+      let baseTreeUnreachable = false;
+      if (!base4 && !renameSourcePath) {
         const treeReachable = await isTreeReachable(baseGen.tree_hash);
         if (!treeReachable) {
-          const fileDiff = extractFileDiff2(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;
-              ghostTheirs = result.theirs;
+          baseTreeUnreachable = true;
+          if (ours) {
+            const fileDiff = extractFileDiff2(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;
+                ghostTheirs = result.theirs;
+              }
             }
           }
         }
@@ -430049,7 +430087,11 @@ var require_dist24 = __commonJS({
         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
       };
     }
     var CONFLICT_OPENER = "<<<<<<< Generated";
@@ -430228,7 +430270,11 @@ var require_dist24 = __commonJS({
         return { kind: "new-file-only-user", theirs: effective_theirs };
       }
       if (base4 == 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" };
@@ -430274,17 +430320,19 @@ var require_dist24 = __commonJS({
         const merged2 = threeWayMerge("", ours, plan.theirs);
         await (0, import_promises210.mkdir)((0, import_node_path44.dirname)(oursPath), { recursive: true });
         await (0, import_promises210.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, patch5.base_generation);
-        return { file: resolvedPath, status: "merged" };
+        return { file: resolvedPath, status: "merged", ...unreachableFlag };
       }
       const merged = threeWayMerge(plan.mergeBase, ours, plan.theirs);
       await (0, import_promises210.mkdir)((0, import_node_path44.dirname)(oursPath), { recursive: true });
@@ -431484,6 +431532,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
           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") {
@@ -431637,6 +431686,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         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") {
@@ -432554,6 +432604,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 warned2 = /* @__PURE__ */ new Set();
+        for (const result of results) {
+          if (!result.fileResults) continue;
+          for (const fr9 of result.fileResults) {
+            if (!fr9.baseTreeUnreachable) continue;
+            if (warned2.has(fr9.file)) continue;
+            warned2.add(fr9.file);
+            const base4 = fr9.conflictMetadata?.baseGeneration;
+            const baseRef = base4 ? ` (base generation ${base4.slice(0, 7)})` : "";
+            this.warnings.push(
+              `${fr9.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.
@@ -669478,7 +669559,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.23.3-662-g4952e03526c",
+          version: "5.23.3-665-g0932ac24e1f",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -669542,7 +669623,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.23.3-662-g4952e03526c",
+        version: "5.23.3-665-g0932ac24e1f",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -861280,7 +861361,7 @@ var LOCAL_STORAGE_FOLDER4 = ".fern-dev";
 var LOGS_FOLDER_NAME = "logs";
 var MAX_LOGS_DIR_SIZE_BYTES = 100 * 1024 * 1024;
 function getCliSource() {
-  const version7 = "5.23.3-662-g4952e03526c";
+  const version7 = "5.23.3-665-g0932ac24e1f";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -892372,7 +892453,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.23.3-662-g4952e03526c",
+        cliVersion: "5.23.3-665-g0932ac24e1f",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -957562,7 +957643,7 @@ function getAutomationContextFromEnv() {
     config_branch: process.env.FERN_CONFIG_BRANCH,
     config_pr_number: process.env.FERN_CONFIG_PR_NUMBER,
     trigger: process.env.GITHUB_EVENT_NAME,
-    cli_version: "5.23.3-662-g4952e03526c"
+    cli_version: "5.23.3-665-g0932ac24e1f"
   };
 }
 function isAutomationMode() {
@@ -958388,7 +958469,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.23.3-662-g4952e03526c";
+    return "5.23.3-665-g0932ac24e1f";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.23.3-662-g4952e03526c",
+  "version": "5.23.3-665-g0932ac24e1f",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",