@fern-api/fern-api-dev 5.23.3-1479-gdcb664ea5f7 → 5.23.3-1481-gfbd8c928ac9

package/cli.cjs

@@ -573419,9 +573419,9 @@ var require_diff3 = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/@fern-api+replay@0.19.1/node_modules/@fern-api/replay/dist/index.cjs
+// ../../../node_modules/.pnpm/@fern-api+replay@0.19.2/node_modules/@fern-api/replay/dist/index.cjs
 var require_dist24 = __commonJS({
-  "../../../node_modules/.pnpm/@fern-api+replay@0.19.1/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
+  "../../../node_modules/.pnpm/@fern-api+replay@0.19.2/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
     "use strict";
     var __defProp5 = Object.defineProperty;
     var __getOwnPropDesc4 = Object.getOwnPropertyDescriptor;
@@ -576659,7 +576659,9 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
       }
       async prepare(options2) {
         const preLock = this.service.lockManager.read();
-        const previousGenerationSha = preLock.current_generation ?? null;
+        const previousGenerationSha = await this.service.resolveReachablePreviousGeneration(
+          preLock.current_generation ?? null
+        );
         let { patches: newPatches, revertedPatchIds } = await this.service.detector.detectNewPatches();
         const detectorWarnings = [...this.service.detector.warnings];
         const detectorDegraded = [...this.service.detector.degradedReasons];
@@ -576795,7 +576797,9 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
       }
       async prepare(options2) {
         const preLock = this.service.lockManager.read();
-        const previousGenerationSha = preLock.current_generation ?? null;
+        const previousGenerationSha = await this.service.resolveReachablePreviousGeneration(
+          preLock.current_generation ?? null
+        );
         if (options2?.dryRun) {
           const existingPatches2 = this.service.lockManager.getPatches();
           const { patches: newPatches2, revertedPatchIds: dryRunReverted } = await this.service.detector.detectNewPatches();
@@ -577031,6 +577035,37 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         this.committer = new ReplayCommitter(git, outputDir);
         this.fileOwnership = new FileOwnership(git);
       }
+      /**
+       * Resolve the previous-generation SHA to export on
+       * `ReplayPreparation.previousGenerationSha`.
+       *
+       * `current_generation` is the SHA of a LOCALLY-created `[fern-generated]` commit.
+       * generator-cli's signed-commit push (`pushSignedCommit`) recreates that commit under a
+       * new remote SHA, and a squash-merge collapses it away, so the recorded value can be
+       * unreachable in a later clone (org "Natural": autoVersion then diffed against a phantom
+       * baseline and silently reported NO_CHANGE — or, pre-a38bbc6, shipped
+       * `0.0.0-fern-placeholder`). Consumers (generator-cli's autoVersion) diff against this
+       * baseline, so it MUST resolve to a real commit.
+       *
+       * Prefer the recorded SHA while it still resolves — the healthy case, and the pristine
+       * prior `[fern-generated]` tree. Otherwise re-anchor on the most recent reachable
+       * generation boundary in first-parent history: the SAME value the detector already
+       * derives for its own scan boundary (`findPreviousGenerationFromHistory`, whose
+       * `isGenerationBoundary` matches squash-merge subjects like `SDK Generation (#N)`). Fall
+       * back to the recorded SHA only when no boundary is reachable at all — no worse than the
+       * prior behavior. ADR 0002 (generator-cli) allows replay to expose this reconciled value;
+       * the consumer stays independently resilient.
+       *
+       * MUST be called before the new `[fern-generated]` commit is created, while HEAD is still
+       * the pre-generation (customer) state, so the walk anchors on the PREVIOUS generation.
+       */
+      async resolveReachablePreviousGeneration(recordedSha) {
+        if (recordedSha != null && await this.git.commitExists(recordedSha)) {
+          return recordedSha;
+        }
+        const derived = await this.detector.findPreviousGenerationFromHistory();
+        return derived ?? recordedSha;
+      }
       /**
        * Phase 1 of the two-phase replay flow. Runs preGenerationRebase (when applicable),
        * detects new patches, and creates the `[fern-generated]` commit. Leaves HEAD at
@@ -690982,7 +691017,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.23.3-1479-gdcb664ea5f7",
+          version: "5.23.3-1481-gfbd8c928ac9",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -691048,7 +691083,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.23.3-1479-gdcb664ea5f7",
+        version: "5.23.3-1481-gfbd8c928ac9",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -872149,7 +872184,7 @@ var LOCAL_STORAGE_FOLDER4 = ".fern-dev";
 var LOGS_FOLDER_NAME = "logs";
 var MAX_LOGS_DIR_SIZE_BYTES = 100 * 1024 * 1024;
 function getCliSource() {
-  const version7 = "5.23.3-1479-gdcb664ea5f7";
+  const version7 = "5.23.3-1481-gfbd8c928ac9";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -904738,7 +904773,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.23.3-1479-gdcb664ea5f7",
+        cliVersion: "5.23.3-1481-gfbd8c928ac9",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -971525,7 +971560,7 @@ function getAutomationContextFromEnv() {
     config_branch: process.env.FERN_CONFIG_BRANCH,
     config_pr_number: process.env.FERN_CONFIG_PR_NUMBER,
     trigger: process.env.GITHUB_EVENT_NAME,
-    cli_version: "5.23.3-1479-gdcb664ea5f7"
+    cli_version: "5.23.3-1481-gfbd8c928ac9"
   };
 }
 function isAutomationMode() {
@@ -972357,7 +972392,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.23.3-1479-gdcb664ea5f7";
+    return "5.23.3-1481-gfbd8c928ac9";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.23.3-1479-gdcb664ea5f7",
+  "version": "5.23.3-1481-gfbd8c928ac9",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",