@fern-api/fern-api-dev 5.68.0 → 5.69.0

package/cli.cjs

@@ -83938,10 +83938,16 @@ function parseIdempotencyKeyMethods(value2) {
   return methods.length > 0 ? methods : DEFAULT_IDEMPOTENCY_KEY_METHODS;
 }
 function getIdempotencyKeyGenerationFromGeneratorConfig(generatorInvocation) {
+  const value2 = generatorInvocation.idempotencyKeyGenerationConfig ?? getRawPerGeneratorIdempotencyKeyConfig(generatorInvocation);
+  return resolveIdempotencyKeyGeneration(value2);
+}
+function getRawPerGeneratorIdempotencyKeyConfig(generatorInvocation) {
   if (typeof generatorInvocation.raw?.config !== "object" || generatorInvocation.raw?.config === null) {
     return void 0;
   }
-  const value2 = generatorInvocation.raw.config["auto-generate-idempotency-key"];
+  return generatorInvocation.raw.config["auto-generate-idempotency-key"];
+}
+function resolveIdempotencyKeyGeneration(value2) {
   if (value2 === true) {
     return { headerName: DEFAULT_IDEMPOTENCY_KEY_HEADER, methods: DEFAULT_IDEMPOTENCY_KEY_METHODS };
   }
@@ -129759,7 +129765,9 @@ var init_ApiConfigurationV2SettingsSchema2 = __esm({
     init_core6();
     init_AsyncApiSettingsSchema2();
     init_OpenApiSettingsSchema2();
-    ApiConfigurationV2SettingsSchema = schemas_exports8.object({}).extend(OpenApiSettingsSchema).extend(AsyncApiSettingsSchema);
+    ApiConfigurationV2SettingsSchema = schemas_exports8.object({
+      "auto-generate-idempotency-key": schemas_exports8.unknown().optional()
+    }).extend(OpenApiSettingsSchema).extend(AsyncApiSettingsSchema);
   }
 });
 
@@ -259646,6 +259654,8 @@ async function convertGeneratorsConfiguration({ absolutePathToGeneratorsConfigur
   const readme = rawGeneratorsConfiguration.readme;
   warnForDeprecatedConfiguration(context3, rawGeneratorsConfiguration);
   const parsedApiConfiguration = await parseAPIConfiguration(rawGeneratorsConfiguration);
+  const apiConfiguration = rawGeneratorsConfiguration.api;
+  const globalIdempotencyKeyGeneration = apiConfiguration != null && generators_yml_exports.isApiConfigurationV2Schema(apiConfiguration) ? apiConfiguration.settings?.["auto-generate-idempotency-key"] : void 0;
   return {
     absolutePathToConfiguration: absolutePathToGeneratorsConfiguration,
     api: parsedApiConfiguration,
@@ -259660,6 +259670,7 @@ async function convertGeneratorsConfiguration({ absolutePathToGeneratorsConfigur
       maybeTopLevelMetadata,
       maybeTopLevelReviewers: rawGeneratorsConfiguration.reviewers,
       maybeRootAutomation: rawGeneratorsConfiguration.automation,
+      globalIdempotencyKeyGeneration,
       readme,
       context: context3
     }))) : [],
@@ -260044,7 +260055,7 @@ async function parseAPIConfiguration(rawGeneratorsConfiguration) {
     definitions: await parseAPIConfigurationToApiLocations(apiConfiguration, rawGeneratorsConfiguration, emptySettings)
   };
 }
-async function convertGroup({ absolutePathToGeneratorsConfiguration, groupName, group, maybeTopLevelMetadata, maybeTopLevelReviewers, maybeRootAutomation, readme, context: context3 }) {
+async function convertGroup({ absolutePathToGeneratorsConfiguration, groupName, group, maybeTopLevelMetadata, maybeTopLevelReviewers, maybeRootAutomation, globalIdempotencyKeyGeneration, readme, context: context3 }) {
   const maybeGroupLevelMetadata = getOutputMetadata(group.metadata);
   return {
     groupName,
@@ -260059,6 +260070,7 @@ async function convertGroup({ absolutePathToGeneratorsConfiguration, groupName,
       maybeGroupLevelReviewers: group.reviewers,
       maybeRootAutomation,
       maybeGroupAutomation: group.automation,
+      globalIdempotencyKeyGeneration,
       readme,
       context: context3
     })))
@@ -260080,10 +260092,12 @@ function getGeneratorNameAndImage(generator, context3) {
     containerImage: void 0
   };
 }
-async function convertGenerator({ absolutePathToGeneratorsConfiguration, generator, maybeGroupLevelMetadata, maybeTopLevelMetadata, maybeGroupLevelReviewers, maybeTopLevelReviewers, maybeRootAutomation, maybeGroupAutomation, readme, context: context3 }) {
+async function convertGenerator({ absolutePathToGeneratorsConfiguration, generator, maybeGroupLevelMetadata, maybeTopLevelMetadata, maybeGroupLevelReviewers, maybeTopLevelReviewers, maybeRootAutomation, maybeGroupAutomation, globalIdempotencyKeyGeneration, readme, context: context3 }) {
   const { normalizedName, containerImage } = getGeneratorNameAndImage(generator, context3);
+  const perGeneratorIdempotencyKeyGeneration = typeof generator.config === "object" && generator.config !== null ? generator.config["auto-generate-idempotency-key"] : void 0;
   return {
     raw: generator,
+    idempotencyKeyGenerationConfig: perGeneratorIdempotencyKeyGeneration ?? globalIdempotencyKeyGeneration,
     automation: generators_yml_exports.resolveAutomationConfig({
       rootAutomation: maybeRootAutomation,
       groupAutomation: maybeGroupAutomation,
@@ -565872,7 +565886,8 @@ var require_AutoVersionStep = __commonJS({
       }
       async handleNormalFlow(params2) {
         const { prepared, service, language, mappedMagicVersion, previousGenerationSha } = params2;
-        const rawDiff = this.gitDiff(previousGenerationSha, prepared.currentGenerationSha);
+        const diffBase = this.resolveReachableGenerationBase(previousGenerationSha, prepared.currentGenerationSha);
+        const rawDiff = diffBase != null ? this.safeGitDiff(diffBase, prepared.currentGenerationSha) : "";
         const previousVersion = await this.resolvePreviousVersion({
           service,
           rawDiff,
@@ -566269,6 +566284,91 @@ var require_AutoVersionStep = __commonJS({
           maxBuffer: 256 * 1024 * 1024
         });
       }
+      /**
+       * Resolves a reachable base commit for the autoversion diff.
+       *
+       * `recordedSha` (the previous generation from replay.lock) is preferred when it exists
+       * in this clone. When it doesn't — e.g. the signed-commit push recreated the
+       * [fern-generated] commit under a new SHA, or the branch was squash-merged — we re-anchor
+       * on the most recent reachable [fern-generated] commit in history. Returns null when no
+       * generation baseline is reachable at all, in which case the caller resolves the previous
+       * version from metadata/git-tags and still rewrites the placeholder.
+       */
+      resolveReachableGenerationBase(recordedSha, currentGenerationSha) {
+        if (this.commitExists(recordedSha)) {
+          return recordedSha;
+        }
+        this.logger.warn(`AutoVersionStep: recorded previous generation ${recordedSha.slice(0, 7)} is unreachable in this clone; deriving the baseline from history.`);
+        const derived = this.findPreviousGenerationFromHistory(currentGenerationSha);
+        if (derived != null) {
+          this.logger.info(`AutoVersionStep: re-anchored autoversion baseline on ${derived.slice(0, 7)}.`);
+          return derived;
+        }
+        this.logger.warn("AutoVersionStep: no reachable [fern-generated] baseline found; falling back to metadata/git-tags.");
+        return null;
+      }
+      commitExists(sha) {
+        if (!/^[0-9a-f]{7,40}$/.test(sha)) {
+          return false;
+        }
+        try {
+          (0, child_process_1.execFileSync)("git", ["cat-file", "-e", `${sha}^{commit}`], {
+            cwd: this.outputDir,
+            stdio: "pipe"
+          });
+          return true;
+        } catch {
+          return false;
+        }
+      }
+      /**
+       * Walks first-parent history from the current generation commit and returns the most
+       * recent prior [fern-generated] commit — the reachable equivalent of replay.lock's
+       * recorded baseline. Mirrors @fern-api/replay's `findPreviousGenerationFromHistory`.
+       */
+      findPreviousGenerationFromHistory(currentGenerationSha) {
+        const start2 = this.commitExists(currentGenerationSha) ? currentGenerationSha : "HEAD";
+        let log4;
+        try {
+          log4 = (0, child_process_1.execFileSync)("git", ["log", "--first-parent", "--format=%H%x00%s", start2], {
+            cwd: this.outputDir,
+            encoding: "utf-8",
+            stdio: "pipe",
+            maxBuffer: 64 * 1024 * 1024
+          });
+        } catch (error50) {
+          this.logger.debug(`AutoVersionStep: git log history walk failed (${String(error50)}); no baseline derived.`);
+          return null;
+        }
+        for (const line of log4.split("\n")) {
+          if (line.trim().length === 0) {
+            continue;
+          }
+          const [sha, subject = ""] = line.split("\0");
+          if (sha == null || sha === currentGenerationSha) {
+            continue;
+          }
+          if (subject.startsWith("[fern-generated]")) {
+            return sha;
+          }
+        }
+        return null;
+      }
+      /**
+       * `gitDiff` that degrades to an empty diff instead of throwing. Both endpoints are
+       * expected to be reachable (the base is resolved via resolveReachableGenerationBase and
+       * `to` is this run's freshly-created HEAD), but we never want a `git diff` failure to
+       * abort autoversion and leave the magic placeholder in the shipped SDK — the empty diff
+       * routes version resolution to baseVersion/metadata/git-tags, which still rewrites it.
+       */
+      safeGitDiff(from4, to2) {
+        try {
+          return this.gitDiff(from4, to2);
+        } catch (error50) {
+          this.logger.warn(`AutoVersionStep: git diff ${from4.slice(0, 7)}..${to2.slice(0, 7)} failed (${error50 instanceof Error ? error50.message : String(error50)}); proceeding with an empty diff.`);
+          return "";
+        }
+      }
       gitDiff(from4, to2) {
         return (0, child_process_1.execFileSync)("git", ["diff", from4, to2, "--", ".", ":(exclude).fern/metadata.json"], {
           cwd: this.outputDir,
@@ -689143,7 +689243,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.68.0",
+          version: "5.69.0",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -689209,7 +689309,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.68.0",
+        version: "5.69.0",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -834305,8 +834405,8 @@ var V67_TO_V66_MIGRATION = {
     [GeneratorName.TYPESCRIPT_SDK]: "3.70.9-rc.0",
     [GeneratorName.TYPESCRIPT_EXPRESS]: GeneratorWasNeverUpdatedToConsumeNewIR,
     [GeneratorName.JAVA]: GeneratorWasNeverUpdatedToConsumeNewIR,
-    [GeneratorName.JAVA_MODEL]: GeneratorWasNeverUpdatedToConsumeNewIR,
-    [GeneratorName.JAVA_SDK]: GeneratorWasNeverUpdatedToConsumeNewIR,
+    [GeneratorName.JAVA_MODEL]: "1.9.0-rc.1",
+    [GeneratorName.JAVA_SDK]: "4.13.3-rc.0",
     [GeneratorName.JAVA_SPRING]: GeneratorWasNeverUpdatedToConsumeNewIR,
     [GeneratorName.OPENAPI_PYTHON_CLIENT]: GeneratorWasNeverUpdatedToConsumeNewIR,
     [GeneratorName.OPENAPI]: GeneratorWasNeverUpdatedToConsumeNewIR,
@@ -834317,13 +834417,13 @@ var V67_TO_V66_MIGRATION = {
     [GeneratorName.POSTMAN]: GeneratorWasNeverUpdatedToConsumeNewIR,
     [GeneratorName.GO_MODEL]: GeneratorWasNeverUpdatedToConsumeNewIR,
     [GeneratorName.GO_SDK]: GeneratorWasNeverUpdatedToConsumeNewIR,
-    [GeneratorName.RUBY_SDK]: GeneratorWasNeverUpdatedToConsumeNewIR,
+    [GeneratorName.RUBY_SDK]: "1.16.0-rc.0",
     [GeneratorName.CSHARP_MODEL]: GeneratorWasNeverUpdatedToConsumeNewIR,
     [GeneratorName.CSHARP_SDK]: GeneratorWasNeverUpdatedToConsumeNewIR,
     [GeneratorName.SWIFT_MODEL]: GeneratorWasNeverUpdatedToConsumeNewIR,
     [GeneratorName.SWIFT_SDK]: GeneratorWasNeverUpdatedToConsumeNewIR,
     [GeneratorName.PHP_MODEL]: GeneratorWasNeverUpdatedToConsumeNewIR,
-    [GeneratorName.PHP_SDK]: GeneratorWasNeverUpdatedToConsumeNewIR,
+    [GeneratorName.PHP_SDK]: "2.11.2-rc.0",
     [GeneratorName.RUST_MODEL]: GeneratorWasNeverUpdatedToConsumeNewIR,
     [GeneratorName.RUST_SDK]: GeneratorWasNeverUpdatedToConsumeNewIR,
     [GeneratorName.CLI]: "0.0.1"
@@ -870310,7 +870410,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.68.0";
+  const version7 = "5.69.0";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -902871,7 +902971,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.68.0",
+        cliVersion: "5.69.0",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -938718,6 +938818,19 @@ var DynamicSnippetsGeneratorContext5 = class _DynamicSnippetsGeneratorContext ex
     }
     return name2.snakeCase.safeName;
   }
+  /**
+   * Module/subpackage directory name, preserving any leading/trailing underscores
+   * from the original name that the casing functions would otherwise strip. This
+   * keeps snippet accessors and module paths consistent with the generated module
+   * directories (e.g. a group named `_agents` yields `client._agents`). It is scoped
+   * to namespace/module names and intentionally not applied to property or method names.
+   */
+  getModuleName(name2) {
+    const leading = name2.originalName.match(/^(_+)/)?.[1] ?? "";
+    const core2 = name2.originalName.slice(leading.length);
+    const trailing = core2.match(/(_+)$/)?.[1] ?? "";
+    return `${leading}${name2.snakeCase.safeName}${trailing}`;
+  }
   getRootClientClassReference() {
     return python_exports.reference({
       name: this.getRootClientClassName(),
@@ -938728,7 +938841,7 @@ var DynamicSnippetsGeneratorContext5 = class _DynamicSnippetsGeneratorContext ex
     const className = this.getClassName(declaration.name);
     const modulePath = [
       ...this.getRootModulePath(),
-      ...declaration.fernFilepath.allParts.map((part) => part.snakeCase.safeName)
+      ...declaration.fernFilepath.allParts.map((part) => this.getModuleName(part))
     ];
     return python_exports.reference({ name: className, modulePath });
   }
@@ -938737,7 +938850,7 @@ var DynamicSnippetsGeneratorContext5 = class _DynamicSnippetsGeneratorContext ex
     const variantName = discriminantValue.name.pascalCase.safeName;
     const modulePath = [
       ...this.getRootModulePath(),
-      ...unionDeclaration.fernFilepath.allParts.map((part) => part.snakeCase.safeName)
+      ...unionDeclaration.fernFilepath.allParts.map((part) => this.getModuleName(part))
     ];
     const name2 = this.customConfig.pydantic_config?.union_naming === "v1" ? `${variantName}${unionClassName}` : `${unionClassName}_${variantName}`;
     return python_exports.reference({ name: name2, modulePath });
@@ -939543,7 +939656,7 @@ var EndpointSnippetGenerator5 = class {
   }
   getMethod({ endpoint: endpoint3 }) {
     if (endpoint3.declaration.fernFilepath.allParts.length > 0) {
-      return `${endpoint3.declaration.fernFilepath.allParts.map((val) => this.context.getMethodName(val)).join(".")}.${this.context.getMethodName(endpoint3.declaration.name)}`;
+      return `${endpoint3.declaration.fernFilepath.allParts.map((val) => this.context.getModuleName(val)).join(".")}.${this.context.getMethodName(endpoint3.declaration.name)}`;
     }
     return this.context.getMethodName(endpoint3.declaration.name);
   }
@@ -969219,7 +969332,7 @@ function getAutomationContextFromEnv() {
     config_branch: process.env.FERN_CONFIG_BRANCH,
     config_pr_number: process.env.FERN_CONFIG_PR_NUMBER,
     trigger: process.env.GITHUB_EVENT_NAME,
-    cli_version: "5.68.0"
+    cli_version: "5.69.0"
   };
 }
 function isAutomationMode() {
@@ -970051,7 +970164,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.68.0";
+    return "5.69.0";
   }
   getCliName() {
     if (false) {

package/package.json

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