@cerbur/clutch-dsh-worktree 0.1.9 → 0.1.12

package/lib/provider/transaction/operations/create.js

@@ -0,0 +1,136 @@
+import { createRepositoryFingerprint } from '../../git/repository-fingerprint.js';
+import { assertGeneratedNameAvailable } from '../../generated-name.js';
+import { recoveryError, recordForCreate, pendingCreate } from '../support/journal.js';
+import { reconcileCreateFailure } from '../recovery/failure-recovery.js';
+import { withShardLock } from '../support/locking.js';
+import { resolveRepository, findActiveBranchConflict, isExactCreatedWorktree, } from '../support/inspection.js';
+import { cleanLegacyObservations, assertMutationAdmitted, assertRepositoryCompatible, } from '../support/admission.js';
+import { assertGeneratedTarget } from '../support/path-safety.js';
+import { publishCreated, markRecovery } from '../support/publication.js';
+import { providerError } from '../../types.js';
+export async function createWorktreeTransaction(dependencies, input) {
+    return withShardLock(dependencies, input.workspaceId, async (locked) => {
+        await dependencies.git.validateRepository(input.workspaceRoot);
+        const repository = await resolveRepository(dependencies, input.workspaceRoot);
+        return dependencies.repositoryLock.run(`repository:${createRepositoryFingerprint(repository.identity)}`, async (lock) => {
+            lock.assertHeld();
+            const gitRoot = repository.identity.topLevel;
+            await cleanLegacyObservations(locked);
+            const current = await locked.read();
+            assertMutationAdmitted(current, input.workspaceId);
+            assertRepositoryCompatible(current, repository.identity, input.workspaceId);
+            assertGeneratedTarget(dependencies, input);
+            let existingGitWorktrees;
+            if (dependencies.git.listBranchesWithWorktreePaths) {
+                const branches = await dependencies.git.listBranchesWithWorktreePaths(gitRoot);
+                const baseBranch = branches.find((branch) => branch.name === input.baseBranch);
+                if (!baseBranch) {
+                    throw providerError('GIT_OPERATION_FAILED', `Local branch does not exist: ${input.baseBranch}`, {
+                        workspaceRoot: input.workspaceRoot,
+                        branch: input.baseBranch,
+                    });
+                }
+                if (input.newBranch !== undefined &&
+                    branches.some((branch) => branch.name === input.newBranch)) {
+                    throw providerError('WORKTREE_BRANCH_CONFLICT', `New branch already exists: ${input.newBranch}`, {
+                        workspaceRoot: input.workspaceRoot,
+                        branch: input.newBranch,
+                        baseBranch: input.baseBranch,
+                    });
+                }
+                if (branches.some((branch) => branch.name === input.targetBranch && branch.worktreePath !== undefined)) {
+                    throw providerError('WORKTREE_BRANCH_CONFLICT', `Branch is already checked out: ${input.targetBranch}`, {
+                        workspaceRoot: input.workspaceRoot,
+                        branch: input.targetBranch,
+                        baseBranch: input.baseBranch,
+                    });
+                }
+            }
+            else {
+                const branches = await dependencies.git.listBranches(gitRoot);
+                if (!branches.includes(input.baseBranch)) {
+                    throw providerError('GIT_OPERATION_FAILED', `Local branch does not exist: ${input.baseBranch}`, {
+                        workspaceRoot: input.workspaceRoot,
+                        branch: input.baseBranch,
+                    });
+                }
+                if (input.newBranch !== undefined && branches.includes(input.newBranch)) {
+                    throw providerError('WORKTREE_BRANCH_CONFLICT', `New branch already exists: ${input.newBranch}`, {
+                        workspaceRoot: input.workspaceRoot,
+                        branch: input.newBranch,
+                        baseBranch: input.baseBranch,
+                    });
+                }
+                existingGitWorktrees = await dependencies.git.listWorktrees(gitRoot);
+                if (existingGitWorktrees.some((worktree) => worktree.branch === input.targetBranch)) {
+                    throw providerError('WORKTREE_BRANCH_CONFLICT', `Branch is already checked out: ${input.targetBranch}`, {
+                        workspaceRoot: input.workspaceRoot,
+                        branch: input.targetBranch,
+                        baseBranch: input.baseBranch,
+                    });
+                }
+            }
+            await assertGeneratedNameAvailable(input.worktreeId, input.targetPath, current, existingGitWorktrees ?? await dependencies.git.listWorktrees(gitRoot));
+            const sidecarConflict = await findActiveBranchConflict(dependencies, current, input.targetBranch, gitRoot);
+            if (sidecarConflict) {
+                throw providerError('WORKTREE_BRANCH_CONFLICT', `Branch is already recorded as active: ${input.targetBranch}`, {
+                    branch: input.targetBranch,
+                    worktreeId: sidecarConflict.worktreeId,
+                });
+            }
+            const record = recordForCreate(input);
+            const pending = pendingCreate(input, repository.identity);
+            await locked.mutate((snapshot) => {
+                const { repository: _repository, ...withoutRepository } = snapshot;
+                void _repository;
+                return {
+                    result: undefined,
+                    snapshot: {
+                        ...withoutRepository,
+                        repositoryFingerprint: createRepositoryFingerprint(repository.identity),
+                        pendingOperation: pending,
+                    },
+                };
+            });
+            try {
+                await dependencies.git.createWorktree(input.workspaceRoot, input.targetPath, input.baseBranch, input.newBranch);
+            }
+            catch (error) {
+                return reconcileCreateFailure(dependencies, {
+                    locked,
+                    input,
+                    record,
+                    pending,
+                    repository: repository.identity,
+                    gitRoot,
+                    error,
+                });
+            }
+            lock.assertHeld();
+            let live;
+            try {
+                live = await dependencies.git.listWorktrees(gitRoot);
+            }
+            catch (inspectionError) {
+                await markRecovery(locked, pending, 'WORKTREE_RECOVERY_REQUIRED');
+                throw recoveryError(`Unable to verify Git after create: ${input.targetPath}`, {
+                    workspaceId: input.workspaceId,
+                    operationId: pending.id,
+                    targetPath: input.targetPath,
+                    cause: String(inspectionError),
+                });
+            }
+            if (!(await isExactCreatedWorktree(live, input))) {
+                await markRecovery(locked, pending, 'WORKTREE_RECOVERY_REQUIRED');
+                throw recoveryError(`Git create completed without the expected Worktree: ${input.targetPath}`, {
+                    workspaceId: input.workspaceId,
+                    worktreeId: input.worktreeId,
+                    targetPath: input.targetPath,
+                });
+            }
+            await publishCreated(dependencies, locked, pending.id, record, repository.identity);
+            return record;
+        });
+    });
+}
+//# sourceMappingURL=create.js.map

package/lib/provider/transaction/operations/create.js.map

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

package/lib/provider/transaction/operations/import.d.ts

@@ -0,0 +1,5 @@
+import type { WorktreeRecord } from '../../../contract/index.js';
+import type { ImportWorktreeTransactionInput } from '../types.js';
+import type { TransactionDependencies } from '../dependencies.js';
+export declare function importWorktreeTransaction(dependencies: Pick<TransactionDependencies, 'git' | 'repositoryLock' | 'sidecar'>, input: ImportWorktreeTransactionInput): Promise<WorktreeRecord>;
+//# sourceMappingURL=import.d.ts.map

package/lib/provider/transaction/operations/import.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"import.d.ts","sourceRoot":"","sources":["../../../../src/provider/transaction/operations/import.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAalE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAGlE,wBAAsB,yBAAyB,CAC7C,YAAY,EAAE,IAAI,CAAC,uBAAuB,EAAE,KAAK,GAAG,gBAAgB,GAAG,SAAS,CAAC,EACjF,KAAK,EAAE,8BAA8B,GACpC,OAAO,CAAC,cAAc,CAAC,CAqHzB"}

package/lib/provider/transaction/operations/import.js

@@ -0,0 +1,93 @@
+import path from 'node:path';
+import { readWorktreeStatus } from '../../git/worktree-status.js';
+import { createRepositoryFingerprint } from '../../git/repository-fingerprint.js';
+import { isDirectory, canonicalPath, samePhysicalPath } from '../support/paths.js';
+import { withShardLock } from '../support/locking.js';
+import { resolveRepository, findWorktreeByPhysicalPath, findSidecarWorktreeByPhysicalPath, } from '../support/inspection.js';
+import { cleanLegacyObservations, assertMutationAdmitted, assertRepositoryCompatible, } from '../support/admission.js';
+import { providerError } from '../../types.js';
+export async function importWorktreeTransaction(dependencies, input) {
+    if (!path.isAbsolute(input.absolutePath)) {
+        throw providerError('WORKTREE_IMPORT_INVALID', 'An absolute Worktree path is required', {
+            workspaceId: input.workspaceId,
+            absolutePath: input.absolutePath,
+        });
+    }
+    const requestedPath = path.resolve(input.absolutePath);
+    if (!(await isDirectory(requestedPath))) {
+        throw providerError('WORKTREE_IMPORT_INVALID', `Worktree path is not a directory: ${requestedPath}`, {
+            workspaceId: input.workspaceId,
+            absolutePath: requestedPath,
+        });
+    }
+    return withShardLock(dependencies, input.workspaceId, async (locked) => {
+        await dependencies.git.validateRepository(input.workspaceRoot);
+        const repository = await resolveRepository(dependencies, input.workspaceRoot);
+        return dependencies.repositoryLock.run(`repository:${createRepositoryFingerprint(repository.identity)}`, async (lock) => {
+            lock.assertHeld();
+            const gitRoot = repository.identity.topLevel;
+            await cleanLegacyObservations(locked);
+            const current = await locked.read();
+            assertMutationAdmitted(current, input.workspaceId);
+            assertRepositoryCompatible(current, repository.identity, input.workspaceId);
+            return locked.mutate(async (snapshot) => {
+                const repositoryFingerprint = createRepositoryFingerprint(repository.identity);
+                const liveWorktree = await findWorktreeByPhysicalPath(await dependencies.git.listWorktrees(gitRoot), requestedPath);
+                if (!liveWorktree ||
+                    !liveWorktree.branch ||
+                    (await readWorktreeStatus(liveWorktree)) !== 'ready' ||
+                    (await samePhysicalPath(liveWorktree.absolutePath, gitRoot))) {
+                    throw providerError('WORKTREE_IMPORT_INVALID', `Path is not an importable Worktree: ${requestedPath}`, {
+                        workspaceId: input.workspaceId,
+                        absolutePath: requestedPath,
+                    });
+                }
+                const normalizedPath = await canonicalPath(liveWorktree.absolutePath);
+                const existing = await findSidecarWorktreeByPhysicalPath(snapshot.worktrees, normalizedPath);
+                if (existing) {
+                    if (existing.status === 'active' &&
+                        existing.source === 'external' &&
+                        existing.workspaceId === input.workspaceId) {
+                        return {
+                            result: existing,
+                            snapshot: snapshot.repositoryFingerprint === repositoryFingerprint
+                                ? snapshot
+                                : { ...snapshot, repositoryFingerprint },
+                            changed: snapshot.repositoryFingerprint === repositoryFingerprint ? false : undefined,
+                        };
+                    }
+                    throw providerError('WORKTREE_ALREADY_MANAGED', `Worktree path is already managed: ${normalizedPath}`, {
+                        workspaceId: input.workspaceId,
+                        absolutePath: normalizedPath,
+                        worktreeId: existing.worktreeId,
+                        source: existing.source,
+                        status: existing.status,
+                    });
+                }
+                if (snapshot.worktrees.some((candidate) => candidate.worktreeId === input.worktreeId)) {
+                    throw providerError('SIDECAR_CORRUPT', `Generated Worktree ID is already recorded: ${input.worktreeId}`, {
+                        worktreeId: input.worktreeId,
+                    });
+                }
+                const record = {
+                    worktreeId: input.worktreeId,
+                    workspaceId: input.workspaceId,
+                    absolutePath: normalizedPath,
+                    branch: liveWorktree.branch,
+                    source: 'external',
+                    importedAt: new Date().toISOString(),
+                    status: 'active',
+                };
+                return {
+                    result: record,
+                    snapshot: {
+                        ...snapshot,
+                        repositoryFingerprint,
+                        worktrees: [record, ...snapshot.worktrees],
+                    },
+                };
+            });
+        });
+    });
+}
+//# sourceMappingURL=import.js.map

package/lib/provider/transaction/operations/import.js.map

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

package/lib/provider/transaction/operations/remove.d.ts

@@ -0,0 +1,4 @@
+import type { RemoveWorktreeTransactionInput } from '../types.js';
+import type { TransactionDependencies } from '../dependencies.js';
+export declare function removeWorktreeTransaction(dependencies: Pick<TransactionDependencies, 'dshHome' | 'git' | 'repositoryLock' | 'sidecar'>, input: RemoveWorktreeTransactionInput): Promise<void>;
+//# sourceMappingURL=remove.d.ts.map

package/lib/provider/transaction/operations/remove.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"remove.d.ts","sourceRoot":"","sources":["../../../../src/provider/transaction/operations/remove.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAclE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAGlE,wBAAsB,yBAAyB,CAC7C,YAAY,EAAE,IAAI,CAAC,uBAAuB,EAAE,SAAS,GAAG,KAAK,GAAG,gBAAgB,GAAG,SAAS,CAAC,EAC7F,KAAK,EAAE,8BAA8B,GACpC,OAAO,CAAC,IAAI,CAAC,CAyLf"}

package/lib/provider/transaction/operations/remove.js

@@ -0,0 +1,164 @@
+import { randomUUID } from 'node:crypto';
+import { createRepositoryFingerprint } from '../../git/repository-fingerprint.js';
+import { pathExists, samePhysicalPath } from '../support/paths.js';
+import { recoveryError, pendingRemove } from '../support/journal.js';
+import { reconcileRemoveFailure } from '../recovery/failure-recovery.js';
+import { withShardLock } from '../support/locking.js';
+import { resolveRepository, findExactWorktree, findWorktreeByPhysicalPath } from '../support/inspection.js';
+import { cleanLegacyObservations, assertMutationAdmitted, assertMutationToken, assertRepositoryCompatible, } from '../support/admission.js';
+import { assertSafeRemovalPath } from '../support/path-safety.js';
+import { publishRemoved, markRecovery } from '../support/publication.js';
+import { providerError } from '../../types.js';
+export async function removeWorktreeTransaction(dependencies, input) {
+    return withShardLock(dependencies, input.workspaceId, async (locked) => {
+        await dependencies.git.validateRepository(input.workspaceRoot);
+        const repository = await resolveRepository(dependencies, input.workspaceRoot);
+        return dependencies.repositoryLock.run(`repository:${createRepositoryFingerprint(repository.identity)}`, async (lock) => {
+            lock.assertHeld();
+            const gitRoot = repository.identity.topLevel;
+            await cleanLegacyObservations(locked);
+            const current = await locked.read();
+            assertMutationAdmitted(current, input.workspaceId);
+            assertRepositoryCompatible(current, repository.identity, input.workspaceId);
+            const record = current.worktrees.find((candidate) => candidate.worktreeId === input.worktreeId);
+            if (!record) {
+                throw providerError('WORKTREE_NOT_FOUND', `Worktree not found: ${input.worktreeId}`, {
+                    workspaceId: input.workspaceId,
+                    worktreeId: input.worktreeId,
+                });
+            }
+            if (record.status === 'removed') {
+                throw providerError('WORKTREE_REMOVED', `Worktree has already been removed: ${input.worktreeId}`, {
+                    workspaceId: input.workspaceId,
+                    worktreeId: input.worktreeId,
+                });
+            }
+            assertMutationToken(current, record, input.mutationToken);
+            if (await samePhysicalPath(record.absolutePath, gitRoot)) {
+                throw providerError('WORKTREE_STATE_CONFLICT', 'The main Worktree cannot be removed', {
+                    workspaceId: input.workspaceId,
+                    worktreeId: input.worktreeId,
+                    targetPath: record.absolutePath,
+                });
+            }
+            const liveBefore = await dependencies.git.listWorktrees(gitRoot);
+            const exactBefore = await findExactWorktree(liveBefore, record.absolutePath, record.branch);
+            if (!exactBefore) {
+                const pathRegistration = await findWorktreeByPhysicalPath(liveBefore, record.absolutePath);
+                const branchRegistration = liveBefore.find((worktree) => worktree.branch === record.branch);
+                if (!pathRegistration &&
+                    !branchRegistration &&
+                    !(await pathExists(record.absolutePath))) {
+                    // A legacy caller may have completed Git removal before the v3
+                    // journal was introduced. With no path or matching registration
+                    // left to delete, finalizing the relation is safe and idempotent.
+                    const pending = pendingRemove(input, record, repository.identity);
+                    await locked.mutate((snapshot) => {
+                        const { repository: _repository, ...withoutRepository } = snapshot;
+                        void _repository;
+                        return {
+                            result: undefined,
+                            snapshot: {
+                                ...withoutRepository,
+                                repositoryFingerprint: createRepositoryFingerprint(repository.identity),
+                                pendingOperation: pending,
+                            },
+                        };
+                    });
+                    await publishRemoved(locked, pending.id, input.worktreeId, repository.identity);
+                    return;
+                }
+                await markRecovery(locked, {
+                    id: randomUUID(),
+                    type: 'remove-worktree',
+                    phase: 'recovery-needed',
+                    workspaceId: input.workspaceId,
+                    worktreeId: input.worktreeId,
+                    targetPath: record.absolutePath,
+                    branch: record.branch,
+                    source: record.source,
+                    repositoryFingerprint: createRepositoryFingerprint(repository.identity),
+                    startedAt: new Date().toISOString(),
+                }, 'WORKTREE_IDENTITY_CHANGED');
+                throw providerError('WORKTREE_IDENTITY_CHANGED', `Worktree identity changed: ${record.absolutePath}`, {
+                    workspaceId: input.workspaceId,
+                    worktreeId: input.worktreeId,
+                    targetPath: record.absolutePath,
+                });
+            }
+            await assertSafeRemovalPath(dependencies, record, input.workspaceRoot);
+            const pending = pendingRemove(input, record, repository.identity);
+            await locked.mutate((snapshot) => {
+                const { repository: _repository, ...withoutRepository } = snapshot;
+                void _repository;
+                return {
+                    result: undefined,
+                    snapshot: {
+                        ...withoutRepository,
+                        repositoryFingerprint: createRepositoryFingerprint(repository.identity),
+                        pendingOperation: pending,
+                    },
+                };
+            });
+            try {
+                await dependencies.git.removeWorktree(input.workspaceRoot, record.absolutePath);
+            }
+            catch (error) {
+                return reconcileRemoveFailure(dependencies, {
+                    locked,
+                    input,
+                    record,
+                    pending,
+                    repository: repository.identity,
+                    gitRoot,
+                    error,
+                });
+            }
+            lock.assertHeld();
+            let liveAfter;
+            try {
+                liveAfter = await dependencies.git.listWorktrees(gitRoot);
+            }
+            catch (inspectionError) {
+                await markRecovery(locked, pending, 'WORKTREE_RECOVERY_REQUIRED');
+                throw recoveryError(`Unable to verify Git after remove: ${record.absolutePath}`, {
+                    workspaceId: input.workspaceId,
+                    operationId: pending.id,
+                    targetPath: record.absolutePath,
+                    cause: String(inspectionError),
+                });
+            }
+            if (await findExactWorktree(liveAfter, record.absolutePath, record.branch)) {
+                await markRecovery(locked, pending, 'WORKTREE_RECOVERY_REQUIRED');
+                throw recoveryError(`Git remove did not remove the registered Worktree: ${record.absolutePath}`, {
+                    workspaceId: input.workspaceId,
+                    worktreeId: input.worktreeId,
+                    targetPath: record.absolutePath,
+                });
+            }
+            let targetExists;
+            try {
+                targetExists = await pathExists(record.absolutePath);
+            }
+            catch (inspectionError) {
+                await markRecovery(locked, pending, 'WORKTREE_RECOVERY_REQUIRED');
+                throw recoveryError(`Unable to verify the removed Worktree path: ${record.absolutePath}`, {
+                    workspaceId: input.workspaceId,
+                    operationId: pending.id,
+                    targetPath: record.absolutePath,
+                    cause: String(inspectionError),
+                });
+            }
+            if (targetExists) {
+                await markRecovery(locked, pending, 'WORKTREE_IDENTITY_CHANGED');
+                throw providerError('WORKTREE_IDENTITY_CHANGED', `Worktree path remains after Git removal: ${record.absolutePath}`, {
+                    workspaceId: input.workspaceId,
+                    worktreeId: input.worktreeId,
+                    targetPath: record.absolutePath,
+                });
+            }
+            await publishRemoved(locked, pending.id, input.worktreeId, repository.identity);
+        });
+    });
+}
+//# sourceMappingURL=remove.js.map

package/lib/provider/transaction/operations/remove.js.map

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

package/lib/provider/transaction/recovery/failure-recovery.d.ts

@@ -0,0 +1,32 @@
+import type { WorktreeRecord } from '../../../contract/index.js';
+import type { LockedSidecarStore, PendingOperation, RepositoryIdentity } from '../../types.js';
+import type { CreateWorktreeTransactionInput, RemoveWorktreeTransactionInput, CleanWorktreeTransactionInput } from '../types.js';
+import type { TransactionDependencies } from '../dependencies.js';
+export declare function reconcileCreateFailure(dependencies: Pick<TransactionDependencies, 'git'>, options: {
+    readonly locked: LockedSidecarStore;
+    readonly input: CreateWorktreeTransactionInput;
+    readonly record: WorktreeRecord;
+    readonly pending: PendingOperation;
+    readonly repository: RepositoryIdentity;
+    readonly gitRoot: string;
+    readonly error: unknown;
+}): Promise<WorktreeRecord>;
+export declare function reconcileRemoveFailure(dependencies: Pick<TransactionDependencies, 'git'>, options: {
+    readonly locked: LockedSidecarStore;
+    readonly input: RemoveWorktreeTransactionInput;
+    readonly record: WorktreeRecord;
+    readonly pending: PendingOperation;
+    readonly repository: RepositoryIdentity;
+    readonly gitRoot: string;
+    readonly error: unknown;
+}): Promise<void>;
+export declare function reconcileCleanFailure(dependencies: Pick<TransactionDependencies, 'git'>, options: {
+    readonly locked: LockedSidecarStore;
+    readonly input: CleanWorktreeTransactionInput;
+    readonly record: WorktreeRecord;
+    readonly pending: PendingOperation;
+    readonly repository: RepositoryIdentity;
+    readonly gitRoot: string;
+    readonly error: unknown;
+}): Promise<void>;
+//# sourceMappingURL=failure-recovery.d.ts.map

package/lib/provider/transaction/recovery/failure-recovery.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"failure-recovery.d.ts","sourceRoot":"","sources":["../../../../src/provider/transaction/recovery/failure-recovery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAEV,kBAAkB,EAClB,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EACV,8BAA8B,EAC9B,8BAA8B,EAC9B,6BAA6B,EAC9B,MAAM,aAAa,CAAC;AAWrB,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAElE,wBAAsB,sBAAsB,CAC1C,YAAY,EAAE,IAAI,CAAC,uBAAuB,EAAE,KAAK,CAAC,EAClD,OAAO,EAAE;IACP,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;IACpC,QAAQ,CAAC,KAAK,EAAE,8BAA8B,CAAC;IAC/C,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,gBAAgB,CAAC;IACnC,QAAQ,CAAC,UAAU,EAAE,kBAAkB,CAAC;IACxC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;CACzB,GACA,OAAO,CAAC,cAAc,CAAC,CA2EzB;AAED,wBAAsB,sBAAsB,CAC1C,YAAY,EAAE,IAAI,CAAC,uBAAuB,EAAE,KAAK,CAAC,EAClD,OAAO,EAAE;IACP,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;IACpC,QAAQ,CAAC,KAAK,EAAE,8BAA8B,CAAC;IAC/C,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,gBAAgB,CAAC;IACnC,QAAQ,CAAC,UAAU,EAAE,kBAAkB,CAAC;IACxC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;CACzB,GACA,OAAO,CAAC,IAAI,CAAC,CA0Df;AAED,wBAAsB,qBAAqB,CACzC,YAAY,EAAE,IAAI,CAAC,uBAAuB,EAAE,KAAK,CAAC,EAClD,OAAO,EAAE;IACP,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;IACpC,QAAQ,CAAC,KAAK,EAAE,6BAA6B,CAAC;IAC9C,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,gBAAgB,CAAC;IACnC,QAAQ,CAAC,UAAU,EAAE,kBAAkB,CAAC;IACxC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;CACzB,GACA,OAAO,CAAC,IAAI,CAAC,CA0Df"}

package/lib/provider/transaction/recovery/failure-recovery.js

@@ -0,0 +1,147 @@
+import { pathExists } from '../support/paths.js';
+import { recoveryError, normalizeGitError } from '../support/journal.js';
+import { findExactWorktree, isExactCreatedWorktree } from '../support/inspection.js';
+import { publishCreated, publishCleaned, publishRemoved, clearPending, markRecovery, } from '../support/publication.js';
+export async function reconcileCreateFailure(dependencies, options) {
+    let live;
+    try {
+        live = await dependencies.git.listWorktrees(options.gitRoot);
+    }
+    catch (inspectionError) {
+        await markRecovery(options.locked, options.pending, 'WORKTREE_RECOVERY_REQUIRED');
+        throw recoveryError(`Unable to inspect Git after create failure: ${options.input.targetPath}`, {
+            workspaceId: options.input.workspaceId,
+            operationId: options.pending.id,
+            targetPath: options.input.targetPath,
+            cause: String(inspectionError),
+        });
+    }
+    if (await isExactCreatedWorktree(live, options.input)) {
+        await publishCreated(dependencies, options.locked, options.pending.id, options.record, options.repository);
+        return options.record;
+    }
+    let branches;
+    try {
+        branches = await dependencies.git.listBranches(options.gitRoot);
+    }
+    catch (inspectionError) {
+        await markRecovery(options.locked, options.pending, 'WORKTREE_RECOVERY_REQUIRED');
+        throw recoveryError(`Unable to inspect branches after create failure: ${options.input.targetPath}`, {
+            workspaceId: options.input.workspaceId,
+            operationId: options.pending.id,
+            targetPath: options.input.targetPath,
+            cause: String(inspectionError),
+        });
+    }
+    const branchAmbiguous = options.pending.type === 'create-worktree' &&
+        options.pending.baseRef !== undefined &&
+        branches.includes(options.pending.branch);
+    let targetExists;
+    try {
+        targetExists = await pathExists(options.input.targetPath);
+    }
+    catch (inspectionError) {
+        await markRecovery(options.locked, options.pending, 'WORKTREE_RECOVERY_REQUIRED');
+        throw recoveryError(`Unable to inspect the Worktree path after create failure: ${options.input.targetPath}`, {
+            workspaceId: options.input.workspaceId,
+            operationId: options.pending.id,
+            targetPath: options.input.targetPath,
+            cause: String(inspectionError),
+        });
+    }
+    if (!branchAmbiguous && !targetExists) {
+        await clearPending(options.locked, options.pending.id);
+        throw normalizeGitError('create worktree', options.input.workspaceRoot, options.input.targetPath, options.error);
+    }
+    await markRecovery(options.locked, options.pending, 'WORKTREE_RECOVERY_REQUIRED');
+    throw recoveryError(`Git create failed with an unreconciled Worktree: ${options.input.targetPath}`, {
+        workspaceId: options.input.workspaceId,
+        operationId: options.pending.id,
+        targetPath: options.input.targetPath,
+    });
+}
+export async function reconcileRemoveFailure(dependencies, options) {
+    let live;
+    try {
+        live = await dependencies.git.listWorktrees(options.gitRoot);
+    }
+    catch (inspectionError) {
+        await markRecovery(options.locked, options.pending, 'WORKTREE_RECOVERY_REQUIRED');
+        throw recoveryError(`Unable to inspect Git after remove failure: ${options.record.absolutePath}`, {
+            workspaceId: options.input.workspaceId,
+            operationId: options.pending.id,
+            targetPath: options.record.absolutePath,
+            cause: String(inspectionError),
+        });
+    }
+    if (await findExactWorktree(live, options.record.absolutePath, options.record.branch)) {
+        await clearPending(options.locked, options.pending.id);
+        throw normalizeGitError('remove worktree', options.input.workspaceRoot, options.record.absolutePath, options.error);
+    }
+    let targetExists;
+    try {
+        targetExists = await pathExists(options.record.absolutePath);
+    }
+    catch (inspectionError) {
+        await markRecovery(options.locked, options.pending, 'WORKTREE_RECOVERY_REQUIRED');
+        throw recoveryError(`Unable to inspect the Worktree path after remove failure: ${options.record.absolutePath}`, {
+            workspaceId: options.input.workspaceId,
+            operationId: options.pending.id,
+            targetPath: options.record.absolutePath,
+            cause: String(inspectionError),
+        });
+    }
+    if (!targetExists) {
+        await publishRemoved(options.locked, options.pending.id, options.record.worktreeId, options.repository);
+        return;
+    }
+    await markRecovery(options.locked, options.pending, 'WORKTREE_IDENTITY_CHANGED');
+    throw recoveryError(`Git remove failed with an unreconciled Worktree: ${options.record.absolutePath}`, {
+        workspaceId: options.input.workspaceId,
+        operationId: options.pending.id,
+        targetPath: options.record.absolutePath,
+    });
+}
+export async function reconcileCleanFailure(dependencies, options) {
+    let live;
+    try {
+        live = await dependencies.git.listWorktrees(options.gitRoot);
+    }
+    catch (inspectionError) {
+        await markRecovery(options.locked, options.pending, 'WORKTREE_RECOVERY_REQUIRED');
+        throw recoveryError(`Unable to inspect Git after clean failure: ${options.record.absolutePath}`, {
+            workspaceId: options.input.workspaceId,
+            operationId: options.pending.id,
+            targetPath: options.record.absolutePath,
+            cause: String(inspectionError),
+        });
+    }
+    if (await findExactWorktree(live, options.record.absolutePath, options.record.branch)) {
+        await clearPending(options.locked, options.pending.id);
+        throw normalizeGitError('clean worktree', options.input.workspaceRoot, options.record.absolutePath, options.error);
+    }
+    let targetExists;
+    try {
+        targetExists = await pathExists(options.record.absolutePath);
+    }
+    catch (inspectionError) {
+        await markRecovery(options.locked, options.pending, 'WORKTREE_RECOVERY_REQUIRED');
+        throw recoveryError(`Unable to inspect the Worktree path after clean failure: ${options.record.absolutePath}`, {
+            workspaceId: options.input.workspaceId,
+            operationId: options.pending.id,
+            targetPath: options.record.absolutePath,
+            cause: String(inspectionError),
+        });
+    }
+    if (!targetExists) {
+        await publishCleaned(options.locked, options.pending.id, options.input.worktreeId, options.repository);
+        return;
+    }
+    await markRecovery(options.locked, options.pending, 'WORKTREE_IDENTITY_CHANGED');
+    throw recoveryError(`Git clean failed with an unreconciled Worktree: ${options.record.absolutePath}`, {
+        workspaceId: options.input.workspaceId,
+        operationId: options.pending.id,
+        targetPath: options.record.absolutePath,
+    });
+}
+//# sourceMappingURL=failure-recovery.js.map