@fern-api/fern-api-dev 4.62.3-18-gaf2c775a876 → 4.62.3-19-g218ebd6b5a4

package/cli.cjs

@@ -363452,9 +363452,9 @@ var require_diff3 = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/@fern-api+replay@0.9.0/node_modules/@fern-api/replay/dist/index.cjs
+// ../../../node_modules/.pnpm/@fern-api+replay@0.9.1/node_modules/@fern-api/replay/dist/index.cjs
 var require_dist11 = __commonJS({
-  "../../../node_modules/.pnpm/@fern-api+replay@0.9.0/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
+  "../../../node_modules/.pnpm/@fern-api+replay@0.9.1/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
     "use strict";
     var __defProp4 = Object.defineProperty;
     var __getOwnPropDesc4 = Object.getOwnPropertyDescriptor;
@@ -363579,6 +363579,14 @@ var require_dist11 = __commonJS({
               return false;
             }
           }
+          async treeExists(treeHash) {
+            try {
+              const type8 = await this.exec(["cat-file", "-t", treeHash]);
+              return type8.trim() === "tree";
+            } catch {
+              return false;
+            }
+          }
           async getCommitBody(commitSha) {
             return this.exec(["log", "-1", "--format=%B", commitSha]);
           }
@@ -363588,6 +363596,253 @@ var require_dist11 = __commonJS({
         };
       }
     });
+    var HybridReconstruction_exports = {};
+    __export4(HybridReconstruction_exports, {
+      assembleHybrid: () => assembleHybrid,
+      locateHunksInOurs: () => locateHunksInOurs,
+      parseHunks: () => parseHunks,
+      reconstructFromGhostPatch: () => reconstructFromGhostPatch
+    });
+    function parseHunks(fileDiff) {
+      const lines = fileDiff.split("\n");
+      const hunks = [];
+      let currentHunk = null;
+      for (const line of lines) {
+        const headerMatch = line.match(
+          /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/
+        );
+        if (headerMatch) {
+          if (currentHunk) {
+            hunks.push(currentHunk);
+          }
+          currentHunk = {
+            oldStart: parseInt(headerMatch[1], 10),
+            oldCount: headerMatch[2] != null ? parseInt(headerMatch[2], 10) : 1,
+            newStart: parseInt(headerMatch[3], 10),
+            newCount: headerMatch[4] != null ? parseInt(headerMatch[4], 10) : 1,
+            lines: []
+          };
+          continue;
+        }
+        if (!currentHunk) continue;
+        if (line.startsWith("diff --git") || line.startsWith("index ") || line.startsWith("---") || line.startsWith("+++") || line.startsWith("old mode") || line.startsWith("new mode") || line.startsWith("similarity index") || line.startsWith("rename from") || line.startsWith("rename to") || line.startsWith("new file mode") || line.startsWith("deleted file mode")) {
+          continue;
+        }
+        if (line === "\") {
+          continue;
+        }
+        if (line.startsWith("-")) {
+          currentHunk.lines.push({ type: "remove", content: line.slice(1) });
+        } else if (line.startsWith("+")) {
+          currentHunk.lines.push({ type: "add", content: line.slice(1) });
+        } else if (line.startsWith(" ") || line === "") {
+          currentHunk.lines.push({
+            type: "context",
+            content: line.startsWith(" ") ? line.slice(1) : line
+          });
+        }
+      }
+      if (currentHunk) {
+        hunks.push(currentHunk);
+      }
+      return hunks;
+    }
+    function extractLeadingContext(hunk) {
+      const result = [];
+      for (const line of hunk.lines) {
+        if (line.type !== "context") break;
+        result.push(line.content);
+      }
+      return result;
+    }
+    function extractTrailingContext(hunk) {
+      const result = [];
+      for (let i11 = hunk.lines.length - 1; i11 >= 0; i11--) {
+        if (hunk.lines[i11].type !== "context") break;
+        result.unshift(hunk.lines[i11].content);
+      }
+      return result;
+    }
+    function countOursLinesBeforeTrailing(hunk) {
+      let count = 0;
+      const trailingStart = findTrailingContextStart(hunk);
+      for (let i11 = 0; i11 < trailingStart; i11++) {
+        if (hunk.lines[i11].type === "context") count++;
+      }
+      return count;
+    }
+    function findTrailingContextStart(hunk) {
+      let i11 = hunk.lines.length - 1;
+      while (i11 >= 0 && hunk.lines[i11].type === "context") {
+        i11--;
+      }
+      return i11 + 1;
+    }
+    function matchesAt(needle, haystack, offset2) {
+      for (let i11 = 0; i11 < needle.length; i11++) {
+        if (haystack[offset2 + i11] !== needle[i11]) return false;
+      }
+      return true;
+    }
+    function findContextInOurs(contextLines, oursLines, minIndex, hint) {
+      const SEARCH_WINDOW = 200;
+      const maxStart = oursLines.length - contextLines.length;
+      const clampedHint = Math.max(minIndex, Math.min(hint, maxStart));
+      if (clampedHint >= minIndex && clampedHint <= maxStart) {
+        if (matchesAt(contextLines, oursLines, clampedHint)) {
+          return clampedHint;
+        }
+      }
+      for (let delta = 1; delta <= SEARCH_WINDOW; delta++) {
+        for (const sign2 of [1, -1]) {
+          const idx = clampedHint + delta * sign2;
+          if (idx < minIndex || idx > maxStart) continue;
+          if (matchesAt(contextLines, oursLines, idx)) {
+            return idx;
+          }
+        }
+      }
+      return -1;
+    }
+    function computeOursSpan(hunk, oursLines, oursOffset) {
+      const leading = extractLeadingContext(hunk);
+      const trailing = extractTrailingContext(hunk);
+      if (trailing.length === 0) {
+        const contextCount2 = hunk.lines.filter(
+          (l14) => l14.type === "context"
+        ).length;
+        return Math.min(contextCount2, oursLines.length - oursOffset);
+      }
+      const searchStart = oursOffset + leading.length;
+      for (let i11 = searchStart; i11 <= oursLines.length - trailing.length; i11++) {
+        if (matchesAt(trailing, oursLines, i11)) {
+          return i11 + trailing.length - oursOffset;
+        }
+      }
+      const contextCount = hunk.lines.filter(
+        (l14) => l14.type === "context"
+      ).length;
+      return Math.min(contextCount, oursLines.length - oursOffset);
+    }
+    function locateHunksInOurs(hunks, oursLines) {
+      const located = [];
+      let minOursIndex = 0;
+      for (const hunk of hunks) {
+        const contextLines = extractLeadingContext(hunk);
+        let oursOffset;
+        if (contextLines.length > 0) {
+          const found = findContextInOurs(
+            contextLines,
+            oursLines,
+            minOursIndex,
+            hunk.newStart - 1
+          );
+          if (found === -1) {
+            const trailingContext = extractTrailingContext(hunk);
+            if (trailingContext.length > 0) {
+              const trailingFound = findContextInOurs(
+                trailingContext,
+                oursLines,
+                minOursIndex,
+                hunk.newStart - 1
+              );
+              if (trailingFound === -1) return null;
+              const nonTrailingCount = countOursLinesBeforeTrailing(hunk);
+              oursOffset = trailingFound - nonTrailingCount;
+              if (oursOffset < minOursIndex) return null;
+            } else {
+              return null;
+            }
+          } else {
+            oursOffset = found;
+          }
+        } else if (hunk.oldStart === 1 && hunk.oldCount === 0) {
+          oursOffset = 0;
+        } else {
+          oursOffset = Math.max(hunk.newStart - 1, minOursIndex);
+        }
+        const oursSpan = computeOursSpan(hunk, oursLines, oursOffset);
+        located.push({ hunk, oursOffset, oursSpan });
+        minOursIndex = oursOffset + oursSpan;
+      }
+      return located;
+    }
+    function assembleHybrid(locatedHunks, oursLines) {
+      const baseLines = [];
+      const theirsLines = [];
+      let oursCursor = 0;
+      for (const { hunk, oursOffset, oursSpan } of locatedHunks) {
+        if (oursOffset > oursCursor) {
+          const gapLines = oursLines.slice(oursCursor, oursOffset);
+          baseLines.push(...gapLines);
+          theirsLines.push(...gapLines);
+        }
+        for (const line of hunk.lines) {
+          switch (line.type) {
+            case "context":
+              baseLines.push(line.content);
+              theirsLines.push(line.content);
+              break;
+            case "remove":
+              baseLines.push(line.content);
+              break;
+            case "add":
+              theirsLines.push(line.content);
+              break;
+          }
+        }
+        oursCursor = oursOffset + oursSpan;
+      }
+      if (oursCursor < oursLines.length) {
+        const gapLines = oursLines.slice(oursCursor);
+        baseLines.push(...gapLines);
+        theirsLines.push(...gapLines);
+      }
+      return {
+        base: baseLines.join("\n"),
+        theirs: theirsLines.join("\n")
+      };
+    }
+    function reconstructFromGhostPatch(fileDiff, ours) {
+      const hunks = parseHunks(fileDiff);
+      if (hunks.length === 0) {
+        return null;
+      }
+      const isPureAddition = hunks.every(
+        (h14) => h14.oldCount === 0 && h14.lines.every((l14) => l14.type !== "remove")
+      );
+      if (isPureAddition) {
+        return null;
+      }
+      const isPureDeletion = hunks.every(
+        (h14) => h14.newCount === 0 && h14.lines.every((l14) => l14.type !== "add")
+      );
+      if (isPureDeletion) {
+        const baseLines = [];
+        for (const hunk of hunks) {
+          for (const line of hunk.lines) {
+            if (line.type === "context" || line.type === "remove") {
+              baseLines.push(line.content);
+            }
+          }
+        }
+        return {
+          base: baseLines.join("\n"),
+          theirs: ""
+        };
+      }
+      const oursLines = ours.split("\n");
+      const located = locateHunksInOurs(hunks, oursLines);
+      if (!located) {
+        return null;
+      }
+      return assembleHybrid(located, oursLines);
+    }
+    var init_HybridReconstruction = __esm3({
+      "src/HybridReconstruction.ts"() {
+        "use strict";
+      }
+    });
     var index_exports = {};
     __export4(index_exports, {
       FERN_BOT_EMAIL: () => FERN_BOT_EMAIL,
@@ -364092,6 +364347,7 @@ var require_dist11 = __commonJS({
       lockManager;
       outputDir;
       renameCache = /* @__PURE__ */ new Map();
+      treeExistsCache = /* @__PURE__ */ new Map();
       fileTheirsAccumulator = /* @__PURE__ */ new Map();
       constructor(git, lockManager, outputDir) {
         this.git = git;
@@ -364288,14 +364544,33 @@ var require_dist11 = __commonJS({
           }
           const oursPath = (0, import_node_path210.join)(this.outputDir, resolvedPath);
           const ours = await (0, import_promises181.readFile)(oursPath, "utf-8").catch(() => null);
-          let theirs = await this.applyPatchToContent(
-            base4,
-            patch5.patch_content,
-            filePath,
-            tempGit,
-            tempDir2,
-            renameSourcePath
-          );
+          let ghostReconstructed = false;
+          let theirs = null;
+          if (!base4 && ours && !renameSourcePath) {
+            const treeReachable = await this.isTreeReachable(baseGen.tree_hash);
+            if (!treeReachable) {
+              const fileDiff = this.extractFileDiff(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;
+                  theirs = result.theirs;
+                  ghostReconstructed = true;
+                }
+              }
+            }
+          }
+          if (!ghostReconstructed) {
+            theirs = await this.applyPatchToContent(
+              base4,
+              patch5.patch_content,
+              filePath,
+              tempGit,
+              tempDir2,
+              renameSourcePath
+            );
+          }
           let useAccumulatorAsMergeBase = false;
           const accumulatorEntry = this.fileTheirsAccumulator.get(resolvedPath);
           if (!theirs && accumulatorEntry) {
@@ -364328,13 +364603,13 @@ var require_dist11 = __commonJS({
               baseMismatchSkipped = true;
             }
           }
-          if (!base4 && !ours && effective_theirs) {
+          if (base4 == null && !ours && effective_theirs) {
             const outDir2 = (0, import_node_path210.dirname)(oursPath);
             await (0, import_promises181.mkdir)(outDir2, { recursive: true });
             await (0, import_promises181.writeFile)(oursPath, effective_theirs);
             return { file: resolvedPath, status: "merged", reason: "new-file" };
           }
-          if (!base4 && ours && effective_theirs) {
+          if (base4 == null && ours && effective_theirs) {
             const merged2 = threeWayMerge("", ours, effective_theirs);
             const outDir2 = (0, import_node_path210.dirname)(oursPath);
             await (0, import_promises181.mkdir)(outDir2, { recursive: true });
@@ -364357,7 +364632,7 @@ var require_dist11 = __commonJS({
               reason: "missing-content"
             };
           }
-          if (!base4 && !useAccumulatorAsMergeBase || !ours) {
+          if (base4 == null && !useAccumulatorAsMergeBase || !ours) {
             return {
               file: resolvedPath,
               status: "skipped",
@@ -364400,6 +364675,14 @@ var require_dist11 = __commonJS({
           };
         }
       }
+      async isTreeReachable(treeHash) {
+        let result = this.treeExistsCache.get(treeHash);
+        if (result === void 0) {
+          result = await this.git.treeExists(treeHash);
+          this.treeExistsCache.set(treeHash, result);
+        }
+        return result;
+      }
       isExcluded(patch5) {
         const config5 = this.lockManager.getCustomizationsConfig();
         if (!config5.exclude) return false;
@@ -365466,6 +365749,7 @@ CLI Version: ${options2.cliVersion}`;
       }
       lockManager.save();
       const fernignoreUpdated = ensureFernignoreEntries(outputDir);
+      ensureGitattributesEntries(outputDir);
       if (migrator.fernignoreExists() && fernignorePatterns.length > 0) {
         const action = options2?.fernignoreAction ?? "skip";
         if (action === "migrate") {
@@ -365547,7 +365831,7 @@ CLI Version: ${options2.cliVersion}`;
         return { sha, authorName, authorEmail, message };
       });
     }
-    var REPLAY_FERNIGNORE_ENTRIES = [".fern/replay.lock", ".fern/replay.yml"];
+    var REPLAY_FERNIGNORE_ENTRIES = [".fern/replay.lock", ".fern/replay.yml", ".gitattributes"];
     function ensureFernignoreEntries(outputDir) {
       const fernignorePath = (0, import_node_path52.join)(outputDir, ".fernignore");
       let content5 = "";
@@ -365571,6 +365855,29 @@ CLI Version: ${options2.cliVersion}`;
       (0, import_node_fs42.writeFileSync)(fernignorePath, content5, "utf-8");
       return true;
     }
+    var GITATTRIBUTES_ENTRIES = [".fern/replay.lock linguist-generated=true"];
+    function ensureGitattributesEntries(outputDir) {
+      const gitattributesPath = (0, import_node_path52.join)(outputDir, ".gitattributes");
+      let content5 = "";
+      if ((0, import_node_fs42.existsSync)(gitattributesPath)) {
+        content5 = (0, import_node_fs42.readFileSync)(gitattributesPath, "utf-8");
+      }
+      const lines = content5.split("\n");
+      const toAdd = [];
+      for (const entry of GITATTRIBUTES_ENTRIES) {
+        if (!lines.some((line) => line.trim() === entry)) {
+          toAdd.push(entry);
+        }
+      }
+      if (toAdd.length === 0) {
+        return;
+      }
+      if (content5 && !content5.endsWith("\n")) {
+        content5 += "\n";
+      }
+      content5 += toAdd.join("\n") + "\n";
+      (0, import_node_fs42.writeFileSync)(gitattributesPath, content5, "utf-8");
+    }
     function computeContentHash(patchContent) {
       const normalized = patchContent.split("\n").filter((line) => !line.startsWith("From ") && !line.startsWith("index ") && !line.startsWith("Date: ")).join("\n");
       return `sha256:${(0, import_node_crypto32.createHash)("sha256").update(normalized).digest("hex")}`;
@@ -603138,7 +603445,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.62.3-18-gaf2c775a876",
+          version: "4.62.3-19-g218ebd6b5a4",
           usingAccessToken: true
         }
       });
@@ -603189,7 +603496,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.62.3-18-gaf2c775a876",
+        version: "4.62.3-19-g218ebd6b5a4",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -753177,7 +753484,7 @@ var V66_TO_V65_MIGRATION = {
     [GeneratorName.JAVA_SDK]: GeneratorWasNeverUpdatedToConsumeNewIR,
     [GeneratorName.JAVA_SPRING]: GeneratorWasNeverUpdatedToConsumeNewIR,
     [GeneratorName.OPENAPI_PYTHON_CLIENT]: GeneratorWasNeverUpdatedToConsumeNewIR,
-    [GeneratorName.OPENAPI]: GeneratorWasNeverUpdatedToConsumeNewIR,
+    [GeneratorName.OPENAPI]: "0.4.0-rc.0",
     [GeneratorName.PYTHON_FASTAPI]: GeneratorWasNeverUpdatedToConsumeNewIR,
     [GeneratorName.PYTHON_PYDANTIC]: GeneratorWasNeverUpdatedToConsumeNewIR,
     [GeneratorName.PYTHON_SDK]: GeneratorWasNeverUpdatedToConsumeNewIR,
@@ -840485,7 +840792,7 @@ var import_path54 = __toESM(require("path"), 1);
 var LOCAL_STORAGE_FOLDER4 = ".fern-dev";
 var LOGS_FOLDER_NAME = "logs";
 function getCliSource() {
-  const version7 = "4.62.3-18-gaf2c775a876";
+  const version7 = "4.62.3-19-g218ebd6b5a4";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -851593,7 +851900,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.62.3-18-gaf2c775a876"
+        cliVersion: "4.62.3-19-g218ebd6b5a4"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
         return { success: false };
@@ -924893,7 +925200,7 @@ var CliContext = class {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.62.3-18-gaf2c775a876";
+    return "4.62.3-19-g218ebd6b5a4";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.62.3-18-gaf2c775a876",
+  "version": "4.62.3-19-g218ebd6b5a4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",