@fern-api/generator-cli 0.9.9 → 0.9.10

package/dist/api.js

@@ -10377,13 +10377,17 @@ var GithubStep = class extends BaseStep {
     });
     switch (branchAction) {
       case "replay-branch":
-        generationBaseSha = await createReplayBranch(
-          repository,
-          prBranch,
-          this.config.commitMessage,
-          replayConflictInfo,
-          this.logger
-        );
+        if (shouldPushGenerationBaseTag(replayResult)) {
+          generationBaseSha = await createReplayBranch(
+            repository,
+            prBranch,
+            this.config.commitMessage,
+            replayConflictInfo,
+            this.logger
+          );
+        } else {
+          await repository.createBranchFromHead(prBranch);
+        }
         break;
       case "create-from-head":
         await repository.createBranchFromHead(prBranch);
@@ -10592,6 +10596,9 @@ _Fern Run ID: \`${config.runId}\`_`;
 function shouldEnableAutomerge(config) {
   return config.automationMode === true && config.autoMerge === true && config.hasBreakingChanges !== true;
 }
+function shouldPushGenerationBaseTag(replayResult) {
+  return (replayResult?.patchesWithConflicts ?? 0) > 0;
+}
 function resolveBranchAction({
   automationMode,
   skipCommit,
@@ -10730,18 +10737,24 @@ async function replayRun(params) {
       }
     }
     if (shouldSync && tagSha != null) {
-      const syncService = new import_replay.ReplayService(outputDir, { enabled: true });
-      await syncService.syncFromDivergentMerge(tagSha, {
-        cliVersion,
-        generatorVersions,
-        baseBranchHead: baseBranchHead ?? void 0
-      });
-      try {
-        const freshLockManager = new import_replay.LockfileManager(outputDir);
-        if (freshLockManager.exists()) {
-          previousGenerationSha = freshLockManager.read().current_generation;
+      if (!isTagMergedIntoHead(outputDir, tagSha)) {
+        logger?.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 import_replay.ReplayService(outputDir, { enabled: true });
+        await syncService.syncFromDivergentMerge(tagSha, {
+          cliVersion,
+          generatorVersions,
+          baseBranchHead: baseBranchHead ?? void 0
+        });
+        try {
+          const freshLockManager = new import_replay.LockfileManager(outputDir);
+          if (freshLockManager.exists()) {
+            previousGenerationSha = freshLockManager.read().current_generation;
+          }
+        } catch {
         }
-      } catch {
       }
     }
   }
@@ -10791,6 +10804,30 @@ async function replayRun(params) {
     baseBranchHead: resolvedBaseBranchHead
   };
 }
+function isTagMergedIntoHead(cwd2, tagSha) {
+  try {
+    (0, import_child_process3.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, import_child_process3.execFileSync)("git", ["log", "HEAD", "--format=%T", "--max-count=500"], {
+      cwd: cwd2,
+      encoding: "utf-8",
+      stdio: "pipe"
+    });
+    return trees.split("\n").some((t2) => t2.trim() === tagTree);
+  } catch {
+    return false;
+  }
+}
 function gitRevParse(cwd2, rev) {
   try {
     return (0, import_child_process3.execFileSync)("git", ["rev-parse", "--verify", rev], {

package/dist/cli.js

@@ -33772,13 +33772,17 @@ var GithubStep = class extends BaseStep {
     });
     switch (branchAction) {
       case "replay-branch":
-        generationBaseSha = await createReplayBranch(
-          repository,
-          prBranch,
-          this.config.commitMessage,
-          replayConflictInfo,
-          this.logger
-        );
+        if (shouldPushGenerationBaseTag(replayResult)) {
+          generationBaseSha = await createReplayBranch(
+            repository,
+            prBranch,
+            this.config.commitMessage,
+            replayConflictInfo,
+            this.logger
+          );
+        } else {
+          await repository.createBranchFromHead(prBranch);
+        }
         break;
       case "create-from-head":
         await repository.createBranchFromHead(prBranch);
@@ -33987,6 +33991,9 @@ _Fern Run ID: \`${config.runId}\`_`;
 function shouldEnableAutomerge(config) {
   return config.automationMode === true && config.autoMerge === true && config.hasBreakingChanges !== true;
 }
+function shouldPushGenerationBaseTag(replayResult) {
+  return (replayResult?.patchesWithConflicts ?? 0) > 0;
+}
 function resolveBranchAction({
   automationMode,
   skipCommit,
@@ -34125,18 +34132,24 @@ async function replayRun(params) {
       }
     }
     if (shouldSync && tagSha != null) {
-      const syncService = new ReplayService(outputDir, { enabled: true });
-      await syncService.syncFromDivergentMerge(tagSha, {
-        cliVersion,
-        generatorVersions,
-        baseBranchHead: baseBranchHead ?? void 0
-      });
-      try {
-        const freshLockManager = new LockfileManager(outputDir);
-        if (freshLockManager.exists()) {
-          previousGenerationSha = freshLockManager.read().current_generation;
+      if (!isTagMergedIntoHead(outputDir, tagSha)) {
+        logger?.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 ReplayService(outputDir, { enabled: true });
+        await syncService.syncFromDivergentMerge(tagSha, {
+          cliVersion,
+          generatorVersions,
+          baseBranchHead: baseBranchHead ?? void 0
+        });
+        try {
+          const freshLockManager = new LockfileManager(outputDir);
+          if (freshLockManager.exists()) {
+            previousGenerationSha = freshLockManager.read().current_generation;
+          }
+        } catch {
         }
-      } catch {
       }
     }
   }
@@ -34186,6 +34199,30 @@ async function replayRun(params) {
     baseBranchHead: resolvedBaseBranchHead
   };
 }
+function isTagMergedIntoHead(cwd2, tagSha) {
+  try {
+    (0, import_child_process3.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, import_child_process3.execFileSync)("git", ["log", "HEAD", "--format=%T", "--max-count=500"], {
+      cwd: cwd2,
+      encoding: "utf-8",
+      stdio: "pipe"
+    });
+    return trees.split("\n").some((t2) => t2.trim() === tagTree);
+  } catch {
+    return false;
+  }
+}
 function gitRevParse(cwd2, rev) {
   try {
     return (0, import_child_process3.execFileSync)("git", ["rev-parse", "--verify", rev], {

package/package.json

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