@cerbur/clutch-dsh-worktree 0.1.9 → 0.1.10

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EACL,oBAAoB,EACpB,uBAAuB,EACvB,mBAAmB,GACpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAmClE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EACL,wBAAwB,EACxB,2BAA2B,EAC3B,2BAA2B,EAC3B,2BAA2B,GAC5B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,iCAAiC,EACjC,uBAAuB,GACxB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,sBAAsB,EACtB,qBAAqB,EACrB,uBAAuB,EACvB,aAAa,GACd,MAAM,qBAAqB,CAAC;AAmB7B,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAM/E,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,8BAA8B,EAC9B,kCAAkC,EAClC,+BAA+B,GAChC,MAAM,iBAAiB,CAAC;AAQzB,uDAAuD;AACvD,uFAAuF;AACvF,0DAA0D;AAC1D,OAAO,EAAE,qBAAqB,IAAI,OAAO,EAAE,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EACL,oBAAoB,EACpB,uBAAuB,EACvB,mBAAmB,GACpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAoClE,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EACL,wBAAwB,EACxB,2BAA2B,EAC3B,2BAA2B,EAC3B,2BAA2B,GAC5B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,iCAAiC,EACjC,uBAAuB,GACxB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,sBAAsB,EACtB,qBAAqB,EACrB,uBAAuB,EACvB,aAAa,GACd,MAAM,qBAAqB,CAAC;AAmB7B,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAM/E,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,8BAA8B,EAC9B,kCAAkC,EAClC,+BAA+B,GAChC,MAAM,iBAAiB,CAAC;AAQzB,uDAAuD;AACvD,uFAAuF;AACvF,0DAA0D;AAC1D,OAAO,EAAE,qBAAqB,IAAI,OAAO,EAAE,MAAM,iBAAiB,CAAC"}

package/lib/manage/manager-context.d.ts

@@ -1,6 +1,6 @@
 import type { WorktreeManagerOptions } from './types.js';
 import type { GitWorktreeAdapter, SidecarStore } from '../provider/types.js';
-import type { WorktreeMutationTransaction } from '../provider/transaction.js';
+import type { WorktreeMutationTransaction } from '../provider/transaction/index.js';
 /** Internal Manage composition context shared by the responsibility-specific use-case modules. */
 export interface WorktreeManagerContext {
     readonly dsh: WorktreeManagerOptions['dsh'];
@@ -9,5 +9,6 @@ export interface WorktreeManagerContext {
     readonly sidecar: SidecarStore;
     readonly transaction: WorktreeMutationTransaction;
     readonly idFactory: () => string;
+    readonly signal: AbortSignal;
 }
 //# sourceMappingURL=manager-context.d.ts.map

package/lib/manage/manager-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manager-context.d.ts","sourceRoot":"","sources":["../../src/manage/manager-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAC7E,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AAE9E,kGAAkG;AAClG,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,GAAG,EAAE,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAC5C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,GAAG,EAAE,kBAAkB,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;IAC/B,QAAQ,CAAC,WAAW,EAAE,2BAA2B,CAAC;IAClD,QAAQ,CAAC,SAAS,EAAE,MAAM,MAAM,CAAC;CAClC"}
+{"version":3,"file":"manager-context.d.ts","sourceRoot":"","sources":["../../src/manage/manager-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAC7E,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAEpF,kGAAkG;AAClG,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,GAAG,EAAE,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAC5C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,GAAG,EAAE,kBAAkB,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;IAC/B,QAAQ,CAAC,WAAW,EAAE,2BAA2B,CAAC;IAClD,QAAQ,CAAC,SAAS,EAAE,MAAM,MAAM,CAAC;IACjC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;CAC9B"}

package/lib/manage/manager-sessions.js

@@ -17,8 +17,8 @@ export async function bindSession(context, input) {
                 worktreeId: input.worktreeId,
             });
         }
-        if (worktree.status === 'removed') {
-            throw providerError('WORKTREE_REMOVED', `Worktree has been removed: ${input.worktreeId}`, {
+        if (worktree.diskCleanup === 'completed') {
+            throw providerError('WORKTREE_REMOVED', `Worktree has been cleaned: ${input.worktreeId}`, {
                 workspaceId: input.workspaceId,
                 worktreeId: input.worktreeId,
             });
@@ -71,8 +71,8 @@ export async function resolveRuntimeCwd(context, input) {
             sessionId: input.sessionId,
         });
     }
-    if (worktree.status !== 'active') {
-        throw providerError('WORKTREE_REMOVED', `Active binding points to a removed Worktree: ${worktree.worktreeId}`, {
+    if (worktree.diskCleanup === 'completed') {
+        throw providerError('WORKTREE_REMOVED', `Active binding points to a cleaned Worktree: ${worktree.worktreeId}`, {
             workspaceId: input.workspaceId,
             worktreeId: worktree.worktreeId,
             sessionId: input.sessionId,

package/lib/manage/manager-sessions.js.map

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

package/lib/manage/manager-worktree-lifecycle.d.ts

@@ -0,0 +1,23 @@
+import type { WorktreeLifecycleInput } from '../contract/index.js';
+import type { WorktreeManagerContext } from './manager-context.js';
+/**
+ * Remove (archive) a Worktree: change status to 'removed', preserving its directory,
+ * active Session bindings, and runtime cwd.
+ */
+export declare function archiveWorktree(context: WorktreeManagerContext, input: WorktreeLifecycleInput): Promise<void>;
+/**
+ * Unarchive a Worktree: change status from 'removed' back to 'active'.
+ * Requires that the Worktree was not cleaned from disk, exists physically in Git,
+ * and has no active conflict on branch or physical path.
+ */
+export declare function unarchiveWorktree(context: WorktreeManagerContext, input: WorktreeLifecycleInput): Promise<void>;
+/**
+ * Clean Worktree from disk: performs real git worktree removal with journal protection,
+ * marks record diskCleanup: 'completed', and detaches bindings.
+ */
+export declare function cleanWorktree(context: WorktreeManagerContext, input: WorktreeLifecycleInput): Promise<void>;
+/**
+ * Forget Worktree: removes the record and all its Session bindings completely from sidecar.
+ */
+export declare function forgetWorktree(context: WorktreeManagerContext, input: WorktreeLifecycleInput): Promise<void>;
+//# sourceMappingURL=manager-worktree-lifecycle.d.ts.map

package/lib/manage/manager-worktree-lifecycle.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"manager-worktree-lifecycle.d.ts","sourceRoot":"","sources":["../../src/manage/manager-worktree-lifecycle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,sBAAsB,EAEvB,MAAM,sBAAsB,CAAC;AAU9B,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAiBnE;;;GAGG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,sBAAsB,EAC/B,KAAK,EAAE,sBAAsB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAqBf;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,sBAAsB,EAC/B,KAAK,EAAE,sBAAsB,GAC5B,OAAO,CAAC,IAAI,CAAC,CA6Ff;AAED;;;GAGG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,sBAAsB,EAC/B,KAAK,EAAE,sBAAsB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAcf;AAED;;GAEG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,sBAAsB,EAC/B,KAAK,EAAE,sBAAsB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAyBf"}

package/lib/manage/manager-worktree-lifecycle.js

@@ -0,0 +1,165 @@
+import { createWorktreeMutationToken } from '../provider/mutation-token.js';
+import { providerError } from '../provider/types.js';
+import path from 'node:path';
+import { archiveWorktreeSnapshot, unarchiveWorktreeSnapshot, forgetWorktreeSnapshot, } from '../provider/worktree-lifecycle.js';
+import { asSidecarError, requireWorkspace, samePhysicalPath } from './manager-support.js';
+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,
+        });
+    }
+}
+/**
+ * Remove (archive) a Worktree: change status to 'removed', preserving its directory,
+ * active Session bindings, and runtime cwd.
+ */
+export async function archiveWorktree(context, input) {
+    await requireWorkspace(context, input.workspaceId);
+    try {
+        await context.sidecar.mutate(input.workspaceId, (snapshot) => {
+            const record = snapshot.worktrees.find((w) => w.worktreeId === input.worktreeId);
+            if (!record) {
+                throw providerError('WORKTREE_NOT_FOUND', `Worktree not found: ${input.worktreeId}`, {
+                    worktreeId: input.worktreeId,
+                    workspaceId: input.workspaceId,
+                });
+            }
+            assertMutationToken(snapshot, record, input.mutationToken);
+            if (record.status === 'removed') {
+                return { result: undefined, snapshot, changed: false };
+            }
+            const next = archiveWorktreeSnapshot(snapshot, input.worktreeId);
+            return { result: undefined, snapshot: next, changed: true };
+        });
+    }
+    catch (error) {
+        throw asSidecarError(error, input.workspaceId);
+    }
+}
+/**
+ * Unarchive a Worktree: change status from 'removed' back to 'active'.
+ * Requires that the Worktree was not cleaned from disk, exists physically in Git,
+ * and has no active conflict on branch or physical path.
+ */
+export async function unarchiveWorktree(context, input) {
+    const workspace = await requireWorkspace(context, input.workspaceId);
+    try {
+        await context.sidecar.mutate(input.workspaceId, async (snapshot) => {
+            const record = snapshot.worktrees.find((w) => w.worktreeId === input.worktreeId);
+            if (!record) {
+                throw providerError('WORKTREE_NOT_FOUND', `Worktree not found: ${input.worktreeId}`, {
+                    worktreeId: input.worktreeId,
+                    workspaceId: input.workspaceId,
+                });
+            }
+            assertMutationToken(snapshot, record, input.mutationToken);
+            if (record.status === 'active') {
+                return { result: undefined, snapshot, changed: false };
+            }
+            if (record.diskCleanup === 'completed') {
+                throw providerError('WORKTREE_STATE_CONFLICT', 'Cleaned worktrees cannot be unarchived', {
+                    workspaceId: input.workspaceId,
+                    worktreeId: input.worktreeId,
+                });
+            }
+            // Check conflict with other active worktrees in the same workspace
+            const conflict = snapshot.worktrees.find((w) => w.status === 'active' &&
+                w.worktreeId !== record.worktreeId &&
+                (w.branch === record.branch || w.absolutePath === record.absolutePath));
+            if (conflict) {
+                throw providerError('WORKTREE_STATE_CONFLICT', `Another active worktree is using branch ${record.branch} or path ${record.absolutePath}`, {
+                    workspaceId: input.workspaceId,
+                    worktreeId: input.worktreeId,
+                    conflictingWorktreeId: conflict.worktreeId,
+                });
+            }
+            // Verify physical existence / git registration
+            if (context.git.listWorktrees) {
+                let gitWorktrees;
+                try {
+                    const gitRoot = context.git.resolveRepositoryRoot
+                        ? await context.git.resolveRepositoryRoot(workspace.rootPath)
+                        : workspace.rootPath;
+                    gitWorktrees = await context.git.listWorktrees(gitRoot);
+                }
+                catch {
+                    gitWorktrees = undefined;
+                }
+                if (!gitWorktrees) {
+                    throw providerError('WORKTREE_STATE_CONFLICT', 'Git worktree repository cannot be inspected; cannot unarchive', {
+                        workspaceId: input.workspaceId,
+                        worktreeId: input.worktreeId,
+                    });
+                }
+                let foundInGit = false;
+                for (const gw of gitWorktrees) {
+                    if (path.resolve(gw.absolutePath) === path.resolve(record.absolutePath) ||
+                        (await samePhysicalPath(gw.absolutePath, record.absolutePath))) {
+                        foundInGit = true;
+                        break;
+                    }
+                }
+                if (!foundInGit) {
+                    throw providerError('WORKTREE_STATE_CONFLICT', 'Worktree directory or Git registration is missing; cannot unarchive', {
+                        workspaceId: input.workspaceId,
+                        worktreeId: input.worktreeId,
+                    });
+                }
+            }
+            const next = unarchiveWorktreeSnapshot(snapshot, input.worktreeId);
+            return { result: undefined, snapshot: next, changed: true };
+        });
+    }
+    catch (error) {
+        throw asSidecarError(error, input.workspaceId);
+    }
+}
+/**
+ * Clean Worktree from disk: performs real git worktree removal with journal protection,
+ * marks record diskCleanup: 'completed', and detaches bindings.
+ */
+export async function cleanWorktree(context, input) {
+    const workspace = await requireWorkspace(context, input.workspaceId);
+    if (!context.sidecar.runExclusive) {
+        throw providerError('WORKTREE_RECOVERY_REQUIRED', 'Clean requires transactional sidecar lock', {
+            workspaceId: input.workspaceId,
+            worktreeId: input.worktreeId,
+        });
+    }
+    await context.transaction.clean({
+        workspaceId: input.workspaceId,
+        workspaceRoot: workspace.rootPath,
+        worktreeId: input.worktreeId,
+        mutationToken: input.mutationToken,
+    });
+}
+/**
+ * Forget Worktree: removes the record and all its Session bindings completely from sidecar.
+ */
+export async function forgetWorktree(context, input) {
+    await requireWorkspace(context, input.workspaceId);
+    try {
+        await context.sidecar.mutate(input.workspaceId, (snapshot) => {
+            const record = snapshot.worktrees.find((w) => w.worktreeId === input.worktreeId);
+            if (!record) {
+                return { result: undefined, snapshot, changed: false };
+            }
+            if (record.status !== 'removed') {
+                throw providerError('WORKTREE_STATE_CONFLICT', 'Worktree must be archived before it can be removed from management', {
+                    workspaceId: input.workspaceId,
+                    worktreeId: input.worktreeId,
+                });
+            }
+            assertMutationToken(snapshot, record, input.mutationToken);
+            const next = forgetWorktreeSnapshot(snapshot, input.worktreeId);
+            return { result: undefined, snapshot: next, changed: true };
+        });
+    }
+    catch (error) {
+        throw asSidecarError(error, input.workspaceId);
+    }
+}
+//# sourceMappingURL=manager-worktree-lifecycle.js.map

package/lib/manage/manager-worktree-lifecycle.js.map

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

package/lib/manage/manager-worktrees.d.ts

@@ -23,12 +23,7 @@ export declare function importWorktree(context: WorktreeManagerContext, input: {
     readonly workspaceId: WorkspaceId;
     readonly absolutePath: string;
 }): Promise<WorktreeRecord>;
-/** Remove Git state first, then mark the relation removed while preserving detached bindings. */
-export declare function removeWorktree(context: WorktreeManagerContext, input: {
-    readonly workspaceId: WorkspaceId;
-    readonly worktreeId: string;
-    readonly mutationToken: string;
-}): Promise<void>;
+export { archiveWorktree as removeWorktree, unarchiveWorktree, cleanWorktree, forgetWorktree, } from './manager-worktree-lifecycle.js';
 /** Reconcile one Workspace's durable Git/sidecar operation marker. */
 export declare function recoverWorktrees(context: WorktreeManagerContext, input: {
     readonly workspaceId: WorkspaceId;

package/lib/manage/manager-worktrees.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manager-worktrees.d.ts","sourceRoot":"","sources":["../../src/manage/manager-worktrees.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,YAAY,EACZ,UAAU,EACV,uBAAuB,EACvB,cAAc,EACd,WAAW,EACZ,MAAM,sBAAsB,CAAC;AAG9B,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AA6CnE,+EAA+E;AAC/E,wBAAsB,aAAa,CACjC,OAAO,EAAE,sBAAsB,EAC/B,KAAK,EAAE;IAAE,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAA;CAAE,GAC3C,OAAO,CAAC,SAAS,cAAc,EAAE,CAAC,CAmDpC;AAED,gGAAgG;AAChG,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,sBAAsB,EAC/B,KAAK,EAAE;IAAE,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAA;CAAE,GAC3C,OAAO,CAAC,SAAS,uBAAuB,EAAE,CAAC,CAyB7C;AAED,wFAAwF;AACxF,wBAAsB,YAAY,CAChC,OAAO,EAAE,sBAAsB,EAC/B,KAAK,EAAE;IAAE,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAA;CAAE,GAC3C,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC,CAqClC;AAED,qFAAqF;AACrF,wBAAsB,cAAc,CAClC,OAAO,EAAE,sBAAsB,EAC/B,KAAK,EAAE;IAAE,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GACjG,OAAO,CAAC,cAAc,CAAC,CAuJzB;AAED,8FAA8F;AAC9F,wBAAsB,cAAc,CAClC,OAAO,EAAE,sBAAsB,EAC/B,KAAK,EAAE;IAAE,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;CAAE,GAC1E,OAAO,CAAC,cAAc,CAAC,CA8EzB;AAoCD,iGAAiG;AACjG,wBAAsB,cAAc,CAClC,OAAO,EAAE,sBAAsB,EAC/B,KAAK,EAAE;IAAE,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAA;CAAE,GACxG,OAAO,CAAC,IAAI,CAAC,CAiFf;AAED,sEAAsE;AACtE,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,sBAAsB,EAC/B,KAAK,EAAE;IAAE,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAA;CAAE,GAC3C,OAAO,CAAC,IAAI,CAAC,CAMf;AAED,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,sBAAsB,EAC/B,KAAK,EAAE;IAAE,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,UAAU,CAAA;CAAE,GACpH,OAAO,CAAC,SAAS,UAAU,EAAE,CAAC,CAWhC"}
+{"version":3,"file":"manager-worktrees.d.ts","sourceRoot":"","sources":["../../src/manage/manager-worktrees.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,YAAY,EAEZ,UAAU,EACV,uBAAuB,EACvB,cAAc,EACd,WAAW,EACZ,MAAM,sBAAsB,CAAC;AAG9B,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAkCnE,+EAA+E;AAC/E,wBAAsB,aAAa,CACjC,OAAO,EAAE,sBAAsB,EAC/B,KAAK,EAAE;IAAE,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAA;CAAE,GAC3C,OAAO,CAAC,SAAS,cAAc,EAAE,CAAC,CAyFpC;AAED,gGAAgG;AAChG,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,sBAAsB,EAC/B,KAAK,EAAE;IAAE,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAA;CAAE,GAC3C,OAAO,CAAC,SAAS,uBAAuB,EAAE,CAAC,CA0B7C;AAED,wFAAwF;AACxF,wBAAsB,YAAY,CAChC,OAAO,EAAE,sBAAsB,EAC/B,KAAK,EAAE;IAAE,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAA;CAAE,GAC3C,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC,CAqClC;AAED,qFAAqF;AACrF,wBAAsB,cAAc,CAClC,OAAO,EAAE,sBAAsB,EAC/B,KAAK,EAAE;IAAE,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GACjG,OAAO,CAAC,cAAc,CAAC,CAazB;AAmKD,8FAA8F;AAC9F,wBAAsB,cAAc,CAClC,OAAO,EAAE,sBAAsB,EAC/B,KAAK,EAAE;IAAE,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;CAAE,GAC1E,OAAO,CAAC,cAAc,CAAC,CA+EzB;AAoCD,OAAO,EACL,eAAe,IAAI,cAAc,EACjC,iBAAiB,EACjB,aAAa,EACb,cAAc,GACf,MAAM,iCAAiC,CAAC;AAEzC,sEAAsE;AACtE,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,sBAAsB,EAC/B,KAAK,EAAE;IAAE,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAA;CAAE,GAC3C,OAAO,CAAC,IAAI,CAAC,CAMf;AAED,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,sBAAsB,EAC/B,KAAK,EAAE;IAAE,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,UAAU,CAAA;CAAE,GACpH,OAAO,CAAC,SAAS,UAAU,EAAE,CAAC,CAWhC"}

package/lib/manage/manager-worktrees.js

@@ -1,28 +1,22 @@
 import path from 'node:path';
+import { assertGeneratedNameAvailable, GeneratedWorktreeNameCollision } from '../provider/generated-name.js';
+import { readWorktreeStatus } from '../provider/git/worktree-status.js';
 import { createWorktreeMutationToken } from '../provider/mutation-token.js';
 import { providerError } from '../provider/types.js';
-import { asGitError, asSidecarError, canonicalPath, describeError, generatedId, isDirectory, pathExists, requireWorkspace, samePhysicalPath, validateGeneratedPath, validatePhysicalGeneratedPath, } from './manager-support.js';
-function projectRuntimeRecord(snapshot, record, health) {
-    const { health: _health, mutationToken: _mutationToken, ...durableRecord } = record;
+import { asGitError, asSidecarError, canonicalPath, describeError, generatedId, isDirectory, requireWorkspace, samePhysicalPath, validateGeneratedPath, validatePhysicalGeneratedPath, } from './manager-support.js';
+function projectRuntimeRecord(snapshot, record, health, activity) {
+    const { health: _health, mutationToken: _mutationToken, activity: _activity, currentBranch: _currentBranch, ...durableRecord } = record;
     void _health;
     void _mutationToken;
-    if (record.status !== 'active')
-        return durableRecord;
+    void _activity;
+    void _currentBranch;
     return {
         ...durableRecord,
         mutationToken: createWorktreeMutationToken(snapshot, record),
         ...(health === undefined ? {} : { health }),
+        ...(activity === undefined ? {} : { activity }),
     };
 }
-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,
-        });
-    }
-}
 /** Return the sidecar Worktree projection with runtime Git health attached. */
 export async function listWorktrees(context, input) {
     const workspace = await requireWorkspace(context, input.workspaceId);
@@ -35,6 +29,23 @@ export async function listWorktrees(context, input) {
             ...(snapshot.pendingOperation ? { operationId: snapshot.pendingOperation.id } : {}),
         });
     }
+    const getActivity = async (record) => {
+        const ids = [
+            ...new Set(snapshot.bindings
+                .filter((b) => b.worktreeId === record.worktreeId)
+                .map((b) => b.sessionId)),
+        ];
+        if (ids.length === 0)
+            return { state: 'idle' };
+        if (!context.dsh.readWorktreeActivity)
+            return { state: 'unknown' };
+        try {
+            return await context.dsh.readWorktreeActivity(ids);
+        }
+        catch {
+            return { state: 'unknown' };
+        }
+    };
     let gitWorktrees;
     try {
         const gitRoot = context.git.resolveRepositoryRoot
@@ -43,26 +54,37 @@ export async function listWorktrees(context, input) {
         gitWorktrees = await context.git.listWorktrees(gitRoot);
     }
     catch {
-        return records.map((record) => projectRuntimeRecord(snapshot, record, record.status === 'active'
-            ? recoveryNeeded ? 'recovery-needed' : 'repair'
-            : undefined));
+        gitWorktrees = undefined;
     }
     const nextRecords = [];
     for (const record of records) {
-        if (record.status !== 'active') {
-            nextRecords.push(projectRuntimeRecord(snapshot, record));
+        const activity = await getActivity(record);
+        const recordRecoveryNeeded = (snapshot.pendingOperation !== undefined &&
+            (snapshot.pendingOperation.worktreeId === undefined ||
+                snapshot.pendingOperation.worktreeId === record.worktreeId)) ||
+            snapshot.recoveryIssues?.some((issue) => issue.worktreeId === undefined || issue.worktreeId === record.worktreeId) === true;
+        if (record.diskCleanup === 'completed') {
+            nextRecords.push(projectRuntimeRecord(snapshot, record, recordRecoveryNeeded ? 'recovery-needed' : 'cleaned', activity));
+            continue;
+        }
+        if (gitWorktrees === undefined) {
+            nextRecords.push(projectRuntimeRecord(snapshot, record, recordRecoveryNeeded ? 'recovery-needed' : 'repair', activity));
             continue;
         }
         let ready = false;
+        let currentBranch;
         for (const gitWorktree of gitWorktrees) {
             if (path.resolve(gitWorktree.absolutePath) === path.resolve(record.absolutePath) ||
                 (await samePhysicalPath(gitWorktree.absolutePath, record.absolutePath))) {
-                ready = true;
+                const status = await readWorktreeStatus(gitWorktree);
+                ready = status === 'ready' || status === 'detached';
+                currentBranch = gitWorktree.detached ? null : gitWorktree.branch;
                 break;
             }
         }
         nextRecords.push({
-            ...projectRuntimeRecord(snapshot, record, recoveryNeeded ? 'recovery-needed' : ready ? 'ready' : 'repair'),
+            ...projectRuntimeRecord(snapshot, record, recordRecoveryNeeded ? 'recovery-needed' : ready ? currentBranch === undefined || currentBranch === record.branch ? 'ready' : 'branch-drift' : 'repair', activity),
+            ...(currentBranch === undefined ? {} : { currentBranch }),
         });
     }
     return nextRecords;
@@ -82,6 +104,8 @@ export async function listImportCandidates(context, input) {
     for (const worktree of gitWorktrees) {
         if (!worktree.branch || await samePhysicalPath(worktree.absolutePath, gitRoot))
             continue;
+        if (await readWorktreeStatus(worktree) !== 'ready')
+            continue;
         let managed = false;
         for (const record of snapshot.worktrees) {
             if (await samePhysicalPath(worktree.absolutePath, record.absolutePath)) {
@@ -135,6 +159,23 @@ export async function listBranches(context, input) {
 }
 /** Create a Git Worktree first, then commit its external relation to the sidecar. */
 export async function createWorktree(context, input) {
+    let baseId = '';
+    for (let attempt = 0n;; attempt++) {
+        context.signal.throwIfAborted();
+        // Reroll first, then make progress even if an injected random source repeats forever.
+        if (attempt < 8n)
+            baseId = generatedId(context.idFactory);
+        const worktreeId = attempt < 8n ? baseId : `${baseId}_${attempt - 7n}`;
+        try {
+            return await createWorktreeAttempt(context, input, worktreeId);
+        }
+        catch (error) {
+            if (!(error instanceof GeneratedWorktreeNameCollision))
+                throw error;
+        }
+    }
+}
+async function createWorktreeAttempt(context, input, worktreeId) {
     const workspace = await requireWorkspace(context, input.workspaceId);
     const transactional = context.sidecar.runExclusive !== undefined;
     if (!transactional)
@@ -189,19 +230,11 @@ export async function createWorktree(context, input) {
             });
         }
     }
-    const worktreeId = generatedId(context.idFactory);
     const targetPath = path.resolve(context.dshHome, 'clutch-dsh-worktree', 'worktree', worktreeId);
     // 创建前同时检查词法和物理目录边界，阻止配置、ID 或 symlink 将目标引回 Workspace 或带出插件根目录。
     // Check lexical and physical directory boundaries before creation so configuration, IDs, or symlinks cannot redirect the target into the Workspace or outside the plugin root.
     validateGeneratedPath(context, workspace.rootPath, targetPath, worktreeId);
     await validatePhysicalGeneratedPath(context, workspace.rootPath, targetPath);
-    if (await pathExists(targetPath)) {
-        throw providerError('GIT_OPERATION_FAILED', `Generated Worktree path already exists: ${targetPath}`, {
-            workspaceRoot: workspace.rootPath,
-            targetPath,
-            worktreeId,
-        });
-    }
     // The default Workspace-sharded sidecar exposes the transaction seam. Legacy
     // injected stores keep the previous path below for compatibility with older
     // Host compositions and failure-injection tests.
@@ -216,6 +249,7 @@ export async function createWorktree(context, input) {
             targetBranch,
         });
     }
+    await assertGeneratedNameAvailable(worktreeId, targetPath, await context.sidecar.read(input.workspaceId), await context.git.listWorktrees(workspace.rootPath));
     // Git is the first external side effect; the sidecar mutation below is the relation commit point.
     try {
         await context.git.createWorktree(workspace.rootPath, targetPath, baseBranch, newBranch);
@@ -232,7 +266,7 @@ export async function createWorktree(context, input) {
         status: 'active',
     };
     try {
-        return await context.sidecar.mutate(input.workspaceId, (snapshot) => {
+        return await context.sidecar.mutate(input.workspaceId, async (snapshot) => {
             // Recheck ID and branch inside the serialized mutation so concurrent writes cannot create duplicate active records.
             const idConflict = snapshot.worktrees.find((worktree) => worktree.worktreeId === worktreeId);
             if (idConflict) {
@@ -241,12 +275,17 @@ export async function createWorktree(context, input) {
                     existingStatus: idConflict.status,
                 });
             }
-            const branchConflict = snapshot.worktrees.find((worktree) => worktree.status === 'active' && worktree.branch === targetBranch);
-            if (branchConflict) {
-                throw providerError('WORKTREE_BRANCH_CONFLICT', `Branch is already recorded as active: ${targetBranch}`, {
-                    branch: targetBranch,
-                    worktreeId: branchConflict.worktreeId,
-                });
+            const branchClaims = snapshot.worktrees.filter((worktree) => worktree.status === 'active' && worktree.branch === targetBranch);
+            if (branchClaims.length > 0) {
+                const live = await context.git.listWorktrees(workspace.rootPath);
+                for (const claim of branchClaims) {
+                    const actual = await findGitWorktreeByPhysicalPath(live, claim.absolutePath);
+                    if (!actual || (!actual.detached && (!actual.branch || actual.branch === targetBranch))) {
+                        throw providerError('WORKTREE_BRANCH_CONFLICT', `Branch is already recorded as active: ${targetBranch}`, {
+                            branch: targetBranch, worktreeId: claim.worktreeId,
+                        });
+                    }
+                }
             }
             const next = {
                 ...snapshot,
@@ -300,7 +339,7 @@ export async function importWorktree(context, input) {
     await context.git.validateRepository(workspace.rootPath);
     const gitWorktrees = await context.git.listWorktrees(workspace.rootPath);
     const gitWorktree = await findGitWorktreeByPhysicalPath(gitWorktrees, requestedPath);
-    if (!gitWorktree || !gitWorktree.branch || await samePhysicalPath(gitWorktree.absolutePath, workspace.rootPath)) {
+    if (!gitWorktree || !gitWorktree.branch || await readWorktreeStatus(gitWorktree) !== 'ready' || await samePhysicalPath(gitWorktree.absolutePath, workspace.rootPath)) {
         throw providerError('WORKTREE_IMPORT_INVALID', `Path is not an importable Worktree: ${requestedPath}`, {
             workspaceId: input.workspaceId,
             absolutePath: requestedPath,
@@ -318,6 +357,7 @@ export async function importWorktree(context, input) {
             const liveWorktree = await findGitWorktreeByPhysicalPath(await context.git.listWorktrees(workspace.rootPath), normalizedPath);
             if (!liveWorktree ||
                 !liveWorktree.branch ||
+                await readWorktreeStatus(liveWorktree) !== 'ready' ||
                 await samePhysicalPath(liveWorktree.absolutePath, workspace.rootPath)) {
                 throw providerError('WORKTREE_IMPORT_INVALID', `Path is not an importable Worktree: ${normalizedPath}`, {
                     workspaceId: input.workspaceId,
@@ -371,81 +411,7 @@ function importConflictOrExisting(existing, workspaceId, absolutePath) {
         status: existing.status,
     });
 }
-/** Remove Git state first, then mark the relation removed while preserving detached bindings. */
-export async function removeWorktree(context, input) {
-    const workspace = await requireWorkspace(context, input.workspaceId);
-    if (context.sidecar.runExclusive) {
-        await context.transaction.remove({
-            workspaceId: input.workspaceId,
-            workspaceRoot: workspace.rootPath,
-            worktreeId: input.worktreeId,
-            mutationToken: input.mutationToken,
-        });
-        return;
-    }
-    let gitRemoved = false;
-    try {
-        await context.sidecar.mutate(input.workspaceId, async (snapshot) => {
-            const record = snapshot.worktrees.find((worktree) => worktree.worktreeId === input.worktreeId);
-            if (!record) {
-                throw providerError('WORKTREE_NOT_FOUND', `Worktree not found: ${input.worktreeId}`, {
-                    worktreeId: input.worktreeId,
-                    workspaceId: input.workspaceId,
-                });
-            }
-            if (record.status === 'removed') {
-                throw providerError('WORKTREE_REMOVED', `Worktree has already been removed: ${input.worktreeId}`, {
-                    worktreeId: input.worktreeId,
-                });
-            }
-            assertMutationToken(snapshot, record, input.mutationToken);
-            try {
-                await context.git.removeWorktree(workspace.rootPath, record.absolutePath);
-            }
-            catch (error) {
-                let stillRegistered;
-                try {
-                    stillRegistered = false;
-                    for (const worktree of await context.git.listWorktrees(workspace.rootPath)) {
-                        if (await samePhysicalPath(worktree.absolutePath, record.absolutePath)) {
-                            stillRegistered = true;
-                            break;
-                        }
-                    }
-                }
-                catch {
-                    throw asGitError('remove worktree', workspace.rootPath, record.absolutePath, error);
-                }
-                if (stillRegistered) {
-                    throw asGitError('remove worktree', workspace.rootPath, record.absolutePath, error);
-                }
-            }
-            gitRemoved = true;
-            // Preserve Worktree and binding history while changing lifecycle only; DSH Sessions are never read or deleted here.
-            const next = {
-                ...snapshot,
-                worktrees: snapshot.worktrees.map((candidate) => candidate.worktreeId === record.worktreeId ? { ...candidate, status: 'removed' } : candidate),
-                bindings: snapshot.bindings.map((binding) => binding.worktreeId === record.worktreeId && binding.status === 'active'
-                    ? { ...binding, status: 'detached' }
-                    : binding),
-            };
-            return { result: undefined, snapshot: next };
-        });
-    }
-    catch (error) {
-        if (gitRemoved) {
-            // Git removal cannot be rolled back here, so expose the divergence for a safe retry.
-            const sidecarError = asSidecarError(error, input.workspaceId);
-            throw providerError('SIDECAR_SYNC_REQUIRED', `Git removed Worktree ${input.worktreeId}, but sidecar synchronization failed`, {
-                workspaceId: input.workspaceId,
-                worktreeId: input.worktreeId,
-                workspaceRoot: workspace.rootPath,
-                sidecarError: sidecarError.message,
-            });
-        }
-        throw error;
-    }
-}
+export { archiveWorktree as removeWorktree, unarchiveWorktree, cleanWorktree, forgetWorktree, } from './manager-worktree-lifecycle.js';
 /** Reconcile one Workspace's durable Git/sidecar operation marker. */
 export async function recoverWorktrees(context, input) {
     const workspace = await requireWorkspace(context, input.workspaceId);