@fern-api/fern-api-dev 4.47.0-8-ga7152010378 → 4.48.0

package/cli.cjs

@@ -601952,7 +601952,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.47.0-8-ga7152010378",
+          version: "4.48.0",
           usingAccessToken: true
         }
       });
@@ -602003,7 +602003,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.47.0-8-ga7152010378",
+        version: "4.48.0",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -825858,7 +825858,7 @@ var import_path54 = __toESM(require("path"), 1);
 var LOCAL_STORAGE_FOLDER4 = ".fern-dev";
 var LOGS_FOLDER_NAME = "logs";
 function getCliSource() {
-  const version7 = "4.47.0-8-ga7152010378";
+  const version7 = "4.48.0";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -835928,6 +835928,12 @@ var DocsPublishConflictError = class extends Error {
     this.name = "DocsPublishConflictError";
   }
 };
+async function unlockDeploy({ fdrOrigin, token, domain: domain3, basepath }) {
+  try {
+    await axios_default.post(`${fdrOrigin}/docs-deployment/unlock`, { domain: domain3, basepath }, { headers: { Authorization: `Bearer ${token}` } });
+  } catch {
+  }
+}
 async function calculateFileHash(absoluteFilePath) {
   const fileBuffer = await (0, import_promises92.readFile)(absoluteFilePath);
   return (0, import_crypto10.createHash)("sha256").update(new Uint8Array(fileBuffer)).digest("hex");
@@ -835965,274 +835971,303 @@ async function publishDocs({ token, organization, docsWorkspace, domain: domain3
   if (isBasepathAware) {
     context3.logger.debug("Experimental flag 'basepath-aware' is enabled - using basepath-aware S3 key format");
   }
-  const resolver2 = new DocsDefinitionResolver({
-    domain: domain3,
-    docsWorkspace,
-    ossWorkspaces,
-    apiWorkspaces,
-    taskContext: context3,
-    editThisPage,
-    uploadFiles: async (files) => {
-      const filesWithSanitizedPaths = files.map((file4) => ({
-        ...file4,
-        sanitizedPath: sanitizeRelativePathForS3(file4.relativeFilePath)
-      }));
-      const filesMap = new Map(filesWithSanitizedPaths.map((file4) => [file4.absoluteFilePath, file4]));
-      const sanitizedToAbsoluteMap = new Map(filesWithSanitizedPaths.map((file4) => [file4.sanitizedPath, file4.absoluteFilePath]));
-      const filesWithMimeType = filesWithSanitizedPaths.map((fileMetadata) => ({
-        ...fileMetadata,
-        mediaType: mime.lookup(fileMetadata.absoluteFilePath)
-      })).filter((fileMetadata) => fileMetadata.mediaType !== false);
-      const imagesToMeasure = filesWithMimeType.filter((file4) => MediaType.parse(file4.mediaType)?.isImage() ?? false).map((file4) => file4.absoluteFilePath);
-      const measuredImages = await measureImageSizes(imagesToMeasure, MEASURE_IMAGE_BATCH_SIZE, context3);
-      context3.logger.debug(`Hashing ${measuredImages.size} image files with concurrency ${HASH_CONCURRENCY}...`);
-      const hashImageStart = performance.now();
-      const imageArray = Array.from(measuredImages.values());
-      const hashedImages = await asyncPool2(HASH_CONCURRENCY, imageArray, async (image3) => {
-        const filePath = filesMap.get(image3.filePath);
-        if (filePath == null) {
-          return null;
-        }
-        const sanitizedPath = filePath.sanitizedPath;
-        const obj = {
-          filePath: FdrAPI_exports.docs.v1.write.FilePath(convertToFernHostRelativeFilePath(sanitizedPath)),
-          width: image3.width,
-          height: image3.height,
-          blurDataUrl: image3.blurDataUrl,
-          alt: void 0,
-          fileHash: await calculateFileHash(filePath.absoluteFilePath)
-        };
-        return obj;
-      });
-      const images = hashedImages.filter((img2) => img2 != null);
-      const hashImageTime = performance.now() - hashImageStart;
-      context3.logger.debug(`Hashed ${images.length} images in ${hashImageTime.toFixed(0)}ms`);
-      const nonImageFiles = filesWithSanitizedPaths.filter(({ absoluteFilePath }) => !measuredImages.has(absoluteFilePath));
-      context3.logger.debug(`Hashing ${nonImageFiles.length} non-image files with concurrency ${HASH_CONCURRENCY}...`);
-      const hashNonImageStart = performance.now();
-      const filepaths = await asyncPool2(HASH_CONCURRENCY, nonImageFiles, async (file4) => {
-        return {
-          path: FdrAPI_exports.docs.v1.write.FilePath(convertToFernHostRelativeFilePath(file4.sanitizedPath)),
-          fileHash: await calculateFileHash(file4.absoluteFilePath)
-        };
-      });
-      const hashNonImageTime = performance.now() - hashNonImageStart;
-      context3.logger.debug(`Hashed ${filepaths.length} non-image files in ${hashNonImageTime.toFixed(0)}ms`);
-      if (preview) {
-        const startDocsRegisterResponse = await fdr.docs.v2.write.startDocsPreviewRegister({
-          orgId: FdrAPI_exports.OrgId(organization),
-          authConfig: isPrivate ? { type: "private", authType: "sso" } : { type: "public" },
-          filepaths,
-          images,
-          basePath,
-          previewId: previewId != null ? sanitizePreviewId(previewId) : void 0
-        });
-        if (startDocsRegisterResponse.ok) {
-          urlToOutput = startDocsRegisterResponse.body.previewUrl;
-          docsRegistrationId = startDocsRegisterResponse.body.docsRegistrationId;
-          context3.logger.debug(`Received preview registration ID: ${docsRegistrationId}`);
-          if (skipUpload) {
-            context3.logger.debug("Skip-upload mode: skipping file uploads for docs preview");
-          } else {
-            const skippedSet = new Set(startDocsRegisterResponse.body.skippedFiles || []);
-            const urlsToUpload = Object.fromEntries(Object.entries(startDocsRegisterResponse.body.uploadUrls).filter(([filepath]) => !skippedSet.has(filepath)));
-            const uploadCount = Object.keys(urlsToUpload).length;
-            const skippedCount = skippedSet.size;
-            if (uploadCount > 0) {
-              context3.logger.debug(`Uploading ${uploadCount} files (${skippedCount} skipped)...`);
-              await uploadFiles(urlsToUpload, docsWorkspace.absoluteFilePath, context3, UPLOAD_FILE_BATCH_SIZE, sanitizedToAbsoluteMap);
+  let deployLocked = false;
+  const doUnlock = () => {
+    if (deployLocked && !preview) {
+      deployLocked = false;
+      context3.logger.debug("Unlocking docs deploy due to early exit...");
+      void unlockDeploy({ fdrOrigin, token: token.value, domain: domain3, basepath: basePath });
+    }
+  };
+  const onSignal = async () => {
+    if (deployLocked && !preview) {
+      deployLocked = false;
+      context3.logger.debug("Unlocking docs deploy due to signal...");
+      await unlockDeploy({ fdrOrigin, token: token.value, domain: domain3, basepath: basePath });
+    }
+    process.exit(1);
+  };
+  process.on("SIGINT", onSignal);
+  process.on("SIGTERM", onSignal);
+  try {
+    const resolver2 = new DocsDefinitionResolver({
+      domain: domain3,
+      docsWorkspace,
+      ossWorkspaces,
+      apiWorkspaces,
+      taskContext: context3,
+      editThisPage,
+      uploadFiles: async (files) => {
+        const filesWithSanitizedPaths = files.map((file4) => ({
+          ...file4,
+          sanitizedPath: sanitizeRelativePathForS3(file4.relativeFilePath)
+        }));
+        const filesMap = new Map(filesWithSanitizedPaths.map((file4) => [file4.absoluteFilePath, file4]));
+        const sanitizedToAbsoluteMap = new Map(filesWithSanitizedPaths.map((file4) => [file4.sanitizedPath, file4.absoluteFilePath]));
+        const filesWithMimeType = filesWithSanitizedPaths.map((fileMetadata) => ({
+          ...fileMetadata,
+          mediaType: mime.lookup(fileMetadata.absoluteFilePath)
+        })).filter((fileMetadata) => fileMetadata.mediaType !== false);
+        const imagesToMeasure = filesWithMimeType.filter((file4) => MediaType.parse(file4.mediaType)?.isImage() ?? false).map((file4) => file4.absoluteFilePath);
+        const measuredImages = await measureImageSizes(imagesToMeasure, MEASURE_IMAGE_BATCH_SIZE, context3);
+        context3.logger.debug(`Hashing ${measuredImages.size} image files with concurrency ${HASH_CONCURRENCY}...`);
+        const hashImageStart = performance.now();
+        const imageArray = Array.from(measuredImages.values());
+        const hashedImages = await asyncPool2(HASH_CONCURRENCY, imageArray, async (image3) => {
+          const filePath = filesMap.get(image3.filePath);
+          if (filePath == null) {
+            return null;
+          }
+          const sanitizedPath = filePath.sanitizedPath;
+          const obj = {
+            filePath: FdrAPI_exports.docs.v1.write.FilePath(convertToFernHostRelativeFilePath(sanitizedPath)),
+            width: image3.width,
+            height: image3.height,
+            blurDataUrl: image3.blurDataUrl,
+            alt: void 0,
+            fileHash: await calculateFileHash(filePath.absoluteFilePath)
+          };
+          return obj;
+        });
+        const images = hashedImages.filter((img2) => img2 != null);
+        const hashImageTime = performance.now() - hashImageStart;
+        context3.logger.debug(`Hashed ${images.length} images in ${hashImageTime.toFixed(0)}ms`);
+        const nonImageFiles = filesWithSanitizedPaths.filter(({ absoluteFilePath }) => !measuredImages.has(absoluteFilePath));
+        context3.logger.debug(`Hashing ${nonImageFiles.length} non-image files with concurrency ${HASH_CONCURRENCY}...`);
+        const hashNonImageStart = performance.now();
+        const filepaths = await asyncPool2(HASH_CONCURRENCY, nonImageFiles, async (file4) => {
+          return {
+            path: FdrAPI_exports.docs.v1.write.FilePath(convertToFernHostRelativeFilePath(file4.sanitizedPath)),
+            fileHash: await calculateFileHash(file4.absoluteFilePath)
+          };
+        });
+        const hashNonImageTime = performance.now() - hashNonImageStart;
+        context3.logger.debug(`Hashed ${filepaths.length} non-image files in ${hashNonImageTime.toFixed(0)}ms`);
+        if (preview) {
+          const startDocsRegisterResponse = await fdr.docs.v2.write.startDocsPreviewRegister({
+            orgId: FdrAPI_exports.OrgId(organization),
+            authConfig: isPrivate ? { type: "private", authType: "sso" } : { type: "public" },
+            filepaths,
+            images,
+            basePath,
+            previewId: previewId != null ? sanitizePreviewId(previewId) : void 0
+          });
+          if (startDocsRegisterResponse.ok) {
+            urlToOutput = startDocsRegisterResponse.body.previewUrl;
+            docsRegistrationId = startDocsRegisterResponse.body.docsRegistrationId;
+            context3.logger.debug(`Received preview registration ID: ${docsRegistrationId}`);
+            if (skipUpload) {
+              context3.logger.debug("Skip-upload mode: skipping file uploads for docs preview");
             } else {
-              context3.logger.debug(`No files to upload (all ${skippedCount} up to date)`);
+              const skippedSet = new Set(startDocsRegisterResponse.body.skippedFiles || []);
+              const urlsToUpload = Object.fromEntries(Object.entries(startDocsRegisterResponse.body.uploadUrls).filter(([filepath]) => !skippedSet.has(filepath)));
+              const uploadCount = Object.keys(urlsToUpload).length;
+              const skippedCount = skippedSet.size;
+              if (uploadCount > 0) {
+                context3.logger.debug(`Uploading ${uploadCount} files (${skippedCount} skipped)...`);
+                await uploadFiles(urlsToUpload, docsWorkspace.absoluteFilePath, context3, UPLOAD_FILE_BATCH_SIZE, sanitizedToAbsoluteMap);
+              } else {
+                context3.logger.debug(`No files to upload (all ${skippedCount} up to date)`);
+              }
             }
-          }
-          return convertToFilePathPairs(startDocsRegisterResponse.body.uploadUrls, docsWorkspace.absoluteFilePath, sanitizedToAbsoluteMap);
-        } else {
-          return await startDocsRegisterFailed(startDocsRegisterResponse.error, context3, organization);
-        }
-      } else {
-        const startDocsRegisterResponse = await fdr.docs.v2.write.startDocsRegister({
-          domain: domain3,
-          customDomains,
-          authConfig,
-          apiId: FdrAPI_exports.ApiId(""),
-          orgId: FdrAPI_exports.OrgId(organization),
-          filepaths,
-          images,
-          ...isBasepathAware && { basepathAware: true }
-        });
-        if (startDocsRegisterResponse.ok) {
-          docsRegistrationId = startDocsRegisterResponse.body.docsRegistrationId;
-          context3.logger.debug(`Received production registration ID: ${docsRegistrationId}`);
-          const skippedCount = startDocsRegisterResponse.body.skippedFiles?.length || 0;
-          if (skippedCount > 0) {
-            context3.logger.info(`Skipped ${skippedCount} unchanged file${skippedCount === 1 ? "" : "s"} (already uploaded)`);
-          }
-          if (skipUpload) {
-            context3.logger.debug("Skip-upload mode: skipping file uploads for docs");
+            return convertToFilePathPairs(startDocsRegisterResponse.body.uploadUrls, docsWorkspace.absoluteFilePath, sanitizedToAbsoluteMap);
           } else {
-            const skippedSet = new Set(startDocsRegisterResponse.body.skippedFiles || []);
-            const urlsToUpload = Object.fromEntries(Object.entries(startDocsRegisterResponse.body.uploadUrls).filter(([filepath]) => !skippedSet.has(filepath)));
-            const uploadCount = Object.keys(urlsToUpload).length;
-            if (uploadCount > 0) {
-              context3.logger.info(`\u2191 Uploading ${uploadCount} files...`);
-              await uploadFiles(urlsToUpload, docsWorkspace.absoluteFilePath, context3, UPLOAD_FILE_BATCH_SIZE, sanitizedToAbsoluteMap);
+            return await startDocsRegisterFailed(startDocsRegisterResponse.error, context3, organization);
+          }
+        } else {
+          const startDocsRegisterResponse = await fdr.docs.v2.write.startDocsRegister({
+            domain: domain3,
+            customDomains,
+            authConfig,
+            apiId: FdrAPI_exports.ApiId(""),
+            orgId: FdrAPI_exports.OrgId(organization),
+            filepaths,
+            images,
+            ...isBasepathAware && { basepathAware: true }
+          });
+          if (startDocsRegisterResponse.ok) {
+            docsRegistrationId = startDocsRegisterResponse.body.docsRegistrationId;
+            deployLocked = true;
+            context3.logger.debug(`Received production registration ID: ${docsRegistrationId}`);
+            const skippedCount = startDocsRegisterResponse.body.skippedFiles?.length || 0;
+            if (skippedCount > 0) {
+              context3.logger.info(`Skipped ${skippedCount} unchanged file${skippedCount === 1 ? "" : "s"} (already uploaded)`);
+            }
+            if (skipUpload) {
+              context3.logger.debug("Skip-upload mode: skipping file uploads for docs");
             } else {
-              context3.logger.info("No files to upload (all up to date)");
+              const skippedSet = new Set(startDocsRegisterResponse.body.skippedFiles || []);
+              const urlsToUpload = Object.fromEntries(Object.entries(startDocsRegisterResponse.body.uploadUrls).filter(([filepath]) => !skippedSet.has(filepath)));
+              const uploadCount = Object.keys(urlsToUpload).length;
+              if (uploadCount > 0) {
+                context3.logger.info(`\u2191 Uploading ${uploadCount} files...`);
+                await uploadFiles(urlsToUpload, docsWorkspace.absoluteFilePath, context3, UPLOAD_FILE_BATCH_SIZE, sanitizedToAbsoluteMap);
+              } else {
+                context3.logger.info("No files to upload (all up to date)");
+              }
             }
+            return convertToFilePathPairs(startDocsRegisterResponse.body.uploadUrls, docsWorkspace.absoluteFilePath, sanitizedToAbsoluteMap);
+          } else {
+            return startDocsRegisterFailed(startDocsRegisterResponse.error, context3, organization);
           }
-          return convertToFilePathPairs(startDocsRegisterResponse.body.uploadUrls, docsWorkspace.absoluteFilePath, sanitizedToAbsoluteMap);
-        } else {
-          return startDocsRegisterFailed(startDocsRegisterResponse.error, context3, organization);
         }
-      }
-    },
-    registerApi: async ({ ir: ir15, snippetsConfig, playgroundConfig, apiName, workspace, graphqlOperations, graphqlTypes }) => {
-      let apiDefinition = convertIrToFdrApi({
-        ir: ir15,
-        snippetsConfig,
-        playgroundConfig,
-        graphqlOperations,
-        graphqlTypes,
-        context: context3,
-        apiNameOverride: apiName
-      });
-      const aiEnhancerConfig = getAIEnhancerConfig(withAiExamples, docsWorkspace.config.aiExamples?.style ?? docsWorkspace.config.experimental?.aiExampleStyleInstructions);
-      if (aiEnhancerConfig) {
-        const sources = workspace?.getSources();
-        const openApiSources = sources?.filter((source2) => source2.type === "openapi").map((source2) => ({
-          absoluteFilePath: source2.absoluteFilePath,
-          absoluteFilePathToOverrides: source2.absoluteFilePathToOverrides
-        }));
-        if (openApiSources == null || openApiSources.length === 0) {
-          context3.logger.debug("Skipping AI example enhancement: no OpenAPI source file paths available");
-        } else {
-          apiDefinition = await enhanceExamplesWithAI(apiDefinition, aiEnhancerConfig, context3, token, organization, openApiSources);
-        }
-      }
-      let dynamicIRsByLanguage;
-      let languagesWithExistingSdkDynamicIr = /* @__PURE__ */ new Set();
-      if (Object.keys(snippetsConfig).length === 0) {
-        context3.logger.debug(`No snippets configuration defined, skipping snippet generation...`);
-      } else if (!disableDynamicSnippets) {
-        const existingSdkDynamicIrs = await checkAndDownloadExistingSdkDynamicIRs({
-          fdr,
-          workspace,
-          organization,
-          context: context3,
-          snippetsConfig
-        });
-        if (existingSdkDynamicIrs && Object.keys(existingSdkDynamicIrs).length > 0) {
-          dynamicIRsByLanguage = existingSdkDynamicIrs;
-          languagesWithExistingSdkDynamicIr = new Set(Object.keys(existingSdkDynamicIrs));
-          context3.logger.debug(`Using existing SDK dynamic IRs for: ${Object.keys(existingSdkDynamicIrs).join(", ")}`);
-        }
-        const generatedDynamicIRs = await generateLanguageSpecificDynamicIRs({
-          workspace,
-          organization,
-          context: context3,
+      },
+      registerApi: async ({ ir: ir15, snippetsConfig, playgroundConfig, apiName, workspace, graphqlOperations, graphqlTypes }) => {
+        let apiDefinition = convertIrToFdrApi({
+          ir: ir15,
           snippetsConfig,
-          skipLanguages: languagesWithExistingSdkDynamicIr
-        });
-        if (generatedDynamicIRs) {
-          dynamicIRsByLanguage = {
-            ...dynamicIRsByLanguage,
-            ...generatedDynamicIRs
-          };
-        }
-      }
-      const response = await fdr.api.v1.register.registerApiDefinition({
-        orgId: FdrAPI_exports.OrgId(organization),
-        apiId: FdrAPI_exports.ApiId(apiName ?? ir15.apiName.originalName),
-        definition: apiDefinition,
-        definitionV2: void 0,
-        dynamicIRs: dynamicIRsByLanguage,
-        docsUrl
-      });
-      if (response.ok) {
-        context3.logger.debug(`Registered API Definition ${apiName}: ${response.body.apiDefinitionId}`);
-        if (response.body.dynamicIRs && dynamicIRsByLanguage) {
-          if (skipUpload) {
-            context3.logger.debug("Skip-upload mode: skipping dynamic IR uploads");
+          playgroundConfig,
+          graphqlOperations,
+          graphqlTypes,
+          context: context3,
+          apiNameOverride: apiName
+        });
+        const aiEnhancerConfig = getAIEnhancerConfig(withAiExamples, docsWorkspace.config.aiExamples?.style ?? docsWorkspace.config.experimental?.aiExampleStyleInstructions);
+        if (aiEnhancerConfig) {
+          const sources = workspace?.getSources();
+          const openApiSources = sources?.filter((source2) => source2.type === "openapi").map((source2) => ({
+            absoluteFilePath: source2.absoluteFilePath,
+            absoluteFilePathToOverrides: source2.absoluteFilePathToOverrides
+          }));
+          if (openApiSources == null || openApiSources.length === 0) {
+            context3.logger.debug("Skipping AI example enhancement: no OpenAPI source file paths available");
           } else {
-            await uploadDynamicIRs({
-              dynamicIRs: dynamicIRsByLanguage,
-              dynamicIRUploadUrls: response.body.dynamicIRs,
-              context: context3,
-              apiId: response.body.apiDefinitionId
-            });
+            apiDefinition = await enhanceExamplesWithAI(apiDefinition, aiEnhancerConfig, context3, token, organization, openApiSources);
           }
         }
-        return response.body.apiDefinitionId;
-      } else {
-        switch (response.error.error) {
-          case "UnauthorizedError":
-          case "UserNotInOrgError": {
-            return context3.failAndThrow("You do not have permissions to register the docs. Reach out to support@buildwithfern.com");
+        let dynamicIRsByLanguage;
+        let languagesWithExistingSdkDynamicIr = /* @__PURE__ */ new Set();
+        if (Object.keys(snippetsConfig).length === 0) {
+          context3.logger.debug(`No snippets configuration defined, skipping snippet generation...`);
+        } else if (!disableDynamicSnippets) {
+          const existingSdkDynamicIrs = await checkAndDownloadExistingSdkDynamicIRs({
+            fdr,
+            workspace,
+            organization,
+            context: context3,
+            snippetsConfig
+          });
+          if (existingSdkDynamicIrs && Object.keys(existingSdkDynamicIrs).length > 0) {
+            dynamicIRsByLanguage = existingSdkDynamicIrs;
+            languagesWithExistingSdkDynamicIr = new Set(Object.keys(existingSdkDynamicIrs));
+            context3.logger.debug(`Using existing SDK dynamic IRs for: ${Object.keys(existingSdkDynamicIrs).join(", ")}`);
           }
-          default: {
-            const errorDetails = extractErrorDetails(response.error);
-            context3.logger.error(`FDR registerApiDefinition failed. Error details:
-${JSON.stringify(errorDetails, void 0, 2)}`);
-            if (apiName != null) {
-              return context3.failAndThrow(`Failed to publish docs because API definition (${apiName}) could not be uploaded. Please contact support@buildwithfern.com`, errorDetails);
+          const generatedDynamicIRs = await generateLanguageSpecificDynamicIRs({
+            workspace,
+            organization,
+            context: context3,
+            snippetsConfig,
+            skipLanguages: languagesWithExistingSdkDynamicIr
+          });
+          if (generatedDynamicIRs) {
+            dynamicIRsByLanguage = {
+              ...dynamicIRsByLanguage,
+              ...generatedDynamicIRs
+            };
+          }
+        }
+        const response = await fdr.api.v1.register.registerApiDefinition({
+          orgId: FdrAPI_exports.OrgId(organization),
+          apiId: FdrAPI_exports.ApiId(apiName ?? ir15.apiName.originalName),
+          definition: apiDefinition,
+          definitionV2: void 0,
+          dynamicIRs: dynamicIRsByLanguage,
+          docsUrl
+        });
+        if (response.ok) {
+          context3.logger.debug(`Registered API Definition ${apiName}: ${response.body.apiDefinitionId}`);
+          if (response.body.dynamicIRs && dynamicIRsByLanguage) {
+            if (skipUpload) {
+              context3.logger.debug("Skip-upload mode: skipping dynamic IR uploads");
             } else {
-              return context3.failAndThrow(`Failed to publish docs because API definition could not be uploaded. Please contact support@buildwithfern.com`, errorDetails);
+              await uploadDynamicIRs({
+                dynamicIRs: dynamicIRsByLanguage,
+                dynamicIRUploadUrls: response.body.dynamicIRs,
+                context: context3,
+                apiId: response.body.apiDefinitionId
+              });
+            }
+          }
+          return response.body.apiDefinitionId;
+        } else {
+          switch (response.error.error) {
+            case "UnauthorizedError":
+            case "UserNotInOrgError": {
+              return context3.failAndThrow("You do not have permissions to register the docs. Reach out to support@buildwithfern.com");
+            }
+            default: {
+              const errorDetails = extractErrorDetails(response.error);
+              context3.logger.error(`FDR registerApiDefinition failed. Error details:
+${JSON.stringify(errorDetails, void 0, 2)}`);
+              if (apiName != null) {
+                return context3.failAndThrow(`Failed to publish docs because API definition (${apiName}) could not be uploaded. Please contact support@buildwithfern.com`, errorDetails);
+              } else {
+                return context3.failAndThrow(`Failed to publish docs because API definition could not be uploaded. Please contact support@buildwithfern.com`, errorDetails);
+              }
             }
           }
         }
-      }
-    },
-    targetAudiences
-  });
-  context3.logger.info("Resolving docs definition...");
-  const resolveStart = performance.now();
-  let docsDefinition = await resolver2.resolve();
-  const resolveTime = performance.now() - resolveStart;
-  if (docsWorkspace.config.settings?.substituteEnvVars) {
-    context3.logger.debug("Applying environment variable substitution to docs definition...");
-    const { jsFiles, ...docsWithoutJsFiles } = docsDefinition;
-    const substitutedDocs = replaceEnvVariables(docsWithoutJsFiles, { onError: (e6) => context3.failAndThrow(e6) }, { substituteAsEmpty: false });
-    docsDefinition = { ...substitutedDocs, jsFiles };
-  }
-  const pageCount = Object.keys(docsDefinition.pages).length;
-  const apiWorkspaceCount = apiWorkspaces.length;
-  const resolveMemory = process.memoryUsage();
-  context3.logger.info(`Resolved docs definition in ${resolveTime.toFixed(0)}ms: ${pageCount} pages${apiWorkspaceCount ? `, ${apiWorkspaceCount} API workspaces` : ""}`);
-  context3.logger.debug(`Memory after resolve: RSS=${(resolveMemory.rss / 1024 / 1024).toFixed(2)}MB, Heap=${(resolveMemory.heapUsed / 1024 / 1024).toFixed(2)}MB`);
-  if (docsRegistrationId == null) {
-    return context3.failAndThrow("Failed to publish docs.", "Docs registration ID is missing.");
-  }
-  context3.logger.info("Publishing docs to FDR...");
-  const publishStart = performance.now();
-  const registerDocsResponse = await fdr.docs.v2.write.finishDocsRegister(DocsV1Write_exports.DocsRegistrationId(docsRegistrationId), {
-    docsDefinition,
-    excludeApis,
-    ...isBasepathAware && !preview && { basepathAware: true }
-  });
-  if (registerDocsResponse.ok) {
-    const publishTime = performance.now() - publishStart;
-    context3.logger.debug(`Docs published to FDR in ${publishTime.toFixed(0)}ms`);
-    const url3 = wrapWithHttps(urlToOutput);
-    await updateAiChatFromDocsDefinition({
-      docsDefinition,
-      isPreview: preview,
-      context: context3
+      },
+      targetAudiences
     });
-    const link3 = terminalLink(url3, url3);
-    context3.logger.info(source_default.green(`Published docs to ${link3}`));
-    return url3;
-  } else {
-    switch (registerDocsResponse.error.error) {
-      case "UnauthorizedError":
-      case "UserNotInOrgError":
-        return context3.failAndThrow("Insufficient permissions. Failed to publish docs to " + domain3);
-      case "DocsRegistrationIdNotFound":
-        return context3.failAndThrow("Failed to publish docs to " + domain3, `Docs registration ID ${docsRegistrationId} does not exist.`);
-      case "LibraryDocsJobInvalidForRegistrationError":
-        return context3.failAndThrow("Failed to publish docs to " + domain3, "Library docs job is invalid for registration. The job may not exist, may not be completed, or may belong to a different organization.");
-      default:
-        return context3.failAndThrow("Failed to publish docs to " + domain3, registerDocsResponse.error);
+    context3.logger.info("Resolving docs definition...");
+    const resolveStart = performance.now();
+    let docsDefinition = await resolver2.resolve();
+    const resolveTime = performance.now() - resolveStart;
+    if (docsWorkspace.config.settings?.substituteEnvVars) {
+      context3.logger.debug("Applying environment variable substitution to docs definition...");
+      const { jsFiles, ...docsWithoutJsFiles } = docsDefinition;
+      const substitutedDocs = replaceEnvVariables(docsWithoutJsFiles, { onError: (e6) => context3.failAndThrow(e6) }, { substituteAsEmpty: false });
+      docsDefinition = { ...substitutedDocs, jsFiles };
     }
+    const pageCount = Object.keys(docsDefinition.pages).length;
+    const apiWorkspaceCount = apiWorkspaces.length;
+    const resolveMemory = process.memoryUsage();
+    context3.logger.info(`Resolved docs definition in ${resolveTime.toFixed(0)}ms: ${pageCount} pages${apiWorkspaceCount ? `, ${apiWorkspaceCount} API workspaces` : ""}`);
+    context3.logger.debug(`Memory after resolve: RSS=${(resolveMemory.rss / 1024 / 1024).toFixed(2)}MB, Heap=${(resolveMemory.heapUsed / 1024 / 1024).toFixed(2)}MB`);
+    if (docsRegistrationId == null) {
+      doUnlock();
+      return context3.failAndThrow("Failed to publish docs.", "Docs registration ID is missing.");
+    }
+    context3.logger.info("Publishing docs to FDR...");
+    const publishStart = performance.now();
+    const registerDocsResponse = await fdr.docs.v2.write.finishDocsRegister(DocsV1Write_exports.DocsRegistrationId(docsRegistrationId), {
+      docsDefinition,
+      excludeApis,
+      ...isBasepathAware && !preview && { basepathAware: true }
+    });
+    if (registerDocsResponse.ok) {
+      const publishTime = performance.now() - publishStart;
+      context3.logger.debug(`Docs published to FDR in ${publishTime.toFixed(0)}ms`);
+      const url3 = wrapWithHttps(urlToOutput);
+      await updateAiChatFromDocsDefinition({
+        docsDefinition,
+        isPreview: preview,
+        context: context3
+      });
+      const link3 = terminalLink(url3, url3);
+      context3.logger.info(source_default.green(`Published docs to ${link3}`));
+      return url3;
+    } else {
+      switch (registerDocsResponse.error.error) {
+        case "UnauthorizedError":
+        case "UserNotInOrgError":
+          return context3.failAndThrow("Insufficient permissions. Failed to publish docs to " + domain3);
+        case "DocsRegistrationIdNotFound":
+          return context3.failAndThrow("Failed to publish docs to " + domain3, `Docs registration ID ${docsRegistrationId} does not exist.`);
+        case "LibraryDocsJobInvalidForRegistrationError":
+          return context3.failAndThrow("Failed to publish docs to " + domain3, "Library docs job is invalid for registration. The job may not exist, may not be completed, or may belong to a different organization.");
+        default:
+          return context3.failAndThrow("Failed to publish docs to " + domain3, registerDocsResponse.error);
+      }
+    }
+  } catch (error50) {
+    doUnlock();
+    throw error50;
+  } finally {
+    deployLocked = false;
+    process.removeListener("SIGINT", onSignal);
+    process.removeListener("SIGTERM", onSignal);
   }
 }
 async function uploadFiles(filesToUpload, docsWorkspacePath, context3, batchSize, sanitizedToAbsoluteMap) {
@@ -836825,7 +836860,7 @@ var LegacyDocsPublisher = class {
         previewId: void 0,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.47.0-8-ga7152010378"
+        cliVersion: "4.48.0"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
         return { success: false };
@@ -877838,6 +877873,8 @@ var DynamicTypeLiteralMapper5 = class {
         extendsInfo
       });
     }
+    const hasAdditionalProperties = objectType2.additionalProperties === true;
+    const useDefault = hasAdditionalProperties || this.context.canObjectTypeUseDefault(objectType2);
     const structFields = [];
     for (const property22 of objectType2.properties) {
       this.context.scopeError(property22.name.wireValue);
@@ -877865,7 +877902,11 @@ var DynamicTypeLiteralMapper5 = class {
           if (!hasValue) {
             const isOptional = this.context.isNullable(property22.typeReference);
             if (isOptional) {
-              propertyValue = rust_exports.Expression.none();
+              if (useDefault) {
+                propertyValue = void 0;
+              } else {
+                propertyValue = rust_exports.Expression.none();
+              }
             } else {
               this.context.addScopedError(`Required field '${wireValue}' is missing`, Severity.Critical);
               propertyValue = rust_exports.Expression.raw("Default::default()");
@@ -877877,15 +877918,17 @@ var DynamicTypeLiteralMapper5 = class {
             });
           }
         }
-        structFields.push({
-          name: propertyName,
-          value: propertyValue
-        });
+        if (propertyValue !== void 0) {
+          structFields.push({
+            name: propertyName,
+            value: propertyValue
+          });
+        }
       } finally {
         this.context.unscopeError();
       }
     }
-    return rust_exports.Expression.structConstruction(structName, structFields);
+    return rust_exports.Expression.structConstruction(structName, structFields, useDefault);
   }
   // Check if object extends another object (for flattening)
   getObjectExtensionInfo(objectType2) {
@@ -877924,31 +877967,40 @@ var DynamicTypeLiteralMapper5 = class {
   // Convert object that extends another object (handles flattening)
   convertExtendedObject({ objectType: objectType2, value, structName, extendsInfo }) {
     const structFields = [];
-    const baseStructFields = extendsInfo.baseObjectType.properties.map((property22) => {
+    const baseHasAdditionalProperties = extendsInfo.baseObjectType.additionalProperties === true;
+    const baseUseDefault = baseHasAdditionalProperties || this.context.canObjectTypeUseDefault(extendsInfo.baseObjectType);
+    const baseStructFields = [];
+    for (const property22 of extendsInfo.baseObjectType.properties) {
       this.context.scopeError(property22.name.wireValue);
       try {
         const propertyValue = value[property22.name.wireValue];
-        let fieldValue;
         if (propertyValue !== void 0) {
-          fieldValue = this.convert({
-            typeReference: property22.typeReference,
-            value: propertyValue
+          baseStructFields.push({
+            name: this.context.getPropertyName(property22.name.name),
+            value: this.convert({
+              typeReference: property22.typeReference,
+              value: propertyValue
+            })
           });
         } else if (property22.typeReference.type === "optional" || property22.typeReference.type === "nullable") {
-          fieldValue = rust_exports.Expression.raw("None");
+          if (!baseUseDefault) {
+            baseStructFields.push({
+              name: this.context.getPropertyName(property22.name.name),
+              value: rust_exports.Expression.raw("None")
+            });
+          }
         } else {
-          fieldValue = rust_exports.Expression.raw("Default::default()");
+          baseStructFields.push({
+            name: this.context.getPropertyName(property22.name.name),
+            value: rust_exports.Expression.raw("Default::default()")
+          });
         }
-        return {
-          name: this.context.getPropertyName(property22.name.name),
-          value: fieldValue
-        };
       } finally {
         this.context.unscopeError();
       }
-    });
+    }
     const baseStructName = this.context.getStructName(extendsInfo.baseObjectType.declaration.name);
-    const baseStruct = rust_exports.Expression.structConstruction(baseStructName, baseStructFields);
+    const baseStruct = rust_exports.Expression.structConstruction(baseStructName, baseStructFields, baseUseDefault);
     structFields.push({
       name: extendsInfo.baseFieldName,
       value: baseStruct
@@ -877972,7 +878024,9 @@ var DynamicTypeLiteralMapper5 = class {
         this.context.unscopeError();
       }
     });
-    return rust_exports.Expression.structConstruction(structName, structFields);
+    const outerHasAdditionalProperties = objectType2.additionalProperties === true;
+    const outerUseDefault = outerHasAdditionalProperties || this.context.canObjectTypeUseDefault(objectType2);
+    return rust_exports.Expression.structConstruction(structName, structFields, outerUseDefault);
   }
   // Generate the field name for the flattened base object
   getBaseFieldName(baseName) {
@@ -878053,6 +878107,10 @@ var DynamicTypeLiteralMapper5 = class {
           this.context.addScopedError("Referenced union type not found or not an object", Severity.Critical);
           return rust_exports.Expression.reference(`${unionName}::${variantName}`);
         }
+        if (referencedType.properties.length === 0) {
+          const methodName = this.context.getPropertyName(unionVariant.discriminantValue.name);
+          return rust_exports.Expression.raw(`${unionName}::${methodName}()`);
+        }
         const convertedObject = this.convertObjectType({
           objectType: referencedType,
           value: discriminatedUnionTypeInstance.value
@@ -878797,6 +878855,69 @@ var DynamicSnippetsGeneratorContext7 = class _DynamicSnippetsGeneratorContext ex
     }
     return this.allParametersAreOptional(allProperties);
   }
+  /**
+   * Check if a dynamic IR object type will have Default derived by the model generator.
+   * Mirrors the logic in StructGenerator.canDeriveDefault():
+   * - All property types must support Default
+   * - Extended types must support Default
+   */
+  canObjectTypeUseDefault(objectType2) {
+    const extendsProperty = objectType2.extends;
+    if (extendsProperty != null && extendsProperty.length > 0) {
+      for (const baseTypeId of extendsProperty) {
+        const baseType = this.ir.types[baseTypeId];
+        if (!baseType || baseType.type !== "object" || !this.canObjectTypeUseDefault(baseType)) {
+          return false;
+        }
+      }
+    }
+    return objectType2.properties.every((prop) => this.typeSupportsDefault(prop.typeReference));
+  }
+  /**
+   * Check if a type reference maps to a Rust type that implements Default.
+   * Mirrors the model generator's typeSupportsDefault logic.
+   */
+  typeSupportsDefault(typeRef, visited = /* @__PURE__ */ new Set()) {
+    switch (typeRef.type) {
+      case "primitive":
+        return true;
+      // All Rust primitives implement Default
+      case "optional":
+      case "nullable":
+        return true;
+      // Option<T> defaults to None
+      case "list":
+      case "map":
+      case "set":
+        return true;
+      // Vec, HashMap, HashSet all implement Default
+      case "unknown":
+        return true;
+      // serde_json::Value implements Default
+      case "literal":
+        return false;
+      case "named": {
+        const typeId = typeRef.value;
+        if (visited.has(typeId)) {
+          return false;
+        }
+        visited.add(typeId);
+        const namedType = this.ir.types[typeId];
+        if (!namedType) {
+          return false;
+        }
+        if (namedType.type === "object") {
+          return this.canObjectTypeUseDefault(namedType);
+        }
+        if (namedType.type === "alias") {
+          return this.typeSupportsDefault(namedType.typeReference, visited);
+        }
+        return false;
+      }
+      default:
+        return false;
+    }
+  }
 };
 
 // ../../../generators/rust/dynamic-snippets/lib/EndpointSnippetGenerator.js
@@ -879340,24 +879461,27 @@ var EndpointSnippetGenerator8 = class {
     }
     this.context.errors.unscope();
     const structName = this.getCorrectRequestStructName(endpoint3, request7);
-    const useDefault = false;
+    const useDefault = this.context.canRequestUseDefault(request7);
     this.addMissingFields({
       request: request7,
       structFields,
-      providedFieldNames
+      providedFieldNames,
+      useDefault
     });
     return this.createStructExpression(structName, structFields, useDefault);
   }
-  addMissingFields({ request: request7, structFields, providedFieldNames }) {
+  addMissingFields({ request: request7, structFields, providedFieldNames, useDefault }) {
     const allQueryParams = request7.queryParameters ?? [];
     for (const param of allQueryParams) {
       const fieldName = this.context.getPropertyName(param.name.name);
       if (!providedFieldNames.has(fieldName)) {
         if (this.context.isOptionalType(param.typeReference)) {
-          structFields.push({
-            name: fieldName,
-            value: rust_exports.Expression.raw("None")
-          });
+          if (!useDefault) {
+            structFields.push({
+              name: fieldName,
+              value: rust_exports.Expression.raw("None")
+            });
+          }
         } else {
           structFields.push({
             name: fieldName,
@@ -879371,10 +879495,12 @@ var EndpointSnippetGenerator8 = class {
         const fieldName = this.context.getPropertyName(param.name.name);
         if (!providedFieldNames.has(fieldName)) {
           if (this.context.isOptionalType(param.typeReference)) {
-            structFields.push({
-              name: fieldName,
-              value: rust_exports.Expression.raw("None")
-            });
+            if (!useDefault) {
+              structFields.push({
+                name: fieldName,
+                value: rust_exports.Expression.raw("None")
+              });
+            }
           } else {
             structFields.push({
               name: fieldName,
@@ -909849,7 +909975,7 @@ var CliContext = class {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.47.0-8-ga7152010378";
+    return "4.48.0";
   }
   getCliName() {
     if (false) {

package/package.json

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