@fern-api/generator-cli 0.9.50 → 0.9.52

package/dist/cli.js

@@ -22214,7 +22214,7 @@ var init_diff3 = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/@fern-api+replay@0.19.1/node_modules/@fern-api/replay/dist/index.js
+// ../../node_modules/.pnpm/@fern-api+replay@0.19.2/node_modules/@fern-api/replay/dist/index.js
 var dist_exports = {};
 __export(dist_exports, {
   CREDENTIAL_PATTERNS: () => CREDENTIAL_PATTERNS,
@@ -24295,7 +24295,7 @@ function status(outputDir) {
 }
 var import_promises4, import_os, import_path7, import_fs6, import_path8, import_yaml, import_crypto, import_path9, import_promises5, import_os2, import_path10, import_promises6, import_path11, import_promises7, import_path12, import_fs7, import_promises8, import_path13, import_fs8, import_path14, import_promises9, import_os3, import_path15, import_child_process3, import_crypto2, import_fs9, import_path16, import_yaml2, import_crypto3, import_fs10, import_path17, import_fs11, import_promises10, import_path18, __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, BINARY_EXTENSIONS, INFRASTRUCTURE_FILES, ReplayDetector, MergeAccumulator, CONFLICT_OPENER, CONFLICT_SEPARATOR, CONFLICT_CLOSER, AUTOVERSION_PLACEHOLDERS, VERSION_TOKEN, VERSION_MASK, ReplayApplicator, ReplayCommitter, FileOwnership, FirstGenerationFlow, SkipApplicationFlow, NoPatchesFlow, NormalRegenerationFlow, ReplayService, FernignoreMigrator, REPLAY_FERNIGNORE_ENTRIES, GITATTRIBUTES_ENTRIES, EMPTY_RESULT;
 var init_dist3 = __esm({
-  "../../node_modules/.pnpm/@fern-api+replay@0.19.1/node_modules/@fern-api/replay/dist/index.js"() {
+  "../../node_modules/.pnpm/@fern-api+replay@0.19.2/node_modules/@fern-api/replay/dist/index.js"() {
     "use strict";
     init_esm4();
     import_promises4 = require("fs/promises");
@@ -26248,7 +26248,9 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
       }
       async prepare(options) {
         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];
@@ -26384,7 +26386,9 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
       }
       async prepare(options) {
         const preLock = this.service.lockManager.read();
-        const previousGenerationSha = preLock.current_generation ?? null;
+        const previousGenerationSha = await this.service.resolveReachablePreviousGeneration(
+          preLock.current_generation ?? null
+        );
         if (options?.dryRun) {
           const existingPatches2 = this.service.lockManager.getPatches();
           const { patches: newPatches2, revertedPatchIds: dryRunReverted } = await this.service.detector.detectNewPatches();
@@ -26613,6 +26617,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
@@ -41162,56 +41197,44 @@ var AutoVersioningService = class _AutoVersioningService {
   }
   /**
    * Removes paired - and + lines where the only difference is the magic version.
+   *
+   * Matching is done across the whole section rather than only between adjacent lines.
+   * Unified diffs group every deletion before every addition within a hunk, so when
+   * several version-bearing lines change together (e.g. `X-Fern-SDK-Version` and
+   * `User-Agent` on consecutive lines) an adjacency-only pass leaves the interleaved
+   * deletions behind. Once the magic-version additions are stripped, those orphaned
+   * deletions reach the AI analyzer as apparent removals — which is why a routine
+   * version bump was reported as the `User-Agent` header being dropped. Pairing each
+   * version-change deletion with any unused version-change addition in the section and
+   * dropping both keeps the diff balanced regardless of layout.
    */
   removeVersionChangePairs(lines, mappedMagicVersion) {
-    const result = [];
-    let lineIndex = 0;
-    while (lineIndex < lines.length) {
-      const currentLine = lines[lineIndex];
-      if (!currentLine) {
-        lineIndex++;
+    const removed = /* @__PURE__ */ new Set();
+    for (let deletionIndex = 0; deletionIndex < lines.length; deletionIndex++) {
+      const deletionLine = lines[deletionIndex];
+      if (deletionLine == null || removed.has(deletionIndex) || !this.isDeletionLine(deletionLine)) {
         continue;
       }
-      if (this.isDeletionLine(currentLine)) {
-        const pairIndex = this.findMatchingAdditionLine(lines, lineIndex, mappedMagicVersion);
-        if (pairIndex !== -1) {
-          result.push(...lines.slice(lineIndex + 1, pairIndex));
-          lineIndex = pairIndex + 1;
-        } else {
-          result.push(currentLine);
-          lineIndex++;
+      for (let additionIndex = 0; additionIndex < lines.length; additionIndex++) {
+        if (additionIndex === deletionIndex || removed.has(additionIndex)) {
+          continue;
+        }
+        const additionLine = lines[additionIndex];
+        if (additionLine == null || !this.isAdditionLine(additionLine)) {
+          continue;
+        }
+        if (this.isVersionChangePair(deletionLine, additionLine, mappedMagicVersion)) {
+          removed.add(deletionIndex);
+          removed.add(additionIndex);
+          break;
         }
-      } else {
-        result.push(currentLine);
-        lineIndex++;
       }
     }
-    return result;
+    return lines.filter((_2, index) => !removed.has(index));
   }
   isDeletionLine(line) {
     return line.startsWith("-") && !_AutoVersioningService.isDiffHeader(line);
   }
-  findMatchingAdditionLine(lines, startIndex, mappedMagicVersion) {
-    const startLine = lines[startIndex];
-    if (!startLine) {
-      return -1;
-    }
-    for (let nextIndex = startIndex + 1; nextIndex < lines.length; nextIndex++) {
-      const nextLine = lines[nextIndex];
-      if (!nextLine) {
-        continue;
-      }
-      if (this.shouldStopSearching(nextLine)) {
-        break;
-      }
-      if (this.isAdditionLine(nextLine)) {
-        if (this.isVersionChangePair(startLine, nextLine, mappedMagicVersion)) {
-          return nextIndex;
-        }
-      }
-    }
-    return -1;
-  }
   isAdditionLine(line) {
     return line.startsWith("+") && !_AutoVersioningService.isDiffHeader(line);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fern-api/generator-cli",
-  "version": "0.9.50",
+  "version": "0.9.52",
   "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.19.1",
+    "@fern-api/replay": "0.19.2",
     "@octokit/rest": "^22.0.1",
     "es-toolkit": "^1.45.1",
     "semver": "^7.6.3",