@fern-api/generator-cli 0.9.5 → 0.9.7

package/dist/api.d.ts

@@ -549,6 +549,16 @@ interface GithubStepConfig {
         previousGenerationSha: string;
         currentGenerationSha: string;
     };
+    /** When true: separate PRs per generation, no-diff skip, automerge support, run_id in body */
+    automationMode?: boolean;
+    /** Enable GitHub automerge on the PR (only effective when automationMode && !hasBreakingChanges) */
+    autoMerge?: boolean;
+    /** Pre-computed: version bump is MAJOR (from --version AUTO AI analysis) */
+    hasBreakingChanges?: boolean;
+    /** Human-readable breaking changes summary for PR body (from autoVersioningPrDescription on MAJOR) */
+    breakingChangesSummary?: string;
+    /** FERN_RUN_ID for cross-repo correlation (set by GitHub Action) */
+    runId?: string;
 }
 interface PipelineResult {
     success: boolean;
@@ -593,6 +603,10 @@ interface GithubStepResult extends StepResult {
     prNumber?: number;
     updatedExistingPr?: boolean;
     generationBaseTagSha?: string;
+    /** True when generation produced no changes vs base branch — PR skipped */
+    skippedNoDiff?: boolean;
+    /** True when automerge was enabled on the PR */
+    autoMergeEnabled?: boolean;
 }
 interface StepResult {
     executed: boolean;

package/dist/api.js

@@ -6022,6 +6022,24 @@ var ClonedRepository = class _ClonedRepository {
     const result = await this.git.raw(["rev-parse", `${commitSha}^{tree}`]);
     return result.trim();
   }
+  /**
+   * Returns true if the working tree has uncommitted changes (staged or unstaged).
+   */
+  async hasChanges() {
+    await this.git.cwd(this.clonePath);
+    const status2 = await this.git.status();
+    return !status2.isClean();
+  }
+  /**
+   * Compares the tree hash of HEAD against a ref (e.g. `origin/main`).
+   * Returns true if the trees are identical (no content difference).
+   * Useful for detecting no-diff after committing — if trees match, the commit is a no-op.
+   */
+  async treeHashEquals(ref) {
+    const headTree = await this.getHeadTreeHash();
+    const refTree = await this.getCommitTreeHash(ref);
+    return headTree === refTree;
+  }
   // This tag is a moving pointer (fern-generation-base--<generator>) that tracks the latest
   // clean generation SHA. --force is required because: (1) the tag is intentionally overwritten
   // each generation, and (2) --force-with-lease doesn't work for tags since git tag -f overwrites
@@ -10311,31 +10329,32 @@ var GithubStep = class extends BaseStep {
     const baseBranch = this.config.branch ?? await repository.getDefaultBranch();
     const octokit = new import_rest2.Octokit({ auth: this.config.token });
     const { owner, repo } = parseRepository(this.config.uri);
-    const existingPR = await findExistingUpdatablePR(octokit, owner, repo, baseBranch, this.logger);
     let prBranch;
     let isUpdatingExistingPR = false;
     let generationBaseSha;
+    let existingPR;
+    if (!this.config.automationMode) {
+      existingPR = await findExistingUpdatablePR(octokit, owner, repo, baseBranch, this.logger);
+    }
     if (existingPR != null) {
       this.logger.info(
         `Found existing updatable PR #${existingPR.number}, will update branch ${existingPR.headBranch}`
       );
       prBranch = existingPR.headBranch;
       isUpdatingExistingPR = true;
-      if (skipCommit) {
-        generationBaseSha = await createReplayBranch(
-          repository,
-          prBranch,
-          this.config.commitMessage,
-          replayConflictInfo,
-          this.logger
-        );
-      } else {
-        await repository.checkoutRemoteBranch(prBranch);
-      }
     } else {
-      this.logger.debug(`No existing updatable PR found, creating new branch ${newPrBranch}`);
+      this.logger.debug(
+        this.config.automationMode ? `Automation mode: creating new branch ${newPrBranch}` : `No existing updatable PR found, creating new branch ${newPrBranch}`
+      );
       prBranch = newPrBranch;
-      if (skipCommit) {
+    }
+    const branchAction = resolveBranchAction({
+      automationMode: this.config.automationMode === true,
+      skipCommit,
+      existingPR
+    });
+    switch (branchAction) {
+      case "replay-branch":
         generationBaseSha = await createReplayBranch(
           repository,
           prBranch,
@@ -10343,8 +10362,16 @@ var GithubStep = class extends BaseStep {
           replayConflictInfo,
           this.logger
         );
-      } else {
-        await repository.checkout(prBranch);
+        break;
+      case "create-from-head":
+        await repository.createBranchFromHead(prBranch);
+        break;
+      case "checkout-remote":
+        await repository.checkoutRemoteBranch(prBranch);
+        break;
+      default: {
+        const _exhaustive = branchAction;
+        throw new Error(`Unexpected branch action: ${String(_exhaustive)}`);
       }
     }
     if (!skipCommit) {
@@ -10354,6 +10381,13 @@ var GithubStep = class extends BaseStep {
       await repository.commitAllChanges(finalCommitMessage2);
       this.logger.debug(`Committed changes to local copy of GitHub repository at ${this.outputDir}`);
     }
+    if (this.config.automationMode) {
+      const noDiff = await repository.treeHashEquals(`origin/${baseBranch}`);
+      if (noDiff) {
+        this.logger.info("No changes detected after generation \u2014 skipping PR creation");
+        return { executed: true, success: true, skippedNoDiff: true };
+      }
+    }
     const result = {
       executed: true,
       success: true,
@@ -10388,7 +10422,8 @@ var GithubStep = class extends BaseStep {
       this.config.versionBumpReason
     );
     const replaySection = formatReplayPrBody(replayResult, { branchName: prBranch, repoUri: this.config.uri });
-    const enrichedBody = replaySection != null ? prBody + "\n\n---\n\n" + replaySection : prBody;
+    let enrichedBody = replaySection != null ? prBody + "\n\n---\n\n" + replaySection : prBody;
+    enrichedBody = enrichPrBodyForAutomation(enrichedBody, this.config);
     if (isUpdatingExistingPR && existingPR != null) {
       this.logger.info(`Updated existing pull request: ${existingPR.htmlUrl}`);
       result.prUrl = existingPR.htmlUrl;
@@ -10419,6 +10454,23 @@ var GithubStep = class extends BaseStep {
         this.logger.info(`Created pull request: ${pullRequest.html_url}`);
         result.prUrl = pullRequest.html_url;
         result.prNumber = pullRequest.number;
+        if (shouldEnableAutomerge(this.config) && pullRequest.node_id) {
+          try {
+            await octokit.graphql(
+              `mutation($pullRequestId: ID!) {
+                                enablePullRequestAutoMerge(input: {
+                                    pullRequestId: $pullRequestId,
+                                    mergeMethod: SQUASH
+                                }) { clientMutationId }
+                            }`,
+              { pullRequestId: pullRequest.node_id }
+            );
+            this.logger.info(`Enabled automerge on PR #${pullRequest.number}`);
+            result.autoMergeEnabled = true;
+          } catch (autoMergeError) {
+            this.logger.warn(`Could not enable automerge: ${extractErrorMessage(autoMergeError)}`);
+          }
+        }
       } catch (error) {
         const message = extractErrorMessage(error);
         if (message.includes("A pull request already exists for")) {
@@ -10431,6 +10483,7 @@ var GithubStep = class extends BaseStep {
     return result;
   }
   async executePushMode(repository) {
+    const baseBranch = this.config.branch ?? await repository.getDefaultBranch();
     if (this.config.branch != null) {
       this.logger.debug(`Checking out branch ${this.config.branch}`);
       await repository.checkout(this.config.branch);
@@ -10440,6 +10493,13 @@ var GithubStep = class extends BaseStep {
     const finalCommitMessage = this.config.commitMessage ?? "SDK Generation";
     await repository.commitAllChanges(finalCommitMessage);
     this.logger.debug(`Committed changes to local copy of GitHub repository at ${this.outputDir}`);
+    if (this.config.automationMode) {
+      const noDiff = await repository.treeHashEquals(`origin/${baseBranch}`);
+      if (noDiff) {
+        this.logger.info("No changes detected after generation \u2014 skipping push");
+        return { executed: true, success: true, skippedNoDiff: true };
+      }
+    }
     const result = {
       executed: true,
       success: true
@@ -10484,6 +10544,42 @@ var GithubStep = class extends BaseStep {
     return void 0;
   }
 };
+function enrichPrBodyForAutomation(body, config) {
+  if (!config.automationMode) {
+    return body;
+  }
+  let result = body;
+  if (config.hasBreakingChanges && config.breakingChangesSummary) {
+    result += "\n\n---\n\n## \u26A0\uFE0F Breaking Changes\n\nThis release contains breaking changes that require manual review:\n\n" + config.breakingChangesSummary;
+  }
+  if (config.runId) {
+    result += `
+
+---
+
+_Fern Run ID: \`${config.runId}\`_`;
+  }
+  return result;
+}
+function shouldEnableAutomerge(config) {
+  return config.automationMode === true && config.autoMerge === true && config.hasBreakingChanges !== true;
+}
+function resolveBranchAction({
+  automationMode,
+  skipCommit,
+  existingPR
+}) {
+  if (skipCommit) {
+    return "replay-branch";
+  }
+  if (automationMode) {
+    return "create-from-head";
+  }
+  if (existingPR != null) {
+    return "checkout-remote";
+  }
+  return "create-from-head";
+}
 
 // src/replay/replay-run.ts
 var import_replay = require("@fern-api/replay");

package/dist/cli.js

@@ -20098,7 +20098,7 @@ var init_diff3 = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/@fern-api+replay@0.10.2/node_modules/@fern-api/replay/dist/index.js
+// ../../node_modules/.pnpm/@fern-api+replay@0.10.4/node_modules/@fern-api/replay/dist/index.js
 var dist_exports = {};
 __export(dist_exports, {
   FERN_BOT_EMAIL: () => FERN_BOT_EMAIL2,
@@ -21063,7 +21063,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, HybridReconstruction_exports, init_HybridReconstruction, FERN_BOT_NAME2, FERN_BOT_EMAIL2, FERN_BOT_LOGIN2, 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.10.2/node_modules/@fern-api/replay/dist/index.js"() {
+  "../../node_modules/.pnpm/@fern-api+replay@0.10.4/node_modules/@fern-api/replay/dist/index.js"() {
     "use strict";
     init_esm4();
     import_fs6 = require("fs");
@@ -21427,6 +21427,7 @@ var init_dist3 = __esm({
         }
         const log = await this.git.exec([
           "log",
+          "--first-parent",
           "--format=%H%x00%an%x00%ae%x00%s",
           `${lastGen.commit_sha}..HEAD`,
           "--",
@@ -21442,11 +21443,20 @@ var init_dist3 = __esm({
           if (isGenerationCommit(commit)) {
             continue;
           }
-          const parents = await this.git.getCommitParents(commit.sha);
-          if (parents.length > 1) {
+          if (lock.patches.find((p) => p.original_commit === commit.sha)) {
             continue;
           }
-          if (lock.patches.find((p) => p.original_commit === commit.sha)) {
+          const parents = await this.git.getCommitParents(commit.sha);
+          if (parents.length > 1) {
+            const compositePatch = await this.createMergeCompositePatch({
+              mergeCommit: commit,
+              firstParent: parents[0],
+              lastGen,
+              lock
+            });
+            if (compositePatch) {
+              newPatches.push(compositePatch);
+            }
             continue;
           }
           let patchContent;
@@ -21545,6 +21555,46 @@ var init_dist3 = __esm({
         const normalized = patchContent.split("\n").filter((line) => !line.startsWith("From ") && !line.startsWith("index ") && !line.startsWith("Date: ")).join("\n");
         return `sha256:${(0, import_crypto.createHash)("sha256").update(normalized).digest("hex")}`;
       }
+      /**
+       * Create a single composite patch for a merge commit by diffing the merge
+       * commit against its first parent. This captures the net change of the
+       * entire merged branch as one patch, eliminating accumulator chaining and
+       * zero-net-change ghost conflicts.
+       */
+      async createMergeCompositePatch(input) {
+        const { mergeCommit, firstParent, lastGen, lock } = input;
+        const forgottenHashes = new Set(lock.forgotten_hashes ?? []);
+        const filesOutput = await this.git.exec([
+          "diff",
+          "--name-only",
+          firstParent,
+          mergeCommit.sha
+        ]);
+        const files = filesOutput.trim().split("\n").filter(Boolean).filter((f2) => !INFRASTRUCTURE_FILES.has(f2)).filter((f2) => !f2.startsWith(".fern/"));
+        if (files.length === 0) return null;
+        const diff = await this.git.exec([
+          "diff",
+          firstParent,
+          mergeCommit.sha,
+          "--",
+          ...files
+        ]);
+        if (!diff.trim()) return null;
+        const contentHash = this.computeContentHash(diff);
+        if (lock.patches.some((p) => p.content_hash === contentHash) || forgottenHashes.has(contentHash)) {
+          return null;
+        }
+        return {
+          id: `patch-merge-${mergeCommit.sha.slice(0, 8)}`,
+          content_hash: contentHash,
+          original_commit: mergeCommit.sha,
+          original_message: mergeCommit.message,
+          original_author: `${mergeCommit.authorName} <${mergeCommit.authorEmail}>`,
+          base_generation: lastGen.commit_sha,
+          files,
+          patch_content: diff
+        };
+      }
       /**
        * Detect patches via tree diff for non-linear history. Returns a composite patch.
        * Revert reconciliation is skipped here because tree-diff produces a single composite
@@ -25063,6 +25113,24 @@ var ClonedRepository = class _ClonedRepository {
     const result = await this.git.raw(["rev-parse", `${commitSha}^{tree}`]);
     return result.trim();
   }
+  /**
+   * Returns true if the working tree has uncommitted changes (staged or unstaged).
+   */
+  async hasChanges() {
+    await this.git.cwd(this.clonePath);
+    const status2 = await this.git.status();
+    return !status2.isClean();
+  }
+  /**
+   * Compares the tree hash of HEAD against a ref (e.g. `origin/main`).
+   * Returns true if the trees are identical (no content difference).
+   * Useful for detecting no-diff after committing — if trees match, the commit is a no-op.
+   */
+  async treeHashEquals(ref) {
+    const headTree = await this.getHeadTreeHash();
+    const refTree = await this.getCommitTreeHash(ref);
+    return headTree === refTree;
+  }
   // This tag is a moving pointer (fern-generation-base--<generator>) that tracks the latest
   // clean generation SHA. --force is required because: (1) the tag is intentionally overwritten
   // each generation, and (2) --force-with-lease doesn't work for tags since git tag -f overwrites
@@ -33135,31 +33203,32 @@ var GithubStep = class extends BaseStep {
     const baseBranch = this.config.branch ?? await repository.getDefaultBranch();
     const octokit = new Octokit2({ auth: this.config.token });
     const { owner, repo } = parseRepository(this.config.uri);
-    const existingPR = await findExistingUpdatablePR(octokit, owner, repo, baseBranch, this.logger);
     let prBranch;
     let isUpdatingExistingPR = false;
     let generationBaseSha;
+    let existingPR;
+    if (!this.config.automationMode) {
+      existingPR = await findExistingUpdatablePR(octokit, owner, repo, baseBranch, this.logger);
+    }
     if (existingPR != null) {
       this.logger.info(
         `Found existing updatable PR #${existingPR.number}, will update branch ${existingPR.headBranch}`
       );
       prBranch = existingPR.headBranch;
       isUpdatingExistingPR = true;
-      if (skipCommit) {
-        generationBaseSha = await createReplayBranch(
-          repository,
-          prBranch,
-          this.config.commitMessage,
-          replayConflictInfo,
-          this.logger
-        );
-      } else {
-        await repository.checkoutRemoteBranch(prBranch);
-      }
     } else {
-      this.logger.debug(`No existing updatable PR found, creating new branch ${newPrBranch}`);
+      this.logger.debug(
+        this.config.automationMode ? `Automation mode: creating new branch ${newPrBranch}` : `No existing updatable PR found, creating new branch ${newPrBranch}`
+      );
       prBranch = newPrBranch;
-      if (skipCommit) {
+    }
+    const branchAction = resolveBranchAction({
+      automationMode: this.config.automationMode === true,
+      skipCommit,
+      existingPR
+    });
+    switch (branchAction) {
+      case "replay-branch":
         generationBaseSha = await createReplayBranch(
           repository,
           prBranch,
@@ -33167,8 +33236,16 @@ var GithubStep = class extends BaseStep {
           replayConflictInfo,
           this.logger
         );
-      } else {
-        await repository.checkout(prBranch);
+        break;
+      case "create-from-head":
+        await repository.createBranchFromHead(prBranch);
+        break;
+      case "checkout-remote":
+        await repository.checkoutRemoteBranch(prBranch);
+        break;
+      default: {
+        const _exhaustive = branchAction;
+        throw new Error(`Unexpected branch action: ${String(_exhaustive)}`);
       }
     }
     if (!skipCommit) {
@@ -33178,6 +33255,13 @@ var GithubStep = class extends BaseStep {
       await repository.commitAllChanges(finalCommitMessage2);
       this.logger.debug(`Committed changes to local copy of GitHub repository at ${this.outputDir}`);
     }
+    if (this.config.automationMode) {
+      const noDiff = await repository.treeHashEquals(`origin/${baseBranch}`);
+      if (noDiff) {
+        this.logger.info("No changes detected after generation \u2014 skipping PR creation");
+        return { executed: true, success: true, skippedNoDiff: true };
+      }
+    }
     const result = {
       executed: true,
       success: true,
@@ -33212,7 +33296,8 @@ var GithubStep = class extends BaseStep {
       this.config.versionBumpReason
     );
     const replaySection = formatReplayPrBody(replayResult, { branchName: prBranch, repoUri: this.config.uri });
-    const enrichedBody = replaySection != null ? prBody + "\n\n---\n\n" + replaySection : prBody;
+    let enrichedBody = replaySection != null ? prBody + "\n\n---\n\n" + replaySection : prBody;
+    enrichedBody = enrichPrBodyForAutomation(enrichedBody, this.config);
     if (isUpdatingExistingPR && existingPR != null) {
       this.logger.info(`Updated existing pull request: ${existingPR.htmlUrl}`);
       result.prUrl = existingPR.htmlUrl;
@@ -33243,6 +33328,23 @@ var GithubStep = class extends BaseStep {
         this.logger.info(`Created pull request: ${pullRequest.html_url}`);
         result.prUrl = pullRequest.html_url;
         result.prNumber = pullRequest.number;
+        if (shouldEnableAutomerge(this.config) && pullRequest.node_id) {
+          try {
+            await octokit.graphql(
+              `mutation($pullRequestId: ID!) {
+                                enablePullRequestAutoMerge(input: {
+                                    pullRequestId: $pullRequestId,
+                                    mergeMethod: SQUASH
+                                }) { clientMutationId }
+                            }`,
+              { pullRequestId: pullRequest.node_id }
+            );
+            this.logger.info(`Enabled automerge on PR #${pullRequest.number}`);
+            result.autoMergeEnabled = true;
+          } catch (autoMergeError) {
+            this.logger.warn(`Could not enable automerge: ${extractErrorMessage(autoMergeError)}`);
+          }
+        }
       } catch (error) {
         const message = extractErrorMessage(error);
         if (message.includes("A pull request already exists for")) {
@@ -33255,6 +33357,7 @@ var GithubStep = class extends BaseStep {
     return result;
   }
   async executePushMode(repository) {
+    const baseBranch = this.config.branch ?? await repository.getDefaultBranch();
     if (this.config.branch != null) {
       this.logger.debug(`Checking out branch ${this.config.branch}`);
       await repository.checkout(this.config.branch);
@@ -33264,6 +33367,13 @@ var GithubStep = class extends BaseStep {
     const finalCommitMessage = this.config.commitMessage ?? "SDK Generation";
     await repository.commitAllChanges(finalCommitMessage);
     this.logger.debug(`Committed changes to local copy of GitHub repository at ${this.outputDir}`);
+    if (this.config.automationMode) {
+      const noDiff = await repository.treeHashEquals(`origin/${baseBranch}`);
+      if (noDiff) {
+        this.logger.info("No changes detected after generation \u2014 skipping push");
+        return { executed: true, success: true, skippedNoDiff: true };
+      }
+    }
     const result = {
       executed: true,
       success: true
@@ -33308,6 +33418,42 @@ var GithubStep = class extends BaseStep {
     return void 0;
   }
 };
+function enrichPrBodyForAutomation(body, config) {
+  if (!config.automationMode) {
+    return body;
+  }
+  let result = body;
+  if (config.hasBreakingChanges && config.breakingChangesSummary) {
+    result += "\n\n---\n\n## \u26A0\uFE0F Breaking Changes\n\nThis release contains breaking changes that require manual review:\n\n" + config.breakingChangesSummary;
+  }
+  if (config.runId) {
+    result += `
+
+---
+
+_Fern Run ID: \`${config.runId}\`_`;
+  }
+  return result;
+}
+function shouldEnableAutomerge(config) {
+  return config.automationMode === true && config.autoMerge === true && config.hasBreakingChanges !== true;
+}
+function resolveBranchAction({
+  automationMode,
+  skipCommit,
+  existingPR
+}) {
+  if (skipCommit) {
+    return "replay-branch";
+  }
+  if (automationMode) {
+    return "create-from-head";
+  }
+  if (existingPR != null) {
+    return "checkout-remote";
+  }
+  return "create-from-head";
+}
 
 // src/replay/replay-run.ts
 init_dist3();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fern-api/generator-cli",
-  "version": "0.9.5",
+  "version": "0.9.7",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",
@@ -22,7 +22,7 @@
     "**"
   ],
   "dependencies": {
-    "@fern-api/replay": "0.10.2",
+    "@fern-api/replay": "0.10.4",
     "@octokit/rest": "^22.0.1",
     "es-toolkit": "^1.45.1",
     "tmp-promise": "^3.0.3"