@fern-api/fern-api-dev 4.67.1 → 4.68.0

package/cli.cjs

@@ -363248,9 +363248,9 @@ var require_diff3 = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/@fern-api+replay@0.10.3/node_modules/@fern-api/replay/dist/index.cjs
+// ../../../node_modules/.pnpm/@fern-api+replay@0.10.4/node_modules/@fern-api/replay/dist/index.cjs
 var require_dist14 = __commonJS({
-  "../../../node_modules/.pnpm/@fern-api+replay@0.10.3/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
+  "../../../node_modules/.pnpm/@fern-api+replay@0.10.4/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
     "use strict";
     var __defProp4 = Object.defineProperty;
     var __getOwnPropDesc4 = Object.getOwnPropertyDescriptor;
@@ -363893,6 +363893,7 @@ var require_dist14 = __commonJS({
         }
         const log4 = await this.git.exec([
           "log",
+          "--first-parent",
           "--format=%H%x00%an%x00%ae%x00%s",
           `${lastGen.commit_sha}..HEAD`,
           "--",
@@ -363908,11 +363909,20 @@ var require_dist14 = __commonJS({
           if (isGenerationCommit(commit)) {
             continue;
           }
-          const parents = await this.git.getCommitParents(commit.sha);
-          if (parents.length > 1) {
+          if (lock.patches.find((p10) => p10.original_commit === commit.sha)) {
             continue;
           }
-          if (lock.patches.find((p10) => p10.original_commit === commit.sha)) {
+          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;
@@ -364011,6 +364021,46 @@ var require_dist14 = __commonJS({
         const normalized = patchContent.split("\n").filter((line) => !line.startsWith("From ") && !line.startsWith("index ") && !line.startsWith("Date: ")).join("\n");
         return `sha256:${(0, import_node_crypto7.createHash)("sha256").update(normalized).digest("hex")}`;
       }
+      /**
+       * 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 = filesOutput.trim().split("\n").filter(Boolean).filter((f10) => !INFRASTRUCTURE_FILES.has(f10)).filter((f10) => !f10.startsWith(".fern/"));
+        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((p10) => p10.content_hash === contentHash) || forgottenHashes.has(contentHash)) {
+          return null;
+        }
+        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
+        };
+      }
       /**
        * 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
@@ -405313,9 +405363,9 @@ var require_file2 = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/parseControlResponse.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/parseControlResponse.js
 var require_parseControlResponse = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/parseControlResponse.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/parseControlResponse.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.parseControlResponse = parseControlResponse;
@@ -405365,9 +405415,9 @@ var require_parseControlResponse = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/FtpContext.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/FtpContext.js
 var require_FtpContext = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/FtpContext.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/FtpContext.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.FTPContext = exports2.FTPError = void 0;
@@ -405509,6 +405559,9 @@ var require_FtpContext = __commonJS({
        * Send an FTP command without waiting for or handling the result.
        */
       send(command3) {
+        if (/[\r\n\0]/.test(command3)) {
+          throw new Error(`Invalid command: Contains control characters. (${command3})`);
+        }
         const containsPassword = command3.startsWith("PASS");
         const message = containsPassword ? "> PASS ###" : `> ${command3}`;
         this.log(message);
@@ -405682,9 +405735,9 @@ Closing reason: ${this._closingError.stack}`;
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/FileInfo.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/FileInfo.js
 var require_FileInfo = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/FileInfo.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/FileInfo.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.FileInfo = exports2.FileType = void 0;
@@ -405739,9 +405792,9 @@ var require_FileInfo = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/parseListDOS.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/parseListDOS.js
 var require_parseListDOS = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/parseListDOS.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/parseListDOS.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.testLine = testLine;
@@ -405782,9 +405835,9 @@ var require_parseListDOS = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/parseListUnix.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/parseListUnix.js
 var require_parseListUnix = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/parseListUnix.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/parseListUnix.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.testLine = testLine;
@@ -405868,9 +405921,9 @@ var require_parseListUnix = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/parseListMLSD.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/parseListMLSD.js
 var require_parseListMLSD = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/parseListMLSD.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/parseListMLSD.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.testLine = testLine;
@@ -406033,9 +406086,9 @@ var require_parseListMLSD = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/parseList.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/parseList.js
 var require_parseList = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/parseList.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/parseList.js"(exports2) {
     "use strict";
     var __createBinding2 = exports2 && exports2.__createBinding || (Object.create ? (function(o14, m11, k19, k23) {
       if (k23 === void 0) k23 = k19;
@@ -406111,9 +406164,9 @@ var require_parseList = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/ProgressTracker.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/ProgressTracker.js
 var require_ProgressTracker = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/ProgressTracker.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/ProgressTracker.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.ProgressTracker = void 0;
@@ -406182,9 +406235,9 @@ var require_ProgressTracker = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/StringWriter.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/StringWriter.js
 var require_StringWriter = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/StringWriter.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/StringWriter.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.StringWriter = void 0;
@@ -406210,9 +406263,9 @@ var require_StringWriter = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/netUtils.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/netUtils.js
 var require_netUtils = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/netUtils.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/netUtils.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.describeTLS = describeTLS;
@@ -406261,9 +406314,9 @@ var require_netUtils = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/transfer.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/transfer.js
 var require_transfer = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/transfer.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/transfer.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.enterPassiveModeIPv6 = enterPassiveModeIPv6;
@@ -406513,9 +406566,9 @@ var require_transfer = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/Client.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/Client.js
 var require_Client14 = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/Client.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/Client.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.Client = void 0;
@@ -407147,9 +407200,6 @@ var require_Client14 = __commonJS({
        * a given path to fix that issue for most cases.
        */
       async protectWhitespace(path97) {
-        if (/[\r\n\0]/.test(path97)) {
-          throw new Error("Invalid path: Contains control characters");
-        }
         if (!path97.startsWith(" ")) {
           return path97;
         }
@@ -407249,17 +407299,17 @@ var require_Client14 = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/StringEncoding.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/StringEncoding.js
 var require_StringEncoding = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/StringEncoding.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/StringEncoding.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
   }
 });
 
-// ../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/index.js
+// ../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/index.js
 var require_dist17 = __commonJS({
-  "../../../node_modules/.pnpm/basic-ftp@5.2.1/node_modules/basic-ftp/dist/index.js"(exports2) {
+  "../../../node_modules/.pnpm/basic-ftp@5.2.2/node_modules/basic-ftp/dist/index.js"(exports2) {
     "use strict";
     var __createBinding2 = exports2 && exports2.__createBinding || (Object.create ? (function(o14, m11, k19, k23) {
       if (k23 === void 0) k23 = k19;
@@ -529537,6 +529587,7 @@ var WebsocketMessageOrigin2 = schemas_exports9.enum_(["client", "server"]);
 // ../api-importers/openapi/openapi-ir/lib/sdk/serialization/resources/finalIr/types/WebsocketMessageSchema.js
 var WebsocketMessageSchema = schemas_exports9.objectWithoutOptionalProperties({
   name: schemas_exports9.string(),
+  displayName: schemas_exports9.string().optional(),
   origin: WebsocketMessageOrigin2,
   body: schemas_exports9.lazy(() => Schema2),
   methodName: schemas_exports9.string().optional()
@@ -532790,6 +532841,9 @@ function buildChannel({ channel: channel3, context: context3, declarationFile })
         declarationDepth: 0
       })
     };
+    if (message.displayName != null) {
+      messageSchema["display-name"] = message.displayName;
+    }
     if (message.methodName != null) {
       messageSchema["method-name"] = message.methodName;
     }
@@ -545976,6 +546030,7 @@ function parseAsyncAPIV2({ context: context3, breadcrumbs, source: source2, asyn
         messages2.push({
           origin: "client",
           name: "publish",
+          displayName: channel3.publish != null ? getExtension(channel3.publish, FernAsyncAPIExtension.FERN_DISPLAY_NAME) : void 0,
           body: convertSchemaWithExampleToSchema(publishSchema),
           methodName: channel3.publish != null ? getExtension(channel3.publish, FernAsyncAPIExtension.FERN_SDK_METHOD_NAME) : void 0
         });
@@ -545984,6 +546039,7 @@ function parseAsyncAPIV2({ context: context3, breadcrumbs, source: source2, asyn
         messages2.push({
           origin: "server",
           name: "subscribe",
+          displayName: channel3.subscribe != null ? getExtension(channel3.subscribe, FernAsyncAPIExtension.FERN_DISPLAY_NAME) : void 0,
           body: convertSchemaWithExampleToSchema(subscribeSchema),
           methodName: channel3.subscribe != null ? getExtension(channel3.subscribe, FernAsyncAPIExtension.FERN_SDK_METHOD_NAME) : void 0
         });
@@ -546277,12 +546333,14 @@ function parseAsyncAPIV3({ context: context3, breadcrumbs, source: source2, asyn
       channelEvents[channelPath] = { subscribe: [], publish: [], __parsedMessages: [] };
     }
     const methodName = getExtension(operation, FernAsyncAPIExtension.FERN_SDK_METHOD_NAME);
+    const operationDisplayName = getExtension(operation, FernAsyncAPIExtension.FERN_DISPLAY_NAME);
     if (!operation.messages || !Array.isArray(operation.messages)) {
       continue;
     }
     const messagesWithMethodName = operation.messages.filter((ref2) => ref2 != null && ref2.$ref != null).map((ref2) => ({
       ref: ref2,
-      methodName
+      methodName,
+      displayName: operationDisplayName
     }));
     const channelEvent = channelEvents[channelPath];
     if (channelEvent == null) {
@@ -546610,6 +546668,7 @@ function convertMessageReferencesToWebsocketSchemas({ messages: messages2, chann
         results.push({
           origin: origin2,
           name: schemaId ?? `${origin2}Message${i11 + 1}`,
+          displayName: message.displayName,
           body: convertSchemaWithExampleToSchema(schema2),
           methodName: message.methodName
         });
@@ -611807,14 +611866,14 @@ var ChannelAddressExtension = class extends AbstractExtension {
 
 // ../api-importers/asyncapi-to-ir/lib/extensions/x-fern-display-name.js
 var DisplayNameExtension = class extends AbstractExtension {
-  channel;
+  node;
   key = "x-fern-display-name";
-  constructor({ breadcrumbs, channel: channel3, context: context3 }) {
+  constructor({ breadcrumbs, node: node4, context: context3 }) {
     super({ breadcrumbs, context: context3 });
-    this.channel = channel3;
+    this.node = node4;
   }
   convert() {
-    const extensionValue = this.getExtensionValue(this.channel);
+    const extensionValue = this.getExtensionValue(this.node);
     if (extensionValue == null || typeof extensionValue !== "string") {
       return void 0;
     }
@@ -611849,12 +611908,12 @@ var ChannelConverter2_X = class extends AbstractChannelConverter {
     const pathParameters = [];
     const queryParameters = [];
     const headers2 = [];
-    const displayNameExtension = new DisplayNameExtension({
+    const channelDisplayNameExtension = new DisplayNameExtension({
       breadcrumbs: this.breadcrumbs,
-      channel: this.channel,
+      node: this.channel,
       context: this.context
     });
-    const displayName = displayNameExtension.convert() ?? this.websocketGroup?.join(".");
+    const displayName = channelDisplayNameExtension.convert() ?? this.websocketGroup?.join(".");
     if (this.channel.parameters) {
       this.convertPathParameters({
         context: this.context,
@@ -612024,9 +612083,15 @@ var ChannelConverter2_X = class extends AbstractChannelConverter {
         docs: operation.description
       });
       const messageType = origin2 === "server" ? "subscribe" : "publish";
+      const operationDisplayNameExtension = new DisplayNameExtension({
+        breadcrumbs: [...this.breadcrumbs, messageType],
+        node: operation,
+        context: this.context
+      });
+      const operationDisplayName = operationDisplayNameExtension.convert() ?? messageType;
       return {
         type: messageType,
-        displayName: messageType,
+        displayName: operationDisplayName,
         origin: origin2,
         body,
         availability: context3.getAvailability({
@@ -612188,12 +612253,12 @@ var ChannelConverter3_0 = class extends AbstractChannelConverter {
     const pathParameters = [];
     const queryParameters = [];
     const headers2 = [];
-    const displayNameExtension = new DisplayNameExtension({
+    const channelDisplayNameExtension = new DisplayNameExtension({
       breadcrumbs: this.breadcrumbs,
-      channel: this.channel,
+      node: this.channel,
       context: this.context
     });
-    const displayName = displayNameExtension.convert() ?? this.websocketGroup?.join(".") ?? this.channelPath;
+    const displayName = channelDisplayNameExtension.convert() ?? this.websocketGroup?.join(".") ?? this.channelPath;
     if (this.channel.parameters) {
       this.convertChannelParameters({
         pathParameters,
@@ -612213,6 +612278,12 @@ var ChannelConverter3_0 = class extends AbstractChannelConverter {
     }, {});
     const messages2 = [];
     for (const [operationId, operation] of Object.entries(channelOperations)) {
+      const operationDisplayNameExtension = new DisplayNameExtension({
+        breadcrumbs: [...this.breadcrumbs, operationId],
+        node: operation,
+        context: this.context
+      });
+      const operationDisplayName = operationDisplayNameExtension.convert() ?? operationId;
       for (const message of operation.messages) {
         const resolved = this.context.convertReferenceToTypeReference({ reference: message });
         if (resolved.ok) {
@@ -612222,7 +612293,7 @@ var ChannelConverter3_0 = class extends AbstractChannelConverter {
           });
           messages2.push({
             type: operationId,
-            displayName: operationId,
+            displayName: operationDisplayName,
             origin: operation.action === "send" ? "client" : "server",
             body: messageBody,
             availability: this.context.getAvailability({
@@ -619399,7 +619470,7 @@ var TaskContextAdapter = class {
       return false;
     }
   }
-  async instrumentPostHogEvent(_event) {
+  instrumentPostHogEvent(_event) {
   }
   formatError(error50) {
     if (error50 == null) {
@@ -627553,7 +627624,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.67.1",
+          version: "4.68.0",
           usingAccessToken: true
         }
       });
@@ -627604,7 +627675,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.67.1",
+        version: "4.68.0",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -628683,7 +628754,7 @@ var DASHBOARD_BASE_URL = "https://dashboard-dev.buildwithfern.com";
 
 // ../login/lib/login.js
 async function login(context3, { useDeviceCodeFlow = false, email: email3 } = {}) {
-  await context3.instrumentPostHogEvent({
+  context3.instrumentPostHogEvent({
     command: "Login initiated"
   });
   const { accessToken } = await getTokenFromAuth0(context3, { useDeviceCodeFlow, email: email3 });
@@ -628763,7 +628834,7 @@ async function askForConfirmation(message) {
 // ../login/lib/logout.js
 var import_open3 = __toESM(require_open(), 1);
 async function logout(context3) {
-  await context3.instrumentPostHogEvent({
+  context3.instrumentPostHogEvent({
     command: "Logout initiated"
   });
   const wasLoggedIn = await isLoggedIn();
@@ -628780,7 +628851,7 @@ async function logout(context3) {
   } catch (error50) {
     context3.logger.warn(source_default.yellow("Could not open browser automatically. Please visit this URL to complete logout:\n" + logoutUrl));
   }
-  await context3.instrumentPostHogEvent({
+  context3.instrumentPostHogEvent({
     command: "Logout successful"
   });
 }
@@ -631028,13 +631099,18 @@ var import_path46 = require("path");
 var Version2 = "*";
 
 // ../cli-v2/lib/telemetry/TelemetryClient.js
-var TelemetryClient = class {
+var TelemetryClient = class _TelemetryClient {
   posthog;
   sentry;
   baseTags;
   accumulatedTags = {};
-  cachedDistinctId;
-  constructor({ isTTY }) {
+  distinctId;
+  static async create({ isTTY }) {
+    const distinctId = await _TelemetryClient.getDistinctId();
+    return new _TelemetryClient({ isTTY, distinctId });
+  }
+  constructor({ isTTY, distinctId }) {
+    this.distinctId = distinctId;
     const isTelemetryEnabled = this.isTelemetryEnabled();
     const apiKey = null;
     this.baseTags = {
@@ -631064,13 +631140,13 @@ var TelemetryClient = class {
     }
   }
   /** Send a named event that inherits base + accumulated properties. */
-  async sendEvent(event, tags) {
+  sendEvent(event, tags) {
     if (this.posthog == null) {
       return;
     }
     try {
       this.posthog.capture({
-        distinctId: await this.getDistinctId(),
+        distinctId: this.distinctId,
         event,
         properties: { ...this.baseTags, ...this.accumulatedTags, ...tags }
       });
@@ -631081,13 +631157,13 @@ var TelemetryClient = class {
    *
    * This is not meant to be called directly by command handlers.
    */
-  async sendLifecycleEvent(event) {
+  sendLifecycleEvent(event) {
     if (this.posthog == null) {
       return;
     }
     try {
       this.posthog.capture({
-        distinctId: await this.getDistinctId(),
+        distinctId: this.distinctId,
         event: "cli",
         properties: {
           ...this.baseTags,
@@ -631108,14 +631184,14 @@ var TelemetryClient = class {
    * The caller is responsible for deciding which errors are worth reporting
    * (see `shouldReportToSentry` in withContext.ts).
    */
-  async captureException(error50) {
+  captureException(error50) {
     if (this.sentry === void 0) {
       return;
     }
     try {
       this.sentry.captureException(error50, {
         captureContext: {
-          user: { id: await this.getDistinctId() },
+          user: { id: this.distinctId },
           tags: { ...this.baseTags, ...this.accumulatedTags }
         }
       });
@@ -631132,30 +631208,28 @@ var TelemetryClient = class {
     }
     await Promise.all(promises);
   }
-  async getDistinctId() {
-    if (this.cachedDistinctId != null) {
-      return this.cachedDistinctId;
-    }
-    const distinctIdFilepath = this.getDistinctIdFilepath();
+  static async getDistinctId() {
+    const distinctIdFilepath = _TelemetryClient.getDistinctIdFilepath();
+    let distinctId = null;
     try {
       if (!await doesPathExist(distinctIdFilepath)) {
         await (0, import_promises49.mkdir)((0, import_path46.dirname)(distinctIdFilepath), { recursive: true });
         await (0, import_promises49.writeFile)(distinctIdFilepath, v4_default(), { flag: "wx" });
       }
       const content5 = (await (0, import_promises49.readFile)(distinctIdFilepath)).toString().trim();
-      this.cachedDistinctId = content5;
+      distinctId = content5;
       if (!validate_default(content5)) {
         const newId = v4_default();
         await (0, import_promises49.writeFile)(distinctIdFilepath, newId);
-        this.cachedDistinctId = newId;
+        distinctId = newId;
       }
     } catch {
-      this.cachedDistinctId = v4_default();
+      distinctId = v4_default();
     }
-    if (this.cachedDistinctId == null || this.cachedDistinctId.length === 0) {
-      this.cachedDistinctId = v4_default();
+    if (distinctId == null || distinctId.length === 0) {
+      distinctId = v4_default();
     }
-    return this.cachedDistinctId;
+    return distinctId;
   }
   /**
    * The file that stores the distinct ID for the user (stored in ~/.fern/id).
@@ -631163,7 +631237,7 @@ var TelemetryClient = class {
    * Note that all telemetry is anonymous, but we still use a shared distinct ID
    * to correlate metrics from the same user/machine across multiple CLI invocations.
    */
-  getDistinctIdFilepath() {
+  static getDistinctIdFilepath() {
     return join8(AbsoluteFilePath2.of((0, import_os8.homedir)()), RelativeFilePath2.of(".fern"), RelativeFilePath2.of("id"));
   }
   /**
@@ -632011,7 +632085,7 @@ ${"=".repeat(60)}
 };
 
 // ../cli-v2/lib/context/Context.js
-var Context = class {
+var Context = class _Context {
   shutdownCallbacks = [];
   isShuttingDown = false;
   logFilePathPrinted = false;
@@ -632025,7 +632099,12 @@ var Context = class {
   telemetry;
   tokenService;
   ttyAwareLogger;
-  constructor({ stdout, stderr, cwd: cwd2, logLevel }) {
+  static async create({ stdout, stderr, cwd: cwd2, logLevel }) {
+    const ttyAwareLogger = new TtyAwareLogger(stdout, stderr);
+    const telemetry = await TelemetryClient.create({ isTTY: ttyAwareLogger.isTTY });
+    return new _Context({ stdout, stderr, cwd: cwd2, logLevel, ttyAwareLogger, telemetry });
+  }
+  constructor({ cwd: cwd2, logLevel, ttyAwareLogger, telemetry }) {
     this.cwd = cwd2 ?? AbsoluteFilePath2.of(process.cwd());
     this.logLevel = logLevel ?? LogLevel2.Info;
     this.info = parseCommandInfo(process.argv);
@@ -632033,8 +632112,8 @@ var Context = class {
     this.stderr = createLogger4((level, ...args) => this.logStderr(level, ...args));
     this.cache = new Cache({ logger: this.stderr });
     this.logs = new LogFileWriter(this.cache.logs.absoluteFilePath);
-    this.ttyAwareLogger = new TtyAwareLogger(stdout, stderr);
-    this.telemetry = new TelemetryClient({ isTTY: this.isTTY });
+    this.ttyAwareLogger = ttyAwareLogger;
+    this.telemetry = telemetry;
     this.tokenService = new TokenService({ credential: new CredentialStore() });
   }
   /**
@@ -632274,12 +632353,12 @@ var SIGINT_EXIT_CODE = SIGNAL_EXIT_CODE_BASE + 2;
 var SIGTERM_EXIT_CODE = SIGNAL_EXIT_CODE_BASE + 15;
 function withContext(handler3) {
   return async (args) => {
-    const context3 = createContext(args);
+    const context3 = await createContext(args);
     const startTime = Date.now();
     setupSignalHandler(context3);
     try {
       await handler3(context3, args);
-      await context3.telemetry.sendLifecycleEvent({
+      context3.telemetry.sendLifecycleEvent({
         command: context3.info.command,
         status: "success",
         durationMs: Date.now() - startTime
@@ -632289,9 +632368,9 @@ function withContext(handler3) {
       await exitGracefully(0);
     } catch (error50) {
       if (shouldReportToSentry(error50)) {
-        await context3.telemetry.captureException(error50);
+        context3.telemetry.captureException(error50);
       }
-      await context3.telemetry.sendLifecycleEvent({
+      context3.telemetry.sendLifecycleEvent({
         command: context3.info.command,
         status: "error",
         durationMs: Date.now() - startTime,
@@ -632304,9 +632383,9 @@ function withContext(handler3) {
     }
   };
 }
-function createContext(options2) {
+async function createContext(options2) {
   const logLevel = parseLogLevel(options2["log-level"] ?? "info");
-  return new Context({
+  return Context.create({
     stdout: process.stdout,
     stderr: process.stderr,
     logLevel
@@ -843865,7 +843944,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.67.1";
+  const version7 = "4.68.0";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -854517,7 +854596,7 @@ function convertToFilePathPairs(uploadUrls, docsWorkspacePath, sanitizedToAbsolu
   return toRet;
 }
 async function startDocsRegisterFailed(error50, context3, organization, domain3) {
-  await context3.instrumentPostHogEvent({
+  context3.instrumentPostHogEvent({
     command: "docs-generation",
     properties: {
       error: JSON.stringify(error50)
@@ -855113,7 +855192,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.67.1"
+        cliVersion: "4.68.0"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
         return { success: false };
@@ -889247,7 +889326,9 @@ var DynamicTypeLiteralMapper3 = class {
           object_: named,
           value: discriminatedUnionTypeInstance.value
         });
-        return [...baseFields, ...objectEntries];
+        const baseFieldNames = new Set(baseFields.map((f10) => f10.name));
+        const filteredObjectEntries = objectEntries.filter((entry) => !baseFieldNames.has(entry.name));
+        return [...baseFields, ...filteredObjectEntries];
       }
       case "singleProperty": {
         try {
@@ -928408,8 +928489,8 @@ var TaskContextImpl = class {
   getResult() {
     return this.result;
   }
-  async instrumentPostHogEvent(event) {
-    await this.instrumentPostHogEventImpl(event);
+  instrumentPostHogEvent(event) {
+    this.instrumentPostHogEventImpl(event);
   }
   logAtLevel(level, ...parts) {
     this.logAtLevelWithOverrides(level, parts);
@@ -928445,7 +928526,7 @@ var TaskContextImpl = class {
       takeOverTerminal: this.takeOverTerminal,
       onResult: this.onResult,
       shouldBufferLogs: this.shouldBufferLogs,
-      instrumentPostHogEvent: async (event) => await this.instrumentPostHogEventImpl(event)
+      instrumentPostHogEvent: (event) => this.instrumentPostHogEventImpl(event)
     });
     this.subtasks.push(subtask);
     return subtask;
@@ -928811,9 +928892,10 @@ async function getLatestVersionOfCli({
 
 // src/cli-context/CliContext.ts
 var WORKSPACE_NAME_COLORS = ["#2E86AB", "#A23B72", "#F18F01", "#C73E1D", "#CCE2A3"];
-var CliContext = class {
+var CliContext = class _CliContext {
   environment;
   sentryClient;
+  posthogManager;
   didSucceed = true;
   numTasks = 0;
   ttyAwareLogger;
@@ -928821,9 +928903,14 @@ var CliContext = class {
   isLocal;
   stdoutRedirector = new StdoutRedirector();
   jsonMode = false;
-  constructor(stdout, stderr, { isLocal }) {
+  static async create(stdout, stderr, { isLocal }) {
+    const posthogManager2 = await getPosthogManager();
+    return new _CliContext(stdout, stderr, { isLocal, posthogManager: posthogManager2 });
+  }
+  constructor(stdout, stderr, { isLocal, posthogManager: posthogManager2 }) {
     this.ttyAwareLogger = new TtyAwareLogger(stdout, stderr);
     this.isLocal = isLocal ?? false;
+    this.posthogManager = posthogManager2;
     const packageName = this.getPackageName();
     const packageVersion3 = this.getPackageVersion();
     const cliName = this.getCliName();
@@ -928847,7 +928934,7 @@ var CliContext = class {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.67.1";
+    return "4.68.0";
   }
   getCliName() {
     if (false) {
@@ -928903,8 +928990,7 @@ var CliContext = class {
       await this.nudgeUpgradeIfAvailable();
     }
     this.ttyAwareLogger.finish();
-    const posthogManager2 = await getPosthogManager();
-    await posthogManager2.flush();
+    await this.posthogManager.flush();
     await this.sentryClient.flush();
     this.exitProgram({ code: code5 });
   }
@@ -928985,9 +929071,9 @@ var CliContext = class {
     }
     return result;
   }
-  async instrumentPostHogEvent(event) {
+  instrumentPostHogEvent(event) {
     if (!this.isLocal) {
-      (await getPosthogManager()).sendEvent(event);
+      this.posthogManager.sendEvent(event);
     }
   }
   async captureException(error50) {
@@ -929017,8 +929103,8 @@ var CliContext = class {
           this.didSucceed = false;
         }
       },
-      instrumentPostHogEvent: async (event) => {
-        await this.instrumentPostHogEvent(event);
+      instrumentPostHogEvent: (event) => {
+        this.instrumentPostHogEvent(event);
       },
       shouldBufferLogs: false
     };
@@ -930095,7 +930181,7 @@ function addGetOrganizationCommand(cli, cliContext) {
       description: "The location to output the organization name as a text file, defaults to standard out."
     }),
     async (argv) => {
-      await cliContext.instrumentPostHogEvent({
+      cliContext.instrumentPostHogEvent({
         command: "fern organization",
         properties: {
           outputLocation: argv.output
@@ -930149,7 +930235,7 @@ function addGeneratorCommands(cli, cliContext) {
         description: "The generator output modes to exclude within the outputted list."
       }),
       async (argv) => {
-        await cliContext.instrumentPostHogEvent({
+        cliContext.instrumentPostHogEvent({
           command: "fern generator list",
           properties: {
             outputLocation: argv.output
@@ -930206,7 +930292,7 @@ function addGeneratorCommands(cli, cliContext) {
         description: "Skip upgrading generators that have autorelease: false set in their configuration."
       }),
       async (argv) => {
-        await cliContext.instrumentPostHogEvent({
+        cliContext.instrumentPostHogEvent({
           command: "fern generator upgrade",
           properties: {
             generator: argv.generator,
@@ -930289,7 +930375,7 @@ function addGeneratorCommands(cli, cliContext) {
       }),
       async (argv) => {
         const correctedGetGenerator = warnAndCorrectIncorrectDockerOrgV2(argv.generator, cliContext);
-        await cliContext.instrumentPostHogEvent({
+        cliContext.instrumentPostHogEvent({
           command: "fern generator get",
           properties: {
             generator: correctedGetGenerator,
@@ -930648,7 +930734,7 @@ async function previewDocsWorkspace({
     return;
   }
   if (legacyPreview) {
-    await cliContext.instrumentPostHogEvent({
+    cliContext.instrumentPostHogEvent({
       orgId: project.config.organization,
       command: "fern docs dev --legacy"
     });
@@ -930693,7 +930779,7 @@ async function previewDocsWorkspace({
       });
     });
   }
-  await cliContext.instrumentPostHogEvent({
+  cliContext.instrumentPostHogEvent({
     orgId: project.config.organization,
     command: "fern docs dev --beta"
   });
@@ -938400,7 +938486,7 @@ async function generateAPIWorkspaces({
       }
     }
   }
-  await cliContext.instrumentPostHogEvent({
+  cliContext.instrumentPostHogEvent({
     orgId: project.config.organization,
     command: "fern generate",
     properties: {
@@ -938651,7 +938737,7 @@ ${source_default.yellow("?")} Are you sure you want to continue?`,
       }
     }
   }
-  await cliContext.instrumentPostHogEvent({
+  cliContext.instrumentPostHogEvent({
     orgId: project.config.organization,
     command: "fern generate --docs"
   });
@@ -940314,7 +940400,7 @@ async function mockServer({
   project,
   port
 }) {
-  await cliContext.instrumentPostHogEvent({
+  cliContext.instrumentPostHogEvent({
     orgId: project.config.organization,
     command: "fern mock"
   });
@@ -941276,7 +941362,7 @@ async function testOutput({
   testCommand,
   generationLanguage
 }) {
-  await cliContext.instrumentPostHogEvent({
+  cliContext.instrumentPostHogEvent({
     orgId: project.config.organization,
     command: "fern test"
   });
@@ -947025,7 +947111,7 @@ var USE_NODE_18_OR_ABOVE_MESSAGE = "The Fern CLI requires Node 18+ or above.";
 async function runCli() {
   getOrCreateFernRunId();
   const isLocal = process.argv.includes("--local");
-  const cliContext = new CliContext(process.stdout, process.stderr, { isLocal });
+  const cliContext = await CliContext.create(process.stdout, process.stderr, { isLocal });
   const exit3 = async () => {
     await cliContext.exit();
   };
@@ -947059,7 +947145,7 @@ async function runCli() {
       });
     }
   } catch (error50) {
-    await cliContext.instrumentPostHogEvent({
+    cliContext.instrumentPostHogEvent({
       command: process.argv.join(" "),
       properties: {
         failed: true,
@@ -947393,7 +947479,7 @@ function addSdkDiffCommand(cli, cliContext) {
       description: "Output result as JSON"
     }),
     async (argv) => {
-      await cliContext.instrumentPostHogEvent({
+      cliContext.instrumentPostHogEvent({
         command: "fern sdk-diff"
       });
       const project = await loadProjectAndRegisterWorkspacesWithContext(cliContext, {
@@ -948090,7 +948176,7 @@ function addUpdateApiSpecCommand(cli, cliContext) {
       default: 2
     }),
     async (argv) => {
-      await cliContext.instrumentPostHogEvent({
+      cliContext.instrumentPostHogEvent({
         command: "fern api update"
       });
       await updateApiSpec({
@@ -948117,7 +948203,7 @@ function addSelfUpdateCommand(cli, cliContext) {
       default: false
     }),
     async (argv) => {
-      await cliContext.instrumentPostHogEvent({
+      cliContext.instrumentPostHogEvent({
         command: "fern self-update"
       });
       await selfUpdate({
@@ -948142,7 +948228,7 @@ function addLoginCommand2(cli, cliContext) {
     }),
     async (argv) => {
       await cliContext.runTask(async (context3) => {
-        await cliContext.instrumentPostHogEvent({
+        cliContext.instrumentPostHogEvent({
           command: "fern login"
         });
         await login(context3, { useDeviceCodeFlow: argv.deviceCode, email: argv.email });
@@ -948157,7 +948243,7 @@ function addLogoutCommand2(cli, cliContext) {
     (yargs) => yargs,
     async () => {
       await cliContext.runTask(async (context3) => {
-        await cliContext.instrumentPostHogEvent({
+        cliContext.instrumentPostHogEvent({
           command: "fern logout"
         });
         await logout(context3);
@@ -948178,7 +948264,7 @@ function addFormatCommand(cli, cliContext) {
       description: "Only run the command on the provided API"
     }),
     async (argv) => {
-      await cliContext.instrumentPostHogEvent({
+      cliContext.instrumentPostHogEvent({
         command: "fern format"
       });
       await formatWorkspaces({
@@ -948207,7 +948293,7 @@ function addTestCommand(cli, cliContext) {
       description: "Run the tests configured to a specific language"
     }),
     async (argv) => {
-      await cliContext.instrumentPostHogEvent({
+      cliContext.instrumentPostHogEvent({
         command: "fern test"
       });
       await testOutput({
@@ -948236,7 +948322,7 @@ function addMockCommand(cli, cliContext) {
       description: "The API to mock."
     }),
     async (argv) => {
-      await cliContext.instrumentPostHogEvent({
+      cliContext.instrumentPostHogEvent({
         command: "fern mock"
       });
       await mockServer({
@@ -948275,7 +948361,7 @@ function addOverridesCompareCommand(cli, cliContext) {
       description: "Path to write the overrides file (defaults to <original>-overrides.yml)"
     }),
     async (argv) => {
-      await cliContext.instrumentPostHogEvent({
+      cliContext.instrumentPostHogEvent({
         command: "fern overrides compare"
       });
       const originalPath = resolve6(cwd(), argv.original);
@@ -948306,7 +948392,7 @@ function addOverridesWriteCommand(cli, cliContext) {
       })
     ],
     async (argv) => {
-      await cliContext.instrumentPostHogEvent({
+      cliContext.instrumentPostHogEvent({
         command: "fern overrides write"
       });
       await writeOverridesForWorkspaces({
@@ -948338,7 +948424,7 @@ function addWriteOverridesCommand(cli, cliContext) {
     ],
     async (argv) => {
       cliContext.logger.warn("The 'write-overrides' command is deprecated. Use 'fern overrides write' instead.");
-      await cliContext.instrumentPostHogEvent({
+      cliContext.instrumentPostHogEvent({
         command: "fern write-overrides"
       });
       await writeOverridesForWorkspaces({
@@ -948368,7 +948454,7 @@ function addWriteDefinitionCommand(cli, cliContext) {
     }),
     async (argv) => {
       const preserveSchemaIds = argv.preserveSchemas != null;
-      await cliContext.instrumentPostHogEvent({
+      cliContext.instrumentPostHogEvent({
         command: "fern write-definition"
       });
       await writeDefinitionForWorkspaces({
@@ -948411,7 +948497,7 @@ function addDocsMdGenerateCommand(cli, cliContext) {
       description: "Name of a specific library defined in docs.yml to generate docs for"
     }),
     async (argv) => {
-      await cliContext.instrumentPostHogEvent({
+      cliContext.instrumentPostHogEvent({
         command: "fern docs md generate"
       });
       const project = await loadProjectAndRegisterWorkspacesWithContext(cliContext, {
@@ -948445,7 +948531,7 @@ function addDocsDiffCommand(cli, cliContext) {
       description: "Output directory for diff images"
     }),
     async (argv) => {
-      await cliContext.instrumentPostHogEvent({
+      cliContext.instrumentPostHogEvent({
         command: "fern docs diff"
       });
       const project = await loadProjectAndRegisterWorkspacesWithContext(cliContext, {
@@ -948482,7 +948568,7 @@ function addDocsPreviewListCommand(cli, cliContext) {
       description: "Page number for pagination (starts at 1)"
     }),
     async (argv) => {
-      await cliContext.instrumentPostHogEvent({
+      cliContext.instrumentPostHogEvent({
         command: "fern docs preview list"
       });
       await listDocsPreview({
@@ -948503,7 +948589,7 @@ function addDocsPreviewDeleteCommand(cli, cliContext) {
       demandOption: true
     }),
     async (argv) => {
-      await cliContext.instrumentPostHogEvent({
+      cliContext.instrumentPostHogEvent({
         command: "fern docs preview delete"
       });
       await deleteDocsPreview({
@@ -948606,7 +948692,7 @@ function addDocsMdCheckCommand(cli, cliContext) {
     () => {
     },
     async () => {
-      await cliContext.instrumentPostHogEvent({
+      cliContext.instrumentPostHogEvent({
         command: "fern docs md check"
       });
       const project = await loadProjectAndRegisterWorkspacesWithContext(cliContext, {
@@ -948651,7 +948737,7 @@ function addGenerateJsonschemaCommand(cli, cliContext) {
       description: "The type to generate JSON Schema for (e.g. 'MySchema' or 'mypackage.MySchema')"
     }),
     async (argv) => {
-      await cliContext.instrumentPostHogEvent({
+      cliContext.instrumentPostHogEvent({
         command: "fern jsonschema",
         properties: {
           output: argv.output
@@ -948680,7 +948766,7 @@ function addWriteDocsDefinitionCommand(cli, cliContext) {
       demandOption: true
     }),
     async (argv) => {
-      await cliContext.instrumentPostHogEvent({
+      cliContext.instrumentPostHogEvent({
         command: "fern write-docs-definition",
         properties: {
           outputPath: argv.outputPath
@@ -948708,7 +948794,7 @@ function addWriteTranslationCommand(cli, cliContext) {
       description: "Return content as-is without calling the translation service"
     }),
     async (argv) => {
-      await cliContext.instrumentPostHogEvent({
+      cliContext.instrumentPostHogEvent({
         command: "fern write-translation"
       });
       await writeTranslationForProject({
@@ -948739,7 +948825,7 @@ function addExportCommand(cli, cliContext) {
       default: 2
     }),
     async (argv) => {
-      await cliContext.instrumentPostHogEvent({
+      cliContext.instrumentPostHogEvent({
         command: "fern export",
         properties: {
           outputPath: argv.outputPath
@@ -948777,7 +948863,7 @@ function addEnrichCommand(cli, cliContext) {
       demandOption: true
     }),
     async (argv) => {
-      await cliContext.instrumentPostHogEvent({
+      cliContext.instrumentPostHogEvent({
         command: "fern api enrich"
       });
       const openapiPath = resolve6(cwd(), argv.openapi);
@@ -948957,7 +949043,7 @@ function addSdkPreviewCommand(cli, cliContext) {
       description: "Push a preview diff branch (fern-preview-{version}) to the SDK repo in addition to publishing to the preview registry. Requires the generator to have github output configuration and the Fern GitHub App installed on the target repo. Cannot be combined with --local."
     }),
     async (argv) => {
-      await cliContext.instrumentPostHogEvent({
+      cliContext.instrumentPostHogEvent({
         command: "fern sdk preview"
       });
       const generatorFilter = argv.generator != null ? warnAndCorrectIncorrectDockerOrg(argv.generator, cliContext) : void 0;
@@ -949101,7 +949187,7 @@ function addReplayInitCommand(cli, cliContext) {
       description: "Overwrite existing lockfile if Replay is already initialized"
     }),
     async (argv) => {
-      await cliContext.instrumentPostHogEvent({
+      cliContext.instrumentPostHogEvent({
         command: "fern replay init"
       });
       let githubRepo = argv.github;
@@ -949202,7 +949288,7 @@ function addReplayResolveCommand(cli, cliContext) {
       description: "Skip checking for remaining conflict markers before committing"
     }),
     async (argv) => {
-      await cliContext.instrumentPostHogEvent({
+      cliContext.instrumentPostHogEvent({
         command: "fern replay resolve"
       });
       const outputDir = resolve6(cwd(), argv.directory ?? ".");

package/package.json

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