@fern-api/fern-api-dev 5.27.6 → 5.27.7

package/cli.cjs

@@ -360342,9 +360342,9 @@ var require_diff3 = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/@fern-api+replay@0.15.1/node_modules/@fern-api/replay/dist/index.cjs
+// ../../../node_modules/.pnpm/@fern-api+replay@0.15.2/node_modules/@fern-api/replay/dist/index.cjs
 var require_dist14 = __commonJS({
-  "../../../node_modules/.pnpm/@fern-api+replay@0.15.1/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
+  "../../../node_modules/.pnpm/@fern-api+replay@0.15.2/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
     "use strict";
     var __defProp4 = Object.defineProperty;
     var __getOwnPropDesc4 = Object.getOwnPropertyDescriptor;
@@ -361269,7 +361269,7 @@ var require_dist14 = __commonJS({
       async detectPatchesInRange(rangeStart, lastGen, lock) {
         const log4 = await this.git.exec([
           "log",
-          "--first-parent",
+          "--no-merges",
           "--format=%H%x00%an%x00%ae%x00%s",
           `${rangeStart}..HEAD`,
           "--",
@@ -361289,18 +361289,6 @@ var require_dist14 = __commonJS({
             continue;
           }
           const parents = await this.git.getCommitParents(commit.sha);
-          if (parents.length > 1) {
-            const compositePatch = await this.createMergeCompositePatch({
-              mergeCommit: commit,
-              firstParent: parents[0],
-              lastGen,
-              lock
-            });
-            if (compositePatch) {
-              newPatches.push(compositePatch);
-            }
-            continue;
-          }
           let patchContent;
           try {
             patchContent = await this.git.formatPatch(commit.sha);
@@ -361438,9 +361426,7 @@ var require_dist14 = __commonJS({
        * within the current linear detection window, and are absent from
        * HEAD at the end of the window.
        *
-       * Rationale: on a merge commit, createMergeCompositePatch already diffs
-       * firstParent..mergeCommit so net-zero files never enter the composite. On
-       * linear history each commit becomes its own patch, so a file that was
+       * Rationale: each commit becomes its own patch, so a file that was
        * briefly added and later removed survives as a create+delete pair whose
        * cumulative diff is empty. We drop such patches before they reach the
        * lockfile.
@@ -361507,54 +361493,6 @@ var require_dist14 = __commonJS({
           return /* @__PURE__ */ new Set();
         }
       }
-      /**
-       * Create a single composite patch for a merge commit by diffing the merge
-       * commit against its first parent. This captures the net change of the
-       * entire merged branch as one patch, eliminating accumulator chaining and
-       * zero-net-change ghost conflicts.
-       */
-      async createMergeCompositePatch(input3) {
-        const { mergeCommit, firstParent, lastGen, lock } = input3;
-        const forgottenHashes = new Set(lock.forgotten_hashes ?? []);
-        const filesOutput = await this.git.exec([
-          "diff",
-          "--name-only",
-          firstParent,
-          mergeCommit.sha
-        ]);
-        const { files, sensitiveFiles } = filterInfrastructureAndSensitiveFiles(filesOutput);
-        if (sensitiveFiles.length > 0) {
-          this.warnings.push(
-            `Sensitive file(s) excluded from merge patch for commit ${mergeCommit.sha.slice(0, 7)}: ${sensitiveFiles.join(", ")}. These files will not be tracked by replay.`
-          );
-        }
-        if (files.length === 0) return null;
-        const diff2 = await this.git.exec([
-          "diff",
-          firstParent,
-          mergeCommit.sha,
-          "--",
-          ...files
-        ]);
-        if (!diff2.trim()) return null;
-        const contentHash = this.computeContentHash(diff2);
-        if (lock.patches.some((p14) => p14.content_hash === contentHash) || forgottenHashes.has(contentHash)) {
-          return null;
-        }
-        const theirsSnapshot = await capturePatchSnapshot(this.git, files, mergeCommit.sha);
-        return {
-          id: `patch-merge-${mergeCommit.sha.slice(0, 8)}`,
-          content_hash: contentHash,
-          original_commit: mergeCommit.sha,
-          original_message: mergeCommit.message,
-          original_author: `${mergeCommit.authorName} <${mergeCommit.authorEmail}>`,
-          base_generation: lastGen.commit_sha,
-          files,
-          patch_content: diff2,
-          ...Object.keys(theirsSnapshot).length > 0 ? { theirs_snapshot: theirsSnapshot } : {},
-          ...this.isCreationOnlyPatch(diff2) ? { user_owned: true } : {}
-        };
-      }
       /**
        * Detect patches via tree diff for non-linear history. Returns a composite patch.
        * Revert reconciliation is skipped here because tree-diff produces a single composite
@@ -668132,7 +668070,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.27.6",
+          version: "5.27.7",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -668196,7 +668134,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.27.6",
+        version: "5.27.7",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -859775,7 +859713,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.27.6";
+  const version7 = "5.27.7";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -873775,7 +873713,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.27.6",
+        cliVersion: "5.27.7",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -948180,7 +948118,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.27.6"
+    cli_version: "5.27.7"
   };
 }
 function isAutomationMode() {
@@ -949006,7 +948944,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.27.6";
+    return "5.27.7";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.27.6",
+  "version": "5.27.7",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",