@fern-api/generator-cli 0.9.47 → 0.9.48

package/dist/api.js

@@ -11855,6 +11855,7 @@ function resolve2(...paths) {
 
 // src/github/GitHub.ts
 var import_rest = require("@octokit/rest");
+var import_promises2 = require("fs/promises");
 var GitHub = class {
   githubConfig;
   constructor({
@@ -11881,9 +11882,10 @@ var GitHub = class {
         await repository.pull(branch);
       }
       const fernIgnoreFiles = await this.getFernignoreFiles(repository);
+      const changelogFiles = await this.getChangelogFilesToPreserve(repository, sourceDirectory);
       await repository.overwriteLocalContents(sourceDirectory);
       await repository.add(".");
-      await this.restoreFiles(repository, fernIgnoreFiles);
+      await this.restoreFiles(repository, [...fernIgnoreFiles, ...changelogFiles]);
       await repository.commit("SDK Generation");
       if (isEmptyRepo) {
         await repository.pushUpstream(branch);
@@ -11920,9 +11922,10 @@ var GitHub = class {
       const prBranch = `fern-bot/${formattedDate}`;
       await repository.checkout(prBranch);
       const fernIgnoreFiles = await this.getFernignoreFiles(repository);
+      const changelogFiles = await this.getChangelogFilesToPreserve(repository, sourceDirectory);
       await repository.overwriteLocalContents(sourceDirectory);
       await repository.add(".");
-      await this.restoreFiles(repository, fernIgnoreFiles);
+      await this.restoreFiles(repository, [...fernIgnoreFiles, ...changelogFiles]);
       await repository.commit("SDK Generation");
       await repository.push();
       const apiBaseUrl = getGithubApiBaseUrl(this.githubConfig.uri);
@@ -11966,6 +11969,25 @@ var GitHub = class {
     const tracked = await repository.listTrackedFiles();
     return expandFernignorePatterns(fernignore, tracked);
   }
+  /**
+   * Returns tracked changelog files (e.g. `changelog.md`) that should be restored after
+   * `overwriteLocalContents`, so existing changelog entries are never wiped when the
+   * generated output doesn't include a changelog of its own.
+   */
+  async getChangelogFilesToPreserve(repository, sourceDirectory) {
+    const tracked = await repository.listTrackedFiles();
+    const trackedChangelogs = tracked.filter((file) => file.toLowerCase() === "changelog.md");
+    if (trackedChangelogs.length === 0) {
+      return [];
+    }
+    try {
+      const sourceFiles = await (0, import_promises2.readdir)(sourceDirectory);
+      const sourceHasChangelog = sourceFiles.some((file) => file.toLowerCase() === "changelog.md");
+      return sourceHasChangelog ? [] : trackedChangelogs;
+    } catch {
+      return trackedChangelogs;
+    }
+  }
   async restoreFiles(repository, files) {
     if (files.length === 0) {
       return;
@@ -12009,7 +12031,7 @@ var import_path4 = require("path");
 var import_tmp_promise2 = __toESM(require("tmp-promise"));
 
 // src/replay/fernignore.ts
-var import_promises2 = require("fs/promises");
+var import_promises3 = require("fs/promises");
 var import_path3 = require("path");
 var REPLAY_FERNIGNORE_ENTRIES = [".fern/replay.lock", ".fern/replay.yml", ".gitattributes"];
 var GITATTRIBUTES_ENTRIES = [".fern/replay.lock linguist-generated=true"];
@@ -12017,14 +12039,14 @@ async function ensureReplayFernignoreEntries(outputDir) {
   const fernignorePath = (0, import_path3.join)(outputDir, ".fernignore");
   let content = "";
   try {
-    content = await (0, import_promises2.readFile)(fernignorePath, "utf-8");
+    content = await (0, import_promises3.readFile)(fernignorePath, "utf-8");
   } catch {
   }
   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" : "";
-    await (0, import_promises2.writeFile)(fernignorePath, content + suffix + toAdd.join("\n") + "\n", "utf-8");
+    await (0, import_promises3.writeFile)(fernignorePath, content + suffix + toAdd.join("\n") + "\n", "utf-8");
     return true;
   }
   return false;
@@ -12033,14 +12055,14 @@ async function ensureGitattributesEntries(outputDir) {
   const gitattributesPath = (0, import_path3.join)(outputDir, ".gitattributes");
   let content = "";
   try {
-    content = await (0, import_promises2.readFile)(gitattributesPath, "utf-8");
+    content = await (0, import_promises3.readFile)(gitattributesPath, "utf-8");
   } catch {
   }
   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" : "";
-    await (0, import_promises2.writeFile)(gitattributesPath, content + suffix + toAdd.join("\n") + "\n", "utf-8");
+    await (0, import_promises3.writeFile)(gitattributesPath, content + suffix + toAdd.join("\n") + "\n", "utf-8");
   }
 }
 

package/dist/cli.js

@@ -22482,7 +22482,7 @@ function reconstructFromGhostPatch(fileDiff, ours) {
 async function applyPatchToContent(base, patchContent, filePath) {
   const fileDiff = extractFileDiff(patchContent, filePath);
   if (!fileDiff) return null;
-  const tempDir = await (0, import_promises3.mkdtemp)((0, import_path7.join)((0, import_os.tmpdir)(), "replay-migrate-"));
+  const tempDir = await (0, import_promises4.mkdtemp)((0, import_path7.join)((0, import_os.tmpdir)(), "replay-migrate-"));
   const tempGit = new GitClient(tempDir);
   try {
     await tempGit.exec(["init"]);
@@ -22490,16 +22490,16 @@ async function applyPatchToContent(base, patchContent, filePath) {
     await tempGit.exec(["config", "user.name", "Fern Replay Migration"]);
     await tempGit.exec(["config", "commit.gpgSign", "false"]);
     const tempFilePath = (0, import_path7.join)(tempDir, filePath);
-    await (0, import_promises3.mkdir)((0, import_path7.dirname)(tempFilePath), { recursive: true });
-    await (0, import_promises3.writeFile)(tempFilePath, base);
+    await (0, import_promises4.mkdir)((0, import_path7.dirname)(tempFilePath), { recursive: true });
+    await (0, import_promises4.writeFile)(tempFilePath, base);
     await tempGit.exec(["add", filePath]);
     await tempGit.exec(["commit", "-m", `base for ${filePath}`, "--allow-empty"]);
     await tempGit.execWithInput(["apply", "--allow-empty"], fileDiff);
-    return await (0, import_promises3.readFile)(tempFilePath, "utf-8");
+    return await (0, import_promises4.readFile)(tempFilePath, "utf-8");
   } catch {
     return null;
   } finally {
-    await (0, import_promises3.rm)(tempDir, { recursive: true, force: true }).catch(() => {
+    await (0, import_promises4.rm)(tempDir, { recursive: true, force: true }).catch(() => {
     });
   }
 }
@@ -22820,7 +22820,7 @@ async function resolveInputs(args) {
     }
   }
   const oursPath = (0, import_path11.join)(outputDir, resolvedPath);
-  const ours = await (0, import_promises5.readFile)(oursPath, "utf-8").catch(() => null);
+  const ours = await (0, import_promises6.readFile)(oursPath, "utf-8").catch(() => null);
   let ghostTheirs = null;
   let baseTreeUnreachable = false;
   if (!base && !renameSourcePath) {
@@ -23067,14 +23067,14 @@ async function runMergeAndRecord(args) {
   }
   if (plan.kind === "new-file-only-user") {
     accumulator.recordMerge(resolvedPath, plan.theirs, patch.base_generation);
-    await (0, import_promises6.mkdir)((0, import_path12.dirname)(oursPath), { recursive: true });
-    await (0, import_promises6.writeFile)(oursPath, plan.theirs);
+    await (0, import_promises7.mkdir)((0, import_path12.dirname)(oursPath), { recursive: true });
+    await (0, import_promises7.writeFile)(oursPath, plan.theirs);
     return { file: resolvedPath, status: "merged", reason: "new-file" };
   }
   if (plan.kind === "new-file-both") {
     const merged2 = threeWayMerge("", ours, plan.theirs);
-    await (0, import_promises6.mkdir)((0, import_path12.dirname)(oursPath), { recursive: true });
-    await (0, import_promises6.writeFile)(oursPath, merged2.content);
+    await (0, import_promises7.mkdir)((0, import_path12.dirname)(oursPath), { recursive: true });
+    await (0, import_promises7.writeFile)(oursPath, merged2.content);
     const unreachableFlag = plan.baseTreeUnreachable ? { baseTreeUnreachable: true } : {};
     if (merged2.hasConflicts) {
       return {
@@ -23090,8 +23090,8 @@ async function runMergeAndRecord(args) {
     return { file: resolvedPath, status: "merged", ...unreachableFlag };
   }
   const merged = threeWayMerge(plan.mergeBase, ours, plan.theirs);
-  await (0, import_promises6.mkdir)((0, import_path12.dirname)(oursPath), { recursive: true });
-  await (0, import_promises6.writeFile)(oursPath, merged.content);
+  await (0, import_promises7.mkdir)((0, import_path12.dirname)(oursPath), { recursive: true });
+  await (0, import_promises7.writeFile)(oursPath, merged.content);
   if (merged.hasConflicts) {
     accumulator.recordConflict(resolvedPath, plan.theirs, patch.base_generation);
     return {
@@ -23357,17 +23357,17 @@ function overlayRegions(currentGenLines, locInCurrentGen, workingTreeLines, locI
 }
 async function unifiedDiff(beforeContent, afterContent, filePath) {
   if (beforeContent === afterContent) return "";
-  const tmp4 = await (0, import_promises8.mkdtemp)((0, import_path15.join)((0, import_os3.tmpdir)(), "fern-replay-pp-"));
+  const tmp4 = await (0, import_promises9.mkdtemp)((0, import_path15.join)((0, import_os3.tmpdir)(), "fern-replay-pp-"));
   try {
     const beforePath = (0, import_path15.join)(tmp4, "before");
     const afterPath = (0, import_path15.join)(tmp4, "after");
-    await (0, import_promises8.writeFile)(beforePath, beforeContent, "utf-8");
-    await (0, import_promises8.writeFile)(afterPath, afterContent, "utf-8");
+    await (0, import_promises9.writeFile)(beforePath, beforeContent, "utf-8");
+    await (0, import_promises9.writeFile)(afterPath, afterContent, "utf-8");
     const raw = await runGitDiffNoIndex(beforePath, afterPath);
     if (!raw.trim()) return "";
     return rewriteDiffHeaders(raw, filePath);
   } finally {
-    await (0, import_promises8.rm)(tmp4, { recursive: true, force: true });
+    await (0, import_promises9.rm)(tmp4, { recursive: true, force: true });
   }
 }
 function runGitDiffNoIndex(beforePath, afterPath) {
@@ -24060,7 +24060,7 @@ async function resolve7(outputDir, options) {
       const result = await computePerPatchDiffWithFallback(
         patch,
         (f) => git.showFile(currentGen, f),
-        (f) => (0, import_promises9.readFile)((0, import_path18.join)(outputDir, f), "utf-8").catch(() => null),
+        (f) => (0, import_promises10.readFile)((0, import_path18.join)(outputDir, f), "utf-8").catch(() => null),
         (files) => git.exec(["diff", currentGen, "--", ...files]).catch(() => null)
       );
       if (result === null) {
@@ -24136,7 +24136,7 @@ async function resolve7(outputDir, options) {
       const theirsSnapshot = {};
       for (const file of filesForSnapshot) {
         if (isBinaryFile(file)) continue;
-        const content = await (0, import_promises9.readFile)((0, import_path18.join)(outputDir, file), "utf-8").catch(() => null);
+        const content = await (0, import_promises10.readFile)((0, import_path18.join)(outputDir, file), "utf-8").catch(() => null);
         if (content != null) {
           theirsSnapshot[file] = content;
         }
@@ -24260,12 +24260,12 @@ function status(outputDir) {
     legacyDismissedCount
   };
 }
-var import_promises3, import_os, import_path7, import_fs6, import_path8, import_yaml, import_crypto, import_path9, import_promises4, import_os2, import_path10, import_promises5, import_path11, import_promises6, import_path12, import_fs7, import_promises7, import_path13, import_fs8, import_path14, import_promises8, import_os3, import_path15, import_child_process3, import_crypto2, import_fs9, import_path16, import_yaml2, import_crypto3, import_fs10, import_path17, import_fs11, import_promises9, import_path18, __defProp3, __getOwnPropNames3, __esm3, __export3, GitClient_exports, GitClient, init_GitClient, HybridReconstruction_exports, init_HybridReconstruction, PatchApplyTheirs_exports, init_PatchApplyTheirs, CREDENTIAL_PATTERNS, SENSITIVE_FILE_PATTERNS, FERN_BOT_NAME, FERN_BOT_EMAIL, FERN_BOT_LOGIN, FERN_SUPPORT_NAMES, LOCKFILE_HEADER, LockfileNotFoundError, LockfileManager, BINARY_EXTENSIONS, INFRASTRUCTURE_FILES, ReplayDetector, MergeAccumulator, CONFLICT_OPENER, CONFLICT_SEPARATOR, CONFLICT_CLOSER, ReplayApplicator, ReplayCommitter, FileOwnership, FirstGenerationFlow, SkipApplicationFlow, NoPatchesFlow, NormalRegenerationFlow, ReplayService, FernignoreMigrator, REPLAY_FERNIGNORE_ENTRIES, GITATTRIBUTES_ENTRIES, EMPTY_RESULT;
+var import_promises4, import_os, import_path7, import_fs6, import_path8, import_yaml, import_crypto, import_path9, import_promises5, import_os2, import_path10, import_promises6, import_path11, import_promises7, import_path12, import_fs7, import_promises8, import_path13, import_fs8, import_path14, import_promises9, import_os3, import_path15, import_child_process3, import_crypto2, import_fs9, import_path16, import_yaml2, import_crypto3, import_fs10, import_path17, import_fs11, import_promises10, import_path18, __defProp3, __getOwnPropNames3, __esm3, __export3, GitClient_exports, GitClient, init_GitClient, HybridReconstruction_exports, init_HybridReconstruction, PatchApplyTheirs_exports, init_PatchApplyTheirs, CREDENTIAL_PATTERNS, SENSITIVE_FILE_PATTERNS, FERN_BOT_NAME, FERN_BOT_EMAIL, FERN_BOT_LOGIN, FERN_SUPPORT_NAMES, LOCKFILE_HEADER, LockfileNotFoundError, LockfileManager, BINARY_EXTENSIONS, INFRASTRUCTURE_FILES, ReplayDetector, MergeAccumulator, CONFLICT_OPENER, CONFLICT_SEPARATOR, CONFLICT_CLOSER, ReplayApplicator, ReplayCommitter, FileOwnership, FirstGenerationFlow, SkipApplicationFlow, NoPatchesFlow, NormalRegenerationFlow, ReplayService, FernignoreMigrator, REPLAY_FERNIGNORE_ENTRIES, GITATTRIBUTES_ENTRIES, EMPTY_RESULT;
 var init_dist3 = __esm({
   "../../node_modules/.pnpm/@fern-api+replay@0.19.0/node_modules/@fern-api/replay/dist/index.js"() {
     "use strict";
     init_esm4();
-    import_promises3 = require("fs/promises");
+    import_promises4 = require("fs/promises");
     import_os = require("os");
     import_path7 = require("path");
     import_fs6 = require("fs");
@@ -24276,21 +24276,21 @@ var init_dist3 = __esm({
     init_esm3();
     import_path9 = require("path");
     init_diff3();
-    import_promises4 = require("fs/promises");
+    import_promises5 = require("fs/promises");
     import_os2 = require("os");
     import_path10 = require("path");
     init_esm3();
-    import_promises5 = require("fs/promises");
-    import_path11 = require("path");
     import_promises6 = require("fs/promises");
+    import_path11 = require("path");
+    import_promises7 = require("fs/promises");
     import_path12 = require("path");
     import_fs7 = require("fs");
-    import_promises7 = require("fs/promises");
+    import_promises8 = require("fs/promises");
     import_path13 = require("path");
     init_esm3();
     import_fs8 = require("fs");
     import_path14 = require("path");
-    import_promises8 = require("fs/promises");
+    import_promises9 = require("fs/promises");
     import_os3 = require("os");
     import_path15 = require("path");
     import_child_process3 = require("child_process");
@@ -24305,7 +24305,7 @@ var init_dist3 = __esm({
     import_path17 = require("path");
     init_esm3();
     import_fs11 = require("fs");
-    import_promises9 = require("fs/promises");
+    import_promises10 = require("fs/promises");
     import_path18 = require("path");
     __defProp3 = Object.defineProperty;
     __getOwnPropNames3 = Object.getOwnPropertyNames;
@@ -25579,9 +25579,9 @@ var init_dist3 = __esm({
               if (laterFiles.has(fileResult.file) || laterFiles.has(originalPath)) {
                 const filePath = (0, import_path10.join)(this.outputDir, fileResult.file);
                 try {
-                  const content = await (0, import_promises4.readFile)(filePath, "utf-8");
+                  const content = await (0, import_promises5.readFile)(filePath, "utf-8");
                   const stripped = stripConflictMarkers(content);
-                  await (0, import_promises4.writeFile)(filePath, stripped);
+                  await (0, import_promises5.writeFile)(filePath, stripped);
                 } catch {
                 }
               }
@@ -25601,7 +25601,7 @@ var init_dist3 = __esm({
       async populateAccumulatorForPatch(patch, baseGen, currentTreeHash) {
         const fileResults = [];
         if (!baseGen) return fileResults;
-        const tempDir = await (0, import_promises4.mkdtemp)((0, import_path10.join)((0, import_os2.tmpdir)(), "replay-acc-"));
+        const tempDir = await (0, import_promises5.mkdtemp)((0, import_path10.join)((0, import_os2.tmpdir)(), "replay-acc-"));
         const { GitClient: GitClient2 } = await Promise.resolve().then(() => (init_GitClient(), GitClient_exports));
         const tempGit = new GitClient2(tempDir);
         await tempGit.exec(["init"]);
@@ -25615,7 +25615,7 @@ var init_dist3 = __esm({
             const snapshotForFile = patch.theirs_snapshot?.[resolvedPath] ?? patch.theirs_snapshot?.[filePath];
             const fileIsShared = this.accumulator.isShared(resolvedPath) || this.accumulator.isShared(filePath);
             const theirs = !fileIsShared && snapshotForFile != null ? snapshotForFile : await this.applyPatchToContent(base, patch.patch_content, filePath, tempGit, tempDir);
-            const finalOnDisk = await (0, import_promises4.readFile)((0, import_path10.join)(this.outputDir, resolvedPath), "utf-8").catch(() => null);
+            const finalOnDisk = await (0, import_promises5.readFile)((0, import_path10.join)(this.outputDir, resolvedPath), "utf-8").catch(() => null);
             const effectiveTheirs = theirs ?? finalOnDisk;
             if (effectiveTheirs != null) {
               this.accumulator.recordMerge(resolvedPath, effectiveTheirs, patch.base_generation);
@@ -25632,7 +25632,7 @@ var init_dist3 = __esm({
             }
           }
         } finally {
-          await (0, import_promises4.rm)(tempDir, { recursive: true }).catch(() => {
+          await (0, import_promises5.rm)(tempDir, { recursive: true }).catch(() => {
           });
         }
         return fileResults;
@@ -25662,7 +25662,7 @@ var init_dist3 = __esm({
           const snapshots = /* @__PURE__ */ new Map();
           for (const filePath of patch.files) {
             const fullPath = (0, import_path10.join)(this.outputDir, filePath);
-            snapshots.set(filePath, await (0, import_promises4.readFile)(fullPath, "utf-8").catch(() => null));
+            snapshots.set(filePath, await (0, import_promises5.readFile)(fullPath, "utf-8").catch(() => null));
           }
           try {
             await this.git.execWithInput(["apply", "--3way"], patch.patch_content);
@@ -25678,9 +25678,9 @@ var init_dist3 = __esm({
             for (const [filePath, content] of snapshots) {
               const fullPath = (0, import_path10.join)(this.outputDir, filePath);
               if (content != null) {
-                await (0, import_promises4.writeFile)(fullPath, content);
+                await (0, import_promises5.writeFile)(fullPath, content);
               } else {
-                await (0, import_promises4.unlink)(fullPath).catch(() => {
+                await (0, import_promises5.unlink)(fullPath).catch(() => {
                 });
               }
             }
@@ -25691,7 +25691,7 @@ var init_dist3 = __esm({
       async applyWithThreeWayMerge(patch) {
         const fileResults = [];
         const resolvedFiles = {};
-        const tempDir = await (0, import_promises4.mkdtemp)((0, import_path10.join)((0, import_os2.tmpdir)(), "replay-"));
+        const tempDir = await (0, import_promises5.mkdtemp)((0, import_path10.join)((0, import_os2.tmpdir)(), "replay-"));
         const { GitClient: GitClient2 } = await Promise.resolve().then(() => (init_GitClient(), GitClient_exports));
         const tempGit = new GitClient2(tempDir);
         await tempGit.exec(["init"]);
@@ -25714,7 +25714,7 @@ var init_dist3 = __esm({
             fileResults.push(result);
           }
         } finally {
-          await (0, import_promises4.rm)(tempDir, { recursive: true }).catch(() => {
+          await (0, import_promises5.rm)(tempDir, { recursive: true }).catch(() => {
           });
         }
         const conflictFiles = fileResults.filter((r2) => r2.status === "conflict");
@@ -25820,8 +25820,8 @@ var init_dist3 = __esm({
         try {
           if (sourceFilePath) {
             const tempSourcePath = (0, import_path10.join)(tempDir, sourceFilePath);
-            await (0, import_promises4.mkdir)((0, import_path10.dirname)(tempSourcePath), { recursive: true });
-            await (0, import_promises4.writeFile)(tempSourcePath, base);
+            await (0, import_promises5.mkdir)((0, import_path10.dirname)(tempSourcePath), { recursive: true });
+            await (0, import_promises5.writeFile)(tempSourcePath, base);
             await tempGit.exec(["add", sourceFilePath]);
             await tempGit.exec([
               "commit",
@@ -25831,15 +25831,15 @@ var init_dist3 = __esm({
             ]);
             await tempGit.execWithInput(["apply", "--allow-empty"], fileDiff);
             const tempTargetPath = (0, import_path10.join)(tempDir, filePath);
-            return await (0, import_promises4.readFile)(tempTargetPath, "utf-8");
+            return await (0, import_promises5.readFile)(tempTargetPath, "utf-8");
           }
           const tempFilePath = (0, import_path10.join)(tempDir, filePath);
-          await (0, import_promises4.mkdir)((0, import_path10.dirname)(tempFilePath), { recursive: true });
-          await (0, import_promises4.writeFile)(tempFilePath, base);
+          await (0, import_promises5.mkdir)((0, import_path10.dirname)(tempFilePath), { recursive: true });
+          await (0, import_promises5.writeFile)(tempFilePath, base);
           await tempGit.exec(["add", filePath]);
           await tempGit.exec(["commit", "-m", `base for ${filePath}`, "--allow-empty"]);
           await tempGit.execWithInput(["apply", "--allow-empty"], fileDiff);
-          return await (0, import_promises4.readFile)(tempFilePath, "utf-8");
+          return await (0, import_promises5.readFile)(tempFilePath, "utf-8");
         } catch {
           return null;
         }
@@ -25856,8 +25856,8 @@ var init_dist3 = __esm({
         if (!fileDiff) return false;
         try {
           const tempFilePath = (0, import_path10.join)(tempDir, filePath);
-          await (0, import_promises4.mkdir)((0, import_path10.dirname)(tempFilePath), { recursive: true });
-          await (0, import_promises4.writeFile)(tempFilePath, content);
+          await (0, import_promises5.mkdir)((0, import_path10.dirname)(tempFilePath), { recursive: true });
+          await (0, import_promises5.writeFile)(tempFilePath, content);
           await tempGit.exec(["add", filePath]);
           await tempGit.exec(["commit", "-m", `check already-applied ${filePath}`, "--allow-empty"]);
           await tempGit.execWithInput(["apply", "--reverse", "--check", "--allow-empty"], fileDiff);
@@ -26941,7 +26941,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         for (const file of files) {
           if (isBinaryFile(file)) continue;
           try {
-            const content = await (0, import_promises7.readFile)((0, import_path13.join)(this.outputDir, file), "utf-8");
+            const content = await (0, import_promises8.readFile)((0, import_path13.join)(this.outputDir, file), "utf-8");
             snapshot[file] = content;
           } catch {
           }
@@ -30360,7 +30360,7 @@ function resolve(...paths) {
 
 // src/cli.ts
 var import_fs17 = __toESM(require("fs"));
-var import_promises18 = require("fs/promises");
+var import_promises19 = require("fs/promises");
 var import_path26 = __toESM(require("path"));
 
 // ../../node_modules/.pnpm/yargs@17.7.2/node_modules/yargs/build/lib/yerror.js
@@ -36120,6 +36120,7 @@ var Octokit2 = Octokit.plugin(requestLog, legacyRestEndpointMethods, paginateRes
 );
 
 // src/github/GitHub.ts
+var import_promises3 = require("fs/promises");
 var GitHub = class {
   githubConfig;
   constructor({
@@ -36146,9 +36147,10 @@ var GitHub = class {
         await repository.pull(branch);
       }
       const fernIgnoreFiles = await this.getFernignoreFiles(repository);
+      const changelogFiles = await this.getChangelogFilesToPreserve(repository, sourceDirectory);
       await repository.overwriteLocalContents(sourceDirectory);
       await repository.add(".");
-      await this.restoreFiles(repository, fernIgnoreFiles);
+      await this.restoreFiles(repository, [...fernIgnoreFiles, ...changelogFiles]);
       await repository.commit("SDK Generation");
       if (isEmptyRepo) {
         await repository.pushUpstream(branch);
@@ -36185,9 +36187,10 @@ var GitHub = class {
       const prBranch = `fern-bot/${formattedDate}`;
       await repository.checkout(prBranch);
       const fernIgnoreFiles = await this.getFernignoreFiles(repository);
+      const changelogFiles = await this.getChangelogFilesToPreserve(repository, sourceDirectory);
       await repository.overwriteLocalContents(sourceDirectory);
       await repository.add(".");
-      await this.restoreFiles(repository, fernIgnoreFiles);
+      await this.restoreFiles(repository, [...fernIgnoreFiles, ...changelogFiles]);
       await repository.commit("SDK Generation");
       await repository.push();
       const apiBaseUrl = getGithubApiBaseUrl(this.githubConfig.uri);
@@ -36231,6 +36234,25 @@ var GitHub = class {
     const tracked = await repository.listTrackedFiles();
     return expandFernignorePatterns(fernignore, tracked);
   }
+  /**
+   * Returns tracked changelog files (e.g. `changelog.md`) that should be restored after
+   * `overwriteLocalContents`, so existing changelog entries are never wiped when the
+   * generated output doesn't include a changelog of its own.
+   */
+  async getChangelogFilesToPreserve(repository, sourceDirectory) {
+    const tracked = await repository.listTrackedFiles();
+    const trackedChangelogs = tracked.filter((file) => file.toLowerCase() === "changelog.md");
+    if (trackedChangelogs.length === 0) {
+      return [];
+    }
+    try {
+      const sourceFiles = await (0, import_promises3.readdir)(sourceDirectory);
+      const sourceHasChangelog = sourceFiles.some((file) => file.toLowerCase() === "changelog.md");
+      return sourceHasChangelog ? [] : trackedChangelogs;
+    } catch {
+      return trackedChangelogs;
+    }
+  }
   async restoreFiles(repository, files) {
     if (files.length === 0) {
       return;
@@ -40114,7 +40136,7 @@ var import_path20 = require("path");
 var import_tmp_promise2 = __toESM(require_tmp_promise());
 
 // src/replay/fernignore.ts
-var import_promises10 = require("fs/promises");
+var import_promises11 = require("fs/promises");
 var import_path19 = require("path");
 var REPLAY_FERNIGNORE_ENTRIES2 = [".fern/replay.lock", ".fern/replay.yml", ".gitattributes"];
 var GITATTRIBUTES_ENTRIES2 = [".fern/replay.lock linguist-generated=true"];
@@ -40122,14 +40144,14 @@ async function ensureReplayFernignoreEntries(outputDir) {
   const fernignorePath = (0, import_path19.join)(outputDir, ".fernignore");
   let content = "";
   try {
-    content = await (0, import_promises10.readFile)(fernignorePath, "utf-8");
+    content = await (0, import_promises11.readFile)(fernignorePath, "utf-8");
   } catch {
   }
   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" : "";
-    await (0, import_promises10.writeFile)(fernignorePath, content + suffix + toAdd.join("\n") + "\n", "utf-8");
+    await (0, import_promises11.writeFile)(fernignorePath, content + suffix + toAdd.join("\n") + "\n", "utf-8");
     return true;
   }
   return false;
@@ -40138,14 +40160,14 @@ async function ensureGitattributesEntries2(outputDir) {
   const gitattributesPath = (0, import_path19.join)(outputDir, ".gitattributes");
   let content = "";
   try {
-    content = await (0, import_promises10.readFile)(gitattributesPath, "utf-8");
+    content = await (0, import_promises11.readFile)(gitattributesPath, "utf-8");
   } catch {
   }
   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" : "";
-    await (0, import_promises10.writeFile)(gitattributesPath, content + suffix + toAdd.join("\n") + "\n", "utf-8");
+    await (0, import_promises11.writeFile)(gitattributesPath, content + suffix + toAdd.join("\n") + "\n", "utf-8");
   }
 }
 
@@ -40429,29 +40451,29 @@ function replayStatus(params) {
 }
 
 // src/configuration/loadGitHubConfig.ts
-var import_promises11 = require("fs/promises");
+var import_promises12 = require("fs/promises");
 async function loadGitHubConfig({
   absolutePathToConfig
 }) {
-  const rawContents = await (0, import_promises11.readFile)(absolutePathToConfig, "utf8");
+  const rawContents = await (0, import_promises12.readFile)(absolutePathToConfig, "utf8");
   return JSON.parse(rawContents);
 }
 
 // src/configuration/loadReadmeConfig.ts
-var import_promises12 = require("fs/promises");
+var import_promises13 = require("fs/promises");
 async function loadReadmeConfig({
   absolutePathToConfig
 }) {
-  const rawContents = await (0, import_promises12.readFile)(absolutePathToConfig, "utf8");
+  const rawContents = await (0, import_promises13.readFile)(absolutePathToConfig, "utf8");
   return JSON.parse(rawContents);
 }
 
 // src/configuration/loadReferenceConfig.ts
-var import_promises13 = require("fs/promises");
+var import_promises14 = require("fs/promises");
 async function loadReferenceConfig({
   absolutePathToConfig
 }) {
-  const rawContents = await (0, import_promises13.readFile)(absolutePathToConfig, "utf8");
+  const rawContents = await (0, import_promises14.readFile)(absolutePathToConfig, "utf8");
   return JSON.parse(rawContents);
 }
 
@@ -40478,7 +40500,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_promises15 = require("fs/promises");
+var import_promises16 = require("fs/promises");
 var import_path23 = require("path");
 
 // ../commons/logging-execa/lib/loggingExeca.js
@@ -40538,7 +40560,7 @@ async function loggingExeca(logger, executable, args = [], { doNotPipeOutput = f
 
 // src/autoversion/AutoVersioningService.ts
 var import_fs14 = require("fs");
-var import_promises14 = require("fs/promises");
+var import_promises15 = require("fs/promises");
 var import_path22 = require("path");
 var import_semver = __toESM(require_semver2());
 var AutoVersioningException = class extends Error {
@@ -41293,12 +41315,12 @@ var AutoVersioningService = class _AutoVersioningService {
       if (await this.isBinaryFile(filePath)) {
         return false;
       }
-      const content = await (0, import_promises14.readFile)(filePath, "utf-8");
+      const content = await (0, import_promises15.readFile)(filePath, "utf-8");
       if (!content.includes(mappedMagicVersion)) {
         return false;
       }
       const updated = content.split(mappedMagicVersion).join(finalVersion);
-      await (0, import_promises14.writeFile)(filePath, updated, "utf-8");
+      await (0, import_promises15.writeFile)(filePath, updated, "utf-8");
       return true;
     };
     const results = await this.processInParallel(files, replaceInFile);
@@ -41306,7 +41328,7 @@ var AutoVersioningService = class _AutoVersioningService {
     this.logger.debug(`Placeholder version replaced successfully in ${replacedCount} file(s)`);
   }
   async isBinaryFile(filePath) {
-    const fileHandle = await (0, import_promises14.open)(filePath, "r");
+    const fileHandle = await (0, import_promises15.open)(filePath, "r");
     try {
       const header = Buffer.alloc(8192);
       const { bytesRead } = await fileHandle.read(header, 0, 8192, 0);
@@ -41373,7 +41395,7 @@ var AutoVersioningService = class _AutoVersioningService {
    * Reads the module path from a go.mod file.
    */
   async readGoModulePath(goModPath) {
-    const content = await (0, import_promises14.readFile)(goModPath, "utf-8");
+    const content = await (0, import_promises15.readFile)(goModPath, "utf-8");
     for (const line of content.split("\n")) {
       const trimmed2 = line.trim();
       if (trimmed2.startsWith("module ")) {
@@ -41386,7 +41408,7 @@ var AutoVersioningService = class _AutoVersioningService {
    * Adds a version suffix to the module line in go.mod.
    */
   async addSuffixToGoMod(goModPath, modulePath, suffix) {
-    const content = await (0, import_promises14.readFile)(goModPath, "utf-8");
+    const content = await (0, import_promises15.readFile)(goModPath, "utf-8");
     const lines = content.split("\n");
     let changed = false;
     for (let i2 = 0; i2 < lines.length; i2++) {
@@ -41398,7 +41420,7 @@ var AutoVersioningService = class _AutoVersioningService {
       }
     }
     if (changed) {
-      await (0, import_promises14.writeFile)(goModPath, lines.join("\n"), "utf-8");
+      await (0, import_promises15.writeFile)(goModPath, lines.join("\n"), "utf-8");
       this.logger.debug(`Updated go.mod: added ${suffix} to module path`);
     }
   }
@@ -41407,10 +41429,10 @@ var AutoVersioningService = class _AutoVersioningService {
    */
   async walkDirectory(dir, filter2) {
     const results = [];
-    const entries2 = await (0, import_promises14.readdir)(dir);
+    const entries2 = await (0, import_promises15.readdir)(dir);
     for (const entry of entries2) {
       const fullPath = (0, import_path22.join)(dir, entry);
-      const entryStat = await (0, import_promises14.lstat)(fullPath);
+      const entryStat = await (0, import_promises15.lstat)(fullPath);
       if (entryStat.isSymbolicLink()) {
         continue;
       }
@@ -41449,7 +41471,7 @@ var AutoVersioningService = class _AutoVersioningService {
    * literals in a single .go file.
    */
   async addSuffixToGoFile(filePath, modulePath, suffix) {
-    const content = await (0, import_promises14.readFile)(filePath, "utf-8");
+    const content = await (0, import_promises15.readFile)(filePath, "utf-8");
     const lines = content.split("\n");
     let changed = false;
     let inImportBlock = false;
@@ -41475,7 +41497,7 @@ var AutoVersioningService = class _AutoVersioningService {
       }
     }
     if (changed) {
-      await (0, import_promises14.writeFile)(filePath, lines.join("\n"), "utf-8");
+      await (0, import_promises15.writeFile)(filePath, lines.join("\n"), "utf-8");
       this.logger.debug(`Updated Go imports in ${filePath}`);
     }
   }
@@ -41502,7 +41524,7 @@ var AutoVersioningService = class _AutoVersioningService {
    * preceded by an install command.
    */
   async addSuffixToMarkdownFile(filePath, modulePath, suffix) {
-    const content = await (0, import_promises14.readFile)(filePath, "utf-8");
+    const content = await (0, import_promises15.readFile)(filePath, "utf-8");
     if (!content.includes(modulePath)) {
       return;
     }
@@ -41514,7 +41536,7 @@ var AutoVersioningService = class _AutoVersioningService {
     );
     updated = updated.replace(installCommandPattern, `$1${modulePath}${suffix}`);
     if (updated !== content) {
-      await (0, import_promises14.writeFile)(filePath, updated, "utf-8");
+      await (0, import_promises15.writeFile)(filePath, updated, "utf-8");
       this.logger.debug(`Updated Go module path in ${filePath}`);
     }
   }
@@ -41560,6 +41582,41 @@ var AutoVersioningService = class _AutoVersioningService {
   }
 };
 
+// src/autoversion/changelogUtils.ts
+function prependChangelogBlock({
+  existingContent,
+  version: version2,
+  entry,
+  date: date2 = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10)
+}) {
+  const header = version2 != null ? `## [${version2}] - ${date2}
+` : `## ${date2}
+`;
+  const trimmedEntry = entry.trim();
+  const newBlock = trimmedEntry.length > 0 ? `${header}${trimmedEntry}
+
+` : `${header}
+`;
+  if (existingContent.trim().length === 0) {
+    return `# Changelog
+
+${newBlock}`;
+  }
+  if (existingContent.startsWith("# Changelog")) {
+    const newlineIdx = existingContent.indexOf("\n");
+    const headerLine = newlineIdx >= 0 ? existingContent.slice(0, newlineIdx) : existingContent;
+    const remainder = (newlineIdx >= 0 ? existingContent.slice(newlineIdx + 1) : "").replace(/^\s*\n/, "");
+    return `${headerLine}
+
+${newBlock}${remainder}`;
+  }
+  return `${newBlock}${existingContent}`;
+}
+function changelogContainsVersion(content, version2) {
+  const escaped = version2.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  return new RegExp(`^## \\[${escaped}\\]`, "m").test(content);
+}
+
 // src/autoversion/VersionUtils.ts
 var import_semver2 = __toESM(require_semver2());
 var MAGIC_VERSION = "0.0.0-fern-placeholder";
@@ -42237,32 +42294,11 @@ ${body}` : `${COMMIT_MARKER} ${subject}`;
   async prependChangelogEntry(params) {
     const { version: version2, entry } = params;
     const changelogPath = (0, import_path23.join)(this.outputDir, "changelog.md");
-    const now = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
-    const header = `## [${version2}] - ${now}
-`;
-    const newBlock = `${header}${entry.trim()}
-
-`;
     let existing = "";
     if ((0, import_fs15.existsSync)(changelogPath)) {
-      existing = await (0, import_promises15.readFile)(changelogPath, "utf-8");
+      existing = await (0, import_promises16.readFile)(changelogPath, "utf-8");
     }
-    let output;
-    if (existing.trim().length === 0) {
-      output = `# Changelog
-
-${newBlock}`;
-    } else if (existing.startsWith("# Changelog")) {
-      const newlineIdx = existing.indexOf("\n");
-      const headerLine = newlineIdx >= 0 ? existing.slice(0, newlineIdx) : existing;
-      const remainder = (newlineIdx >= 0 ? existing.slice(newlineIdx + 1) : "").replace(/^\s*\n/, "");
-      output = `${headerLine}
-
-${newBlock}${remainder}`;
-    } else {
-      output = `${newBlock}${existing}`;
-    }
-    await (0, import_promises15.writeFile)(changelogPath, output, "utf-8");
+    await (0, import_promises16.writeFile)(changelogPath, prependChangelogBlock({ existingContent: existing, version: version2, entry }), "utf-8");
   }
   brandMessage(message) {
     if (this.config.isWhitelabel) {
@@ -42536,7 +42572,7 @@ function tryRevParse(cwd2, rev) {
 }
 
 // src/pipeline/steps/GithubStep.ts
-var import_promises16 = require("fs/promises");
+var import_promises17 = require("fs/promises");
 var import_path24 = require("path");
 
 // src/pipeline/github/createReplayBranch.ts
@@ -43295,39 +43331,50 @@ var GithubStep = class extends BaseStep {
     this.logger.debug("Checking for .fernignore file...");
     const fernignorePath = (0, import_path24.join)(this.outputDir, ".fernignore");
     try {
-      await (0, import_promises16.access)(fernignorePath);
+      await (0, import_promises17.access)(fernignorePath);
       this.logger.debug(".fernignore already exists");
     } catch {
       this.logger.debug("Creating .fernignore file...");
-      await (0, import_promises16.writeFile)(fernignorePath, "# Specify files that shouldn't be modified by Fern\n", "utf-8");
+      await (0, import_promises17.writeFile)(fernignorePath, "# Specify files that shouldn't be modified by Fern\n", "utf-8");
     }
   }
   /**
-   * Guarantees `changelog.md` is present in the output directory whenever a changelog entry
-   * exists for this run, so the file lands in the committed tree that GithubStep pushes and the
+   * Guarantees `changelog.md` records this run whenever there is a changelog entry or a
+   * resolved version, so the file lands in the committed tree that GithubStep pushes and the
    * "See full changelog" link resolves. AutoVersionStep normally writes this file via
-   * `prependChangelogEntry`; this is a safety net for paths where that write never reached the
-   * directory GithubStep commits (e.g. non-replay self-hosted generation), which previously left
-   * the link pointing at a non-existent blob (404).
+   * `prependChangelogEntry`; this covers the paths where that write never reached the
+   * directory GithubStep commits (e.g. non-replay self-hosted generation) and explicitly
+   * versioned runs (`--version X.Y.Z`), which record a version-only entry with an empty
+   * description. Existing entries are always preserved — the new block is prepended.
    *
-   * Returns `true` when it created the file, `false` when the file already existed (or there is
-   * no changelog entry to write).
+   * Returns `true` when it created or modified the file, `false` when the version's entry was
+   * already recorded (e.g. by AutoVersionStep) or there is nothing to write.
    */
   async ensureChangelogFile(resolved) {
-    const entry = resolved.changelogEntry?.trim();
-    if (entry == null || entry.length === 0) {
+    const entry = resolved.changelogEntry?.trim() ?? "";
+    const version2 = resolved.newVersion ?? resolved.previousVersion;
+    if (entry.length === 0 && resolved.newVersion == null) {
       return false;
     }
     const changelogPath = (0, import_path24.join)(this.outputDir, "changelog.md");
+    let existing;
     try {
-      await (0, import_promises16.access)(changelogPath);
-      return false;
+      existing = await (0, import_promises17.readFile)(changelogPath, "utf-8");
     } catch {
-      const version2 = resolved.newVersion ?? resolved.previousVersion;
-      await (0, import_promises16.writeFile)(changelogPath, buildChangelogFileContents(entry, version2), "utf-8");
-      this.logger.debug(`Wrote changelog.md${version2 != null ? ` for ${version2}` : ""}.`);
-      return true;
+      existing = void 0;
+    }
+    if (existing != null) {
+      if (version2 == null || changelogContainsVersion(existing, version2)) {
+        return false;
+      }
     }
+    await (0, import_promises17.writeFile)(
+      changelogPath,
+      prependChangelogBlock({ existingContent: existing ?? "", version: version2, entry }),
+      "utf-8"
+    );
+    this.logger.debug(`Wrote changelog.md${version2 != null ? ` for ${version2}` : ""}.`);
+    return true;
   }
   deriveSkipCommit(replayResult) {
     if (replayResult == null) {
@@ -43412,18 +43459,6 @@ function resolveBranchAction({
   }
   return "create-from-head";
 }
-function buildChangelogFileContents(entry, version2) {
-  const trimmed2 = entry.trim();
-  const now = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
-  const header = version2 != null ? `## [${version2}] - ${now}
-` : `## ${now}
-`;
-  return `# Changelog
-
-${header}${trimmed2}
-
-`;
-}
 function resolveChangelogUrl({
   changelogEntry,
   changelogCommitted,
@@ -43599,7 +43634,7 @@ var ReplayStep = class extends BaseStep {
 };
 
 // ../cli/generation/local-generation/docker-utils/lib/runDocker.js
-var import_promises17 = require("fs/promises");
+var import_promises18 = require("fs/promises");
 var import_tmp_promise3 = __toESM(require_tmp_promise(), 1);
 async function pullImage(imageName, runner, signal) {
   await loggingExeca(void 0, runner ?? "docker", ["pull", imageName], {
@@ -43647,7 +43682,7 @@ async function execInContainer({ logger, containerId, command, runner, envVars =
   const logs = stdout + stderr;
   if (writeLogsToFile) {
     const tmpFile = await import_tmp_promise3.default.file();
-    await (0, import_promises17.writeFile)(tmpFile.path, logs);
+    await (0, import_promises18.writeFile)(tmpFile.path, logs);
     logger.info(`Generator logs here: ${tmpFile.path}`);
   }
   const resolvedExitCode = exitCode ?? 1;
@@ -44017,7 +44052,7 @@ void yargs_default(hideBin(process.argv)).scriptName(process.env.CLI_NAME ?? "ge
     const readmeConfig = await loadReadmeConfig({
       absolutePathToConfig: resolve(wd, argv.config)
     });
-    const originalReadmeContent = argv.originalReadme != null ? await (0, import_promises18.readFile)(argv.originalReadme, "utf8") : void 0;
+    const originalReadmeContent = argv.originalReadme != null ? await (0, import_promises19.readFile)(argv.originalReadme, "utf8") : void 0;
     await generateReadmeToStream({
       originalReadmeContent,
       readmeConfig,
@@ -44145,7 +44180,7 @@ void yargs_default(hideBin(process.argv)).scriptName(process.env.CLI_NAME ?? "ge
       try {
         const wd = cwd();
         const configValue = argv.config;
-        const configContent = configValue === STDIN_MARKER ? await readStdin() : configValue.trimStart().startsWith("{") ? configValue : await (0, import_promises18.readFile)(resolve(wd, configValue), "utf-8");
+        const configContent = configValue === STDIN_MARKER ? await readStdin() : configValue.trimStart().startsWith("{") ? configValue : await (0, import_promises19.readFile)(resolve(wd, configValue), "utf-8");
         let config;
         try {
           config = JSON.parse(configContent);
@@ -44441,7 +44476,7 @@ async function createWriteStream(outputPath) {
 }
 async function createWriteStreamFromFile(filepath) {
   if (!await doesPathExist(filepath)) {
-    await (0, import_promises18.mkdir)(import_path26.default.dirname(filepath), { recursive: true });
+    await (0, import_promises19.mkdir)(import_path26.default.dirname(filepath), { recursive: true });
   }
   return import_fs17.default.createWriteStream(filepath);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fern-api/generator-cli",
-  "version": "0.9.47",
+  "version": "0.9.48",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",