@fern-api/generator-cli 0.6.9 → 0.6.11

package/dist/api.js

@@ -893,13 +893,11 @@ __export(api_exports2, {
   githubRelease: () => githubRelease,
   logReplaySummary: () => logReplaySummary,
   replayInit: () => replayInit,
+  replayResolve: () => replayResolve,
   replayRun: () => replayRun
 });
 module.exports = __toCommonJS(api_exports2);
 
-// src/api/generate-readme.ts
-var import_node_stream = require("stream");
-
 // ../commons/github/lib/ClonedRepository.js
 var import_promises = require("fs/promises");
 var import_path = __toESM(require("path"), 1);
@@ -8256,7 +8254,7 @@ var StreamWriter = class extends Writer {
     this.stream = stream;
   }
   async write(content) {
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve4, reject) => {
       const handleError = (err) => {
         this.stream.removeListener("error", handleError);
         reject(err);
@@ -8267,12 +8265,12 @@ var StreamWriter = class extends Writer {
           if (error) {
             reject(error);
           } else {
-            resolve3();
+            resolve4();
           }
         });
         this.stream.once("error", handleError);
         if (!canWrite) {
-          this.stream.once("drain", resolve3);
+          this.stream.once("drain", resolve4);
         }
       } else {
         const canWrite = this.stream.write(content);
@@ -8280,26 +8278,26 @@ var StreamWriter = class extends Writer {
         if (!canWrite) {
           this.stream.once("drain", () => {
             this.stream.removeListener("error", handleError);
-            resolve3();
+            resolve4();
           });
         } else {
           this.stream.removeListener("error", handleError);
-          resolve3();
+          resolve4();
         }
       }
     });
   }
   end() {
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve4, reject) => {
       if (this.stream instanceof import_fs.default.WriteStream) {
         this.stream.end(() => {
-          resolve3();
+          resolve4();
         });
         this.stream.once("error", reject);
-        this.stream.once("finish", resolve3);
+        this.stream.once("finish", resolve4);
       } else {
         this.stream.write("", () => {
-          resolve3();
+          resolve4();
         });
       }
     });
@@ -8388,7 +8386,8 @@ var BlockList = class {
   }
   addBlock(block) {
     if (this.hasBlock(block.id)) {
-      throw new Error(`block with id "${block.id}" already exists`);
+      console.warn(`[readme] Duplicate block with id "${block.id}" detected; overriding with latest content`);
+      this.blocks = this.blocks.filter((b) => b.id !== block.id);
     }
     this.ids.add(block.id);
     this.blocks.push(block);
@@ -8402,7 +8401,9 @@ var BlockList = class {
   // }
   insertBlock(block, precedingBlockId) {
     if (this.hasBlock(block.id)) {
-      throw new Error(`block with id "${block.id}" already exists`);
+      console.warn(`[readme] Duplicate block with id "${block.id}" detected; overriding with latest content`);
+      this.blocks = this.blocks.filter((b) => b.id !== block.id);
+      this.ids.delete(block.id);
     }
     if (precedingBlockId === void 0) {
       this.addBlock(block);
@@ -8453,16 +8454,25 @@ var ReadmeGenerator = class {
     this.apiName = this.readmeConfig.apiName ?? this.organizationPascalCase;
   }
   async generateReadme({ output }) {
+    const writer = new StreamWriter(output);
+    await this.writeReadmeContent({ writer });
+    await writer.end();
+  }
+  async generateReadmeToString() {
+    const writer = new StringWriter();
+    await this.writeReadmeContent({ writer });
+    await writer.end();
+    return writer.toString();
+  }
+  async writeReadmeContent({ writer }) {
     const blocks = await this.generateBlocks();
     const mergedBlocks = await this.mergeBlocks({ blocks });
-    const writer = new StreamWriter(output);
     await this.writeHeader({ writer });
     await this.writeTableOfContents({ writer, blocks: mergedBlocks });
     await this.writeBlocks({
       writer,
       blocks: mergedBlocks
     });
-    await writer.end();
   }
   async generateBlocks() {
     const blocks = [];
@@ -9334,28 +9344,14 @@ async function generateReadmeToStream(params) {
 }
 async function generateReadme(params) {
   const { originalReadmeContent, readmeConfig } = params;
-  const content = [];
-  const sink = new import_node_stream.Writable({
-    write(chunk, _encoding, callback) {
-      if (typeof chunk === "string") {
-        content.push(chunk);
-      } else {
-        content.push(Buffer.from(chunk).toString("utf8"));
-      }
-      callback();
-    }
-  });
-  await generateReadmeToStream({
-    originalReadmeContent,
+  const generator = new ReadmeGenerator({
+    readmeParser: new ReadmeParser(),
     readmeConfig,
-    outputStream: sink
+    originalReadme: originalReadmeContent
   });
-  return content.join("");
+  return generator.generateReadmeToString();
 }
 
-// src/api/generate-reference.ts
-var import_node_stream2 = require("stream");
-
 // src/reference/ReferenceGenerator.ts
 var ReferenceGenerator = class {
   referenceConfig;
@@ -9366,6 +9362,16 @@ var ReferenceGenerator = class {
   }
   async generate({ output }) {
     const writer = new StreamWriter(output);
+    await this.writeReferenceContent({ writer });
+    await writer.end();
+  }
+  async generateToString() {
+    const writer = new StringWriter();
+    await this.writeReferenceContent({ writer });
+    await writer.end();
+    return writer.toString();
+  }
+  async writeReferenceContent({ writer }) {
     await writer.writeLine("# Reference");
     if (this.referenceConfig.rootSection != null) {
       await this.writeRootSection({
@@ -9376,7 +9382,6 @@ var ReferenceGenerator = class {
     for (const section of this.referenceConfig.sections) {
       await this.writeSection({ section, writer });
     }
-    await writer.end();
   }
   async writeRootSection({
     section,
@@ -9477,22 +9482,8 @@ async function generateReferenceToStream(params) {
 }
 async function generateReference(params) {
   const { referenceConfig } = params;
-  const content = [];
-  const sink = new import_node_stream2.Writable({
-    write(chunk, _encoding, callback) {
-      if (typeof chunk === "string") {
-        content.push(chunk);
-      } else {
-        content.push(Buffer.from(chunk).toString("utf8"));
-      }
-      callback();
-    }
-  });
-  await generateReferenceToStream({
-    referenceConfig,
-    outputStream: sink
-  });
-  return content.join("");
+  const generator = new ReferenceGenerator({ referenceConfig });
+  return generator.generateToString();
 }
 
 // ../commons/path-utils/lib/convertToOsPath.js
@@ -9686,41 +9677,19 @@ var import_path3 = require("path");
 
 // src/pipeline/github/createReplayBranch.ts
 async function createReplayBranch(repository, branchName, commitMessage, replayConflictInfo, logger) {
-  if (replayConflictInfo?.hasConflicts) {
-    const parentSha = replayConflictInfo.previousGenerationSha;
-    const lockfileRestoreSha = replayConflictInfo.baseBranchHead ?? replayConflictInfo.previousGenerationSha;
-    logger.debug(`Creating divergent PR branch with generation tree (parent: ${parentSha.substring(0, 7)})`);
-    const genTreeHash = await repository.getCommitTreeHash(replayConflictInfo.currentGenerationSha);
-    const syntheticCommitSha = await repository.commitTree(
-      genTreeHash,
-      parentSha,
-      `[fern-generated] ${commitMessage ?? "Update SDK"}`
-    );
-    await repository.createBranchFromCommit(branchName, syntheticCommitSha);
-    try {
-      await repository.restoreFilesFromCommit(lockfileRestoreSha, ".fern/replay.lock");
-      await repository.commitAllChanges(`[fern-generated] ${commitMessage ?? "Update SDK"}`);
-    } catch (error) {
-      logger.debug(
-        `Could not restore lockfile from base branch: ${error instanceof Error ? error.message : String(error)}`
-      );
-    }
-    return syntheticCommitSha;
-  } else if (replayConflictInfo != null) {
-    const parentSha = replayConflictInfo.previousGenerationSha;
-    logger.debug(`Creating linear PR branch from HEAD (no conflicts)`);
-    await repository.createBranchFromHead(branchName);
-    const genTreeHash = await repository.getCommitTreeHash(replayConflictInfo.currentGenerationSha);
-    const tagCommitSha = await repository.commitTree(
-      genTreeHash,
-      parentSha,
-      `[fern-generated] ${commitMessage ?? "Update SDK"}`
-    );
-    return tagCommitSha;
-  } else {
+  if (replayConflictInfo == null) {
     await repository.createBranchFromHead(branchName);
     return void 0;
   }
+  const parentSha = replayConflictInfo.previousGenerationSha;
+  await repository.createBranchFromHead(branchName);
+  const genTreeHash = await repository.getCommitTreeHash(replayConflictInfo.currentGenerationSha);
+  const tagCommitSha = await repository.commitTree(
+    genTreeHash,
+    parentSha,
+    `[fern-generated] ${commitMessage ?? "Update SDK"}`
+  );
+  return tagCommitSha;
 }
 
 // src/pipeline/github/findExistingUpdatablePR.ts
@@ -9815,11 +9784,11 @@ function formatConflictReason(reason) {
     case "same-line-edit":
       return "The new generation changed the same lines you edited";
     case "new-file-both":
-      return "You and the generator both created this file";
+      return "Both the generator and your customization created this file";
     case "base-generation-mismatch":
-      return "The generated code changed significantly around your edit";
+      return "This customization was from a previous generation";
     case "patch-apply-failed":
-      return "Your change could not be applied to the new generated code";
+      return "The customization could not be applied to the new code";
     default:
       return "Your edit overlaps with changes in the new generation";
   }
@@ -9828,7 +9797,7 @@ function patchDescription(detail) {
   if (detail.patchMessage && detail.patchMessage !== "update") {
     return detail.patchMessage;
   }
-  const firstFile = detail.files[0]?.file;
+  const firstFile = detail.files[0];
   return firstFile != null ? `changes in ${firstFile}` : "customization";
 }
 function logReplaySummary(result, logger) {
@@ -9837,10 +9806,10 @@ function logReplaySummary(result, logger) {
   }
   const applied = result.patchesApplied ?? 0;
   const absorbed = result.patchesAbsorbed ?? 0;
-  const conflicts2 = result.patchesWithConflicts ?? 0;
+  const unresolvedCount = result.unresolvedPatches?.length ?? 0;
   const preserved = applied - absorbed;
   logger.debug(
-    `Replay: flow=${result.flow}, detected=${result.patchesDetected ?? 0}, applied=${applied}, absorbed=${absorbed}, conflicts=${conflicts2}`
+    `Replay: flow=${result.flow}, detected=${result.patchesDetected ?? 0}, applied=${applied}, absorbed=${absorbed}, unresolved=${unresolvedCount}`
   );
   if (preserved > 0) {
     const absorbedNote = absorbed > 0 ? ` (some customizations now part of generated code)` : "";
@@ -9848,14 +9817,17 @@ function logReplaySummary(result, logger) {
   } else if (absorbed > 0) {
     logger.info(`Replay: customizations now part of generated code`);
   }
-  if (conflicts2 > 0) {
-    const totalFiles = (result.conflictDetails ?? []).reduce((sum, d) => sum + d.files.length, 0);
+  if (unresolvedCount > 0) {
+    const totalFiles = (result.unresolvedPatches ?? []).reduce(
+      (sum, patch) => sum + patch.conflictDetails.length,
+      0
+    );
     logger.warn(
-      `Replay: ${plural(totalFiles, "file")} ${totalFiles === 1 ? "has" : "have"} merge conflicts \u2014 resolve in the PR or locally`
+      `Replay: ${plural(totalFiles, "file")} ${totalFiles === 1 ? "has" : "have"} unresolved conflicts \u2014 resolve via \`fern replay resolve\``
     );
-    for (const detail of result.conflictDetails ?? []) {
-      logger.warn(`  "${patchDescription(detail)}":`);
-      for (const file of detail.files) {
+    for (const patch of result.unresolvedPatches ?? []) {
+      logger.warn(`  "${patchDescription(patch)}":`);
+      for (const file of patch.conflictDetails) {
         logger.warn(`    ${file.file} \u2014 ${formatConflictReason(file.conflictReason)}`);
       }
     }
@@ -9870,70 +9842,66 @@ function formatReplayPrBody(result, options) {
   }
   const applied = result.patchesApplied ?? 0;
   const absorbed = result.patchesAbsorbed ?? 0;
-  const conflicts2 = result.patchesWithConflicts ?? 0;
+  const unresolvedPatches = result.unresolvedPatches ?? [];
+  const hasUnresolved = unresolvedPatches.length > 0;
   const preserved = applied - absorbed;
-  if (preserved === 0 && conflicts2 === 0) {
+  if (preserved === 0 && !hasUnresolved) {
     return void 0;
   }
   const parts = [];
-  if (preserved > 0 && conflicts2 === 0) {
+  if (preserved > 0 && !hasUnresolved) {
     parts.push(`\u2705 Customizations automatically preserved in this update.`);
   } else if (preserved > 0) {
+    const totalFiles = unresolvedPatches.reduce((sum, patch) => sum + patch.conflictDetails.length, 0);
     parts.push(
-      `\u2705 Customizations automatically preserved, but ${plural(conflicts2, "file")} ${conflicts2 === 1 ? "needs" : "need"} your attention.`
+      `\u2705 Customizations automatically preserved, but ${plural(totalFiles, "file")} ${totalFiles === 1 ? "needs" : "need"} your attention.`
     );
   }
-  if (conflicts2 > 0) {
-    const allFiles = (result.conflictDetails ?? []).flatMap((d) => d.files);
-    const totalFiles = allFiles.length;
+  if (hasUnresolved) {
+    const totalFiles = unresolvedPatches.reduce((sum, patch) => sum + patch.conflictDetails.length, 0);
     parts.push(`
-### \u26A0\uFE0F Action required: ${plural(totalFiles, "file")} with customization conflicts
+### Action required: ${plural(totalFiles, "file")} with unresolved customization conflicts
 `);
     parts.push(
-      `You previously customized ${totalFiles === 1 ? "a file" : "files"} in this SDK. This generation changed the same code, so your ${totalFiles === 1 ? "edit" : "edits"} couldn't be applied automatically.
-`
-    );
-    parts.push(
-      `> \u26A0\uFE0F **Label guide:** In GitHub's conflict editor, \`<<<<<<< HEAD\` ("Accept current") = new generated code. \`>>>>>>> main\` ("Accept incoming") = your customization.
+      `The new generation changed code you previously customized. Non-conflicting customizations have been applied automatically. The following files need manual resolution:
 `
     );
     parts.push(`| File | Your customization | Why it conflicted |`);
     parts.push(`|------|-------------------|-------------------|`);
-    for (const detail of result.conflictDetails ?? []) {
-      const description = patchDescription(detail);
-      for (const f of detail.files) {
-        parts.push(`| \`${f.file}\` | ${description} | ${formatConflictReason(f.conflictReason)} |`);
+    for (const patch of unresolvedPatches) {
+      const description = patchDescription(patch);
+      for (const file of patch.conflictDetails) {
+        parts.push(`| \`${file.file}\` | ${description} | ${formatConflictReason(file.conflictReason)} |`);
       }
     }
     const branch = options?.branchName ?? "<branch-name>";
+    const repoUri = options?.repoUri;
+    const repoName = repoUri?.split("/").pop() ?? "<repo>";
     parts.push(`
-#### How to fix
-`);
-    parts.push(`**Option A: Resolve in GitHub (recommended for simple conflicts)**
-`);
-    parts.push(`1. Click the **Resolve conflicts** button below`);
-    parts.push(`2. For each file, choose which code to keep:`);
-    parts.push(`   - \`<<<<<<< HEAD\` / "Accept current changes" = **new generated code**`);
-    parts.push(`   - \`>>>>>>> main\` / "Accept incoming changes" = **your customization**`);
-    parts.push(`   - Or manually combine both, then delete the conflict markers`);
-    parts.push(`3. Click **Mark as resolved** for each file, then **Commit merge**
-`);
-    parts.push(`**Option B: Resolve locally**
+#### How to resolve
 `);
-    parts.push(`1. Fetch and check out this branch:`);
+    parts.push(`1. Check out this branch:`);
     parts.push(`   \`\`\`sh`);
-    parts.push(`   git fetch origin && git checkout ${branch}`);
+    parts.push(`   git fetch origin && git checkout -b ${branch} origin/${branch}`);
     parts.push(`   \`\`\``);
-    parts.push(`2. Merge the base branch and resolve conflicts in your editor:`);
-    parts.push(`   \`\`\`sh`);
-    parts.push(`   git merge origin/main`);
-    parts.push(`   \`\`\``);
-    parts.push(`3. Commit and push:`);
-    parts.push(`   \`\`\`sh`);
-    parts.push(`   git add -A && git commit -m "resolve conflicts" && git push`);
-    parts.push(`   \`\`\`
+    if (repoUri != null) {
+      parts.push(`   Or if you don't have the repo cloned:`);
+      parts.push(`   \`\`\`sh`);
+      parts.push(
+        `   git clone https://github.com/${repoUri}.git && cd ${repoName} && git checkout -b ${branch} origin/${branch}`
+      );
+      parts.push(`   \`\`\``);
+    }
+    parts.push(`2. Run: \`fern replay resolve\``);
+    parts.push(`3. Open the conflicting files in your editor \u2014 you'll see standard merge conflict markers`);
+    parts.push(`4. Resolve using your editor's merge tools (VS Code, IntelliJ, etc.)`);
+    parts.push(`5. Run: \`fern replay resolve\` again to finalize`);
+    parts.push(`6. Push your changes
 `);
-    parts.push(`Your resolved changes will be remembered on future SDK generations.`);
+    parts.push(`Your resolved customizations will be remembered on future SDK generations.`);
+    parts.push(
+      `If you merge this PR without resolving, your unresolved customizations will conflict again on the next generation.`
+    );
   }
   return parts.join("\n");
 }
@@ -10069,16 +10037,9 @@ var GithubStep = class extends BaseStep {
         }
       }
     }
-    if (!this.config.previewMode) {
-      const headSha = await repository.getHeadSha();
-      await this.postReplayConflictStatus(octokit, owner, repo, headSha, replayConflictInfo, replayResult);
-      if (isUpdatingExistingPR && existingPR != null) {
-        await this.togglePrDraftState(octokit, existingPR, replayConflictInfo);
-      }
-    }
     const finalCommitMessage = this.config.commitMessage ?? "SDK Generation";
     const { prTitle, prBody } = parseCommitMessageForPR(finalCommitMessage);
-    const replaySection = formatReplayPrBody(replayResult, { branchName: prBranch });
+    const replaySection = formatReplayPrBody(replayResult, { branchName: prBranch, repoUri: this.config.uri });
     const enrichedBody = replaySection != null ? prBody + "\n\n---\n\n" + replaySection : prBody;
     if (isUpdatingExistingPR && existingPR != null) {
       this.logger.info(`Updated existing pull request: ${existingPR.htmlUrl}`);
@@ -10100,7 +10061,6 @@ var GithubStep = class extends BaseStep {
       }
     } else {
       const head = `${owner}:${prBranch}`;
-      const hasConflicts = replayConflictInfo?.hasConflicts === true;
       try {
         const { data: pullRequest } = await octokit.pulls.create({
           owner,
@@ -10108,8 +10068,7 @@ var GithubStep = class extends BaseStep {
           title: prTitle,
           body: enrichedBody,
           head,
-          base: baseBranch,
-          draft: hasConflicts
+          base: baseBranch
         });
         this.logger.info(`Created pull request: ${pullRequest.html_url}`);
         result.prUrl = pullRequest.html_url;
@@ -10123,17 +10082,6 @@ var GithubStep = class extends BaseStep {
         }
       }
     }
-    if (!this.config.previewMode && result.prNumber != null && replayConflictInfo?.hasConflicts === true && replayResult != null) {
-      await this.postWebEditorFallbackComment(
-        octokit,
-        owner,
-        repo,
-        result.prNumber,
-        prBranch,
-        baseBranch,
-        replayResult
-      );
-    }
     return result;
   }
   async executePushMode(repository) {
@@ -10179,198 +10127,17 @@ var GithubStep = class extends BaseStep {
     if (replayResult == null) {
       return void 0;
     }
-    const hasConflicts = (replayResult.patchesWithConflicts ?? 0) > 0;
     const previousGenerationSha = replayResult.previousGenerationSha;
     const currentGenerationSha = replayResult.currentGenerationSha;
     if (previousGenerationSha != null && currentGenerationSha != null) {
       return {
         previousGenerationSha,
-        currentGenerationSha,
-        hasConflicts,
-        baseBranchHead: replayResult.baseBranchHead
+        currentGenerationSha
       };
     }
     return void 0;
   }
-  async togglePrDraftState(octokit, existingPR, replayConflictInfo) {
-    const hasConflicts = replayConflictInfo?.hasConflicts === true;
-    if (hasConflicts && !existingPR.isDraft) {
-      await this.convertPrToDraft(octokit, existingPR.nodeId, existingPR.number);
-    } else if (!hasConflicts && existingPR.isDraft) {
-      await this.markPrReady(octokit, existingPR.nodeId, existingPR.number);
-    }
-  }
-  async convertPrToDraft(octokit, nodeId, prNumber) {
-    try {
-      await octokit.graphql(
-        `mutation($id: ID!) {
-                    convertPullRequestToDraft(input: {pullRequestId: $id}) {
-                        pullRequest { isDraft }
-                    }
-                }`,
-        { id: nodeId }
-      );
-      this.logger.info(`Converted PR #${prNumber} to draft due to replay conflicts`);
-    } catch (error) {
-      this.logger.debug(
-        `Could not convert PR to draft: ${error instanceof Error ? error.message : String(error)}`
-      );
-    }
-  }
-  async markPrReady(octokit, nodeId, prNumber) {
-    try {
-      await octokit.graphql(
-        `mutation($id: ID!) {
-                    markPullRequestReadyForReview(input: {pullRequestId: $id}) {
-                        pullRequest { isDraft }
-                    }
-                }`,
-        { id: nodeId }
-      );
-      this.logger.info(`Marked PR #${prNumber} as ready (conflicts resolved)`);
-    } catch (error) {
-      this.logger.debug(`Could not mark PR as ready: ${error instanceof Error ? error.message : String(error)}`);
-    }
-  }
-  async postReplayConflictStatus(octokit, owner, repo, sha, replayConflictInfo, replayResult) {
-    if (replayResult == null || !replayResult.executed) {
-      return;
-    }
-    const hasConflicts = replayConflictInfo?.hasConflicts === true;
-    const conflictFileCount = (replayResult.conflictDetails ?? []).reduce(
-      (sum, detail) => sum + detail.files.length,
-      0
-    );
-    const sanitizedName = this.config.generatorName?.replace(/\//g, "--");
-    const context = sanitizedName != null ? `fern / sdk customizations / ${sanitizedName}` : "fern / sdk customizations";
-    try {
-      await octokit.repos.createCommitStatus({
-        owner,
-        repo,
-        sha,
-        state: hasConflicts ? "failure" : "success",
-        context,
-        description: hasConflicts ? `${conflictFileCount} file(s) need manual conflict resolution \u2014 see PR description` : "All customizations applied"
-      });
-      this.logger.debug(`Posted ${hasConflicts ? "failing" : "passing"} commit status (${context})`);
-    } catch (error) {
-      this.logger.debug(
-        `Could not post commit status: ${error instanceof Error ? error.message : String(error)}`
-      );
-    }
-  }
-  async postWebEditorFallbackComment(octokit, owner, repo, prNumber, branchName, baseBranch, replayResult) {
-    try {
-      const webEditorLikelyDisabled = await this.isWebEditorLikelyDisabled(
-        octokit,
-        owner,
-        repo,
-        prNumber,
-        replayResult
-      );
-      if (!webEditorLikelyDisabled) {
-        this.logger.debug(`PR #${prNumber}: web conflict editor appears usable, skipping fallback comment`);
-        return;
-      }
-      const comment = buildWebEditorFallbackComment(branchName, baseBranch);
-      await octokit.issues.createComment({
-        owner,
-        repo,
-        issue_number: prNumber,
-        body: comment
-      });
-      this.logger.info(`Posted web-editor fallback comment on PR #${prNumber}`);
-    } catch (error) {
-      this.logger.debug(
-        `Could not post web-editor fallback comment: ${error instanceof Error ? error.message : String(error)}`
-      );
-    }
-  }
-  async isWebEditorLikelyDisabled(octokit, owner, repo, prNumber, replayResult) {
-    const conflictDetails = replayResult.conflictDetails ?? [];
-    const allConflictFiles = conflictDetails.flatMap((d) => d.files);
-    const totalConflictFiles = allConflictFiles.length;
-    const hasFileDeletionConflict = allConflictFiles.some((f) => {
-      const status = (f.status ?? "").toLowerCase();
-      const reason = (f.conflictReason ?? "").toLowerCase();
-      return status === "skipped" || reason.includes("delete") || reason.includes("removed");
-    });
-    if (hasFileDeletionConflict) {
-      this.logger.debug(`PR #${prNumber}: detected file deletion conflict, web editor likely disabled`);
-      return true;
-    }
-    if (totalConflictFiles >= WEB_EDITOR_FILE_THRESHOLD) {
-      this.logger.debug(
-        `PR #${prNumber}: ${totalConflictFiles} conflicting files exceeds threshold (${WEB_EDITOR_FILE_THRESHOLD}), web editor likely disabled`
-      );
-      return true;
-    }
-    const totalHunks = (replayResult.conflicts ?? []).reduce(
-      (sum, fileConflict) => sum + fileConflict.conflicts.length,
-      0
-    );
-    if (totalHunks >= WEB_EDITOR_HUNK_THRESHOLD) {
-      this.logger.debug(
-        `PR #${prNumber}: ${totalHunks} conflict hunks exceeds threshold (${WEB_EDITOR_HUNK_THRESHOLD}), web editor likely disabled`
-      );
-      return true;
-    }
-    const mergeableState = await this.pollMergeableState(octokit, owner, repo, prNumber);
-    if (mergeableState.mergeable === null) {
-      this.logger.debug(`PR #${prNumber}: mergeable state still null after polling, web editor likely disabled`);
-      return true;
-    }
-    return false;
-  }
-  async pollMergeableState(octokit, owner, repo, prNumber) {
-    for (let attempt = 0; attempt < MERGEABLE_POLL_MAX_ATTEMPTS; attempt++) {
-      const { data: pr } = await octokit.pulls.get({
-        owner,
-        repo,
-        pull_number: prNumber
-      });
-      if (pr.mergeable != null) {
-        return {
-          mergeable: pr.mergeable,
-          mergeableState: pr.mergeable_state
-        };
-      }
-      if (attempt < MERGEABLE_POLL_MAX_ATTEMPTS - 1) {
-        await sleep(MERGEABLE_POLL_DELAY_MS);
-      }
-    }
-    return { mergeable: null, mergeableState: "unknown" };
-  }
 };
-var WEB_EDITOR_FILE_THRESHOLD = 20;
-var WEB_EDITOR_HUNK_THRESHOLD = 50;
-var MERGEABLE_POLL_MAX_ATTEMPTS = 3;
-var MERGEABLE_POLL_DELAY_MS = 1500;
-function buildWebEditorFallbackComment(branchName, baseBranch) {
-  const lines = [
-    `> **Note:** These conflicts may be too complex for GitHub's web editor. To resolve locally:`,
-    `>`,
-    `> 1. Check out this branch:`,
-    `>    \`\`\`sh`,
-    `>    git fetch origin && git checkout ${branchName}`,
-    `>    \`\`\``,
-    `> 2. Merge the base branch:`,
-    `>    \`\`\`sh`,
-    `>    git merge origin/${baseBranch}`,
-    `>    \`\`\``,
-    `> 3. Resolve conflicts in your editor (VS Code, IntelliJ, etc. have built-in merge tools)`,
-    `> 4. Commit and push:`,
-    `>    \`\`\`sh`,
-    `>    git add -A && git commit -m "resolve conflicts" && git push`,
-    `>    \`\`\``,
-    `>`,
-    `> **Label guide:** In your editor's merge view, "current" = new generated code, "incoming" = your customization.`
-  ];
-  return lines.join("\n");
-}
-function sleep(ms) {
-  return new Promise((resolve3) => setTimeout(resolve3, ms));
-}
 
 // src/replay/replay-run.ts
 var import_replay = require("@fern-api/replay");
@@ -10579,8 +10346,7 @@ var ReplayStep = class extends BaseStep {
         flow: "first-generation",
         patchesDetected: 0,
         patchesApplied: 0,
-        patchesWithConflicts: 0,
-        conflicts: []
+        patchesWithConflicts: 0
       };
     }
     const report = result.report;
@@ -10598,22 +10364,12 @@ var ReplayStep = class extends BaseStep {
       patchesRepointed: report.patchesRepointed,
       patchesContentRebased: report.patchesContentRebased,
       patchesKeptAsUserOwned: report.patchesKeptAsUserOwned,
-      conflicts: report.conflicts.map((fileResult) => ({
-        filePath: fileResult.file,
-        conflicts: fileResult.conflicts?.map((conflict) => ({
-          startLine: conflict.startLine,
-          endLine: conflict.endLine,
-          ours: conflict.ours,
-          theirs: conflict.theirs
-        })) ?? []
-      })),
-      conflictDetails: report.conflictDetails?.map((detail) => ({
-        patchId: detail.patchId,
-        patchMessage: detail.patchMessage,
-        reason: detail.reason,
-        files: detail.files.map((f) => ({
+      unresolvedPatches: report.unresolvedPatches?.map((info) => ({
+        patchId: info.patchId,
+        patchMessage: info.patchMessage,
+        files: info.files,
+        conflictDetails: info.conflictDetails.map((f) => ({
           file: f.file,
-          status: f.status,
           conflictReason: f.conflictReason
         }))
       })),
@@ -10738,7 +10494,10 @@ Base generation: ${bootstrapResult.generationCommit.sha.slice(0, 7)}`;
     `user.name=${import_replay2.FERN_BOT_NAME}`,
     "-c",
     `user.email=${import_replay2.FERN_BOT_EMAIL}`,
+    "-c",
+    "commit.gpgsign=false",
     "commit",
+    "--no-verify",
     "-m",
     commitMessage
   ]);
@@ -10874,6 +10633,14 @@ function buildPrBody(result) {
   lines.push("Once merged, your customizations will be automatically preserved on future `fern generate` runs.");
   return lines.join("\n");
 }
+
+// src/replay/replay-resolve.ts
+var import_replay3 = require("@fern-api/replay");
+async function replayResolve(params) {
+  return (0, import_replay3.resolve)(params.outputDir, {
+    checkMarkers: params.checkMarkers
+  });
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   PostGenerationPipeline,
@@ -10889,5 +10656,6 @@ function buildPrBody(result) {
   githubRelease,
   logReplaySummary,
   replayInit,
+  replayResolve,
   replayRun
 });