@fern-api/replay 0.6.2 → 0.8.0

package/dist/index.d.cts

@@ -23,6 +23,10 @@ interface StoredPatch {
     base_generation: string;
     files: string[];
     patch_content: string;
+    /** When "unresolved", the patch conflicted during CI and needs local resolution.
+     *  When "resolving", the resolve command has applied patches to the working tree
+     *  and is waiting for the customer to resolve conflicts and run resolve again. */
+    status?: "unresolved" | "resolving";
 }
 interface CustomizationsConfig {
     exclude?: string[];
@@ -96,6 +100,7 @@ declare class GitClient {
     }>>;
     isAncestor(commit: string, descendant: string): Promise<boolean>;
     commitExists(sha: string): Promise<boolean>;
+    getCommitBody(commitSha: string): Promise<string>;
     getRepoPath(): string;
 }
 
@@ -104,6 +109,12 @@ declare const FERN_BOT_EMAIL = "115122769+fern-api[bot]@users.noreply.github.com
 declare const FERN_BOT_LOGIN = "fern-api[bot]";
 declare function isGenerationCommit(commit: CommitInfo): boolean;
 declare function isReplayCommit(commit: CommitInfo): boolean;
+/** Check if a commit message indicates a git revert */
+declare function isRevertCommit(message: string): boolean;
+/** Extract the reverted commit SHA from a full commit body containing "This reverts commit SHA." */
+declare function parseRevertedSha(fullBody: string): string | undefined;
+/** Extract the original commit message from a revert subject like 'Revert "original message"' */
+declare function parseRevertedMessage(subject: string): string | undefined;
 
 declare class LockfileManager {
     private outputDir;
@@ -123,9 +134,13 @@ declare class LockfileManager {
     save(): void;
     addGeneration(record: GenerationRecord): void;
     addPatch(patch: StoredPatch): void;
-    updatePatch(patchId: string, updates: Partial<Pick<StoredPatch, "base_generation" | "patch_content" | "content_hash" | "files">>): void;
+    updatePatch(patchId: string, updates: Partial<Pick<StoredPatch, "base_generation" | "patch_content" | "content_hash" | "files" | "status">>): void;
     removePatch(patchId: string): void;
     clearPatches(): void;
+    getUnresolvedPatches(): StoredPatch[];
+    getResolvingPatches(): StoredPatch[];
+    markPatchUnresolved(patchId: string): void;
+    markPatchResolved(patchId: string, updates: Pick<StoredPatch, "patch_content" | "content_hash" | "base_generation" | "files">): void;
     getPatches(): StoredPatch[];
     setReplaySkippedAt(timestamp: string): void;
     clearReplaySkippedAt(): void;
@@ -135,20 +150,28 @@ declare class LockfileManager {
     private ensureLoaded;
 }
 
+interface DetectionResult {
+    patches: StoredPatch[];
+    revertedPatchIds: string[];
+}
 declare class ReplayDetector {
     private git;
     private lockManager;
     private sdkOutputDir;
     readonly warnings: string[];
     constructor(git: GitClient, lockManager: LockfileManager, sdkOutputDir: string);
-    detectNewPatches(): Promise<StoredPatch[]>;
+    detectNewPatches(): Promise<DetectionResult>;
     /**
      * Compute content hash for deduplication.
      * Removes commit SHA line and index lines before hashing,
      * so rebased commits with same content produce the same hash.
      */
     computeContentHash(patchContent: string): string;
-    /** Detect patches via tree diff for non-linear history. Returns a composite patch. */
+    /**
+     * Detect patches via tree diff for non-linear history. Returns a composite patch.
+     * Revert reconciliation is skipped here because tree-diff produces a single composite
+     * patch from the aggregate diff — individual revert commits are not distinguishable.
+     */
     private detectPatchesViaTreeDiff;
     private parseGitLog;
     private getLastGeneration;
@@ -201,7 +224,7 @@ declare class ReplayCommitter {
     private outputDir;
     constructor(git: GitClient, outputDir: string);
     commitGeneration(message: string, options?: CommitOptions): Promise<string>;
-    commitReplay(_patchCount: number, patches?: StoredPatch[]): Promise<string>;
+    commitReplay(_patchCount: number, patches?: StoredPatch[], message?: string): Promise<string>;
     createGenerationRecord(options?: CommitOptions): Promise<GenerationRecord>;
     stageAll(): Promise<void>;
     hasStagedChanges(): Promise<boolean>;
@@ -216,6 +239,12 @@ interface ConflictDetail {
     /** Files that applied cleanly in a patch that also had conflicts. */
     cleanFiles?: string[];
 }
+interface UnresolvedPatchInfo {
+    patchId: string;
+    patchMessage: string;
+    files: string[];
+    conflictDetails: FileResult[];
+}
 interface ReplayReport {
     flow: "first-generation" | "no-patches" | "normal-regeneration" | "skip-application";
     patchesDetected: number;
@@ -228,9 +257,12 @@ interface ReplayReport {
     patchesKeptAsUserOwned?: number;
     patchesPartiallyApplied?: number;
     patchesConflictResolved?: number;
+    patchesReverted?: number;
     patchesRefreshed?: number;
     conflicts: FileResult[];
     conflictDetails?: ConflictDetail[];
+    /** Patches that conflicted and need local resolution via `fern-replay resolve` */
+    unresolvedPatches?: UnresolvedPatchInfo[];
     wouldApply?: StoredPatch[];
     warnings?: string[];
 }
@@ -303,6 +335,11 @@ declare class ReplayService {
      * Called BEFORE commitGeneration() while HEAD has customer code.
      */
     private preGenerationRebase;
+    /**
+     * After applyPatches(), strip conflict markers from conflicting files
+     * so only clean content is committed. Keeps the Generated (OURS) side.
+     */
+    private revertConflictingFiles;
     private readFernignorePatterns;
     private buildReport;
 }
@@ -427,10 +464,16 @@ interface ResolveResult {
     success: boolean;
     /** Commit SHA of the [fern-replay] commit, if created */
     commitSha?: string;
-    /** Reason for failure */
+    /** Reason for failure or current state */
     reason?: string;
-    /** Files that still have conflict markers */
+    /** Files that have conflict markers */
     unresolvedFiles?: string[];
+    /** Phase the command executed */
+    phase?: "applied" | "committed" | "nothing-to-resolve";
+    /** Number of patches applied to working tree (phase 1) */
+    patchesApplied?: number;
+    /** Number of patches resolved and committed (phase 2) */
+    patchesResolved?: number;
 }
 declare function resolve(outputDir: string, options?: ResolveOptions): Promise<ResolveResult>;
 
@@ -460,4 +503,4 @@ interface StatusGeneration {
 }
 declare function status(outputDir: string): StatusResult;
 
-export { type BootstrapOptions, type BootstrapResult, type CommitInfo, type CommitOptions, type ConflictDetail, type ConflictMetadata, type ConflictReason, type ConflictRegion, type CustomizationsConfig, FERN_BOT_EMAIL, FERN_BOT_LOGIN, FERN_BOT_NAME, FernignoreMigrator, type FileResult, type ForgetOptions, type ForgetResult, type GenerationLock, type GenerationRecord, GitClient, LockfileManager, type MergeResult, type MigrationAnalysis, type MigrationResult, type MoveDeclaration, ReplayApplicator, ReplayCommitter, type ReplayConfig, ReplayDetector, type ReplayOptions, type ReplayReport, type ReplayResult, ReplayService, type ResetOptions, type ResetResult, type ResolveOptions, type ResolveResult, type StatusGeneration, type StatusPatch, type StatusResult, type StoredPatch, bootstrap, forget, isGenerationCommit, isReplayCommit, reset, resolve, status, threeWayMerge };
+export { type BootstrapOptions, type BootstrapResult, type CommitInfo, type CommitOptions, type ConflictDetail, type ConflictMetadata, type ConflictReason, type ConflictRegion, type CustomizationsConfig, type DetectionResult, FERN_BOT_EMAIL, FERN_BOT_LOGIN, FERN_BOT_NAME, FernignoreMigrator, type FileResult, type ForgetOptions, type ForgetResult, type GenerationLock, type GenerationRecord, GitClient, LockfileManager, type MergeResult, type MigrationAnalysis, type MigrationResult, type MoveDeclaration, ReplayApplicator, ReplayCommitter, type ReplayConfig, ReplayDetector, type ReplayOptions, type ReplayReport, type ReplayResult, ReplayService, type ResetOptions, type ResetResult, type ResolveOptions, type ResolveResult, type StatusGeneration, type StatusPatch, type StatusResult, type StoredPatch, type UnresolvedPatchInfo, bootstrap, forget, isGenerationCommit, isReplayCommit, isRevertCommit, parseRevertedMessage, parseRevertedSha, reset, resolve, status, threeWayMerge };

package/dist/index.d.ts

@@ -23,6 +23,10 @@ interface StoredPatch {
     base_generation: string;
     files: string[];
     patch_content: string;
+    /** When "unresolved", the patch conflicted during CI and needs local resolution.
+     *  When "resolving", the resolve command has applied patches to the working tree
+     *  and is waiting for the customer to resolve conflicts and run resolve again. */
+    status?: "unresolved" | "resolving";
 }
 interface CustomizationsConfig {
     exclude?: string[];
@@ -96,6 +100,7 @@ declare class GitClient {
     }>>;
     isAncestor(commit: string, descendant: string): Promise<boolean>;
     commitExists(sha: string): Promise<boolean>;
+    getCommitBody(commitSha: string): Promise<string>;
     getRepoPath(): string;
 }
 
@@ -104,6 +109,12 @@ declare const FERN_BOT_EMAIL = "115122769+fern-api[bot]@users.noreply.github.com
 declare const FERN_BOT_LOGIN = "fern-api[bot]";
 declare function isGenerationCommit(commit: CommitInfo): boolean;
 declare function isReplayCommit(commit: CommitInfo): boolean;
+/** Check if a commit message indicates a git revert */
+declare function isRevertCommit(message: string): boolean;
+/** Extract the reverted commit SHA from a full commit body containing "This reverts commit SHA." */
+declare function parseRevertedSha(fullBody: string): string | undefined;
+/** Extract the original commit message from a revert subject like 'Revert "original message"' */
+declare function parseRevertedMessage(subject: string): string | undefined;
 
 declare class LockfileManager {
     private outputDir;
@@ -123,9 +134,13 @@ declare class LockfileManager {
     save(): void;
     addGeneration(record: GenerationRecord): void;
     addPatch(patch: StoredPatch): void;
-    updatePatch(patchId: string, updates: Partial<Pick<StoredPatch, "base_generation" | "patch_content" | "content_hash" | "files">>): void;
+    updatePatch(patchId: string, updates: Partial<Pick<StoredPatch, "base_generation" | "patch_content" | "content_hash" | "files" | "status">>): void;
     removePatch(patchId: string): void;
     clearPatches(): void;
+    getUnresolvedPatches(): StoredPatch[];
+    getResolvingPatches(): StoredPatch[];
+    markPatchUnresolved(patchId: string): void;
+    markPatchResolved(patchId: string, updates: Pick<StoredPatch, "patch_content" | "content_hash" | "base_generation" | "files">): void;
     getPatches(): StoredPatch[];
     setReplaySkippedAt(timestamp: string): void;
     clearReplaySkippedAt(): void;
@@ -135,20 +150,28 @@ declare class LockfileManager {
     private ensureLoaded;
 }
 
+interface DetectionResult {
+    patches: StoredPatch[];
+    revertedPatchIds: string[];
+}
 declare class ReplayDetector {
     private git;
     private lockManager;
     private sdkOutputDir;
     readonly warnings: string[];
     constructor(git: GitClient, lockManager: LockfileManager, sdkOutputDir: string);
-    detectNewPatches(): Promise<StoredPatch[]>;
+    detectNewPatches(): Promise<DetectionResult>;
     /**
      * Compute content hash for deduplication.
      * Removes commit SHA line and index lines before hashing,
      * so rebased commits with same content produce the same hash.
      */
     computeContentHash(patchContent: string): string;
-    /** Detect patches via tree diff for non-linear history. Returns a composite patch. */
+    /**
+     * Detect patches via tree diff for non-linear history. Returns a composite patch.
+     * Revert reconciliation is skipped here because tree-diff produces a single composite
+     * patch from the aggregate diff — individual revert commits are not distinguishable.
+     */
     private detectPatchesViaTreeDiff;
     private parseGitLog;
     private getLastGeneration;
@@ -201,7 +224,7 @@ declare class ReplayCommitter {
     private outputDir;
     constructor(git: GitClient, outputDir: string);
     commitGeneration(message: string, options?: CommitOptions): Promise<string>;
-    commitReplay(_patchCount: number, patches?: StoredPatch[]): Promise<string>;
+    commitReplay(_patchCount: number, patches?: StoredPatch[], message?: string): Promise<string>;
     createGenerationRecord(options?: CommitOptions): Promise<GenerationRecord>;
     stageAll(): Promise<void>;
     hasStagedChanges(): Promise<boolean>;
@@ -216,6 +239,12 @@ interface ConflictDetail {
     /** Files that applied cleanly in a patch that also had conflicts. */
     cleanFiles?: string[];
 }
+interface UnresolvedPatchInfo {
+    patchId: string;
+    patchMessage: string;
+    files: string[];
+    conflictDetails: FileResult[];
+}
 interface ReplayReport {
     flow: "first-generation" | "no-patches" | "normal-regeneration" | "skip-application";
     patchesDetected: number;
@@ -228,9 +257,12 @@ interface ReplayReport {
     patchesKeptAsUserOwned?: number;
     patchesPartiallyApplied?: number;
     patchesConflictResolved?: number;
+    patchesReverted?: number;
     patchesRefreshed?: number;
     conflicts: FileResult[];
     conflictDetails?: ConflictDetail[];
+    /** Patches that conflicted and need local resolution via `fern-replay resolve` */
+    unresolvedPatches?: UnresolvedPatchInfo[];
     wouldApply?: StoredPatch[];
     warnings?: string[];
 }
@@ -303,6 +335,11 @@ declare class ReplayService {
      * Called BEFORE commitGeneration() while HEAD has customer code.
      */
     private preGenerationRebase;
+    /**
+     * After applyPatches(), strip conflict markers from conflicting files
+     * so only clean content is committed. Keeps the Generated (OURS) side.
+     */
+    private revertConflictingFiles;
     private readFernignorePatterns;
     private buildReport;
 }
@@ -427,10 +464,16 @@ interface ResolveResult {
     success: boolean;
     /** Commit SHA of the [fern-replay] commit, if created */
     commitSha?: string;
-    /** Reason for failure */
+    /** Reason for failure or current state */
     reason?: string;
-    /** Files that still have conflict markers */
+    /** Files that have conflict markers */
     unresolvedFiles?: string[];
+    /** Phase the command executed */
+    phase?: "applied" | "committed" | "nothing-to-resolve";
+    /** Number of patches applied to working tree (phase 1) */
+    patchesApplied?: number;
+    /** Number of patches resolved and committed (phase 2) */
+    patchesResolved?: number;
 }
 declare function resolve(outputDir: string, options?: ResolveOptions): Promise<ResolveResult>;
 
@@ -460,4 +503,4 @@ interface StatusGeneration {
 }
 declare function status(outputDir: string): StatusResult;
 
-export { type BootstrapOptions, type BootstrapResult, type CommitInfo, type CommitOptions, type ConflictDetail, type ConflictMetadata, type ConflictReason, type ConflictRegion, type CustomizationsConfig, FERN_BOT_EMAIL, FERN_BOT_LOGIN, FERN_BOT_NAME, FernignoreMigrator, type FileResult, type ForgetOptions, type ForgetResult, type GenerationLock, type GenerationRecord, GitClient, LockfileManager, type MergeResult, type MigrationAnalysis, type MigrationResult, type MoveDeclaration, ReplayApplicator, ReplayCommitter, type ReplayConfig, ReplayDetector, type ReplayOptions, type ReplayReport, type ReplayResult, ReplayService, type ResetOptions, type ResetResult, type ResolveOptions, type ResolveResult, type StatusGeneration, type StatusPatch, type StatusResult, type StoredPatch, bootstrap, forget, isGenerationCommit, isReplayCommit, reset, resolve, status, threeWayMerge };
+export { type BootstrapOptions, type BootstrapResult, type CommitInfo, type CommitOptions, type ConflictDetail, type ConflictMetadata, type ConflictReason, type ConflictRegion, type CustomizationsConfig, type DetectionResult, FERN_BOT_EMAIL, FERN_BOT_LOGIN, FERN_BOT_NAME, FernignoreMigrator, type FileResult, type ForgetOptions, type ForgetResult, type GenerationLock, type GenerationRecord, GitClient, LockfileManager, type MergeResult, type MigrationAnalysis, type MigrationResult, type MoveDeclaration, ReplayApplicator, ReplayCommitter, type ReplayConfig, ReplayDetector, type ReplayOptions, type ReplayReport, type ReplayResult, ReplayService, type ResetOptions, type ResetResult, type ResolveOptions, type ResolveResult, type StatusGeneration, type StatusPatch, type StatusResult, type StoredPatch, type UnresolvedPatchInfo, bootstrap, forget, isGenerationCommit, isReplayCommit, isRevertCommit, parseRevertedMessage, parseRevertedSha, reset, resolve, status, threeWayMerge };