@fern-api/replay 0.9.1 → 0.10.1

package/dist/index.d.cts

@@ -118,6 +118,9 @@ 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 LockfileNotFoundError extends Error {
+    constructor(path: string);
+}
 declare class LockfileManager {
     private outputDir;
     private lock;
@@ -176,6 +179,27 @@ declare class ReplayDetector {
      * patch from the aggregate diff — individual revert commits are not distinguishable.
      */
     private detectPatchesViaTreeDiff;
+    /**
+     * Last-resort detection when both generation commit and tree are unreachable.
+     * Scans all commits from HEAD, filters against known lockfile patches, and
+     * skips creation-only commits (squashed history after force push).
+     *
+     * Detected patches use the commit's parent as base_generation so the applicator
+     * can find base file content from the parent's tree (which IS reachable).
+     */
+    private detectPatchesViaCommitScan;
+    /**
+     * Check if a format-patch consists entirely of new-file creations.
+     * Used to identify squashed commits after force push, which create all files
+     * from scratch (--- /dev/null) rather than modifying existing files.
+     */
+    private isCreationOnlyPatch;
+    /**
+     * Resolve the best available diff base for a generation record.
+     * Prefers commit_sha, falls back to tree_hash for unreachable commits.
+     * When commitKnownMissing is true, skips the redundant commitExists check.
+     */
+    private resolveDiffBase;
     private parseGitLog;
     private getLastGeneration;
 }
@@ -198,6 +222,12 @@ declare class ReplayApplicator {
     private treeExistsCache;
     private fileTheirsAccumulator;
     constructor(git: GitClient, lockManager: LockfileManager, outputDir: string);
+    /**
+     * Resolve the GenerationRecord for a patch's base_generation.
+     * Falls back to constructing an ad-hoc record from the commit's tree
+     * when base_generation isn't a tracked generation (commit-scan patches).
+     */
+    private resolveBaseGeneration;
     /** Reset inter-patch accumulator for a new cycle. */
     private resetAccumulator;
     /**
@@ -345,6 +375,13 @@ declare class ReplayService {
      * so only clean content is committed. Keeps the Generated (OURS) side.
      */
     private revertConflictingFiles;
+    /**
+     * Clean up stale conflict markers left by a previous crashed run.
+     * Called after commitGeneration() when HEAD is the [fern-generated] commit.
+     * Restores files to their clean generated state from HEAD.
+     * Skips .fernignore-protected files to prevent overwriting user content.
+     */
+    private cleanupStaleConflictMarkers;
     private readFernignorePatterns;
     private buildReport;
 }
@@ -551,4 +588,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, type DetectionResult, type DiffStat, FERN_BOT_EMAIL, FERN_BOT_LOGIN, FERN_BOT_NAME, FernignoreMigrator, type FileResult, type ForgetOptions, type ForgetResult, type GenerationLock, type GenerationRecord, GitClient, LockfileManager, type MatchedPatch, 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 };
+export { type BootstrapOptions, type BootstrapResult, type CommitInfo, type CommitOptions, type ConflictDetail, type ConflictMetadata, type ConflictReason, type ConflictRegion, type CustomizationsConfig, type DetectionResult, type DiffStat, FERN_BOT_EMAIL, FERN_BOT_LOGIN, FERN_BOT_NAME, FernignoreMigrator, type FileResult, type ForgetOptions, type ForgetResult, type GenerationLock, type GenerationRecord, GitClient, LockfileManager, LockfileNotFoundError, type MatchedPatch, 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

@@ -118,6 +118,9 @@ 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 LockfileNotFoundError extends Error {
+    constructor(path: string);
+}
 declare class LockfileManager {
     private outputDir;
     private lock;
@@ -176,6 +179,27 @@ declare class ReplayDetector {
      * patch from the aggregate diff — individual revert commits are not distinguishable.
      */
     private detectPatchesViaTreeDiff;
+    /**
+     * Last-resort detection when both generation commit and tree are unreachable.
+     * Scans all commits from HEAD, filters against known lockfile patches, and
+     * skips creation-only commits (squashed history after force push).
+     *
+     * Detected patches use the commit's parent as base_generation so the applicator
+     * can find base file content from the parent's tree (which IS reachable).
+     */
+    private detectPatchesViaCommitScan;
+    /**
+     * Check if a format-patch consists entirely of new-file creations.
+     * Used to identify squashed commits after force push, which create all files
+     * from scratch (--- /dev/null) rather than modifying existing files.
+     */
+    private isCreationOnlyPatch;
+    /**
+     * Resolve the best available diff base for a generation record.
+     * Prefers commit_sha, falls back to tree_hash for unreachable commits.
+     * When commitKnownMissing is true, skips the redundant commitExists check.
+     */
+    private resolveDiffBase;
     private parseGitLog;
     private getLastGeneration;
 }
@@ -198,6 +222,12 @@ declare class ReplayApplicator {
     private treeExistsCache;
     private fileTheirsAccumulator;
     constructor(git: GitClient, lockManager: LockfileManager, outputDir: string);
+    /**
+     * Resolve the GenerationRecord for a patch's base_generation.
+     * Falls back to constructing an ad-hoc record from the commit's tree
+     * when base_generation isn't a tracked generation (commit-scan patches).
+     */
+    private resolveBaseGeneration;
     /** Reset inter-patch accumulator for a new cycle. */
     private resetAccumulator;
     /**
@@ -345,6 +375,13 @@ declare class ReplayService {
      * so only clean content is committed. Keeps the Generated (OURS) side.
      */
     private revertConflictingFiles;
+    /**
+     * Clean up stale conflict markers left by a previous crashed run.
+     * Called after commitGeneration() when HEAD is the [fern-generated] commit.
+     * Restores files to their clean generated state from HEAD.
+     * Skips .fernignore-protected files to prevent overwriting user content.
+     */
+    private cleanupStaleConflictMarkers;
     private readFernignorePatterns;
     private buildReport;
 }
@@ -551,4 +588,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, type DetectionResult, type DiffStat, FERN_BOT_EMAIL, FERN_BOT_LOGIN, FERN_BOT_NAME, FernignoreMigrator, type FileResult, type ForgetOptions, type ForgetResult, type GenerationLock, type GenerationRecord, GitClient, LockfileManager, type MatchedPatch, 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 };
+export { type BootstrapOptions, type BootstrapResult, type CommitInfo, type CommitOptions, type ConflictDetail, type ConflictMetadata, type ConflictReason, type ConflictRegion, type CustomizationsConfig, type DetectionResult, type DiffStat, FERN_BOT_EMAIL, FERN_BOT_LOGIN, FERN_BOT_NAME, FernignoreMigrator, type FileResult, type ForgetOptions, type ForgetResult, type GenerationLock, type GenerationRecord, GitClient, LockfileManager, LockfileNotFoundError, type MatchedPatch, 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 };