@fern-api/generator-cli 0.9.25 → 0.9.27

package/dist/api.js

@@ -6362,6 +6362,15 @@ async function cloneRepository({ githubRepository, installationToken, targetDire
   });
 }
 
+// ../commons/github/lib/getGithubApiBaseUrl.js
+function getGithubApiBaseUrl(repositoryUri) {
+  const { remote } = parseRepository(repositoryUri);
+  if (remote === DEFAULT_REMOTE) {
+    return void 0;
+  }
+  return `https://${remote}/api/v3`;
+}
+
 // src/readme/ReadmeGenerator.ts
 var import_compat = require("es-toolkit/compat");
 var import_string2 = require("es-toolkit/string");
@@ -10069,8 +10078,10 @@ var GitHub = class {
       await this.restoreFiles(repository, fernIgnoreFiles);
       await repository.commit("SDK Generation");
       await repository.push();
+      const apiBaseUrl = getGithubApiBaseUrl(this.githubConfig.uri);
       const octokit = new import_rest.Octokit({
-        auth: this.githubConfig.token
+        auth: this.githubConfig.token,
+        ...apiBaseUrl != null ? { baseUrl: apiBaseUrl } : {}
       });
       const parsedRepo = parseRepository(this.githubConfig.uri);
       const { owner, repo } = parsedRepo;

package/dist/cli.js

@@ -4186,10 +4186,10 @@ var require_tmp_promise = __commonJS({
   "../../node_modules/.pnpm/tmp-promise@3.0.3/node_modules/tmp-promise/index.js"(exports2, module2) {
     "use strict";
     var { promisify } = require("util");
-    var tmp3 = require_tmp();
-    module2.exports.fileSync = tmp3.fileSync;
+    var tmp4 = require_tmp();
+    module2.exports.fileSync = tmp4.fileSync;
     var fileWithOptions = promisify(
-      (options, cb) => tmp3.file(
+      (options, cb) => tmp4.file(
         options,
         (err, path5, fd, cleanup) => err ? cb(err) : cb(void 0, { path: path5, fd, cleanup: promisify(cleanup) })
       )
@@ -4203,9 +4203,9 @@ var require_tmp_promise = __commonJS({
         await cleanup();
       }
     };
-    module2.exports.dirSync = tmp3.dirSync;
+    module2.exports.dirSync = tmp4.dirSync;
     var dirWithOptions = promisify(
-      (options, cb) => tmp3.dir(
+      (options, cb) => tmp4.dir(
         options,
         (err, path5, cleanup) => err ? cb(err) : cb(void 0, { path: path5, cleanup: promisify(cleanup) })
       )
@@ -4219,10 +4219,10 @@ var require_tmp_promise = __commonJS({
         await cleanup();
       }
     };
-    module2.exports.tmpNameSync = tmp3.tmpNameSync;
-    module2.exports.tmpName = promisify(tmp3.tmpName);
-    module2.exports.tmpdir = tmp3.tmpdir;
-    module2.exports.setGracefulCleanup = tmp3.setGracefulCleanup;
+    module2.exports.tmpNameSync = tmp4.tmpNameSync;
+    module2.exports.tmpName = promisify(tmp4.tmpName);
+    module2.exports.tmpdir = tmp4.tmpdir;
+    module2.exports.setGracefulCleanup = tmp4.setGracefulCleanup;
   }
 });
 
@@ -7035,15 +7035,15 @@ var require_sync = __commonJS({
     var { readdirSync: readdirSync2, statSync: statSync4 } = require("fs");
     module2.exports = function(start, callback) {
       let dir = resolve8(".", start);
-      let tmp3, stats = statSync4(dir);
+      let tmp4, stats = statSync4(dir);
       if (!stats.isDirectory()) {
         dir = dirname5(dir);
       }
       while (true) {
-        tmp3 = callback(dir, readdirSync2(dir));
-        if (tmp3) return resolve8(dir, tmp3);
-        dir = dirname5(tmp3 = dir);
-        if (tmp3 === dir) break;
+        tmp4 = callback(dir, readdirSync2(dir));
+        if (tmp4) return resolve8(dir, tmp4);
+        dir = dirname5(tmp4 = dir);
+        if (tmp4 === dir) break;
       }
     };
   }
@@ -7078,7 +7078,7 @@ var require_require_directory = __commonJS({
   "../../node_modules/.pnpm/require-directory@2.1.1/node_modules/require-directory/index.js"(exports2, module2) {
     "use strict";
     var fs3 = require("fs");
-    var join15 = require("path").join;
+    var join16 = require("path").join;
     var resolve8 = require("path").resolve;
     var dirname5 = require("path").dirname;
     var defaultOptions2 = {
@@ -7115,7 +7115,7 @@ var require_require_directory = __commonJS({
       }
       path5 = !path5 ? dirname5(m.filename) : resolve8(dirname5(m.filename), path5);
       fs3.readdirSync(path5).forEach(function(filename) {
-        var joined = join15(path5, filename), files, key, obj;
+        var joined = join16(path5, filename), files, key, obj;
         if (fs3.statSync(joined).isDirectory() && options.recurse) {
           files = requireDirectory(m, joined, options);
           if (Object.keys(files).length) {
@@ -22126,7 +22126,7 @@ var init_diff3 = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/@fern-api+replay@0.14.1/node_modules/@fern-api/replay/dist/index.js
+// ../../node_modules/.pnpm/@fern-api+replay@0.15.0/node_modules/@fern-api/replay/dist/index.js
 var dist_exports = {};
 __export(dist_exports, {
   CREDENTIAL_PATTERNS: () => CREDENTIAL_PATTERNS,
@@ -22939,17 +22939,17 @@ function overlayRegions(currentGenLines, locInCurrentGen, workingTreeLines, locI
 }
 async function unifiedDiff(beforeContent, afterContent, filePath) {
   if (beforeContent === afterContent) return "";
-  const tmp3 = await (0, import_promises6.mkdtemp)((0, import_path11.join)((0, import_os3.tmpdir)(), "fern-replay-pp-"));
+  const tmp4 = await (0, import_promises6.mkdtemp)((0, import_path11.join)((0, import_os3.tmpdir)(), "fern-replay-pp-"));
   try {
-    const beforePath = (0, import_path11.join)(tmp3, "before");
-    const afterPath = (0, import_path11.join)(tmp3, "after");
+    const beforePath = (0, import_path11.join)(tmp4, "before");
+    const afterPath = (0, import_path11.join)(tmp4, "after");
     await (0, import_promises6.writeFile)(beforePath, beforeContent, "utf-8");
     await (0, import_promises6.writeFile)(afterPath, afterContent, "utf-8");
     const raw = await runGitDiffNoIndex(beforePath, afterPath);
     if (!raw.trim()) return "";
     return rewriteDiffHeaders(raw, filePath);
   } finally {
-    await (0, import_promises6.rm)(tmp3, { recursive: true, force: true });
+    await (0, import_promises6.rm)(tmp4, { recursive: true, force: true });
   }
 }
 function runGitDiffNoIndex(beforePath, afterPath) {
@@ -23630,7 +23630,7 @@ function status(outputDir) {
 }
 var import_promises3, import_os, import_path7, import_fs6, import_path8, import_yaml, import_crypto, import_promises4, import_os2, import_path9, import_fs7, import_promises5, import_path10, import_promises6, import_os3, import_path11, import_child_process3, import_crypto2, import_fs8, import_path12, import_yaml2, import_crypto3, import_fs9, import_path13, import_fs10, import_promises7, import_path14, __defProp3, __getOwnPropNames3, __esm3, __export3, GitClient_exports, GitClient, init_GitClient, HybridReconstruction_exports, init_HybridReconstruction, PatchApplyTheirs_exports, init_PatchApplyTheirs, CREDENTIAL_PATTERNS, SENSITIVE_FILE_PATTERNS, FERN_BOT_NAME, FERN_BOT_EMAIL, FERN_BOT_LOGIN, FERN_SUPPORT_NAMES, LOCKFILE_HEADER, LockfileNotFoundError, LockfileManager, CONFLICT_OPENER, CONFLICT_SEPARATOR, CONFLICT_CLOSER, BINARY_EXTENSIONS, ReplayApplicator, INFRASTRUCTURE_FILES, ReplayDetector, ReplayCommitter, ReplayService, FernignoreMigrator, REPLAY_FERNIGNORE_ENTRIES, GITATTRIBUTES_ENTRIES, EMPTY_RESULT;
 var init_dist3 = __esm({
-  "../../node_modules/.pnpm/@fern-api+replay@0.14.1/node_modules/@fern-api/replay/dist/index.js"() {
+  "../../node_modules/.pnpm/@fern-api+replay@0.15.0/node_modules/@fern-api/replay/dist/index.js"() {
     "use strict";
     init_esm4();
     import_promises3 = require("fs/promises");
@@ -26243,6 +26243,66 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         }
         return snapshot;
       }
+      /**
+       * FER-10203: returns true when a `[fern-autoversion]` commit between
+       * `fromSha` and `toSha` touched any of the patch's `files`. Re-classifies
+       * each grep match via `isGenerationCommit` so a customer commit that
+       * merely quotes the marker in its body doesn't false-positive.
+       */
+      async hasAutoversionContamination(fromSha, toSha, files) {
+        if (files.length === 0) return false;
+        const log = await this.git.exec([
+          "log",
+          `${fromSha}..${toSha}`,
+          "--grep=\\[fern-autoversion\\]",
+          "--extended-regexp",
+          "--format=%H%x09%aN%x09%ae%x09%s",
+          "--",
+          ...files
+        ]).catch(() => "");
+        if (!log.trim()) return false;
+        for (const line of log.trim().split("\n")) {
+          const [sha, authorName, authorEmail, message] = line.split("	");
+          if (sha == null) continue;
+          if (isGenerationCommit({
+            sha,
+            authorName: authorName ?? "",
+            authorEmail: authorEmail ?? "",
+            message: message ?? ""
+          })) {
+            return true;
+          }
+        }
+        return false;
+      }
+      /**
+       * FER-10203: rebuild patch_content from `theirs_snapshot` (captured at
+       * detection time, predates pipeline content) rather than a HEAD-relative
+       * diff. Returns `null` when snapshot is missing or doesn't cover every
+       * file in `patch.files` — caller leaves the patch unchanged.
+       */
+      async computeSnapshotBasedPatchDiff(patch, currentGen) {
+        if (!patch.theirs_snapshot) return null;
+        if (Object.keys(patch.theirs_snapshot).length === 0) return null;
+        for (const file of patch.files) {
+          if (patch.theirs_snapshot[file] == null) return null;
+        }
+        const fragments = [];
+        for (const file of patch.files) {
+          const theirsContent = patch.theirs_snapshot[file];
+          const oursContent = await this.git.showFile(currentGen, file).catch(() => null);
+          if (oursContent == null) {
+            fragments.push(synthesizeNewFileDiff(file, theirsContent));
+            continue;
+          }
+          if (oursContent === theirsContent) continue;
+          const fileDiff = await unifiedDiff(oursContent, theirsContent, file);
+          if (fileDiff.trim()) {
+            fragments.push(fileDiff);
+          }
+        }
+        return fragments.join("");
+      }
       /**
        * Read THEIRS snapshot from a git tree-ish (commit, branch, or tree).
        * Used when the diff that produced `patch_content` was relative to that
@@ -26508,6 +26568,41 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
           }
           if (patch.base_generation === currentGen) {
             try {
+              const contaminated = await this.hasAutoversionContamination(
+                currentGen,
+                "HEAD",
+                patch.files
+              );
+              if (contaminated) {
+                const snapshotDiff = await this.computeSnapshotBasedPatchDiff(
+                  patch,
+                  currentGen
+                );
+                if (snapshotDiff === null) continue;
+                if (!snapshotDiff.trim()) {
+                  if (await allPatchFilesUserOwned(patch)) continue;
+                  this.lockManager.removePatch(patch.id);
+                  contentRefreshed++;
+                  continue;
+                }
+                const snapHasStaleMarkers = snapshotDiff.split("\n").some(
+                  (l) => l.startsWith("+<<<<<<< Generated") || l.startsWith("+>>>>>>> Your customization")
+                );
+                if (snapHasStaleMarkers) continue;
+                const isProtectedSnap = patch.files.some(
+                  (file) => file === ".fernignore" || fernignorePatterns.some((p2) => file === p2 || minimatch(file, p2))
+                );
+                if (isProtectedSnap) continue;
+                const snapHash = this.detector.computeContentHash(snapshotDiff);
+                if (snapHash !== patch.content_hash) {
+                  this.lockManager.updatePatch(patch.id, {
+                    patch_content: snapshotDiff,
+                    content_hash: snapHash
+                  });
+                  contentRefreshed++;
+                }
+                continue;
+              }
               const ppResult = await computePerPatchDiffWithFallback(
                 patch,
                 (f) => this.git.showFile(currentGen, f),
@@ -26559,6 +26654,42 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
           try {
             const markerFiles = await this.git.exec(["grep", "-l", "<<<<<<< Generated", "HEAD", "--", ...patch.files]).catch(() => "");
             if (markerFiles.trim()) continue;
+            const contaminated = await this.hasAutoversionContamination(
+              currentGen,
+              "HEAD",
+              patch.files
+            );
+            if (contaminated) {
+              const snapshotDiff = await this.computeSnapshotBasedPatchDiff(
+                patch,
+                currentGen
+              );
+              if (snapshotDiff === null) continue;
+              if (!snapshotDiff.trim()) {
+                if (await allPatchFilesUserOwned(patch)) {
+                  try {
+                    this.lockManager.updatePatch(patch.id, { base_generation: currentGen });
+                  } catch {
+                  }
+                  continue;
+                }
+                this.lockManager.removePatch(patch.id);
+                conflictAbsorbed++;
+                continue;
+              }
+              const snapHasStaleMarkers = snapshotDiff.split("\n").some(
+                (l) => l.startsWith("+<<<<<<< Generated") || l.startsWith("+>>>>>>> Your customization")
+              );
+              if (snapHasStaleMarkers) continue;
+              const snapHash = this.detector.computeContentHash(snapshotDiff);
+              this.lockManager.updatePatch(patch.id, {
+                base_generation: currentGen,
+                patch_content: snapshotDiff,
+                content_hash: snapHash
+              });
+              conflictResolved++;
+              continue;
+            }
             const ppResult = await computePerPatchDiffWithFallback(
               patch,
               (f) => this.git.showFile(currentGen, f),
@@ -27170,9 +27301,9 @@ var require_path_key = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/cross-spawn@7.0.5/node_modules/cross-spawn/lib/util/resolveCommand.js
+// ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/resolveCommand.js
 var require_resolveCommand = __commonJS({
-  "../../node_modules/.pnpm/cross-spawn@7.0.5/node_modules/cross-spawn/lib/util/resolveCommand.js"(exports2, module2) {
+  "../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/resolveCommand.js"(exports2, module2) {
     "use strict";
     var path5 = require("path");
     var which = require_which();
@@ -27212,9 +27343,9 @@ var require_resolveCommand = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/cross-spawn@7.0.5/node_modules/cross-spawn/lib/util/escape.js
+// ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/escape.js
 var require_escape = __commonJS({
-  "../../node_modules/.pnpm/cross-spawn@7.0.5/node_modules/cross-spawn/lib/util/escape.js"(exports2, module2) {
+  "../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/escape.js"(exports2, module2) {
     "use strict";
     var metaCharsRegExp = /([()\][%!^"`<>&|;, *?])/g;
     function escapeCommand(arg) {
@@ -27265,9 +27396,9 @@ var require_shebang_command = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/cross-spawn@7.0.5/node_modules/cross-spawn/lib/util/readShebang.js
+// ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/readShebang.js
 var require_readShebang = __commonJS({
-  "../../node_modules/.pnpm/cross-spawn@7.0.5/node_modules/cross-spawn/lib/util/readShebang.js"(exports2, module2) {
+  "../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/readShebang.js"(exports2, module2) {
     "use strict";
     var fs3 = require("fs");
     var shebangCommand = require_shebang_command();
@@ -27287,9 +27418,9 @@ var require_readShebang = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/cross-spawn@7.0.5/node_modules/cross-spawn/lib/parse.js
+// ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/parse.js
 var require_parse2 = __commonJS({
-  "../../node_modules/.pnpm/cross-spawn@7.0.5/node_modules/cross-spawn/lib/parse.js"(exports2, module2) {
+  "../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/parse.js"(exports2, module2) {
     "use strict";
     var path5 = require("path");
     var resolveCommand = require_resolveCommand();
@@ -27349,9 +27480,9 @@ var require_parse2 = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/cross-spawn@7.0.5/node_modules/cross-spawn/lib/enoent.js
+// ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/enoent.js
 var require_enoent = __commonJS({
-  "../../node_modules/.pnpm/cross-spawn@7.0.5/node_modules/cross-spawn/lib/enoent.js"(exports2, module2) {
+  "../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/enoent.js"(exports2, module2) {
     "use strict";
     var isWin = process.platform === "win32";
     function notFoundError(original, syscall) {
@@ -27399,9 +27530,9 @@ var require_enoent = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/cross-spawn@7.0.5/node_modules/cross-spawn/index.js
+// ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/index.js
 var require_cross_spawn = __commonJS({
-  "../../node_modules/.pnpm/cross-spawn@7.0.5/node_modules/cross-spawn/index.js"(exports2, module2) {
+  "../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/index.js"(exports2, module2) {
     "use strict";
     var cp2 = require("child_process");
     var parse3 = require_parse2();
@@ -29507,9 +29638,9 @@ function resolve(...paths) {
 }
 
 // src/cli.ts
-var import_fs15 = __toESM(require("fs"));
-var import_promises15 = require("fs/promises");
-var import_path21 = __toESM(require("path"));
+var import_fs16 = __toESM(require("fs"));
+var import_promises16 = require("fs/promises");
+var import_path22 = __toESM(require("path"));
 
 // ../../node_modules/.pnpm/yargs@17.7.2/node_modules/yargs/build/lib/yerror.js
 var YError = class _YError extends Error {
@@ -30822,15 +30953,15 @@ var import_path3 = require("path");
 var import_fs2 = require("fs");
 function sync_default(start, callback) {
   let dir = (0, import_path3.resolve)(".", start);
-  let tmp3, stats = (0, import_fs2.statSync)(dir);
+  let tmp4, stats = (0, import_fs2.statSync)(dir);
   if (!stats.isDirectory()) {
     dir = (0, import_path3.dirname)(dir);
   }
   while (true) {
-    tmp3 = callback(dir, (0, import_fs2.readdirSync)(dir));
-    if (tmp3) return (0, import_path3.resolve)(dir, tmp3);
-    dir = (0, import_path3.dirname)(tmp3 = dir);
-    if (tmp3 === dir) break;
+    tmp4 = callback(dir, (0, import_fs2.readdirSync)(dir));
+    if (tmp4) return (0, import_path3.resolve)(dir, tmp4);
+    dir = (0, import_path3.dirname)(tmp4 = dir);
+    if (tmp4 === dir) break;
   }
 }
 
@@ -31597,6 +31728,15 @@ function getUserAgent() {
   return "<environment undetectable>";
 }
 
+// ../commons/github/lib/getGithubApiBaseUrl.js
+function getGithubApiBaseUrl(repositoryUri) {
+  const { remote } = parseRepository(repositoryUri);
+  if (remote === DEFAULT_REMOTE) {
+    return void 0;
+  }
+  return `https://${remote}/api/v3`;
+}
+
 // ../../node_modules/.pnpm/before-after-hook@4.0.0/node_modules/before-after-hook/lib/register.js
 function register(state, name, method, options) {
   if (typeof method !== "function") {
@@ -31862,23 +32002,23 @@ function getValues(context, operator, key, modifier) {
           });
         }
       } else {
-        const tmp3 = [];
+        const tmp4 = [];
         if (Array.isArray(value)) {
           value.filter(isDefined).forEach(function(value2) {
-            tmp3.push(encodeValue(operator, value2));
+            tmp4.push(encodeValue(operator, value2));
           });
         } else {
           Object.keys(value).forEach(function(k2) {
             if (isDefined(value[k2])) {
-              tmp3.push(encodeUnreserved(k2));
-              tmp3.push(encodeValue(operator, value[k2].toString()));
+              tmp4.push(encodeUnreserved(k2));
+              tmp4.push(encodeValue(operator, value[k2].toString()));
             }
           });
         }
         if (isKeyOperator(operator)) {
-          result.push(encodeUnreserved(key) + "=" + tmp3.join(","));
-        } else if (tmp3.length !== 0) {
-          result.push(tmp3.join(","));
+          result.push(encodeUnreserved(key) + "=" + tmp4.join(","));
+        } else if (tmp4.length !== 0) {
+          result.push(tmp4.join(","));
         }
       }
     }
@@ -31913,8 +32053,8 @@ function expand2(template2, context) {
           expression = expression.substr(1);
         }
         expression.split(/,/g).forEach(function(variable) {
-          var tmp3 = /([^:\*]*)(?::(\d+)|(\*))?/.exec(variable);
-          values.push(getValues(context, operator, tmp3[1], tmp3[2] || tmp3[3]));
+          var tmp4 = /([^:\*]*)(?::(\d+)|(\*))?/.exec(variable);
+          values.push(getValues(context, operator, tmp4[1], tmp4[2] || tmp4[3]));
         });
         if (operator && operator !== "+") {
           var separator = ",";
@@ -35287,8 +35427,10 @@ var GitHub = class {
       await this.restoreFiles(repository, fernIgnoreFiles);
       await repository.commit("SDK Generation");
       await repository.push();
+      const apiBaseUrl = getGithubApiBaseUrl(this.githubConfig.uri);
       const octokit = new Octokit2({
-        auth: this.githubConfig.token
+        auth: this.githubConfig.token,
+        ...apiBaseUrl != null ? { baseUrl: apiBaseUrl } : {}
       });
       const parsedRepo = parseRepository(this.githubConfig.uri);
       const { owner, repo } = parsedRepo;
@@ -41252,13 +41394,20 @@ async function createReplayBranch(repository, branchName, commitMessage, replayC
   }
   const parentSha = replayConflictInfo.previousGenerationSha;
   await repository.createBranchFromHead(branchName);
-  const genTreeHash = await repository.getCommitTreeHash(replayConflictInfo.currentGenerationSha);
-  const tagCommitSha = await repository.commitTree(
-    genTreeHash,
-    parentSha,
-    `[fern-generated] ${commitMessage ?? "Update SDK"}`
-  );
-  return tagCommitSha;
+  try {
+    const genTreeHash = await repository.getCommitTreeHash(replayConflictInfo.currentGenerationSha);
+    const tagCommitSha = await repository.commitTree(
+      genTreeHash,
+      parentSha,
+      `[fern-generated] ${commitMessage ?? "Update SDK"}`
+    );
+    return tagCommitSha;
+  } catch (error) {
+    logger.warn(
+      `Could not create fern-generation-base tag commit: parent ${parentSha} is unreachable in this clone (likely on a squash-merged + deleted branch). Continuing without tag update. Underlying error: ${String(error)}`
+    );
+    return void 0;
+  }
 }
 
 // src/pipeline/github/findExistingUpdatablePR.ts
@@ -41650,8 +41799,8 @@ var GithubStep = class extends BaseStep {
   }
   async executePullRequestMode(repository, newPrBranch, skipCommit, replayConflictInfo, replayResult, resolved) {
     const baseBranch = this.config.branch ?? await repository.getDefaultBranch();
-    const octokit = new Octokit2({ auth: this.config.token });
-    const { owner, repo } = parseRepository(this.config.uri);
+    const octokit = this.createOctokit();
+    const { owner, repo, remote } = parseRepository(this.config.uri);
     let prBranch;
     let isUpdatingExistingPR = false;
     let generationBaseSha;
@@ -41730,7 +41879,7 @@ var GithubStep = class extends BaseStep {
         logger: this.logger
       });
       const pushedBranch = await repository.getCurrentBranch();
-      result.branchUrl = `https://github.com/${this.config.uri}/tree/${pushedBranch}`;
+      result.branchUrl = `https://${remote}/${owner}/${repo}/tree/${pushedBranch}`;
       this.logger.info(`Pushed branch: ${result.branchUrl}`);
       if (generationBaseSha != null) {
         try {
@@ -41745,7 +41894,7 @@ var GithubStep = class extends BaseStep {
       }
     }
     const headSha = await repository.getHeadSha();
-    const changelogUrl = resolved.changelogEntry ? `https://github.com/${this.config.uri}/blob/${headSha}/changelog.md` : void 0;
+    const changelogUrl = resolved.changelogEntry ? `https://${remote}/${owner}/${repo}/blob/${headSha}/changelog.md` : void 0;
     const { prTitle, prBody } = parseCommitMessageForPR(
       resolved.commitMessage,
       resolved.changelogEntry,
@@ -41839,8 +41988,8 @@ var GithubStep = class extends BaseStep {
       success: true
     };
     if (!this.config.previewMode) {
-      const octokit = new Octokit2({ auth: this.config.token });
-      const { owner, repo } = parseRepository(this.config.uri);
+      const octokit = this.createOctokit();
+      const { owner, repo, remote } = parseRepository(this.config.uri);
       await pushSignedCommit({
         repository,
         octokit,
@@ -41852,11 +42001,18 @@ var GithubStep = class extends BaseStep {
         logger: this.logger
       });
       const pushedBranch = await repository.getCurrentBranch();
-      result.branchUrl = `https://github.com/${this.config.uri}/tree/${pushedBranch}`;
+      result.branchUrl = `https://${remote}/${owner}/${repo}/tree/${pushedBranch}`;
       this.logger.info(`Pushed branch: ${result.branchUrl}`);
     }
     return result;
   }
+  createOctokit() {
+    const opts = { auth: this.config.token };
+    if (this.config.apiBaseUrl != null) {
+      opts.baseUrl = this.config.apiBaseUrl;
+    }
+    return new Octokit2(opts);
+  }
   async ensureFernignore() {
     this.logger.debug("Checking for .fernignore file...");
     const fernignorePath = (0, import_path20.join)(this.outputDir, ".fernignore");
@@ -42075,6 +42231,278 @@ var ReplayStep = class extends BaseStep {
   }
 };
 
+// ../cli/generation/local-generation/docker-utils/lib/runDocker.js
+var import_promises15 = require("fs/promises");
+var import_tmp_promise3 = __toESM(require_tmp_promise(), 1);
+async function pullImage(imageName, runner, signal) {
+  await loggingExeca(void 0, runner ?? "docker", ["pull", imageName], {
+    all: true,
+    doNotPipeOutput: true,
+    signal
+  });
+}
+async function startContainer({ logger, imageName, runner }) {
+  const containerRunner = runner ?? "docker";
+  const tryStart = async () => {
+    const { stdout, exitCode, stderr } = await loggingExeca(logger, containerRunner, ["run", "--user", "root", "-dit", "--entrypoint", "/bin/sh", imageName], {
+      reject: false,
+      doNotPipeOutput: true
+    });
+    if (exitCode == null) {
+      throw new Error(`Container runtime '${containerRunner}' is not installed or not found on PATH.
+Error details: ${stderr || stdout || "No output"}`);
+    }
+    if (exitCode !== 0) {
+      throw new Error(`Failed to start container from image ${imageName}.
+${stdout}
+${stderr}`);
+    }
+    return stdout.trim();
+  };
+  try {
+    return await tryStart();
+  } catch (e) {
+    if (e instanceof Error && e.message.includes("No such image")) {
+      await pullImage(imageName, runner);
+      return await tryStart();
+    }
+    throw e;
+  }
+}
+async function execInContainer({ logger, containerId, command, runner, writeLogsToFile = true, reject = true }) {
+  const containerRunner = runner ?? "docker";
+  const { stdout, stderr, exitCode } = await loggingExeca(logger, containerRunner, ["exec", "--user", "root", containerId, ...command], {
+    reject: false,
+    all: true,
+    doNotPipeOutput: true
+  });
+  const logs = stdout + stderr;
+  if (writeLogsToFile) {
+    const tmpFile = await import_tmp_promise3.default.file();
+    await (0, import_promises15.writeFile)(tmpFile.path, logs);
+    logger.info(`Generator logs here: ${tmpFile.path}`);
+  }
+  const resolvedExitCode = exitCode ?? 1;
+  if (reject && resolvedExitCode !== 0) {
+    throw new Error(`Container exec exited with code ${resolvedExitCode}.
+${stdout}
+${stderr}`);
+  }
+  return { stdout, stderr, exitCode: resolvedExitCode };
+}
+async function copyToContainer({ logger, containerId, hostPath, containerPath, runner }) {
+  const containerRunner = runner ?? "docker";
+  const { exitCode, stdout, stderr } = await loggingExeca(logger, containerRunner, ["cp", hostPath, `${containerId}:${containerPath}`], {
+    reject: false,
+    doNotPipeOutput: true
+  });
+  if (exitCode !== 0) {
+    throw new Error(`Failed to copy ${hostPath} to container ${containerId}:${containerPath}.
+${stdout}
+${stderr}`);
+  }
+}
+async function stopContainer({ logger, containerId, runner }) {
+  const containerRunner = runner ?? "docker";
+  await loggingExeca(logger, containerRunner, ["rm", "-f", containerId], {
+    reject: false,
+    doNotPipeOutput: true
+  });
+}
+
+// ../cli/logger/lib/LogLevel.js
+var LogLevel2 = {
+  Trace: "trace",
+  Debug: "debug",
+  Info: "info",
+  Warn: "warn",
+  Error: "error"
+};
+var LOG_LEVELS = Object.values(LogLevel2);
+
+// ../cli/logger/lib/createLogger.js
+var LoggerImpl = class {
+  log;
+  enabled;
+  constructor(log, enabled = true) {
+    this.log = log;
+    this.enabled = enabled;
+  }
+  disable() {
+    this.enabled = false;
+  }
+  enable() {
+    this.enabled = true;
+  }
+  debug(...args) {
+    if (this.enabled) {
+      this.log(LogLevel2.Debug, ...args);
+    }
+  }
+  info(...args) {
+    if (this.enabled) {
+      this.log(LogLevel2.Info, ...args);
+    }
+  }
+  warn(...args) {
+    if (this.enabled) {
+      this.log(LogLevel2.Warn, ...args);
+    }
+  }
+  error(...args) {
+    if (this.enabled) {
+      this.log(LogLevel2.Error, ...args);
+    }
+  }
+  trace(...args) {
+    if (this.enabled) {
+      this.log(LogLevel2.Trace, ...args);
+    }
+  }
+};
+function createLogger4(log) {
+  return new LoggerImpl(log);
+}
+
+// src/pipeline/steps/VerificationStep.ts
+var import_fs15 = require("fs");
+var import_path21 = 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}`;
+var VerificationStep = class extends BaseStep {
+  constructor(outputDir, logger, config, generatorName, generatorVersions) {
+    super(outputDir, logger);
+    this.config = config;
+    this.generatorName = generatorName;
+    this.generatorVersions = generatorVersions;
+  }
+  config;
+  generatorName;
+  generatorVersions;
+  name = "verify";
+  async execute(_context) {
+    const verifyScriptHostPath = (0, import_path21.join)(this.outputDir, VERIFY_SCRIPT_RELATIVE_PATH);
+    if (!(0, import_fs15.existsSync)(verifyScriptHostPath)) {
+      return { executed: true, success: true, skipped: true };
+    }
+    const validatorImage = this.deriveValidatorImage();
+    if (validatorImage == null) {
+      const message = "Cannot derive validator image: generatorName and generatorVersions are required to compute the `{generatorImage}-validator:{version}` tag.";
+      this.logger.error(message);
+      return {
+        executed: true,
+        success: false,
+        skipped: false,
+        errorMessage: message
+      };
+    }
+    const runner = this.config.runner ?? "docker";
+    const dockerLogger = createDockerLoggerAdapter(this.logger);
+    let containerId;
+    try {
+      try {
+        containerId = await startContainer({
+          logger: dockerLogger,
+          imageName: validatorImage,
+          runner
+        });
+      } catch (error) {
+        const message = `Failed to start verification container from image ${validatorImage}: ${extractErrorMessage(error)}`;
+        this.logger.error(message);
+        return {
+          executed: true,
+          success: false,
+          skipped: false,
+          errorMessage: message
+        };
+      }
+      try {
+        await copyToContainer({
+          logger: dockerLogger,
+          containerId,
+          hostPath: `${this.outputDir}/.`,
+          containerPath: CONTAINER_WORKSPACE_PATH,
+          runner
+        });
+      } catch (error) {
+        const message = `Failed to copy workspace into verification container: ${extractErrorMessage(error)}`;
+        this.logger.error(message);
+        return {
+          executed: true,
+          success: false,
+          skipped: false,
+          errorMessage: message
+        };
+      }
+      const { stdout, stderr, exitCode } = await execInContainer({
+        logger: dockerLogger,
+        containerId,
+        command: ["bash", VERIFY_SCRIPT_CONTAINER_PATH],
+        runner,
+        writeLogsToFile: false,
+        reject: false
+      });
+      if (exitCode !== 0) {
+        const capturedStderr = stderr.length > 0 ? stderr : stdout;
+        this.logger.error(
+          `Verification failed (exit code ${exitCode}) for image ${validatorImage}.
+${capturedStderr}`
+        );
+        return {
+          executed: true,
+          success: false,
+          skipped: false,
+          stderr: capturedStderr,
+          errorMessage: `Verification script exited with code ${exitCode}`
+        };
+      }
+      this.logger.info(`Verification succeeded for image ${validatorImage}`);
+      return { executed: true, success: true, skipped: false };
+    } finally {
+      if (containerId != null) {
+        try {
+          await stopContainer({ logger: dockerLogger, containerId, runner });
+        } catch (error) {
+          this.logger.debug(
+            `Best-effort cleanup: failed to stop verification container ${containerId}: ${extractErrorMessage(error)}`
+          );
+        }
+      }
+    }
+  }
+  deriveValidatorImage() {
+    if (this.generatorName == null) {
+      return void 0;
+    }
+    const version2 = this.generatorVersions?.[this.generatorName];
+    if (version2 == null) {
+      return void 0;
+    }
+    return `${this.generatorName}-validator:${version2}`;
+  }
+};
+function createDockerLoggerAdapter(pipelineLogger) {
+  return createLogger4((level, ...args) => {
+    const message = args.join(" ");
+    switch (level) {
+      case LogLevel2.Trace:
+      case LogLevel2.Debug:
+        pipelineLogger.debug(message);
+        return;
+      case LogLevel2.Info:
+        pipelineLogger.info(message);
+        return;
+      case LogLevel2.Warn:
+        pipelineLogger.warn(message);
+        return;
+      case LogLevel2.Error:
+        pipelineLogger.error(message);
+        return;
+    }
+  });
+}
+
 // src/pipeline/PostGenerationPipeline.ts
 var PostGenerationPipeline = class {
   constructor(config, logger = consolePipelineLogger) {
@@ -42119,6 +42547,17 @@ var PostGenerationPipeline = class {
         )
       );
     }
+    if (config.verify?.enabled) {
+      this.steps.push(
+        new VerificationStep(
+          config.outputDir,
+          this.logger,
+          config.verify,
+          config.generatorName,
+          config.generatorVersions
+        )
+      );
+    }
     if (config.github?.enabled) {
       this.steps.push(new GithubStep(config.outputDir, this.logger, config.github));
     }
@@ -42157,12 +42596,25 @@ var PostGenerationPipeline = class {
           pipelineContext.previousStepResults.autoVersion = stepResult;
         } else if (step.name === "fernignore") {
           result.steps.fernignore = stepResult;
+        } else if (step.name === "verify") {
+          const verifyResult = stepResult;
+          result.steps.verify = verifyResult;
+          pipelineContext.previousStepResults.verify = verifyResult;
         } else if (step.name === "github") {
           result.steps.github = stepResult;
         }
         if (!stepResult.success) {
           result.success = false;
           result.errors = result.errors ?? [];
+          if (step.name === "verify") {
+            const verifyResult = stepResult;
+            if (verifyResult.stderr != null && verifyResult.stderr.length > 0) {
+              result.errors.push(verifyResult.stderr);
+            } else {
+              result.errors.push(verifyResult.errorMessage ?? `${step.name} step failed`);
+            }
+            break;
+          }
           result.errors.push(stepResult.errorMessage ?? `${step.name} step failed`);
         }
       } catch (error) {
@@ -42170,6 +42622,9 @@ var PostGenerationPipeline = class {
         result.errors = result.errors ?? [];
         const errorMessage = extractErrorMessage(error);
         result.errors.push(`${step.name} step error: ${errorMessage}`);
+        if (step.name === "verify") {
+          break;
+        }
       }
     }
     return result;
@@ -42200,7 +42655,7 @@ void yargs_default(hideBin(process.argv)).scriptName(process.env.CLI_NAME ?? "ge
     const readmeConfig = await loadReadmeConfig({
       absolutePathToConfig: resolve(wd, argv.config)
     });
-    const originalReadmeContent = argv.originalReadme != null ? await (0, import_promises15.readFile)(argv.originalReadme, "utf8") : void 0;
+    const originalReadmeContent = argv.originalReadme != null ? await (0, import_promises16.readFile)(argv.originalReadme, "utf8") : void 0;
     await generateReadmeToStream({
       originalReadmeContent,
       readmeConfig,
@@ -42328,7 +42783,7 @@ void yargs_default(hideBin(process.argv)).scriptName(process.env.CLI_NAME ?? "ge
       try {
         const wd = cwd();
         const configValue = argv.config;
-        const configContent = configValue === STDIN_MARKER ? await readStdin() : configValue.trimStart().startsWith("{") ? configValue : await (0, import_promises15.readFile)(resolve(wd, configValue), "utf-8");
+        const configContent = configValue === STDIN_MARKER ? await readStdin() : configValue.trimStart().startsWith("{") ? configValue : await (0, import_promises16.readFile)(resolve(wd, configValue), "utf-8");
         let config;
         try {
           config = JSON.parse(configContent);
@@ -42624,9 +43079,9 @@ async function createWriteStream(outputPath) {
 }
 async function createWriteStreamFromFile(filepath) {
   if (!await doesPathExist(filepath)) {
-    await (0, import_promises15.mkdir)(import_path21.default.dirname(filepath), { recursive: true });
+    await (0, import_promises16.mkdir)(import_path22.default.dirname(filepath), { recursive: true });
   }
-  return import_fs15.default.createWriteStream(filepath);
+  return import_fs16.default.createWriteStream(filepath);
 }
 /*! Bundled license information:
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fern-api/generator-cli",
-  "version": "0.9.25",
+  "version": "0.9.27",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",
@@ -23,7 +23,7 @@
   ],
   "dependencies": {
     "@boundaryml/baml": "^0.219.0",
-    "@fern-api/replay": "0.14.1",
+    "@fern-api/replay": "0.15.0",
     "@octokit/rest": "^22.0.1",
     "es-toolkit": "^1.45.1",
     "semver": "^7.6.3",