@fern-api/generator-cli 0.11.0 → 0.12.1

package/dist/api.js

@@ -6303,12 +6303,18 @@ function newRepositoryReference({ remote, owner, repo }) {
     repoUrl,
     cloneUrl,
     getAuthedCloneUrl: (installationToken) => {
-      const isInstallationToken = installationToken.startsWith("ghs_") || installationToken.startsWith("ghu_");
-      const userPrefix = isInstallationToken ? "x-access-token:" : "";
+      const userPrefix = isGithubAppToken(installationToken) ? "x-access-token:" : "";
       return cloneUrl.replace("https://", `https://${userPrefix}${installationToken}@`);
     }
   };
 }
+function getGitAuthorizationHeader(installationToken) {
+  const credentials = isGithubAppToken(installationToken) ? `x-access-token:${installationToken}` : `${installationToken}:`;
+  return `Authorization: Basic ${Buffer.from(credentials).toString("base64")}`;
+}
+function isGithubAppToken(token) {
+  return token.startsWith("ghs_") || token.startsWith("ghu_");
+}
 function getRepoUrl({ remote, owner, repo }) {
   return `https://${remote}/${owner}/${repo}`;
 }
@@ -6369,7 +6375,8 @@ async function cloneRepository({ githubRepository, installationToken, targetDire
   });
   const startTime = Date.now();
   try {
-    await git.clone(cloneUrl, ".");
+    const cloneOptions = installationToken != null ? ["--config", `http.extraHeader=${getGitAuthorizationHeader(installationToken)}`] : [];
+    await git.clone(cloneUrl, ".", cloneOptions);
   } catch (error) {
     const elapsed = Date.now() - startTime;
     const errorMessage = extractErrorMessage(error);

package/dist/cli.js

@@ -41,6 +41,52 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
+// ../commons/core-utils/lib/errorMessageOrString.js
+function errorMessageOrString(error) {
+  return error instanceof Error ? error.message : String(error);
+}
+var init_errorMessageOrString = __esm({
+  "../commons/core-utils/lib/errorMessageOrString.js"() {
+    "use strict";
+  }
+});
+
+// ../commons/core-utils/lib/examples.js
+var init_examples = __esm({
+  "../commons/core-utils/lib/examples.js"() {
+    "use strict";
+  }
+});
+
+// ../commons/core-utils/lib/extractErrorMessage.js
+function extractErrorMessage(e) {
+  if (typeof e === "string") {
+    return e.length > 0 ? e : "Unknown error";
+  }
+  if (e instanceof Error) {
+    return e.message.length > 0 ? e.message : "Unknown error";
+  }
+  if (typeof e === "object" && e !== null && "message" in e && typeof e["message"] === "string") {
+    return e["message"].length > 0 ? e["message"] : "Unknown error";
+  }
+  const stringified = String(e);
+  return stringified.length > 0 ? stringified : "Unknown error";
+}
+var init_extractErrorMessage = __esm({
+  "../commons/core-utils/lib/extractErrorMessage.js"() {
+    "use strict";
+  }
+});
+
+// ../commons/core-utils/lib/fernEnvVars.js
+var FERN_JAVA_SKIP_FORMATTING_ENV_VAR;
+var init_fernEnvVars = __esm({
+  "../commons/core-utils/lib/fernEnvVars.js"() {
+    "use strict";
+    FERN_JAVA_SKIP_FORMATTING_ENV_VAR = "FERN_JAVA_SKIP_FORMATTING";
+  }
+});
+
 // ../../node_modules/.pnpm/semver@7.8.4/node_modules/semver/internal/constants.js
 var require_constants = __commonJS({
   "../../node_modules/.pnpm/semver@7.8.4/node_modules/semver/internal/constants.js"(exports2, module2) {
@@ -2034,6 +2080,17 @@ var require_semver2 = __commonJS({
   }
 });
 
+// ../commons/core-utils/lib/index.js
+var init_lib = __esm({
+  "../commons/core-utils/lib/index.js"() {
+    "use strict";
+    init_errorMessageOrString();
+    init_examples();
+    init_extractErrorMessage();
+    init_fernEnvVars();
+  }
+});
+
 // ../../node_modules/.pnpm/balanced-match@4.0.4/node_modules/balanced-match/dist/esm/index.js
 var balanced, maybeMatch, range;
 var init_esm = __esm({
@@ -7119,18 +7176,18 @@ var require_build3 = __commonJS({
 var require_sync = __commonJS({
   "../../node_modules/.pnpm/escalade@3.2.0/node_modules/escalade/sync/index.js"(exports2, module2) {
     "use strict";
-    var { dirname: dirname6, resolve: resolve8 } = require("path");
+    var { dirname: dirname7, resolve: resolve8 } = require("path");
     var { readdirSync: readdirSync2, statSync: statSync4 } = require("fs");
     module2.exports = function(start, callback) {
       let dir = resolve8(".", start);
       let tmp4, stats = statSync4(dir);
       if (!stats.isDirectory()) {
-        dir = dirname6(dir);
+        dir = dirname7(dir);
       }
       while (true) {
         tmp4 = callback(dir, readdirSync2(dir));
         if (tmp4) return resolve8(dir, tmp4);
-        dir = dirname6(tmp4 = dir);
+        dir = dirname7(tmp4 = dir);
         if (tmp4 === dir) break;
       }
     };
@@ -7168,7 +7225,7 @@ var require_require_directory = __commonJS({
     var fs3 = require("fs");
     var join19 = require("path").join;
     var resolve8 = require("path").resolve;
-    var dirname6 = require("path").dirname;
+    var dirname7 = require("path").dirname;
     var defaultOptions2 = {
       extensions: ["js", "json", "coffee"],
       recurse: true,
@@ -7201,7 +7258,7 @@ var require_require_directory = __commonJS({
           options[prop] = defaultOptions2[prop];
         }
       }
-      path5 = !path5 ? dirname6(m.filename) : resolve8(dirname6(m.filename), path5);
+      path5 = !path5 ? dirname7(m.filename) : resolve8(dirname7(m.filename), path5);
       fs3.readdirSync(path5).forEach(function(filename) {
         var joined = join19(path5, filename), files, key, obj;
         if (fs3.statSync(joined).isDirectory() && options.recurse) {
@@ -30376,7 +30433,7 @@ async function loadBamlDependencies() {
       configureBamlClient: config.configureBamlClient
     };
   } catch (error) {
-    const original = error instanceof Error ? error.message : String(error);
+    const original = errorMessageOrString(error);
     throw new Error(`${INSTALL_MESSAGE}
 
 Original error: ${original}`);
@@ -30386,6 +30443,7 @@ var INSTALL_MESSAGE;
 var init_loader = __esm({
   "../cli/ai/lib/loader.js"() {
     "use strict";
+    init_lib();
     INSTALL_MESSAGE = "@boundaryml/baml is required for AI features (auto-versioning, sdk-diff).\nInstall it with:\n  npm install @boundaryml/baml\n  pnpm add @boundaryml/baml";
   }
 });
@@ -30410,7 +30468,7 @@ __export(lib_exports, {
   VersionBump: () => VersionBump3,
   loadBamlDependencies: () => loadBamlDependencies
 });
-var init_lib = __esm({
+var init_lib2 = __esm({
   "../cli/ai/lib/index.js"() {
     "use strict";
     init_loader();
@@ -30418,23 +30476,8 @@ var init_lib = __esm({
   }
 });
 
-// ../commons/core-utils/lib/extractErrorMessage.js
-function extractErrorMessage(e) {
-  if (typeof e === "string") {
-    return e.length > 0 ? e : "Unknown error";
-  }
-  if (e instanceof Error) {
-    return e.message.length > 0 ? e.message : "Unknown error";
-  }
-  if (typeof e === "object" && e !== null && "message" in e && typeof e["message"] === "string") {
-    return e["message"].length > 0 ? e["message"] : "Unknown error";
-  }
-  const stringified = String(e);
-  return stringified.length > 0 ? stringified : "Unknown error";
-}
-
-// ../commons/core-utils/lib/fernEnvVars.js
-var FERN_JAVA_SKIP_FORMATTING_ENV_VAR = "FERN_JAVA_SKIP_FORMATTING";
+// src/cli.ts
+init_lib();
 
 // ../commons/path-utils/lib/convertToOsPath.js
 function convertToOsPath(path5) {
@@ -30472,7 +30515,7 @@ function resolve(...paths) {
 // src/cli.ts
 var import_fs18 = __toESM(require("fs"));
 var import_promises19 = require("fs/promises");
-var import_path27 = __toESM(require("path"));
+var import_path28 = __toESM(require("path"));
 
 // ../../node_modules/.pnpm/yargs@17.7.2/node_modules/yargs/build/lib/yerror.js
 var YError = class _YError extends Error {
@@ -32448,6 +32491,7 @@ async function doesPathExist2(filepath) {
 }
 
 // ../commons/github/lib/cloneRepository.js
+init_lib();
 var import_child_process2 = require("child_process");
 init_esm4();
 var import_tmp_promise = __toESM(require_tmp_promise(), 1);
@@ -32486,12 +32530,18 @@ function newRepositoryReference({ remote, owner, repo }) {
     repoUrl,
     cloneUrl,
     getAuthedCloneUrl: (installationToken) => {
-      const isInstallationToken = installationToken.startsWith("ghs_") || installationToken.startsWith("ghu_");
-      const userPrefix = isInstallationToken ? "x-access-token:" : "";
+      const userPrefix = isGithubAppToken(installationToken) ? "x-access-token:" : "";
       return cloneUrl.replace("https://", `https://${userPrefix}${installationToken}@`);
     }
   };
 }
+function getGitAuthorizationHeader(installationToken) {
+  const credentials = isGithubAppToken(installationToken) ? `x-access-token:${installationToken}` : `${installationToken}:`;
+  return `Authorization: Basic ${Buffer.from(credentials).toString("base64")}`;
+}
+function isGithubAppToken(token) {
+  return token.startsWith("ghs_") || token.startsWith("ghu_");
+}
 function getRepoUrl({ remote, owner, repo }) {
   return `https://${remote}/${owner}/${repo}`;
 }
@@ -32552,7 +32602,8 @@ async function cloneRepository({ githubRepository, installationToken, targetDire
   });
   const startTime = Date.now();
   try {
-    await git.clone(cloneUrl, ".");
+    const cloneOptions = installationToken != null ? ["--config", `http.extraHeader=${getGitAuthorizationHeader(installationToken)}`] : [];
+    await git.clone(cloneUrl, ".", cloneOptions);
   } catch (error) {
     const elapsed = Date.now() - startTime;
     const errorMessage = extractErrorMessage(error);
@@ -40606,6 +40657,7 @@ var consolePipelineLogger = {
 };
 
 // src/pipeline/PostGenerationPipeline.ts
+init_lib();
 var import_child_process8 = require("child_process");
 
 // src/pipeline/github/constants.ts
@@ -42874,7 +42926,7 @@ ${body}` : `${COMMIT_MARKER} ${subject}`;
     if (this.config.ai == null) {
       throw new Error("AutoVersionStep: ai config is missing. Set autoVersion.ai to a BAML provider+model pair.");
     }
-    const { loadBamlDependencies: loadBamlDependencies2, VersionBump: VersionBump4 } = await Promise.resolve().then(() => (init_lib(), lib_exports));
+    const { loadBamlDependencies: loadBamlDependencies2, VersionBump: VersionBump4 } = await Promise.resolve().then(() => (init_lib2(), lib_exports));
     const { BamlClient, configureBamlClient: configureBamlClient2 } = await loadBamlDependencies2();
     const registry = configureBamlClient2(this.config.ai);
     return {
@@ -43160,6 +43212,7 @@ function tryRevParse(cwd2, rev) {
 }
 
 // src/pipeline/steps/GithubStep.ts
+init_lib();
 var import_promises17 = require("fs/promises");
 var import_path25 = require("path");
 
@@ -43188,6 +43241,7 @@ async function createReplayBranch(repository, branchName, commitMessage, replayC
 }
 
 // src/pipeline/github/findExistingUpdatablePR.ts
+init_lib();
 async function findExistingUpdatablePR(octokit, owner, repo, baseBranch, logger) {
   try {
     const { data: pulls } = await octokit.pulls.list({
@@ -43299,6 +43353,7 @@ ${prBody}`;
 }
 
 // src/pipeline/github/pushSignedCommit.ts
+init_lib();
 var MAX_CONCURRENT_PUSH_RETRIES = 3;
 var MAX_SIGNED_CHAIN_LENGTH = 20;
 var PAT_TOKEN_PREFIXES = ["ghp_", "github_pat_"];
@@ -43775,6 +43830,9 @@ var GithubStep = class extends BaseStep {
       } catch (error) {
         this.logger.debug(`Failed to update PR title/body: ${extractErrorMessage(error)}`);
       }
+      if (shouldEnableAutomerge(this.config, resolved)) {
+        await this.tryEnableAutomerge(octokit, existingPR.nodeId, existingPR.number, result);
+      }
     } else {
       const head = `${owner}:${prBranch}`;
       try {
@@ -43790,21 +43848,7 @@ var GithubStep = class extends BaseStep {
         result.prUrl = pullRequest.html_url;
         result.prNumber = pullRequest.number;
         if (shouldEnableAutomerge(this.config, resolved) && 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)}`);
-          }
+          await this.tryEnableAutomerge(octokit, pullRequest.node_id, pullRequest.number, result);
         }
       } catch (error) {
         const message = extractErrorMessage(error);
@@ -43817,6 +43861,28 @@ var GithubStep = class extends BaseStep {
     }
     return result;
   }
+  /**
+   * Enables GitHub automerge on a non-breaking PR (newly created or updated) via the built-in
+   * octokit.graphql() from @octokit/core. The SDK repo's own branch protection rules govern
+   * whether the PR actually merges.
+   */
+  async tryEnableAutomerge(octokit, pullRequestNodeId, pullRequestNumber, result) {
+    try {
+      await octokit.graphql(
+        `mutation($pullRequestId: ID!) {
+                    enablePullRequestAutoMerge(input: {
+                        pullRequestId: $pullRequestId,
+                        mergeMethod: SQUASH
+                    }) { clientMutationId }
+                }`,
+        { pullRequestId: pullRequestNodeId }
+      );
+      this.logger.info(`Enabled automerge on PR #${pullRequestNumber}`);
+      result.autoMergeEnabled = true;
+    } catch (autoMergeError) {
+      this.logger.warn(`Could not enable automerge: ${extractErrorMessage(autoMergeError)}`);
+    }
+  }
   async executePushMode(repository, resolved) {
     const baseBranch = this.config.branch ?? await repository.getDefaultBranch();
     if (this.config.branch != null) {
@@ -44057,7 +44123,7 @@ _Fern Run ID: \`${config.runId}\`_`;
 function shouldEnableAutomerge(config, breaking = {}) {
   const hasBreakingChanges = breaking.hasBreakingChanges ?? config.hasBreakingChanges;
   const analysisUnavailable = breaking.analysisWarning != null && breaking.analysisWarning.length > 0;
-  return config.automationMode === true && config.autoMerge === true && hasBreakingChanges !== true && !analysisUnavailable;
+  return config.autoMerge === true && hasBreakingChanges !== true && !analysisUnavailable;
 }
 function shouldCheckNoDiff(config) {
   return config.skipIfNoDiff === true;
@@ -44255,6 +44321,9 @@ var ReplayStep = class extends BaseStep {
   }
 };
 
+// src/pipeline/steps/VerificationStep.ts
+init_lib();
+
 // ../cli/generation/local-generation/docker-utils/lib/dockerHubOatLogin.js
 var DOCKERHUB_OAT_ENV_VAR = "DOCKERHUB_OAT";
 var DOCKERHUB_OAT_USERNAME_ENV_VAR = "DOCKERHUB_OAT_USERNAME";
@@ -44317,9 +44386,11 @@ ${stderr}`);
 
 // ../cli/generation/local-generation/docker-utils/lib/runDocker.js
 var import_promises18 = require("fs/promises");
+var import_path26 = require("path");
 var import_tmp_promise3 = __toESM(require_tmp_promise(), 1);
 
 // ../cli/generation/local-generation/docker-utils/lib/buildContainerEnvVars.js
+init_lib();
 var FORWARDED_ENV_VARS = ["FERN_STACK_TRACK", FERN_JAVA_SKIP_FORMATTING_ENV_VAR];
 function buildContainerEnvVars({ envVars, processEnv }) {
   const forwardedEntries = FORWARDED_ENV_VARS.filter((name) => envVars[name] == null).map((name) => [name, processEnv[name]]).filter((entry) => entry[1] != null && entry[1] !== "");
@@ -44391,9 +44462,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_promises18.writeFile)(tmpFile.path, logs);
-    logger.info(`Generator logs here: ${tmpFile.path}`);
+    await writeLogsFile({ logger, logs });
   }
   const resolvedExitCode = exitCode ?? 1;
   if (reject && resolvedExitCode !== 0) {
@@ -44422,6 +44491,21 @@ async function stopContainer({ logger, containerId, runner }) {
     doNotPipeOutput: true
   });
 }
+async function writeLogsFile({ logger, logs, logFilePath }) {
+  if (logFilePath != null) {
+    try {
+      await (0, import_promises18.mkdir)((0, import_path26.dirname)(logFilePath), { recursive: true });
+      await (0, import_promises18.writeFile)(logFilePath, logs);
+      logger.info(`Generator logs here: ${logFilePath}`);
+      return;
+    } catch (error) {
+      logger.warn(`Failed to write logs to ${logFilePath} (${String(error)}); using a temporary file instead.`);
+    }
+  }
+  const tmpFile = await import_tmp_promise3.default.file();
+  await (0, import_promises18.writeFile)(tmpFile.path, logs);
+  logger.info(`Generator logs here: ${tmpFile.path}`);
+}
 
 // ../cli/logger/lib/LogLevel.js
 var LogLevel2 = {
@@ -44479,7 +44563,7 @@ function createLogger4(log) {
 
 // src/pipeline/steps/VerificationStep.ts
 var import_fs17 = require("fs");
-var import_path26 = require("path");
+var import_path27 = require("path");
 var CONTAINER_WORKSPACE_PATH = "/workspace";
 var VERIFY_SCRIPT_RELATIVE_PATH = ".fern/verify.sh";
 var VERIFY_SCRIPT_CONTAINER_PATH = `${CONTAINER_WORKSPACE_PATH}/${VERIFY_SCRIPT_RELATIVE_PATH}`;
@@ -44495,7 +44579,7 @@ var VerificationStep = class extends BaseStep {
   generatorVersions;
   name = "verify";
   async execute(_context) {
-    const verifyScriptHostPath = (0, import_path26.join)(this.outputDir, VERIFY_SCRIPT_RELATIVE_PATH);
+    const verifyScriptHostPath = (0, import_path27.join)(this.outputDir, VERIFY_SCRIPT_RELATIVE_PATH);
     if (!(0, import_fs17.existsSync)(verifyScriptHostPath)) {
       return { executed: true, success: true, skipped: true };
     }
@@ -45195,7 +45279,7 @@ async function createWriteStream(outputPath) {
 }
 async function createWriteStreamFromFile(filepath) {
   if (!await doesPathExist(filepath)) {
-    await (0, import_promises19.mkdir)(import_path27.default.dirname(filepath), { recursive: true });
+    await (0, import_promises19.mkdir)(import_path28.default.dirname(filepath), { recursive: true });
   }
   return import_fs18.default.createWriteStream(filepath);
 }

package/package.json

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