@fern-api/generator-cli 0.6.10 → 0.6.14

package/dist/api.js

@@ -893,18 +893,16 @@ __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);
 
-// ../../node_modules/.pnpm/simple-git@3.30.0/node_modules/simple-git/dist/esm/index.js
+// ../../node_modules/.pnpm/simple-git@3.33.0/node_modules/simple-git/dist/esm/index.js
 var import_node_buffer = require("buffer");
 var import_file_exists = __toESM(require_dist(), 1);
 var import_debug = __toESM(require_src(), 1);
@@ -1155,7 +1153,7 @@ var init_argument_filters = __esm({
       return typeof input === "number";
     };
     filterString = (input) => {
-      return typeof input === "string";
+      return typeof input === "string" || isPathSpec(input);
     };
     filterStringOrStringArray = (input) => {
       return filterString(input) || Array.isArray(input) && input.every(filterString);
@@ -3530,15 +3528,15 @@ function parser3(indexX, indexY, handler) {
   return [`${indexX}${indexY}`, handler];
 }
 function conflicts(indexX, ...indexY) {
-  return indexY.map((y) => parser3(indexX, y, (result, file) => append(result.conflicted, file)));
+  return indexY.map((y) => parser3(indexX, y, (result, file) => result.conflicted.push(file)));
 }
 function splitLine(result, lineStr) {
   const trimmed2 = lineStr.trim();
   switch (" ") {
     case trimmed2.charAt(2):
-      return data(trimmed2.charAt(0), trimmed2.charAt(1), trimmed2.substr(3));
+      return data(trimmed2.charAt(0), trimmed2.charAt(1), trimmed2.slice(3));
     case trimmed2.charAt(1):
-      return data(" ", trimmed2.charAt(0), trimmed2.substr(2));
+      return data(" ", trimmed2.charAt(0), trimmed2.slice(2));
     default:
       return;
   }
@@ -3586,58 +3584,54 @@ var init_StatusSummary = __esm({
       parser3(
         " ",
         "A",
-        (result, file) => append(result.created, file)
+        (result, file) => result.created.push(file)
       ),
       parser3(
         " ",
         "D",
-        (result, file) => append(result.deleted, file)
-      ),
-      parser3(
-        " ",
-        "M",
-        (result, file) => append(result.modified, file)
+        (result, file) => result.deleted.push(file)
       ),
       parser3(
-        "A",
         " ",
-        (result, file) => append(result.created, file) && append(result.staged, file)
-      ),
-      parser3(
-        "A",
         "M",
-        (result, file) => append(result.created, file) && append(result.staged, file) && append(result.modified, file)
-      ),
-      parser3(
-        "D",
-        " ",
-        (result, file) => append(result.deleted, file) && append(result.staged, file)
-      ),
-      parser3(
-        "M",
-        " ",
-        (result, file) => append(result.modified, file) && append(result.staged, file)
-      ),
-      parser3(
-        "M",
-        "M",
-        (result, file) => append(result.modified, file) && append(result.staged, file)
+        (result, file) => result.modified.push(file)
       ),
+      parser3("A", " ", (result, file) => {
+        result.created.push(file);
+        result.staged.push(file);
+      }),
+      parser3("A", "M", (result, file) => {
+        result.created.push(file);
+        result.staged.push(file);
+        result.modified.push(file);
+      }),
+      parser3("D", " ", (result, file) => {
+        result.deleted.push(file);
+        result.staged.push(file);
+      }),
+      parser3("M", " ", (result, file) => {
+        result.modified.push(file);
+        result.staged.push(file);
+      }),
+      parser3("M", "M", (result, file) => {
+        result.modified.push(file);
+        result.staged.push(file);
+      }),
       parser3("R", " ", (result, file) => {
-        append(result.renamed, renamedFile(file));
+        result.renamed.push(renamedFile(file));
       }),
       parser3("R", "M", (result, file) => {
         const renamed = renamedFile(file);
-        append(result.renamed, renamed);
-        append(result.modified, renamed.to);
+        result.renamed.push(renamed);
+        result.modified.push(renamed.to);
       }),
       parser3("!", "!", (_result, _file) => {
-        append(_result.ignored = _result.ignored || [], _file);
+        (_result.ignored = _result.ignored || []).push(_file);
       }),
       parser3(
         "?",
         "?",
-        (result, file) => append(result.not_added, file)
+        (result, file) => result.not_added.push(file)
       ),
       ...conflicts(
         "A",
@@ -3795,6 +3789,48 @@ var init_version = __esm({
     ];
   }
 });
+function createCloneTask(api, task, repoPath, ...args) {
+  if (!filterString(repoPath)) {
+    return configurationErrorTask(`git.${api}() requires a string 'repoPath'`);
+  }
+  return task(repoPath, filterType(args[0], filterString), getTrailingOptions(arguments));
+}
+function clone_default() {
+  return {
+    clone(repo, ...rest) {
+      return this._runTask(
+        createCloneTask("clone", cloneTask, filterType(repo, filterString), ...rest),
+        trailingFunctionArgument(arguments)
+      );
+    },
+    mirror(repo, ...rest) {
+      return this._runTask(
+        createCloneTask("mirror", cloneMirrorTask, filterType(repo, filterString), ...rest),
+        trailingFunctionArgument(arguments)
+      );
+    }
+  };
+}
+var cloneTask;
+var cloneMirrorTask;
+var init_clone = __esm({
+  "src/lib/tasks/clone.ts"() {
+    "use strict";
+    init_task();
+    init_utils();
+    init_pathspec();
+    cloneTask = (repo, directory, customArgs) => {
+      const commands = ["clone", ...customArgs];
+      filterString(repo) && commands.push(pathspec(repo));
+      filterString(directory) && commands.push(pathspec(directory));
+      return straightThroughStringTask(commands);
+    };
+    cloneMirrorTask = (repo, directory, customArgs) => {
+      append(customArgs, "--mirror");
+      return cloneTask(repo, directory, customArgs);
+    };
+  }
+});
 var simple_git_api_exports = {};
 __export2(simple_git_api_exports, {
   SimpleGitApi: () => SimpleGitApi
@@ -3821,6 +3857,7 @@ var init_simple_git_api = __esm({
     init_task();
     init_version();
     init_utils();
+    init_clone();
     SimpleGitApi = class {
       constructor(_executor) {
         this._executor = _executor;
@@ -3923,6 +3960,7 @@ var init_simple_git_api = __esm({
     Object.assign(
       SimpleGitApi.prototype,
       checkout_default(),
+      clone_default(),
       commit_default(),
       config_default(),
       count_objects_default(),
@@ -4246,35 +4284,6 @@ var init_check_ignore = __esm({
     init_CheckIgnore();
   }
 });
-var clone_exports = {};
-__export2(clone_exports, {
-  cloneMirrorTask: () => cloneMirrorTask,
-  cloneTask: () => cloneTask
-});
-function disallowedCommand(command) {
-  return /^--upload-pack(=|$)/.test(command);
-}
-function cloneTask(repo, directory, customArgs) {
-  const commands = ["clone", ...customArgs];
-  filterString(repo) && commands.push(repo);
-  filterString(directory) && commands.push(directory);
-  const banned = commands.find(disallowedCommand);
-  if (banned) {
-    return configurationErrorTask(`git.fetch: potential exploit argument blocked.`);
-  }
-  return straightThroughStringTask(commands);
-}
-function cloneMirrorTask(repo, directory, customArgs) {
-  append(customArgs, "--mirror");
-  return cloneTask(repo, directory, customArgs);
-}
-var init_clone = __esm({
-  "src/lib/tasks/clone.ts"() {
-    "use strict";
-    init_task();
-    init_utils();
-  }
-});
 function parseFetchResult(stdOut, stdErr) {
   const result = {
     raw: stdOut,
@@ -4330,7 +4339,7 @@ var fetch_exports = {};
 __export2(fetch_exports, {
   fetchTask: () => fetchTask
 });
-function disallowedCommand2(command) {
+function disallowedCommand(command) {
   return /^--upload-pack(=|$)/.test(command);
 }
 function fetchTask(remote, branch, customArgs) {
@@ -4338,7 +4347,7 @@ function fetchTask(remote, branch, customArgs) {
   if (remote && branch) {
     commands.push(remote, branch);
   }
-  const banned = commands.find(disallowedCommand2);
+  const banned = commands.find(disallowedCommand);
   if (banned) {
     return configurationErrorTask(`git.fetch: potential exploit argument blocked.`);
   }
@@ -4654,7 +4663,7 @@ var require_git = __commonJS2({
     var { GitExecutor: GitExecutor2 } = (init_git_executor(), __toCommonJS2(git_executor_exports));
     var { SimpleGitApi: SimpleGitApi2 } = (init_simple_git_api(), __toCommonJS2(simple_git_api_exports));
     var { Scheduler: Scheduler2 } = (init_scheduler(), __toCommonJS2(scheduler_exports));
-    var { configurationErrorTask: configurationErrorTask2 } = (init_task(), __toCommonJS2(task_exports));
+    var { adhocExecTask: adhocExecTask2, configurationErrorTask: configurationErrorTask2 } = (init_task(), __toCommonJS2(task_exports));
     var {
       asArray: asArray2,
       filterArray: filterArray2,
@@ -4675,7 +4684,6 @@ var require_git = __commonJS2({
     } = (init_branch(), __toCommonJS2(branch_exports));
     var { checkIgnoreTask: checkIgnoreTask2 } = (init_check_ignore(), __toCommonJS2(check_ignore_exports));
     var { checkIsRepoTask: checkIsRepoTask2 } = (init_check_is_repo(), __toCommonJS2(check_is_repo_exports));
-    var { cloneTask: cloneTask2, cloneMirrorTask: cloneMirrorTask2 } = (init_clone(), __toCommonJS2(clone_exports));
     var { cleanWithOptionsTask: cleanWithOptionsTask2, isCleanOptionsArray: isCleanOptionsArray2 } = (init_clean(), __toCommonJS2(clean_exports));
     var { diffSummaryTask: diffSummaryTask2 } = (init_diff(), __toCommonJS2(diff_exports));
     var { fetchTask: fetchTask2 } = (init_fetch(), __toCommonJS2(fetch_exports));
@@ -4730,24 +4738,6 @@ var require_git = __commonJS2({
         trailingFunctionArgument2(arguments)
       );
     };
-    function createCloneTask(api, task, repoPath, localPath) {
-      if (typeof repoPath !== "string") {
-        return configurationErrorTask2(`git.${api}() requires a string 'repoPath'`);
-      }
-      return task(repoPath, filterType2(localPath, filterString2), getTrailingOptions2(arguments));
-    }
-    Git2.prototype.clone = function() {
-      return this._runTask(
-        createCloneTask("clone", cloneTask2, ...arguments),
-        trailingFunctionArgument2(arguments)
-      );
-    };
-    Git2.prototype.mirror = function() {
-      return this._runTask(
-        createCloneTask("mirror", cloneMirrorTask2, ...arguments),
-        trailingFunctionArgument2(arguments)
-      );
-    };
     Git2.prototype.mv = function(from, to) {
       return this._runTask(moveTask2(from, to), trailingFunctionArgument2(arguments));
     };
@@ -4780,10 +4770,13 @@ var require_git = __commonJS2({
       );
     };
     Git2.prototype.silent = function(silence) {
-      console.warn(
-        "simple-git deprecation notice: git.silent: logging should be configured using the `debug` library / `DEBUG` environment variable, this will be an error in version 3"
+      return this._runTask(
+        adhocExecTask2(
+          () => console.warn(
+            "simple-git deprecation notice: git.silent: logging should be configured using the `debug` library / `DEBUG` environment variable, this method will be removed."
+          )
+        )
       );
-      return this;
     };
     Git2.prototype.tags = function(options, then) {
       return this._runTask(
@@ -5009,7 +5002,13 @@ var require_git = __commonJS2({
       return this._runTask(task);
     };
     Git2.prototype.clearQueue = function() {
-      return this;
+      return this._runTask(
+        adhocExecTask2(
+          () => console.warn(
+            "simple-git deprecation notice: clearQueue() is deprecated and will be removed, switch to using the abortPlugin instead."
+          )
+        )
+      );
     };
     Git2.prototype.checkIgnore = function(pathnames, then) {
       return this._runTask(
@@ -5079,19 +5078,36 @@ function abortPlugin(signal) {
 function isConfigSwitch(arg) {
   return typeof arg === "string" && arg.trim().toLowerCase() === "-c";
 }
-function preventProtocolOverride(arg, next) {
-  if (!isConfigSwitch(arg)) {
-    return;
-  }
-  if (!/^\s*protocol(.[a-z]+)?.allow/.test(next)) {
-    return;
+function isCloneUploadPackSwitch(char, arg) {
+  if (typeof arg !== "string" || !arg.includes(char)) {
+    return false;
   }
-  throw new GitPluginError(
-    void 0,
-    "unsafe",
-    "Configuring protocol.allow is not permitted without enabling allowUnsafeExtProtocol"
-  );
+  const cleaned = arg.trim().replace(/\0/g, "");
+  return /^(--no)?-{1,2}[\dlsqvnobucj]+(\s|$)/.test(cleaned);
+}
+function preventConfigBuilder(config, setting, message = String(config)) {
+  const regex = typeof config === "string" ? new RegExp(`\\s*${config}`, "i") : config;
+  return function preventCommand(options, arg, next) {
+    if (options[setting] !== true && isConfigSwitch(arg) && regex.test(next)) {
+      throw new GitPluginError(
+        void 0,
+        "unsafe",
+        `Configuring ${message} is not permitted without enabling ${setting}`
+      );
+    }
+  };
 }
+var preventUnsafeConfig = [
+  preventConfigBuilder(
+    /^\s*protocol(.[a-z]+)?.allow/i,
+    "allowUnsafeProtocolOverride",
+    "protocol.allow"
+  ),
+  preventConfigBuilder("core.sshCommand", "allowUnsafeSshCommand"),
+  preventConfigBuilder("core.gitProxy", "allowUnsafeGitProxy"),
+  preventConfigBuilder("core.hooksPath", "allowUnsafeHooksPath"),
+  preventConfigBuilder("diff.external", "allowUnsafeDiffExternal")
+];
 function preventUploadPack(arg, method) {
   if (/^\s*--(upload|receive)-pack/.test(arg)) {
     throw new GitPluginError(
@@ -5100,7 +5116,7 @@ function preventUploadPack(arg, method) {
       `Use of --upload-pack or --receive-pack is not permitted without enabling allowUnsafePack`
     );
   }
-  if (method === "clone" && /^\s*-u\b/.test(arg)) {
+  if (method === "clone" && isCloneUploadPackSwitch("u", arg)) {
     throw new GitPluginError(
       void 0,
       "unsafe",
@@ -5116,16 +5132,16 @@ function preventUploadPack(arg, method) {
   }
 }
 function blockUnsafeOperationsPlugin({
-  allowUnsafeProtocolOverride = false,
-  allowUnsafePack = false
+  allowUnsafePack = false,
+  ...options
 } = {}) {
   return {
     type: "spawn.args",
     action(args, context) {
       args.forEach((current, index) => {
         const next = index < args.length ? args[index + 1] : "";
-        allowUnsafeProtocolOverride || preventProtocolOverride(current, next);
         allowUnsafePack || preventUploadPack(current, context.method);
+        preventUnsafeConfig.forEach((helper) => helper(options, current, next));
       });
       return args;
     }
@@ -5209,7 +5225,7 @@ init_utils();
 var WRONG_NUMBER_ERR = `Invalid value supplied for custom binary, requires a single string or an array containing either one or two strings`;
 var WRONG_CHARS_ERR = `Invalid value supplied for custom binary, restricted characters must be removed or supply the unsafe.allowUnsafeCustomBinary option`;
 function isBadArgument(arg) {
-  return !arg || !/^([a-z]:)?([a-z0-9/.\\_-]+)$/i.test(arg);
+  return !arg || !/^([a-z]:)?([a-z0-9/.\\_~-]+)$/i.test(arg);
 }
 function toBinaryConfig(input, allowUnsafe) {
   if (input.length < 1 || input.length > 2) {
@@ -5437,12 +5453,12 @@ function gitInstanceFactory(baseDir, options) {
     plugins.add(commandConfigPrefixingPlugin(config.config));
   }
   plugins.add(blockUnsafeOperationsPlugin(config.unsafe));
-  plugins.add(suffixPathsPlugin());
   plugins.add(completionDetectionPlugin(config.completion));
   config.abort && plugins.add(abortPlugin(config.abort));
   config.progress && plugins.add(progressMonitorPlugin(config.progress));
   config.timeout && plugins.add(timeoutPlugin(config.timeout));
   config.spawnOptions && plugins.add(spawnOptionsPlugin(config.spawnOptions));
+  plugins.add(suffixPathsPlugin());
   plugins.add(errorDetectionPlugin(errorDetectionHandler(true)));
   config.errors && plugins.add(errorDetectionPlugin(config.errors));
   customBinaryPlugin(plugins, config.binary, config.unsafe?.allowUnsafeCustomBinary);
@@ -5750,6 +5766,21 @@ async function doesPathExist(filepath) {
   }
 }
 
+// ../commons/core-utils/lib/extractErrorMessage.js
+function extractErrorMessage(e) {
+  if (typeof e === "string") {
+    return e.length > 0 ? e : "Unknown error";
+  }
+  if (e instanceof Error) {
+    return e.message.length > 0 ? e.message : "Unknown error";
+  }
+  if (typeof e === "object" && e !== null && "message" in e && typeof e["message"] === "string") {
+    return e["message"].length > 0 ? e["message"] : "Unknown error";
+  }
+  const stringified = String(e);
+  return stringified.length > 0 ? stringified : "Unknown error";
+}
+
 // ../commons/github/lib/cloneRepository.js
 var import_child_process2 = require("child_process");
 var import_tmp_promise = __toESM(require("tmp-promise"), 1);
@@ -5771,7 +5802,7 @@ function parseRepository(githubRepository) {
   } else if (parts.length === 3 && parts[0] != null && parts[1] != null && parts[2] != null) {
     [remote, owner, repo] = parts;
   } else {
-    throw new Error(`Failed to parse GitHub repostiory ${githubRepository}`);
+    throw new Error(`Failed to parse GitHub repository ${githubRepository}`);
   }
   return newRepositoryReference({ remote, owner, repo });
 }
@@ -5852,7 +5883,7 @@ async function cloneRepository({ githubRepository, installationToken, targetDire
     await git.clone(cloneUrl, ".");
   } catch (error) {
     const elapsed = Date.now() - startTime;
-    const errorMessage = error instanceof Error ? error.message : String(error);
+    const errorMessage = extractErrorMessage(error);
     if (errorMessage.includes("ENOENT") || errorMessage.includes("spawn git")) {
       const diagnostics = getGitDiagnostics();
       throw new Error(`Failed to clone repository: git command not found. Self-hosted GitHub mode requires git to be installed on the host machine where the Fern CLI runs. URL: ${sanitizedUrl}. Elapsed: ${elapsed}ms. Debug info: ${diagnostics}. Original error: ${errorMessage}`);
@@ -8256,7 +8287,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 +8298,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 +8311,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();
         });
       }
     });
@@ -8456,16 +8487,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 = [];
@@ -8915,7 +8955,7 @@ var ReadmeGenerator = class {
     await writer.writeLine();
     await writer.writeLine("```groovy");
     await writer.writeLine("dependencies {");
-    await writer.writeLine(`  implementation '${maven.group}:${maven.artifact}'`);
+    await writer.writeLine(`  implementation '${maven.group}:${maven.artifact}:${maven.version}'`);
     await writer.writeLine("}");
     await writer.writeLine("```");
     await writer.writeLine();
@@ -9337,28 +9377,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;
@@ -9369,6 +9395,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({
@@ -9379,7 +9415,6 @@ var ReferenceGenerator = class {
     for (const section of this.referenceConfig.sections) {
       await this.writeSection({ section, writer });
     }
-    await writer.end();
   }
   async writeRootSection({
     section,
@@ -9480,22 +9515,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
@@ -9689,41 +9710,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
@@ -9769,7 +9768,7 @@ async function findExistingUpdatablePR(octokit, owner, repo, baseBranch, logger)
     }
     return void 0;
   } catch (error) {
-    logger.debug(`Error finding existing PRs: ${error instanceof Error ? error.message : String(error)}`);
+    logger.debug(`Error finding existing PRs: ${extractErrorMessage(error)}`);
     return void 0;
   }
 }
@@ -9796,16 +9795,22 @@ async function checkPRHasOnlyGenerationCommits(octokit, owner, repo, pullNumber,
     }
     return true;
   } catch (error) {
-    logger.debug(`Error checking PR commits: ${error instanceof Error ? error.message : String(error)}`);
+    logger.debug(`Error checking PR commits: ${extractErrorMessage(error)}`);
     return false;
   }
 }
 
 // src/pipeline/github/parseCommitMessage.ts
-function parseCommitMessageForPR(commitMessage) {
+function parseCommitMessageForPR(commitMessage, changelogEntry, prDescription, versionBumpReason) {
   const lines = commitMessage.split("\n");
   const prTitle = lines[0]?.trim() || "SDK Generation";
-  const prBody = lines.slice(1).join("\n").trim() || "Automated SDK generation by Fern";
+  const bodyFromCommit = lines.slice(1).join("\n").trim() || "Automated SDK generation by Fern";
+  let prBody = prDescription?.trim() || changelogEntry?.trim() || bodyFromCommit;
+  if (versionBumpReason?.trim()) {
+    prBody = `**Version Bump:** ${versionBumpReason.trim()}
+
+${prBody}`;
+  }
   return { prTitle, prBody };
 }
 
@@ -9818,11 +9823,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";
   }
@@ -9831,7 +9836,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) {
@@ -9840,10 +9845,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)` : "";
@@ -9851,14 +9856,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)}`);
       }
     }
@@ -9873,70 +9881,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)**
+#### How to resolve
 `);
-    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**
-`);
-    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");
 }
@@ -10066,22 +10070,18 @@ var GithubStep = class extends BaseStep {
           this.logger.debug(`Pushed ${tagName} tag for generation tracking`);
           result.generationBaseTagSha = generationBaseSha;
         } catch (error) {
-          this.logger.debug(
-            `Could not push generation tag: ${error instanceof Error ? error.message : String(error)}`
-          );
+          this.logger.debug(`Could not push generation tag: ${extractErrorMessage(error)}`);
         }
       }
     }
-    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 { prTitle, prBody } = parseCommitMessageForPR(
+      finalCommitMessage,
+      this.config.changelogEntry,
+      this.config.prDescription,
+      this.config.versionBumpReason
+    );
+    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}`);
@@ -10097,13 +10097,10 @@ var GithubStep = class extends BaseStep {
         });
         this.logger.debug(`Updated PR #${existingPR.number} title and body`);
       } catch (error) {
-        this.logger.debug(
-          `Failed to update PR title/body: ${error instanceof Error ? error.message : String(error)}`
-        );
+        this.logger.debug(`Failed to update PR title/body: ${extractErrorMessage(error)}`);
       }
     } else {
       const head = `${owner}:${prBranch}`;
-      const hasConflicts = replayConflictInfo?.hasConflicts === true;
       try {
         const { data: pullRequest } = await octokit.pulls.create({
           owner,
@@ -10111,14 +10108,13 @@ 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;
         result.prNumber = pullRequest.number;
       } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
+        const message = extractErrorMessage(error);
         if (message.includes("A pull request already exists for")) {
           this.logger.warn(`A pull request already exists for ${head}`);
         } else {
@@ -10126,17 +10122,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) {
@@ -10182,198 +10167,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");
@@ -10582,8 +10386,7 @@ var ReplayStep = class extends BaseStep {
         flow: "first-generation",
         patchesDetected: 0,
         patchesApplied: 0,
-        patchesWithConflicts: 0,
-        conflicts: []
+        patchesWithConflicts: 0
       };
     }
     const report = result.report;
@@ -10601,22 +10404,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
         }))
       })),
@@ -10687,7 +10480,7 @@ var PostGenerationPipeline = class {
       } catch (error) {
         result.success = false;
         result.errors = result.errors ?? [];
-        const errorMessage = error instanceof Error ? error.message : String(error);
+        const errorMessage = extractErrorMessage(error);
         result.errors.push(`${step.name} step error: ${errorMessage}`);
       }
     }
@@ -10880,6 +10673,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,
@@ -10895,5 +10696,6 @@ function buildPrBody(result) {
   githubRelease,
   logReplaySummary,
   replayInit,
+  replayResolve,
   replayRun
 });