@fern-api/replay 0.18.0 → 0.19.0

package/dist/index.d.cts

@@ -4,8 +4,40 @@ interface GenerationLock {
     current_generation: string;
     patches: StoredPatch[];
     forgotten_hashes?: string[];
+    /**
+     * Visibility metadata for dismissed customizations (patches retired via
+     * `forget` or by keeping the generator's version during `resolve`).
+     * `forgotten_hashes` remains the sole operative tombstone list the
+     * detector consults; this array exists so `status` can show the customer
+     * WHAT was dismissed (message + commit), not just that something was.
+     *
+     * Never stores patch content — the credential strip in
+     * `LockfileManager.save()` only scans patches, so diff text must not
+     * appear here. Like `forgotten_hashes`, this is lost when the lockfile
+     * is deleted (`reset`) or rebuilt (`bootstrap --force`) — full-amnesia
+     * semantics by design.
+     */
+    dismissals?: DismissalRecord[];
     replay_skipped_at?: string;
 }
+interface DismissalRecord {
+    /** ID the patch had when it was dismissed (e.g. "patch-6cf172ea"). */
+    patch_id: string;
+    /** SHA of the customer commit the patch came from. Empty for synthetic patches. */
+    original_commit: string;
+    /** The customer's original commit message. */
+    original_message: string;
+    /**
+     * Every content hash tombstoned for this dismissal: the stored
+     * content_hash plus, when the original commit is reachable, the
+     * re-emission hash recomputed through the detection pipeline.
+     */
+    content_hashes: string[];
+    /** ISO timestamp of the dismissal. */
+    dismissed_at: string;
+    /** Which route dismissed it. */
+    via: "forget" | "resolve";
+}
 interface GenerationRecord {
     commit_sha: string;
     tree_hash: string;
@@ -65,6 +97,35 @@ interface CustomizationsConfig {
     exclude?: string[];
     moves?: MoveDeclaration[];
 }
+/**
+ * Machine-readable reasons a replay run is "degraded": the run completed,
+ * but Replay could not guarantee that customizations were carried forward
+ * because the baseline it needed (the previous generation) was not reachable
+ * during the run.
+ *
+ * These codes are wire keys (pipeline JSON, telemetry) — frozen once shipped.
+ * See CONTEXT.md's wire-contract section.
+ *
+ * - `generation-anchor-unreachable` — the recorded generation commit is not
+ *   in the clone, and tracked patches exist that cannot be verified against
+ *   it. Tree-diff recovery may still have reconstructed on-disk
+ *   customizations.
+ * - `generation-tree-unreachable` — neither the recorded generation commit
+ *   nor its recorded tree is reachable; detection fell back to a bounded
+ *   commit scan that cannot see customizations older than the clone window.
+ * - `baseline-unresolvable` — the lockfile records a previous generation but
+ *   no baseline could be resolved at all (no boundary in history, no matching
+ *   generation record). Detection returned without a baseline.
+ * - `patch-base-unreachable` — at apply time, one or more customizations
+ *   could not be checked against their base generation because that
+ *   generation's tree was not reachable during this run.
+ */
+type DegradedReasonCode = "generation-anchor-unreachable" | "generation-tree-unreachable" | "baseline-unresolvable" | "patch-base-unreachable";
+/** One structured reason a run was degraded. `message` is customer-facing prose. */
+interface DegradedReason {
+    code: DegradedReasonCode;
+    message: string;
+}
 interface MoveDeclaration {
     from: string;
     to: string;
@@ -256,6 +317,13 @@ declare class LockfileManager {
     removePatch(patchId: string): void;
     clearPatches(): void;
     addForgottenHash(hash: string): void;
+    /**
+     * Record a dismissed customization: visibility metadata in `dismissals`
+     * plus a tombstone in `forgotten_hashes` for every content hash.
+     * `forgotten_hashes` stays the only list the detector consults; the
+     * metadata exists so `status` can show what was dismissed.
+     */
+    addDismissal(record: DismissalRecord): void;
     getUnresolvedPatches(): StoredPatch[];
     getResolvingPatches(): StoredPatch[];
     markPatchUnresolved(patchId: string): void;
@@ -273,12 +341,49 @@ interface DetectionResult {
     patches: StoredPatch[];
     revertedPatchIds: string[];
 }
+/**
+ * Result of materializing a commit into patch content through the exact
+ * pipeline detection uses (file filtering → scoped diff or format-patch →
+ * content hash). `sensitiveFiles` / `fernignoredFiles` are surfaced so
+ * callers can emit the same customer-facing warnings detection does.
+ *
+ * - `ok` — patch content and its content hash were produced.
+ * - `unreachable` — the commit (or its patch text) could not be read, e.g.
+ *   a shallow clone window or a GC'd object.
+ * - `empty` — nothing survives filtering (only infrastructure / sensitive /
+ *   fernignored files, or the scoped diff is empty).
+ */
+type MaterializedCommitPatch = {
+    status: "ok";
+    files: string[];
+    sensitiveFiles: string[];
+    fernignoredFiles: string[];
+    patchContent: string;
+    contentHash: string;
+} | {
+    status: "unreachable";
+    sensitiveFiles: string[];
+    fernignoredFiles: string[];
+} | {
+    status: "empty";
+    sensitiveFiles: string[];
+    fernignoredFiles: string[];
+};
 declare class ReplayDetector {
     private git;
     private lockManager;
     private sdkOutputDir;
     private fernignorePatterns;
     readonly warnings: string[];
+    /**
+     * Structured degraded-state channel, mirroring `warnings`. Populated when
+     * detection cannot guarantee customizations were carried forward (baseline
+     * unreachable in this clone). Cleared per-run by `ReplayService.prepareReplay`
+     * alongside `warnings`. Merged into `ReplayReport.degradedReasons` by each
+     * flow handler. Degraded is observability only: detection results are
+     * unchanged.
+     */
+    readonly degradedReasons: DegradedReason[];
     constructor(git: GitClient, lockManager: LockfileManager, sdkOutputDir: string, fernignorePatterns?: readonly string[]);
     /**
      * Derive the previous-generation SHA from git history instead of trusting
@@ -308,6 +413,23 @@ declare class ReplayDetector {
      * content, regardless of where the walk actually started.
      */
     private detectPatchesInRange;
+    /**
+     * Materialize a commit into patch content exactly as detection does.
+     *
+     * Pipeline: `diff-tree --name-only` → filter infrastructure / sensitive /
+     * `.fernignore`d files → scoped `git diff` when files were stripped,
+     * otherwise full `git format-patch` → content hash.
+     *
+     * This is THE definition of a commit's re-emission identity: the content
+     * hash this method returns is what `detectPatchesInRange` will compute if
+     * the commit re-enters the scan range (e.g. after a regen PR is merged
+     * with a merge commit). Callers that tombstone a dismissed patch must use
+     * this hash — the stored `content_hash` drifts every time the patch is
+     * carried forward, so it does not identify the commit on re-detection.
+     *
+     * Never throws; failures are reported through the `status` discriminant.
+     */
+    materializeCommitPatch(sha: string): Promise<MaterializedCommitPatch>;
     /**
      * Compute content hash for deduplication.
      *
@@ -604,6 +726,16 @@ interface ReplayReport {
     unresolvedPatches?: UnresolvedPatchInfo[];
     wouldApply?: StoredPatch[];
     warnings?: string[];
+    /**
+     * True iff `degradedReasons` is non-empty: the run completed but could not
+     * guarantee customizations were carried forward because the baseline it
+     * needed (the previous generation) was unreachable during the run.
+     * Both fields are undefined on healthy runs, matching the `warnings`
+     * convention. Degraded is observability only — it never changes detection
+     * results, lockfile saves, or commit decisions.
+     */
+    degraded?: boolean;
+    degradedReasons?: DegradedReason[];
 }
 interface ReplayOptions {
     /** Log what would happen but don't modify anything */
@@ -689,6 +821,12 @@ interface InternalPreparationActive {
     };
     /** detector warnings snapshotted at end of phase 1 */
     detectorWarnings: string[];
+    /**
+     * Detector degraded reasons snapshotted at end of phase 1 (next to
+     * `detectorWarnings`) so degraded state survives the two-phase
+     * prepare/apply split and any mid-phase commits (e.g. autoversion).
+     */
+    detectorDegraded: DegradedReason[];
     revertedCount: number;
     /** [fern-generated] SHA; passed to rebasePatches as currentGenSha */
     genSha: string;
@@ -722,6 +860,16 @@ declare class ReplayService {
      * @internal Used by Flow implementations in `src/flows/`.
      */
     warnings: string[];
+    /**
+     * Service-level structured degraded reasons, mirroring `warnings`.
+     * Populated at apply time (e.g. `recordUnreachableBaseWarnings` when a
+     * patch's base-generation tree is unreachable). Merged with
+     * `detector.degradedReasons` into `ReplayReport.degradedReasons` by each
+     * flow handler. Cleared at the top of `prepareReplay()`.
+     *
+     * @internal Used by Flow implementations in `src/flows/`.
+     */
+    degradedReasons: DegradedReason[];
     /**
      * @internal Test-only accessor.
      * Returns the ReplayApplicator instance used for the last run. Tests use this
@@ -762,6 +910,17 @@ declare class ReplayService {
      * `diff --git` headers are found (fail-safe for exotic legacy formats).
      */
     private cleanseLegacyFernignoreEntries;
+    /**
+     * Migration step: strips infrastructure file diffs (`.fernignore`, `.fern/*`)
+     * from existing patches' `patch_content`. These diffs were bundled by older
+     * detection logic that did not scope `git diff` when only infrastructure files
+     * were stripped. Patches that end up with no surviving diff sections are
+     * removed entirely.
+     *
+     * Idempotent: a second run is a no-op because the first run already removed
+     * all infrastructure sections. Per-patch try/catch ensures isolation.
+     */
+    private cleanseInfrastructureFileEntries;
     /**
      * Phase 2 of the two-phase replay flow. Applies patches, rebases them against
      * the generation, saves the lockfile, and commits `[fern-replay]` (or stages
@@ -939,7 +1098,7 @@ declare class ReplayService {
         conflictResolved: number;
         conflictAbsorbed: number;
         contentRefreshed: number;
-    }, patchesReverted?: number): ReplayReport;
+    }, patchesReverted?: number, degradedReasons?: DegradedReason[]): ReplayReport;
 }
 
 interface MigrationAnalysis {
@@ -1060,7 +1219,7 @@ interface ForgetResult {
     /** Matching patches for interactive selection (search/no-arg mode only) */
     matched?: MatchedPatch[];
 }
-declare function forget(outputDir: string, options?: ForgetOptions): ForgetResult;
+declare function forget(outputDir: string, options?: ForgetOptions): Promise<ForgetResult>;
 
 interface ResetOptions {
     /** Don't actually delete, just show what would happen */
@@ -1097,6 +1256,15 @@ interface ResolveResult {
     patchesApplied?: number;
     /** Number of patches resolved and committed (phase 2) */
     patchesResolved?: number;
+    /**
+     * Patches permanently dismissed during phase 2 — the customer kept the
+     * generator's version for every file in the patch. These are tombstoned
+     * in the lockfile and will not be re-detected on future generations.
+     */
+    patchesDismissed?: Array<{
+        id: string;
+        message: string;
+    }>;
     /** Non-fatal diagnostic messages (e.g., per-patch fallbacks) */
     warnings?: string[];
 }
@@ -1115,6 +1283,28 @@ interface StatusResult {
     unresolvedCount: number;
     /** Exclude patterns from replay.yml */
     excludePatterns: string[];
+    /**
+     * Customizations the customer permanently dismissed — via `forget`, or by
+     * keeping the generator's version when resolving a conflict. These will
+     * not be re-detected on future generations.
+     */
+    dismissed: StatusDismissal[];
+    /**
+     * Count of forgotten hashes recorded before dismissal metadata existed.
+     * Such entries still tombstone re-detection but carry no message/commit
+     * details to display.
+     */
+    legacyDismissedCount: number;
+}
+interface StatusDismissal {
+    /** The customer's original commit message */
+    message: string;
+    /** Short SHA of the original commit (7 chars; empty for synthetic patches) */
+    sha: string;
+    /** Which route dismissed it */
+    via: "forget" | "resolve";
+    /** ISO timestamp of the dismissal */
+    dismissedAt: string;
 }
 interface StatusPatch {
     /** Patch ID (e.g. "patch-def45678") */
@@ -1146,4 +1336,4 @@ interface StatusGeneration {
 }
 declare function status(outputDir: string): StatusResult;
 
-export { type ApplyOptions, type BootstrapOptions, type BootstrapResult, CREDENTIAL_PATTERNS, type CommitInfo, type CommitOptions, type ConflictDetail, type ConflictMetadata, type ConflictReason, type ConflictRegion, type CredentialPattern, type CustomizationsConfig, type DetectionResult, type DiffStat, FERN_BOT_EMAIL, FERN_BOT_LOGIN, FERN_BOT_NAME, FernignoreMigrator, type FileResult, type FlowKind, 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 ReplayPreparation, type ReplayReport, type ReplayResult, ReplayService, type ResetOptions, type ResetResult, type ResolveOptions, type ResolveResult, SENSITIVE_FILE_PATTERNS, type StatusGeneration, type StatusPatch, type StatusResult, type StoredPatch, type UnresolvedPatchInfo, bootstrap, forget, isGenerationCommit, isReplayCommit, isRevertCommit, isSensitiveFile, parseRevertedMessage, parseRevertedSha, reset, resolve, scanForCredentials, status, threeWayMerge };
+export { type ApplyOptions, type BootstrapOptions, type BootstrapResult, CREDENTIAL_PATTERNS, type CommitInfo, type CommitOptions, type ConflictDetail, type ConflictMetadata, type ConflictReason, type ConflictRegion, type CredentialPattern, type CustomizationsConfig, type DegradedReason, type DegradedReasonCode, type DetectionResult, type DiffStat, type DismissalRecord, FERN_BOT_EMAIL, FERN_BOT_LOGIN, FERN_BOT_NAME, FernignoreMigrator, type FileResult, type FlowKind, type ForgetOptions, type ForgetResult, type GenerationLock, type GenerationRecord, GitClient, LockfileManager, LockfileNotFoundError, type MatchedPatch, type MaterializedCommitPatch, type MergeResult, type MigrationAnalysis, type MigrationResult, type MoveDeclaration, ReplayApplicator, ReplayCommitter, type ReplayConfig, ReplayDetector, type ReplayOptions, type ReplayPreparation, type ReplayReport, type ReplayResult, ReplayService, type ResetOptions, type ResetResult, type ResolveOptions, type ResolveResult, SENSITIVE_FILE_PATTERNS, type StatusDismissal, type StatusGeneration, type StatusPatch, type StatusResult, type StoredPatch, type UnresolvedPatchInfo, bootstrap, forget, isGenerationCommit, isReplayCommit, isRevertCommit, isSensitiveFile, parseRevertedMessage, parseRevertedSha, reset, resolve, scanForCredentials, status, threeWayMerge };

package/dist/index.d.ts

@@ -4,8 +4,40 @@ interface GenerationLock {
     current_generation: string;
     patches: StoredPatch[];
     forgotten_hashes?: string[];
+    /**
+     * Visibility metadata for dismissed customizations (patches retired via
+     * `forget` or by keeping the generator's version during `resolve`).
+     * `forgotten_hashes` remains the sole operative tombstone list the
+     * detector consults; this array exists so `status` can show the customer
+     * WHAT was dismissed (message + commit), not just that something was.
+     *
+     * Never stores patch content — the credential strip in
+     * `LockfileManager.save()` only scans patches, so diff text must not
+     * appear here. Like `forgotten_hashes`, this is lost when the lockfile
+     * is deleted (`reset`) or rebuilt (`bootstrap --force`) — full-amnesia
+     * semantics by design.
+     */
+    dismissals?: DismissalRecord[];
     replay_skipped_at?: string;
 }
+interface DismissalRecord {
+    /** ID the patch had when it was dismissed (e.g. "patch-6cf172ea"). */
+    patch_id: string;
+    /** SHA of the customer commit the patch came from. Empty for synthetic patches. */
+    original_commit: string;
+    /** The customer's original commit message. */
+    original_message: string;
+    /**
+     * Every content hash tombstoned for this dismissal: the stored
+     * content_hash plus, when the original commit is reachable, the
+     * re-emission hash recomputed through the detection pipeline.
+     */
+    content_hashes: string[];
+    /** ISO timestamp of the dismissal. */
+    dismissed_at: string;
+    /** Which route dismissed it. */
+    via: "forget" | "resolve";
+}
 interface GenerationRecord {
     commit_sha: string;
     tree_hash: string;
@@ -65,6 +97,35 @@ interface CustomizationsConfig {
     exclude?: string[];
     moves?: MoveDeclaration[];
 }
+/**
+ * Machine-readable reasons a replay run is "degraded": the run completed,
+ * but Replay could not guarantee that customizations were carried forward
+ * because the baseline it needed (the previous generation) was not reachable
+ * during the run.
+ *
+ * These codes are wire keys (pipeline JSON, telemetry) — frozen once shipped.
+ * See CONTEXT.md's wire-contract section.
+ *
+ * - `generation-anchor-unreachable` — the recorded generation commit is not
+ *   in the clone, and tracked patches exist that cannot be verified against
+ *   it. Tree-diff recovery may still have reconstructed on-disk
+ *   customizations.
+ * - `generation-tree-unreachable` — neither the recorded generation commit
+ *   nor its recorded tree is reachable; detection fell back to a bounded
+ *   commit scan that cannot see customizations older than the clone window.
+ * - `baseline-unresolvable` — the lockfile records a previous generation but
+ *   no baseline could be resolved at all (no boundary in history, no matching
+ *   generation record). Detection returned without a baseline.
+ * - `patch-base-unreachable` — at apply time, one or more customizations
+ *   could not be checked against their base generation because that
+ *   generation's tree was not reachable during this run.
+ */
+type DegradedReasonCode = "generation-anchor-unreachable" | "generation-tree-unreachable" | "baseline-unresolvable" | "patch-base-unreachable";
+/** One structured reason a run was degraded. `message` is customer-facing prose. */
+interface DegradedReason {
+    code: DegradedReasonCode;
+    message: string;
+}
 interface MoveDeclaration {
     from: string;
     to: string;
@@ -256,6 +317,13 @@ declare class LockfileManager {
     removePatch(patchId: string): void;
     clearPatches(): void;
     addForgottenHash(hash: string): void;
+    /**
+     * Record a dismissed customization: visibility metadata in `dismissals`
+     * plus a tombstone in `forgotten_hashes` for every content hash.
+     * `forgotten_hashes` stays the only list the detector consults; the
+     * metadata exists so `status` can show what was dismissed.
+     */
+    addDismissal(record: DismissalRecord): void;
     getUnresolvedPatches(): StoredPatch[];
     getResolvingPatches(): StoredPatch[];
     markPatchUnresolved(patchId: string): void;
@@ -273,12 +341,49 @@ interface DetectionResult {
     patches: StoredPatch[];
     revertedPatchIds: string[];
 }
+/**
+ * Result of materializing a commit into patch content through the exact
+ * pipeline detection uses (file filtering → scoped diff or format-patch →
+ * content hash). `sensitiveFiles` / `fernignoredFiles` are surfaced so
+ * callers can emit the same customer-facing warnings detection does.
+ *
+ * - `ok` — patch content and its content hash were produced.
+ * - `unreachable` — the commit (or its patch text) could not be read, e.g.
+ *   a shallow clone window or a GC'd object.
+ * - `empty` — nothing survives filtering (only infrastructure / sensitive /
+ *   fernignored files, or the scoped diff is empty).
+ */
+type MaterializedCommitPatch = {
+    status: "ok";
+    files: string[];
+    sensitiveFiles: string[];
+    fernignoredFiles: string[];
+    patchContent: string;
+    contentHash: string;
+} | {
+    status: "unreachable";
+    sensitiveFiles: string[];
+    fernignoredFiles: string[];
+} | {
+    status: "empty";
+    sensitiveFiles: string[];
+    fernignoredFiles: string[];
+};
 declare class ReplayDetector {
     private git;
     private lockManager;
     private sdkOutputDir;
     private fernignorePatterns;
     readonly warnings: string[];
+    /**
+     * Structured degraded-state channel, mirroring `warnings`. Populated when
+     * detection cannot guarantee customizations were carried forward (baseline
+     * unreachable in this clone). Cleared per-run by `ReplayService.prepareReplay`
+     * alongside `warnings`. Merged into `ReplayReport.degradedReasons` by each
+     * flow handler. Degraded is observability only: detection results are
+     * unchanged.
+     */
+    readonly degradedReasons: DegradedReason[];
     constructor(git: GitClient, lockManager: LockfileManager, sdkOutputDir: string, fernignorePatterns?: readonly string[]);
     /**
      * Derive the previous-generation SHA from git history instead of trusting
@@ -308,6 +413,23 @@ declare class ReplayDetector {
      * content, regardless of where the walk actually started.
      */
     private detectPatchesInRange;
+    /**
+     * Materialize a commit into patch content exactly as detection does.
+     *
+     * Pipeline: `diff-tree --name-only` → filter infrastructure / sensitive /
+     * `.fernignore`d files → scoped `git diff` when files were stripped,
+     * otherwise full `git format-patch` → content hash.
+     *
+     * This is THE definition of a commit's re-emission identity: the content
+     * hash this method returns is what `detectPatchesInRange` will compute if
+     * the commit re-enters the scan range (e.g. after a regen PR is merged
+     * with a merge commit). Callers that tombstone a dismissed patch must use
+     * this hash — the stored `content_hash` drifts every time the patch is
+     * carried forward, so it does not identify the commit on re-detection.
+     *
+     * Never throws; failures are reported through the `status` discriminant.
+     */
+    materializeCommitPatch(sha: string): Promise<MaterializedCommitPatch>;
     /**
      * Compute content hash for deduplication.
      *
@@ -604,6 +726,16 @@ interface ReplayReport {
     unresolvedPatches?: UnresolvedPatchInfo[];
     wouldApply?: StoredPatch[];
     warnings?: string[];
+    /**
+     * True iff `degradedReasons` is non-empty: the run completed but could not
+     * guarantee customizations were carried forward because the baseline it
+     * needed (the previous generation) was unreachable during the run.
+     * Both fields are undefined on healthy runs, matching the `warnings`
+     * convention. Degraded is observability only — it never changes detection
+     * results, lockfile saves, or commit decisions.
+     */
+    degraded?: boolean;
+    degradedReasons?: DegradedReason[];
 }
 interface ReplayOptions {
     /** Log what would happen but don't modify anything */
@@ -689,6 +821,12 @@ interface InternalPreparationActive {
     };
     /** detector warnings snapshotted at end of phase 1 */
     detectorWarnings: string[];
+    /**
+     * Detector degraded reasons snapshotted at end of phase 1 (next to
+     * `detectorWarnings`) so degraded state survives the two-phase
+     * prepare/apply split and any mid-phase commits (e.g. autoversion).
+     */
+    detectorDegraded: DegradedReason[];
     revertedCount: number;
     /** [fern-generated] SHA; passed to rebasePatches as currentGenSha */
     genSha: string;
@@ -722,6 +860,16 @@ declare class ReplayService {
      * @internal Used by Flow implementations in `src/flows/`.
      */
     warnings: string[];
+    /**
+     * Service-level structured degraded reasons, mirroring `warnings`.
+     * Populated at apply time (e.g. `recordUnreachableBaseWarnings` when a
+     * patch's base-generation tree is unreachable). Merged with
+     * `detector.degradedReasons` into `ReplayReport.degradedReasons` by each
+     * flow handler. Cleared at the top of `prepareReplay()`.
+     *
+     * @internal Used by Flow implementations in `src/flows/`.
+     */
+    degradedReasons: DegradedReason[];
     /**
      * @internal Test-only accessor.
      * Returns the ReplayApplicator instance used for the last run. Tests use this
@@ -762,6 +910,17 @@ declare class ReplayService {
      * `diff --git` headers are found (fail-safe for exotic legacy formats).
      */
     private cleanseLegacyFernignoreEntries;
+    /**
+     * Migration step: strips infrastructure file diffs (`.fernignore`, `.fern/*`)
+     * from existing patches' `patch_content`. These diffs were bundled by older
+     * detection logic that did not scope `git diff` when only infrastructure files
+     * were stripped. Patches that end up with no surviving diff sections are
+     * removed entirely.
+     *
+     * Idempotent: a second run is a no-op because the first run already removed
+     * all infrastructure sections. Per-patch try/catch ensures isolation.
+     */
+    private cleanseInfrastructureFileEntries;
     /**
      * Phase 2 of the two-phase replay flow. Applies patches, rebases them against
      * the generation, saves the lockfile, and commits `[fern-replay]` (or stages
@@ -939,7 +1098,7 @@ declare class ReplayService {
         conflictResolved: number;
         conflictAbsorbed: number;
         contentRefreshed: number;
-    }, patchesReverted?: number): ReplayReport;
+    }, patchesReverted?: number, degradedReasons?: DegradedReason[]): ReplayReport;
 }
 
 interface MigrationAnalysis {
@@ -1060,7 +1219,7 @@ interface ForgetResult {
     /** Matching patches for interactive selection (search/no-arg mode only) */
     matched?: MatchedPatch[];
 }
-declare function forget(outputDir: string, options?: ForgetOptions): ForgetResult;
+declare function forget(outputDir: string, options?: ForgetOptions): Promise<ForgetResult>;
 
 interface ResetOptions {
     /** Don't actually delete, just show what would happen */
@@ -1097,6 +1256,15 @@ interface ResolveResult {
     patchesApplied?: number;
     /** Number of patches resolved and committed (phase 2) */
     patchesResolved?: number;
+    /**
+     * Patches permanently dismissed during phase 2 — the customer kept the
+     * generator's version for every file in the patch. These are tombstoned
+     * in the lockfile and will not be re-detected on future generations.
+     */
+    patchesDismissed?: Array<{
+        id: string;
+        message: string;
+    }>;
     /** Non-fatal diagnostic messages (e.g., per-patch fallbacks) */
     warnings?: string[];
 }
@@ -1115,6 +1283,28 @@ interface StatusResult {
     unresolvedCount: number;
     /** Exclude patterns from replay.yml */
     excludePatterns: string[];
+    /**
+     * Customizations the customer permanently dismissed — via `forget`, or by
+     * keeping the generator's version when resolving a conflict. These will
+     * not be re-detected on future generations.
+     */
+    dismissed: StatusDismissal[];
+    /**
+     * Count of forgotten hashes recorded before dismissal metadata existed.
+     * Such entries still tombstone re-detection but carry no message/commit
+     * details to display.
+     */
+    legacyDismissedCount: number;
+}
+interface StatusDismissal {
+    /** The customer's original commit message */
+    message: string;
+    /** Short SHA of the original commit (7 chars; empty for synthetic patches) */
+    sha: string;
+    /** Which route dismissed it */
+    via: "forget" | "resolve";
+    /** ISO timestamp of the dismissal */
+    dismissedAt: string;
 }
 interface StatusPatch {
     /** Patch ID (e.g. "patch-def45678") */
@@ -1146,4 +1336,4 @@ interface StatusGeneration {
 }
 declare function status(outputDir: string): StatusResult;
 
-export { type ApplyOptions, type BootstrapOptions, type BootstrapResult, CREDENTIAL_PATTERNS, type CommitInfo, type CommitOptions, type ConflictDetail, type ConflictMetadata, type ConflictReason, type ConflictRegion, type CredentialPattern, type CustomizationsConfig, type DetectionResult, type DiffStat, FERN_BOT_EMAIL, FERN_BOT_LOGIN, FERN_BOT_NAME, FernignoreMigrator, type FileResult, type FlowKind, 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 ReplayPreparation, type ReplayReport, type ReplayResult, ReplayService, type ResetOptions, type ResetResult, type ResolveOptions, type ResolveResult, SENSITIVE_FILE_PATTERNS, type StatusGeneration, type StatusPatch, type StatusResult, type StoredPatch, type UnresolvedPatchInfo, bootstrap, forget, isGenerationCommit, isReplayCommit, isRevertCommit, isSensitiveFile, parseRevertedMessage, parseRevertedSha, reset, resolve, scanForCredentials, status, threeWayMerge };
+export { type ApplyOptions, type BootstrapOptions, type BootstrapResult, CREDENTIAL_PATTERNS, type CommitInfo, type CommitOptions, type ConflictDetail, type ConflictMetadata, type ConflictReason, type ConflictRegion, type CredentialPattern, type CustomizationsConfig, type DegradedReason, type DegradedReasonCode, type DetectionResult, type DiffStat, type DismissalRecord, FERN_BOT_EMAIL, FERN_BOT_LOGIN, FERN_BOT_NAME, FernignoreMigrator, type FileResult, type FlowKind, type ForgetOptions, type ForgetResult, type GenerationLock, type GenerationRecord, GitClient, LockfileManager, LockfileNotFoundError, type MatchedPatch, type MaterializedCommitPatch, type MergeResult, type MigrationAnalysis, type MigrationResult, type MoveDeclaration, ReplayApplicator, ReplayCommitter, type ReplayConfig, ReplayDetector, type ReplayOptions, type ReplayPreparation, type ReplayReport, type ReplayResult, ReplayService, type ResetOptions, type ResetResult, type ResolveOptions, type ResolveResult, SENSITIVE_FILE_PATTERNS, type StatusDismissal, type StatusGeneration, type StatusPatch, type StatusResult, type StoredPatch, type UnresolvedPatchInfo, bootstrap, forget, isGenerationCommit, isReplayCommit, isRevertCommit, isSensitiveFile, parseRevertedMessage, parseRevertedSha, reset, resolve, scanForCredentials, status, threeWayMerge };