@fern-api/generator-cli 0.6.4 → 0.6.6

package/dist/api.js

@@ -5541,6 +5541,10 @@ var ClonedRepository = class _ClonedRepository {
       await this.git.push("origin", branch, { "--set-upstream": null });
     }
   }
+  async fetch(args) {
+    await this.git.cwd(this.clonePath);
+    await this.git.fetch(args);
+  }
   async pull(branch) {
     await this.git.cwd(this.clonePath);
     await this.git.pull("origin", branch);
@@ -5666,12 +5670,13 @@ var ClonedRepository = class _ClonedRepository {
     await this.git.push("origin", branch, { "--set-upstream": null });
   }
   // Only used by replay's PR mode to push synthetic divergent commits to a fern-bot/ branch.
-  // Uses --force-with-lease (not --force) so we fail safely if the branch was updated
-  // by someone else since we cloned. Never targets main or user branches.
+  // These branches are exclusively owned by the pipeline — no human pushes to them.
+  // Uses --force (not --force-with-lease) because the lease check fails after
+  // git fetch --unshallow updates remote refs. Never targets main or user branches.
   async forcePush() {
     await this.git.cwd(this.clonePath);
     const currentBranch = await this.getCurrentBranch();
-    await this.git.push("origin", currentBranch, ["--force-with-lease"]);
+    await this.git.push("origin", currentBranch, ["--force"]);
   }
   async createBranchFromHead(branchName) {
     await this.git.cwd(this.clonePath);
@@ -9666,16 +9671,19 @@ var consolePipelineLogger = {
 `)
 };
 
-// src/pipeline/steps/GithubStep.ts
-var import_rest2 = require("@octokit/rest");
-var import_promises2 = require("fs/promises");
-var import_path3 = require("path");
+// src/pipeline/PostGenerationPipeline.ts
+var import_child_process4 = require("child_process");
 
 // src/pipeline/github/constants.ts
 var FERN_BOT_NAME = "fern-api";
 var FERN_BOT_EMAIL = "115122769+fern-api[bot]@users.noreply.github.com";
 var FERN_BOT_LOGIN = "fern-api[bot]";
 
+// src/pipeline/steps/GithubStep.ts
+var import_rest2 = require("@octokit/rest");
+var import_promises2 = require("fs/promises");
+var import_path3 = require("path");
+
 // src/pipeline/github/createReplayBranch.ts
 async function createReplayBranch(repository, branchName, commitMessage, replayConflictInfo, logger) {
   if (replayConflictInfo?.hasConflicts) {
@@ -9835,10 +9843,10 @@ function logReplaySummary(result, logger) {
     `Replay: flow=${result.flow}, detected=${result.patchesDetected ?? 0}, applied=${applied}, absorbed=${absorbed}, conflicts=${conflicts2}`
   );
   if (preserved > 0) {
-    const absorbedNote = absorbed > 0 ? ` (${plural(absorbed, "customization")} now part of generated code)` : "";
-    logger.info(`Replay: ${plural(preserved, "customization")} preserved${absorbedNote}`);
+    const absorbedNote = absorbed > 0 ? ` (some customizations now part of generated code)` : "";
+    logger.info(`Replay: customizations preserved${absorbedNote}`);
   } else if (absorbed > 0) {
-    logger.info(`Replay: ${plural(absorbed, "customization")} now part of generated code`);
+    logger.info(`Replay: customizations now part of generated code`);
   }
   if (conflicts2 > 0) {
     const totalFiles = (result.conflictDetails ?? []).reduce((sum, d) => sum + d.files.length, 0);
@@ -9869,10 +9877,10 @@ function formatReplayPrBody(result, options) {
   }
   const parts = [];
   if (preserved > 0 && conflicts2 === 0) {
-    parts.push(`\u2705 ${plural(preserved, "customization")} automatically preserved in this update.`);
+    parts.push(`\u2705 Customizations automatically preserved in this update.`);
   } else if (preserved > 0) {
     parts.push(
-      `\u2705 ${plural(preserved, "customization")} automatically preserved, but ${plural(conflicts2, "file")} ${conflicts2 === 1 ? "needs" : "need"} your attention.`
+      `\u2705 Customizations automatically preserved, but ${plural(conflicts2, "file")} ${conflicts2 === 1 ? "needs" : "need"} your attention.`
     );
   }
   if (conflicts2 > 0) {
@@ -10031,16 +10039,13 @@ var GithubStep = class extends BaseStep {
     try {
       this.logger.debug("Starting GitHub self-hosted flow in directory: " + this.outputDir);
       const repository = ClonedRepository.createAtPath(this.outputDir);
-      const now = /* @__PURE__ */ new Date();
-      const formattedDate = now.toISOString().replace("T", "_").replace(/:/g, "-").replace("Z", "").replace(".", "_");
-      const newPrBranch = `fern-bot/${formattedDate}`;
       try {
-        await repository.setUserAndEmail({
-          name: FERN_BOT_NAME,
-          email: FERN_BOT_EMAIL
-        });
+        await repository.fetch(["--unshallow"]);
       } catch {
       }
+      const now = /* @__PURE__ */ new Date();
+      const formattedDate = now.toISOString().replace("T", "_").replace(/:/g, "-").replace("Z", "").replace(".", "_");
+      const newPrBranch = `fern-bot/${formattedDate}`;
       const mode = this.config.mode;
       switch (mode) {
         case "pull-request":
@@ -10728,6 +10733,13 @@ var PostGenerationPipeline = class {
   }
   steps = [];
   async run() {
+    if (this.config.github?.enabled) {
+      try {
+        (0, import_child_process4.execFileSync)("git", ["config", "user.name", FERN_BOT_NAME], { cwd: this.config.outputDir });
+        (0, import_child_process4.execFileSync)("git", ["config", "user.email", FERN_BOT_EMAIL], { cwd: this.config.outputDir });
+      } catch {
+      }
+    }
     const result = {
       success: true,
       steps: {}

package/dist/cli.js

@@ -19327,7 +19327,7 @@ var init_diff3 = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/@fern-api+replay@0.6.1/node_modules/@fern-api/replay/dist/index.js
+// ../../node_modules/.pnpm/@fern-api+replay@0.6.2/node_modules/@fern-api/replay/dist/index.js
 var dist_exports = {};
 __export(dist_exports, {
   FERN_BOT_EMAIL: () => FERN_BOT_EMAIL2,
@@ -19686,7 +19686,7 @@ function status(outputDir) {
 }
 var import_fs6, import_path8, import_yaml, import_crypto, import_promises4, import_os, import_path9, import_fs7, import_path10, import_crypto2, import_fs8, import_path11, import_yaml2, import_crypto3, import_fs9, import_path12, import_fs10, __defProp3, __getOwnPropNames3, __esm3, __export3, GitClient_exports, GitClient, init_GitClient, FERN_BOT_NAME2, FERN_BOT_EMAIL2, FERN_BOT_LOGIN2, FERN_SUPPORT_NAMES, LOCKFILE_HEADER, LockfileManager, INFRASTRUCTURE_FILES, ReplayDetector, BINARY_EXTENSIONS, ReplayApplicator, ReplayCommitter, ReplayService, FernignoreMigrator, REPLAY_FERNIGNORE_ENTRIES;
 var init_dist = __esm({
-  "../../node_modules/.pnpm/@fern-api+replay@0.6.1/node_modules/@fern-api/replay/dist/index.js"() {
+  "../../node_modules/.pnpm/@fern-api+replay@0.6.2/node_modules/@fern-api/replay/dist/index.js"() {
     "use strict";
     init_esm4();
     import_fs6 = require("fs");
@@ -20560,12 +20560,12 @@ CLI Version: ${options.cliVersion}`;
         await this.git.exec(["commit", "-m", fullMessage]);
         return (await this.git.exec(["rev-parse", "HEAD"])).trim();
       }
-      async commitReplay(patchCount, patches) {
+      async commitReplay(_patchCount, patches) {
         await this.stageAll();
         if (!await this.hasStagedChanges()) {
           return (await this.git.exec(["rev-parse", "HEAD"])).trim();
         }
-        let fullMessage = `[fern-replay] Applied ${patchCount} customization(s)`;
+        let fullMessage = `[fern-replay] Applied customizations`;
         if (patches && patches.length > 0) {
           fullMessage += "\n\nPatches replayed:";
           for (const patch of patches) {
@@ -22992,6 +22992,10 @@ var ClonedRepository = class _ClonedRepository {
       await this.git.push("origin", branch, { "--set-upstream": null });
     }
   }
+  async fetch(args) {
+    await this.git.cwd(this.clonePath);
+    await this.git.fetch(args);
+  }
   async pull(branch) {
     await this.git.cwd(this.clonePath);
     await this.git.pull("origin", branch);
@@ -23117,12 +23121,13 @@ var ClonedRepository = class _ClonedRepository {
     await this.git.push("origin", branch, { "--set-upstream": null });
   }
   // Only used by replay's PR mode to push synthetic divergent commits to a fern-bot/ branch.
-  // Uses --force-with-lease (not --force) so we fail safely if the branch was updated
-  // by someone else since we cloned. Never targets main or user branches.
+  // These branches are exclusively owned by the pipeline — no human pushes to them.
+  // Uses --force (not --force-with-lease) because the lease check fails after
+  // git fetch --unshallow updates remote refs. Never targets main or user branches.
   async forcePush() {
     await this.git.cwd(this.clonePath);
     const currentBranch = await this.getCurrentBranch();
-    await this.git.push("origin", currentBranch, ["--force-with-lease"]);
+    await this.git.push("origin", currentBranch, ["--force"]);
   }
   async createBranchFromHead(branchName) {
     await this.git.cwd(this.clonePath);
@@ -30827,15 +30832,18 @@ var consolePipelineLogger = {
 `)
 };
 
-// src/pipeline/steps/GithubStep.ts
-var import_promises3 = require("fs/promises");
-var import_path7 = require("path");
+// src/pipeline/PostGenerationPipeline.ts
+var import_child_process4 = require("child_process");
 
 // src/pipeline/github/constants.ts
 var FERN_BOT_NAME = "fern-api";
 var FERN_BOT_EMAIL = "115122769+fern-api[bot]@users.noreply.github.com";
 var FERN_BOT_LOGIN = "fern-api[bot]";
 
+// src/pipeline/steps/GithubStep.ts
+var import_promises3 = require("fs/promises");
+var import_path7 = require("path");
+
 // src/pipeline/github/createReplayBranch.ts
 async function createReplayBranch(repository, branchName, commitMessage, replayConflictInfo, logger) {
   if (replayConflictInfo?.hasConflicts) {
@@ -30996,10 +31004,10 @@ function formatReplayPrBody(result, options) {
   }
   const parts = [];
   if (preserved > 0 && conflicts2 === 0) {
-    parts.push(`\u2705 ${plural(preserved, "customization")} automatically preserved in this update.`);
+    parts.push(`\u2705 Customizations automatically preserved in this update.`);
   } else if (preserved > 0) {
     parts.push(
-      `\u2705 ${plural(preserved, "customization")} automatically preserved, but ${plural(conflicts2, "file")} ${conflicts2 === 1 ? "needs" : "need"} your attention.`
+      `\u2705 Customizations automatically preserved, but ${plural(conflicts2, "file")} ${conflicts2 === 1 ? "needs" : "need"} your attention.`
     );
   }
   if (conflicts2 > 0) {
@@ -31158,16 +31166,13 @@ var GithubStep = class extends BaseStep {
     try {
       this.logger.debug("Starting GitHub self-hosted flow in directory: " + this.outputDir);
       const repository = ClonedRepository.createAtPath(this.outputDir);
-      const now = /* @__PURE__ */ new Date();
-      const formattedDate = now.toISOString().replace("T", "_").replace(/:/g, "-").replace("Z", "").replace(".", "_");
-      const newPrBranch = `fern-bot/${formattedDate}`;
       try {
-        await repository.setUserAndEmail({
-          name: FERN_BOT_NAME,
-          email: FERN_BOT_EMAIL
-        });
+        await repository.fetch(["--unshallow"]);
       } catch {
       }
+      const now = /* @__PURE__ */ new Date();
+      const formattedDate = now.toISOString().replace("T", "_").replace(/:/g, "-").replace("Z", "").replace(".", "_");
+      const newPrBranch = `fern-bot/${formattedDate}`;
       const mode = this.config.mode;
       switch (mode) {
         case "pull-request":
@@ -31855,6 +31860,13 @@ var PostGenerationPipeline = class {
   }
   steps = [];
   async run() {
+    if (this.config.github?.enabled) {
+      try {
+        (0, import_child_process4.execFileSync)("git", ["config", "user.name", FERN_BOT_NAME], { cwd: this.config.outputDir });
+        (0, import_child_process4.execFileSync)("git", ["config", "user.email", FERN_BOT_EMAIL], { cwd: this.config.outputDir });
+      } catch {
+      }
+    }
     const result = {
       success: true,
       steps: {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fern-api/generator-cli",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",
@@ -22,7 +22,7 @@
     "**"
   ],
   "dependencies": {
-    "@fern-api/replay": "^0.6.1",
+    "@fern-api/replay": "^0.6.2",
     "@octokit/rest": "^22.0.1",
     "es-toolkit": "^1.39.10",
     "tmp-promise": "^3.0.3"