@fern-api/generator-cli 0.6.10 → 0.6.14

package/dist/cli.js

@@ -7678,7 +7678,7 @@ var require_dist2 = __commonJS({
   }
 });
 
-// ../../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
 function pathspec(...paths) {
   const key = new String(paths);
   cache.set(key, paths);
@@ -8778,15 +8778,15 @@ function parser3(indexX, indexY, handler2) {
   return [`${indexX}${indexY}`, handler2];
 }
 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;
   }
@@ -8863,6 +8863,28 @@ function versionParser(stdOut) {
   }
   return parseStringResponse(versionResponse(0, 0, 0, stdOut), parsers7, stdOut);
 }
+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)
+      );
+    }
+  };
+}
 function applyPatchTask(patches, customArgs) {
   return straightThroughStringTask(["apply", ...customArgs, ...patches]);
 }
@@ -8972,23 +8994,6 @@ function checkIgnoreTask(paths) {
     parser: parseCheckIgnore
   };
 }
-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);
-}
 function parseFetchResult(stdOut, stdErr) {
   const result = {
     raw: stdOut,
@@ -9000,7 +9005,7 @@ function parseFetchResult(stdOut, stdErr) {
   };
   return parseStringResponse(result, parsers10, [stdOut, stdErr]);
 }
-function disallowedCommand2(command) {
+function disallowedCommand(command) {
   return /^--upload-pack(=|$)/.test(command);
 }
 function fetchTask(remote, branch, customArgs) {
@@ -9008,7 +9013,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.`);
   }
@@ -9210,18 +9215,24 @@ 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}`
+      );
+    }
+  };
 }
 function preventUploadPack(arg, method) {
   if (/^\s*--(upload|receive)-pack/.test(arg)) {
@@ -9231,7 +9242,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",
@@ -9247,16 +9258,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;
     }
@@ -9334,7 +9345,7 @@ function completionDetectionPlugin({
   };
 }
 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) {
@@ -9522,20 +9533,20 @@ 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);
   return new Git(config, plugins);
 }
-var import_node_buffer, import_file_exists, import_debug, import_child_process, import_promise_deferred, import_node_path, import_promise_deferred2, import_node_events, __defProp2, __getOwnPropDesc2, __getOwnPropNames2, __hasOwnProp2, __esm2, __commonJS2, __export2, __copyProps2, __toCommonJS, cache, init_pathspec, GitError, init_git_error, GitResponseError, init_git_response_error, TaskConfigurationError, init_task_configuration_error, NULL, NOOP, objectToString, init_util, filterArray, filterNumber, filterString, filterStringOrStringArray, filterHasLength, init_argument_filters, ExitCodes, init_exit_codes, GitOutputStreams, init_git_output_streams, LineParser, RemoteLineParser, init_line_parser, defaultOptions, init_simple_git_options, init_task_options, init_task_parser, utils_exports, init_utils, check_is_repo_exports, CheckRepoActions, onError, parser2, init_check_is_repo, CleanResponse, removalRegexp, dryRunRemovalRegexp, isFolderRegexp, init_CleanSummary, task_exports, EMPTY_COMMANDS, init_task, clean_exports, CONFIG_ERROR_INTERACTIVE_MODE, CONFIG_ERROR_MODE_REQUIRED, CONFIG_ERROR_UNKNOWN_OPTION, CleanOptions, CleanOptionValues, init_clean, ConfigList, init_ConfigList, GitConfigScope, init_config, DiffNameStatus, diffNameStatus, init_diff_name_status, disallowedOptions, Query, _a3, GrepQuery, init_grep, reset_exports, ResetMode, validResetModes, init_reset, init_git_logger, TasksPendingQueue, init_tasks_pending_queue, GitExecutorChain, init_git_executor_chain, git_executor_exports, GitExecutor, init_git_executor, init_task_callback, init_change_working_directory, init_checkout, parser22, init_count_objects, parsers, init_parse_commit, init_commit, init_first_commit, init_hash_object, InitSummary, initResponseRegex, reInitResponseRegex, init_InitSummary, bareCommand, init_init, logFormatRegex, init_log_format, DiffSummary, init_DiffSummary, statParser, numStatParser, nameOnlyParser, nameStatusParser, diffSummaryParsers, init_parse_diff_summary, START_BOUNDARY, COMMIT_BOUNDARY, SPLITTER, defaultFieldNames, init_parse_list_log_summary, diff_exports, init_diff, excludeOptions, init_log, MergeSummaryConflict, MergeSummaryDetail, init_MergeSummary, PullSummary, PullFailedSummary, init_PullSummary, remoteMessagesObjectParsers, init_parse_remote_objects, parsers2, RemoteMessageSummary, init_parse_remote_messages, FILE_UPDATE_REGEX, SUMMARY_REGEX, ACTION_REGEX, parsers3, errorParsers, parsePullDetail, parsePullResult, init_parse_pull, parsers4, parseMergeResult, parseMergeDetail, init_parse_merge, init_merge, parsers5, parsePushResult, parsePushDetail, init_parse_push, push_exports, init_push, init_show, fromPathRegex, FileStatusSummary, init_FileStatusSummary, StatusSummary, parsers6, parseStatusSummary, init_StatusSummary, ignoredOptions, init_status, NOT_INSTALLED, parsers7, init_version, simple_git_api_exports, SimpleGitApi, init_simple_git_api, scheduler_exports, createScheduledTask, Scheduler, init_scheduler, apply_patch_exports, init_apply_patch, BranchDeletionBatch, init_BranchDeleteSummary, deleteSuccessRegex, deleteErrorRegex, parsers8, parseBranchDeletions, init_parse_branch_delete, BranchSummaryResult, init_BranchSummary, parsers9, currentBranchParser, init_parse_branch, branch_exports, init_branch, parseCheckIgnore, init_CheckIgnore, check_ignore_exports, init_check_ignore, clone_exports, init_clone, parsers10, init_parse_fetch, fetch_exports, init_fetch, parsers11, init_parse_move, move_exports, init_move, pull_exports, init_pull, init_GetRemoteSummary, remote_exports, init_remote, stash_list_exports, init_stash_list, sub_module_exports, init_sub_module, TagList, parseTagList, init_TagList, tag_exports, init_tag, require_git, GitConstructError, GitPluginError, never, WRONG_NUMBER_ERR, WRONG_CHARS_ERR, PluginStore, Git, simpleGit;
+var import_node_buffer, import_file_exists, import_debug, import_child_process, import_promise_deferred, import_node_path, import_promise_deferred2, import_node_events, __defProp2, __getOwnPropDesc2, __getOwnPropNames2, __hasOwnProp2, __esm2, __commonJS2, __export2, __copyProps2, __toCommonJS, cache, init_pathspec, GitError, init_git_error, GitResponseError, init_git_response_error, TaskConfigurationError, init_task_configuration_error, NULL, NOOP, objectToString, init_util, filterArray, filterNumber, filterString, filterStringOrStringArray, filterHasLength, init_argument_filters, ExitCodes, init_exit_codes, GitOutputStreams, init_git_output_streams, LineParser, RemoteLineParser, init_line_parser, defaultOptions, init_simple_git_options, init_task_options, init_task_parser, utils_exports, init_utils, check_is_repo_exports, CheckRepoActions, onError, parser2, init_check_is_repo, CleanResponse, removalRegexp, dryRunRemovalRegexp, isFolderRegexp, init_CleanSummary, task_exports, EMPTY_COMMANDS, init_task, clean_exports, CONFIG_ERROR_INTERACTIVE_MODE, CONFIG_ERROR_MODE_REQUIRED, CONFIG_ERROR_UNKNOWN_OPTION, CleanOptions, CleanOptionValues, init_clean, ConfigList, init_ConfigList, GitConfigScope, init_config, DiffNameStatus, diffNameStatus, init_diff_name_status, disallowedOptions, Query, _a3, GrepQuery, init_grep, reset_exports, ResetMode, validResetModes, init_reset, init_git_logger, TasksPendingQueue, init_tasks_pending_queue, GitExecutorChain, init_git_executor_chain, git_executor_exports, GitExecutor, init_git_executor, init_task_callback, init_change_working_directory, init_checkout, parser22, init_count_objects, parsers, init_parse_commit, init_commit, init_first_commit, init_hash_object, InitSummary, initResponseRegex, reInitResponseRegex, init_InitSummary, bareCommand, init_init, logFormatRegex, init_log_format, DiffSummary, init_DiffSummary, statParser, numStatParser, nameOnlyParser, nameStatusParser, diffSummaryParsers, init_parse_diff_summary, START_BOUNDARY, COMMIT_BOUNDARY, SPLITTER, defaultFieldNames, init_parse_list_log_summary, diff_exports, init_diff, excludeOptions, init_log, MergeSummaryConflict, MergeSummaryDetail, init_MergeSummary, PullSummary, PullFailedSummary, init_PullSummary, remoteMessagesObjectParsers, init_parse_remote_objects, parsers2, RemoteMessageSummary, init_parse_remote_messages, FILE_UPDATE_REGEX, SUMMARY_REGEX, ACTION_REGEX, parsers3, errorParsers, parsePullDetail, parsePullResult, init_parse_pull, parsers4, parseMergeResult, parseMergeDetail, init_parse_merge, init_merge, parsers5, parsePushResult, parsePushDetail, init_parse_push, push_exports, init_push, init_show, fromPathRegex, FileStatusSummary, init_FileStatusSummary, StatusSummary, parsers6, parseStatusSummary, init_StatusSummary, ignoredOptions, init_status, NOT_INSTALLED, parsers7, init_version, cloneTask, cloneMirrorTask, init_clone, simple_git_api_exports, SimpleGitApi, init_simple_git_api, scheduler_exports, createScheduledTask, Scheduler, init_scheduler, apply_patch_exports, init_apply_patch, BranchDeletionBatch, init_BranchDeleteSummary, deleteSuccessRegex, deleteErrorRegex, parsers8, parseBranchDeletions, init_parse_branch_delete, BranchSummaryResult, init_BranchSummary, parsers9, currentBranchParser, init_parse_branch, branch_exports, init_branch, parseCheckIgnore, init_CheckIgnore, check_ignore_exports, init_check_ignore, parsers10, init_parse_fetch, fetch_exports, init_fetch, parsers11, init_parse_move, move_exports, init_move, pull_exports, init_pull, init_GetRemoteSummary, remote_exports, init_remote, stash_list_exports, init_stash_list, sub_module_exports, init_sub_module, TagList, parseTagList, init_TagList, tag_exports, init_tag, require_git, GitConstructError, GitPluginError, preventUnsafeConfig, never, WRONG_NUMBER_ERR, WRONG_CHARS_ERR, PluginStore, Git, simpleGit;
 var init_esm4 = __esm({
-  "../../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"() {
     "use strict";
     import_node_buffer = require("buffer");
     import_file_exists = __toESM(require_dist(), 1);
@@ -9631,7 +9642,7 @@ var init_esm4 = __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);
@@ -11010,58 +11021,54 @@ var init_esm4 = __esm({
           parser3(
             " ",
             "A",
-            (result, file) => append(result.created, file)
-          ),
-          parser3(
-            " ",
-            "D",
-            (result, file) => append(result.deleted, file)
-          ),
-          parser3(
-            " ",
-            "M",
-            (result, file) => append(result.modified, file)
+            (result, file) => result.created.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)
+            (result, file) => result.deleted.push(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",
@@ -11154,6 +11161,24 @@ var init_esm4 = __esm({
         ];
       }
     });
+    init_clone = __esm2({
+      "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);
+        };
+      }
+    });
     simple_git_api_exports = {};
     __export2(simple_git_api_exports, {
       SimpleGitApi: () => SimpleGitApi
@@ -11179,6 +11204,7 @@ var init_esm4 = __esm({
         init_task();
         init_version();
         init_utils();
+        init_clone();
         SimpleGitApi = class {
           constructor(_executor) {
             this._executor = _executor;
@@ -11281,6 +11307,7 @@ var init_esm4 = __esm({
         Object.assign(
           SimpleGitApi.prototype,
           checkout_default(),
+          clone_default(),
           commit_default(),
           config_default(),
           count_objects_default(),
@@ -11484,18 +11511,6 @@ var init_esm4 = __esm({
         init_CheckIgnore();
       }
     });
-    clone_exports = {};
-    __export2(clone_exports, {
-      cloneMirrorTask: () => cloneMirrorTask,
-      cloneTask: () => cloneTask
-    });
-    init_clone = __esm2({
-      "src/lib/tasks/clone.ts"() {
-        "use strict";
-        init_task();
-        init_utils();
-      }
-    });
     init_parse_fetch = __esm2({
       "src/lib/parsers/parse-fetch.ts"() {
         "use strict";
@@ -11677,7 +11692,7 @@ var init_esm4 = __esm({
         var { GitExecutor: GitExecutor2 } = (init_git_executor(), __toCommonJS(git_executor_exports));
         var { SimpleGitApi: SimpleGitApi2 } = (init_simple_git_api(), __toCommonJS(simple_git_api_exports));
         var { Scheduler: Scheduler2 } = (init_scheduler(), __toCommonJS(scheduler_exports));
-        var { configurationErrorTask: configurationErrorTask2 } = (init_task(), __toCommonJS(task_exports));
+        var { adhocExecTask: adhocExecTask2, configurationErrorTask: configurationErrorTask2 } = (init_task(), __toCommonJS(task_exports));
         var {
           asArray: asArray2,
           filterArray: filterArray2,
@@ -11698,7 +11713,6 @@ var init_esm4 = __esm({
         } = (init_branch(), __toCommonJS(branch_exports));
         var { checkIgnoreTask: checkIgnoreTask2 } = (init_check_ignore(), __toCommonJS(check_ignore_exports));
         var { checkIsRepoTask: checkIsRepoTask2 } = (init_check_is_repo(), __toCommonJS(check_is_repo_exports));
-        var { cloneTask: cloneTask2, cloneMirrorTask: cloneMirrorTask2 } = (init_clone(), __toCommonJS(clone_exports));
         var { cleanWithOptionsTask: cleanWithOptionsTask2, isCleanOptionsArray: isCleanOptionsArray2 } = (init_clean(), __toCommonJS(clean_exports));
         var { diffSummaryTask: diffSummaryTask2 } = (init_diff(), __toCommonJS(diff_exports));
         var { fetchTask: fetchTask2 } = (init_fetch(), __toCommonJS(fetch_exports));
@@ -11753,24 +11767,6 @@ var init_esm4 = __esm({
             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));
         };
@@ -11803,10 +11799,13 @@ var init_esm4 = __esm({
           );
         };
         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(
@@ -12032,7 +12031,13 @@ var init_esm4 = __esm({
           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(
@@ -12075,6 +12080,17 @@ var init_esm4 = __esm({
     init_diff_name_status();
     init_grep();
     init_reset();
+    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")
+    ];
     init_utils();
     init_utils();
     never = (0, import_promise_deferred2.deferred)().promise;
@@ -19568,7 +19584,7 @@ var init_diff3 = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/@fern-api+replay@0.6.2/node_modules/@fern-api/replay/dist/index.js
+// ../../node_modules/.pnpm/@fern-api+replay@0.7.0/node_modules/@fern-api/replay/dist/index.js
 var dist_exports = {};
 __export(dist_exports, {
   FERN_BOT_EMAIL: () => FERN_BOT_EMAIL2,
@@ -19891,17 +19907,82 @@ async function resolve7(outputDir, options) {
     return { success: false, reason: "no-patches" };
   }
   const git = new GitClient(outputDir);
+  const unresolvedPatches = lockManager.getUnresolvedPatches();
+  const resolvingPatches = lockManager.getResolvingPatches();
+  if (unresolvedPatches.length > 0) {
+    const applicator = new ReplayApplicator(git, lockManager, outputDir);
+    await applicator.applyPatches(unresolvedPatches);
+    const markerFiles = await findConflictMarkerFiles(git);
+    if (markerFiles.length > 0) {
+      for (const patch of unresolvedPatches) {
+        lockManager.updatePatch(patch.id, { status: "resolving" });
+      }
+      lockManager.save();
+      return {
+        success: false,
+        reason: "conflicts-applied",
+        unresolvedFiles: markerFiles,
+        phase: "applied",
+        patchesApplied: unresolvedPatches.length
+      };
+    }
+  }
   if (options?.checkMarkers !== false) {
-    const markerFiles = await git.exec(["grep", "-l", "<<<<<<<", "--", "."]).catch(() => "");
-    if (markerFiles.trim()) {
-      const files = markerFiles.trim().split("\n").filter(Boolean);
-      return { success: false, reason: "unresolved-conflicts", unresolvedFiles: files };
+    const currentMarkerFiles = await findConflictMarkerFiles(git);
+    if (currentMarkerFiles.length > 0) {
+      return { success: false, reason: "unresolved-conflicts", unresolvedFiles: currentMarkerFiles };
+    }
+  }
+  const patchesToCommit = [...resolvingPatches, ...unresolvedPatches];
+  if (patchesToCommit.length > 0) {
+    const currentGen = lock.current_generation;
+    const detector = new ReplayDetector(git, lockManager, outputDir);
+    let patchesResolved = 0;
+    for (const patch of patchesToCommit) {
+      const diff = await git.exec(["diff", currentGen, "--", ...patch.files]).catch(() => null);
+      if (!diff || !diff.trim()) {
+        lockManager.removePatch(patch.id);
+        continue;
+      }
+      const newContentHash = detector.computeContentHash(diff);
+      const changedFiles = await getChangedFiles(git, currentGen, patch.files);
+      lockManager.markPatchResolved(patch.id, {
+        patch_content: diff,
+        content_hash: newContentHash,
+        base_generation: currentGen,
+        files: changedFiles
+      });
+      patchesResolved++;
     }
+    lockManager.save();
+    const committer2 = new ReplayCommitter(git, outputDir);
+    await committer2.stageAll();
+    const commitSha2 = await committer2.commitReplay(
+      lock.patches.length,
+      lock.patches,
+      "[fern-replay] Resolved conflicts"
+    );
+    return {
+      success: true,
+      commitSha: commitSha2,
+      phase: "committed",
+      patchesResolved
+    };
   }
   const committer = new ReplayCommitter(git, outputDir);
   await committer.stageAll();
   const commitSha = await committer.commitReplay(lock.patches.length, lock.patches);
-  return { success: true, commitSha };
+  return { success: true, commitSha, phase: "committed" };
+}
+async function findConflictMarkerFiles(git) {
+  const output = await git.exec(["grep", "-l", "<<<<<<<", "--", "."]).catch(() => "");
+  return output.trim() ? output.trim().split("\n").filter(Boolean) : [];
+}
+async function getChangedFiles(git, currentGen, files) {
+  const filesOutput = await git.exec(["diff", "--name-only", currentGen, "--", ...files]).catch(() => null);
+  if (!filesOutput || !filesOutput.trim()) return files;
+  const changed = filesOutput.trim().split("\n").filter(Boolean).filter((f) => !f.startsWith(".fern/"));
+  return changed.length > 0 ? changed : files;
 }
 function status(outputDir) {
   const lockManager = new LockfileManager(outputDir);
@@ -19927,7 +20008,7 @@ function status(outputDir) {
 }
 var import_fs6, import_path8, import_yaml, import_crypto, import_promises4, import_os, import_path9, import_fs7, import_path10, import_crypto2, import_fs8, import_path11, import_yaml2, import_crypto3, import_fs9, import_path12, import_fs10, __defProp3, __getOwnPropNames3, __esm3, __export3, GitClient_exports, GitClient, init_GitClient, FERN_BOT_NAME2, FERN_BOT_EMAIL2, FERN_BOT_LOGIN2, FERN_SUPPORT_NAMES, LOCKFILE_HEADER, LockfileManager, INFRASTRUCTURE_FILES, ReplayDetector, BINARY_EXTENSIONS, ReplayApplicator, ReplayCommitter, ReplayService, FernignoreMigrator, REPLAY_FERNIGNORE_ENTRIES;
 var init_dist = __esm({
-  "../../node_modules/.pnpm/@fern-api+replay@0.6.2/node_modules/@fern-api/replay/dist/index.js"() {
+  "../../node_modules/.pnpm/@fern-api+replay@0.7.0/node_modules/@fern-api/replay/dist/index.js"() {
     "use strict";
     init_esm4();
     import_fs6 = require("fs");
@@ -20158,6 +20239,26 @@ var init_dist = __esm({
         this.ensureLoaded();
         this.lock.patches = [];
       }
+      getUnresolvedPatches() {
+        this.ensureLoaded();
+        return this.lock.patches.filter((p) => p.status === "unresolved");
+      }
+      getResolvingPatches() {
+        this.ensureLoaded();
+        return this.lock.patches.filter((p) => p.status === "resolving");
+      }
+      markPatchUnresolved(patchId) {
+        this.updatePatch(patchId, { status: "unresolved" });
+      }
+      markPatchResolved(patchId, updates) {
+        this.ensureLoaded();
+        const patch = this.lock.patches.find((p) => p.id === patchId);
+        if (!patch) {
+          throw new Error(`Patch not found: ${patchId}`);
+        }
+        delete patch.status;
+        Object.assign(patch, updates);
+      }
       getPatches() {
         this.ensureLoaded();
         return this.lock.patches;
@@ -20801,12 +20902,12 @@ CLI Version: ${options.cliVersion}`;
         await this.git.exec(["commit", "-m", fullMessage]);
         return (await this.git.exec(["rev-parse", "HEAD"])).trim();
       }
-      async commitReplay(_patchCount, patches) {
+      async commitReplay(_patchCount, patches, message) {
         await this.stageAll();
         if (!await this.hasStagedChanges()) {
           return (await this.git.exec(["rev-parse", "HEAD"])).trim();
         }
-        let fullMessage = `[fern-replay] Applied customizations`;
+        let fullMessage = message ?? `[fern-replay] Applied customizations`;
         if (patches && patches.length > 0) {
           fullMessage += "\n\nPatches replayed:";
           for (const patch of patches) {
@@ -20896,13 +20997,27 @@ CLI Version: ${options.cliVersion}`;
           this.lockManager.initializeInMemory(record2);
         } else {
           this.lockManager.read();
+          const unresolvedPatches = [
+            ...this.lockManager.getUnresolvedPatches(),
+            ...this.lockManager.getResolvingPatches()
+          ];
           this.lockManager.addGeneration(record2);
           this.lockManager.clearPatches();
+          for (const patch of unresolvedPatches) {
+            this.lockManager.addPatch(patch);
+          }
         }
         this.lockManager.save();
         try {
           const redetectedPatches = await this.detector.detectNewPatches();
           if (redetectedPatches.length > 0) {
+            const redetectedFiles = new Set(redetectedPatches.flatMap((p) => p.files));
+            const currentPatches = this.lockManager.getPatches();
+            for (const patch of currentPatches) {
+              if (patch.status != null && patch.files.some((f) => redetectedFiles.has(f))) {
+                this.lockManager.removePatch(patch.id);
+              }
+            }
             for (const patch of redetectedPatches) {
               this.lockManager.addPatch(patch);
             }
@@ -21010,6 +21125,12 @@ CLI Version: ${options.cliVersion}`;
         let results = [];
         if (newPatches.length > 0) {
           results = await this.applicator.applyPatches(newPatches);
+          this.revertConflictingFiles(results);
+          for (const result of results) {
+            if (result.status === "conflict") {
+              result.patch.status = "unresolved";
+            }
+          }
         }
         const rebaseCounts = await this.rebasePatches(results, genRecord.commit_sha);
         for (const patch of newPatches) {
@@ -21020,10 +21141,8 @@ CLI Version: ${options.cliVersion}`;
         this.lockManager.save();
         if (newPatches.length > 0) {
           if (!options?.stageOnly) {
-            const appliedCount = results.filter((r) => r.status === "applied" || r.status === "conflict").length;
-            if (appliedCount > 0) {
-              await this.committer.commitReplay(appliedCount, newPatches);
-            }
+            const appliedCount = results.filter((r) => r.status === "applied").length;
+            await this.committer.commitReplay(appliedCount, newPatches);
           } else {
             await this.committer.stageAll();
           }
@@ -21071,20 +21190,32 @@ CLI Version: ${options.cliVersion}`;
         const genRecord = await this.committer.createGenerationRecord(commitOpts);
         this.lockManager.addGeneration(genRecord);
         const results = await this.applicator.applyPatches(allPatches);
+        this.revertConflictingFiles(results);
+        for (const result of results) {
+          if (result.status === "conflict") {
+            result.patch.status = "unresolved";
+          }
+        }
         const rebaseCounts = await this.rebasePatches(results, genRecord.commit_sha);
         for (const patch of newPatches) {
           if (!rebaseCounts.absorbedPatchIds.has(patch.id)) {
             this.lockManager.addPatch(patch);
           }
         }
+        for (const result of results) {
+          if (result.status === "conflict") {
+            try {
+              this.lockManager.markPatchUnresolved(result.patch.id);
+            } catch {
+            }
+          }
+        }
         this.lockManager.save();
         if (options?.stageOnly) {
           await this.committer.stageAll();
         } else {
-          const appliedCount = results.filter((r) => r.status === "applied" || r.status === "conflict").length;
-          if (appliedCount > 0) {
-            await this.committer.commitReplay(appliedCount, allPatches);
-          }
+          const appliedCount = results.filter((r) => r.status === "applied").length;
+          await this.committer.commitReplay(appliedCount, allPatches);
         }
         return this.buildReport(
           "normal-regeneration",
@@ -21232,6 +21363,10 @@ CLI Version: ${options.cliVersion}`;
         let conflictAbsorbed = 0;
         let contentRefreshed = 0;
         for (const patch of patches) {
+          if (patch.status != null) {
+            delete patch.status;
+            continue;
+          }
           if (patch.base_generation === currentGen) {
             try {
               const diff = await this.git.exec(["diff", currentGen, "HEAD", "--", ...patch.files]).catch(() => null);
@@ -21282,6 +21417,55 @@ CLI Version: ${options.cliVersion}`;
         }
         return { conflictResolved, conflictAbsorbed, contentRefreshed };
       }
+      /**
+       * Strip conflict markers from file content, keeping the OURS (Generated) side.
+       * Preserves clean patches' non-conflicting changes on shared files.
+       */
+      stripConflictMarkers(content) {
+        const lines = content.split("\n");
+        const result = [];
+        let inConflict = false;
+        let inOurs = false;
+        for (const line of lines) {
+          if (line.startsWith("<<<<<<< ")) {
+            inConflict = true;
+            inOurs = true;
+            continue;
+          }
+          if (inConflict && line === "=======") {
+            inOurs = false;
+            continue;
+          }
+          if (inConflict && line.startsWith(">>>>>>> ")) {
+            inConflict = false;
+            inOurs = false;
+            continue;
+          }
+          if (!inConflict || inOurs) {
+            result.push(line);
+          }
+        }
+        return result.join("\n");
+      }
+      /**
+       * After applyPatches(), strip conflict markers from conflicting files
+       * so only clean content is committed. Keeps the Generated (OURS) side.
+       */
+      revertConflictingFiles(results) {
+        for (const result of results) {
+          if (result.status !== "conflict" || !result.fileResults) continue;
+          for (const fileResult of result.fileResults) {
+            if (fileResult.status !== "conflict") continue;
+            const filePath = (0, import_path10.join)(this.outputDir, fileResult.file);
+            try {
+              const content = (0, import_fs7.readFileSync)(filePath, "utf-8");
+              const stripped = this.stripConflictMarkers(content);
+              (0, import_fs7.writeFileSync)(filePath, stripped);
+            } catch {
+            }
+          }
+        }
+      }
       readFernignorePatterns() {
         const fernignorePath = (0, import_path10.join)(this.outputDir, ".fernignore");
         if (!(0, import_fs7.existsSync)(fernignorePath)) return [];
@@ -21316,6 +21500,12 @@ CLI Version: ${options.cliVersion}`;
           patchesRefreshed: preRebaseCounts && preRebaseCounts.contentRefreshed > 0 ? preRebaseCounts.contentRefreshed : void 0,
           conflicts: conflictResults.flatMap((r) => r.fileResults?.filter((f) => f.status === "conflict") ?? []),
           conflictDetails: conflictDetails.length > 0 ? conflictDetails : void 0,
+          unresolvedPatches: conflictResults.length > 0 ? conflictResults.map((r) => ({
+            patchId: r.patch.id,
+            patchMessage: r.patch.original_message,
+            files: r.patch.files,
+            conflictDetails: r.fileResults?.filter((f) => f.status === "conflict") ?? []
+          })) : void 0,
           wouldApply: options?.dryRun ? patches : void 0,
           warnings: warnings && warnings.length > 0 ? warnings : void 0
         };
@@ -21514,6 +21704,21 @@ CLI Version: ${options.cliVersion}`;
   }
 });
 
+// ../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/path-utils/lib/convertToOsPath.js
 function convertToOsPath(path5) {
   return path5.replace(/\\/g, "/");
@@ -23464,7 +23669,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 });
 }
@@ -23545,7 +23750,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}`);
@@ -27227,9 +27432,6 @@ async function githubRelease(params) {
   await github.release();
 }
 
-// src/api/generate-readme.ts
-var import_node_stream = require("stream");
-
 // ../../node_modules/.pnpm/es-toolkit@1.44.0/node_modules/es-toolkit/dist/predicate/isLength.mjs
 function isLength(value) {
   return Number.isSafeInteger(value) && value >= 0;
@@ -30048,16 +30250,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 = [];
@@ -30507,7 +30718,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();
@@ -30927,9 +31138,6 @@ async function generateReadmeToStream(params) {
   });
 }
 
-// src/api/generate-reference.ts
-var import_node_stream2 = require("stream");
-
 // src/reference/ReferenceGenerator.ts
 var ReferenceGenerator = class {
   referenceConfig;
@@ -30940,6 +31148,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({
@@ -30950,7 +31168,6 @@ var ReferenceGenerator = class {
     for (const section of this.referenceConfig.sections) {
       await this.writeSection({ section, writer });
     }
-    await writer.end();
   }
   async writeRootSection({
     section,
@@ -31090,41 +31307,19 @@ var import_path7 = 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
@@ -31170,7 +31365,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;
   }
 }
@@ -31197,16 +31392,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 };
 }
 
@@ -31219,11 +31420,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";
   }
@@ -31232,7 +31433,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 formatReplayPrBody(result, options) {
@@ -31241,70 +31442,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**
+#### How to resolve
 `);
-    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");
 }
@@ -31434,22 +31631,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}`);
@@ -31465,13 +31658,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,
@@ -31479,14 +31669,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 {
@@ -31494,17 +31683,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) {
@@ -31550,198 +31728,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 status2 = (f.status ?? "").toLowerCase();
-      const reason = (f.conflictReason ?? "").toLowerCase();
-      return status2 === "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 attempt2 = 0; attempt2 < MERGEABLE_POLL_MAX_ATTEMPTS; attempt2++) {
-      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 (attempt2 < 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((resolve8) => setTimeout(resolve8, ms));
-}
 
 // src/replay/replay-run.ts
 init_dist();
@@ -31950,8 +31947,7 @@ var ReplayStep = class extends BaseStep {
         flow: "first-generation",
         patchesDetected: 0,
         patchesApplied: 0,
-        patchesWithConflicts: 0,
-        conflicts: []
+        patchesWithConflicts: 0
       };
     }
     const report = result.report;
@@ -31969,22 +31965,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
         }))
       })),
@@ -32055,7 +32041,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}`);
       }
     }
@@ -32248,6 +32234,9 @@ function buildPrBody(result) {
   return lines.join("\n");
 }
 
+// src/replay/replay-resolve.ts
+init_dist();
+
 // src/configuration/loadGitHubConfig.ts
 var import_promises6 = require("fs/promises");
 async function loadGitHubConfig({
@@ -32432,7 +32421,7 @@ void yargs_default(hideBin(process.argv)).scriptName(process.env.CLI_NAME ?? "ge
         try {
           config = JSON.parse(configContent);
         } catch (parseError) {
-          const parseMessage = parseError instanceof Error ? parseError.message : String(parseError);
+          const parseMessage = extractErrorMessage(parseError);
           throw new Error(`Failed to parse pipeline config as JSON: ${parseMessage}`);
         }
         config.outputDir = resolve(wd, argv["output-dir"]);
@@ -32466,7 +32455,7 @@ ${result.errors.map((e) => `  - ${e}`).join("\n")}
         process.stdout.write(JSON.stringify(result) + "\n");
         process.exitCode = result.success ? 0 : 1;
       } catch (error) {
-        const errorMessage = error instanceof Error ? error.message : String(error);
+        const errorMessage = extractErrorMessage(error);
         process.stderr.write(`Pipeline failed: ${errorMessage}
 `);
         process.exitCode = 1;
@@ -32545,7 +32534,7 @@ ${result.errors.map((e) => `  - ${e}`).join("\n")}
           process.stdout.write(JSON.stringify(result, null, 2) + "\n");
           process.exit(0);
         } catch (error) {
-          const errorMessage = error instanceof Error ? error.message : String(error);
+          const errorMessage = extractErrorMessage(error);
           process.stderr.write(`Replay init failed: ${errorMessage}
 `);
           process.exit(1);
@@ -32627,7 +32616,7 @@ Bootstrap complete! Lockfile saved to ${outputDir}/.fern/replay.lock
           }
           process.exit(0);
         } catch (error) {
-          const errorMessage = error instanceof Error ? error.message : String(error);
+          const errorMessage = extractErrorMessage(error);
           process.stderr.write(`Bootstrap failed: ${errorMessage}
 `);
           process.exit(1);