@fern-api/generator-cli 0.9.18 → 0.9.20

package/dist/api.d.ts

@@ -507,10 +507,10 @@ interface ReplayInitResult {
     bootstrap: BootstrapResult;
     /** Raw lockfile YAML content, present when bootstrap succeeded and not dry-run */
     lockfileContent?: string;
-    /** Raw replay.yml content, present only when fernignore migration created it */
-    replayYmlContent?: string;
     /** Fernignore entries that the server should ensure exist */
     fernignoreEntries: string[];
+    /** Gitattributes entries the server should ensure exist (e.g. linguist-generated markers) */
+    gitattributesEntries: string[];
     /** Generated PR body markdown for the server to use */
     prBody?: string;
 }
@@ -523,8 +523,8 @@ interface ReplayInitResult {
  * Flow:
  * 1. Clone the SDK repo (read-only)
  * 2. Run bootstrap() to scan history and create lockfile
- * 3. Ensure .fernignore has replay entries
- * 4. Read lockfile content from disk and return it
+ * 3. Read lockfile content from disk
+ * 4. Return lockfile + fernignore/gitattributes entries for Fiddle to apply server-side
  */
 declare function replayInit(params: ReplayInitParams): Promise<ReplayInitResult>;
 interface BootstrapLogEntry {

package/dist/api.js

@@ -10053,12 +10053,11 @@ function replayForget(params) {
 
 // src/replay/replay-init.ts
 var import_replay2 = require("@fern-api/replay");
-var import_fs3 = require("fs");
+var import_fs2 = require("fs");
 var import_path4 = require("path");
 var import_tmp_promise2 = __toESM(require("tmp-promise"));
 
 // src/replay/fernignore.ts
-var import_fs2 = require("fs");
 var import_promises2 = require("fs/promises");
 var import_path3 = require("path");
 var REPLAY_FERNIGNORE_ENTRIES = [".fern/replay.lock", ".fern/replay.yml", ".gitattributes"];
@@ -10093,32 +10092,6 @@ async function ensureGitattributesEntries(outputDir) {
     await (0, import_promises2.writeFile)(gitattributesPath, content + suffix + toAdd.join("\n") + "\n", "utf-8");
   }
 }
-function ensureReplayFernignoreEntriesSync(outputDir) {
-  const fernignorePath = (0, import_path3.join)(outputDir, ".fernignore");
-  let content = "";
-  if ((0, import_fs2.existsSync)(fernignorePath)) {
-    content = (0, import_fs2.readFileSync)(fernignorePath, "utf-8");
-  }
-  const lines = content.split("\n");
-  const toAdd = REPLAY_FERNIGNORE_ENTRIES.filter((entry) => !lines.some((line) => line.trim() === entry));
-  if (toAdd.length > 0) {
-    const suffix = content.length > 0 && !content.endsWith("\n") ? "\n" : "";
-    (0, import_fs2.writeFileSync)(fernignorePath, content + suffix + toAdd.join("\n") + "\n", "utf-8");
-  }
-}
-function ensureGitattributesEntriesSync(outputDir) {
-  const gitattributesPath = (0, import_path3.join)(outputDir, ".gitattributes");
-  let content = "";
-  if ((0, import_fs2.existsSync)(gitattributesPath)) {
-    content = (0, import_fs2.readFileSync)(gitattributesPath, "utf-8");
-  }
-  const lines = content.split("\n");
-  const toAdd = GITATTRIBUTES_ENTRIES.filter((entry) => !lines.some((line) => line.trim() === entry));
-  if (toAdd.length > 0) {
-    const suffix = content.length > 0 && !content.endsWith("\n") ? "\n" : "";
-    (0, import_fs2.writeFileSync)(gitattributesPath, content + suffix + toAdd.join("\n") + "\n", "utf-8");
-  }
-}
 
 // src/replay/replay-init.ts
 async function replayInit(params) {
@@ -10138,22 +10111,18 @@ async function replayInit(params) {
     importHistory: params.importHistory
   });
   if (!bootstrapResult.generationCommit) {
-    return { bootstrap: bootstrapResult, fernignoreEntries: [] };
+    return { bootstrap: bootstrapResult, fernignoreEntries: [], gitattributesEntries: [] };
   }
   if (dryRun) {
-    return { bootstrap: bootstrapResult, fernignoreEntries: [] };
+    return { bootstrap: bootstrapResult, fernignoreEntries: [], gitattributesEntries: [] };
   }
-  ensureReplayFernignoreEntriesSync(repoPath);
-  ensureGitattributesEntriesSync(repoPath);
   const lockfilePath = (0, import_path4.join)(repoPath, ".fern", "replay.lock");
-  const lockfileContent = (0, import_fs3.existsSync)(lockfilePath) ? (0, import_fs3.readFileSync)(lockfilePath, "utf-8") : void 0;
-  const replayYmlPath = (0, import_path4.join)(repoPath, ".fern", "replay.yml");
-  const replayYmlContent = (0, import_fs3.existsSync)(replayYmlPath) ? (0, import_fs3.readFileSync)(replayYmlPath, "utf-8") : void 0;
+  const lockfileContent = (0, import_fs2.existsSync)(lockfilePath) ? (0, import_fs2.readFileSync)(lockfilePath, "utf-8") : void 0;
   return {
     bootstrap: bootstrapResult,
     lockfileContent,
-    replayYmlContent,
     fernignoreEntries: REPLAY_FERNIGNORE_ENTRIES,
+    gitattributesEntries: GITATTRIBUTES_ENTRIES,
     prBody: buildPrBody(bootstrapResult)
   };
 }
@@ -10274,7 +10243,7 @@ async function replayResolve(params) {
 // src/replay/replay-run.ts
 var import_replay4 = require("@fern-api/replay");
 var import_child_process3 = require("child_process");
-var import_fs4 = require("fs");
+var import_fs3 = require("fs");
 var import_path5 = require("path");
 async function replayPrepare(params) {
   const {
@@ -10287,7 +10256,7 @@ async function replayPrepare(params) {
     logger
   } = params;
   const lockfilePath = (0, import_path5.join)(outputDir, ".fern", "replay.lock");
-  if (!(0, import_fs4.existsSync)(lockfilePath)) {
+  if (!(0, import_fs3.existsSync)(lockfilePath)) {
     return null;
   }
   const baseBranchHead = gitRevParse(outputDir, "HEAD");
@@ -10485,6 +10454,7 @@ async function submitReplayInit(params) {
       repo,
       lockfileContents: initResult.lockfileContent,
       fernignoreEntries: initResult.fernignoreEntries,
+      gitattributesEntries: initResult.gitattributesEntries,
       prBody: initResult.prBody
     })
   });

package/dist/cli.js

@@ -22028,7 +22028,7 @@ var init_diff3 = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/@fern-api+replay@0.12.0/node_modules/@fern-api/replay/dist/index.js
+// ../../node_modules/.pnpm/@fern-api+replay@0.13.0/node_modules/@fern-api/replay/dist/index.js
 var dist_exports = {};
 __export(dist_exports, {
   CREDENTIAL_PATTERNS: () => CREDENTIAL_PATTERNS,
@@ -23043,7 +23043,7 @@ function status(outputDir) {
 }
 var import_fs6, import_path7, import_yaml, import_crypto, import_promises3, import_os, import_path8, import_fs7, import_path9, import_crypto2, import_fs8, import_path10, import_yaml2, import_crypto3, import_fs9, import_path11, import_fs10, __defProp3, __getOwnPropNames3, __esm3, __export3, GitClient_exports, GitClient, init_GitClient, HybridReconstruction_exports, init_HybridReconstruction, CREDENTIAL_PATTERNS, SENSITIVE_FILE_PATTERNS, FERN_BOT_NAME, FERN_BOT_EMAIL, FERN_BOT_LOGIN, FERN_SUPPORT_NAMES, LOCKFILE_HEADER, LockfileNotFoundError, LockfileManager, INFRASTRUCTURE_FILES, ReplayDetector, CONFLICT_OPENER, CONFLICT_SEPARATOR, CONFLICT_CLOSER, BINARY_EXTENSIONS, ReplayApplicator, ReplayCommitter, ReplayService, FernignoreMigrator, REPLAY_FERNIGNORE_ENTRIES, GITATTRIBUTES_ENTRIES, EMPTY_RESULT;
 var init_dist3 = __esm({
-  "../../node_modules/.pnpm/@fern-api+replay@0.12.0/node_modules/@fern-api/replay/dist/index.js"() {
+  "../../node_modules/.pnpm/@fern-api+replay@0.13.0/node_modules/@fern-api/replay/dist/index.js"() {
     "use strict";
     init_esm4();
     import_fs6 = require("fs");
@@ -23457,17 +23457,57 @@ var init_dist3 = __esm({
         }
         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);
+      }
+      /**
+       * FER-10201 — 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);
+      }
+      /**
+       * FER-10201 — Walk `${rangeStart}..HEAD`, classify each commit, emit one
+       * `StoredPatch` per customer commit. Body shared by the linear path
+       * (rangeStart = lastGen.commit_sha) and the merge-base path.
+       *
+       * Patch `base_generation` is always `lastGen.commit_sha` — the
+       * lockfile-tracked reference the applicator uses to fetch base file
+       * content, regardless of where the walk actually started.
+       */
+      async detectPatchesInRange(rangeStart, lastGen, lock) {
         const log = await this.git.exec([
           "log",
           "--first-parent",
           "--format=%H%x00%an%x00%ae%x00%s",
-          `${lastGen.commit_sha}..HEAD`,
+          `${rangeStart}..HEAD`,
           "--",
           this.sdkOutputDir
         ]);
@@ -28389,7 +28429,7 @@ function resolve(...paths) {
 }
 
 // src/cli.ts
-var import_fs16 = __toESM(require("fs"));
+var import_fs15 = __toESM(require("fs"));
 var import_promises11 = require("fs/promises");
 var import_path18 = __toESM(require("path"));
 
@@ -38091,12 +38131,11 @@ function replayForget(params) {
 
 // src/replay/replay-init.ts
 init_dist3();
-var import_fs12 = require("fs");
+var import_fs11 = require("fs");
 var import_path13 = require("path");
 var import_tmp_promise2 = __toESM(require_tmp_promise());
 
 // src/replay/fernignore.ts
-var import_fs11 = require("fs");
 var import_promises4 = require("fs/promises");
 var import_path12 = require("path");
 var REPLAY_FERNIGNORE_ENTRIES2 = [".fern/replay.lock", ".fern/replay.yml", ".gitattributes"];
@@ -38131,32 +38170,6 @@ async function ensureGitattributesEntries2(outputDir) {
     await (0, import_promises4.writeFile)(gitattributesPath, content + suffix + toAdd.join("\n") + "\n", "utf-8");
   }
 }
-function ensureReplayFernignoreEntriesSync(outputDir) {
-  const fernignorePath = (0, import_path12.join)(outputDir, ".fernignore");
-  let content = "";
-  if ((0, import_fs11.existsSync)(fernignorePath)) {
-    content = (0, import_fs11.readFileSync)(fernignorePath, "utf-8");
-  }
-  const lines = content.split("\n");
-  const toAdd = REPLAY_FERNIGNORE_ENTRIES2.filter((entry) => !lines.some((line) => line.trim() === entry));
-  if (toAdd.length > 0) {
-    const suffix = content.length > 0 && !content.endsWith("\n") ? "\n" : "";
-    (0, import_fs11.writeFileSync)(fernignorePath, content + suffix + toAdd.join("\n") + "\n", "utf-8");
-  }
-}
-function ensureGitattributesEntriesSync(outputDir) {
-  const gitattributesPath = (0, import_path12.join)(outputDir, ".gitattributes");
-  let content = "";
-  if ((0, import_fs11.existsSync)(gitattributesPath)) {
-    content = (0, import_fs11.readFileSync)(gitattributesPath, "utf-8");
-  }
-  const lines = content.split("\n");
-  const toAdd = GITATTRIBUTES_ENTRIES2.filter((entry) => !lines.some((line) => line.trim() === entry));
-  if (toAdd.length > 0) {
-    const suffix = content.length > 0 && !content.endsWith("\n") ? "\n" : "";
-    (0, import_fs11.writeFileSync)(gitattributesPath, content + suffix + toAdd.join("\n") + "\n", "utf-8");
-  }
-}
 
 // src/replay/replay-init.ts
 async function replayInit(params) {
@@ -38176,22 +38189,18 @@ async function replayInit(params) {
     importHistory: params.importHistory
   });
   if (!bootstrapResult.generationCommit) {
-    return { bootstrap: bootstrapResult, fernignoreEntries: [] };
+    return { bootstrap: bootstrapResult, fernignoreEntries: [], gitattributesEntries: [] };
   }
   if (dryRun) {
-    return { bootstrap: bootstrapResult, fernignoreEntries: [] };
+    return { bootstrap: bootstrapResult, fernignoreEntries: [], gitattributesEntries: [] };
   }
-  ensureReplayFernignoreEntriesSync(repoPath);
-  ensureGitattributesEntriesSync(repoPath);
   const lockfilePath = (0, import_path13.join)(repoPath, ".fern", "replay.lock");
-  const lockfileContent = (0, import_fs12.existsSync)(lockfilePath) ? (0, import_fs12.readFileSync)(lockfilePath, "utf-8") : void 0;
-  const replayYmlPath = (0, import_path13.join)(repoPath, ".fern", "replay.yml");
-  const replayYmlContent = (0, import_fs12.existsSync)(replayYmlPath) ? (0, import_fs12.readFileSync)(replayYmlPath, "utf-8") : void 0;
+  const lockfileContent = (0, import_fs11.existsSync)(lockfilePath) ? (0, import_fs11.readFileSync)(lockfilePath, "utf-8") : void 0;
   return {
     bootstrap: bootstrapResult,
     lockfileContent,
-    replayYmlContent,
     fernignoreEntries: REPLAY_FERNIGNORE_ENTRIES2,
+    gitattributesEntries: GITATTRIBUTES_ENTRIES2,
     prBody: buildPrBody(bootstrapResult)
   };
 }
@@ -38307,7 +38316,7 @@ init_dist3();
 // src/replay/replay-run.ts
 init_dist3();
 var import_child_process3 = require("child_process");
-var import_fs13 = require("fs");
+var import_fs12 = require("fs");
 var import_path14 = require("path");
 async function replayPrepare(params) {
   const {
@@ -38320,7 +38329,7 @@ async function replayPrepare(params) {
     logger
   } = params;
   const lockfilePath = (0, import_path14.join)(outputDir, ".fern", "replay.lock");
-  if (!(0, import_fs13.existsSync)(lockfilePath)) {
+  if (!(0, import_fs12.existsSync)(lockfilePath)) {
     return null;
   }
   const baseBranchHead = gitRevParse(outputDir, "HEAD");
@@ -38552,7 +38561,7 @@ var FERN_BOT_LOGIN2 = "fern-api[bot]";
 
 // src/pipeline/steps/AutoVersionStep.ts
 var import_child_process4 = require("child_process");
-var import_fs15 = require("fs");
+var import_fs14 = require("fs");
 var import_promises9 = require("fs/promises");
 var import_path16 = require("path");
 
@@ -38612,7 +38621,7 @@ async function loggingExeca(logger, executable, args = [], { doNotPipeOutput = f
 }
 
 // src/autoversion/AutoVersioningService.ts
-var import_fs14 = require("fs");
+var import_fs13 = require("fs");
 var import_promises8 = require("fs/promises");
 var import_path15 = require("path");
 var import_semver = __toESM(require_semver2());
@@ -39302,7 +39311,7 @@ var AutoVersioningService = class _AutoVersioningService {
       return;
     }
     const goModPath = (0, import_path15.join)(workingDirectory, "go.mod");
-    if (!(0, import_fs14.existsSync)(goModPath)) {
+    if (!(0, import_fs13.existsSync)(goModPath)) {
       this.logger.debug(`No go.mod found in ${workingDirectory}, skipping Go module path update`);
       return;
     }
@@ -39841,7 +39850,7 @@ ${body}` : `${COMMIT_MARKER} ${subject}`;
 
 `;
     let existing = "";
-    if ((0, import_fs15.existsSync)(changelogPath)) {
+    if ((0, import_fs14.existsSync)(changelogPath)) {
       existing = await (0, import_promises9.readFile)(changelogPath, "utf-8");
     }
     let output;
@@ -41384,7 +41393,7 @@ async function createWriteStreamFromFile(filepath) {
   if (!await doesPathExist(filepath)) {
     await (0, import_promises11.mkdir)(import_path18.default.dirname(filepath), { recursive: true });
   }
-  return import_fs16.default.createWriteStream(filepath);
+  return import_fs15.default.createWriteStream(filepath);
 }
 /*! Bundled license information:
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fern-api/generator-cli",
-  "version": "0.9.18",
+  "version": "0.9.20",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",
@@ -23,7 +23,7 @@
   ],
   "dependencies": {
     "@boundaryml/baml": "^0.219.0",
-    "@fern-api/replay": "0.12.0",
+    "@fern-api/replay": "0.13.0",
     "@octokit/rest": "^22.0.1",
     "es-toolkit": "^1.45.1",
     "semver": "^7.6.3",