@fern-api/fern-api-dev 5.23.3-1200-gb5c6748fea5 → 5.23.3-1209-g5a3bf80f2fe

package/cli.cjs

@@ -89377,6 +89377,26 @@ var init_ClonedRepository = __esm({
         const result = await this.git.raw(["rev-parse", `${commitSha}^{tree}`]);
         return result.trim();
       }
+      async getCommitMessage(commitSha) {
+        await this.git.cwd(this.clonePath);
+        const result = await this.git.raw(["log", "-1", "--format=%B", commitSha]);
+        return result.replace(/\n$/, "");
+      }
+      async getCommitParents(commitSha) {
+        await this.git.cwd(this.clonePath);
+        const result = await this.git.raw(["rev-list", "--parents", "-n", "1", commitSha]);
+        const parts = result.trim().split(/\s+/);
+        return parts.slice(1);
+      }
+      /**
+       * Returns the SHAs of commits reachable from HEAD but not from any remote-tracking ref,
+       * ordered oldest-first. These are the commits created locally that have not been pushed.
+       */
+      async getLocalOnlyCommits() {
+        await this.git.cwd(this.clonePath);
+        const result = await this.git.raw(["rev-list", "--reverse", "HEAD", "--not", "--remotes=origin"]);
+        return result.trim().split("\n").filter((line) => line.length > 0);
+      }
       /**
        * Returns true if the working tree has uncommitted changes (staged or unstaged).
        */
@@ -581439,29 +581459,24 @@ var require_pushSignedCommit = __commonJS({
     exports2.isNonFastForwardError = isNonFastForwardError;
     var core_utils_1 = (init_lib4(), __toCommonJS(lib_exports));
     var MAX_CONCURRENT_PUSH_RETRIES = 3;
+    var MAX_SIGNED_CHAIN_LENGTH = 20;
     async function pushSignedCommit({ repository, octokit, owner, repo, branch, force, rebaseOnConflict = false, author, 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()
-        ]);
+        let localHeadSha = await repository.getHeadSha();
         await repository.pushObjectToRef(localHeadSha, tempRef);
         tempRefPushed = true;
         for (let attempt = 0; attempt < MAX_CONCURRENT_PUSH_RETRIES; attempt++) {
-          const identityFields = author != null ? { author, committer: author } : {};
-          const { data: signedCommit } = await octokit.git.createCommit({
+          const signedSha = await signLocalCommitChain({
+            repository,
+            octokit,
             owner,
             repo,
-            message,
-            tree: treeSha,
-            parents,
-            ...identityFields
+            localHeadSha,
+            author,
+            logger: logger4
           });
-          const signedSha = signedCommit.sha;
           try {
             await upsertBranchRef({ octokit, owner, repo, branch, sha: signedSha, force });
             logger4.debug(`Updated refs/heads/${branch} to signed commit ${signedSha}`);
@@ -581474,12 +581489,7 @@ var require_pushSignedCommit = __commonJS({
             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()
-              ]);
+              localHeadSha = await repository.getHeadSha();
               await repository.pushObjectToRef(localHeadSha, tempRef, { force: true });
             } else {
               throw err;
@@ -581497,6 +581507,39 @@ var require_pushSignedCommit = __commonJS({
         }
       }
     }
+    async function signLocalCommitChain({ repository, octokit, owner, repo, localHeadSha, author, logger: logger4 }) {
+      let chain = await repository.getLocalOnlyCommits();
+      if (chain.length === 0 || chain[chain.length - 1] !== localHeadSha) {
+        chain = [localHeadSha];
+      } else if (chain.length > MAX_SIGNED_CHAIN_LENGTH) {
+        logger4.warn(`Local commit chain has ${chain.length} commits (limit ${MAX_SIGNED_CHAIN_LENGTH}); signing HEAD only.`);
+        chain = [localHeadSha];
+      }
+      const identityFields = author != null ? { author, committer: author } : {};
+      const signedShaByLocalSha = /* @__PURE__ */ new Map();
+      let signedSha = localHeadSha;
+      for (const sha of chain) {
+        const [treeSha, message, parents] = await Promise.all([
+          repository.getCommitTreeHash(sha),
+          repository.getCommitMessage(sha),
+          repository.getCommitParents(sha)
+        ]);
+        const { data: signedCommit } = await octokit.git.createCommit({
+          owner,
+          repo,
+          message,
+          tree: treeSha,
+          parents: parents.map((parent) => signedShaByLocalSha.get(parent) ?? parent),
+          ...identityFields
+        });
+        signedShaByLocalSha.set(sha, signedCommit.sha);
+        signedSha = signedCommit.sha;
+      }
+      if (chain.length > 1) {
+        logger4.debug(`Signed ${chain.length} local commits via the GitHub API`);
+      }
+      return signedSha;
+    }
     async function upsertBranchRef({ octokit, owner, repo, branch, sha, force }) {
       try {
         await octokit.git.updateRef({
@@ -688596,7 +688639,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.23.3-1200-gb5c6748fea5",
+          version: "5.23.3-1209-g5a3bf80f2fe",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -688662,7 +688705,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.23.3-1200-gb5c6748fea5",
+        version: "5.23.3-1209-g5a3bf80f2fe",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -869758,7 +869801,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-1200-gb5c6748fea5";
+  const version7 = "5.23.3-1209-g5a3bf80f2fe";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -902320,7 +902363,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.23.3-1200-gb5c6748fea5",
+        cliVersion: "5.23.3-1209-g5a3bf80f2fe",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -968630,7 +968673,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-1200-gb5c6748fea5"
+    cli_version: "5.23.3-1209-g5a3bf80f2fe"
   };
 }
 function isAutomationMode() {
@@ -969462,7 +969505,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.23.3-1200-gb5c6748fea5";
+    return "5.23.3-1209-g5a3bf80f2fe";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.23.3-1200-gb5c6748fea5",
+  "version": "5.23.3-1209-g5a3bf80f2fe",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",