@fern-api/generator-cli 0.9.22 → 0.9.23

package/dist/api.d.ts

@@ -572,7 +572,7 @@ interface ReplayRunParams {
     logger?: PipelineLogger;
 }
 interface ReplayRunResult {
-    /** null if replay wasn't initialized (no lockfile) */
+    /** null if replay wasn't initialized (no lockfile) OR if prepare/apply crashed (see failureReason) */
     report: ReplayReport | null;
     /** Whether .fernignore was updated */
     fernignoreUpdated: boolean;
@@ -582,6 +582,12 @@ interface ReplayRunResult {
     currentGenerationSha: string | null;
     /** SHA of main's HEAD before replay ran. Always on main's lineage, stable after squash merges. */
     baseBranchHead: string | null;
+    /**
+     * Set when prepare or apply crashed (e.g. corrupted lockfile, git failure, library bug).
+     * Distinguishes a real failure from "no replay initialized" (lockfile missing → null report, no failureReason).
+     * Generation never fails on replay errors — callers should surface this for telemetry/logging only.
+     */
+    failureReason?: string;
 }
 /**
  * Backwards-compatible atomic entry point. Composes `replayPrepare` +

package/dist/api.js

@@ -6173,7 +6173,9 @@ function newRepositoryReference({ remote, owner, repo }) {
     repoUrl,
     cloneUrl,
     getAuthedCloneUrl: (installationToken) => {
-      return cloneUrl.replace("https://", `https://x-access-token:${installationToken}@`);
+      const isInstallationToken = installationToken.startsWith("ghs_") || installationToken.startsWith("ghu_");
+      const userPrefix = isInstallationToken ? "x-access-token:" : "";
+      return cloneUrl.replace("https://", `https://${userPrefix}${installationToken}@`);
     }
   };
 }
@@ -9894,7 +9896,7 @@ function cwd() {
 // ../commons/fs-utils/lib/resolve.js
 var import_path2 = __toESM(require("path"), 1);
 function resolve2(...paths) {
-  return import_path2.default.resolve(...paths.map(convertToOsPath));
+  return convertToOsPath(import_path2.default.resolve(...paths.map(convertToOsPath)));
 }
 
 // src/github/GitHub.ts
@@ -10295,12 +10297,17 @@ async function replayPrepare(params) {
           `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_replay4.ReplayService(outputDir, { enabled: true });
-        await syncService.syncFromDivergentMerge(tagSha, {
-          cliVersion,
-          generatorVersions,
-          baseBranchHead: baseBranchHead ?? void 0
-        });
+        try {
+          const syncService = new import_replay4.ReplayService(outputDir, { enabled: true });
+          await syncService.syncFromDivergentMerge(tagSha, {
+            cliVersion,
+            generatorVersions,
+            baseBranchHead: baseBranchHead ?? void 0
+          });
+        } catch (error) {
+          logger?.warn("Replay divergent-merge sync failed, continuing without sync: " + String(error));
+          throw new ReplayPrepareError(String(error), error);
+        }
         try {
           const freshLockManager = new import_replay4.LockfileManager(outputDir);
           if (freshLockManager.exists()) {
@@ -10322,8 +10329,8 @@ async function replayPrepare(params) {
       baseBranchHead: baseBranchHead ?? void 0
     });
   } catch (error) {
-    logger?.warn("Replay failed, continuing without replay: " + String(error));
-    return null;
+    logger?.warn("Replay prepare failed, continuing without replay: " + String(error));
+    throw new ReplayPrepareError(String(error), error);
   }
   return {
     _service: service,
@@ -10341,13 +10348,14 @@ async function replayApply(prepared, params = {}) {
   try {
     report = await prepared._service.applyPreparedReplay(prepared._preparation, { stageOnly });
   } catch (error) {
-    logger?.warn("Replay failed, continuing without replay: " + String(error));
+    logger?.warn("Replay apply failed, continuing without replay: " + String(error));
     return {
       report: null,
       fernignoreUpdated: false,
       previousGenerationSha: prepared.previousGenerationSha,
       currentGenerationSha: prepared.currentGenerationSha,
-      baseBranchHead: prepared.baseBranchHead
+      baseBranchHead: prepared.baseBranchHead,
+      failureReason: String(error)
     };
   }
   let resolvedBaseBranchHead = prepared.baseBranchHead;
@@ -10373,7 +10381,19 @@ async function replayApply(prepared, params = {}) {
   };
 }
 async function replayRun(params) {
-  const prepared = await replayPrepare(params);
+  let prepared;
+  try {
+    prepared = await replayPrepare(params);
+  } catch (error) {
+    return {
+      report: null,
+      fernignoreUpdated: false,
+      previousGenerationSha: null,
+      currentGenerationSha: null,
+      baseBranchHead: null,
+      failureReason: error instanceof ReplayPrepareError ? error.reason : String(error)
+    };
+  }
   if (prepared == null) {
     return {
       report: null,
@@ -10385,6 +10405,18 @@ async function replayRun(params) {
   }
   return replayApply(prepared, { stageOnly: params.stageOnly, logger: params.logger });
 }
+var ReplayPrepareError = class extends Error {
+  reason;
+  constructor(reason, cause) {
+    super(`Replay prepare failed: ${reason}`, { cause });
+    Object.setPrototypeOf(this, new.target.prototype);
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, this.constructor);
+    }
+    this.name = this.constructor.name;
+    this.reason = reason;
+  }
+};
 function isTagMergedIntoHead(cwd2, tagSha) {
   try {
     (0, import_child_process3.execFileSync)("git", ["merge-base", "--is-ancestor", tagSha, "HEAD"], {

package/dist/cli.js

@@ -29211,11 +29211,11 @@ var VersionBump2;
 var init_types = __esm({
   "../cli/ai/lib/baml_client/types.js"() {
     "use strict";
-    (function(VersionBump3) {
-      VersionBump3["MAJOR"] = "MAJOR";
-      VersionBump3["MINOR"] = "MINOR";
-      VersionBump3["PATCH"] = "PATCH";
-      VersionBump3["NO_CHANGE"] = "NO_CHANGE";
+    (function(VersionBump4) {
+      VersionBump4["MAJOR"] = "MAJOR";
+      VersionBump4["MINOR"] = "MINOR";
+      VersionBump4["PATCH"] = "PATCH";
+      VersionBump4["NO_CHANGE"] = "NO_CHANGE";
     })(VersionBump2 || (VersionBump2 = {}));
   }
 });
@@ -29245,6 +29245,24 @@ var init_watchers = __esm({
 });
 
 // ../cli/ai/lib/baml_client/index.js
+var baml_client_exports = {};
+__export(baml_client_exports, {
+  BamlClientFinishReasonError: () => import_baml6.BamlClientFinishReasonError,
+  BamlClientHttpError: () => import_baml6.BamlClientHttpError,
+  BamlValidationError: () => import_baml6.BamlValidationError,
+  VersionBump: () => VersionBump2,
+  all_succeeded: () => all_succeeded,
+  b: () => b2,
+  flush: () => flush,
+  get_checks: () => get_checks,
+  onLogEvent: () => onLogEvent,
+  resetBamlEnvVars: () => resetBamlEnvVars,
+  setTags: () => setTags,
+  traceAsync: () => traceAsync,
+  traceSync: () => traceSync,
+  version: () => version,
+  watchers: () => watchers_exports
+});
 var import_baml5, import_baml6, version;
 var init_baml_client = __esm({
   "../cli/ai/lib/baml_client/index.js"() {
@@ -29262,6 +29280,10 @@ var init_baml_client = __esm({
 });
 
 // ../cli/ai/lib/configureBamlClient.js
+var configureBamlClient_exports = {};
+__export(configureBamlClient_exports, {
+  configureBamlClient: () => configureBamlClient
+});
 function configureBamlClient(config) {
   const registry = new import_baml7.ClientRegistry();
   const clientOptions = {
@@ -29282,31 +29304,59 @@ var init_configureBamlClient = __esm({
   }
 });
 
+// ../cli/ai/lib/loader.js
+async function loadBamlDependencies() {
+  try {
+    const [baml, bamlClient, config] = await Promise.all([
+      import("@boundaryml/baml"),
+      Promise.resolve().then(() => (init_baml_client(), baml_client_exports)),
+      Promise.resolve().then(() => (init_configureBamlClient(), configureBamlClient_exports))
+    ]);
+    return {
+      ClientRegistry: baml.ClientRegistry,
+      BamlClient: bamlClient.b,
+      configureBamlClient: config.configureBamlClient
+    };
+  } catch (error) {
+    const original = error instanceof Error ? error.message : String(error);
+    throw new Error(`${INSTALL_MESSAGE}
+
+Original error: ${original}`);
+  }
+}
+var INSTALL_MESSAGE;
+var init_loader = __esm({
+  "../cli/ai/lib/loader.js"() {
+    "use strict";
+    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";
+  }
+});
+
+// ../cli/ai/lib/types.js
+var VersionBump3;
+var init_types2 = __esm({
+  "../cli/ai/lib/types.js"() {
+    "use strict";
+    (function(VersionBump4) {
+      VersionBump4["MAJOR"] = "MAJOR";
+      VersionBump4["MINOR"] = "MINOR";
+      VersionBump4["PATCH"] = "PATCH";
+      VersionBump4["NO_CHANGE"] = "NO_CHANGE";
+    })(VersionBump3 || (VersionBump3 = {}));
+  }
+});
+
 // ../cli/ai/lib/index.js
 var lib_exports = {};
 __export(lib_exports, {
-  BamlClientFinishReasonError: () => import_baml6.BamlClientFinishReasonError,
-  BamlClientHttpError: () => import_baml6.BamlClientHttpError,
-  BamlValidationError: () => import_baml6.BamlValidationError,
-  VersionBump: () => VersionBump2,
-  all_succeeded: () => all_succeeded,
-  b: () => b2,
-  configureBamlClient: () => configureBamlClient,
-  flush: () => flush,
-  get_checks: () => get_checks,
-  onLogEvent: () => onLogEvent,
-  resetBamlEnvVars: () => resetBamlEnvVars,
-  setTags: () => setTags,
-  traceAsync: () => traceAsync,
-  traceSync: () => traceSync,
-  version: () => version,
-  watchers: () => watchers_exports
+  VersionBump: () => VersionBump3,
+  loadBamlDependencies: () => loadBamlDependencies
 });
 var init_lib = __esm({
   "../cli/ai/lib/index.js"() {
     "use strict";
-    init_baml_client();
-    init_configureBamlClient();
+    init_loader();
+    init_types2();
   }
 });
 
@@ -29355,7 +29405,7 @@ async function doesPathExist(filepath, mode) {
 // ../commons/fs-utils/lib/resolve.js
 var import_path = __toESM(require("path"), 1);
 function resolve(...paths) {
-  return import_path.default.resolve(...paths.map(convertToOsPath));
+  return convertToOsPath(import_path.default.resolve(...paths.map(convertToOsPath)));
 }
 
 // src/cli.ts
@@ -31347,7 +31397,9 @@ function newRepositoryReference({ remote, owner, repo }) {
     repoUrl,
     cloneUrl,
     getAuthedCloneUrl: (installationToken) => {
-      return cloneUrl.replace("https://", `https://x-access-token:${installationToken}@`);
+      const isInstallationToken = installationToken.startsWith("ghs_") || installationToken.startsWith("ghu_");
+      const userPrefix = isInstallationToken ? "x-access-token:" : "";
+      return cloneUrl.replace("https://", `https://${userPrefix}${installationToken}@`);
     }
   };
 }
@@ -39298,12 +39350,17 @@ async function replayPrepare(params) {
           `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 syncService = new ReplayService(outputDir, { enabled: true });
+          await syncService.syncFromDivergentMerge(tagSha, {
+            cliVersion,
+            generatorVersions,
+            baseBranchHead: baseBranchHead ?? void 0
+          });
+        } catch (error) {
+          logger?.warn("Replay divergent-merge sync failed, continuing without sync: " + String(error));
+          throw new ReplayPrepareError(String(error), error);
+        }
         try {
           const freshLockManager = new LockfileManager(outputDir);
           if (freshLockManager.exists()) {
@@ -39325,8 +39382,8 @@ async function replayPrepare(params) {
       baseBranchHead: baseBranchHead ?? void 0
     });
   } catch (error) {
-    logger?.warn("Replay failed, continuing without replay: " + String(error));
-    return null;
+    logger?.warn("Replay prepare failed, continuing without replay: " + String(error));
+    throw new ReplayPrepareError(String(error), error);
   }
   return {
     _service: service,
@@ -39344,13 +39401,14 @@ async function replayApply(prepared, params = {}) {
   try {
     report = await prepared._service.applyPreparedReplay(prepared._preparation, { stageOnly });
   } catch (error) {
-    logger?.warn("Replay failed, continuing without replay: " + String(error));
+    logger?.warn("Replay apply failed, continuing without replay: " + String(error));
     return {
       report: null,
       fernignoreUpdated: false,
       previousGenerationSha: prepared.previousGenerationSha,
       currentGenerationSha: prepared.currentGenerationSha,
-      baseBranchHead: prepared.baseBranchHead
+      baseBranchHead: prepared.baseBranchHead,
+      failureReason: String(error)
     };
   }
   let resolvedBaseBranchHead = prepared.baseBranchHead;
@@ -39376,7 +39434,19 @@ async function replayApply(prepared, params = {}) {
   };
 }
 async function replayRun(params) {
-  const prepared = await replayPrepare(params);
+  let prepared;
+  try {
+    prepared = await replayPrepare(params);
+  } catch (error) {
+    return {
+      report: null,
+      fernignoreUpdated: false,
+      previousGenerationSha: null,
+      currentGenerationSha: null,
+      baseBranchHead: null,
+      failureReason: error instanceof ReplayPrepareError ? error.reason : String(error)
+    };
+  }
   if (prepared == null) {
     return {
       report: null,
@@ -39388,6 +39458,18 @@ async function replayRun(params) {
   }
   return replayApply(prepared, { stageOnly: params.stageOnly, logger: params.logger });
 }
+var ReplayPrepareError = class extends Error {
+  reason;
+  constructor(reason, cause) {
+    super(`Replay prepare failed: ${reason}`, { cause });
+    Object.setPrototypeOf(this, new.target.prototype);
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, this.constructor);
+    }
+    this.name = this.constructor.name;
+    this.reason = reason;
+  }
+};
 function isTagMergedIntoHead(cwd2, tagSha) {
   try {
     (0, import_child_process4.execFileSync)("git", ["merge-base", "--is-ancestor", tagSha, "HEAD"], {
@@ -39482,7 +39564,7 @@ var consolePipelineLogger = {
 };
 
 // src/pipeline/PostGenerationPipeline.ts
-var import_child_process6 = require("child_process");
+var import_child_process7 = require("child_process");
 
 // src/pipeline/github/constants.ts
 var FERN_BOT_NAME2 = "fern-api";
@@ -40810,7 +40892,7 @@ ${newBlock}${remainder}`;
     return `${message.trimEnd()}${FERN_TRAILER}`;
   }
   async analyzeSingle(cleanedDiff, language, previousVersion) {
-    const { client, VersionBump: VersionBump3 } = await this.loadBaml();
+    const { client, VersionBump: VersionBump4 } = await this.loadBaml();
     const result = await client.AnalyzeSdkDiff(
       cleanedDiff,
       language,
@@ -40818,7 +40900,7 @@ ${newBlock}${remainder}`;
       this.config.priorChangelog ?? "",
       this.config.specCommitMessage ?? ""
     );
-    if (result.version_bump === VersionBump3.NO_CHANGE) {
+    if (result.version_bump === VersionBump4.NO_CHANGE) {
       return null;
     }
     return {
@@ -40829,8 +40911,8 @@ ${newBlock}${remainder}`;
     };
   }
   async analyzeChunks(chunks, language, previousVersion) {
-    const { client, VersionBump: VersionBump3 } = await this.loadBaml();
-    let bestBump = VersionBump3.NO_CHANGE;
+    const { client, VersionBump: VersionBump4 } = await this.loadBaml();
+    let bestBump = VersionBump4.NO_CHANGE;
     let bestMessage = "";
     let bestVersionBumpReason;
     const changelogEntries = [];
@@ -40846,7 +40928,7 @@ ${newBlock}${remainder}`;
         this.config.priorChangelog ?? "",
         this.config.specCommitMessage ?? ""
       );
-      if (analysis.version_bump === VersionBump3.NO_CHANGE) {
+      if (analysis.version_bump === VersionBump4.NO_CHANGE) {
         continue;
       }
       const prev = bestBump;
@@ -40860,7 +40942,7 @@ ${newBlock}${remainder}`;
         changelogEntries.push(entry);
       }
     }
-    if (bestBump === VersionBump3.NO_CHANGE) {
+    if (bestBump === VersionBump4.NO_CHANGE) {
       return null;
     }
     if (changelogEntries.length <= 1) {
@@ -40907,11 +40989,12 @@ ${newBlock}${remainder}`;
     if (this.config.ai == null) {
       throw new Error("AutoVersionStep: ai config is missing. Set autoVersion.ai to a BAML provider+model pair.");
     }
-    const cliAi = await Promise.resolve().then(() => (init_lib(), lib_exports));
-    const registry = cliAi.configureBamlClient(this.config.ai);
+    const { loadBamlDependencies: loadBamlDependencies2, VersionBump: VersionBump4 } = await Promise.resolve().then(() => (init_lib(), lib_exports));
+    const { BamlClient, configureBamlClient: configureBamlClient2 } = await loadBamlDependencies2();
+    const registry = configureBamlClient2(this.config.ai);
     return {
-      client: cliAi.b.withOptions({ clientRegistry: registry }),
-      VersionBump: cliAi.VersionBump
+      client: BamlClient.withOptions({ clientRegistry: registry }),
+      VersionBump: VersionBump4
     };
   }
   /**
@@ -40938,6 +41021,7 @@ ${newBlock}${remainder}`;
 };
 
 // src/pipeline/steps/GenerationCommitStep.ts
+var import_child_process6 = require("child_process");
 var GenerationCommitStep = class extends BaseStep {
   constructor(outputDir, logger, config, cliVersion, generatorVersions, generatorName) {
     super(outputDir, logger);
@@ -40952,14 +41036,35 @@ var GenerationCommitStep = class extends BaseStep {
   generatorName;
   name = "generationCommit";
   async execute(_context) {
-    const prepared = await replayPrepare({
-      outputDir: this.outputDir,
-      cliVersion: this.cliVersion,
-      generatorVersions: this.generatorVersions,
-      generatorName: this.generatorName,
-      skipApplication: this.config.skipApplication,
-      logger: this.logger
-    });
+    const headBeforePrepare = tryRevParse(this.outputDir, "HEAD");
+    let prepared;
+    try {
+      prepared = await replayPrepare({
+        outputDir: this.outputDir,
+        cliVersion: this.cliVersion,
+        generatorVersions: this.generatorVersions,
+        generatorName: this.generatorName,
+        skipApplication: this.config.skipApplication,
+        logger: this.logger
+      });
+    } catch (error) {
+      const reason = error instanceof ReplayPrepareError ? error.reason : String(error);
+      if (headBeforePrepare != null) {
+        try {
+          (0, import_child_process6.execFileSync)("git", ["reset", "--hard", headBeforePrepare], {
+            cwd: this.outputDir,
+            stdio: "pipe"
+          });
+        } catch {
+        }
+      }
+      return {
+        executed: true,
+        success: true,
+        errorMessage: reason,
+        preparedReplay: null
+      };
+    }
     if (prepared == null) {
       return {
         executed: true,
@@ -40978,6 +41083,17 @@ var GenerationCommitStep = class extends BaseStep {
     };
   }
 };
+function tryRevParse(cwd2, rev) {
+  try {
+    return (0, import_child_process6.execFileSync)("git", ["rev-parse", "--verify", rev], {
+      cwd: cwd2,
+      encoding: "utf-8",
+      stdio: "pipe"
+    }).trim();
+  } catch {
+    return null;
+  }
+}
 
 // src/pipeline/steps/GithubStep.ts
 var import_promises14 = require("fs/promises");
@@ -41708,6 +41824,18 @@ var ReplayStep = class extends BaseStep {
   async execute(context) {
     const generationCommit = context.previousStepResults.generationCommit;
     const prepared = generationCommit?.preparedReplay;
+    if (generationCommit != null && generationCommit.errorMessage != null && prepared == null) {
+      return {
+        executed: true,
+        success: true,
+        replayCrashed: true,
+        errorMessage: generationCommit.errorMessage,
+        flow: "normal-regeneration",
+        patchesDetected: 0,
+        patchesApplied: 0,
+        patchesWithConflicts: 0
+      };
+    }
     if (generationCommit != null && prepared == null) {
       return {
         executed: true,
@@ -41730,6 +41858,21 @@ var ReplayStep = class extends BaseStep {
       skipApplication: this.config.skipApplication,
       logger: this.logger
     });
+    if (result.failureReason != null) {
+      return {
+        executed: true,
+        success: true,
+        replayCrashed: true,
+        errorMessage: result.failureReason,
+        previousGenerationSha: result.previousGenerationSha ?? void 0,
+        currentGenerationSha: result.currentGenerationSha ?? void 0,
+        baseBranchHead: result.baseBranchHead ?? void 0,
+        flow: "normal-regeneration",
+        patchesDetected: 0,
+        patchesApplied: 0,
+        patchesWithConflicts: 0
+      };
+    }
     if (result.report == null) {
       return {
         executed: true,
@@ -41758,6 +41901,11 @@ var ReplayStep = class extends BaseStep {
       patchesRepointed: report.patchesRepointed,
       patchesContentRebased: report.patchesContentRebased,
       patchesKeptAsUserOwned: report.patchesKeptAsUserOwned,
+      patchesSkipped: report.patchesSkipped,
+      patchesPartiallyApplied: report.patchesPartiallyApplied,
+      patchesConflictResolved: report.patchesConflictResolved,
+      patchesReverted: report.patchesReverted,
+      patchesRefreshed: report.patchesRefreshed,
       unresolvedPatches: report.unresolvedPatches?.map((info) => ({
         patchId: info.patchId,
         patchMessage: info.patchMessage,
@@ -41826,8 +41974,8 @@ var PostGenerationPipeline = class {
   async run() {
     if (this.config.github?.enabled) {
       try {
-        (0, import_child_process6.execFileSync)("git", ["config", "user.name", FERN_BOT_NAME2], { cwd: this.config.outputDir });
-        (0, import_child_process6.execFileSync)("git", ["config", "user.email", FERN_BOT_EMAIL2], { cwd: this.config.outputDir });
+        (0, import_child_process7.execFileSync)("git", ["config", "user.name", FERN_BOT_NAME2], { cwd: this.config.outputDir });
+        (0, import_child_process7.execFileSync)("git", ["config", "user.email", FERN_BOT_EMAIL2], { cwd: this.config.outputDir });
       } catch {
       }
     }

package/package.json

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