@fern-api/generator-cli 0.9.49 → 0.9.50

package/dist/cli.js

@@ -22214,7 +22214,7 @@ var init_diff3 = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/@fern-api+replay@0.19.0/node_modules/@fern-api/replay/dist/index.js
+// ../../node_modules/.pnpm/@fern-api+replay@0.19.1/node_modules/@fern-api/replay/dist/index.js
 var dist_exports = {};
 __export(dist_exports, {
   CREDENTIAL_PATTERNS: () => CREDENTIAL_PATTERNS,
@@ -23059,6 +23059,37 @@ async function buildMergePlan(args) {
     conflictReasonHint
   };
 }
+function maskVersions(line) {
+  return line.replace(VERSION_TOKEN, VERSION_MASK);
+}
+function containsPlaceholder(content) {
+  if (!content) return false;
+  return AUTOVERSION_PLACEHOLDERS.some((p2) => content.includes(p2));
+}
+function remapManagedLines(genBase, target, theirs) {
+  if (!containsPlaceholder(genBase)) return theirs;
+  const managedMasks = /* @__PURE__ */ new Set();
+  for (const line of genBase.split("\n")) {
+    if (AUTOVERSION_PLACEHOLDERS.some((p2) => line.includes(p2))) managedMasks.add(maskVersions(line));
+  }
+  if (managedMasks.size === 0) return theirs;
+  const targetByMask = /* @__PURE__ */ new Map();
+  for (const line of target.split("\n")) {
+    const mask = maskVersions(line);
+    if (managedMasks.has(mask) && !targetByMask.has(mask)) targetByMask.set(mask, line);
+  }
+  return theirs.split("\n").map((line) => {
+    const mask = maskVersions(line);
+    const replacement = managedMasks.has(mask) ? targetByMask.get(mask) : void 0;
+    return replacement !== void 0 && replacement !== line ? replacement : line;
+  }).join("\n");
+}
+function neutralizeAutoversionTheirs(genBase, theirs) {
+  return remapManagedLines(genBase, genBase, theirs);
+}
+function alignAutoversionToOurs(genBase, ours, theirs) {
+  return remapManagedLines(genBase, ours, theirs);
+}
 async function runMergeAndRecord(args) {
   const { plan, inputs, patch, accumulator } = args;
   const { resolvedPath, metadata, oursPath, ours } = inputs;
@@ -23089,11 +23120,13 @@ async function runMergeAndRecord(args) {
     accumulator.recordMerge(resolvedPath, merged2.content, patch.base_generation);
     return { file: resolvedPath, status: "merged", ...unreachableFlag };
   }
-  const merged = threeWayMerge(plan.mergeBase, ours, plan.theirs);
+  const mergeBase = inputs.base != null ? alignAutoversionToOurs(inputs.base, ours, plan.mergeBase) : plan.mergeBase;
+  const theirs = inputs.base != null ? alignAutoversionToOurs(inputs.base, ours, plan.theirs) : plan.theirs;
+  const merged = threeWayMerge(mergeBase, ours, theirs);
   await (0, import_promises7.mkdir)((0, import_path12.dirname)(oursPath), { recursive: true });
   await (0, import_promises7.writeFile)(oursPath, merged.content);
   if (merged.hasConflicts) {
-    accumulator.recordConflict(resolvedPath, plan.theirs, patch.base_generation);
+    accumulator.recordConflict(resolvedPath, theirs, patch.base_generation);
     return {
       file: resolvedPath,
       status: "conflict",
@@ -23102,7 +23135,7 @@ async function runMergeAndRecord(args) {
       conflictMetadata: metadata
     };
   }
-  accumulator.recordMerge(resolvedPath, plan.theirs, patch.base_generation);
+  accumulator.recordMerge(resolvedPath, theirs, patch.base_generation);
   return {
     file: resolvedPath,
     status: "merged",
@@ -24260,9 +24293,9 @@ function status(outputDir) {
     legacyDismissedCount
   };
 }
-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, ReplayApplicator, ReplayCommitter, FileOwnership, FirstGenerationFlow, SkipApplicationFlow, NoPatchesFlow, NormalRegenerationFlow, ReplayService, FernignoreMigrator, REPLAY_FERNIGNORE_ENTRIES, GITATTRIBUTES_ENTRIES, EMPTY_RESULT;
+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.0/node_modules/@fern-api/replay/dist/index.js"() {
+  "../../node_modules/.pnpm/@fern-api+replay@0.19.1/node_modules/@fern-api/replay/dist/index.js"() {
     "use strict";
     init_esm4();
     import_promises4 = require("fs/promises");
@@ -25466,6 +25499,16 @@ var init_dist3 = __esm({
     CONFLICT_OPENER = "<<<<<<< Generated";
     CONFLICT_SEPARATOR = "=======";
     CONFLICT_CLOSER = ">>>>>>> Your customization";
+    AUTOVERSION_PLACEHOLDERS = [
+      "v0.0.0-fern-placeholder",
+      // Go -- a superstring of the default; check first
+      "0.0.0-fern-placeholder",
+      // TS/Java/C#/Ruby/PHP/Rust/default
+      "0.0.0.dev0"
+      // Python (PEP 440 -- Poetry rejects hyphens)
+    ];
+    VERSION_TOKEN = /(?:v)?\d+\.\d+\.\d+[0-9A-Za-z.+-]*/g;
+    VERSION_MASK = "@@FERN_VERSION@@";
     ReplayApplicator = class {
       git;
       lockManager;
@@ -26852,7 +26895,9 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
               if (baseChanged) repointed++;
               continue;
             }
-            const diff = await this.git.exec(["diff", currentGenSha, "--", ...patch.files]).catch(() => null);
+            const rawDiff = await this.git.exec(["diff", currentGenSha, "--", ...patch.files]).catch(() => null);
+            const neutralizedRebase = rawDiff != null && containsPlaceholder(rawDiff) ? await this.computeAutoversionNeutralizedRebase(patch.files, currentGenSha) : null;
+            const diff = neutralizedRebase ? neutralizedRebase.diff : rawDiff;
             if (diff === null) continue;
             if (!diff.trim()) {
               if (hasProtectedFiles) {
@@ -26908,7 +26953,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
             patch.base_generation = currentGenSha;
             patch.patch_content = diff;
             patch.content_hash = newContentHash;
-            const snapshot = await this.readSnapshotFromDisk(patch.files);
+            const snapshot = neutralizedRebase ? neutralizedRebase.snapshot : await this.readSnapshotFromDisk(patch.files);
             const snapshotIsNonEmpty = Object.keys(snapshot).length > 0;
             if (snapshotIsNonEmpty) {
               patch.theirs_snapshot = snapshot;
@@ -26948,6 +26993,47 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         }
         return snapshot;
       }
+      /**
+       * Autoversion-aware replacement for the naive `git diff currentGen -- files`
+       * + on-disk snapshot used when rebasing a cleanly-applied patch.
+       *
+       * The generation tree (BASE) still carries the placeholder on version lines
+       * (autoversion runs after `[fern-generated]`), but the working tree holds
+       * autoversion's resolved semver. A raw diff/snapshot would fold the
+       * placeholder->semver swap into the customer's patch_content/theirs_snapshot,
+       * pinning a stale version. This re-derives both against a version-neutralized
+       * THEIRS so the pipeline-owned version line never enters the patch.
+       *
+       * Returns null when no file is under autoversion (fixed `--version`, i.e. no
+       * placeholder in the generation tree) — callers keep their existing behavior.
+       */
+      async computeAutoversionNeutralizedRebase(files, currentGenSha) {
+        const genByFile = /* @__PURE__ */ new Map();
+        let anyPlaceholder = false;
+        for (const file of files) {
+          const gen = await this.git.showFile(currentGenSha, file).catch(() => null);
+          genByFile.set(file, gen);
+          if (containsPlaceholder(gen)) anyPlaceholder = true;
+        }
+        if (!anyPlaceholder) return null;
+        const snapshot = {};
+        const fragments = [];
+        for (const file of files) {
+          if (isBinaryFile(file)) continue;
+          const disk = await (0, import_promises8.readFile)((0, import_path13.join)(this.outputDir, file), "utf-8").catch(() => null);
+          if (disk == null) continue;
+          const gen = genByFile.get(file) ?? null;
+          const neutralized = gen != null ? neutralizeAutoversionTheirs(gen, disk) : disk;
+          snapshot[file] = neutralized;
+          if (gen == null) {
+            fragments.push(synthesizeNewFileDiff(file, neutralized));
+          } else if (gen !== neutralized) {
+            const fileDiff = await unifiedDiff(gen, neutralized, file);
+            if (fileDiff.trim()) fragments.push(fileDiff);
+          }
+        }
+        return { diff: fragments.join(""), snapshot };
+      }
       /**
        * Detects autoversion contamination — returns true when a
        * `[fern-autoversion]` commit between `fromSha` and `toSha` touched any

package/package.json

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