@fern-api/fern-api-dev 5.14.1 → 5.15.0-1-g3bd6856f480

package/cli.cjs

@@ -310912,6 +310912,8 @@ var require_buildReplayTelemetryProps = __commonJS({
         executed: replay?.executed ?? false,
         flow: replay?.flow ?? null,
         replay_crashed: replay?.replayCrashed === true,
+        auto_bootstrapped: replay?.autoBootstrapped === true,
+        bootstrap_attempted: replay?.bootstrapAttempted === true,
         pipeline_success: pipelineResult.success,
         pipeline_warnings_count: pipelineResult.warnings?.length ?? 0,
         replay_warnings_count: replay?.warnings?.length ?? 0,
@@ -322399,11 +322401,39 @@ var require_replay_run = __commonJS({
     var fs_1 = require("fs");
     var path_1 = require("path");
     var fernignore_1 = require_fernignore();
-    async function replayPrepare(params2) {
+    async function replayPrepare(params2, state) {
       const { outputDir, cliVersion, generatorVersions, stageOnly = false, generatorName, skipApplication, logger: logger4 } = params2;
       const lockfilePath = (0, path_1.join)(outputDir, ".fern", "replay.lock");
+      let autoBootstrapped = false;
+      let bootstrapAttempted = false;
       if (!(0, fs_1.existsSync)(lockfilePath)) {
-        return null;
+        if (process.env.FERN_DISABLE_AUTO_BOOTSTRAP === "true" || process.env.FERN_DISABLE_AUTO_BOOTSTRAP === "1") {
+          return null;
+        }
+        bootstrapAttempted = true;
+        if (state) {
+          state.bootstrapAttempted = true;
+        }
+        try {
+          const bootstrapResult = await (0, replay_1.bootstrap)(outputDir, {
+            fernignoreAction: "skip",
+            force: false,
+            importHistory: false
+          });
+          if (bootstrapResult.generationCommit == null) {
+            return null;
+          }
+          autoBootstrapped = true;
+        } catch (error50) {
+          logger4?.warn("Replay auto-bootstrap failed, continuing without replay: " + String(error50));
+          try {
+            if ((0, fs_1.existsSync)(lockfilePath)) {
+              (0, fs_1.unlinkSync)(lockfilePath);
+            }
+          } catch {
+          }
+          return null;
+        }
       }
       const baseBranchHead = gitRevParse(outputDir, "HEAD");
       let previousGenerationSha = null;
@@ -322477,7 +322507,9 @@ var require_replay_run = __commonJS({
         flow: preparation.flow,
         previousGenerationSha,
         currentGenerationSha: preparation.currentGenerationSha,
-        baseBranchHead
+        baseBranchHead,
+        autoBootstrapped,
+        bootstrapAttempted
       };
     }
     async function replayApply(prepared, params2 = {}) {
@@ -322493,6 +322525,8 @@ var require_replay_run = __commonJS({
           previousGenerationSha: prepared.previousGenerationSha,
           currentGenerationSha: prepared.currentGenerationSha,
           baseBranchHead: prepared.baseBranchHead,
+          autoBootstrapped: prepared.autoBootstrapped,
+          bootstrapAttempted: prepared.bootstrapAttempted,
           failureReason: String(error50)
         };
       }
@@ -322515,13 +322549,16 @@ var require_replay_run = __commonJS({
         fernignoreUpdated,
         previousGenerationSha: prepared.previousGenerationSha,
         currentGenerationSha: prepared.currentGenerationSha,
-        baseBranchHead: resolvedBaseBranchHead
+        baseBranchHead: resolvedBaseBranchHead,
+        autoBootstrapped: prepared.autoBootstrapped,
+        bootstrapAttempted: prepared.bootstrapAttempted
       };
     }
     async function replayRun(params2) {
+      const prepareState = { bootstrapAttempted: false };
       let prepared;
       try {
-        prepared = await replayPrepare(params2);
+        prepared = await replayPrepare(params2, prepareState);
       } catch (error50) {
         return {
           report: null,
@@ -322529,6 +322566,8 @@ var require_replay_run = __commonJS({
           previousGenerationSha: null,
           currentGenerationSha: null,
           baseBranchHead: null,
+          autoBootstrapped: false,
+          bootstrapAttempted: prepareState.bootstrapAttempted,
           failureReason: error50 instanceof ReplayPrepareError ? error50.reason : String(error50)
         };
       }
@@ -322538,7 +322577,9 @@ var require_replay_run = __commonJS({
           fernignoreUpdated: false,
           previousGenerationSha: null,
           currentGenerationSha: null,
-          baseBranchHead: null
+          baseBranchHead: null,
+          autoBootstrapped: false,
+          bootstrapAttempted: prepareState.bootstrapAttempted
         };
       }
       return replayApply(prepared, { stageOnly: params2.stageOnly, logger: params2.logger });
@@ -322630,6 +322671,7 @@ var require_GenerationCommitStep = __commonJS({
       }
       async execute(_context) {
         const headBeforePrepare = tryRevParse(this.outputDir, "HEAD");
+        const prepareState = { bootstrapAttempted: false };
         let prepared;
         try {
           prepared = await (0, replay_run_1.replayPrepare)({
@@ -322639,7 +322681,7 @@ var require_GenerationCommitStep = __commonJS({
             generatorName: this.generatorName,
             skipApplication: this.config.skipApplication,
             logger: this.logger
-          });
+          }, prepareState);
         } catch (error50) {
           const reason = error50 instanceof replay_run_1.ReplayPrepareError ? error50.reason : String(error50);
           if (headBeforePrepare != null) {
@@ -322655,14 +322697,16 @@ var require_GenerationCommitStep = __commonJS({
             executed: true,
             success: true,
             errorMessage: reason,
-            preparedReplay: null
+            preparedReplay: null,
+            bootstrapAttempted: prepareState.bootstrapAttempted
           };
         }
         if (prepared == null) {
           return {
             executed: true,
             success: true,
-            preparedReplay: null
+            preparedReplay: null,
+            bootstrapAttempted: prepareState.bootstrapAttempted
           };
         }
         return {
@@ -322672,7 +322716,8 @@ var require_GenerationCommitStep = __commonJS({
           previousGenerationSha: prepared.previousGenerationSha ?? void 0,
           currentGenerationSha: prepared.currentGenerationSha,
           baseBranchHead: prepared.baseBranchHead ?? void 0,
-          flow: prepared.flow
+          flow: prepared.flow,
+          bootstrapAttempted: prepareState.bootstrapAttempted
         };
       }
     };
@@ -327338,6 +327383,8 @@ var require_ReplayStep = __commonJS({
             success: true,
             replayCrashed: true,
             errorMessage: generationCommit.errorMessage,
+            autoBootstrapped: false,
+            bootstrapAttempted: generationCommit.bootstrapAttempted === true,
             flow: "normal-regeneration",
             patchesDetected: 0,
             patchesApplied: 0,
@@ -327348,6 +327395,8 @@ var require_ReplayStep = __commonJS({
           return {
             executed: true,
             success: true,
+            autoBootstrapped: false,
+            bootstrapAttempted: generationCommit.bootstrapAttempted === true,
             flow: "first-generation",
             patchesDetected: 0,
             patchesApplied: 0,
@@ -327375,6 +327424,8 @@ var require_ReplayStep = __commonJS({
             previousGenerationSha: result.previousGenerationSha ?? void 0,
             currentGenerationSha: result.currentGenerationSha ?? void 0,
             baseBranchHead: result.baseBranchHead ?? void 0,
+            autoBootstrapped: result.autoBootstrapped,
+            bootstrapAttempted: result.bootstrapAttempted,
             flow: "normal-regeneration",
             patchesDetected: 0,
             patchesApplied: 0,
@@ -327388,6 +327439,8 @@ var require_ReplayStep = __commonJS({
             previousGenerationSha: result.previousGenerationSha ?? void 0,
             currentGenerationSha: result.currentGenerationSha ?? void 0,
             baseBranchHead: result.baseBranchHead ?? void 0,
+            autoBootstrapped: result.autoBootstrapped,
+            bootstrapAttempted: result.bootstrapAttempted,
             flow: "first-generation",
             patchesDetected: 0,
             patchesApplied: 0,
@@ -327401,6 +327454,8 @@ var require_ReplayStep = __commonJS({
           previousGenerationSha: result.previousGenerationSha ?? void 0,
           currentGenerationSha: result.currentGenerationSha ?? void 0,
           baseBranchHead: result.baseBranchHead ?? void 0,
+          autoBootstrapped: result.autoBootstrapped,
+          bootstrapAttempted: result.bootstrapAttempted,
           flow: report.flow,
           patchesDetected: report.patchesDetected,
           patchesApplied: report.patchesApplied,
@@ -623478,7 +623533,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.14.1",
+          version: "5.15.0-1-g3bd6856f480",
           usingAccessToken: true
         }
       });
@@ -623527,17 +623582,16 @@ var UserPosthogManager = class {
     }
   }
   async sendEvent(event) {
-    const [userEmail, orgId] = await Promise.all([this.getUserEmail(), this.getPrimaryOrgId()]);
+    const userEmail = await this.getUserEmail();
     this.posthog.capture({
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.14.1",
+        version: "5.15.0-1-g3bd6856f480",
         ...event,
         ...event.properties,
         usingAccessToken: false,
-        ...userEmail != null ? { userEmail } : {},
-        ...orgId != null ? { org_id: orgId } : {}
+        ...userEmail != null ? { userEmail } : {}
       }
     });
   }
@@ -623570,42 +623624,6 @@ var UserPosthogManager = class {
     this.userEmail = null;
     return void 0;
   }
-  /**
-   * Cached primary `OrganizationId` for the current user. `null` is the
-   * "tried and gave up" sentinel — distinct from `undefined` (not yet tried)
-   * so subsequent `sendEvent` calls don't repeatedly hit venus when the user
-   * has no orgs or the call failed.
-   *
-   * Picks the first org returned by `getOrgIdsFromToken`. Multi-org users
-   * appear under their first org for adoption metrics — accurate enough for
-   * dashboards, and matches autopilot's distinct-id pattern.
-   */
-  orgId;
-  async getPrimaryOrgId() {
-    if (this.orgId === null) {
-      return void 0;
-    }
-    if (this.orgId != null) {
-      return this.orgId;
-    }
-    if (this.token == null) {
-      this.orgId = null;
-      return void 0;
-    }
-    try {
-      const response = await createVenusService({ token: this.token.value }).organization.getOrgIdsFromToken();
-      if (response.ok && response.body.length > 0) {
-        const first3 = response.body[0];
-        if (first3 != null) {
-          this.orgId = first3;
-          return this.orgId;
-        }
-      }
-    } catch {
-    }
-    this.orgId = null;
-    return void 0;
-  }
   persistedDistinctId;
   async getPersistedDistinctId() {
     if (this.persistedDistinctId == null) {
@@ -848520,7 +848538,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.14.1";
+  const version7 = "5.15.0-1-g3bd6856f480";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -859190,11 +859208,16 @@ var RemoteTaskHandler = class {
         // the dashboard plan — would require structural change.
         durationMs: Date.now() - this.taskStartedAtMs
       });
+      const propsWithOverlay = {
+        ...props,
+        surface: "fiddle",
+        org_id: this.telemetryContext.orgId
+      };
       this.context.instrumentPostHogEvent({
         command: "replay",
-        properties: { ...props, surface: "fiddle" }
+        properties: propsWithOverlay
       });
-      this.context.logger.debug(`[telemetry] replay event sent: ${JSON.stringify({ ...props, surface: "fiddle" })}`);
+      this.context.logger.debug(`[telemetry] replay event sent: ${JSON.stringify(propsWithOverlay)}`);
       this.replayEventEmitted = true;
     } catch (error50) {
       this.context.logger.debug(`[telemetry] failed to send replay event: ${String(error50)}`);
@@ -859743,6 +859766,7 @@ async function runRemoteGenerationForGenerator({ projectConfig, organization, wo
     absolutePathToPreview,
     telemetryContext: {
       cliVersion: workspace.cliVersion,
+      orgId: projectConfig.organization,
       automationMode: automationMode === true,
       autoMerge: autoMerge === true,
       skipIfNoDiff: skipIfNoDiff === true,
@@ -861319,7 +861343,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.14.1",
+        cliVersion: "5.15.0-1-g3bd6856f480",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -914156,12 +914180,16 @@ generators:
                 previewMode: selfhostedGithubConfig.previewMode === true,
                 durationMs: pipelineDurationMs
               });
-              const propsWithSurface = { ...replayTelemetryProps, surface: "cli" };
+              const propsWithOverlay = {
+                ...replayTelemetryProps,
+                surface: "cli",
+                org_id: projectConfig.organization
+              };
               interactiveTaskContext.instrumentPostHogEvent({
                 command: "replay",
-                properties: propsWithSurface
+                properties: propsWithOverlay
               });
-              interactiveTaskContext.logger.debug(`[telemetry] replay event sent: ${JSON.stringify(propsWithSurface)}`);
+              interactiveTaskContext.logger.debug(`[telemetry] replay event sent: ${JSON.stringify(propsWithOverlay)}`);
             } catch (error50) {
               interactiveTaskContext.logger.debug(`[telemetry] failed to send replay event: ${String(error50)}`);
             }
@@ -935840,7 +935868,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.14.1";
+    return "5.15.0-1-g3bd6856f480";
   }
   getCliName() {
     if (false) {

package/package.json

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