@fern-api/replay 0.6.0 → 0.6.1

package/dist/ReplayApplicator.js

@@ -1,544 +0,0 @@
-import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { dirname, extname, join } from "node:path";
-import { minimatch } from "minimatch";
-import { threeWayMerge } from "./ThreeWayMerge.js";
-const BINARY_EXTENSIONS = new Set([
-    ".png",
-    ".jpg",
-    ".jpeg",
-    ".gif",
-    ".bmp",
-    ".ico",
-    ".webp",
-    ".svg",
-    ".pdf",
-    ".doc",
-    ".docx",
-    ".xls",
-    ".xlsx",
-    ".ppt",
-    ".pptx",
-    ".zip",
-    ".gz",
-    ".tar",
-    ".bz2",
-    ".7z",
-    ".rar",
-    ".jar",
-    ".war",
-    ".ear",
-    ".class",
-    ".exe",
-    ".dll",
-    ".so",
-    ".dylib",
-    ".o",
-    ".a",
-    ".woff",
-    ".woff2",
-    ".ttf",
-    ".eot",
-    ".otf",
-    ".mp3",
-    ".mp4",
-    ".avi",
-    ".mov",
-    ".wav",
-    ".flac",
-    ".sqlite",
-    ".db",
-    ".pyc",
-    ".pyo",
-    ".DS_Store"
-]);
-export class ReplayApplicator {
-    git;
-    lockManager;
-    outputDir;
-    renameCache = new Map();
-    fileTheirsAccumulator = new Map();
-    constructor(git, lockManager, outputDir) {
-        this.git = git;
-        this.lockManager = lockManager;
-        this.outputDir = outputDir;
-    }
-    /** Reset inter-patch accumulator for a new cycle. */
-    resetAccumulator() {
-        this.fileTheirsAccumulator.clear();
-    }
-    /**
-     * Apply all patches, returning results for each.
-     * Skips patches that match exclude patterns in replay.yml
-     */
-    async applyPatches(patches) {
-        this.resetAccumulator(); // Clear accumulator for this apply cycle
-        const results = [];
-        for (const patch of patches) {
-            if (this.isExcluded(patch)) {
-                results.push({
-                    patch,
-                    status: "skipped",
-                    method: "git-am"
-                });
-                continue;
-            }
-            const result = await this.applyPatchWithFallback(patch);
-            results.push(result);
-        }
-        return results;
-    }
-    /** Populate accumulator after git apply succeeds. */
-    async populateAccumulatorForPatch(patch, baseGen, currentTreeHash) {
-        if (!baseGen)
-            return;
-        // Create temp git repo to apply patches to base content
-        const tempDir = await mkdtemp(join(tmpdir(), "replay-acc-"));
-        const { GitClient } = await import("./git/GitClient.js");
-        const tempGit = new GitClient(tempDir);
-        await tempGit.exec(["init"]);
-        await tempGit.exec(["config", "user.email", "replay@fern.com"]);
-        await tempGit.exec(["config", "user.name", "Fern Replay"]);
-        try {
-            for (const filePath of patch.files) {
-                if (isBinaryFile(filePath))
-                    continue;
-                const resolvedPath = await this.resolveFilePath(filePath, baseGen.tree_hash, currentTreeHash);
-                const base = await this.git.showFile(baseGen.tree_hash, filePath);
-                const theirs = await this.applyPatchToContent(base, patch.patch_content, filePath, tempGit, tempDir);
-                if (theirs && base) {
-                    this.fileTheirsAccumulator.set(resolvedPath, {
-                        content: theirs,
-                        baseGeneration: patch.base_generation
-                    });
-                }
-            }
-        }
-        finally {
-            await rm(tempDir, { recursive: true }).catch(() => { });
-        }
-    }
-    async applyPatchWithFallback(patch) {
-        // Resolve all file paths to check accumulator (need baseGen for resolution)
-        const baseGen = this.lockManager.getGeneration(patch.base_generation);
-        const lock = this.lockManager.read();
-        const currentGen = lock.generations.find((g) => g.commit_sha === lock.current_generation);
-        const currentTreeHash = currentGen?.tree_hash ?? baseGen?.tree_hash ?? "";
-        // Check if any file in this patch needs accumulation
-        // If so, skip fast path to ensure we benefit from pre-merge logic
-        const needsAccumulation = await Promise.all(patch.files.map(async (f) => {
-            if (!baseGen)
-                return false;
-            const resolved = await this.resolveFilePath(f, baseGen.tree_hash, currentTreeHash);
-            return this.fileTheirsAccumulator.has(resolved);
-        })).then((results) => results.some(Boolean));
-        // Strategy 1: Try git apply --3way (skip if accumulation needed)
-        if (!needsAccumulation) {
-            // Snapshot files before git apply (may leave conflict markers on failure)
-            const snapshots = new Map();
-            const resolvedFiles = {};
-            for (const filePath of patch.files) {
-                const resolvedPath = baseGen
-                    ? await this.resolveFilePath(filePath, baseGen.tree_hash, currentTreeHash)
-                    : filePath;
-                if (resolvedPath !== filePath) {
-                    resolvedFiles[filePath] = resolvedPath;
-                }
-                const fullPath = join(this.outputDir, resolvedPath);
-                snapshots.set(resolvedPath, await readFile(fullPath, "utf-8").catch(() => null));
-            }
-            try {
-                await this.git.execWithInput(["apply", "--3way"], patch.patch_content);
-                // Success! Populate accumulator so subsequent patches on these files
-                // will skip fast path and use the pre-merge logic instead
-                await this.populateAccumulatorForPatch(patch, baseGen, currentTreeHash);
-                return {
-                    patch,
-                    status: "applied",
-                    method: "git-am",
-                    ...(Object.keys(resolvedFiles).length > 0 && { resolvedFiles })
-                };
-            }
-            catch {
-                // git apply --3way failed and may have left conflict markers on disk
-                // Restore files from snapshot to undo any corruption before fallback
-                for (const [resolvedPath, content] of snapshots) {
-                    if (content != null) {
-                        await writeFile(join(this.outputDir, resolvedPath), content);
-                    }
-                }
-            }
-        }
-        // Strategy 2: Fall back to file-by-file 3-way merge (uses accumulator)
-        return this.applyWithThreeWayMerge(patch);
-    }
-    async applyWithThreeWayMerge(patch) {
-        const fileResults = [];
-        const resolvedFiles = {};
-        const tempDir = await mkdtemp(join(tmpdir(), "replay-"));
-        const { GitClient } = await import("./git/GitClient.js");
-        const tempGit = new GitClient(tempDir);
-        await tempGit.exec(["init"]);
-        await tempGit.exec(["config", "user.email", "replay@fern.com"]);
-        await tempGit.exec(["config", "user.name", "Fern Replay"]);
-        try {
-            for (const filePath of patch.files) {
-                if (isBinaryFile(filePath)) {
-                    fileResults.push({
-                        file: filePath,
-                        status: "skipped",
-                        reason: "binary-file"
-                    });
-                    continue;
-                }
-                const result = await this.mergeFile(patch, filePath, tempGit, tempDir);
-                if (result.file !== filePath) {
-                    resolvedFiles[filePath] = result.file;
-                }
-                fileResults.push(result);
-            }
-        }
-        finally {
-            await rm(tempDir, { recursive: true }).catch(() => { });
-        }
-        const conflictFiles = fileResults.filter((r) => r.status === "conflict");
-        const hasConflicts = conflictFiles.length > 0;
-        // Aggregate conflict reason from file-level to patch-level
-        const conflictReason = hasConflicts
-            ? conflictFiles.some((f) => f.conflictReason === "base-generation-mismatch")
-                ? "base-generation-mismatch"
-                : conflictFiles[0]?.conflictReason
-            : undefined;
-        return {
-            patch,
-            status: hasConflicts ? "conflict" : "applied",
-            method: "3way-merge",
-            fileResults,
-            conflictReason,
-            ...(Object.keys(resolvedFiles).length > 0 && { resolvedFiles })
-        };
-    }
-    async mergeFile(patch, filePath, tempGit, tempDir) {
-        try {
-            const baseGen = this.lockManager.getGeneration(patch.base_generation);
-            if (!baseGen) {
-                return { file: filePath, status: "skipped", reason: "base-generation-not-found" };
-            }
-            // Resolve file path in case the generator renamed it between generations
-            const lock = this.lockManager.read();
-            const currentGen = lock.generations.find((g) => g.commit_sha === lock.current_generation);
-            const currentTreeHash = currentGen?.tree_hash ?? baseGen.tree_hash;
-            const resolvedPath = await this.resolveFilePath(filePath, baseGen.tree_hash, currentTreeHash);
-            // Build conflict metadata for this file (used if conflict occurs)
-            const metadata = {
-                patchId: patch.id,
-                patchMessage: patch.original_message,
-                baseGeneration: patch.base_generation,
-                currentGeneration: lock.current_generation
-            };
-            // BASE: pristine state from when user made their edit (old path)
-            let base = await this.git.showFile(baseGen.tree_hash, filePath);
-            // If BASE is null, check if this file is the target of a rename in the patch.
-            // Rename diffs (e.g., git mv old new) have the content at the old path.
-            let renameSourcePath;
-            if (!base) {
-                const renameSource = this.extractRenameSource(patch.patch_content, filePath);
-                if (renameSource) {
-                    base = await this.git.showFile(baseGen.tree_hash, renameSource);
-                    renameSourcePath = renameSource;
-                }
-            }
-            // OURS: current generated state on disk (resolved/new path)
-            const oursPath = join(this.outputDir, resolvedPath);
-            const ours = await readFile(oursPath, "utf-8").catch(() => null);
-            // THEIRS: user's version (apply patch to base using original path)
-            let theirs = await this.applyPatchToContent(base, patch.patch_content, filePath, tempGit, tempDir, renameSourcePath);
-            // Fall back to accumulator as merge base for incremental patches.
-            let useAccumulatorAsMergeBase = false;
-            const accumulatorEntry = this.fileTheirsAccumulator.get(resolvedPath);
-            if (!theirs && base && accumulatorEntry) {
-                theirs = await this.applyPatchToContent(accumulatorEntry.content, patch.patch_content, filePath, tempGit, tempDir);
-                if (theirs) {
-                    useAccumulatorAsMergeBase = true;
-                }
-            }
-            // Pre-merge with accumulated customizations (skip when accumulator is merge base).
-            let effective_theirs = theirs;
-            let baseMismatchSkipped = false;
-            if (theirs && base && !useAccumulatorAsMergeBase) {
-                if (accumulatorEntry && accumulatorEntry.baseGeneration === patch.base_generation) {
-                    // Pre-merge: combine previous customizations with current patch
-                    try {
-                        const preMerged = threeWayMerge(base, accumulatorEntry.content, theirs);
-                        if (!preMerged.hasConflicts) {
-                            // Clean merge - use the combined result
-                            effective_theirs = preMerged.content;
-                        }
-                        else {
-                            // Pre-merge has conflicts - skip accumulator for this patch
-                            // to avoid nested conflict markers. User patches conflict
-                            // with each other and require manual resolution.
-                            effective_theirs = theirs;
-                        }
-                    }
-                    catch {
-                        // If pre-merge fails unexpectedly, fall back to current_theirs
-                        effective_theirs = theirs;
-                    }
-                }
-                else if (accumulatorEntry) {
-                    // Base generations differ - accumulator pre-merge skipped.
-                    // The main merge below will still run, but if it conflicts
-                    // we flag it as a base-generation-mismatch.
-                    baseMismatchSkipped = true;
-                }
-            }
-            // Handle new files (user created, didn't exist in generation)
-            if (!base && !ours && effective_theirs) {
-                const outDir = dirname(oursPath);
-                await mkdir(outDir, { recursive: true });
-                await writeFile(oursPath, effective_theirs);
-                return { file: resolvedPath, status: "merged", reason: "new-file" };
-            }
-            // Handle new file created by both user and generator (conflict)
-            if (!base && ours && effective_theirs) {
-                const merged = threeWayMerge("", ours, effective_theirs);
-                const outDir = dirname(oursPath);
-                await mkdir(outDir, { recursive: true });
-                await writeFile(oursPath, merged.content);
-                if (merged.hasConflicts) {
-                    return {
-                        file: resolvedPath,
-                        status: "conflict",
-                        conflicts: merged.conflicts,
-                        conflictReason: "new-file-both",
-                        conflictMetadata: metadata
-                    };
-                }
-                return { file: resolvedPath, status: "merged" };
-            }
-            if (!effective_theirs) {
-                return {
-                    file: resolvedPath,
-                    status: "skipped",
-                    reason: "missing-content"
-                };
-            }
-            if (!base || !ours) {
-                return {
-                    file: resolvedPath,
-                    status: "skipped",
-                    reason: "missing-content"
-                };
-            }
-            // Perform 3-way merge.
-            // For incremental patches, use the accumulated state as the merge base
-            // so the diff is computed relative to prior patches, not the raw generation.
-            const mergeBase = useAccumulatorAsMergeBase && accumulatorEntry ? accumulatorEntry.content : base;
-            const merged = threeWayMerge(mergeBase, ours, effective_theirs);
-            // Write result to the resolved (current) path
-            const outDir = dirname(oursPath);
-            await mkdir(outDir, { recursive: true });
-            await writeFile(oursPath, merged.content);
-            // Update accumulator after successful merge
-            // This allows subsequent patches on the same file to benefit from pre-merge
-            if (effective_theirs && base) {
-                this.fileTheirsAccumulator.set(resolvedPath, {
-                    content: effective_theirs,
-                    baseGeneration: patch.base_generation
-                });
-            }
-            if (merged.hasConflicts) {
-                return {
-                    file: resolvedPath,
-                    status: "conflict",
-                    conflicts: merged.conflicts,
-                    conflictReason: baseMismatchSkipped ? "base-generation-mismatch" : "same-line-edit",
-                    conflictMetadata: metadata
-                };
-            }
-            return { file: resolvedPath, status: "merged" };
-        }
-        catch (error) {
-            return {
-                file: filePath,
-                status: "skipped",
-                reason: `error: ${error instanceof Error ? error.message : String(error)}`
-            };
-        }
-    }
-    isExcluded(patch) {
-        const config = this.lockManager.getCustomizationsConfig();
-        if (!config.exclude)
-            return false;
-        return patch.files.some((file) => config.exclude.some((pattern) => minimatch(file, pattern)));
-    }
-    async resolveFilePath(filePath, baseTreeHash, currentTreeHash) {
-        // Priority 1: Manual moves from replay.yml
-        const config = this.lockManager.getCustomizationsConfig();
-        if (config.moves) {
-            for (const move of config.moves) {
-                if (minimatch(filePath, move.from) || filePath === move.from) {
-                    // For exact matches, replace directly
-                    if (filePath === move.from) {
-                        return move.to;
-                    }
-                    // For glob matches, replace the matching prefix
-                    // e.g., from: "src/api/**" to: "src/resources/**"
-                    // filePath: "src/api/client.ts" → "src/resources/client.ts"
-                    const fromBase = move.from.replace(/\*\*.*$/, "");
-                    const toBase = move.to.replace(/\*\*.*$/, "");
-                    if (filePath.startsWith(fromBase)) {
-                        return toBase + filePath.slice(fromBase.length);
-                    }
-                }
-            }
-        }
-        // Priority 2: Git rename detection (cached per tree pair)
-        const cacheKey = `${baseTreeHash}:${currentTreeHash}`;
-        let renames = this.renameCache.get(cacheKey);
-        if (!renames) {
-            renames = await this.git.detectRenames(baseTreeHash, currentTreeHash);
-            this.renameCache.set(cacheKey, renames);
-        }
-        const gitRename = renames.find((r) => r.from === filePath);
-        if (gitRename) {
-            return gitRename.to;
-        }
-        // Priority 3: No rename detected
-        return filePath;
-    }
-    async applyPatchToContent(base, patchContent, filePath, tempGit, tempDir, sourceFilePath) {
-        if (!base) {
-            // New file - extract content directly from patch
-            return this.extractNewFileFromPatch(patchContent, filePath);
-        }
-        // Extract only the diff for this specific file
-        const fileDiff = this.extractFileDiff(patchContent, filePath);
-        if (!fileDiff)
-            return null;
-        try {
-            if (sourceFilePath) {
-                // Rename case: write base at the OLD path, apply the rename diff,
-                // then read from the NEW path (filePath).
-                const tempSourcePath = join(tempDir, sourceFilePath);
-                await mkdir(dirname(tempSourcePath), { recursive: true });
-                await writeFile(tempSourcePath, base);
-                await tempGit.exec(["add", sourceFilePath]);
-                await tempGit.exec([
-                    "commit",
-                    "-m",
-                    `base for rename ${sourceFilePath} -> ${filePath}`,
-                    "--allow-empty"
-                ]);
-                await tempGit.execWithInput(["apply", "--allow-empty"], fileDiff);
-                const tempTargetPath = join(tempDir, filePath);
-                return await readFile(tempTargetPath, "utf-8");
-            }
-            // Normal case: write base at filePath, apply diff, read back
-            const tempFilePath = join(tempDir, filePath);
-            await mkdir(dirname(tempFilePath), { recursive: true });
-            await writeFile(tempFilePath, base);
-            // Stage and commit so git apply has a clean base
-            await tempGit.exec(["add", filePath]);
-            await tempGit.exec(["commit", "-m", `base for ${filePath}`, "--allow-empty"]);
-            // Apply this file's diff
-            await tempGit.execWithInput(["apply", "--allow-empty"], fileDiff);
-            return await readFile(tempFilePath, "utf-8");
-        }
-        catch {
-            return null;
-        }
-    }
-    extractFileDiff(patchContent, filePath) {
-        const lines = patchContent.split("\n");
-        const diffLines = [];
-        let inTargetFile = false;
-        for (const line of lines) {
-            if (line.startsWith("diff --git")) {
-                if (inTargetFile) {
-                    // Hit the next file's diff, stop collecting
-                    break;
-                }
-                if (isDiffLineForFile(line, filePath)) {
-                    inTargetFile = true;
-                    diffLines.push(line);
-                }
-                continue;
-            }
-            if (inTargetFile) {
-                diffLines.push(line);
-            }
-        }
-        return diffLines.length > 0 ? diffLines.join("\n") + "\n" : null;
-    }
-    extractRenameSource(patchContent, targetFilePath) {
-        const lines = patchContent.split("\n");
-        let inTargetFile = false;
-        for (const line of lines) {
-            if (line.startsWith("diff --git")) {
-                if (inTargetFile)
-                    break; // past the target block
-                inTargetFile = isDiffLineForFile(line, targetFilePath);
-                continue;
-            }
-            if (!inTargetFile)
-                continue;
-            // Stop at first hunk — rename headers appear before @@
-            if (line.startsWith("@@"))
-                break;
-            if (line.startsWith("rename from ")) {
-                return line.slice("rename from ".length);
-            }
-        }
-        return null;
-    }
-    extractNewFileFromPatch(patchContent, filePath) {
-        const lines = patchContent.split("\n");
-        const addedLines = [];
-        let inTargetFile = false;
-        let inHunk = false;
-        let noTrailingNewline = false;
-        for (const line of lines) {
-            if (line.startsWith("diff --git")) {
-                if (inTargetFile)
-                    break; // hit next file's diff
-                inTargetFile = isDiffLineForFile(line, filePath);
-                inHunk = false;
-                continue;
-            }
-            if (!inTargetFile)
-                continue;
-            if (line.startsWith("@@")) {
-                inHunk = true;
-                continue;
-            }
-            if (!inHunk)
-                continue;
-            if (line === "\") {
-                noTrailingNewline = true;
-                continue;
-            }
-            if (line.startsWith("+") && !line.startsWith("+++")) {
-                addedLines.push(line.slice(1));
-            }
-        }
-        if (addedLines.length === 0)
-            return null;
-        return addedLines.join("\n") + (noTrailingNewline ? "" : "\n");
-    }
-}
-function isBinaryFile(filePath) {
-    const ext = extname(filePath).toLowerCase();
-    return BINARY_EXTENSIONS.has(ext);
-}
-/**
- * Check if a `diff --git` line targets the given file path.
- * Uses a regex anchored to the line format to avoid substring false positives
- * (e.g., `lib/foo.ts` matching `b/lib/foo.ts-backup`).
- */
-function isDiffLineForFile(diffLine, filePath) {
-    const match = diffLine.match(/^diff --git a\/.+ b\/(.+)$/);
-    return match !== null && match[1] === filePath;
-}
-//# sourceMappingURL=ReplayApplicator.js.map

package/dist/ReplayApplicator.js.map

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

package/dist/ReplayCommitter.d.ts

@@ -1,19 +0,0 @@
-import type { GitClient } from "./git/GitClient.js";
-import type { GenerationRecord, StoredPatch } from "./types.js";
-export interface CommitOptions {
-    cliVersion: string;
-    generatorVersions: Record<string, string>;
-    baseBranchHead?: string;
-}
-export declare class ReplayCommitter {
-    private git;
-    private outputDir;
-    constructor(git: GitClient, outputDir: string);
-    commitGeneration(message: string, options?: CommitOptions): Promise<string>;
-    commitReplay(patchCount: number, patches?: StoredPatch[]): Promise<string>;
-    createGenerationRecord(options?: CommitOptions): Promise<GenerationRecord>;
-    stageAll(): Promise<void>;
-    hasStagedChanges(): Promise<boolean>;
-    getTreeHash(commitSha: string): Promise<string>;
-}
-//# sourceMappingURL=ReplayCommitter.d.ts.map

package/dist/ReplayCommitter.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ReplayCommitter.d.ts","sourceRoot":"","sources":["../src/ReplayCommitter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEhE,MAAM,WAAW,aAAa;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,cAAc,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,qBAAa,eAAe;IACxB,OAAO,CAAC,GAAG,CAAY;IACvB,OAAO,CAAC,SAAS,CAAS;gBAEd,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM;IAKvC,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IAwB3E,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAoB1E,sBAAsB,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAc1E,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAIzB,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC;IAKpC,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAGxD"}

package/dist/ReplayCommitter.js

@@ -1,64 +0,0 @@
-export class ReplayCommitter {
-    git;
-    outputDir;
-    constructor(git, outputDir) {
-        this.git = git;
-        this.outputDir = outputDir;
-    }
-    async commitGeneration(message, options) {
-        await this.stageAll();
-        if (!(await this.hasStagedChanges())) {
-            return (await this.git.exec(["rev-parse", "HEAD"])).trim();
-        }
-        let fullMessage = `[fern-generated] ${message}\n\nGenerated by Fern`;
-        if (options?.cliVersion) {
-            fullMessage += `\nCLI Version: ${options.cliVersion}`;
-        }
-        if (options?.generatorVersions && Object.keys(options.generatorVersions).length > 0) {
-            fullMessage += "\nGenerators:";
-            for (const [name, version] of Object.entries(options.generatorVersions)) {
-                fullMessage += `\n  - ${name}: ${version}`;
-            }
-        }
-        await this.git.exec(["commit", "-m", fullMessage]);
-        return (await this.git.exec(["rev-parse", "HEAD"])).trim();
-    }
-    async commitReplay(patchCount, patches) {
-        await this.stageAll();
-        if (!(await this.hasStagedChanges())) {
-            return (await this.git.exec(["rev-parse", "HEAD"])).trim();
-        }
-        let fullMessage = `[fern-replay] Applied ${patchCount} customization(s)`;
-        if (patches && patches.length > 0) {
-            fullMessage += "\n\nPatches replayed:";
-            for (const patch of patches) {
-                fullMessage += `\n  - ${patch.id}: ${patch.original_message}`;
-            }
-        }
-        await this.git.exec(["commit", "-m", fullMessage]);
-        return (await this.git.exec(["rev-parse", "HEAD"])).trim();
-    }
-    async createGenerationRecord(options) {
-        const commitSha = (await this.git.exec(["rev-parse", "HEAD"])).trim();
-        const treeHash = await this.getTreeHash(commitSha);
-        return {
-            commit_sha: commitSha,
-            tree_hash: treeHash,
-            timestamp: new Date().toISOString(),
-            cli_version: options?.cliVersion ?? "unknown",
-            generator_versions: options?.generatorVersions ?? {},
-            base_branch_head: options?.baseBranchHead
-        };
-    }
-    async stageAll() {
-        await this.git.exec(["add", "-A", this.outputDir]);
-    }
-    async hasStagedChanges() {
-        const output = await this.git.exec(["diff", "--cached", "--name-only"]);
-        return output.trim().length > 0;
-    }
-    async getTreeHash(commitSha) {
-        return this.git.getTreeHash(commitSha);
-    }
-}
-//# sourceMappingURL=ReplayCommitter.js.map