@paraharness/git 0.0.0-stage → 0.2.0

package/dist/executors/internal/git-worktree-materialize-merge.js

@@ -0,0 +1,161 @@
+import { randomUUID } from 'node:crypto';
+import { rm } from 'node:fs/promises';
+import path from 'node:path';
+import { listTreePaths } from './checkpoint-staging-and-integrity.js';
+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';
+/**
+ * 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 async function synthesizeWorkingTreeCommitOverBase(handle, parentCommitSha, excludeGlobs) {
+    const headSha = (await runGitCommand({ cwd: handle.worktreePath, args: ['rev-parse', 'HEAD'] })).stdout.trim();
+    const snap = await gitCheckpointStatusMap(handle.worktreePath, { excludeGlobs });
+    const tmpIndex = path.join(handle.gitDirPath, `harness-synth-idx.${process.pid}.${randomUUID()}`);
+    const toAdd = [];
+    const toRemove = [];
+    for (const [relPath, digest] of Object.entries(snap.statusMap)) {
+        if (digest === 'DELETED')
+            toRemove.push(relPath);
+        else
+            toAdd.push(relPath);
+    }
+    try {
+        await runGitCommand({ cwd: handle.worktreePath, args: ['read-tree', headSha], env: { GIT_INDEX_FILE: tmpIndex } });
+        if (toRemove.length > 0) {
+            await runGitCommand({ cwd: handle.worktreePath, args: ['update-index', '--force-remove', '-z', '--stdin'], env: { GIT_INDEX_FILE: tmpIndex }, stdin: `${toRemove.join('\0')}\0` });
+        }
+        if (toAdd.length > 0) {
+            await runGitCommand({ cwd: handle.worktreePath, args: ['update-index', '--add', '-z', '--stdin'], env: { GIT_INDEX_FILE: tmpIndex }, stdin: `${toAdd.join('\0')}\0` });
+        }
+        const treeSha = (await runGitCommand({ cwd: handle.worktreePath, args: ['write-tree'], env: { GIT_INDEX_FILE: tmpIndex } })).stdout.trim();
+        const commitSha = (await runGitCommand({ cwd: handle.worktreePath, args: ['commit-tree', treeSha, '-p', parentCommitSha, '-m', 'harness: synthesized worktree state'] })).stdout.trim();
+        return Object.freeze({ treeSha, commitSha });
+    }
+    finally {
+        await rm(tmpIndex, { force: true });
+    }
+}
+/**
+ * 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 async function executeStatelessMergeTree(handle, targetCommitSha, sourceCommitSha) {
+    const targetTree = (await runGitCommand({ cwd: handle.worktreePath, args: ['rev-parse', `${targetCommitSha}^{tree}`] })).stdout.trim();
+    const targetPrime = (await runGitCommand({ cwd: handle.worktreePath, args: ['commit-tree', targetTree, '-p', handle.baseRef, '-m', 'harness: merge-tree target'] })).stdout.trim();
+    const mergeOutput = await runGitCommand({
+        cwd: handle.worktreePath,
+        args: ['merge-tree', '--write-tree', '-z', targetPrime, sourceCommitSha],
+        allowNonZeroExit: true,
+    });
+    const parts = mergeOutput.stdout.split('\0');
+    const mergedTreeSha = (parts[0] ?? '').split(/\r?\n/)[0]?.trim() ?? '';
+    if (mergeOutput.exitCode === 0) {
+        return Object.freeze({ clean: true, mergedTreeSha, conflictedPaths: Object.freeze([]) });
+    }
+    const conflictSet = new Set();
+    for (let i = 1; i < parts.length; i += 1) {
+        const token = parts[i] ?? '';
+        if (token.length === 0)
+            break;
+        const tabIdx = token.indexOf('\t');
+        if (tabIdx !== -1)
+            conflictSet.add(token.slice(tabIdx + 1));
+    }
+    return Object.freeze({ clean: false, mergedTreeSha, conflictedPaths: Object.freeze([...conflictSet]) });
+}
+/**
+ * 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 async function gitWorktreeMaterializeMerge(handle, mergeParams) {
+    const meta = await readHarnessMeta(handle.gitDirPath);
+    const placeholderConflicts = {};
+    for (const relPath of mergeParams.conflictedPaths)
+        placeholderConflicts[relPath] = 'PENDING';
+    await writeHarnessMeta(handle.gitDirPath, {
+        ...meta,
+        inFlightMerge: {
+            targetHeadSha: mergeParams.targetHeadSha,
+            mergedTreeSha: mergeParams.mergedTreeSha,
+            priorTreeSha: mergeParams.priorTreeSha,
+            unresolvedConflictPaths: placeholderConflicts,
+        },
+    });
+    const basePaths = await listTreePaths(handle.worktreePath, handle.baseRef);
+    const priorPaths = await listTreePaths(handle.worktreePath, mergeParams.priorTreeSha);
+    const mergedPaths = await listTreePaths(handle.worktreePath, mergeParams.mergedTreeSha);
+    const tmpIndex = path.join(handle.gitDirPath, `harness-merge-idx.${process.pid}.${randomUUID()}`);
+    try {
+        await runGitCommand({ cwd: handle.worktreePath, args: ['read-tree', mergeParams.mergedTreeSha], env: { GIT_INDEX_FILE: tmpIndex } });
+        await runGitCommand({ cwd: handle.worktreePath, args: ['checkout-index', '-f', '-a'], env: { GIT_INDEX_FILE: tmpIndex } });
+    }
+    finally {
+        await rm(tmpIndex, { force: true });
+    }
+    for (const oldPath of new Set([...basePaths, ...priorPaths])) {
+        if (!mergedPaths.has(oldPath))
+            await rm(path.join(handle.worktreePath, oldPath), { force: true });
+    }
+    return finalizeMaterializedMergeMetadata(handle, mergeParams);
+}
+/**
+ * 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 async function finalizeMaterializedMergeMetadata(handle, mergeParams) {
+    await runGitCommand({ cwd: handle.worktreePath, args: ['update-ref', '--no-deref', 'HEAD', mergeParams.targetHeadSha] });
+    await runGitCommand({ cwd: handle.worktreePath, args: ['read-tree', mergeParams.targetHeadSha] });
+    const conflictDigests = {};
+    for (const relPath of mergeParams.conflictedPaths) {
+        const rawDigest = await computePathModeAndSha256(path.join(handle.worktreePath, relPath));
+        conflictDigests[relPath] = rawDigest === 'DELETED' ? 'MISSING' : rawDigest;
+    }
+    const frozenConflicts = Object.freeze(conflictDigests);
+    const meta = await readHarnessMeta(handle.gitDirPath);
+    const nextBaseBranch = mergeParams.nextBaseBranch ?? meta.baseBranch;
+    await writeHarnessMeta(handle.gitDirPath, {
+        baseRef: mergeParams.targetHeadSha,
+        baseBranch: nextBaseBranch,
+        branchName: meta.branchName,
+        unresolvedConflictPaths: frozenConflicts,
+        pendingParentHeadSha: undefined,
+        inFlightMerge: undefined,
+        inFlightCommitAndPush: meta.inFlightCommitAndPush,
+    });
+    updateWorktreeHandleInPlace(handle, {
+        baseRef: mergeParams.targetHeadSha,
+        baseBranch: nextBaseBranch,
+        headRef: mergeParams.targetHeadSha,
+        unresolvedConflictPaths: frozenConflicts,
+    });
+    return frozenConflicts;
+}
+//# sourceMappingURL=git-worktree-materialize-merge.js.map

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

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

package/dist/executors/internal/git-worktree-reattach.d.ts

@@ -0,0 +1,57 @@
+import type { GitCowWorktreeNode, GitWorktreeHandle } from '@paraharness/core';
+/**
+ * Parameters for reattaching or recreating a child fork worktree during crash recovery.
+ */
+export interface ReattachChildWorktreeParams {
+    /** Worktree scope AST node configuration. */
+    readonly node: GitCowWorktreeNode;
+    /** Reattached parent worktree handle. */
+    readonly parent: GitWorktreeHandle;
+    /** Unique child fork or branch identifier. */
+    readonly forkId: string;
+    /** Optional serialized checkpoint fallback when the directory is missing. */
+    readonly checkpoint?: string;
+}
+/**
+ * Merges `node.excludeFromCloneGlobs` and `node.checkpointPolicy?.excludeGlobs` into an effective checkpoint policy.
+ *
+ * Precomputes the combined exclusion globs so checkpoint serialization, diffing, and restoration share one policy.
+ *
+ * @param {Pick<GitCowWorktreeNode, 'excludeFromCloneGlobs' | 'checkpointPolicy'>} node - Passive worktree scope AST configuration node.
+ *
+ * @returns {GitCowWorktreeNode['checkpointPolicy']} Effective checkpoint policy with merged `excludeGlobs`.
+ */
+export declare function resolveEffectiveCheckpointPolicy(node: Pick<GitCowWorktreeNode, 'excludeFromCloneGlobs' | 'checkpointPolicy'>): GitCowWorktreeNode['checkpointPolicy'];
+/**
+ * Completes or rolls back any interrupted atomic metadata state (`pendingParentHeadSha`, `inFlightMerge`, `inFlightCommitAndPush`).
+ *
+ * Preserves intact working-tree edits across process reboots when no in-flight atomic transition was interrupted.
+ *
+ * @param {string} worktreePath - Absolute path to the existing worktree directory on disk.
+ *
+ * @returns {Promise<GitWorktreeHandle>} Rebound and recovered `GitWorktreeHandle`.
+ */
+export declare function recoverInFlightWorktreeState(worktreePath: string): Promise<GitWorktreeHandle>;
+/**
+ * Rebinds an existing Task Root Worktree at `<dir>/roots/<runId>` or recreates it from `checkpoint` if missing.
+ *
+ * Completes interrupted `pendingParentHeadSha` or `inFlightMerge` transitions and rolls back `inFlightCommitAndPush`.
+ *
+ * @param {GitCowWorktreeNode} node         - Worktree scope AST node configuration.
+ * @param {string}             runId        - Unique flow run identifier.
+ * @param {string}             [checkpoint] - Optional serialized checkpoint fallback when the directory is missing.
+ *
+ * @returns {Promise<GitWorktreeHandle>} Reattached root `GitWorktreeHandle`.
+ */
+export declare function gitWorktreeReattachRoot(node: GitCowWorktreeNode, runId: string, checkpoint?: string): Promise<GitWorktreeHandle>;
+/**
+ * Rebinds an existing child fork worktree at `<dir>/forks/<runId>/<forkId>` or recreates it from `checkpoint` if missing.
+ *
+ * Completes any interrupted `inFlightMerge` materialization and preserves uncommitted child edits across reboots.
+ *
+ * @param {ReattachChildWorktreeParams} params - Child worktree reattachment parameters.
+ *
+ * @returns {Promise<GitWorktreeHandle>} Reattached child `GitWorktreeHandle`.
+ */
+export declare function gitWorktreeReattachChild(params: ReattachChildWorktreeParams): Promise<GitWorktreeHandle>;
+//# sourceMappingURL=git-worktree-reattach.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"git-worktree-reattach.d.ts","sourceRoot":"","sources":["../../../src/executors/internal/git-worktree-reattach.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAe/E;;GAEG;AACH,MAAM,WAAW,2BAA2B;IAC1C,6CAA6C;IAC7C,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAC;IAClC,yCAAyC;IACzC,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAC;IACnC,8CAA8C;IAC9C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,6EAA6E;IAC7E,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B;AAgCD;;;;;;;;GAQG;AACH,wBAAgB,gCAAgC,CAC9C,IAAI,EAAE,IAAI,CAAC,kBAAkB,EAAE,uBAAuB,GAAG,kBAAkB,CAAC,GAC3E,kBAAkB,CAAC,kBAAkB,CAAC,CAexC;AAsCD;;;;;;;;GAQG;AACH,wBAAsB,4BAA4B,CAChD,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,iBAAiB,CAAC,CAkD5B;AAoFD;;;;;;;;;;GAUG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,kBAAkB,EACxB,KAAK,EAAE,MAAM,EACb,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,iBAAiB,CAAC,CAmB5B;AAuFD;;;;;;;;GAQG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,2BAA2B,GAClC,OAAO,CAAC,iBAAiB,CAAC,CAuB5B"}

package/dist/executors/internal/git-worktree-reattach.js

@@ -0,0 +1,324 @@
+import { lstat, mkdir } from 'node:fs/promises';
+import path from 'node:path';
+import { cloneNodeModulesTree, hydrateWorktreeDependencies, } from './cow-worktree-hydrator.js';
+import { gitCheckpointRestore } from './git-checkpoint-restore.js';
+import { readHarnessMeta, runGitCommand, withHostWorktreeLock, writeHarnessMeta, } from './git-cli-runner.js';
+import { gitWorktreeMaterializeMerge } from './git-worktree-materialize-merge.js';
+/**
+ * Merges `node.excludeFromCloneGlobs` and `node.checkpointPolicy?.excludeGlobs` into an effective checkpoint policy.
+ *
+ * Precomputes the combined exclusion globs so checkpoint serialization, diffing, and restoration share one policy.
+ *
+ * @param {Pick<GitCowWorktreeNode, 'excludeFromCloneGlobs' | 'checkpointPolicy'>} node - Passive worktree scope AST configuration node.
+ *
+ * @returns {GitCowWorktreeNode['checkpointPolicy']} Effective checkpoint policy with merged `excludeGlobs`.
+ */
+export function resolveEffectiveCheckpointPolicy(node) {
+    const cloneGlobs = node.excludeFromCloneGlobs ?? [];
+    const policyGlobs = node.checkpointPolicy?.excludeGlobs ?? [];
+    if (cloneGlobs.length === 0 && node.checkpointPolicy === undefined) {
+        return undefined;
+    }
+    const mergedGlobs = Object.freeze([
+        ...new Set([...cloneGlobs, ...policyGlobs]),
+    ]);
+    return Object.freeze({
+        partitionMap: node.checkpointPolicy?.partitionMap,
+        excludeGlobs: mergedGlobs,
+        maxUntrackedFileSizeBytes: node.checkpointPolicy?.maxUntrackedFileSizeBytes,
+    });
+}
+/**
+ * Rolls back an interrupted `inFlightCommitAndPush` transition on `worktreePath` to `preStepHeadSha` and `preStepBaseRef`.
+ *
+ * Aborts any in-progress rebase, resets `HEAD` to `preStepHeadSha`, and clears `inFlightCommitAndPush` in `harness-meta.json`.
+ *
+ * @param {string}            worktreePath - Absolute path to the worktree directory.
+ * @param {string}            gitDirPath   - Absolute path to the worktree's `<gitdir>`.
+ * @param {HarnessMetaRecord} meta         - Current metadata record containing `inFlightCommitAndPush`.
+ *
+ * @returns {Promise<HarnessMetaRecord>} Updated `HarnessMetaRecord` with `inFlightCommitAndPush` cleared.
+ */
+async function rollbackInFlightCommitAndPush(worktreePath, gitDirPath, meta) {
+    const commitState = meta.inFlightCommitAndPush;
+    if (commitState === undefined)
+        return meta;
+    await runGitCommand({
+        cwd: worktreePath,
+        args: ['rebase', '--abort'],
+        allowNonZeroExit: true,
+    });
+    await runGitCommand({
+        cwd: worktreePath,
+        args: ['reset', '--hard', commitState.preStepHeadSha],
+    });
+    const updatedMeta = {
+        ...meta,
+        baseRef: commitState.preStepBaseRef,
+        inFlightCommitAndPush: undefined,
+    };
+    await writeHarnessMeta(gitDirPath, updatedMeta);
+    return updatedMeta;
+}
+/**
+ * Completes or rolls back any interrupted atomic metadata state (`pendingParentHeadSha`, `inFlightMerge`, `inFlightCommitAndPush`).
+ *
+ * Preserves intact working-tree edits across process reboots when no in-flight atomic transition was interrupted.
+ *
+ * @param {string} worktreePath - Absolute path to the existing worktree directory on disk.
+ *
+ * @returns {Promise<GitWorktreeHandle>} Rebound and recovered `GitWorktreeHandle`.
+ */
+export async function recoverInFlightWorktreeState(worktreePath) {
+    const gitDirResult = await runGitCommand({
+        cwd: worktreePath,
+        args: ['rev-parse', '--git-dir'],
+    });
+    const gitDirPath = path.resolve(worktreePath, gitDirResult.stdout.trim());
+    let meta = await readHarnessMeta(gitDirPath);
+    if (meta.pendingParentHeadSha !== undefined) {
+        await runGitCommand({
+            cwd: worktreePath,
+            args: ['update-ref', 'HEAD', meta.pendingParentHeadSha],
+        });
+        meta = { ...meta, pendingParentHeadSha: undefined };
+        await writeHarnessMeta(gitDirPath, meta);
+    }
+    if (meta.inFlightMerge !== undefined) {
+        const mergeState = meta.inFlightMerge;
+        const tempHandle = {
+            worktreePath,
+            gitDirPath,
+            baseRef: meta.baseRef,
+            baseBranch: meta.baseBranch,
+            branchName: meta.branchName,
+            headRef: meta.baseRef,
+            unresolvedConflictPaths: meta.unresolvedConflictPaths,
+        };
+        await gitWorktreeMaterializeMerge(tempHandle, {
+            targetHeadSha: mergeState.targetHeadSha,
+            mergedTreeSha: mergeState.mergedTreeSha,
+            priorTreeSha: mergeState.priorTreeSha,
+            conflictedPaths: Object.keys(mergeState.unresolvedConflictPaths),
+        });
+        meta = await readHarnessMeta(gitDirPath);
+    }
+    if (meta.inFlightCommitAndPush !== undefined) {
+        meta = await rollbackInFlightCommitAndPush(worktreePath, gitDirPath, meta);
+    }
+    const headResult = await runGitCommand({
+        cwd: worktreePath,
+        args: ['rev-parse', 'HEAD'],
+    });
+    return {
+        worktreePath,
+        gitDirPath,
+        baseRef: meta.baseRef,
+        baseBranch: meta.baseBranch,
+        branchName: meta.branchName,
+        headRef: headResult.stdout.trim(),
+        unresolvedConflictPaths: meta.unresolvedConflictPaths,
+    };
+}
+/**
+ * Recreates a missing Task Root Worktree at `params.worktreePath` from a pinned completed ref or host `HEAD`,
+ * hydrates `node_modules`, and restores `params.checkpoint` when provided.
+ *
+ * @param {RecreateMissingRootWorktreeParams} params - Root worktree recreation parameters.
+ *
+ * @returns {Promise<GitWorktreeHandle>} Newly recreated root `GitWorktreeHandle`.
+ */
+async function recreateMissingRootWorktree(params) {
+    const { node, repoPath, safeRunId, worktreePath, checkpoint } = params;
+    await mkdir(path.dirname(worktreePath), { recursive: true });
+    const baseRef = await withHostWorktreeLock(repoPath, async () => {
+        await runGitCommand({
+            cwd: repoPath,
+            args: ['worktree', 'prune'],
+            allowNonZeroExit: true,
+        });
+        const pinnedResult = await runGitCommand({
+            cwd: repoPath,
+            args: [
+                'rev-parse',
+                '--verify',
+                `refs/harness/completed/roots/${safeRunId}`,
+            ],
+            allowNonZeroExit: true,
+        });
+        const fallbackHeadResult = await runGitCommand({
+            cwd: repoPath,
+            args: ['rev-parse', 'HEAD'],
+        });
+        const resolvedBaseRef = pinnedResult.exitCode === 0 && pinnedResult.stdout.trim().length > 0
+            ? pinnedResult.stdout.trim()
+            : fallbackHeadResult.stdout.trim();
+        await runGitCommand({
+            cwd: repoPath,
+            args: [
+                'worktree',
+                'add',
+                '--detach',
+                '--force',
+                worktreePath,
+                resolvedBaseRef,
+            ],
+        });
+        return resolvedBaseRef;
+    });
+    const gitDirResult = await runGitCommand({
+        cwd: worktreePath,
+        args: ['rev-parse', '--git-dir'],
+    });
+    const gitDirPath = path.resolve(worktreePath, gitDirResult.stdout.trim());
+    await hydrateWorktreeDependencies(node, repoPath, worktreePath);
+    const emptyConflicts = Object.freeze({});
+    await writeHarnessMeta(gitDirPath, {
+        baseRef,
+        baseBranch: 'main',
+        unresolvedConflictPaths: emptyConflicts,
+    });
+    const handle = {
+        worktreePath,
+        gitDirPath,
+        baseRef,
+        baseBranch: 'main',
+        headRef: baseRef,
+        unresolvedConflictPaths: emptyConflicts,
+    };
+    if (checkpoint !== undefined) {
+        await gitCheckpointRestore(handle, checkpoint, resolveEffectiveCheckpointPolicy(node));
+    }
+    return handle;
+}
+/**
+ * Rebinds an existing Task Root Worktree at `<dir>/roots/<runId>` or recreates it from `checkpoint` if missing.
+ *
+ * Completes interrupted `pendingParentHeadSha` or `inFlightMerge` transitions and rolls back `inFlightCommitAndPush`.
+ *
+ * @param {GitCowWorktreeNode} node         - Worktree scope AST node configuration.
+ * @param {string}             runId        - Unique flow run identifier.
+ * @param {string}             [checkpoint] - Optional serialized checkpoint fallback when the directory is missing.
+ *
+ * @returns {Promise<GitWorktreeHandle>} Reattached root `GitWorktreeHandle`.
+ */
+export async function gitWorktreeReattachRoot(node, runId, checkpoint) {
+    const repoPath = path.resolve(node.repo);
+    const baseDir = path.isAbsolute(node.dir)
+        ? node.dir
+        : path.resolve(repoPath, node.dir);
+    const safeRunId = runId.replace(/[^a-zA-Z0-9._-]/g, '_');
+    const worktreePath = path.join(baseDir, 'roots', safeRunId);
+    const exists = await lstat(worktreePath).then(() => true, () => false);
+    if (exists)
+        return recoverInFlightWorktreeState(worktreePath);
+    return recreateMissingRootWorktree({
+        node,
+        repoPath,
+        safeRunId,
+        worktreePath,
+        checkpoint,
+    });
+}
+/**
+ * Recreates a missing child fork worktree at `recreateParams.worktreePath` from a pinned completed ref or `parent`,
+ * clones `node_modules`, and restores `recreateParams.params.checkpoint` when provided.
+ *
+ * @param {RecreateMissingChildWorktreeParams} recreateParams - Child worktree recreation parameters.
+ *
+ * @returns {Promise<GitWorktreeHandle>} Newly recreated child `GitWorktreeHandle`.
+ */
+async function recreateMissingChildWorktree(recreateParams) {
+    const { params, runId, safeForkId, worktreePath } = recreateParams;
+    const { node, parent, checkpoint } = params;
+    await mkdir(path.dirname(worktreePath), { recursive: true });
+    const baseRef = await withHostWorktreeLock(parent.worktreePath, async () => {
+        await runGitCommand({
+            cwd: parent.worktreePath,
+            args: ['worktree', 'prune'],
+            allowNonZeroExit: true,
+        });
+        const pinnedResult = await runGitCommand({
+            cwd: parent.worktreePath,
+            args: [
+                'rev-parse',
+                '--verify',
+                `refs/harness/completed/forks/${runId}/${safeForkId}`,
+            ],
+            allowNonZeroExit: true,
+        });
+        const resolvedBaseRef = pinnedResult.exitCode === 0 && pinnedResult.stdout.trim().length > 0
+            ? pinnedResult.stdout.trim()
+            : (parent.headRef ?? parent.baseRef);
+        await runGitCommand({
+            cwd: parent.worktreePath,
+            args: [
+                'worktree',
+                'add',
+                '--detach',
+                '--force',
+                worktreePath,
+                resolvedBaseRef,
+            ],
+        });
+        return resolvedBaseRef;
+    });
+    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 emptyConflicts = Object.freeze({});
+    await writeHarnessMeta(gitDirPath, {
+        baseRef,
+        baseBranch: parent.baseBranch,
+        branchName: parent.branchName,
+        unresolvedConflictPaths: emptyConflicts,
+    });
+    const handle = {
+        worktreePath,
+        gitDirPath,
+        baseRef,
+        baseBranch: parent.baseBranch,
+        branchName: parent.branchName,
+        headRef: baseRef,
+        unresolvedConflictPaths: emptyConflicts,
+    };
+    if (checkpoint !== undefined) {
+        await gitCheckpointRestore(handle, checkpoint, resolveEffectiveCheckpointPolicy(node));
+    }
+    return handle;
+}
+/**
+ * Rebinds an existing child fork worktree at `<dir>/forks/<runId>/<forkId>` or recreates it from `checkpoint` if missing.
+ *
+ * Completes any interrupted `inFlightMerge` materialization and preserves uncommitted child edits across reboots.
+ *
+ * @param {ReattachChildWorktreeParams} params - Child worktree reattachment parameters.
+ *
+ * @returns {Promise<GitWorktreeHandle>} Reattached child `GitWorktreeHandle`.
+ */
+export async function gitWorktreeReattachChild(params) {
+    const { parent, forkId } = params;
+    const parentDir = path.dirname(parent.worktreePath);
+    const isParentRoot = path.basename(parentDir) === 'roots';
+    const runId = isParentRoot
+        ? path.basename(parent.worktreePath)
+        : path.basename(parentDir);
+    const baseDir = isParentRoot
+        ? path.dirname(parentDir)
+        : path.dirname(path.dirname(parentDir));
+    const safeForkId = forkId.replace(/[^a-zA-Z0-9._-]/g, '_');
+    const worktreePath = path.join(baseDir, 'forks', runId, safeForkId);
+    const exists = await lstat(worktreePath).then(() => true, () => false);
+    if (exists)
+        return recoverInFlightWorktreeState(worktreePath);
+    return recreateMissingChildWorktree({
+        params,
+        runId,
+        safeForkId,
+        worktreePath,
+    });
+}
+//# sourceMappingURL=git-worktree-reattach.js.map

package/dist/executors/internal/git-worktree-reattach.js.map

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

package/dist/executors/internal/git-worktree-sync-child-and-root.d.ts

@@ -0,0 +1,26 @@
+import type { GitScopeReceipt, GitSyncReceipt, GitWorktreeHandle, ReconcileResult } from '@paraharness/core';
+/**
+ * Rebases/merges uncommitted changes in `pausedChild` onto an updated `parent` worktree via `git merge-tree --write-tree`.
+ *
+ * Preserves dirty edits in `pausedChild` and records any conflicted paths in `pausedChild.unresolvedConflictPaths`.
+ *
+ * @param {GitWorktreeHandle}             parent         - Updated parent worktree handle.
+ * @param {GitWorktreeHandle}             pausedChild    - Suspended child worktree handle being synced.
+ * @param {readonly string[] | undefined} [excludeGlobs] - Optional glob patterns excluded from staging.
+ *
+ * @returns {Promise<ReconcileResult<GitSyncReceipt>>} Clean or conflicted synchronization receipt.
+ */
+export declare function gitWorktreeSyncChild(parent: GitWorktreeHandle, pausedChild: GitWorktreeHandle, excludeGlobs?: readonly string[]): Promise<ReconcileResult<GitSyncReceipt>>;
+/**
+ * Synchronizes `rootHandle` onto the tip prerequisite receipt in `prerequisiteReceipts` via `git merge-tree --write-tree`.
+ *
+ * Auto-flushes clean dirty edits on `rootHandle`, resolves stacked `baseBranch`, and materializes the 3-way merge.
+ *
+ * @param {GitWorktreeHandle}             rootHandle           - Task root worktree handle.
+ * @param {readonly GitScopeReceipt[]}    prerequisiteReceipts - Terminal scope receipts of completed prerequisites.
+ * @param {readonly string[] | undefined} [excludeGlobs]       - Optional glob patterns excluded from staging.
+ *
+ * @returns {Promise<ReconcileResult<GitSyncReceipt>>} Clean or conflicted synchronization receipt.
+ */
+export declare function gitWorktreeSyncRoot(rootHandle: GitWorktreeHandle, prerequisiteReceipts: readonly GitScopeReceipt[], excludeGlobs?: readonly string[]): Promise<ReconcileResult<GitSyncReceipt>>;
+//# sourceMappingURL=git-worktree-sync-child-and-root.d.ts.map

package/dist/executors/internal/git-worktree-sync-child-and-root.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-worktree-sync-child-and-root.d.ts","sourceRoot":"","sources":["../../../src/executors/internal/git-worktree-sync-child-and-root.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,cAAc,EACd,iBAAiB,EACjB,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAW3B;;;;;;;;;;GAUG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,iBAAiB,EACzB,WAAW,EAAE,iBAAiB,EAC9B,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,GAC/B,OAAO,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC,CAqB1C;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,iBAAiB,EAC7B,oBAAoB,EAAE,SAAS,eAAe,EAAE,EAChD,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,GAC/B,OAAO,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC,CA6B1C"}