@fern-api/generator-cli 0.9.14 → 0.9.16

package/dist/cli.js

@@ -35152,21 +35152,23 @@ function stringifyValidationError(error) {
 }
 
 // src/configuration/sdk/core/schemas/builders/schema-utils/JsonError.ts
-var JsonError = class _JsonError extends Error {
+var JsonError = class extends Error {
   constructor(errors) {
     super(errors.map(stringifyValidationError).join("; "));
     this.errors = errors;
-    Object.setPrototypeOf(this, _JsonError.prototype);
+    Object.setPrototypeOf(this, new.target.prototype);
+    this.name = this.constructor.name;
   }
   errors;
 };
 
 // src/configuration/sdk/core/schemas/builders/schema-utils/ParseError.ts
-var ParseError = class _ParseError extends Error {
+var ParseError = class extends Error {
   constructor(errors) {
     super(errors.map(stringifyValidationError).join("; "));
     this.errors = errors;
-    Object.setPrototypeOf(this, _ParseError.prototype);
+    Object.setPrototypeOf(this, new.target.prototype);
+    this.name = this.constructor.name;
   }
   errors;
 };
@@ -39176,14 +39178,22 @@ var AutoVersionStep = class extends BaseStep {
   async handleNormalFlow(params) {
     const { prepared, service, language, mappedMagicVersion, previousGenerationSha } = params;
     const rawDiff = this.gitDiff(previousGenerationSha, prepared.currentGenerationSha);
-    if (rawDiff.trim().length === 0) {
-      this.logger.info("AutoVersionStep: empty diff between generations; skipping autoversion.");
-      return { executed: true, success: true };
-    }
     const previousVersion = await this.resolvePreviousVersion({ service, rawDiff, mappedMagicVersion });
     if (previousVersion == null) {
       return await this.handleFirstGeneration({ service, language, mappedMagicVersion });
     }
+    if (rawDiff.trim().length === 0) {
+      this.logger.info(
+        `AutoVersionStep: empty diff between generations; rewriting placeholder to ${previousVersion}.`
+      );
+      return await this.finalizeNoChange({
+        service,
+        language,
+        mappedMagicVersion,
+        previousVersion,
+        reason: "no diff between generations"
+      });
+    }
     const cleanedDiff = service.cleanDiffForAI(rawDiff, mappedMagicVersion);
     const rawBytes = Buffer.byteLength(rawDiff, "utf-8");
     const cleanedBytes = Buffer.byteLength(cleanedDiff, "utf-8");
@@ -39191,8 +39201,16 @@ var AutoVersionStep = class extends BaseStep {
       `AutoVersionStep: raw=${formatSizeKB(rawBytes)}KB (${countFilesInDiff(rawDiff)} files), cleaned=${formatSizeKB(cleanedBytes)}KB (${countFilesInDiff(cleanedDiff)} files)`
     );
     if (cleanedDiff.trim().length === 0) {
-      this.logger.info("AutoVersionStep: cleaned diff is empty; no semantic changes.");
-      return { executed: true, success: true };
+      this.logger.info(
+        `AutoVersionStep: cleaned diff is empty; no semantic changes \u2014 rewriting placeholder to ${previousVersion}.`
+      );
+      return await this.finalizeNoChange({
+        service,
+        language,
+        mappedMagicVersion,
+        previousVersion,
+        reason: "no semantic changes"
+      });
     }
     if (cleanedBytes > MAX_RAW_DIFF_BYTES) {
       this.logger.warn(
@@ -39222,13 +39240,14 @@ var AutoVersionStep = class extends BaseStep {
       analysis = { versionBump: "PATCH", message: this.brandMessage("SDK regeneration") };
     }
     if (analysis == null) {
-      this.logger.info("AutoVersionStep: FAI returned NO_CHANGE; skipping autoversion commit.");
-      return {
-        executed: true,
-        success: true,
+      this.logger.info(`AutoVersionStep: FAI returned NO_CHANGE; rewriting placeholder to ${previousVersion}.`);
+      return await this.finalizeNoChange({
+        service,
+        language,
+        mappedMagicVersion,
         previousVersion,
-        versionBump: "NO_CHANGE"
-      };
+        reason: "FAI returned NO_CHANGE"
+      });
     }
     return await this.finalizeWithBump({
       service,
@@ -39238,6 +39257,38 @@ var AutoVersionStep = class extends BaseStep {
       analysis
     });
   }
+  /**
+   * Terminal path for runs that determine no semver bump is needed. The
+   * current working tree still contains `0.0.0-fern-placeholder` from this
+   * run's generator output, so we must rewrite it to `previousVersion`
+   * before exiting — otherwise the SDK ships with the placeholder embedded
+   * in manifests (package.json, pyproject.toml, .fern/metadata.json) and
+   * user-agent strings (e.g. `X-Fern-SDK-Version`). Commits the rewrite as
+   * `[fern-autoversion]` so the replay + github steps see a stable base.
+   */
+  async finalizeNoChange(params) {
+    const { service, language, mappedMagicVersion, previousVersion, reason } = params;
+    if (!isValidSemver(previousVersion)) {
+      const errorMessage = `AutoVersionStep: resolved previousVersion ${JSON.stringify(previousVersion)} is not a valid semver string. Refusing to rewrite placeholder to avoid shell injection.`;
+      this.logger.error(errorMessage);
+      return { executed: true, success: false, errorMessage };
+    }
+    await service.replaceMagicVersion(this.outputDir, mappedMagicVersion, previousVersion);
+    if (language === "go") {
+      await service.addGoMajorVersionSuffix(this.outputDir, previousVersion);
+    }
+    const commitMessage = this.brandMessage(`SDK regeneration (no semver change: ${reason})`);
+    const commitSha = this.commitAutoversion(commitMessage);
+    return {
+      executed: true,
+      success: true,
+      version: previousVersion,
+      previousVersion,
+      versionBump: "NO_CHANGE",
+      commitMessage,
+      commitSha
+    };
+  }
   async finalizeWithBump(params) {
     const { service, language, mappedMagicVersion, previousVersion, analysis } = params;
     const newVersion = incrementVersion(previousVersion, analysis.versionBump);
@@ -40159,8 +40210,10 @@ var GithubStep = class extends BaseStep {
   name = "github";
   async execute(context) {
     const replayResult = context.previousStepResults.replay;
+    const autoVersionResult = context.previousStepResults.autoVersion;
     const skipCommit = this.config.skipCommit ?? this.deriveSkipCommit(replayResult);
     const replayConflictInfo = this.config.replayConflictInfo ?? this.deriveReplayConflictInfo(replayResult);
+    const resolvedPrFields = this.resolvePrFields(autoVersionResult);
     try {
       this.logger.debug("Starting GitHub self-hosted flow in directory: " + this.outputDir);
       const repository = ClonedRepository.createAtPath(this.outputDir);
@@ -40179,10 +40232,11 @@ var GithubStep = class extends BaseStep {
             newPrBranch,
             skipCommit,
             replayConflictInfo,
-            replayResult
+            replayResult,
+            resolvedPrFields
           );
         case "push":
-          return await this.executePushMode(repository);
+          return await this.executePushMode(repository, resolvedPrFields);
         default: {
           const exhaustive = mode;
           throw new Error(`Unexpected GitHub mode: ${String(exhaustive)}`);
@@ -40198,7 +40252,7 @@ var GithubStep = class extends BaseStep {
       };
     }
   }
-  async executePullRequestMode(repository, newPrBranch, skipCommit, replayConflictInfo, replayResult) {
+  async executePullRequestMode(repository, newPrBranch, skipCommit, replayConflictInfo, replayResult, resolved) {
     const baseBranch = this.config.branch ?? await repository.getDefaultBranch();
     const octokit = new Octokit2({ auth: this.config.token });
     const { owner, repo } = parseRepository(this.config.uri);
@@ -40232,7 +40286,7 @@ var GithubStep = class extends BaseStep {
           generationBaseSha = await createReplayBranch(
             repository,
             prBranch,
-            this.config.commitMessage,
+            resolved.commitMessage,
             replayConflictInfo,
             this.logger
           );
@@ -40254,8 +40308,7 @@ var GithubStep = class extends BaseStep {
     if (!skipCommit) {
       await this.ensureFernignore();
       this.logger.debug("Committing changes...");
-      const finalCommitMessage2 = this.config.commitMessage ?? "SDK Generation";
-      await repository.commitAllChanges(finalCommitMessage2);
+      await repository.commitAllChanges(resolved.commitMessage);
       this.logger.debug(`Committed changes to local copy of GitHub repository at ${this.outputDir}`);
     }
     if (shouldCheckNoDiff(this.config)) {
@@ -40295,22 +40348,21 @@ var GithubStep = class extends BaseStep {
         }
       }
     }
-    const finalCommitMessage = this.config.commitMessage ?? "SDK Generation";
     const headSha = await repository.getHeadSha();
-    const changelogUrl = this.config.changelogEntry ? `https://github.com/${this.config.uri}/blob/${headSha}/changelog.md` : void 0;
+    const changelogUrl = resolved.changelogEntry ? `https://github.com/${this.config.uri}/blob/${headSha}/changelog.md` : void 0;
     const { prTitle, prBody } = parseCommitMessageForPR(
-      finalCommitMessage,
-      this.config.changelogEntry,
-      this.config.prDescription,
-      this.config.versionBumpReason,
-      this.config.previousVersion,
-      this.config.newVersion,
-      this.config.versionBump,
+      resolved.commitMessage,
+      resolved.changelogEntry,
+      resolved.prDescription,
+      resolved.versionBumpReason,
+      resolved.previousVersion,
+      resolved.newVersion,
+      resolved.versionBump,
       changelogUrl
     );
     const replaySection = formatReplayPrBody(replayResult, { branchName: prBranch, repoUri: this.config.uri });
     let enrichedBody = replaySection != null ? prBody + "\n\n---\n\n" + replaySection : prBody;
-    enrichedBody = enrichPrBodyForAutomation(enrichedBody, this.config);
+    enrichedBody = enrichPrBodyForAutomation(enrichedBody, this.config, resolved);
     if (isUpdatingExistingPR && existingPR != null) {
       this.logger.info(`Updated existing pull request: ${existingPR.htmlUrl}`);
       result.prUrl = existingPR.htmlUrl;
@@ -40341,7 +40393,7 @@ var GithubStep = class extends BaseStep {
         this.logger.info(`Created pull request: ${pullRequest.html_url}`);
         result.prUrl = pullRequest.html_url;
         result.prNumber = pullRequest.number;
-        if (shouldEnableAutomerge(this.config) && pullRequest.node_id) {
+        if (shouldEnableAutomerge(this.config, resolved) && pullRequest.node_id) {
           try {
             await octokit.graphql(
               `mutation($pullRequestId: ID!) {
@@ -40369,7 +40421,7 @@ var GithubStep = class extends BaseStep {
     }
     return result;
   }
-  async executePushMode(repository) {
+  async executePushMode(repository, resolved) {
     const baseBranch = this.config.branch ?? await repository.getDefaultBranch();
     if (this.config.branch != null) {
       this.logger.debug(`Checking out branch ${this.config.branch}`);
@@ -40377,8 +40429,7 @@ var GithubStep = class extends BaseStep {
     }
     await this.ensureFernignore();
     this.logger.debug("Committing changes...");
-    const finalCommitMessage = this.config.commitMessage ?? "SDK Generation";
-    await repository.commitAllChanges(finalCommitMessage);
+    await repository.commitAllChanges(resolved.commitMessage);
     this.logger.debug(`Committed changes to local copy of GitHub repository at ${this.outputDir}`);
     if (shouldCheckNoDiff(this.config)) {
       const noDiff = await repository.treeHashEquals(`origin/${baseBranch}`);
@@ -40441,14 +40492,33 @@ var GithubStep = class extends BaseStep {
     }
     return void 0;
   }
+  resolvePrFields(autoVersion) {
+    return resolvePrFields(this.config, autoVersion);
+  }
 };
-function enrichPrBodyForAutomation(body, config) {
+function resolvePrFields(config, autoVersion) {
+  const autoVersionBreaking = autoVersion?.versionBump === "MAJOR";
+  return {
+    commitMessage: config.commitMessage ?? autoVersion?.commitMessage ?? "SDK Generation",
+    changelogEntry: config.changelogEntry ?? autoVersion?.changelogEntry,
+    prDescription: config.prDescription ?? autoVersion?.prDescription,
+    versionBumpReason: config.versionBumpReason ?? autoVersion?.versionBumpReason,
+    previousVersion: config.previousVersion ?? autoVersion?.previousVersion,
+    newVersion: config.newVersion ?? autoVersion?.version,
+    versionBump: config.versionBump ?? autoVersion?.versionBump,
+    hasBreakingChanges: config.hasBreakingChanges ?? autoVersionBreaking,
+    breakingChangesSummary: config.breakingChangesSummary ?? autoVersion?.prDescription
+  };
+}
+function enrichPrBodyForAutomation(body, config, breaking = {}) {
   if (!config.automationMode) {
     return body;
   }
+  const hasBreakingChanges = breaking.hasBreakingChanges ?? config.hasBreakingChanges;
+  const breakingChangesSummary = breaking.breakingChangesSummary ?? config.breakingChangesSummary;
   let result = body;
-  if (config.hasBreakingChanges && config.breakingChangesSummary) {
-    result += "\n\n---\n\n## \u26A0\uFE0F Breaking Changes\n\nThis release contains breaking changes that require manual review:\n\n" + config.breakingChangesSummary;
+  if (hasBreakingChanges && breakingChangesSummary) {
+    result += "\n\n---\n\n## \u26A0\uFE0F Breaking Changes\n\nThis release contains breaking changes that require manual review:\n\n" + breakingChangesSummary;
   }
   if (config.runId) {
     result += `
@@ -40459,8 +40529,9 @@ _Fern Run ID: \`${config.runId}\`_`;
   }
   return result;
 }
-function shouldEnableAutomerge(config) {
-  return config.automationMode === true && config.autoMerge === true && config.hasBreakingChanges !== true;
+function shouldEnableAutomerge(config, breaking = {}) {
+  const hasBreakingChanges = breaking.hasBreakingChanges ?? config.hasBreakingChanges;
+  return config.automationMode === true && config.autoMerge === true && hasBreakingChanges !== true;
 }
 function shouldCheckNoDiff(config) {
   return config.skipIfNoDiff === true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fern-api/generator-cli",
-  "version": "0.9.14",
+  "version": "0.9.16",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",