@fern-api/fern-api-dev 4.87.0-8-g09119efe4e3 → 4.87.0

package/cli.cjs

@@ -58626,46 +58626,6 @@ var init_ClonedRepository = __esm({
         const result = await this.git.raw(["rev-parse", "HEAD^{tree}"]);
         return result.trim();
       }
-      async getHeadCommitMessage() {
-        await this.git.cwd(this.clonePath);
-        const result = await this.git.raw(["log", "-1", "--format=%B", "HEAD"]);
-        return result.replace(/\n$/, "");
-      }
-      async getHeadParents() {
-        await this.git.cwd(this.clonePath);
-        const result = await this.git.raw(["rev-list", "--parents", "-n", "1", "HEAD"]);
-        const parts = result.trim().split(/\s+/);
-        return parts.slice(1);
-      }
-      /**
-       * Pushes a specific object (commit SHA) to a remote ref.
-       * Used to upload tree and blob objects to the remote without moving a branch.
-       *
-       * Pass `force: true` when overwriting a ref that may already point to an
-       * unrelated commit (e.g. retrying a temp ref after a local rebase rewrites
-       * history so the new SHA is not a descendant of the previous one).
-       */
-      async pushObjectToRef(localSha, remoteRef, { force = false } = {}) {
-        await this.git.cwd(this.clonePath);
-        const spec = force ? `+${localSha}:${remoteRef}` : `${localSha}:${remoteRef}`;
-        await this.git.raw(["push", "origin", spec]);
-      }
-      /**
-       * Resets the current branch HEAD to the given SHA. After fetching a newly-created remote
-       * signed commit, use this to align the local branch so subsequent operations (tag push,
-       * getHeadSha(), etc.) see the signed SHA.
-       */
-      async resetHardToSha(sha) {
-        await this.git.cwd(this.clonePath);
-        await this.git.raw(["reset", "--hard", sha]);
-      }
-      /**
-       * Rebases the current branch onto the given remote branch (`git pull --rebase origin <branch>`).
-       */
-      async pullWithRebase(branch) {
-        await this.git.cwd(this.clonePath);
-        await this.git.raw(["pull", "origin", branch, "--rebase"]);
-      }
       async getCommitTreeHash(commitSha) {
         await this.git.cwd(this.clonePath);
         const result = await this.git.raw(["rev-parse", `${commitSha}^{tree}`]);
@@ -330837,113 +330797,6 @@ ${prBody}`;
   }
 });
 
-// ../../generator-cli/lib/pipeline/github/pushSignedCommit.js
-var require_pushSignedCommit = __commonJS({
-  "../../generator-cli/lib/pipeline/github/pushSignedCommit.js"(exports2) {
-    "use strict";
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.pushSignedCommit = pushSignedCommit;
-    exports2.isNonFastForwardError = isNonFastForwardError;
-    var core_utils_1 = (init_lib4(), __toCommonJS(lib_exports));
-    var MAX_CONCURRENT_PUSH_RETRIES = 3;
-    async function pushSignedCommit({ repository, octokit, owner, repo, branch, force, rebaseOnConflict = false, logger: logger4 }) {
-      const tempRef = `refs/temp/fern-${Date.now()}`;
-      let tempRefPushed = false;
-      try {
-        let [localHeadSha, treeSha, message, parents] = await Promise.all([
-          repository.getHeadSha(),
-          repository.getHeadTreeHash(),
-          repository.getHeadCommitMessage(),
-          repository.getHeadParents()
-        ]);
-        await repository.pushObjectToRef(localHeadSha, tempRef);
-        tempRefPushed = true;
-        for (let attempt = 0; attempt < MAX_CONCURRENT_PUSH_RETRIES; attempt++) {
-          const { data: signedCommit } = await octokit.git.createCommit({
-            owner,
-            repo,
-            message,
-            tree: treeSha,
-            parents
-          });
-          const signedSha = signedCommit.sha;
-          try {
-            await upsertBranchRef({ octokit, owner, repo, branch, sha: signedSha, force });
-            logger4.debug(`Updated refs/heads/${branch} to signed commit ${signedSha}`);
-            await syncLocalToSignedCommit({ repository, branch, signedSha });
-            return signedSha;
-          } catch (err) {
-            if (!isNonFastForwardError(err) || force || attempt >= MAX_CONCURRENT_PUSH_RETRIES - 1) {
-              throw err;
-            }
-            if (rebaseOnConflict) {
-              logger4.warn(`Non-fast-forward on refs/heads/${branch} (attempt ${attempt + 1}/${MAX_CONCURRENT_PUSH_RETRIES}); rebasing locally and retrying.`);
-              await repository.pullWithRebase(branch);
-              [localHeadSha, treeSha, message, parents] = await Promise.all([
-                repository.getHeadSha(),
-                repository.getHeadTreeHash(),
-                repository.getHeadCommitMessage(),
-                repository.getHeadParents()
-              ]);
-              await repository.pushObjectToRef(localHeadSha, tempRef, { force: true });
-            } else {
-              throw err;
-            }
-          }
-        }
-        throw new Error(`Failed to push signed commit to refs/heads/${branch} after ${MAX_CONCURRENT_PUSH_RETRIES} attempts`);
-      } finally {
-        if (tempRefPushed) {
-          try {
-            await octokit.git.deleteRef({ owner, repo, ref: tempRef.replace(/^refs\//, "") });
-          } catch (err) {
-            logger4.debug(`Failed to delete temp ref ${tempRef}: ${(0, core_utils_1.extractErrorMessage)(err)}`);
-          }
-        }
-      }
-    }
-    async function upsertBranchRef({ octokit, owner, repo, branch, sha, force }) {
-      try {
-        await octokit.git.updateRef({
-          owner,
-          repo,
-          ref: `heads/${branch}`,
-          sha,
-          force
-        });
-      } catch (err) {
-        if (isNotFoundError(err)) {
-          await octokit.git.createRef({
-            owner,
-            repo,
-            ref: `refs/heads/${branch}`,
-            sha
-          });
-          return;
-        }
-        throw err;
-      }
-    }
-    async function syncLocalToSignedCommit({ repository, branch, signedSha }) {
-      await repository.fetch(["origin", branch]);
-      await repository.resetHardToSha(signedSha);
-    }
-    function hasNumericStatus(err) {
-      return typeof err === "object" && err != null && "status" in err && typeof err.status === "number";
-    }
-    function isNotFoundError(err) {
-      return hasNumericStatus(err) && err.status === 404;
-    }
-    function isNonFastForwardError(err) {
-      if (!hasNumericStatus(err) || err.status !== 422) {
-        return false;
-      }
-      const message = (0, core_utils_1.extractErrorMessage)(err).toLowerCase();
-      return message.includes("not a fast forward") || message.includes("not a fast-forward") || message.includes("update is not a fast forward");
-    }
-  }
-});
-
 // ../../generator-cli/lib/pipeline/replay-summary.js
 var require_replay_summary = __commonJS({
   "../../generator-cli/lib/pipeline/replay-summary.js"(exports2) {
@@ -331089,7 +330942,6 @@ var require_GithubStep = __commonJS({
     var createReplayBranch_1 = require_createReplayBranch();
     var findExistingUpdatablePR_1 = require_findExistingUpdatablePR();
     var parseCommitMessage_1 = require_parseCommitMessage();
-    var pushSignedCommit_1 = require_pushSignedCommit();
     var replay_summary_1 = require_replay_summary();
     var BaseStep_1 = require_BaseStep();
     var GithubStep = class extends BaseStep_1.BaseStep {
@@ -331197,15 +331049,11 @@ var require_GithubStep = __commonJS({
           updatedExistingPr: isUpdatingExistingPR
         };
         if (!this.config.previewMode) {
-          await (0, pushSignedCommit_1.pushSignedCommit)({
-            repository,
-            octokit,
-            owner,
-            repo,
-            branch: prBranch,
-            force: isUpdatingExistingPR,
-            logger: this.logger
-          });
+          if (isUpdatingExistingPR) {
+            await repository.forcePush();
+          } else {
+            await repository.push();
+          }
           const pushedBranch = await repository.getCurrentBranch();
           result.branchUrl = `https://github.com/${this.config.uri}/tree/${pushedBranch}`;
           this.logger.info(`Pushed branch: ${result.branchUrl}`);
@@ -331306,18 +331154,7 @@ var require_GithubStep = __commonJS({
           success: true
         };
         if (!this.config.previewMode) {
-          const octokit = new rest_1.Octokit({ auth: this.config.token });
-          const { owner, repo } = (0, github_1.parseRepository)(this.config.uri);
-          await (0, pushSignedCommit_1.pushSignedCommit)({
-            repository,
-            octokit,
-            owner,
-            repo,
-            branch: baseBranch,
-            force: false,
-            rebaseOnConflict: true,
-            logger: this.logger
-          });
+          await repository.pushWithRebasingRemote();
           const pushedBranch = await repository.getCurrentBranch();
           result.branchUrl = `https://github.com/${this.config.uri}/tree/${pushedBranch}`;
           this.logger.info(`Pushed branch: ${result.branchUrl}`);
@@ -615211,7 +615048,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.87.0-8-g09119efe4e3",
+          version: "4.87.0",
           usingAccessToken: true
         }
       });
@@ -615265,7 +615102,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.87.0-8-g09119efe4e3",
+        version: "4.87.0",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -832787,7 +832624,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 = "4.87.0-8-g09119efe4e3";
+  const version7 = "4.87.0";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -844535,7 +844372,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.87.0-8-g09119efe4e3"
+        cliVersion: "4.87.0"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
         return { success: false };
@@ -919923,7 +919760,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.87.0-8-g09119efe4e3";
+    return "4.87.0";
   }
   getCliName() {
     if (false) {

package/package.json

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