@fern-api/generator-cli 0.9.21 → 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"], {