@cerbur/clutch-dsh-worktree 0.1.16 → 0.1.18

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

@@ -1,3 +1,4 @@
+import { isWorktreeGitCommit } from '../../../contract/index.js';
 import { createRepositoryFingerprint } from '../../git/repository-fingerprint.js';
 import { assertGeneratedNameAvailable } from '../../generated-name.js';
 import { recoveryError, recordForCreate, pendingCreate } from '../support/journal.js';
@@ -8,7 +9,19 @@ import { cleanLegacyObservations, assertMutationAdmitted, assertRepositoryCompat
 import { assertGeneratedTarget } from '../support/path-safety.js';
 import { publishCreated, markRecovery } from '../support/publication.js';
 import { providerError } from '../../types.js';
+import { workspacePathInWorktree } from '../../worktree-path.js';
+import { isSafeBranchName, isSafeBranchIdentity } from '../../git/branch-name.js';
+import { assertLocalWorktreeBranch, localBranchExists, findBranchIdentity, canonicalBranchIdentity } from '../../git/branches.js';
 export async function createWorktreeTransaction(dependencies, input) {
+    if (input.baseBranch === undefined && (!isWorktreeGitCommit(input.baseCommit) || input.newBranch === undefined)) {
+        throw providerError('GIT_OPERATION_FAILED', 'Commit-based creation requires a full Git hash and a new branch', {});
+    }
+    if ((input.baseBranch !== undefined && !isSafeBranchIdentity(input.baseBranch)) ||
+        (input.newBranch !== undefined && !isSafeBranchName(input.newBranch))) {
+        throw providerError('GIT_OPERATION_FAILED', 'A valid branch short name is required', {});
+    }
+    let baseRef = input.baseCommit ?? input.baseBranch;
+    let savedBaseBranch = input.baseBranch;
     return withShardLock(dependencies, input.workspaceId, async (locked) => {
         await dependencies.git.validateRepository(input.workspaceRoot);
         const repository = await resolveRepository(dependencies, input.workspaceRoot);
@@ -23,33 +36,37 @@ export async function createWorktreeTransaction(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}`, {
+                const baseBranch = input.baseBranch === undefined ? undefined : findBranchIdentity(branches, input.baseBranch);
+                if (input.baseBranch !== undefined && !baseBranch) {
+                    throw providerError('GIT_OPERATION_FAILED', `Branch does not exist: ${input.baseBranch}`, {
                         workspaceRoot: input.workspaceRoot,
                         branch: input.baseBranch,
                     });
                 }
+                assertLocalWorktreeBranch(baseBranch, input.newBranch);
+                if (baseBranch !== undefined)
+                    savedBaseBranch = canonicalBranchIdentity(baseBranch, input.baseBranch);
+                baseRef = input.baseCommit ?? baseBranch?.ref ?? baseRef;
                 if (input.newBranch !== undefined &&
-                    branches.some((branch) => branch.name === input.newBranch)) {
+                    localBranchExists(branches, input.newBranch)) {
                     throw providerError('WORKTREE_BRANCH_CONFLICT', `New branch already exists: ${input.newBranch}`, {
                         workspaceRoot: input.workspaceRoot,
                         branch: input.newBranch,
-                        baseBranch: input.baseBranch,
+                        baseBranch: input.baseBranch ?? baseRef,
                     });
                 }
                 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,
+                        baseBranch: input.baseBranch ?? baseRef,
                     });
                 }
             }
             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}`, {
+                if (input.baseBranch !== undefined && !branches.includes(input.baseBranch)) {
+                    throw providerError('GIT_OPERATION_FAILED', `Branch does not exist: ${input.baseBranch}`, {
                         workspaceRoot: input.workspaceRoot,
                         branch: input.baseBranch,
                     });
@@ -58,7 +75,7 @@ export async function createWorktreeTransaction(dependencies, input) {
                     throw providerError('WORKTREE_BRANCH_CONFLICT', `New branch already exists: ${input.newBranch}`, {
                         workspaceRoot: input.workspaceRoot,
                         branch: input.newBranch,
-                        baseBranch: input.baseBranch,
+                        baseBranch: input.baseBranch ?? baseRef,
                     });
                 }
                 existingGitWorktrees = await dependencies.git.listWorktrees(gitRoot);
@@ -66,11 +83,11 @@ export async function createWorktreeTransaction(dependencies, input) {
                     throw providerError('WORKTREE_BRANCH_CONFLICT', `Branch is already checked out: ${input.targetBranch}`, {
                         workspaceRoot: input.workspaceRoot,
                         branch: input.targetBranch,
-                        baseBranch: input.baseBranch,
+                        baseBranch: input.baseBranch ?? baseRef,
                     });
                 }
             }
-            await assertGeneratedNameAvailable(input.worktreeId, input.targetPath, current, existingGitWorktrees ?? await dependencies.git.listWorktrees(gitRoot));
+            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}`, {
@@ -84,11 +101,14 @@ export async function createWorktreeTransaction(dependencies, input) {
             // so a Worktree that already advanced past its creation point is never
             // recorded as its own baseline.
             const capturedBaseCommit = dependencies.git.resolveCommit
-                ? await dependencies.git.resolveCommit(gitRoot, input.baseBranch)
-                : undefined;
-            const transactionInput = capturedBaseCommit === undefined
-                ? input
-                : { ...input, baseCommit: capturedBaseCommit };
+                ? await dependencies.git.resolveCommit(gitRoot, baseRef)
+                : input.baseCommit;
+            const transactionInput = {
+                ...input,
+                ...(savedBaseBranch === undefined ? {} : { baseBranch: savedBaseBranch }),
+                workspacePath: await workspacePathInWorktree(input.workspaceRoot, gitRoot, input.targetPath),
+                ...(capturedBaseCommit === undefined ? {} : { baseCommit: capturedBaseCommit }),
+            };
             const record = recordForCreate(transactionInput);
             const pending = pendingCreate(transactionInput, repository.identity);
             await locked.mutate((snapshot) => {
@@ -104,7 +124,9 @@ export async function createWorktreeTransaction(dependencies, input) {
                 };
             });
             try {
-                await dependencies.git.createWorktree(input.workspaceRoot, input.targetPath, input.baseBranch, input.newBranch);
+                await dependencies.git.createWorktree(input.workspaceRoot, input.targetPath, input.newBranch === undefined
+                    ? input.targetBranch
+                    : (capturedBaseCommit ?? baseRef), input.newBranch);
             }
             catch (error) {
                 return reconcileCreateFailure(dependencies, {

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

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

@@ -1 +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"}
+{"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;AAIlE,wBAAsB,yBAAyB,CAC7C,YAAY,EAAE,IAAI,CAAC,uBAAuB,EAAE,KAAK,GAAG,gBAAgB,GAAG,SAAS,CAAC,EACjF,KAAK,EAAE,8BAA8B,GACpC,OAAO,CAAC,cAAc,CAAC,CA0HzB"}

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

@@ -6,6 +6,7 @@ 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';
+import { workspacePathInWorktree, worktreeWorkspaceAvailable } from '../../worktree-path.js';
 export async function importWorktreeTransaction(dependencies, input) {
     if (!path.isAbsolute(input.absolutePath)) {
         throw providerError('WORKTREE_IMPORT_INVALID', 'An absolute Worktree path is required', {
@@ -43,6 +44,10 @@ export async function importWorktreeTransaction(dependencies, input) {
                     });
                 }
                 const normalizedPath = await canonicalPath(liveWorktree.absolutePath);
+                const absolutePath = await workspacePathInWorktree(input.workspaceRoot, gitRoot, normalizedPath);
+                if (!(await worktreeWorkspaceAvailable({ absolutePath, gitRootPath: normalizedPath }))) {
+                    throw providerError('WORKTREE_IMPORT_INVALID', 'Workspace directory is unavailable in this Worktree', { absolutePath });
+                }
                 const existing = await findSidecarWorktreeByPhysicalPath(snapshot.worktrees, normalizedPath);
                 if (existing) {
                     if (existing.status === 'active' &&
@@ -72,7 +77,8 @@ export async function importWorktreeTransaction(dependencies, input) {
                 const record = {
                     worktreeId: input.worktreeId,
                     workspaceId: input.workspaceId,
-                    absolutePath: normalizedPath,
+                    absolutePath,
+                    ...(absolutePath === normalizedPath ? {} : { gitRootPath: normalizedPath }),
                     branch: liveWorktree.branch,
                     source: 'external',
                     importedAt: new Date().toISOString(),

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

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

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

@@ -1,3 +1,4 @@
+import { gitWorktreeRoot } from '../../../contract/index.js';
 import { randomUUID } from 'node:crypto';
 import { createRepositoryFingerprint } from '../../git/repository-fingerprint.js';
 import { pathExists, samePhysicalPath } from '../support/paths.js';
@@ -34,21 +35,21 @@ export async function removeWorktreeTransaction(dependencies, input) {
                 });
             }
             assertMutationToken(current, record, input.mutationToken);
-            if (await samePhysicalPath(record.absolutePath, gitRoot)) {
+            if (await samePhysicalPath(gitWorktreeRoot(record), gitRoot)) {
                 throw providerError('WORKTREE_STATE_CONFLICT', 'The main Worktree cannot be removed', {
                     workspaceId: input.workspaceId,
                     worktreeId: input.worktreeId,
-                    targetPath: record.absolutePath,
+                    targetPath: gitWorktreeRoot(record),
                 });
             }
             const liveBefore = await dependencies.git.listWorktrees(gitRoot);
-            const exactBefore = await findExactWorktree(liveBefore, record.absolutePath, record.branch);
+            const exactBefore = await findExactWorktree(liveBefore, gitWorktreeRoot(record), record.branch);
             if (!exactBefore) {
-                const pathRegistration = await findWorktreeByPhysicalPath(liveBefore, record.absolutePath);
+                const pathRegistration = await findWorktreeByPhysicalPath(liveBefore, gitWorktreeRoot(record));
                 const branchRegistration = liveBefore.find((worktree) => worktree.branch === record.branch);
                 if (!pathRegistration &&
                     !branchRegistration &&
-                    !(await pathExists(record.absolutePath))) {
+                    !(await pathExists(gitWorktreeRoot(record)))) {
                     // 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.
@@ -74,16 +75,16 @@ export async function removeWorktreeTransaction(dependencies, input) {
                     phase: 'recovery-needed',
                     workspaceId: input.workspaceId,
                     worktreeId: input.worktreeId,
-                    targetPath: record.absolutePath,
+                    targetPath: gitWorktreeRoot(record),
                     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}`, {
+                throw providerError('WORKTREE_IDENTITY_CHANGED', `Worktree identity changed: ${gitWorktreeRoot(record)}`, {
                     workspaceId: input.workspaceId,
                     worktreeId: input.worktreeId,
-                    targetPath: record.absolutePath,
+                    targetPath: gitWorktreeRoot(record),
                 });
             }
             await assertSafeRemovalPath(dependencies, record, input.workspaceRoot);
@@ -101,7 +102,7 @@ export async function removeWorktreeTransaction(dependencies, input) {
                 };
             });
             try {
-                await dependencies.git.removeWorktree(input.workspaceRoot, record.absolutePath);
+                await dependencies.git.removeWorktree(input.workspaceRoot, gitWorktreeRoot(record));
             }
             catch (error) {
                 return reconcileRemoveFailure(dependencies, {
@@ -121,40 +122,40 @@ export async function removeWorktreeTransaction(dependencies, input) {
             }
             catch (inspectionError) {
                 await markRecovery(locked, pending, 'WORKTREE_RECOVERY_REQUIRED');
-                throw recoveryError(`Unable to verify Git after remove: ${record.absolutePath}`, {
+                throw recoveryError(`Unable to verify Git after remove: ${gitWorktreeRoot(record)}`, {
                     workspaceId: input.workspaceId,
                     operationId: pending.id,
-                    targetPath: record.absolutePath,
+                    targetPath: gitWorktreeRoot(record),
                     cause: String(inspectionError),
                 });
             }
-            if (await findExactWorktree(liveAfter, record.absolutePath, record.branch)) {
+            if (await findExactWorktree(liveAfter, gitWorktreeRoot(record), record.branch)) {
                 await markRecovery(locked, pending, 'WORKTREE_RECOVERY_REQUIRED');
-                throw recoveryError(`Git remove did not remove the registered Worktree: ${record.absolutePath}`, {
+                throw recoveryError(`Git remove did not remove the registered Worktree: ${gitWorktreeRoot(record)}`, {
                     workspaceId: input.workspaceId,
                     worktreeId: input.worktreeId,
-                    targetPath: record.absolutePath,
+                    targetPath: gitWorktreeRoot(record),
                 });
             }
             let targetExists;
             try {
-                targetExists = await pathExists(record.absolutePath);
+                targetExists = await pathExists(gitWorktreeRoot(record));
             }
             catch (inspectionError) {
                 await markRecovery(locked, pending, 'WORKTREE_RECOVERY_REQUIRED');
-                throw recoveryError(`Unable to verify the removed Worktree path: ${record.absolutePath}`, {
+                throw recoveryError(`Unable to verify the removed Worktree path: ${gitWorktreeRoot(record)}`, {
                     workspaceId: input.workspaceId,
                     operationId: pending.id,
-                    targetPath: record.absolutePath,
+                    targetPath: gitWorktreeRoot(record),
                     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}`, {
+                throw providerError('WORKTREE_IDENTITY_CHANGED', `Worktree path remains after Git removal: ${gitWorktreeRoot(record)}`, {
                     workspaceId: input.workspaceId,
                     worktreeId: input.worktreeId,
-                    targetPath: record.absolutePath,
+                    targetPath: gitWorktreeRoot(record),
                 });
             }
             await publishRemoved(locked, pending.id, input.worktreeId, repository.identity);

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

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

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

@@ -1,3 +1,5 @@
+import { readBranchFacts, localBranchExists } from '../../git/branches.js';
+import { gitWorktreeRoot } from '../../../contract/index.js';
 import { pathExists } from '../support/paths.js';
 import { recoveryError, normalizeGitError } from '../support/journal.js';
 import { findExactWorktree } from '../support/inspection.js';
@@ -29,7 +31,7 @@ export async function reconcileCreateFailure(dependencies, options) {
     }
     let branches;
     try {
-        branches = await dependencies.git.listBranches(options.gitRoot);
+        branches = await readBranchFacts(dependencies.git, options.gitRoot);
     }
     catch (inspectionError) {
         await markRecovery(options.locked, options.pending, 'WORKTREE_RECOVERY_REQUIRED');
@@ -42,7 +44,7 @@ export async function reconcileCreateFailure(dependencies, options) {
     }
     const branchAmbiguous = options.pending.type === 'create-worktree' &&
         options.pending.baseRef !== undefined &&
-        branches.includes(options.pending.branch);
+        localBranchExists(branches, options.pending.branch);
     let targetExists;
     try {
         targetExists = await pathExists(options.input.targetPath);
@@ -74,27 +76,27 @@ export async function reconcileRemoveFailure(dependencies, options) {
     }
     catch (inspectionError) {
         await markRecovery(options.locked, options.pending, 'WORKTREE_RECOVERY_REQUIRED');
-        throw recoveryError(`Unable to inspect Git after remove failure: ${options.record.absolutePath}`, {
+        throw recoveryError(`Unable to inspect Git after remove failure: ${gitWorktreeRoot(options.record)}`, {
             workspaceId: options.input.workspaceId,
             operationId: options.pending.id,
-            targetPath: options.record.absolutePath,
+            targetPath: gitWorktreeRoot(options.record),
             cause: String(inspectionError),
         });
     }
-    if (await findExactWorktree(live, options.record.absolutePath, options.record.branch)) {
+    if (await findExactWorktree(live, gitWorktreeRoot(options.record), options.record.branch)) {
         await clearPending(options.locked, options.pending.id);
-        throw normalizeGitError('remove worktree', options.input.workspaceRoot, options.record.absolutePath, options.error);
+        throw normalizeGitError('remove worktree', options.input.workspaceRoot, gitWorktreeRoot(options.record), options.error);
     }
     let targetExists;
     try {
-        targetExists = await pathExists(options.record.absolutePath);
+        targetExists = await pathExists(gitWorktreeRoot(options.record));
     }
     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}`, {
+        throw recoveryError(`Unable to inspect the Worktree path after remove failure: ${gitWorktreeRoot(options.record)}`, {
             workspaceId: options.input.workspaceId,
             operationId: options.pending.id,
-            targetPath: options.record.absolutePath,
+            targetPath: gitWorktreeRoot(options.record),
             cause: String(inspectionError),
         });
     }
@@ -103,10 +105,10 @@ export async function reconcileRemoveFailure(dependencies, options) {
         return;
     }
     await markRecovery(options.locked, options.pending, 'WORKTREE_IDENTITY_CHANGED');
-    throw recoveryError(`Git remove failed with an unreconciled Worktree: ${options.record.absolutePath}`, {
+    throw recoveryError(`Git remove failed with an unreconciled Worktree: ${gitWorktreeRoot(options.record)}`, {
         workspaceId: options.input.workspaceId,
         operationId: options.pending.id,
-        targetPath: options.record.absolutePath,
+        targetPath: gitWorktreeRoot(options.record),
     });
 }
 export async function reconcileCleanFailure(dependencies, options) {
@@ -116,27 +118,27 @@ export async function reconcileCleanFailure(dependencies, options) {
     }
     catch (inspectionError) {
         await markRecovery(options.locked, options.pending, 'WORKTREE_RECOVERY_REQUIRED');
-        throw recoveryError(`Unable to inspect Git after clean failure: ${options.record.absolutePath}`, {
+        throw recoveryError(`Unable to inspect Git after clean failure: ${gitWorktreeRoot(options.record)}`, {
             workspaceId: options.input.workspaceId,
             operationId: options.pending.id,
-            targetPath: options.record.absolutePath,
+            targetPath: gitWorktreeRoot(options.record),
             cause: String(inspectionError),
         });
     }
-    if (await findExactWorktree(live, options.record.absolutePath, options.record.branch)) {
+    if (await findExactWorktree(live, gitWorktreeRoot(options.record), options.record.branch)) {
         await clearPending(options.locked, options.pending.id);
-        throw normalizeGitError('clean worktree', options.input.workspaceRoot, options.record.absolutePath, options.error);
+        throw normalizeGitError('clean worktree', options.input.workspaceRoot, gitWorktreeRoot(options.record), options.error);
     }
     let targetExists;
     try {
-        targetExists = await pathExists(options.record.absolutePath);
+        targetExists = await pathExists(gitWorktreeRoot(options.record));
     }
     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}`, {
+        throw recoveryError(`Unable to inspect the Worktree path after clean failure: ${gitWorktreeRoot(options.record)}`, {
             workspaceId: options.input.workspaceId,
             operationId: options.pending.id,
-            targetPath: options.record.absolutePath,
+            targetPath: gitWorktreeRoot(options.record),
             cause: String(inspectionError),
         });
     }
@@ -145,10 +147,10 @@ export async function reconcileCleanFailure(dependencies, options) {
         return;
     }
     await markRecovery(options.locked, options.pending, 'WORKTREE_IDENTITY_CHANGED');
-    throw recoveryError(`Git clean failed with an unreconciled Worktree: ${options.record.absolutePath}`, {
+    throw recoveryError(`Git clean failed with an unreconciled Worktree: ${gitWorktreeRoot(options.record)}`, {
         workspaceId: options.input.workspaceId,
         operationId: options.pending.id,
-        targetPath: options.record.absolutePath,
+        targetPath: gitWorktreeRoot(options.record),
     });
 }
 //# sourceMappingURL=failure-recovery.js.map

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

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

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

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

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

@@ -1,3 +1,5 @@
+import { readBranchFacts, localBranchExists } from '../../git/branches.js';
+import { isWorktreeGitCommit } from '../../../contract/index.js';
 import { createRepositoryFingerprint } from '../../git/repository-fingerprint.js';
 import { pathExists } from '../support/paths.js';
 import { recoveryError } from '../support/journal.js';
@@ -64,10 +66,15 @@ export async function recoverWorktreeTransaction(dependencies, input) {
                     const record = {
                         worktreeId: pending.worktreeId,
                         workspaceId: input.workspaceId,
-                        absolutePath: pending.targetPath,
+                        absolutePath: pending.workspacePath ?? pending.targetPath,
+                        ...(pending.workspacePath === undefined || pending.workspacePath === pending.targetPath ? {} : { gitRootPath: pending.targetPath }),
                         branch: pending.branch,
                         createdAt: pending.startedAt,
-                        baseBranch: pending.baseRef ?? pending.branch,
+                        ...(pending.baseBranch !== undefined
+                            ? { baseBranch: pending.baseBranch }
+                            : pending.baseRef?.endsWith('^{commit}') && isWorktreeGitCommit(pending.baseRef.slice(0, -9))
+                                ? {}
+                                : { baseBranch: pending.baseRef ?? pending.branch }),
                         // The journaled acquisition commit is immutable and always wins.
                         // Recovery may run long after the interrupted create, so the live
                         // Worktree HEAD can already have advanced past the acquisition point.
@@ -82,7 +89,7 @@ export async function recoverWorktreeTransaction(dependencies, input) {
                 }
                 let branches;
                 try {
-                    branches = await dependencies.git.listBranches(gitRoot);
+                    branches = await readBranchFacts(dependencies.git, gitRoot);
                 }
                 catch (inspectionError) {
                     await markRecovery(locked, pending, 'WORKTREE_RECOVERY_REQUIRED');
@@ -93,7 +100,7 @@ export async function recoverWorktreeTransaction(dependencies, input) {
                         cause: String(inspectionError),
                     });
                 }
-                const ambiguousNewBranch = pending.baseRef !== undefined && branches.includes(pending.branch);
+                const ambiguousNewBranch = pending.baseRef !== undefined && localBranchExists(branches, pending.branch);
                 let pendingTargetExists;
                 try {
                     pendingTargetExists = await pathExists(pending.targetPath);