@fern-api/replay 0.1.0 → 0.2.0

package/dist/LockfileManager.d.ts

@@ -19,6 +19,7 @@ export declare class LockfileManager {
     addPatch(patch: StoredPatch): void;
     updatePatch(patchId: string, updates: Partial<Pick<StoredPatch, "base_generation" | "patch_content" | "content_hash" | "files">>): void;
     removePatch(patchId: string): void;
+    clearPatches(): void;
     getPatches(): StoredPatch[];
     getGeneration(commitSha: string): GenerationRecord | undefined;
     getCustomizationsConfig(): CustomizationsConfig;

package/dist/LockfileManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LockfileManager.d.ts","sourceRoot":"","sources":["../src/LockfileManager.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACR,cAAc,EACd,gBAAgB,EAChB,WAAW,EACX,oBAAoB,EACvB,MAAM,YAAY,CAAC;AAIpB,qBAAa,eAAe;IACxB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,IAAI,CAA+B;gBAE/B,SAAS,EAAE,MAAM;IAI7B,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,IAAI,kBAAkB,IAAI,MAAM,CAE/B;IAED,MAAM,IAAI,OAAO;IAIjB,IAAI,IAAI,cAAc;IAYtB,UAAU,CAAC,eAAe,EAAE,gBAAgB,GAAG,IAAI;IAKnD;;;;OAIG;IACH,kBAAkB,CAAC,eAAe,EAAE,gBAAgB,GAAG,IAAI;IAS3D,IAAI,IAAI,IAAI;IAmBZ,aAAa,CAAC,MAAM,EAAE,gBAAgB,GAAG,IAAI;IAM7C,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAKlC,WAAW,CACP,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,iBAAiB,GAAG,eAAe,GAAG,cAAc,GAAG,OAAO,CAAC,CAAC,GACpG,IAAI;IASP,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAKlC,UAAU,IAAI,WAAW,EAAE;IAK3B,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS;IAK9D,uBAAuB,IAAI,oBAAoB;IAQ/C,OAAO,CAAC,YAAY;CAKvB"}
+{"version":3,"file":"LockfileManager.d.ts","sourceRoot":"","sources":["../src/LockfileManager.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACR,cAAc,EACd,gBAAgB,EAChB,WAAW,EACX,oBAAoB,EACvB,MAAM,YAAY,CAAC;AAIpB,qBAAa,eAAe;IACxB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,IAAI,CAA+B;gBAE/B,SAAS,EAAE,MAAM;IAI7B,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,IAAI,kBAAkB,IAAI,MAAM,CAE/B;IAED,MAAM,IAAI,OAAO;IAIjB,IAAI,IAAI,cAAc;IAYtB,UAAU,CAAC,eAAe,EAAE,gBAAgB,GAAG,IAAI;IAKnD;;;;OAIG;IACH,kBAAkB,CAAC,eAAe,EAAE,gBAAgB,GAAG,IAAI;IAS3D,IAAI,IAAI,IAAI;IAmBZ,aAAa,CAAC,MAAM,EAAE,gBAAgB,GAAG,IAAI;IAM7C,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAKlC,WAAW,CACP,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,iBAAiB,GAAG,eAAe,GAAG,cAAc,GAAG,OAAO,CAAC,CAAC,GACpG,IAAI;IASP,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAKlC,YAAY,IAAI,IAAI;IAKpB,UAAU,IAAI,WAAW,EAAE;IAK3B,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS;IAK9D,uBAAuB,IAAI,oBAAoB;IAQ/C,OAAO,CAAC,YAAY;CAKvB"}

package/dist/LockfileManager.js

@@ -84,6 +84,10 @@ export class LockfileManager {
         this.ensureLoaded();
         this.lock.patches = this.lock.patches.filter((p) => p.id !== patchId);
     }
+    clearPatches() {
+        this.ensureLoaded();
+        this.lock.patches = [];
+    }
     getPatches() {
         this.ensureLoaded();
         return this.lock.patches;

package/dist/LockfileManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"LockfileManager.js","sourceRoot":"","sources":["../src/LockfileManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LockfileManager.js","sourceRoot":"","sources":["../src/LockfileManager.ts"],"names":[],"mappings":"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"}

package/dist/ReplayDetector.d.ts

@@ -19,6 +19,12 @@ export declare class ReplayDetector {
      * so rebased commits with same content produce the same hash.
      */
     computeContentHash(patchContent: string): string;
+    /**
+     * Detect customization patches via tree diff when the generation commit
+     * is not an ancestor of HEAD (non-linear history from squash merge).
+     * Returns a single composite patch covering all customizations.
+     */
+    private detectPatchesViaTreeDiff;
     private parseGitLog;
     private getLastGeneration;
 }

package/dist/ReplayDetector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReplayDetector.d.ts","sourceRoot":"","sources":["../src/ReplayDetector.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAA8B,WAAW,EAAE,MAAM,YAAY,CAAC;AAM1E,qBAAa,cAAc;IACvB,OAAO,CAAC,GAAG,CAAY;IACvB,OAAO,CAAC,WAAW,CAAkB;IACrC,OAAO,CAAC,YAAY,CAAS;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAM;gBAErB,GAAG,EAAE,SAAS,EAAE,WAAW,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM;IAM9E;;;;OAIG;IACG,gBAAgB,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;IAiFhD;;;;OAIG;IACH,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAShD,OAAO,CAAC,WAAW;IAUnB,OAAO,CAAC,iBAAiB;CAG5B"}
+{"version":3,"file":"ReplayDetector.d.ts","sourceRoot":"","sources":["../src/ReplayDetector.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAgD,WAAW,EAAE,MAAM,YAAY,CAAC;AAM5F,qBAAa,cAAc;IACvB,OAAO,CAAC,GAAG,CAAY;IACvB,OAAO,CAAC,WAAW,CAAkB;IACrC,OAAO,CAAC,YAAY,CAAS;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAM;gBAErB,GAAG,EAAE,SAAS,EAAE,WAAW,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM;IAM9E;;;;OAIG;IACG,gBAAgB,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;IAyFhD;;;;OAIG;IACH,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAShD;;;;OAIG;YACW,wBAAwB;IA+BtC,OAAO,CAAC,WAAW;IAUnB,OAAO,CAAC,iBAAiB;CAG5B"}

package/dist/ReplayDetector.js

@@ -30,6 +30,13 @@ export class ReplayDetector {
                 `Skipping new patch detection. Existing lockfile patches will still be applied.`);
             return [];
         }
+        // If the generation commit is not an ancestor of HEAD (e.g., after a squash
+        // merge of a divergent PR), git log would return all of main's history.
+        // Fall back to tree-diff-based detection which handles non-linear history.
+        const isAncestor = await this.git.isAncestor(lastGen.commit_sha, "HEAD");
+        if (!isAncestor) {
+            return this.detectPatchesViaTreeDiff(lastGen);
+        }
         const log = await this.git.exec([
             "log",
             "--format=%H%x00%an%x00%ae%x00%s",
@@ -94,6 +101,39 @@ export class ReplayDetector {
             .join("\n");
         return `sha256:${createHash("sha256").update(normalized).digest("hex")}`;
     }
+    /**
+     * Detect customization patches via tree diff when the generation commit
+     * is not an ancestor of HEAD (non-linear history from squash merge).
+     * Returns a single composite patch covering all customizations.
+     */
+    async detectPatchesViaTreeDiff(lastGen) {
+        // Get changed files first, then filter before computing the diff
+        const filesOutput = await this.git.exec(["diff", "--name-only", lastGen.commit_sha, "HEAD"]);
+        const files = filesOutput
+            .trim()
+            .split("\n")
+            .filter(Boolean)
+            .filter((f) => !INFRASTRUCTURE_FILES.has(f))
+            .filter((f) => !f.startsWith(".fern/"));
+        if (files.length === 0)
+            return [];
+        // Compute diff only for the filtered files
+        const diff = await this.git.exec(["diff", lastGen.commit_sha, "HEAD", "--", ...files]);
+        if (!diff.trim())
+            return [];
+        const contentHash = this.computeContentHash(diff);
+        const headSha = (await this.git.exec(["rev-parse", "HEAD"])).trim();
+        return [{
+                id: `patch-composite-${headSha.slice(0, 8)}`,
+                content_hash: contentHash,
+                original_commit: headSha,
+                original_message: "Customer customizations (composite)",
+                original_author: "composite",
+                base_generation: lastGen.commit_sha,
+                files,
+                patch_content: diff,
+            }];
+    }
     parseGitLog(log) {
         return log
             .trim()

package/dist/ReplayDetector.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReplayDetector.js","sourceRoot":"","sources":["../src/ReplayDetector.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ReplayDetector.js","sourceRoot":"","sources":["../src/ReplayDetector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAK9D,0EAA0E;AAC1E,sEAAsE;AACtE,MAAM,oBAAoB,GAAG,IAAI,GAAG,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;AAEtD,MAAM,OAAO,cAAc;IACf,GAAG,CAAY;IACf,WAAW,CAAkB;IAC7B,YAAY,CAAS;IACpB,QAAQ,GAAa,EAAE,CAAC;IAEjC,YAAY,GAAc,EAAE,WAA4B,EAAE,YAAoB;QAC1E,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACrC,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,gBAAgB;QAClB,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,OAAO,EAAE,CAAC;QACd,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC/D,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,IAAI,CAAC,QAAQ,CAAC,IAAI,CACd,qBAAqB,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,6BAA6B;gBAC5E,gFAAgF,CACvF,CAAC;YACF,OAAO,EAAE,CAAC;QACd,CAAC;QAED,4EAA4E;QAC5E,wEAAwE;QACxE,2EAA2E;QAC3E,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QACzE,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,OAAO,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;QAClD,CAAC;QAED,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;YAC5B,KAAK;YACL,iCAAiC;YACjC,GAAG,OAAO,CAAC,UAAU,QAAQ;YAC7B,IAAI;YACJ,IAAI,CAAC,YAAY;SACpB,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;YACd,OAAO,EAAE,CAAC;QACd,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QACtC,MAAM,UAAU,GAAkB,EAAE,CAAC;QAErC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC3B,IAAI,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC7B,SAAS;YACb,CAAC;YAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC5D,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACrB,SAAS;YACb,CAAC;YAED,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,KAAK,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC7D,SAAS;YACb,CAAC;YAED,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAE5D,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;YAC1D,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,WAAW,CAAC,EAAE,CAAC;gBAC3D,SAAS;YACb,CAAC;YAED,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,gBAAgB,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YAE1G,MAAM,KAAK,GAAG,WAAW;iBACpB,IAAI,EAAE;iBACN,KAAK,CAAC,IAAI,CAAC;iBACX,MAAM,CAAC,OAAO,CAAC;iBACf,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAEjD,oDAAoD;YACpD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACrB,SAAS;YACb,CAAC;YAED,UAAU,CAAC,IAAI,CAAC;gBACZ,EAAE,EAAE,SAAS,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;gBACrC,YAAY,EAAE,WAAW;gBACzB,eAAe,EAAE,MAAM,CAAC,GAAG;gBAC3B,gBAAgB,EAAE,MAAM,CAAC,OAAO;gBAChC,eAAe,EAAE,GAAG,MAAM,CAAC,UAAU,KAAK,MAAM,CAAC,WAAW,GAAG;gBAC/D,eAAe,EAAE,OAAO,CAAC,UAAU;gBACnC,KAAK;gBACL,aAAa,EAAE,YAAY;aAC9B,CAAC,CAAC;QACP,CAAC;QAED,iEAAiE;QACjE,OAAO,UAAU,CAAC,OAAO,EAAE,CAAC;IAChC,CAAC;IAED;;;;OAIG;IACH,kBAAkB,CAAC,YAAoB;QACnC,MAAM,UAAU,GAAG,YAAY;aAC1B,KAAK,CAAC,IAAI,CAAC;aACX,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;aACvG,IAAI,CAAC,IAAI,CAAC,CAAC;QAEhB,OAAO,UAAU,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;IAC7E,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,wBAAwB,CAAC,OAAyB;QAC5D,iEAAiE;QACjE,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;QAC7F,MAAM,KAAK,GAAG,WAAW;aACpB,IAAI,EAAE;aACN,KAAK,CAAC,IAAI,CAAC;aACX,MAAM,CAAC,OAAO,CAAC;aACf,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aAC3C,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;QAE5C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAElC,2CAA2C;QAC3C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC;QACvF,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YAAE,OAAO,EAAE,CAAC;QAE5B,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,OAAO,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAEpE,OAAO,CAAC;gBACJ,EAAE,EAAE,mBAAmB,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;gBAC5C,YAAY,EAAE,WAAW;gBACzB,eAAe,EAAE,OAAO;gBACxB,gBAAgB,EAAE,qCAAqC;gBACvD,eAAe,EAAE,WAAW;gBAC5B,eAAe,EAAE,OAAO,CAAC,UAAU;gBACnC,KAAK;gBACL,aAAa,EAAE,IAAI;aACtB,CAAC,CAAC;IACP,CAAC;IAEO,WAAW,CAAC,GAAW;QAC3B,OAAO,GAAG;aACL,IAAI,EAAE;aACN,KAAK,CAAC,IAAI,CAAC;aACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACV,MAAM,CAAC,GAAG,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACjE,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;QACrD,CAAC,CAAC,CAAC;IACX,CAAC;IAEO,iBAAiB,CAAC,IAAoB;QAC1C,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAClF,CAAC;CACJ"}

package/dist/ReplayService.d.ts

@@ -15,15 +15,12 @@ export interface ReplayReport {
     patchesRepointed?: number;
     patchesContentRebased?: number;
     patchesKeptAsUserOwned?: number;
+    patchesConflictResolved?: number;
     conflicts: FileResult[];
     conflictDetails?: ConflictDetail[];
     wouldApply?: StoredPatch[];
     warnings?: string[];
 }
-export declare class ReplayConflictError extends Error {
-    readonly report: ReplayReport;
-    constructor(report: ReplayReport);
-}
 export interface ReplayOptions {
     /** Log what would happen but don't modify anything */
     dryRun?: boolean;
@@ -36,17 +33,32 @@ export interface ReplayOptions {
 }
 export declare class ReplayService {
     private git;
-    private config;
     private detector;
     private applicator;
     private committer;
     private lockManager;
     private outputDir;
-    constructor(outputDir: string, config: ReplayConfig);
+    constructor(outputDir: string, _config: ReplayConfig);
     /**
      * Run the full replay flow.
      */
     runReplay(options?: ReplayOptions): Promise<ReplayReport>;
+    /**
+     * Sync the lockfile after a divergent PR was squash-merged.
+     *
+     * When a divergent PR is merged, the lockfile's current_generation is stale
+     * (points to gen N while the code is at gen N+1). This method:
+     * 1. Adds the real generation (from the tag) to the lockfile
+     * 2. Updates current_generation to point to it
+     * 3. Clears existing patches (superseded — they'll be re-detected via tree diff)
+     * 4. Saves the lockfile
+     *
+     * Call this BEFORE runReplay() when the CLI detects a merged divergent PR.
+     */
+    syncFromDivergentMerge(generationCommitSha: string, options?: {
+        cliVersion?: string;
+        generatorVersions?: Record<string, string>;
+    }): Promise<void>;
     /**
      * Determine which flow to use based on lockfile state.
      */
@@ -63,33 +75,23 @@ export declare class ReplayService {
      * Normal flow - apply existing patches + detect new ones.
      */
     private handleNormalRegeneration;
-    /**
-     * Get the active conflict policy based on config and environment.
-     * Returns undefined when on_conflict is not configured (backwards-compatible).
-     */
-    private getConflictPolicy;
-    /**
-     * Auto-resolve all conflict markers in conflicted files.
-     * "ours" = keep generated code, "theirs" = keep user customization.
-     */
-    private autoResolveConflicts;
-    /**
-     * Phase 1: Resolve conflict markers on disk BEFORE rebasing.
-     * Handles keep-mine, keep-generated, and prompt policies.
-     * Must run before rebasePatches() so rebased content captures clean files.
-     */
-    private resolveConflictsOnDisk;
-    /**
-     * Phase 2: Throw for "fail" policy AFTER lockfile save.
-     * This ensures the lockfile is preserved even when we reject the commit.
-     */
-    private enforceConflictFailPolicy;
     /**
      * Rebase cleanly applied patches so they are relative to the current generation.
      * This prevents recurring conflicts on subsequent regenerations.
      * Returns the number of patches rebased.
      */
     private rebasePatches;
+    /**
+     * Pre-generation rebase: update stale conflicted patches using the customer's
+     * resolved state. Called BEFORE commitGeneration() so that HEAD still reflects
+     * the customer's code (generator output is in the working tree, not committed).
+     *
+     * For each patch with a stale base_generation:
+     * - If conflict markers remain in HEAD → skip (not yet resolved)
+     * - If diff(currentGen, HEAD) is empty → customer reverted, remove patch
+     * - Otherwise → update patch_content, content_hash, base_generation
+     */
+    private preGenerationRebase;
     /**
      * Read .fernignore patterns from the output directory.
      * Returns an empty array if .fernignore doesn't exist.

package/dist/ReplayService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReplayService.d.ts","sourceRoot":"","sources":["../src/ReplayService.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,YAAY,EAAgB,WAAW,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAEtF,MAAM,WAAW,cAAc;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,UAAU,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,kBAAkB,GAAG,YAAY,GAAG,qBAAqB,CAAC;IAChE,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,eAAe,CAAC,EAAE,cAAc,EAAE,CAAC;IACnC,UAAU,CAAC,EAAE,WAAW,EAAE,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,qBAAa,mBAAoB,SAAQ,KAAK;IAC1C,SAAgB,MAAM,EAAE,YAAY,CAAC;gBAEzB,MAAM,EAAE,YAAY;CAKnC;AAED,MAAM,WAAW,aAAa;IAC1B,sDAAsD;IACtD,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,sDAAsD;IACtD,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,sCAAsC;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,6CAA6C;IAC7C,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9C;AAED,qBAAa,aAAa;IACtB,OAAO,CAAC,GAAG,CAAY;IACvB,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,UAAU,CAAmB;IACrC,OAAO,CAAC,SAAS,CAAkB;IACnC,OAAO,CAAC,WAAW,CAAkB;IACrC,OAAO,CAAC,SAAS,CAAS;gBAGtB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,YAAY;IAYxB;;OAEG;IACG,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;IAa/D;;OAEG;IACH,OAAO,CAAC,aAAa;IAarB;;OAEG;YACW,qBAAqB;IA+BnC;;OAEG;YACW,2BAA2B;IAoEzC;;OAEG;YACW,wBAAwB;IA6DtC;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAOzB;;;OAGG;YACW,oBAAoB;IAsBlC;;;;OAIG;YACW,sBAAsB;IA+DpC;;;OAGG;IACH,OAAO,CAAC,yBAAyB;IAkBjC;;;;OAIG;YACW,aAAa;IAqG3B;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAS9B;;OAEG;IACH,OAAO,CAAC,WAAW;CAmCtB"}
+{"version":3,"file":"ReplayService.d.ts","sourceRoot":"","sources":["../src/ReplayService.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAoB,YAAY,EAAgB,WAAW,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExG,MAAM,WAAW,cAAc;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,UAAU,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,kBAAkB,GAAG,YAAY,GAAG,qBAAqB,CAAC;IAChE,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,eAAe,CAAC,EAAE,cAAc,EAAE,CAAC;IACnC,UAAU,CAAC,EAAE,WAAW,EAAE,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,aAAa;IAC1B,sDAAsD;IACtD,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,sDAAsD;IACtD,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,sCAAsC;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,6CAA6C;IAC7C,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9C;AAED,qBAAa,aAAa;IACtB,OAAO,CAAC,GAAG,CAAY;IACvB,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,UAAU,CAAmB;IACrC,OAAO,CAAC,SAAS,CAAkB;IACnC,OAAO,CAAC,WAAW,CAAkB;IACrC,OAAO,CAAC,SAAS,CAAS;gBAGtB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,YAAY;IAWzB;;OAEG;IACG,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;IAa/D;;;;;;;;;;;OAWG;IACG,sBAAsB,CACxB,mBAAmB,EAAE,MAAM,EAC3B,OAAO,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,MAAM,CAAC;QAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,GAC9E,OAAO,CAAC,IAAI,CAAC;IAwBhB;;OAEG;IACH,OAAO,CAAC,aAAa;IAarB;;OAEG;YACW,qBAAqB;IA+BnC;;OAEG;YACW,2BAA2B;IA2DzC;;OAEG;YACW,wBAAwB;IAiEtC;;;;OAIG;YACW,aAAa;IAoG3B;;;;;;;;;OASG;YACW,mBAAmB;IAkDjC;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAS9B;;OAEG;IACH,OAAO,CAAC,WAAW;CAsCtB"}

package/dist/ReplayService.js

@@ -6,29 +6,16 @@ import { LockfileManager } from "./LockfileManager.js";
 import { ReplayDetector } from "./ReplayDetector.js";
 import { ReplayApplicator } from "./ReplayApplicator.js";
 import { ReplayCommitter } from "./ReplayCommitter.js";
-import { resolveConflictMarkers } from "./ConflictResolver.js";
-import { promptForConflictResolution } from "./ConflictPrompt.js";
-import { isCI } from "./environment.js";
-export class ReplayConflictError extends Error {
-    report;
-    constructor(report) {
-        super(`Replay produced ${report.patchesWithConflicts} patch conflict(s)`);
-        this.name = "ReplayConflictError";
-        this.report = report;
-    }
-}
 export class ReplayService {
     git;
-    config;
     detector;
     applicator;
     committer;
     lockManager;
     outputDir;
-    constructor(outputDir, config) {
+    constructor(outputDir, _config) {
         const git = new GitClient(outputDir);
         this.git = git;
-        this.config = config;
         this.outputDir = outputDir;
         this.lockManager = new LockfileManager(outputDir);
         this.detector = new ReplayDetector(git, this.lockManager, outputDir);
@@ -49,6 +36,38 @@ export class ReplayService {
                 return this.handleNormalRegeneration(options);
         }
     }
+    /**
+     * Sync the lockfile after a divergent PR was squash-merged.
+     *
+     * When a divergent PR is merged, the lockfile's current_generation is stale
+     * (points to gen N while the code is at gen N+1). This method:
+     * 1. Adds the real generation (from the tag) to the lockfile
+     * 2. Updates current_generation to point to it
+     * 3. Clears existing patches (superseded — they'll be re-detected via tree diff)
+     * 4. Saves the lockfile
+     *
+     * Call this BEFORE runReplay() when the CLI detects a merged divergent PR.
+     */
+    async syncFromDivergentMerge(generationCommitSha, options) {
+        const treeHash = await this.git.getTreeHash(generationCommitSha);
+        const timestamp = (await this.git.exec(["log", "-1", "--format=%aI", generationCommitSha])).trim();
+        const record = {
+            commit_sha: generationCommitSha,
+            tree_hash: treeHash,
+            timestamp,
+            cli_version: options?.cliVersion ?? "unknown",
+            generator_versions: options?.generatorVersions ?? {},
+        };
+        if (!this.lockManager.exists()) {
+            this.lockManager.initializeInMemory(record);
+        }
+        else {
+            this.lockManager.read();
+            this.lockManager.addGeneration(record);
+            this.lockManager.clearPatches();
+        }
+        this.lockManager.save();
+    }
     /**
      * Determine which flow to use based on lockfile state.
      */
@@ -120,10 +139,6 @@ export class ReplayService {
         if (newPatches.length > 0) {
             results = await this.applicator.applyPatches(newPatches);
         }
-        // Phase 1: Resolve conflict markers on disk BEFORE rebasing.
-        // This ensures rebasePatches() captures clean file content, not
-        // content with conflict markers baked in.
-        await this.resolveConflictsOnDisk(results, newPatches, "no-patches", options, warnings);
         // Rebase cleanly applied patches to the current generation.
         // This prevents recurring conflicts on subsequent regenerations.
         const rebaseCounts = await this.rebasePatches(results, genRecord.commit_sha);
@@ -135,9 +150,6 @@ export class ReplayService {
             }
         }
         this.lockManager.save();
-        // Phase 2: For "fail" policy, throw AFTER lockfile save so patches
-        // aren't lost, but BEFORE replay commit so broken code isn't committed.
-        this.enforceConflictFailPolicy(results, newPatches, "no-patches", options, warnings, rebaseCounts);
         if (newPatches.length > 0) {
             if (!options?.stageOnly) {
                 const appliedCount = results.filter((r) => r.status === "applied" || r.status === "conflict").length;
@@ -155,11 +167,11 @@ export class ReplayService {
      * Normal flow - apply existing patches + detect new ones.
      */
     async handleNormalRegeneration(options) {
-        const existingPatches = this.lockManager.getPatches();
-        const newPatches = await this.detector.detectNewPatches();
-        const warnings = [...this.detector.warnings];
-        const allPatches = [...existingPatches, ...newPatches];
         if (options?.dryRun) {
+            const existingPatches = this.lockManager.getPatches();
+            const newPatches = await this.detector.detectNewPatches();
+            const warnings = [...this.detector.warnings];
+            const allPatches = [...existingPatches, ...newPatches];
             return {
                 flow: "normal-regeneration",
                 patchesDetected: allPatches.length,
@@ -171,6 +183,15 @@ export class ReplayService {
                 warnings: warnings.length > 0 ? warnings : undefined,
             };
         }
+        // Pre-generation rebase: update stale conflicted patches using customer's
+        // resolved state. At this point HEAD still has the customer's code — the
+        // generator output is in the working tree but not yet committed.
+        let existingPatches = this.lockManager.getPatches();
+        const preRebaseCounts = await this.preGenerationRebase(existingPatches);
+        existingPatches = this.lockManager.getPatches();
+        const newPatches = await this.detector.detectNewPatches();
+        const warnings = [...this.detector.warnings];
+        const allPatches = [...existingPatches, ...newPatches];
         const commitOpts = options ? {
             cliVersion: options.cliVersion ?? "unknown",
             generatorVersions: options.generatorVersions ?? {},
@@ -178,8 +199,6 @@ export class ReplayService {
         await this.committer.commitGeneration("Update SDK", commitOpts);
         const genRecord = await this.committer.createGenerationRecord(commitOpts);
         const results = await this.applicator.applyPatches(allPatches);
-        // Phase 1: Resolve conflict markers on disk BEFORE rebasing.
-        await this.resolveConflictsOnDisk(results, allPatches, "normal-regeneration", options, warnings);
         // Rebase cleanly applied patches to the current generation.
         const rebaseCounts = await this.rebasePatches(results, genRecord.commit_sha);
         // Save lockfile BEFORE commit — lockfile is source of truth.
@@ -190,8 +209,6 @@ export class ReplayService {
             }
         }
         this.lockManager.save();
-        // Phase 2: For "fail" policy, throw AFTER lockfile save.
-        this.enforceConflictFailPolicy(results, allPatches, "normal-regeneration", options, warnings, rebaseCounts);
         if (options?.stageOnly) {
             await this.committer.stageAll();
         }
@@ -201,119 +218,7 @@ export class ReplayService {
                 await this.committer.commitReplay(appliedCount, allPatches);
             }
         }
-        return this.buildReport("normal-regeneration", allPatches, results, options, warnings, rebaseCounts);
-    }
-    /**
-     * Get the active conflict policy based on config and environment.
-     * Returns undefined when on_conflict is not configured (backwards-compatible).
-     */
-    getConflictPolicy() {
-        const onConflict = this.config.on_conflict;
-        if (!onConflict)
-            return undefined;
-        return isCI() ? onConflict.ci : onConflict.local;
-    }
-    /**
-     * Auto-resolve all conflict markers in conflicted files.
-     * "ours" = keep generated code, "theirs" = keep user customization.
-     */
-    async autoResolveConflicts(results, strategy) {
-        const { join } = await import("node:path");
-        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 = join(this.outputDir, fileResult.file);
-                await resolveConflictMarkers(filePath, strategy);
-                fileResult.status = "merged";
-                fileResult.reason = `auto-resolved (${strategy === "ours" ? "keep-generated" : "keep-mine"})`;
-            }
-            // If all files resolved, mark the patch as applied
-            const allResolved = result.fileResults.every((f) => f.status !== "conflict");
-            if (allResolved) {
-                result.status = "applied";
-            }
-        }
-    }
-    /**
-     * Phase 1: Resolve conflict markers on disk BEFORE rebasing.
-     * Handles keep-mine, keep-generated, and prompt policies.
-     * Must run before rebasePatches() so rebased content captures clean files.
-     */
-    async resolveConflictsOnDisk(results, allPatches, flow, options, warnings) {
-        const hasConflicts = results.some((r) => r.status === "conflict");
-        if (!hasConflicts)
-            return;
-        const policy = this.getConflictPolicy();
-        if (policy === undefined)
-            return; // backwards-compatible: commit with markers
-        switch (policy) {
-            case "fail":
-                // Don't resolve — enforceConflictFailPolicy() handles this after lockfile save
-                break;
-            case "keep-mine":
-                await this.autoResolveConflicts(results, "theirs");
-                break;
-            case "keep-generated":
-                await this.autoResolveConflicts(results, "ours");
-                break;
-            case "prompt": {
-                if (!process.stdin.isTTY)
-                    break; // No TTY → fall through to default
-                const { join } = await import("node:path");
-                for (const result of results) {
-                    if (result.status !== "conflict" || !result.fileResults)
-                        continue;
-                    for (const fileResult of result.fileResults) {
-                        if (fileResult.status !== "conflict")
-                            continue;
-                        const answer = await promptForConflictResolution({
-                            patchId: result.patch.id,
-                            patchMessage: result.patch.original_message,
-                            file: fileResult,
-                        });
-                        if (answer === "abort") {
-                            const report = this.buildReport(flow, allPatches, results, options, warnings);
-                            throw new ReplayConflictError(report);
-                        }
-                        if (answer === "ours" || answer === "theirs") {
-                            const filePath = join(this.outputDir, fileResult.file);
-                            await resolveConflictMarkers(filePath, answer);
-                            fileResult.status = "merged";
-                            fileResult.reason = `resolved (${answer === "ours" ? "keep-generated" : "keep-mine"})`;
-                        }
-                        // "manual" → leave conflict markers
-                    }
-                    const allResolved = result.fileResults.every((f) => f.status !== "conflict");
-                    if (allResolved) {
-                        result.status = "applied";
-                    }
-                }
-                break;
-            }
-            case "create-pr":
-                // Future feature. Fall through with a warning.
-                if (warnings) {
-                    warnings.push("on_conflict: create-pr is not yet implemented; conflict markers left in place");
-                }
-                break;
-        }
-    }
-    /**
-     * Phase 2: Throw for "fail" policy AFTER lockfile save.
-     * This ensures the lockfile is preserved even when we reject the commit.
-     */
-    enforceConflictFailPolicy(results, allPatches, flow, options, warnings, rebaseCounts) {
-        const hasConflicts = results.some((r) => r.status === "conflict");
-        if (!hasConflicts)
-            return;
-        const policy = this.getConflictPolicy();
-        if (policy !== "fail")
-            return;
-        const report = this.buildReport(flow, allPatches, results, options, warnings, rebaseCounts);
-        throw new ReplayConflictError(report);
+        return this.buildReport("normal-regeneration", allPatches, results, options, warnings, rebaseCounts, preRebaseCounts);
     }
     /**
      * Rebase cleanly applied patches so they are relative to the current generation.
@@ -380,9 +285,8 @@ export class ReplayService {
                 ]).catch(() => null);
                 if (!diff || !diff.trim()) {
                     // Patch is now empty — customization was absorbed by the generator.
-                    // Only removePatch (not absorbedPatchIds) — new patches that haven't
-                    // been added yet are correctly ignored by the no-op removePatch.
                     this.lockManager.removePatch(patch.id);
+                    absorbedPatchIds.add(patch.id);
                     absorbed++;
                     continue;
                 }
@@ -410,6 +314,55 @@ export class ReplayService {
         }
         return { absorbed, repointed, contentRebased, keptAsUserOwned, absorbedPatchIds };
     }
+    /**
+     * Pre-generation rebase: update stale conflicted patches using the customer's
+     * resolved state. Called BEFORE commitGeneration() so that HEAD still reflects
+     * the customer's code (generator output is in the working tree, not committed).
+     *
+     * For each patch with a stale base_generation:
+     * - If conflict markers remain in HEAD → skip (not yet resolved)
+     * - If diff(currentGen, HEAD) is empty → customer reverted, remove patch
+     * - Otherwise → update patch_content, content_hash, base_generation
+     */
+    async preGenerationRebase(patches) {
+        const lock = this.lockManager.read();
+        const currentGen = lock.current_generation;
+        let conflictResolved = 0;
+        let conflictAbsorbed = 0;
+        for (const patch of patches) {
+            if (patch.base_generation === currentGen)
+                continue;
+            try {
+                // Check for unresolved conflict markers in HEAD
+                const markerFiles = await this.git.exec(["grep", "-l", "<<<<<<<", "HEAD", "--", ...patch.files]).catch(() => "");
+                if (markerFiles.trim())
+                    continue;
+                // Compute customer's resolved state relative to current generation
+                const diff = await this.git.exec(["diff", currentGen, "HEAD", "--", ...patch.files]).catch(() => null);
+                // Diff command failed (e.g., invalid SHA) — skip this patch
+                if (diff === null)
+                    continue;
+                if (!diff.trim()) {
+                    // Empty diff — customer reverted their customization
+                    this.lockManager.removePatch(patch.id);
+                    conflictAbsorbed++;
+                    continue;
+                }
+                // Update the patch with the resolved content
+                const newContentHash = this.detector.computeContentHash(diff);
+                this.lockManager.updatePatch(patch.id, {
+                    base_generation: currentGen,
+                    patch_content: diff,
+                    content_hash: newContentHash,
+                });
+                conflictResolved++;
+            }
+            catch {
+                // If anything fails, leave the patch unchanged
+            }
+        }
+        return { conflictResolved, conflictAbsorbed };
+    }
     /**
      * Read .fernignore patterns from the output directory.
      * Returns an empty array if .fernignore doesn't exist.
@@ -426,7 +379,7 @@ export class ReplayService {
     /**
      * Build the final report from results.
      */
-    buildReport(flow, patches, results, options, warnings, rebaseCounts) {
+    buildReport(flow, patches, results, options, warnings, rebaseCounts, preRebaseCounts) {
         const conflictResults = results.filter((r) => r.status === "conflict");
         const conflictDetails = conflictResults
             .map((r) => ({
@@ -446,6 +399,8 @@ export class ReplayService {
             patchesRepointed: rebaseCounts && rebaseCounts.repointed > 0 ? rebaseCounts.repointed : undefined,
             patchesContentRebased: rebaseCounts && rebaseCounts.contentRebased > 0 ? rebaseCounts.contentRebased : undefined,
             patchesKeptAsUserOwned: rebaseCounts && rebaseCounts.keptAsUserOwned > 0 ? rebaseCounts.keptAsUserOwned : undefined,
+            patchesConflictResolved: preRebaseCounts && (preRebaseCounts.conflictResolved + preRebaseCounts.conflictAbsorbed) > 0
+                ? preRebaseCounts.conflictResolved + preRebaseCounts.conflictAbsorbed : undefined,
             conflicts: conflictResults
                 .flatMap((r) => r.fileResults?.filter((f) => f.status === "conflict") ?? []),
             conflictDetails: conflictDetails.length > 0 ? conflictDetails : undefined,