@paraharness/git 0.0.0-stage → 0.2.0

package/dist/executors/internal/git-worktree-flush-and-prune.d.ts

@@ -0,0 +1,43 @@
+import type { GitWorktreeHandle, LeaseDelta } from '@paraharness/core';
+/**
+ * Tests whether `content` contains a complete paired Git conflict marker block (`<<<<<<< `, `=======`, `>>>>>>> `).
+ *
+ * Ignores standalone Markdown `=======` headings that are not preceded by `^<{7} ` and followed by `^>{7} `.
+ *
+ * @param {string} content - UTF-8 file or diff text to inspect.
+ *
+ * @returns {boolean} `true` if a complete paired conflict marker block is present.
+ */
+export declare function hasPairedConflictMarkers(content: string): boolean;
+/**
+ * Prunes entries in `handle.unresolvedConflictPaths` whose working-tree digest changed and contain no conflict markers.
+ *
+ * Persists the updated `unresolvedConflictPaths` map in `<gitdir>/harness-meta.json` and updates `handle` in-place.
+ *
+ * @param {GitWorktreeHandle} handle - Worktree handle whose conflict map should be pruned.
+ *
+ * @returns {Promise<Readonly<Record<string, string>>>} Frozen map of remaining unresolved conflict paths to digests.
+ */
+export declare function gitWorktreePruneResolvedConflicts(handle: GitWorktreeHandle): Promise<Readonly<Record<string, string>>>;
+/**
+ * Auto-commits non-conflicted dirty working-tree files on `parentHandle` onto `parentHandle.HEAD`.
+ *
+ * Keeps `parentHandle.baseRef` pinned while advancing `parentHandle.HEAD` so child forks and 3-way merges see parent edits.
+ *
+ * @param {GitWorktreeHandle}             parentHandle   - Parent worktree handle to flush.
+ * @param {readonly string[] | undefined} [excludeGlobs] - Optional glob patterns excluded from status scanning.
+ *
+ * @returns {Promise<string>} Resolved `HEAD` commit SHA on `parentHandle` after flushing.
+ */
+export declare function gitWorktreeFlushCleanParentChanges(parentHandle: GitWorktreeHandle, excludeGlobs?: readonly string[]): Promise<string>;
+/**
+ * Constructs the temporary `LeaseDelta` (`type: 'harness:lease-delta'`) granting write access to `handle.unresolvedConflictPaths`.
+ *
+ * Returns `undefined` when `handle.unresolvedConflictPaths` is empty, without importing `@paraharness/fs`.
+ *
+ * @param {GitWorktreeHandle} handle - Worktree handle to inspect for unresolved conflicts.
+ *
+ * @returns {LeaseDelta | undefined} Frozen `LeaseDelta` unlocking conflicted paths, or `undefined`.
+ */
+export declare function buildConflictLeaseDelta(handle: GitWorktreeHandle): LeaseDelta | undefined;
+//# sourceMappingURL=git-worktree-flush-and-prune.d.ts.map

package/dist/executors/internal/git-worktree-flush-and-prune.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-worktree-flush-and-prune.d.ts","sourceRoot":"","sources":["../../../src/executors/internal/git-worktree-flush-and-prune.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAEV,iBAAiB,EACjB,UAAU,EACX,MAAM,mBAAmB,CAAC;AAe3B;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAYjE;AAED;;;;;;;;GAQG;AACH,wBAAsB,iCAAiC,CACrD,MAAM,EAAE,iBAAiB,GACxB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CA8B3C;AAED;;;;;;;;;GASG;AACH,wBAAsB,kCAAkC,CACtD,YAAY,EAAE,iBAAiB,EAC/B,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,GAC/B,OAAO,CAAC,MAAM,CAAC,CAiEjB;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,iBAAiB,GACxB,UAAU,GAAG,SAAS,CAexB"}

package/dist/executors/internal/git-worktree-flush-and-prune.js

@@ -0,0 +1,169 @@
+import { readFile } from 'node:fs/promises';
+import path from 'node:path';
+import { computePathModeAndSha256 } from './file-digest-and-globs.js';
+import { gitCheckpointStatusMap } from './git-checkpoint-status-map.js';
+import { readHarnessMeta, runGitCommand, updateWorktreeHandleInPlace, writeHarnessMeta, } from './git-cli-runner.js';
+import { CONFLICT_END_REGEX, CONFLICT_SEP_REGEX, CONFLICT_START_REGEX, } from './git-executor.constants.js';
+/**
+ * Tests whether `content` contains a complete paired Git conflict marker block (`<<<<<<< `, `=======`, `>>>>>>> `).
+ *
+ * Ignores standalone Markdown `=======` headings that are not preceded by `^<{7} ` and followed by `^>{7} `.
+ *
+ * @param {string} content - UTF-8 file or diff text to inspect.
+ *
+ * @returns {boolean} `true` if a complete paired conflict marker block is present.
+ */
+export function hasPairedConflictMarkers(content) {
+    let state = 0;
+    for (const rawLine of content.split(/\r?\n/)) {
+        if (state === 0 && CONFLICT_START_REGEX.test(rawLine)) {
+            state = 1;
+        }
+        else if (state === 1 && CONFLICT_SEP_REGEX.test(rawLine)) {
+            state = 2;
+        }
+        else if (state === 2 && CONFLICT_END_REGEX.test(rawLine)) {
+            return true;
+        }
+    }
+    return false;
+}
+/**
+ * Prunes entries in `handle.unresolvedConflictPaths` whose working-tree digest changed and contain no conflict markers.
+ *
+ * Persists the updated `unresolvedConflictPaths` map in `<gitdir>/harness-meta.json` and updates `handle` in-place.
+ *
+ * @param {GitWorktreeHandle} handle - Worktree handle whose conflict map should be pruned.
+ *
+ * @returns {Promise<Readonly<Record<string, string>>>} Frozen map of remaining unresolved conflict paths to digests.
+ */
+export async function gitWorktreePruneResolvedConflicts(handle) {
+    const meta = await readHarnessMeta(handle.gitDirPath);
+    const mergedConflicts = {
+        ...meta.unresolvedConflictPaths,
+        ...handle.unresolvedConflictPaths,
+    };
+    const remaining = {};
+    for (const [relPath, recordedDigest] of Object.entries(mergedConflicts)) {
+        const absPath = path.join(handle.worktreePath, relPath);
+        const rawDigest = await computePathModeAndSha256(absPath);
+        const currentDigest = rawDigest === 'DELETED' ? 'MISSING' : rawDigest;
+        const content = currentDigest !== 'MISSING'
+            ? await readFile(absPath, 'utf8').catch(() => '')
+            : '';
+        const hasMarkers = currentDigest !== 'MISSING' && hasPairedConflictMarkers(content);
+        if (currentDigest === recordedDigest || hasMarkers) {
+            remaining[relPath] = recordedDigest;
+        }
+    }
+    const frozenRemaining = Object.freeze(remaining);
+    await writeHarnessMeta(handle.gitDirPath, {
+        ...meta,
+        unresolvedConflictPaths: frozenRemaining,
+    });
+    updateWorktreeHandleInPlace(handle, {
+        unresolvedConflictPaths: frozenRemaining,
+    });
+    return frozenRemaining;
+}
+/**
+ * Auto-commits non-conflicted dirty working-tree files on `parentHandle` onto `parentHandle.HEAD`.
+ *
+ * Keeps `parentHandle.baseRef` pinned while advancing `parentHandle.HEAD` so child forks and 3-way merges see parent edits.
+ *
+ * @param {GitWorktreeHandle}             parentHandle   - Parent worktree handle to flush.
+ * @param {readonly string[] | undefined} [excludeGlobs] - Optional glob patterns excluded from status scanning.
+ *
+ * @returns {Promise<string>} Resolved `HEAD` commit SHA on `parentHandle` after flushing.
+ */
+export async function gitWorktreeFlushCleanParentChanges(parentHandle, excludeGlobs) {
+    const remainingConflicts = await gitWorktreePruneResolvedConflicts(parentHandle);
+    const snapshot = await gitCheckpointStatusMap(parentHandle.worktreePath, {
+        excludeGlobs,
+    });
+    const toAdd = [];
+    const toRemove = [];
+    for (const [relPath, digest] of Object.entries(snapshot.statusMap)) {
+        if (remainingConflicts[relPath] !== undefined)
+            continue;
+        if (digest === 'DELETED') {
+            toRemove.push(relPath);
+            continue;
+        }
+        const content = await readFile(path.join(parentHandle.worktreePath, relPath), 'utf8').catch(() => '');
+        if (!hasPairedConflictMarkers(content)) {
+            toAdd.push(relPath);
+        }
+    }
+    const headResult = await runGitCommand({
+        cwd: parentHandle.worktreePath,
+        args: ['rev-parse', 'HEAD'],
+    });
+    const headSha = headResult.stdout.trim();
+    if (toAdd.length === 0 && toRemove.length === 0)
+        return headSha;
+    if (toRemove.length > 0) {
+        await runGitCommand({
+            cwd: parentHandle.worktreePath,
+            args: ['update-index', '--force-remove', '-z', '--stdin'],
+            stdin: `${toRemove.join('\0')}\0`,
+        });
+    }
+    if (toAdd.length > 0) {
+        await runGitCommand({
+            cwd: parentHandle.worktreePath,
+            args: ['update-index', '--add', '-z', '--stdin'],
+            stdin: `${toAdd.join('\0')}\0`,
+        });
+    }
+    const treeResult = await runGitCommand({
+        cwd: parentHandle.worktreePath,
+        args: ['write-tree'],
+    });
+    const treeSha = treeResult.stdout.trim();
+    const commitResult = await runGitCommand({
+        cwd: parentHandle.worktreePath,
+        args: [
+            'commit-tree',
+            treeSha,
+            '-p',
+            headSha,
+            '-m',
+            'harness: flush parent working tree',
+        ],
+    });
+    const commitSha = commitResult.stdout.trim();
+    await runGitCommand({
+        cwd: parentHandle.worktreePath,
+        args: ['update-ref', 'HEAD', commitSha, headSha],
+    });
+    updateWorktreeHandleInPlace(parentHandle, { headRef: commitSha });
+    return commitSha;
+}
+/**
+ * Constructs the temporary `LeaseDelta` (`type: 'harness:lease-delta'`) granting write access to `handle.unresolvedConflictPaths`.
+ *
+ * Returns `undefined` when `handle.unresolvedConflictPaths` is empty, without importing `@paraharness/fs`.
+ *
+ * @param {GitWorktreeHandle} handle - Worktree handle to inspect for unresolved conflicts.
+ *
+ * @returns {LeaseDelta | undefined} Frozen `LeaseDelta` unlocking conflicted paths, or `undefined`.
+ */
+export function buildConflictLeaseDelta(handle) {
+    const globs = Object.keys(handle.unresolvedConflictPaths);
+    if (globs.length === 0)
+        return undefined;
+    const scopeTag = path.basename(handle.worktreePath);
+    const matcher = Object.freeze({
+        type: 'fs:match-globs',
+        id: `git-conflict-globs:${scopeTag}`,
+        globs: Object.freeze([...globs]),
+        mode: 'write',
+    });
+    return Object.freeze({
+        type: 'harness:lease-delta',
+        id: `git-conflict-lease:${scopeTag}`,
+        grantedMatchers: Object.freeze([matcher]),
+    });
+}
+//# sourceMappingURL=git-worktree-flush-and-prune.js.map

package/dist/executors/internal/git-worktree-flush-and-prune.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-worktree-flush-and-prune.js","sourceRoot":"","sources":["../../../src/executors/internal/git-worktree-flush-and-prune.ts"],"names":[],"mappings":"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"}

package/dist/executors/internal/git-worktree-fork-and-release.d.ts

@@ -0,0 +1,37 @@
+import type { GitCowWorktreeNode, GitWorktreeHandle } from '@paraharness/core';
+/**
+ * Copies any unresolved conflict files from `parentWorktreePath` into `childWorktreePath`.
+ *
+ * Unlinks paths recorded as `'MISSING'` and returns a frozen copy of the unresolved conflict map.
+ *
+ * @param {string}                           parentWorktreePath      - Source parent worktree directory path.
+ * @param {string}                           childWorktreePath       - Destination child worktree directory path.
+ * @param {Readonly<Record<string, string>>} unresolvedConflictPaths - Map of conflicted paths to digests on the parent.
+ *
+ * @returns {Promise<Readonly<Record<string, string>>>} Frozen unresolved conflict digest map for the child worktree.
+ */
+export declare function copyParentUnresolvedConflictsToChild(parentWorktreePath: string, childWorktreePath: string, unresolvedConflictPaths: Readonly<Record<string, string>>): Promise<Readonly<Record<string, string>>>;
+/**
+ * Forks an isolated child worktree at `<dir>/forks/<runId>/<forkId>` from an already-flushed `parent` handle.
+ *
+ * Clones `node_modules` and copies any `unresolvedConflictPaths` from `parent` into the child worktree.
+ *
+ * @param {GitCowWorktreeNode} node   - Worktree scope AST node configuration.
+ * @param {GitWorktreeHandle}  parent - Flushed parent worktree handle.
+ * @param {string}             forkId - Unique fork or speculative branch identifier.
+ *
+ * @returns {Promise<GitWorktreeHandle>} Newly provisioned child `GitWorktreeHandle`.
+ */
+export declare function gitWorktreeForkChild(node: GitCowWorktreeNode, parent: GitWorktreeHandle, forkId: string): Promise<GitWorktreeHandle>;
+/**
+ * Pins the terminal worktree state under `refs/harness/completed/{roots,forks}/...` and removes the worktree directory.
+ *
+ * Cleans up `<gitdir>/harness-ckpt-blobs/` and `<gitdir>/harness-ckpt-nm/` before running `git worktree remove --force`.
+ *
+ * @param {GitWorktreeHandle}             handle         - Root or child worktree handle to release.
+ * @param {readonly string[] | undefined} [excludeGlobs] - Optional glob patterns excluded when synthesizing the final commit.
+ *
+ * @returns {Promise<void>} Resolves once the completed ref is pinned and the worktree is removed.
+ */
+export declare function gitWorktreeReleaseAndPinRef(handle: GitWorktreeHandle, excludeGlobs?: readonly string[]): Promise<void>;
+//# sourceMappingURL=git-worktree-fork-and-release.d.ts.map

package/dist/executors/internal/git-worktree-fork-and-release.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-worktree-fork-and-release.d.ts","sourceRoot":"","sources":["../../../src/executors/internal/git-worktree-fork-and-release.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAW/E;;;;;;;;;;GAUG;AACH,wBAAsB,oCAAoC,CACxD,kBAAkB,EAAE,MAAM,EAC1B,iBAAiB,EAAE,MAAM,EACzB,uBAAuB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GACxD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAgB3C;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,kBAAkB,EACxB,MAAM,EAAE,iBAAiB,EACzB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAoE5B;AAED;;;;;;;;;GASG;AACH,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,iBAAiB,EACzB,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,GAC/B,OAAO,CAAC,IAAI,CAAC,CAmDf"}

package/dist/executors/internal/git-worktree-fork-and-release.js

@@ -0,0 +1,159 @@
+import { mkdir, rm } from 'node:fs/promises';
+import path from 'node:path';
+import { cloneNodeModulesTree } from './cow-worktree-hydrator.js';
+import { copyFileCowOrValue } from './file-digest-and-globs.js';
+import { readHarnessMeta, runGitCommand, withHostWorktreeLock, writeHarnessMeta, } from './git-cli-runner.js';
+import { synthesizeWorkingTreeCommitOverBase } from './git-worktree-materialize-merge.js';
+/**
+ * Copies any unresolved conflict files from `parentWorktreePath` into `childWorktreePath`.
+ *
+ * Unlinks paths recorded as `'MISSING'` and returns a frozen copy of the unresolved conflict map.
+ *
+ * @param {string}                           parentWorktreePath      - Source parent worktree directory path.
+ * @param {string}                           childWorktreePath       - Destination child worktree directory path.
+ * @param {Readonly<Record<string, string>>} unresolvedConflictPaths - Map of conflicted paths to digests on the parent.
+ *
+ * @returns {Promise<Readonly<Record<string, string>>>} Frozen unresolved conflict digest map for the child worktree.
+ */
+export async function copyParentUnresolvedConflictsToChild(parentWorktreePath, childWorktreePath, unresolvedConflictPaths) {
+    const copiedConflicts = {
+        ...unresolvedConflictPaths,
+    };
+    for (const [relPath, digest] of Object.entries(copiedConflicts)) {
+        const childTargetPath = path.join(childWorktreePath, relPath);
+        if (digest === 'MISSING') {
+            await rm(childTargetPath, { force: true });
+        }
+        else {
+            await copyFileCowOrValue(path.join(parentWorktreePath, relPath), childTargetPath);
+        }
+    }
+    return Object.freeze(copiedConflicts);
+}
+/**
+ * Forks an isolated child worktree at `<dir>/forks/<runId>/<forkId>` from an already-flushed `parent` handle.
+ *
+ * Clones `node_modules` and copies any `unresolvedConflictPaths` from `parent` into the child worktree.
+ *
+ * @param {GitCowWorktreeNode} node   - Worktree scope AST node configuration.
+ * @param {GitWorktreeHandle}  parent - Flushed parent worktree handle.
+ * @param {string}             forkId - Unique fork or speculative branch identifier.
+ *
+ * @returns {Promise<GitWorktreeHandle>} Newly provisioned child `GitWorktreeHandle`.
+ */
+export async function gitWorktreeForkChild(node, parent, forkId) {
+    const repoPath = path.resolve(node.repo);
+    const baseDir = path.isAbsolute(node.dir)
+        ? node.dir
+        : path.resolve(repoPath, node.dir);
+    const parentDirName = path.basename(path.dirname(parent.worktreePath));
+    const runId = parentDirName === 'roots'
+        ? path.basename(parent.worktreePath)
+        : parentDirName;
+    const safeForkId = forkId.replace(/[^a-zA-Z0-9._-]/g, '_');
+    const worktreePath = path.join(baseDir, 'forks', runId, safeForkId);
+    await rm(worktreePath, { recursive: true, force: true });
+    await mkdir(path.dirname(worktreePath), { recursive: true });
+    const parentHeadResult = await runGitCommand({
+        cwd: parent.worktreePath,
+        args: ['rev-parse', 'HEAD'],
+    });
+    const parentHeadSha = parentHeadResult.stdout.trim();
+    const parentMeta = await readHarnessMeta(parent.gitDirPath);
+    await withHostWorktreeLock(parent.worktreePath, async () => {
+        await runGitCommand({
+            cwd: parent.worktreePath,
+            args: ['worktree', 'prune'],
+            allowNonZeroExit: true,
+        });
+        await runGitCommand({
+            cwd: parent.worktreePath,
+            args: [
+                'worktree',
+                'add',
+                '--detach',
+                '--force',
+                worktreePath,
+                parentHeadSha,
+            ],
+        });
+    });
+    const gitDirResult = await runGitCommand({
+        cwd: worktreePath,
+        args: ['rev-parse', '--git-dir'],
+    });
+    const gitDirPath = path.resolve(worktreePath, gitDirResult.stdout.trim());
+    await cloneNodeModulesTree(parent.worktreePath, worktreePath, node.excludeFromCloneGlobs);
+    const frozenConflicts = await copyParentUnresolvedConflictsToChild(parent.worktreePath, worktreePath, parentMeta.unresolvedConflictPaths);
+    await writeHarnessMeta(gitDirPath, {
+        baseRef: parentHeadSha,
+        baseBranch: parent.baseBranch,
+        branchName: parent.branchName,
+        unresolvedConflictPaths: frozenConflicts,
+    });
+    return {
+        worktreePath,
+        gitDirPath,
+        baseRef: parentHeadSha,
+        baseBranch: parent.baseBranch,
+        branchName: parent.branchName,
+        headRef: parentHeadSha,
+        unresolvedConflictPaths: frozenConflicts,
+    };
+}
+/**
+ * Pins the terminal worktree state under `refs/harness/completed/{roots,forks}/...` and removes the worktree directory.
+ *
+ * Cleans up `<gitdir>/harness-ckpt-blobs/` and `<gitdir>/harness-ckpt-nm/` before running `git worktree remove --force`.
+ *
+ * @param {GitWorktreeHandle}             handle         - Root or child worktree handle to release.
+ * @param {readonly string[] | undefined} [excludeGlobs] - Optional glob patterns excluded when synthesizing the final commit.
+ *
+ * @returns {Promise<void>} Resolves once the completed ref is pinned and the worktree is removed.
+ */
+export async function gitWorktreeReleaseAndPinRef(handle, excludeGlobs) {
+    const synth = await synthesizeWorkingTreeCommitOverBase(handle, handle.baseRef, excludeGlobs);
+    const parentDir = path.dirname(handle.worktreePath);
+    const isRoot = path.basename(parentDir) === 'roots';
+    const completedRef = isRoot
+        ? `refs/harness/completed/roots/${path.basename(handle.worktreePath)}`
+        : `refs/harness/completed/forks/${path.basename(parentDir)}/${path.basename(handle.worktreePath)}`;
+    await runGitCommand({
+        cwd: handle.worktreePath,
+        args: ['update-ref', completedRef, synth.commitSha],
+    });
+    const commonDirResult = await runGitCommand({
+        cwd: handle.worktreePath,
+        args: ['rev-parse', '--git-common-dir'],
+    });
+    const commonGitDir = path.resolve(handle.worktreePath, commonDirResult.stdout.trim());
+    await rm(path.join(handle.gitDirPath, 'harness-ckpt-blobs'), {
+        recursive: true,
+        force: true,
+    });
+    await rm(path.join(handle.gitDirPath, 'harness-ckpt-nm'), {
+        recursive: true,
+        force: true,
+    });
+    await withHostWorktreeLock(commonGitDir, async () => {
+        await runGitCommand({
+            cwd: commonGitDir,
+            args: [
+                '--git-dir',
+                commonGitDir,
+                'worktree',
+                'remove',
+                '--force',
+                handle.worktreePath,
+            ],
+            allowNonZeroExit: true,
+        });
+        await rm(handle.worktreePath, { recursive: true, force: true });
+        await runGitCommand({
+            cwd: commonGitDir,
+            args: ['--git-dir', commonGitDir, 'worktree', 'prune'],
+            allowNonZeroExit: true,
+        });
+    });
+}
+//# sourceMappingURL=git-worktree-fork-and-release.js.map

package/dist/executors/internal/git-worktree-fork-and-release.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-worktree-fork-and-release.js","sourceRoot":"","sources":["../../../src/executors/internal/git-worktree-fork-and-release.ts"],"names":[],"mappings":"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"}

package/dist/executors/internal/git-worktree-materialize-merge.d.ts

@@ -0,0 +1,51 @@
+import type { GitWorktreeHandle } from '@paraharness/core';
+import type { MaterializeInFlightMergeParams } from './merge-tree-materializer-params.js';
+import type { StatelessMergeTreeResult } from './stateless-merge-tree-result.js';
+import type { SynthesizedWorkingTreeCommit } from './synthesized-working-tree-commit.js';
+/**
+ * Synthesizes a temporary Git tree and commit object over `parentCommitSha` without mutating `<gitdir>/index` or `HEAD`.
+ *
+ * Stages all dirty tracked and untracked files from `gitCheckpointStatusMap` into a temporary index file.
+ *
+ * @param {GitWorktreeHandle}             handle          - Worktree handle whose working state should be synthesized.
+ * @param {string}                        parentCommitSha - Parent commit SHA (`-p`) for `git commit-tree`.
+ * @param {readonly string[] | undefined} [excludeGlobs]  - Optional glob patterns excluded from staging.
+ *
+ * @returns {Promise<SynthesizedWorkingTreeCommit>} Synthesized tree SHA and commit SHA.
+ */
+export declare function synthesizeWorkingTreeCommitOverBase(handle: GitWorktreeHandle, parentCommitSha: string, excludeGlobs?: readonly string[]): Promise<SynthesizedWorkingTreeCommit>;
+/**
+ * Executes a stateless 3-way `git merge-tree --write-tree -z` between `targetCommitSha` and `sourceCommitSha` over `baseRef`.
+ *
+ * Synthesizes `targetPrime` with `baseRef` as its sole immediate parent so Git 2.38+ always uses `baseRef` as the merge base.
+ *
+ * @param {GitWorktreeHandle} handle          - Worktree handle providing `worktreePath` and `baseRef`.
+ * @param {string}            targetCommitSha - Target commit SHA ($C_1$ or $C_{\text{prereq}}$).
+ * @param {string}            sourceCommitSha - Source commit SHA ($C_{\text{child}}$ or $C_{\text{root}}$) parented on `handle.baseRef`.
+ *
+ * @returns {Promise<StatelessMergeTreeResult>} Merge tree result.
+ */
+export declare function executeStatelessMergeTree(handle: GitWorktreeHandle, targetCommitSha: string, sourceCommitSha: string): Promise<StatelessMergeTreeResult>;
+/**
+ * Atomically materializes `inFlightMerge` into `handle`'s working tree and updates `HEAD`, `.git/index`, and `baseRef`.
+ *
+ * Persists `inFlightMerge` in `<gitdir>/harness-meta.json` before modifying files, checks out `mergedTreeSha`, unlinks removed paths, and records conflict digests.
+ *
+ * @param {GitWorktreeHandle}              handle      - Target worktree handle to materialize into.
+ * @param {MaterializeInFlightMergeParams} mergeParams - Merge materialization parameters.
+ *
+ * @returns {Promise<Readonly<Record<string, string>>>} Frozen map of conflicted paths to their materialized `${mode}:${sha256}` digests.
+ */
+export declare function gitWorktreeMaterializeMerge(handle: GitWorktreeHandle, mergeParams: MaterializeInFlightMergeParams): Promise<Readonly<Record<string, string>>>;
+/**
+ * Completes `gitWorktreeMaterializeMerge` by updating `HEAD`, live `.git/index`, `baseRef`, and `unresolvedConflictPaths`.
+ *
+ * Computes post-checkout `${mode}:${sha256}` digests for `conflictedPaths` and clears `inFlightMerge` in `harness-meta.json`.
+ *
+ * @param {GitWorktreeHandle}              handle      - Target worktree handle.
+ * @param {MaterializeInFlightMergeParams} mergeParams - Finalization parameters.
+ *
+ * @returns {Promise<Readonly<Record<string, string>>>} Frozen map of unresolved conflict paths to materialized digests.
+ */
+export declare function finalizeMaterializedMergeMetadata(handle: GitWorktreeHandle, mergeParams: MaterializeInFlightMergeParams): Promise<Readonly<Record<string, string>>>;
+//# sourceMappingURL=git-worktree-materialize-merge.d.ts.map

package/dist/executors/internal/git-worktree-materialize-merge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-worktree-materialize-merge.d.ts","sourceRoot":"","sources":["../../../src/executors/internal/git-worktree-materialize-merge.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAU3D,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AAC1F,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AACjF,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AAEzF;;;;;;;;;;GAUG;AACH,wBAAsB,mCAAmC,CACvD,MAAM,EAAE,iBAAiB,EACzB,eAAe,EAAE,MAAM,EACvB,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,GAC/B,OAAO,CAAC,4BAA4B,CAAC,CAwBvC;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,iBAAiB,EACzB,eAAe,EAAE,MAAM,EACvB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,wBAAwB,CAAC,CAqBnC;AAED;;;;;;;;;GASG;AACH,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,iBAAiB,EACzB,WAAW,EAAE,8BAA8B,GAC1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CA2B3C;AAED;;;;;;;;;GASG;AACH,wBAAsB,iCAAiC,CACrD,MAAM,EAAE,iBAAiB,EACzB,WAAW,EAAE,8BAA8B,GAC1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CA2B3C"}