@cerbur/clutch-dsh-worktree 0.1.9 → 0.1.12

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

@@ -0,0 +1 @@
+{"version":3,"file":"failure-recovery.js","sourceRoot":"","sources":["../../../../src/provider/transaction/recovery/failure-recovery.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AACrF,OAAO,EACL,cAAc,EACd,cAAc,EACd,cAAc,EACd,YAAY,EACZ,YAAY,GACb,MAAM,2BAA2B,CAAC;AAGnC,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,YAAkD,EAClD,OAQC;IAED,IAAI,IAAgC,CAAC;IACrC,IAAI,CAAC;QACH,IAAI,GAAG,MAAM,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/D,CAAC;IAAC,OAAO,eAAe,EAAE,CAAC;QACzB,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,EAAE,4BAA4B,CAAC,CAAC;QAClF,MAAM,aAAa,CAAC,+CAA+C,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE;YAC7F,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,WAAW;YACtC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;YAC/B,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,UAAU;YACpC,KAAK,EAAE,MAAM,CAAC,eAAe,CAAC;SAC/B,CAAC,CAAC;IACL,CAAC;IACD,IAAI,MAAM,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACtD,MAAM,cAAc,CAClB,YAAY,EACZ,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,OAAO,CAAC,EAAE,EAClB,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,UAAU,CACnB,CAAC;QACF,OAAO,OAAO,CAAC,MAAM,CAAC;IACxB,CAAC;IACD,IAAI,QAA2B,CAAC;IAChC,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAClE,CAAC;IAAC,OAAO,eAAe,EAAE,CAAC;QACzB,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,EAAE,4BAA4B,CAAC,CAAC;QAClF,MAAM,aAAa,CACjB,oDAAoD,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,EAC9E;YACE,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,WAAW;YACtC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;YAC/B,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,UAAU;YACpC,KAAK,EAAE,MAAM,CAAC,eAAe,CAAC;SAC/B,CACF,CAAC;IACJ,CAAC;IACD,MAAM,eAAe,GACnB,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,iBAAiB;QAC1C,OAAO,CAAC,OAAO,CAAC,OAAO,KAAK,SAAS;QACrC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5C,IAAI,YAAqB,CAAC;IAC1B,IAAI,CAAC;QACH,YAAY,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAC5D,CAAC;IAAC,OAAO,eAAe,EAAE,CAAC;QACzB,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,EAAE,4BAA4B,CAAC,CAAC;QAClF,MAAM,aAAa,CACjB,6DAA6D,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,EACvF;YACE,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,WAAW;YACtC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;YAC/B,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,UAAU;YACpC,KAAK,EAAE,MAAM,CAAC,eAAe,CAAC;SAC/B,CACF,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,eAAe,IAAI,CAAC,YAAY,EAAE,CAAC;QACtC,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACvD,MAAM,iBAAiB,CACrB,iBAAiB,EACjB,OAAO,CAAC,KAAK,CAAC,aAAa,EAC3B,OAAO,CAAC,KAAK,CAAC,UAAU,EACxB,OAAO,CAAC,KAAK,CACd,CAAC;IACJ,CAAC;IACD,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,EAAE,4BAA4B,CAAC,CAAC;IAClF,MAAM,aAAa,CACjB,oDAAoD,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,EAC9E;QACE,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,WAAW;QACtC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;QAC/B,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,UAAU;KACrC,CACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,YAAkD,EAClD,OAQC;IAED,IAAI,IAAgC,CAAC;IACrC,IAAI,CAAC;QACH,IAAI,GAAG,MAAM,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/D,CAAC;IAAC,OAAO,eAAe,EAAE,CAAC;QACzB,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,EAAE,4BAA4B,CAAC,CAAC;QAClF,MAAM,aAAa,CACjB,+CAA+C,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAC5E;YACE,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,WAAW;YACtC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;YAC/B,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,YAAY;YACvC,KAAK,EAAE,MAAM,CAAC,eAAe,CAAC;SAC/B,CACF,CAAC;IACJ,CAAC;IACD,IAAI,MAAM,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QACtF,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACvD,MAAM,iBAAiB,CACrB,iBAAiB,EACjB,OAAO,CAAC,KAAK,CAAC,aAAa,EAC3B,OAAO,CAAC,MAAM,CAAC,YAAY,EAC3B,OAAO,CAAC,KAAK,CACd,CAAC;IACJ,CAAC;IACD,IAAI,YAAqB,CAAC;IAC1B,IAAI,CAAC;QACH,YAAY,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAC/D,CAAC;IAAC,OAAO,eAAe,EAAE,CAAC;QACzB,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,EAAE,4BAA4B,CAAC,CAAC;QAClF,MAAM,aAAa,CACjB,6DAA6D,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAC1F;YACE,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,WAAW;YACtC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;YAC/B,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,YAAY;YACvC,KAAK,EAAE,MAAM,CAAC,eAAe,CAAC;SAC/B,CACF,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,cAAc,CAClB,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,OAAO,CAAC,EAAE,EAClB,OAAO,CAAC,MAAM,CAAC,UAAU,EACzB,OAAO,CAAC,UAAU,CACnB,CAAC;QACF,OAAO;IACT,CAAC;IACD,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,EAAE,2BAA2B,CAAC,CAAC;IACjF,MAAM,aAAa,CACjB,oDAAoD,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EACjF;QACE,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,WAAW;QACtC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;QAC/B,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,YAAY;KACxC,CACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,YAAkD,EAClD,OAQC;IAED,IAAI,IAAgC,CAAC;IACrC,IAAI,CAAC;QACH,IAAI,GAAG,MAAM,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/D,CAAC;IAAC,OAAO,eAAe,EAAE,CAAC;QACzB,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,EAAE,4BAA4B,CAAC,CAAC;QAClF,MAAM,aAAa,CACjB,8CAA8C,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAC3E;YACE,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,WAAW;YACtC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;YAC/B,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,YAAY;YACvC,KAAK,EAAE,MAAM,CAAC,eAAe,CAAC;SAC/B,CACF,CAAC;IACJ,CAAC;IACD,IAAI,MAAM,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QACtF,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACvD,MAAM,iBAAiB,CACrB,gBAAgB,EAChB,OAAO,CAAC,KAAK,CAAC,aAAa,EAC3B,OAAO,CAAC,MAAM,CAAC,YAAY,EAC3B,OAAO,CAAC,KAAK,CACd,CAAC;IACJ,CAAC;IACD,IAAI,YAAqB,CAAC;IAC1B,IAAI,CAAC;QACH,YAAY,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAC/D,CAAC;IAAC,OAAO,eAAe,EAAE,CAAC;QACzB,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,EAAE,4BAA4B,CAAC,CAAC;QAClF,MAAM,aAAa,CACjB,4DAA4D,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EACzF;YACE,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,WAAW;YACtC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;YAC/B,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,YAAY;YACvC,KAAK,EAAE,MAAM,CAAC,eAAe,CAAC;SAC/B,CACF,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,cAAc,CAClB,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,OAAO,CAAC,EAAE,EAClB,OAAO,CAAC,KAAK,CAAC,UAAU,EACxB,OAAO,CAAC,UAAU,CACnB,CAAC;QACF,OAAO;IACT,CAAC;IACD,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,EAAE,2BAA2B,CAAC,CAAC;IACjF,MAAM,aAAa,CACjB,mDAAmD,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAChF;QACE,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,WAAW;QACtC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;QAC/B,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,YAAY;KACxC,CACF,CAAC;AACJ,CAAC"}

package/lib/provider/transaction/recovery/recover.d.ts

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

package/lib/provider/transaction/recovery/recover.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"recover.d.ts","sourceRoot":"","sources":["../../../../src/provider/transaction/recovery/recover.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAQzD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAGlE,wBAAsB,0BAA0B,CAC9C,YAAY,EAAE,IAAI,CAAC,uBAAuB,EAAE,SAAS,GAAG,KAAK,GAAG,gBAAgB,GAAG,SAAS,CAAC,EAC7F,KAAK,EAAE,qBAAqB,GAC3B,OAAO,CAAC,IAAI,CAAC,CA4Kf"}

package/lib/provider/transaction/recovery/recover.js

@@ -0,0 +1,164 @@
+import { createRepositoryFingerprint } from '../../git/repository-fingerprint.js';
+import { pathExists } from '../support/paths.js';
+import { recoveryError } from '../support/journal.js';
+import { withShardLock } from '../support/locking.js';
+import { resolveRepository, findExactWorktree, isExactCreatedWorktree } from '../support/inspection.js';
+import { cleanLegacyObservations, assertRepositoryCompatible } from '../support/admission.js';
+import { assertRecoverableCreatePath } from '../support/path-safety.js';
+import { publishCreated, publishCleaned, clearPending, markRecovery } from '../support/publication.js';
+import { WorktreeProviderError, providerError } from '../../types.js';
+export async function recoverWorktreeTransaction(dependencies, input) {
+    return withShardLock(dependencies, input.workspaceId, async (locked) => {
+        await cleanLegacyObservations(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;
+            const current = await locked.read();
+            assertRepositoryCompatible(current, repository.identity, input.workspaceId, true);
+            const pending = current.pendingOperation;
+            let live;
+            try {
+                live = await dependencies.git.listWorktrees(gitRoot);
+            }
+            catch (inspectionError) {
+                if (pending)
+                    await markRecovery(locked, pending, 'WORKTREE_RECOVERY_REQUIRED');
+                throw recoveryError(`Unable to inspect Git during Worktree recovery`, {
+                    workspaceId: input.workspaceId,
+                    ...(pending ? { operationId: pending.id } : {}),
+                    cause: String(inspectionError),
+                });
+            }
+            // Without a journal there is no interrupted mutation to recover. Missing
+            // registrations remain runtime repair facts, including active records.
+            if (!pending)
+                return;
+            const pendingFingerprint = pending.repositoryFingerprint ??
+                (pending.repository ? createRepositoryFingerprint(pending.repository) : undefined);
+            if (pendingFingerprint !== createRepositoryFingerprint(repository.identity)) {
+                await markRecovery(locked, pending, 'WORKTREE_IDENTITY_CHANGED');
+                throw providerError('WORKTREE_IDENTITY_CHANGED', 'Pending operation belongs to another repository', {
+                    workspaceId: input.workspaceId,
+                    operationId: pending.id,
+                });
+            }
+            if (pending.type === 'create-worktree') {
+                try {
+                    await assertRecoverableCreatePath(dependencies, pending, input.workspaceRoot);
+                }
+                catch (error) {
+                    await markRecovery(locked, pending, 'WORKTREE_IDENTITY_CHANGED');
+                    if (error instanceof WorktreeProviderError)
+                        throw error;
+                    throw recoveryError(`Unable to validate the pending Worktree path: ${pending.targetPath}`, {
+                        workspaceId: input.workspaceId,
+                        operationId: pending.id,
+                        targetPath: pending.targetPath,
+                        cause: String(error),
+                    });
+                }
+                const exact = await isExactCreatedWorktree(live, {
+                    workspaceId: input.workspaceId,
+                    workspaceRoot: input.workspaceRoot,
+                    targetPath: pending.targetPath,
+                    worktreeId: pending.worktreeId,
+                    baseBranch: pending.baseRef ?? pending.branch,
+                    newBranch: pending.baseRef !== undefined ? pending.branch : undefined,
+                    targetBranch: pending.branch,
+                });
+                if (exact) {
+                    const record = {
+                        worktreeId: pending.worktreeId,
+                        workspaceId: input.workspaceId,
+                        absolutePath: pending.targetPath,
+                        branch: pending.branch,
+                        createdAt: pending.startedAt,
+                        baseBranch: pending.baseRef ?? pending.branch,
+                        source: 'plugin',
+                        status: 'active',
+                    };
+                    await publishCreated(dependencies, locked, pending.id, record, repository.identity);
+                    return;
+                }
+                let branches;
+                try {
+                    branches = await dependencies.git.listBranches(gitRoot);
+                }
+                catch (inspectionError) {
+                    await markRecovery(locked, pending, 'WORKTREE_RECOVERY_REQUIRED');
+                    throw recoveryError(`Unable to inspect branches during pending create recovery`, {
+                        workspaceId: input.workspaceId,
+                        operationId: pending.id,
+                        targetPath: pending.targetPath,
+                        cause: String(inspectionError),
+                    });
+                }
+                const ambiguousNewBranch = pending.baseRef !== undefined && branches.includes(pending.branch);
+                let pendingTargetExists;
+                try {
+                    pendingTargetExists = await pathExists(pending.targetPath);
+                }
+                catch (inspectionError) {
+                    await markRecovery(locked, pending, 'WORKTREE_RECOVERY_REQUIRED');
+                    throw recoveryError(`Unable to inspect the pending Worktree path: ${pending.targetPath}`, {
+                        workspaceId: input.workspaceId,
+                        operationId: pending.id,
+                        targetPath: pending.targetPath,
+                        cause: String(inspectionError),
+                    });
+                }
+                if (!ambiguousNewBranch && !pendingTargetExists) {
+                    await clearPending(locked, pending.id);
+                    return;
+                }
+                await markRecovery(locked, pending, 'WORKTREE_RECOVERY_REQUIRED');
+                throw recoveryError(`Unable to reconcile pending create: ${pending.targetPath}`, {
+                    workspaceId: input.workspaceId,
+                    operationId: pending.id,
+                    targetPath: pending.targetPath,
+                });
+            }
+            const exact = await findExactWorktree(live, pending.targetPath, pending.branch);
+            let pendingTargetExists;
+            try {
+                pendingTargetExists = await pathExists(pending.targetPath);
+            }
+            catch (inspectionError) {
+                await markRecovery(locked, pending, 'WORKTREE_RECOVERY_REQUIRED');
+                throw recoveryError(`Unable to inspect the pending Worktree path: ${pending.targetPath}`, {
+                    workspaceId: input.workspaceId,
+                    operationId: pending.id,
+                    targetPath: pending.targetPath,
+                    cause: String(inspectionError),
+                });
+            }
+            if (pending.type === 'clean-worktree' &&
+                pending.phase === 'recovery-needed' &&
+                !exact &&
+                !pendingTargetExists) {
+                throw recoveryError('Clean operation lacks sufficient completion evidence', {
+                    workspaceId: input.workspaceId,
+                    operationId: pending.id,
+                    worktreeId: pending.worktreeId,
+                });
+            }
+            if (!exact && !pendingTargetExists) {
+                await publishCleaned(locked, pending.id, pending.worktreeId, repository.identity);
+                return;
+            }
+            if (exact) {
+                await clearPending(locked, pending.id);
+                return;
+            }
+            await markRecovery(locked, pending, 'WORKTREE_IDENTITY_CHANGED');
+            throw providerError('WORKTREE_IDENTITY_CHANGED', `Unable to reconcile pending ${pending.type}: ${pending.targetPath}`, {
+                workspaceId: input.workspaceId,
+                operationId: pending.id,
+                targetPath: pending.targetPath,
+            });
+        });
+    });
+}
+//# sourceMappingURL=recover.js.map

package/lib/provider/transaction/recovery/recover.js.map

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

package/lib/provider/transaction/support/admission.d.ts

@@ -0,0 +1,7 @@
+import type { WorktreeRecord } from '../../../contract/index.js';
+import type { LockedSidecarStore, RepositoryIdentity, SidecarSnapshot } from '../../types.js';
+export declare function cleanLegacyObservations(locked: LockedSidecarStore): Promise<void>;
+export declare function assertMutationAdmitted(snapshot: SidecarSnapshot, workspaceId: string): void;
+export declare function assertMutationToken(snapshot: Pick<SidecarSnapshot, 'schemaVersion' | 'workspaceId' | 'revision'>, record: WorktreeRecord, token: string | undefined): void;
+export declare function assertRepositoryCompatible(snapshot: SidecarSnapshot, identity: RepositoryIdentity, workspaceId: string, allowMissing?: boolean): void;
+//# sourceMappingURL=admission.d.ts.map

package/lib/provider/transaction/support/admission.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"admission.d.ts","sourceRoot":"","sources":["../../../../src/provider/transaction/support/admission.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAGjE,OAAO,KAAK,EACV,kBAAkB,EAElB,kBAAkB,EAClB,eAAe,EAChB,MAAM,gBAAgB,CAAC;AAuBxB,wBAAsB,uBAAuB,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyBvF;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,CAiB3F;AAED,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,eAAe,GAAG,aAAa,GAAG,UAAU,CAAC,EAC7E,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,IAAI,CAQN;AAED,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,eAAe,EACzB,QAAQ,EAAE,kBAAkB,EAC5B,WAAW,EAAE,MAAM,EACnB,YAAY,UAAQ,GACnB,IAAI,CAuBN"}

package/lib/provider/transaction/support/admission.js

@@ -0,0 +1,90 @@
+import { createWorktreeMutationToken } from '../../mutation-token.js';
+import { createRepositoryFingerprint } from '../../git/repository-fingerprint.js';
+import { sameRepository } from './paths.js';
+import { recoveryError } from './journal.js';
+import { providerError } from '../../types.js';
+/** Only legacy observations of known, uncleaned records may be retired. */
+function recoveryBlocker(worktrees) {
+    const records = new Map();
+    for (const record of worktrees) {
+        // Preserve the previous first-match lookup even for an injected legacy store.
+        if (!records.has(record.worktreeId))
+            records.set(record.worktreeId, record);
+    }
+    return (issue) => {
+        const record = issue.worktreeId === undefined ? undefined : records.get(issue.worktreeId);
+        return !(issue.operationId === undefined &&
+            issue.code === 'WORKTREE_RECOVERY_REQUIRED' &&
+            record !== undefined &&
+            record.diskCleanup !== 'completed');
+    };
+}
+export async function cleanLegacyObservations(locked) {
+    const snapshot = await locked.read();
+    if (snapshot.pendingOperation !== undefined ||
+        !snapshot.recoveryIssues ||
+        snapshot.recoveryIssues.length === 0) {
+        return;
+    }
+    const remainingIssues = snapshot.recoveryIssues.filter(recoveryBlocker(snapshot.worktrees));
+    if (remainingIssues.length !== snapshot.recoveryIssues.length) {
+        await locked.mutate((current) => {
+            const { repository: _repository, recoveryIssues: _oldRecovery, ...stableFields } = current;
+            void _repository;
+            void _oldRecovery;
+            return {
+                result: undefined,
+                changed: true,
+                snapshot: {
+                    ...stableFields,
+                    ...(remainingIssues.length > 0 ? { recoveryIssues: remainingIssues } : {}),
+                },
+            };
+        });
+    }
+}
+export function assertMutationAdmitted(snapshot, workspaceId) {
+    if (snapshot.pendingOperation) {
+        throw recoveryError(`Workspace has a pending Worktree operation: ${snapshot.pendingOperation.id}`, {
+            workspaceId,
+            operationId: snapshot.pendingOperation.id,
+        });
+    }
+    if (snapshot.recoveryIssues && snapshot.recoveryIssues.length > 0) {
+        if (snapshot.recoveryIssues.some(recoveryBlocker(snapshot.worktrees))) {
+            throw recoveryError(`Workspace has unresolved Worktree recovery issues: ${workspaceId}`, {
+                workspaceId,
+            });
+        }
+    }
+}
+export function assertMutationToken(snapshot, record, token) {
+    const expected = createWorktreeMutationToken(snapshot, record);
+    if (token === undefined || token !== expected) {
+        throw providerError('WORKTREE_STATE_CONFLICT', 'Worktree state changed after it was loaded', {
+            workspaceId: record.workspaceId,
+            worktreeId: record.worktreeId,
+        });
+    }
+}
+export function assertRepositoryCompatible(snapshot, identity, workspaceId, allowMissing = false) {
+    const actualFingerprint = createRepositoryFingerprint(identity);
+    if (snapshot.repositoryFingerprint && snapshot.repositoryFingerprint !== actualFingerprint) {
+        throw providerError('WORKTREE_IDENTITY_CHANGED', 'Workspace repository identity changed', {
+            workspaceId,
+            expectedFingerprint: snapshot.repositoryFingerprint,
+            actualFingerprint,
+        });
+    }
+    if (snapshot.repository && !sameRepository(snapshot.repository, identity)) {
+        throw providerError('WORKTREE_IDENTITY_CHANGED', 'Workspace repository identity changed', {
+            workspaceId,
+            expectedCommonDirectory: snapshot.repository.commonDirectory,
+            actualCommonDirectory: identity.commonDirectory,
+        });
+    }
+    if (!allowMissing && !identity.commonDirectory) {
+        throw providerError('WORKTREE_IDENTITY_CHANGED', 'Unable to resolve Workspace repository identity', { workspaceId });
+    }
+}
+//# sourceMappingURL=admission.js.map

package/lib/provider/transaction/support/admission.js.map

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

package/lib/provider/transaction/support/inspection.d.ts

@@ -0,0 +1,11 @@
+import type { WorktreeRecord } from '../../../contract/index.js';
+import type { GitRepositoryInspection, GitWorktreeInfo, SidecarSnapshot } from '../../types.js';
+import type { CreateWorktreeTransactionInput } from '../types.js';
+import type { TransactionDependencies } from '../dependencies.js';
+export declare function resolveRepository(dependencies: Pick<TransactionDependencies, 'git'>, workspaceRoot: string): Promise<GitRepositoryInspection>;
+export declare function findActiveBranchConflict(dependencies: Pick<TransactionDependencies, 'git'>, snapshot: SidecarSnapshot, branch: string, gitRoot: string, worktreeId?: string): Promise<WorktreeRecord | undefined>;
+export declare function findExactWorktree(worktrees: readonly GitWorktreeInfo[], targetPath: string, branch: string): Promise<GitWorktreeInfo | undefined>;
+export declare function findWorktreeByPhysicalPath(worktrees: readonly GitWorktreeInfo[], targetPath: string): Promise<GitWorktreeInfo | undefined>;
+export declare function findSidecarWorktreeByPhysicalPath(worktrees: readonly WorktreeRecord[], targetPath: string): Promise<WorktreeRecord | undefined>;
+export declare function isExactCreatedWorktree(worktrees: readonly GitWorktreeInfo[], input: CreateWorktreeTransactionInput): Promise<boolean>;
+//# sourceMappingURL=inspection.d.ts.map

package/lib/provider/transaction/support/inspection.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"inspection.d.ts","sourceRoot":"","sources":["../../../../src/provider/transaction/support/inspection.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,uBAAuB,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAChG,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAElE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAElE,wBAAsB,iBAAiB,CACrC,YAAY,EAAE,IAAI,CAAC,uBAAuB,EAAE,KAAK,CAAC,EAClD,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,uBAAuB,CAAC,CASlC;AAED,wBAAsB,wBAAwB,CAC5C,YAAY,EAAE,IAAI,CAAC,uBAAuB,EAAE,KAAK,CAAC,EAClD,QAAQ,EAAE,eAAe,EACzB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAcrC;AAED,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,SAAS,eAAe,EAAE,EACrC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAMtC;AAED,wBAAsB,0BAA0B,CAC9C,SAAS,EAAE,SAAS,eAAe,EAAE,EACrC,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAKtC;AAED,wBAAsB,iCAAiC,CACrD,SAAS,EAAE,SAAS,cAAc,EAAE,EACpC,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAKrC;AAED,wBAAsB,sBAAsB,CAC1C,SAAS,EAAE,SAAS,eAAe,EAAE,EACrC,KAAK,EAAE,8BAA8B,GACpC,OAAO,CAAC,OAAO,CAAC,CAGlB"}

package/lib/provider/transaction/support/inspection.js

@@ -0,0 +1,51 @@
+import path from 'node:path';
+import { canonicalPath, samePhysicalPath } from './paths.js';
+export async function resolveRepository(dependencies, workspaceRoot) {
+    if (dependencies.git.resolveRepositoryIdentity)
+        return dependencies.git.resolveRepositoryIdentity(workspaceRoot);
+    const topLevel = dependencies.git.resolveRepositoryRoot
+        ? await dependencies.git.resolveRepositoryRoot(workspaceRoot)
+        : workspaceRoot;
+    const canonicalTopLevel = await canonicalPath(topLevel);
+    const commonDirectory = await canonicalPath(path.join(canonicalTopLevel, '.git'));
+    return { identity: { topLevel: canonicalTopLevel, commonDirectory } };
+}
+export async function findActiveBranchConflict(dependencies, snapshot, branch, gitRoot, worktreeId) {
+    const candidates = snapshot.worktrees.filter((record) => record.status === 'active' && record.branch === branch && record.worktreeId !== worktreeId);
+    if (candidates.length === 0)
+        return undefined;
+    const live = await dependencies.git.listWorktrees(gitRoot);
+    for (const candidate of candidates) {
+        const actual = await findWorktreeByPhysicalPath(live, candidate.absolutePath);
+        // Only positive evidence of a different live branch releases a stale claim.
+        if (!actual || (!actual.detached && (!actual.branch || actual.branch === branch)))
+            return candidate;
+    }
+    return undefined;
+}
+export async function findExactWorktree(worktrees, targetPath, branch) {
+    for (const worktree of worktrees) {
+        if (worktree.branch === branch && (await samePhysicalPath(worktree.absolutePath, targetPath)))
+            return worktree;
+    }
+    return undefined;
+}
+export async function findWorktreeByPhysicalPath(worktrees, targetPath) {
+    for (const worktree of worktrees) {
+        if (await samePhysicalPath(worktree.absolutePath, targetPath))
+            return worktree;
+    }
+    return undefined;
+}
+export async function findSidecarWorktreeByPhysicalPath(worktrees, targetPath) {
+    for (const worktree of worktrees) {
+        if (await samePhysicalPath(worktree.absolutePath, targetPath))
+            return worktree;
+    }
+    return undefined;
+}
+export async function isExactCreatedWorktree(worktrees, input) {
+    const exact = await findExactWorktree(worktrees, input.targetPath, input.targetBranch);
+    return exact !== undefined && exact.detached !== true;
+}
+//# sourceMappingURL=inspection.js.map

package/lib/provider/transaction/support/inspection.js.map

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

package/lib/provider/transaction/support/journal.d.ts

@@ -0,0 +1,12 @@
+import type { WorktreeRecord } from '../../../contract/index.js';
+import type { CleanWorktreePendingOperation, PendingOperation, RecoveryIssue, RepositoryIdentity } from '../../types.js';
+import type { CreateWorktreeTransactionInput, RemoveWorktreeTransactionInput, CleanWorktreeTransactionInput } from '../types.js';
+import { WorktreeProviderError } from '../../types.js';
+export declare function removeRecoveryIssue(issues: readonly RecoveryIssue[] | undefined, operationId: string, worktreeId?: string): readonly RecoveryIssue[];
+export declare function recoveryError(message: string, details?: Record<string, string | number | readonly string[]>): WorktreeProviderError;
+export declare function normalizeGitError(operation: string, workspaceRoot: string, targetPath: string, error: unknown): WorktreeProviderError;
+export declare function recordForCreate(input: CreateWorktreeTransactionInput): WorktreeRecord;
+export declare function pendingCreate(input: CreateWorktreeTransactionInput, repository: RepositoryIdentity): PendingOperation;
+export declare function pendingRemove(input: RemoveWorktreeTransactionInput, record: WorktreeRecord, repository: RepositoryIdentity): PendingOperation;
+export declare function pendingClean(input: CleanWorktreeTransactionInput, record: WorktreeRecord, repository: RepositoryIdentity): CleanWorktreePendingOperation;
+//# sourceMappingURL=journal.d.ts.map

package/lib/provider/transaction/support/journal.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"journal.d.ts","sourceRoot":"","sources":["../../../../src/provider/transaction/support/journal.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,KAAK,EACV,6BAA6B,EAC7B,gBAAgB,EAChB,aAAa,EACb,kBAAkB,EACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EACV,8BAA8B,EAC9B,8BAA8B,EAC9B,6BAA6B,EAC9B,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,qBAAqB,EAAiB,MAAM,gBAAgB,CAAC;AAEtE,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,SAAS,aAAa,EAAE,GAAG,SAAS,EAC5C,WAAW,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,MAAM,GAClB,SAAS,aAAa,EAAE,CAM1B;AAED,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,MAAM,EAAE,CAAM,GAChE,qBAAqB,CAEvB;AAED,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,OAAO,GACb,qBAAqB,CAOvB;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,8BAA8B,GAAG,cAAc,CAWrF;AAED,wBAAgB,aAAa,CAC3B,KAAK,EAAE,8BAA8B,EACrC,UAAU,EAAE,kBAAkB,GAC7B,gBAAgB,CAalB;AAED,wBAAgB,aAAa,CAC3B,KAAK,EAAE,8BAA8B,EACrC,MAAM,EAAE,cAAc,EACtB,UAAU,EAAE,kBAAkB,GAC7B,gBAAgB,CAalB;AAED,wBAAgB,YAAY,CAC1B,KAAK,EAAE,6BAA6B,EACpC,MAAM,EAAE,cAAc,EACtB,UAAU,EAAE,kBAAkB,GAC7B,6BAA6B,CAa/B"}

package/lib/provider/transaction/support/journal.js

@@ -0,0 +1,74 @@
+import { randomUUID } from 'node:crypto';
+import { createRepositoryFingerprint } from '../../git/repository-fingerprint.js';
+import { WorktreeProviderError, providerError } from '../../types.js';
+export function removeRecoveryIssue(issues, operationId, worktreeId) {
+    return (issues ?? []).filter((issue) => issue.operationId !== operationId &&
+        (worktreeId === undefined || issue.worktreeId !== worktreeId));
+}
+export function recoveryError(message, details = {}) {
+    return providerError('WORKTREE_RECOVERY_REQUIRED', message, details);
+}
+export function normalizeGitError(operation, workspaceRoot, targetPath, error) {
+    if (error instanceof WorktreeProviderError)
+        return error;
+    return providerError('GIT_OPERATION_FAILED', `Git ${operation} failed: ${String(error)}`, {
+        operation,
+        workspaceRoot,
+        targetPath,
+    });
+}
+export function recordForCreate(input) {
+    return {
+        worktreeId: input.worktreeId,
+        workspaceId: input.workspaceId,
+        absolutePath: input.targetPath,
+        branch: input.targetBranch,
+        createdAt: new Date().toISOString(),
+        baseBranch: input.baseBranch,
+        source: 'plugin',
+        status: 'active',
+    };
+}
+export function pendingCreate(input, repository) {
+    return {
+        id: randomUUID(),
+        type: 'create-worktree',
+        phase: 'executing',
+        workspaceId: input.workspaceId,
+        worktreeId: input.worktreeId,
+        targetPath: input.targetPath,
+        branch: input.targetBranch,
+        ...(input.newBranch !== undefined ? { baseRef: input.baseBranch } : {}),
+        repositoryFingerprint: createRepositoryFingerprint(repository),
+        startedAt: new Date().toISOString(),
+    };
+}
+export function pendingRemove(input, record, repository) {
+    return {
+        id: randomUUID(),
+        type: 'remove-worktree',
+        phase: 'executing',
+        workspaceId: input.workspaceId,
+        worktreeId: input.worktreeId,
+        targetPath: record.absolutePath,
+        branch: record.branch,
+        source: record.source,
+        repositoryFingerprint: createRepositoryFingerprint(repository),
+        startedAt: new Date().toISOString(),
+    };
+}
+export function pendingClean(input, record, repository) {
+    return {
+        id: randomUUID(),
+        type: 'clean-worktree',
+        phase: 'executing',
+        workspaceId: input.workspaceId,
+        worktreeId: input.worktreeId,
+        targetPath: record.absolutePath,
+        branch: record.branch,
+        source: record.source,
+        repositoryFingerprint: createRepositoryFingerprint(repository),
+        startedAt: new Date().toISOString(),
+    };
+}
+//# sourceMappingURL=journal.js.map

package/lib/provider/transaction/support/journal.js.map

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

package/lib/provider/transaction/support/locking.d.ts

@@ -0,0 +1,4 @@
+import type { LockedSidecarStore } from '../../types.js';
+import type { TransactionDependencies } from '../dependencies.js';
+export declare function withShardLock<T>(dependencies: Pick<TransactionDependencies, 'sidecar'>, workspaceId: string, operation: (locked: LockedSidecarStore) => Promise<T>): Promise<T>;
+//# sourceMappingURL=locking.d.ts.map

package/lib/provider/transaction/support/locking.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"locking.d.ts","sourceRoot":"","sources":["../../../../src/provider/transaction/support/locking.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAElE,wBAAsB,aAAa,CAAC,CAAC,EACnC,YAAY,EAAE,IAAI,CAAC,uBAAuB,EAAE,SAAS,CAAC,EACtD,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,CAAC,MAAM,EAAE,kBAAkB,KAAK,OAAO,CAAC,CAAC,CAAC,GACpD,OAAO,CAAC,CAAC,CAAC,CASZ"}

package/lib/provider/transaction/support/locking.js

@@ -0,0 +1,11 @@
+export async function withShardLock(dependencies, workspaceId, operation) {
+    if (dependencies.sidecar.runExclusive)
+        return dependencies.sidecar.runExclusive(workspaceId, operation);
+    // Injected legacy stores remain usable for tests and older compositions, but
+    // cannot provide the cross-process shard lock until they implement the seam.
+    return operation({
+        read: () => dependencies.sidecar.read(workspaceId),
+        mutate: (mutation) => dependencies.sidecar.mutate(workspaceId, mutation),
+    });
+}
+//# sourceMappingURL=locking.js.map

package/lib/provider/transaction/support/locking.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"locking.js","sourceRoot":"","sources":["../../../../src/provider/transaction/support/locking.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,YAAsD,EACtD,WAAmB,EACnB,SAAqD;IAErD,IAAI,YAAY,CAAC,OAAO,CAAC,YAAY;QACnC,OAAO,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IACnE,6EAA6E;IAC7E,6EAA6E;IAC7E,OAAO,SAAS,CAAC;QACf,IAAI,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC;QAClD,MAAM,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC;KACzE,CAAC,CAAC;AACL,CAAC"}

package/lib/provider/transaction/support/path-safety.d.ts

@@ -0,0 +1,11 @@
+import type { WorktreeRecord } from '../../../contract/index.js';
+import type { PendingOperation } from '../../types.js';
+import type { CreateWorktreeTransactionInput } from '../types.js';
+import type { TransactionDependencies } from '../dependencies.js';
+export declare function assertGeneratedTarget(dependencies: Pick<TransactionDependencies, 'dshHome'>, input: CreateWorktreeTransactionInput): void;
+export declare function assertSafeRemovalPath(dependencies: Pick<TransactionDependencies, 'dshHome'>, record: WorktreeRecord, workspaceRoot: string): Promise<void>;
+export declare function assertRecoverableCreatePath(dependencies: Pick<TransactionDependencies, 'dshHome'>, pending: Extract<PendingOperation, {
+    readonly type: 'create-worktree';
+}>, workspaceRoot: string): Promise<void>;
+export declare function assertNotSymlink(pathname: string, record: WorktreeRecord): Promise<void>;
+//# sourceMappingURL=path-safety.d.ts.map

package/lib/provider/transaction/support/path-safety.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"path-safety.d.ts","sourceRoot":"","sources":["../../../../src/provider/transaction/support/path-safety.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAElE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAGlE,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,IAAI,CAAC,uBAAuB,EAAE,SAAS,CAAC,EACtD,KAAK,EAAE,8BAA8B,GACpC,IAAI,CAgBN;AAED,wBAAsB,qBAAqB,CACzC,YAAY,EAAE,IAAI,CAAC,uBAAuB,EAAE,SAAS,CAAC,EACtD,MAAM,EAAE,cAAc,EACtB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,IAAI,CAAC,CA6Bf;AAED,wBAAsB,2BAA2B,CAC/C,YAAY,EAAE,IAAI,CAAC,uBAAuB,EAAE,SAAS,CAAC,EACtD,OAAO,EAAE,OAAO,CAAC,gBAAgB,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAA;CAAE,CAAC,EACxE,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,IAAI,CAAC,CA6Bf;AAED,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAY9F"}

package/lib/provider/transaction/support/path-safety.js

@@ -0,0 +1,82 @@
+import path from 'node:path';
+import { lstat } from 'node:fs/promises';
+import { isMissing, isInside } from './paths.js';
+import { providerError } from '../../types.js';
+export function assertGeneratedTarget(dependencies, input) {
+    const generatedRoot = path.join(dependencies.dshHome, 'clutch-dsh-worktree', 'worktree');
+    if (!path.isAbsolute(input.targetPath) ||
+        !isInside(generatedRoot, input.targetPath) ||
+        isInside(input.workspaceRoot, input.targetPath)) {
+        throw providerError('WORKTREE_STATE_CONFLICT', 'Generated Worktree path is outside the managed boundary', {
+            workspaceId: input.workspaceId,
+            targetPath: input.targetPath,
+        });
+    }
+}
+export async function assertSafeRemovalPath(dependencies, record, workspaceRoot) {
+    const targetPath = path.resolve(record.absolutePath);
+    if (record.source === 'plugin') {
+        const generatedRoot = path.join(dependencies.dshHome, 'clutch-dsh-worktree', 'worktree');
+        if (!isInside(generatedRoot, targetPath) || isInside(workspaceRoot, targetPath)) {
+            throw providerError('WORKTREE_IDENTITY_CHANGED', 'Managed Worktree path moved outside its trusted root', {
+                worktreeId: record.worktreeId,
+                targetPath: record.absolutePath,
+            });
+        }
+        for (const trustedPath of [
+            dependencies.dshHome,
+            path.join(dependencies.dshHome, 'clutch-dsh-worktree'),
+            generatedRoot,
+            targetPath,
+        ]) {
+            await assertNotSymlink(trustedPath, record);
+        }
+        return;
+    }
+    // Imported records are canonicalized at registration time. Refusing a
+    // symlink here prevents a later path replacement from redirecting Git's
+    // destructive command to an unrelated directory.
+    await assertNotSymlink(targetPath, record);
+}
+export async function assertRecoverableCreatePath(dependencies, pending, workspaceRoot) {
+    const targetPath = path.resolve(pending.targetPath);
+    const generatedRoot = path.join(dependencies.dshHome, 'clutch-dsh-worktree', 'worktree');
+    if (!isInside(generatedRoot, targetPath) || isInside(workspaceRoot, targetPath)) {
+        throw providerError('WORKTREE_IDENTITY_CHANGED', 'Pending Worktree path moved outside its trusted root', {
+            worktreeId: pending.worktreeId,
+            targetPath: pending.targetPath,
+        });
+    }
+    const record = {
+        worktreeId: pending.worktreeId,
+        workspaceId: pending.workspaceId,
+        absolutePath: pending.targetPath,
+        branch: pending.branch,
+        source: 'plugin',
+        status: 'active',
+    };
+    for (const trustedPath of [
+        dependencies.dshHome,
+        path.join(dependencies.dshHome, 'clutch-dsh-worktree'),
+        generatedRoot,
+        targetPath,
+    ]) {
+        await assertNotSymlink(trustedPath, record);
+    }
+}
+export async function assertNotSymlink(pathname, record) {
+    try {
+        if ((await lstat(pathname)).isSymbolicLink()) {
+            throw providerError('WORKTREE_IDENTITY_CHANGED', `Worktree path is a symlink: ${pathname}`, {
+                worktreeId: record.worktreeId,
+                targetPath: record.absolutePath,
+            });
+        }
+    }
+    catch (error) {
+        if (isMissing(error))
+            return;
+        throw error;
+    }
+}
+//# sourceMappingURL=path-safety.js.map