@fern-api/generator-cli 0.6.9 → 0.6.11

package/dist/cli.js

@@ -258,10 +258,10 @@ var init_esm2 = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/minimatch@10.2.2/node_modules/minimatch/dist/esm/assert-valid-pattern.js
+// ../../node_modules/.pnpm/minimatch@10.2.4/node_modules/minimatch/dist/esm/assert-valid-pattern.js
 var MAX_PATTERN_LENGTH, assertValidPattern;
 var init_assert_valid_pattern = __esm({
-  "../../node_modules/.pnpm/minimatch@10.2.2/node_modules/minimatch/dist/esm/assert-valid-pattern.js"() {
+  "../../node_modules/.pnpm/minimatch@10.2.4/node_modules/minimatch/dist/esm/assert-valid-pattern.js"() {
     "use strict";
     MAX_PATTERN_LENGTH = 1024 * 64;
     assertValidPattern = (pattern) => {
@@ -275,10 +275,10 @@ var init_assert_valid_pattern = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/minimatch@10.2.2/node_modules/minimatch/dist/esm/brace-expressions.js
+// ../../node_modules/.pnpm/minimatch@10.2.4/node_modules/minimatch/dist/esm/brace-expressions.js
 var posixClasses, braceEscape, regexpEscape, rangesToString, parseClass;
 var init_brace_expressions = __esm({
-  "../../node_modules/.pnpm/minimatch@10.2.2/node_modules/minimatch/dist/esm/brace-expressions.js"() {
+  "../../node_modules/.pnpm/minimatch@10.2.4/node_modules/minimatch/dist/esm/brace-expressions.js"() {
     "use strict";
     posixClasses = {
       "[:alnum:]": ["\\p{L}\\p{Nl}\\p{Nd}", true],
@@ -390,10 +390,10 @@ var init_brace_expressions = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/minimatch@10.2.2/node_modules/minimatch/dist/esm/unescape.js
+// ../../node_modules/.pnpm/minimatch@10.2.4/node_modules/minimatch/dist/esm/unescape.js
 var unescape;
 var init_unescape = __esm({
-  "../../node_modules/.pnpm/minimatch@10.2.2/node_modules/minimatch/dist/esm/unescape.js"() {
+  "../../node_modules/.pnpm/minimatch@10.2.4/node_modules/minimatch/dist/esm/unescape.js"() {
     "use strict";
     unescape = (s, { windowsPathsNoEscape = false, magicalBraces = true } = {}) => {
       if (magicalBraces) {
@@ -404,15 +404,62 @@ var init_unescape = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/minimatch@10.2.2/node_modules/minimatch/dist/esm/ast.js
-var types, isExtglobType, startNoTraversal, startNoDot, addPatternStart, justDots, reSpecials, regExpEscape, qmark, star, starNoEmpty, AST;
+// ../../node_modules/.pnpm/minimatch@10.2.4/node_modules/minimatch/dist/esm/ast.js
+var _a, types, isExtglobType, isExtglobAST, adoptionMap, adoptionWithSpaceMap, adoptionAnyMap, usurpMap, startNoTraversal, startNoDot, addPatternStart, justDots, reSpecials, regExpEscape, qmark, star, starNoEmpty, ID, AST;
 var init_ast = __esm({
-  "../../node_modules/.pnpm/minimatch@10.2.2/node_modules/minimatch/dist/esm/ast.js"() {
+  "../../node_modules/.pnpm/minimatch@10.2.4/node_modules/minimatch/dist/esm/ast.js"() {
     "use strict";
     init_brace_expressions();
     init_unescape();
     types = /* @__PURE__ */ new Set(["!", "?", "+", "*", "@"]);
     isExtglobType = (c) => types.has(c);
+    isExtglobAST = (c) => isExtglobType(c.type);
+    adoptionMap = /* @__PURE__ */ new Map([
+      ["!", ["@"]],
+      ["?", ["?", "@"]],
+      ["@", ["@"]],
+      ["*", ["*", "+", "?", "@"]],
+      ["+", ["+", "@"]]
+    ]);
+    adoptionWithSpaceMap = /* @__PURE__ */ new Map([
+      ["!", ["?"]],
+      ["@", ["?"]],
+      ["+", ["?", "*"]]
+    ]);
+    adoptionAnyMap = /* @__PURE__ */ new Map([
+      ["!", ["?", "@"]],
+      ["?", ["?", "@"]],
+      ["@", ["?", "@"]],
+      ["*", ["*", "+", "?", "@"]],
+      ["+", ["+", "@", "?", "*"]]
+    ]);
+    usurpMap = /* @__PURE__ */ new Map([
+      ["!", /* @__PURE__ */ new Map([["!", "@"]])],
+      [
+        "?",
+        /* @__PURE__ */ new Map([
+          ["*", "*"],
+          ["+", "*"]
+        ])
+      ],
+      [
+        "@",
+        /* @__PURE__ */ new Map([
+          ["!", "!"],
+          ["?", "?"],
+          ["@", "@"],
+          ["*", "*"],
+          ["+", "+"]
+        ])
+      ],
+      [
+        "+",
+        /* @__PURE__ */ new Map([
+          ["?", "*"],
+          ["*", "*"]
+        ])
+      ]
+    ]);
     startNoTraversal = "(?!(?:^|/)\\.\\.?(?:$|/))";
     startNoDot = "(?!\\.)";
     addPatternStart = /* @__PURE__ */ new Set(["[", "."]);
@@ -422,7 +469,8 @@ var init_ast = __esm({
     qmark = "[^/]";
     star = qmark + "*?";
     starNoEmpty = qmark + "+?";
-    AST = class _AST {
+    ID = 0;
+    AST = class {
       type;
       #root;
       #hasMagic;
@@ -437,6 +485,22 @@ var init_ast = __esm({
       // set to true if it's an extglob with no children
       // (which really means one child of '')
       #emptyExt = false;
+      id = ++ID;
+      get depth() {
+        return (this.#parent?.depth ?? -1) + 1;
+      }
+      [/* @__PURE__ */ Symbol.for("nodejs.util.inspect.custom")]() {
+        return {
+          "@@type": "AST",
+          id: this.id,
+          type: this.type,
+          root: this.#root.id,
+          parent: this.#parent?.id,
+          depth: this.depth,
+          partsLength: this.#parts.length,
+          parts: this.#parts
+        };
+      }
       constructor(type, parent, options = {}) {
         this.type = type;
         if (type)
@@ -502,7 +566,7 @@ var init_ast = __esm({
         for (const p of parts) {
           if (p === "")
             continue;
-          if (typeof p !== "string" && !(p instanceof _AST && p.#parent === this)) {
+          if (typeof p !== "string" && !(p instanceof _a && p.#parent === this)) {
             throw new Error("invalid part: " + p);
           }
           this.#parts.push(p);
@@ -527,7 +591,7 @@ var init_ast = __esm({
         const p = this.#parent;
         for (let i = 0; i < this.#parentIndex; i++) {
           const pp = p.#parts[i];
-          if (!(pp instanceof _AST && pp.type === "!")) {
+          if (!(pp instanceof _a && pp.type === "!")) {
             return false;
           }
         }
@@ -552,13 +616,14 @@ var init_ast = __esm({
           this.push(part.clone(this));
       }
       clone(parent) {
-        const c = new _AST(this.type, parent);
+        const c = new _a(this.type, parent);
         for (const p of this.#parts) {
           c.copyIn(p);
         }
         return c;
       }
-      static #parseAST(str, ast, pos, opt) {
+      static #parseAST(str, ast, pos, opt, extDepth) {
+        const maxDepth = opt.maxExtglobRecursion ?? 2;
         let escaping = false;
         let inBrace = false;
         let braceStart = -1;
@@ -590,11 +655,12 @@ var init_ast = __esm({
               acc2 += c;
               continue;
             }
-            if (!opt.noext && isExtglobType(c) && str.charAt(i2) === "(") {
+            const doRecurse = !opt.noext && isExtglobType(c) && str.charAt(i2) === "(" && extDepth <= maxDepth;
+            if (doRecurse) {
               ast.push(acc2);
               acc2 = "";
-              const ext2 = new _AST(c, ast);
-              i2 = _AST.#parseAST(str, ext2, i2, opt);
+              const ext2 = new _a(c, ast);
+              i2 = _a.#parseAST(str, ext2, i2, opt, extDepth + 1);
               ast.push(ext2);
               continue;
             }
@@ -604,7 +670,7 @@ var init_ast = __esm({
           return i2;
         }
         let i = pos + 1;
-        let part = new _AST(null, ast);
+        let part = new _a(null, ast);
         const parts = [];
         let acc = "";
         while (i < str.length) {
@@ -631,19 +697,22 @@ var init_ast = __esm({
             acc += c;
             continue;
           }
-          if (isExtglobType(c) && str.charAt(i) === "(") {
+          const doRecurse = !opt.noext && isExtglobType(c) && str.charAt(i) === "(" && /* c8 ignore start - the maxDepth is sufficient here */
+          (extDepth <= maxDepth || ast && ast.#canAdoptType(c));
+          if (doRecurse) {
+            const depthAdd = ast && ast.#canAdoptType(c) ? 0 : 1;
             part.push(acc);
             acc = "";
-            const ext2 = new _AST(c, part);
+            const ext2 = new _a(c, part);
             part.push(ext2);
-            i = _AST.#parseAST(str, ext2, i, opt);
+            i = _a.#parseAST(str, ext2, i, opt, extDepth + depthAdd);
             continue;
           }
           if (c === "|") {
             part.push(acc);
             acc = "";
             parts.push(part);
-            part = new _AST(null, ast);
+            part = new _a(null, ast);
             continue;
           }
           if (c === ")") {
@@ -662,9 +731,71 @@ var init_ast = __esm({
         ast.#parts = [str.substring(pos - 1)];
         return i;
       }
+      #canAdoptWithSpace(child) {
+        return this.#canAdopt(child, adoptionWithSpaceMap);
+      }
+      #canAdopt(child, map = adoptionMap) {
+        if (!child || typeof child !== "object" || child.type !== null || child.#parts.length !== 1 || this.type === null) {
+          return false;
+        }
+        const gc = child.#parts[0];
+        if (!gc || typeof gc !== "object" || gc.type === null) {
+          return false;
+        }
+        return this.#canAdoptType(gc.type, map);
+      }
+      #canAdoptType(c, map = adoptionAnyMap) {
+        return !!map.get(this.type)?.includes(c);
+      }
+      #adoptWithSpace(child, index) {
+        const gc = child.#parts[0];
+        const blank = new _a(null, gc, this.options);
+        blank.#parts.push("");
+        gc.push(blank);
+        this.#adopt(child, index);
+      }
+      #adopt(child, index) {
+        const gc = child.#parts[0];
+        this.#parts.splice(index, 1, ...gc.#parts);
+        for (const p of gc.#parts) {
+          if (typeof p === "object")
+            p.#parent = this;
+        }
+        this.#toString = void 0;
+      }
+      #canUsurpType(c) {
+        const m = usurpMap.get(this.type);
+        return !!m?.has(c);
+      }
+      #canUsurp(child) {
+        if (!child || typeof child !== "object" || child.type !== null || child.#parts.length !== 1 || this.type === null || this.#parts.length !== 1) {
+          return false;
+        }
+        const gc = child.#parts[0];
+        if (!gc || typeof gc !== "object" || gc.type === null) {
+          return false;
+        }
+        return this.#canUsurpType(gc.type);
+      }
+      #usurp(child) {
+        const m = usurpMap.get(this.type);
+        const gc = child.#parts[0];
+        const nt = m?.get(gc.type);
+        if (!nt)
+          return false;
+        this.#parts = gc.#parts;
+        for (const p of this.#parts) {
+          if (typeof p === "object") {
+            p.#parent = this;
+          }
+        }
+        this.type = nt;
+        this.#toString = void 0;
+        this.#emptyExt = false;
+      }
       static fromGlob(pattern, options = {}) {
-        const ast = new _AST(null, void 0, options);
-        _AST.#parseAST(pattern, ast, 0, options);
+        const ast = new _a(null, void 0, options);
+        _a.#parseAST(pattern, ast, 0, options, 0);
         return ast;
       }
       // returns the regular expression if there's magic, or the unescaped
@@ -758,12 +889,14 @@ var init_ast = __esm({
       // or start or whatever) and prepend ^ or / at the Regexp construction.
       toRegExpSource(allowDot) {
         const dot = allowDot ?? !!this.#options.dot;
-        if (this.#root === this)
+        if (this.#root === this) {
+          this.#flatten();
           this.#fillNegs();
-        if (!this.type) {
+        }
+        if (!isExtglobAST(this)) {
           const noEmpty = this.isStart() && this.isEnd() && !this.#parts.some((s) => typeof s !== "string");
           const src = this.#parts.map((p) => {
-            const [re, _, hasMagic, uflag] = typeof p === "string" ? _AST.#parseGlob(p, this.#hasMagic, noEmpty) : p.toRegExpSource(allowDot);
+            const [re, _, hasMagic, uflag] = typeof p === "string" ? _a.#parseGlob(p, this.#hasMagic, noEmpty) : p.toRegExpSource(allowDot);
             this.#hasMagic = this.#hasMagic || hasMagic;
             this.#uflag = this.#uflag || uflag;
             return re;
@@ -802,9 +935,10 @@ var init_ast = __esm({
         let body = this.#partsToRegExp(dot);
         if (this.isStart() && this.isEnd() && !body && this.type !== "!") {
           const s = this.toString();
-          this.#parts = [s];
-          this.type = null;
-          this.#hasMagic = void 0;
+          const me = this;
+          me.#parts = [s];
+          me.type = null;
+          me.#hasMagic = void 0;
           return [s, unescape(this.toString()), false, false];
         }
         let bodyDotAllowed = !repeated || allowDot || dot || !startNoDot ? "" : this.#partsToRegExp(true);
@@ -831,6 +965,38 @@ var init_ast = __esm({
           this.#uflag
         ];
       }
+      #flatten() {
+        if (!isExtglobAST(this)) {
+          for (const p of this.#parts) {
+            if (typeof p === "object") {
+              p.#flatten();
+            }
+          }
+        } else {
+          let iterations = 0;
+          let done = false;
+          do {
+            done = true;
+            for (let i = 0; i < this.#parts.length; i++) {
+              const c = this.#parts[i];
+              if (typeof c === "object") {
+                c.#flatten();
+                if (this.#canAdopt(c)) {
+                  done = false;
+                  this.#adopt(c, i);
+                } else if (this.#canAdoptWithSpace(c)) {
+                  done = false;
+                  this.#adoptWithSpace(c, i);
+                } else if (this.#canUsurp(c)) {
+                  done = false;
+                  this.#usurp(c);
+                }
+              }
+            }
+          } while (!done && ++iterations < 10);
+        }
+        this.#toString = void 0;
+      }
       #partsToRegExp(dot) {
         return this.#parts.map((p) => {
           if (typeof p === "string") {
@@ -891,13 +1057,14 @@ var init_ast = __esm({
         return [re, unescape(glob), !!hasMagic, uflag];
       }
     };
+    _a = AST;
   }
 });
 
-// ../../node_modules/.pnpm/minimatch@10.2.2/node_modules/minimatch/dist/esm/escape.js
+// ../../node_modules/.pnpm/minimatch@10.2.4/node_modules/minimatch/dist/esm/escape.js
 var escape;
 var init_escape = __esm({
-  "../../node_modules/.pnpm/minimatch@10.2.2/node_modules/minimatch/dist/esm/escape.js"() {
+  "../../node_modules/.pnpm/minimatch@10.2.4/node_modules/minimatch/dist/esm/escape.js"() {
     "use strict";
     escape = (s, { windowsPathsNoEscape = false, magicalBraces = false } = {}) => {
       if (magicalBraces) {
@@ -908,10 +1075,10 @@ var init_escape = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/minimatch@10.2.2/node_modules/minimatch/dist/esm/index.js
+// ../../node_modules/.pnpm/minimatch@10.2.4/node_modules/minimatch/dist/esm/index.js
 var minimatch, starDotExtRE, starDotExtTest, starDotExtTestDot, starDotExtTestNocase, starDotExtTestNocaseDot, starDotStarRE, starDotStarTest, starDotStarTestDot, dotStarRE, dotStarTest, starRE, starTest, starTestDot, qmarksRE, qmarksTestNocase, qmarksTestNocaseDot, qmarksTestDot, qmarksTest, qmarksTestNoExt, qmarksTestNoExtDot, defaultPlatform, path, sep, GLOBSTAR, qmark2, star2, twoStarDot, twoStarNoDot, filter, ext, defaults, braceExpand, makeRe, match, globMagic, regExpEscape2, Minimatch;
 var init_esm3 = __esm({
-  "../../node_modules/.pnpm/minimatch@10.2.2/node_modules/minimatch/dist/esm/index.js"() {
+  "../../node_modules/.pnpm/minimatch@10.2.4/node_modules/minimatch/dist/esm/index.js"() {
     "use strict";
     init_esm2();
     init_assert_valid_pattern();
@@ -1069,11 +1236,13 @@ var init_esm3 = __esm({
       isWindows;
       platform;
       windowsNoMagicRoot;
+      maxGlobstarRecursion;
       regexp;
       constructor(pattern, options = {}) {
         assertValidPattern(pattern);
         options = options || {};
         this.options = options;
+        this.maxGlobstarRecursion = options.maxGlobstarRecursion ?? 200;
         this.pattern = pattern;
         this.platform = options.platform || defaultPlatform;
         this.isWindows = this.platform === "win32";
@@ -1410,7 +1579,8 @@ var init_esm3 = __esm({
       // out of pattern, then that's fine, as long as all
       // the parts match.
       matchOne(file, pattern, partial = false) {
-        const options = this.options;
+        let fileStartIndex = 0;
+        let patternStartIndex = 0;
         if (this.isWindows) {
           const fileDrive = typeof file[0] === "string" && /^[a-z]:$/i.test(file[0]);
           const fileUNC = !fileDrive && file[0] === "" && file[1] === "" && file[2] === "?" && /^[a-z]:$/i.test(file[3]);
@@ -1425,11 +1595,8 @@ var init_esm3 = __esm({
             ];
             if (fd.toLowerCase() === pd.toLowerCase()) {
               pattern[pdi] = fd;
-              if (pdi > fdi) {
-                pattern = pattern.slice(pdi);
-              } else if (fdi > pdi) {
-                file = file.slice(fdi);
-              }
+              patternStartIndex = pdi;
+              fileStartIndex = fdi;
             }
           }
         }
@@ -1437,49 +1604,123 @@ var init_esm3 = __esm({
         if (optimizationLevel >= 2) {
           file = this.levelTwoFileOptimize(file);
         }
-        this.debug("matchOne", this, { file, pattern });
-        this.debug("matchOne", file.length, pattern.length);
-        for (var fi = 0, pi = 0, fl = file.length, pl = pattern.length; fi < fl && pi < pl; fi++, pi++) {
-          this.debug("matchOne loop");
-          var p = pattern[pi];
-          var f = file[fi];
-          this.debug(pattern, p, f);
-          if (p === false) {
+        if (pattern.includes(GLOBSTAR)) {
+          return this.#matchGlobstar(file, pattern, partial, fileStartIndex, patternStartIndex);
+        }
+        return this.#matchOne(file, pattern, partial, fileStartIndex, patternStartIndex);
+      }
+      #matchGlobstar(file, pattern, partial, fileIndex, patternIndex) {
+        const firstgs = pattern.indexOf(GLOBSTAR, patternIndex);
+        const lastgs = pattern.lastIndexOf(GLOBSTAR);
+        const [head, body, tail] = partial ? [
+          pattern.slice(patternIndex, firstgs),
+          pattern.slice(firstgs + 1),
+          []
+        ] : [
+          pattern.slice(patternIndex, firstgs),
+          pattern.slice(firstgs + 1, lastgs),
+          pattern.slice(lastgs + 1)
+        ];
+        if (head.length) {
+          const fileHead = file.slice(fileIndex, fileIndex + head.length);
+          if (!this.#matchOne(fileHead, head, partial, 0, 0)) {
             return false;
           }
-          if (p === GLOBSTAR) {
-            this.debug("GLOBSTAR", [pattern, p, f]);
-            var fr = fi;
-            var pr = pi + 1;
-            if (pr === pl) {
-              this.debug("** at the end");
-              for (; fi < fl; fi++) {
-                if (file[fi] === "." || file[fi] === ".." || !options.dot && file[fi].charAt(0) === ".")
-                  return false;
-              }
-              return true;
+          fileIndex += head.length;
+          patternIndex += head.length;
+        }
+        let fileTailMatch = 0;
+        if (tail.length) {
+          if (tail.length + fileIndex > file.length)
+            return false;
+          let tailStart = file.length - tail.length;
+          if (this.#matchOne(file, tail, partial, tailStart, 0)) {
+            fileTailMatch = tail.length;
+          } else {
+            if (file[file.length - 1] !== "" || fileIndex + tail.length === file.length) {
+              return false;
             }
-            while (fr < fl) {
-              var swallowee = file[fr];
-              this.debug("\nglobstar while", file, fr, pattern, pr, swallowee);
-              if (this.matchOne(file.slice(fr), pattern.slice(pr), partial)) {
-                this.debug("globstar found match!", fr, fl, swallowee);
-                return true;
-              } else {
-                if (swallowee === "." || swallowee === ".." || !options.dot && swallowee.charAt(0) === ".") {
-                  this.debug("dot detected!", file, fr, pattern, pr);
-                  break;
-                }
-                this.debug("globstar swallow a segment, and continue");
-                fr++;
-              }
+            tailStart--;
+            if (!this.#matchOne(file, tail, partial, tailStart, 0)) {
+              return false;
             }
-            if (partial) {
-              this.debug("\n>>> no match, partial?", file, fr, pattern, pr);
-              if (fr === fl) {
-                return true;
-              }
+            fileTailMatch = tail.length + 1;
+          }
+        }
+        if (!body.length) {
+          let sawSome = !!fileTailMatch;
+          for (let i2 = fileIndex; i2 < file.length - fileTailMatch; i2++) {
+            const f = String(file[i2]);
+            sawSome = true;
+            if (f === "." || f === ".." || !this.options.dot && f.startsWith(".")) {
+              return false;
+            }
+          }
+          return partial || sawSome;
+        }
+        const bodySegments = [[[], 0]];
+        let currentBody = bodySegments[0];
+        let nonGsParts = 0;
+        const nonGsPartsSums = [0];
+        for (const b of body) {
+          if (b === GLOBSTAR) {
+            nonGsPartsSums.push(nonGsParts);
+            currentBody = [[], 0];
+            bodySegments.push(currentBody);
+          } else {
+            currentBody[0].push(b);
+            nonGsParts++;
+          }
+        }
+        let i = bodySegments.length - 1;
+        const fileLength = file.length - fileTailMatch;
+        for (const b of bodySegments) {
+          b[1] = fileLength - (nonGsPartsSums[i--] + b[0].length);
+        }
+        return !!this.#matchGlobStarBodySections(file, bodySegments, fileIndex, 0, partial, 0, !!fileTailMatch);
+      }
+      // return false for "nope, not matching"
+      // return null for "not matching, cannot keep trying"
+      #matchGlobStarBodySections(file, bodySegments, fileIndex, bodyIndex, partial, globStarDepth, sawTail) {
+        const bs = bodySegments[bodyIndex];
+        if (!bs) {
+          for (let i = fileIndex; i < file.length; i++) {
+            sawTail = true;
+            const f = file[i];
+            if (f === "." || f === ".." || !this.options.dot && f.startsWith(".")) {
+              return false;
             }
+          }
+          return sawTail;
+        }
+        const [body, after] = bs;
+        while (fileIndex <= after) {
+          const m = this.#matchOne(file.slice(0, fileIndex + body.length), body, partial, fileIndex, 0);
+          if (m && globStarDepth < this.maxGlobstarRecursion) {
+            const sub = this.#matchGlobStarBodySections(file, bodySegments, fileIndex + body.length, bodyIndex + 1, partial, globStarDepth + 1, sawTail);
+            if (sub !== false) {
+              return sub;
+            }
+          }
+          const f = file[fileIndex];
+          if (f === "." || f === ".." || !this.options.dot && f.startsWith(".")) {
+            return false;
+          }
+          fileIndex++;
+        }
+        return partial || null;
+      }
+      #matchOne(file, pattern, partial, fileIndex, patternIndex) {
+        let fi;
+        let pi;
+        let pl;
+        let fl;
+        for (fi = fileIndex, pi = patternIndex, fl = file.length, pl = pattern.length; fi < fl && pi < pl; fi++, pi++) {
+          this.debug("matchOne loop");
+          let p = pattern[pi];
+          let f = file[fi];
+          this.debug(pattern, p, f);
+          if (p === false || p === GLOBSTAR) {
             return false;
           }
           let hit;
@@ -3181,11 +3422,11 @@ var require_build2 = __commonJS({
     function stripQuotes2(val) {
       return typeof val === "string" && (val[0] === "'" || val[0] === '"') && val[val.length - 1] === val[0] ? val.substring(1, val.length - 1) : val;
     }
-    var _a3;
+    var _a4;
     var _b2;
     var _c2;
     var minNodeVersion2 = process && process.env && process.env.YARGS_MIN_NODE_VERSION ? Number(process.env.YARGS_MIN_NODE_VERSION) : 12;
-    var nodeVersion2 = (_b2 = (_a3 = process === null || process === void 0 ? void 0 : process.versions) === null || _a3 === void 0 ? void 0 : _a3.node) !== null && _b2 !== void 0 ? _b2 : (_c2 = process === null || process === void 0 ? void 0 : process.version) === null || _c2 === void 0 ? void 0 : _c2.slice(1);
+    var nodeVersion2 = (_b2 = (_a4 = process === null || process === void 0 ? void 0 : process.versions) === null || _a4 === void 0 ? void 0 : _a4.node) !== null && _b2 !== void 0 ? _b2 : (_c2 = process === null || process === void 0 ? void 0 : process.version) === null || _c2 === void 0 ? void 0 : _c2.slice(1);
     if (nodeVersion2) {
       const major = Number(nodeVersion2.match(/^([^.]+)/)[1]);
       if (major < minNodeVersion2) {
@@ -4605,9 +4846,9 @@ var require_build3 = __commonJS({
     var left2 = 3;
     var UI2 = class {
       constructor(opts) {
-        var _a3;
+        var _a4;
         this.width = opts.width;
-        this.wrap = (_a3 = opts.wrap) !== null && _a3 !== void 0 ? _a3 : true;
+        this.wrap = (_a4 = opts.wrap) !== null && _a4 !== void 0 ? _a4 : true;
         this.rows = [];
       }
       span(...args) {
@@ -9292,7 +9533,7 @@ function gitInstanceFactory(baseDir, options) {
   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, _a2, 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, 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 init_esm4 = __esm({
   "../../node_modules/.pnpm/simple-git@3.30.0/node_modules/simple-git/dist/esm/index.js"() {
     "use strict";
@@ -9738,9 +9979,9 @@ var init_esm4 = __esm({
         Query = /* @__PURE__ */ Symbol("grepQuery");
         GrepQuery = class {
           constructor() {
-            this[_a2] = [];
+            this[_a3] = [];
           }
-          *[(_a2 = Query, Symbol.iterator)]() {
+          *[(_a3 = Query, Symbol.iterator)]() {
             for (const query of this[Query]) {
               yield query;
             }
@@ -19327,7 +19568,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,
@@ -19650,17 +19891,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);
@@ -19686,7 +19992,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");
@@ -19917,6 +20223,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;
@@ -20560,12 +20886,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) {
@@ -20655,13 +20981,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);
             }
@@ -20769,6 +21109,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) {
@@ -20779,10 +21125,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();
           }
@@ -20830,20 +21174,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",
@@ -20991,6 +21347,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);
@@ -21041,6 +21401,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 [];
@@ -21075,6 +21484,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
         };
@@ -22282,11 +22697,11 @@ function stripQuotes(val) {
 
 // ../../node_modules/.pnpm/yargs-parser@21.1.1/node_modules/yargs-parser/build/lib/index.js
 var import_fs = require("fs");
-var _a;
+var _a2;
 var _b;
 var _c;
 var minNodeVersion = process && process.env && process.env.YARGS_MIN_NODE_VERSION ? Number(process.env.YARGS_MIN_NODE_VERSION) : 12;
-var nodeVersion = (_b = (_a = process === null || process === void 0 ? void 0 : process.versions) === null || _a === void 0 ? void 0 : _a.node) !== null && _b !== void 0 ? _b : (_c = process === null || process === void 0 ? void 0 : process.version) === null || _c === void 0 ? void 0 : _c.slice(1);
+var nodeVersion = (_b = (_a2 = process === null || process === void 0 ? void 0 : process.versions) === null || _a2 === void 0 ? void 0 : _a2.node) !== null && _b !== void 0 ? _b : (_c = process === null || process === void 0 ? void 0 : process.version) === null || _c === void 0 ? void 0 : _c.slice(1);
 if (nodeVersion) {
   const major = Number(nodeVersion.match(/^([^.]+)/)[1]);
   if (major < minNodeVersion) {
@@ -22340,9 +22755,9 @@ var bottom = 2;
 var left = 3;
 var UI = class {
   constructor(opts) {
-    var _a3;
+    var _a4;
     this.width = opts.width;
-    this.wrap = (_a3 = opts.wrap) !== null && _a3 !== void 0 ? _a3 : true;
+    this.wrap = (_a4 = opts.wrap) !== null && _a4 !== void 0 ? _a4 : true;
     this.rows = [];
   }
   span(...args) {
@@ -26986,9 +27401,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;
@@ -29739,7 +30151,8 @@ var BlockList = class {
   }
   addBlock(block) {
     if (this.hasBlock(block.id)) {
-      throw new Error(`block with id "${block.id}" already exists`);
+      console.warn(`[readme] Duplicate block with id "${block.id}" detected; overriding with latest content`);
+      this.blocks = this.blocks.filter((b) => b.id !== block.id);
     }
     this.ids.add(block.id);
     this.blocks.push(block);
@@ -29753,7 +30166,9 @@ var BlockList = class {
   // }
   insertBlock(block, precedingBlockId) {
     if (this.hasBlock(block.id)) {
-      throw new Error(`block with id "${block.id}" already exists`);
+      console.warn(`[readme] Duplicate block with id "${block.id}" detected; overriding with latest content`);
+      this.blocks = this.blocks.filter((b) => b.id !== block.id);
+      this.ids.delete(block.id);
     }
     if (precedingBlockId === void 0) {
       this.addBlock(block);
@@ -29804,16 +30219,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 = [];
@@ -30683,9 +31107,6 @@ async function generateReadmeToStream(params) {
   });
 }
 
-// src/api/generate-reference.ts
-var import_node_stream2 = require("stream");
-
 // src/reference/ReferenceGenerator.ts
 var ReferenceGenerator = class {
   referenceConfig;
@@ -30696,6 +31117,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({
@@ -30706,7 +31137,6 @@ var ReferenceGenerator = class {
     for (const section of this.referenceConfig.sections) {
       await this.writeSection({ section, writer });
     }
-    await writer.end();
   }
   async writeRootSection({
     section,
@@ -30846,41 +31276,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
@@ -30975,11 +31383,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";
   }
@@ -30988,7 +31396,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) {
@@ -30997,70 +31405,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
+#### How to resolve
 `);
-    parts.push(`**Option A: Resolve in GitHub (recommended for simple conflicts)**
-`);
-    parts.push(`1. Click the **Resolve conflicts** button below`);
-    parts.push(`2. For each file, choose which code to keep:`);
-    parts.push(`   - \`<<<<<<< HEAD\` / "Accept current changes" = **new generated code**`);
-    parts.push(`   - \`>>>>>>> main\` / "Accept incoming changes" = **your customization**`);
-    parts.push(`   - Or manually combine both, then delete the conflict markers`);
-    parts.push(`3. Click **Mark as resolved** for each file, then **Commit merge**
-`);
-    parts.push(`**Option B: Resolve locally**
-`);
-    parts.push(`1. Fetch and check out this branch:`);
-    parts.push(`   \`\`\`sh`);
-    parts.push(`   git fetch origin && git checkout ${branch}`);
-    parts.push(`   \`\`\``);
-    parts.push(`2. Merge the base branch and resolve conflicts in your editor:`);
+    parts.push(`1. Check out this branch:`);
     parts.push(`   \`\`\`sh`);
-    parts.push(`   git merge origin/main`);
+    parts.push(`   git fetch origin && git checkout -b ${branch} origin/${branch}`);
     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");
 }
@@ -31196,16 +31600,9 @@ var GithubStep = class extends BaseStep {
         }
       }
     }
-    if (!this.config.previewMode) {
-      const headSha = await repository.getHeadSha();
-      await this.postReplayConflictStatus(octokit, owner, repo, headSha, replayConflictInfo, replayResult);
-      if (isUpdatingExistingPR && existingPR != null) {
-        await this.togglePrDraftState(octokit, existingPR, replayConflictInfo);
-      }
-    }
     const finalCommitMessage = this.config.commitMessage ?? "SDK Generation";
     const { prTitle, prBody } = parseCommitMessageForPR(finalCommitMessage);
-    const replaySection = formatReplayPrBody(replayResult, { branchName: prBranch });
+    const replaySection = formatReplayPrBody(replayResult, { branchName: prBranch, repoUri: this.config.uri });
     const enrichedBody = replaySection != null ? prBody + "\n\n---\n\n" + replaySection : prBody;
     if (isUpdatingExistingPR && existingPR != null) {
       this.logger.info(`Updated existing pull request: ${existingPR.htmlUrl}`);
@@ -31227,7 +31624,6 @@ var GithubStep = class extends BaseStep {
       }
     } else {
       const head = `${owner}:${prBranch}`;
-      const hasConflicts = replayConflictInfo?.hasConflicts === true;
       try {
         const { data: pullRequest } = await octokit.pulls.create({
           owner,
@@ -31235,8 +31631,7 @@ var GithubStep = class extends BaseStep {
           title: prTitle,
           body: enrichedBody,
           head,
-          base: baseBranch,
-          draft: hasConflicts
+          base: baseBranch
         });
         this.logger.info(`Created pull request: ${pullRequest.html_url}`);
         result.prUrl = pullRequest.html_url;
@@ -31250,17 +31645,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) {
@@ -31306,198 +31690,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();
@@ -31706,8 +31909,7 @@ var ReplayStep = class extends BaseStep {
         flow: "first-generation",
         patchesDetected: 0,
         patchesApplied: 0,
-        patchesWithConflicts: 0,
-        conflicts: []
+        patchesWithConflicts: 0
       };
     }
     const report = result.report;
@@ -31725,22 +31927,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
         }))
       })),
@@ -31864,7 +32056,10 @@ Base generation: ${bootstrapResult.generationCommit.sha.slice(0, 7)}`;
     `user.name=${FERN_BOT_NAME2}`,
     "-c",
     `user.email=${FERN_BOT_EMAIL2}`,
+    "-c",
+    "commit.gpgsign=false",
     "commit",
+    "--no-verify",
     "-m",
     commitMessage
   ]);
@@ -32001,6 +32196,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({