@fern-api/fern-api-dev 4.75.0-5-g68e18dd3bdb → 4.76.0-1-g4629aee782f

package/cli.cjs

@@ -345167,6 +345167,7 @@ var require_GithubStep = __commonJS({
     exports2.GithubStep = void 0;
     exports2.enrichPrBodyForAutomation = enrichPrBodyForAutomation;
     exports2.shouldEnableAutomerge = shouldEnableAutomerge;
+    exports2.shouldPushGenerationBaseTag = shouldPushGenerationBaseTag;
     exports2.resolveBranchAction = resolveBranchAction;
     var core_utils_1 = (init_lib4(), __toCommonJS(lib_exports));
     var github_1 = (init_lib7(), __toCommonJS(lib_exports3));
@@ -345246,7 +345247,11 @@ var require_GithubStep = __commonJS({
         });
         switch (branchAction) {
           case "replay-branch":
-            generationBaseSha = await (0, createReplayBranch_1.createReplayBranch)(repository, prBranch, this.config.commitMessage, replayConflictInfo, this.logger);
+            if (shouldPushGenerationBaseTag(replayResult)) {
+              generationBaseSha = await (0, createReplayBranch_1.createReplayBranch)(repository, prBranch, this.config.commitMessage, replayConflictInfo, this.logger);
+            } else {
+              await repository.createBranchFromHead(prBranch);
+            }
             break;
           case "create-from-head":
             await repository.createBranchFromHead(prBranch);
@@ -345444,6 +345449,9 @@ _Fern Run ID: \`${config5.runId}\`_`;
     function shouldEnableAutomerge(config5) {
       return config5.automationMode === true && config5.autoMerge === true && config5.hasBreakingChanges !== true;
     }
+    function shouldPushGenerationBaseTag(replayResult) {
+      return (replayResult?.patchesWithConflicts ?? 0) > 0;
+    }
     function resolveBranchAction({ automationMode, skipCommit, existingPR }) {
       if (skipCommit) {
         return "replay-branch";
@@ -354642,6 +354650,7 @@ var require_replay_run = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.replayRun = replayRun;
+    exports2.isTagMergedIntoHead = isTagMergedIntoHead;
     var replay_1 = require_dist14();
     var child_process_1 = require("child_process");
     var fs_1 = require("fs");
@@ -354686,18 +354695,22 @@ var require_replay_run = __commonJS({
           }
         }
         if (shouldSync && tagSha != null) {
-          const syncService = new replay_1.ReplayService(outputDir, { enabled: true });
-          await syncService.syncFromDivergentMerge(tagSha, {
-            cliVersion,
-            generatorVersions,
-            baseBranchHead: baseBranchHead ?? void 0
-          });
-          try {
-            const freshLockManager = new replay_1.LockfileManager(outputDir);
-            if (freshLockManager.exists()) {
-              previousGenerationSha = freshLockManager.read().current_generation;
+          if (!isTagMergedIntoHead(outputDir, tagSha)) {
+            logger4?.warn(`fern-generation-base tag ${tagSha} is not reachable from HEAD \u2014 skipping divergent-merge sync. The tag likely points at an unmerged generation (PR closed without merge).`);
+          } else {
+            const syncService = new replay_1.ReplayService(outputDir, { enabled: true });
+            await syncService.syncFromDivergentMerge(tagSha, {
+              cliVersion,
+              generatorVersions,
+              baseBranchHead: baseBranchHead ?? void 0
+            });
+            try {
+              const freshLockManager = new replay_1.LockfileManager(outputDir);
+              if (freshLockManager.exists()) {
+                previousGenerationSha = freshLockManager.read().current_generation;
+              }
+            } catch {
             }
-          } catch {
           }
         }
       }
@@ -354747,6 +354760,30 @@ var require_replay_run = __commonJS({
         baseBranchHead: resolvedBaseBranchHead
       };
     }
+    function isTagMergedIntoHead(cwd2, tagSha) {
+      try {
+        (0, child_process_1.execFileSync)("git", ["merge-base", "--is-ancestor", tagSha, "HEAD"], {
+          cwd: cwd2,
+          stdio: "pipe"
+        });
+        return true;
+      } catch {
+      }
+      const tagTree = gitRevParse(cwd2, `${tagSha}^{tree}`);
+      if (tagTree == null) {
+        return false;
+      }
+      try {
+        const trees = (0, child_process_1.execFileSync)("git", ["log", "HEAD", "--format=%T", "--max-count=500"], {
+          cwd: cwd2,
+          encoding: "utf-8",
+          stdio: "pipe"
+        });
+        return trees.split("\n").some((t3) => t3.trim() === tagTree);
+      } catch {
+        return false;
+      }
+    }
     function gitRevParse(cwd2, rev) {
       try {
         return (0, child_process_1.execFileSync)("git", ["rev-parse", "--verify", rev], {
@@ -621915,7 +621952,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.75.0-5-g68e18dd3bdb",
+          version: "4.76.0-1-g4629aee782f",
           usingAccessToken: true
         }
       });
@@ -621969,7 +622006,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.75.0-5-g68e18dd3bdb",
+        version: "4.76.0-1-g4629aee782f",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -839179,7 +839216,7 @@ var LOCAL_STORAGE_FOLDER4 = ".fern-dev";
 var LOGS_FOLDER_NAME = "logs";
 var MAX_LOGS_DIR_SIZE_BYTES = 100 * 1024 * 1024;
 function getCliSource() {
-  const version7 = "4.75.0-5-g68e18dd3bdb";
+  const version7 = "4.76.0-1-g4629aee782f";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -850494,7 +850531,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.75.0-5-g68e18dd3bdb"
+        cliVersion: "4.76.0-1-g4629aee782f"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
         return { success: false };
@@ -924952,7 +924989,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.75.0-5-g68e18dd3bdb";
+    return "4.76.0-1-g4629aee782f";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.75.0-5-g68e18dd3bdb",
+  "version": "4.76.0-1-g4629aee782f",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",