@cerbur/clutch-dsh-worktree 0.1.8 → 0.1.9

package/lib/client/virtual-workspace-membership.js

@@ -8,76 +8,97 @@ function normalizeBindings(bindings) {
     }
     return [...bySession.values()];
 }
-function sameWorkspaceItems(left, right) {
-    if (left.items.length !== right.items.length)
-        return false;
-    return left.items.every((item, index) => {
-        const other = right.items[index];
-        if (item === other)
-            return true;
-        if (typeof item !== 'object' ||
-            item === null ||
-            typeof other !== 'object' ||
-            other === null ||
-            !('workspaceId' in item) ||
-            !('workspaceId' in other) ||
-            !('sessionIds' in item) ||
-            !('sessionIds' in other)) {
-            return false;
-        }
-        const leftSessionIds = item.sessionIds;
-        const rightSessionIds = other.sessionIds;
-        return (item.workspaceId === other.workspaceId &&
-            Array.isArray(leftSessionIds) &&
-            Array.isArray(rightSessionIds) &&
-            leftSessionIds.length === rightSessionIds.length &&
-            leftSessionIds.every((sessionId, sessionIndex) => sessionId === rightSessionIds[sessionIndex]));
+function sameBindings(left, right) {
+    return left.length === right.length && left.every((binding, index) => {
+        const other = right[index];
+        return binding.workspaceId === other.workspaceId && binding.sessionId === other.sessionId;
     });
 }
 /**
- * Maintains a re-playable in-memory overlay over DSH's Workspace list. Native
- * refreshes are observed and the current sidecar bindings are applied again;
- * no DSH Host mutation or persistence is involved.
+ * Decorate DSH's read-only WorkspaceSource with a browser-local membership
+ * projection. The source's native model is never written: the wrapper keeps
+ * the current sidecar bindings in memory, reprojects every native snapshot,
+ * and publishes only the projected view to subscribers.
  */
 export function createVirtualWorkspaceMembership(list) {
+    if (!Object.isExtensible(list)) {
+        throw new Error('Workspace membership projection requires an extensible WorkspaceSource');
+    }
+    const nativeGetSnapshot = list.getSnapshot.bind(list);
+    const nativeSubscribe = list.subscribe.bind(list);
+    const originalGetSnapshot = Object.getOwnPropertyDescriptor(list, 'getSnapshot');
+    const originalSubscribe = Object.getOwnPropertyDescriptor(list, 'subscribe');
+    const listeners = new Set();
     let bindings = [];
+    let nativeSnapshot = nativeGetSnapshot();
+    let projectedSnapshot = projectVirtualWorkspaceMembership(nativeSnapshot, [], bindings);
     let disposed = false;
-    let applying = false;
-    const nativeSet = list.set;
-    const write = (next) => {
-        applying = true;
-        try {
-            nativeSet(next);
-        }
-        finally {
-            applying = false;
-        }
-    };
-    // The current upstream DSH publishes Workspace baselines through `set()`. Decorate that
-    // browser-local write seam so native subscribers receive the projection in
-    // the same notification instead of observing a raw snapshot first.
-    list.set = (next) => {
-        write(projectVirtualWorkspaceMembership(next, bindings, bindings));
+    const project = (nextNativeSnapshot, previousBindings, nextBindings) => projectVirtualWorkspaceMembership(nextNativeSnapshot, previousBindings, nextBindings);
+    const refreshSnapshot = () => {
+        const nextNativeSnapshot = nativeGetSnapshot();
+        if (nextNativeSnapshot === nativeSnapshot)
+            return false;
+        nativeSnapshot = nextNativeSnapshot;
+        const nextProjectedSnapshot = project(nextNativeSnapshot, bindings, bindings);
+        const changed = nextProjectedSnapshot !== projectedSnapshot;
+        projectedSnapshot = nextProjectedSnapshot;
+        return changed;
     };
-    const apply = (nextBindings) => {
-        const current = list.getSnapshot();
-        const next = projectVirtualWorkspaceMembership(current, bindings, nextBindings);
-        if (sameWorkspaceItems(current, next))
+    const notify = () => {
+        if (disposed)
             return;
-        write(next);
-    };
-    const replay = () => {
-        if (disposed || applying)
+        if (!refreshSnapshot())
             return;
-        apply(bindings);
+        for (const listener of [...listeners])
+            listener();
+    };
+    const getSnapshot = () => {
+        if (disposed)
+            return nativeGetSnapshot();
+        refreshSnapshot();
+        return projectedSnapshot;
+    };
+    const subscribe = (listener) => {
+        if (disposed)
+            return () => undefined;
+        listeners.add(listener);
+        return () => listeners.delete(listener);
     };
-    const unsubscribe = list.subscribe(replay);
+    Object.defineProperty(list, 'getSnapshot', {
+        configurable: true,
+        enumerable: false,
+        writable: true,
+        value: getSnapshot,
+    });
+    Object.defineProperty(list, 'subscribe', {
+        configurable: true,
+        enumerable: false,
+        writable: true,
+        value: subscribe,
+    });
+    const unsubscribeNative = nativeSubscribe(notify);
     const sync = (nextBindings) => {
         if (disposed)
             return;
         const normalized = normalizeBindings(nextBindings);
-        apply(normalized);
+        if (sameBindings(bindings, normalized))
+            return;
+        const previousBindings = bindings;
         bindings = normalized;
+        nativeSnapshot = nativeGetSnapshot();
+        const previousProjectedSnapshot = projectedSnapshot;
+        projectedSnapshot = project(nativeSnapshot, previousBindings, bindings);
+        if (projectedSnapshot === previousProjectedSnapshot)
+            return;
+        for (const listener of [...listeners])
+            listener();
+    };
+    const restoreMethod = (name, descriptor) => {
+        if (descriptor === undefined) {
+            delete list[name];
+            return;
+        }
+        Object.defineProperty(list, name, descriptor);
     };
     return {
         ensure(binding) {
@@ -95,11 +116,15 @@ export function createVirtualWorkspaceMembership(list) {
         dispose() {
             if (disposed)
                 return;
-            apply([]);
             bindings = [];
+            projectedSnapshot = nativeGetSnapshot();
             disposed = true;
-            unsubscribe();
-            list.set = nativeSet;
+            for (const listener of [...listeners])
+                listener();
+            unsubscribeNative();
+            listeners.clear();
+            restoreMethod('getSnapshot', originalGetSnapshot);
+            restoreMethod('subscribe', originalSubscribe);
         },
     };
 }

package/lib/client/virtual-workspace-membership.js.map

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

package/lib/client/worktree-context-store.d.ts

@@ -1,18 +1,10 @@
-import type { ObservableSnapshot, SnapshotStore } from '@deepseek-ai/dsh-client-runtime/client';
-import type { WorktreeManager } from '../contract/index.js';
+import type { ObservableSnapshot, SnapshotStore } from '@deepseek-ai/dsh-client-store';
+import type { SessionListState } from '@deepseek-ai/dsh-api-session-controller/client';
+import type { WorkspaceSnapshot as DshWorkspaceSnapshot } from '@deepseek-ai/dsh-api-workspace-controller/client';
 import { type WorktreeSessionContext } from './worktree-context.js';
-import { type WorktreeViewError } from './worktree-view.js';
-interface SessionSnapshot {
-    readonly current?: string;
-}
-interface WorkspaceSnapshot {
-    readonly items: readonly {
-        readonly workspaceId: string;
-        readonly title: string;
-        readonly sessionIds: readonly string[];
-    }[];
-    readonly recentWorkspaceId?: string;
-}
+import { type WorktreeViewReader, type WorktreeViewError } from './worktree-view.js';
+type SessionSnapshot = Pick<SessionListState, 'current' | 'byId'>;
+type WorkspaceSnapshot = Pick<DshWorkspaceSnapshot, 'items' | 'archivedSessionIds' | 'state' | 'phase' | 'error'>;
 export interface WorktreeContextState {
     readonly status: 'idle' | 'loading' | 'ready' | 'error';
     readonly sessionId?: string;
@@ -32,7 +24,7 @@ export type WorktreeContextStoreFactory = <State>(initial: State) => SnapshotSto
 export interface WorktreeContextProjectionInput {
     readonly sessions: ObservableSnapshot<SessionSnapshot>;
     readonly workspaces: ObservableSnapshot<WorkspaceSnapshot>;
-    readonly manager: WorktreeManager;
+    readonly viewReader: WorktreeViewReader;
     readonly storeFactory: WorktreeContextStoreFactory;
 }
 /**

package/lib/client/worktree-context-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worktree-context-store.d.ts","sourceRoot":"","sources":["../../src/client/worktree-context-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,aAAa,EACd,MAAM,wCAAwC,CAAC;AAEhD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAEL,KAAK,sBAAsB,EAC5B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,oBAAoB,CAAC;AAE5B,UAAU,eAAe;IACvB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,UAAU,iBAAiB;IACzB,QAAQ,CAAC,KAAK,EAAE,SAAS;QACvB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;QAC7B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;KACxC,EAAE,CAAC;IACJ,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;CACrC;AAYD,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,OAAO,CAAC;IACxD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,KAAK,EAAE,sBAAsB,CAAC;IACvC,QAAQ,CAAC,KAAK,CAAC,EAAE,iBAAiB,CAAC;CACpC;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,oBAAoB,CAAC,CAAC;IACpD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,UAAU,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,OAAO,IAAI,IAAI,CAAC;CACjB;AAED,8EAA8E;AAC9E,MAAM,MAAM,2BAA2B,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,KAAK,aAAa,CAAC,KAAK,CAAC,CAAC;AAE1F,MAAM,WAAW,8BAA8B;IAC7C,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,CAAC,eAAe,CAAC,CAAC;IACvD,QAAQ,CAAC,UAAU,EAAE,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;IAC3D,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAClC,QAAQ,CAAC,YAAY,EAAE,2BAA2B,CAAC;CACpD;AA+BD;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,KAAK,EAAE,8BAA8B,GACpC,yBAAyB,CAsO3B"}
+{"version":3,"file":"worktree-context-store.d.ts","sourceRoot":"","sources":["../../src/client/worktree-context-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,aAAa,EACd,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AACvF,OAAO,KAAK,EAAE,iBAAiB,IAAI,oBAAoB,EAAE,MAAM,kDAAkD,CAAC;AAElH,OAAO,EAEL,KAAK,sBAAsB,EAC5B,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,KAAK,kBAAkB,EAGvB,KAAK,iBAAiB,EACvB,MAAM,oBAAoB,CAAC;AAE5B,KAAK,eAAe,GAAG,IAAI,CAAC,gBAAgB,EAAE,SAAS,GAAG,MAAM,CAAC,CAAC;AAElE,KAAK,iBAAiB,GAAG,IAAI,CAC3B,oBAAoB,EACpB,OAAO,GAAG,oBAAoB,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,CAC7D,CAAC;AAYF,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,OAAO,CAAC;IACxD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,KAAK,EAAE,sBAAsB,CAAC;IACvC,QAAQ,CAAC,KAAK,CAAC,EAAE,iBAAiB,CAAC;CACpC;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,oBAAoB,CAAC,CAAC;IACpD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,UAAU,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,OAAO,IAAI,IAAI,CAAC;CACjB;AAED,8EAA8E;AAC9E,MAAM,MAAM,2BAA2B,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,KAAK,aAAa,CAAC,KAAK,CAAC,CAAC;AAE1F,MAAM,WAAW,8BAA8B;IAC7C,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,CAAC,eAAe,CAAC,CAAC;IACvD,QAAQ,CAAC,UAAU,EAAE,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;IAC3D,QAAQ,CAAC,UAAU,EAAE,kBAAkB,CAAC;IACxC,QAAQ,CAAC,YAAY,EAAE,2BAA2B,CAAC;CACpD;AAsCD;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,KAAK,EAAE,8BAA8B,GACpC,yBAAyB,CAuO3B"}

package/lib/client/worktree-context-store.js

@@ -1,5 +1,6 @@
 import { resolveWorktreeSessionContext, } from './worktree-context.js';
-import { loadWorktreeView, toWorktreeViewError, } from './worktree-view.js';
+import { deriveRecentWorkspaceId } from './view-mode.js';
+import { toWorktreeViewError, } from './worktree-view.js';
 const notReady = () => ({ kind: 'none', reason: 'not-ready' });
 function scheduledRefresh() {
     let resolve;
@@ -9,11 +10,15 @@ function scheduledRefresh() {
     return { promise, resolve };
 }
 function identityFrom(sessions, workspaces) {
-    const sessionId = sessions.getSnapshot().current;
+    const sessionSnapshot = sessions.getSnapshot();
+    const workspaceSnapshot = workspaces.getSnapshot();
+    const sessionId = sessionSnapshot.current;
     if (sessionId === undefined) {
-        return { workspaceId: workspaces.getSnapshot().recentWorkspaceId };
+        return {
+            workspaceId: deriveRecentWorkspaceId({ items: workspaceSnapshot.items }, sessionSnapshot.byId),
+        };
     }
-    const workspace = workspaces.getSnapshot().items.find((candidate) => candidate.sessionIds.includes(sessionId));
+    const workspace = workspaceSnapshot.items.find((candidate) => candidate.sessionIds.includes(sessionId));
     return { sessionId, workspaceId: workspace?.workspaceId };
 }
 /**
@@ -32,7 +37,6 @@ export function createWorktreeContextProjection(input) {
     let scheduleTicket = 0;
     let scheduledCompletion;
     let latestRefresh = Promise.resolve();
-    const viewCache = new Map();
     let lastObservedIdentity;
     const sameIdentity = (left, right) => left?.sessionId === right.sessionId
         && left?.workspaceId === right.workspaceId;
@@ -72,14 +76,18 @@ export function createWorktreeContextProjection(input) {
             });
             return;
         }
-        const cachedView = viewCache.get(identity.workspaceId);
-        if (cachedView !== undefined) {
+        const current = store.getSnapshot();
+        if (current.status === 'ready' && current.workspaceId !== identity.workspaceId) {
+            // Keep the last valid context visible until the new Workspace facts arrive.
+            return;
+        }
+        if (current.status === 'ready' && current.workspaceId === identity.workspaceId) {
             store.set({
                 status: 'ready',
                 ...(identity.sessionId === undefined ? {} : { sessionId: identity.sessionId }),
                 workspaceId: identity.workspaceId,
                 workspaceTitle: workspaceTitleFor(identity.workspaceId),
-                value: valueFrom(identity, cachedView),
+                value: current.value,
             });
             return;
         }
@@ -111,7 +119,7 @@ export function createWorktreeContextProjection(input) {
             workspaceId: identity.workspaceId,
         };
         try {
-            const data = await loadWorktreeView(input.manager, request.workspaceId);
+            const data = await input.viewReader.read(request.workspaceId);
             if (!matchesCurrent(request, requestGeneration))
                 return;
             const workspace = input.workspaces.getSnapshot().items.find((candidate) => candidate.workspaceId === request.workspaceId);
@@ -126,9 +134,6 @@ export function createWorktreeContextProjection(input) {
                 });
                 return;
             }
-            if (data.readiness.status === 'ready') {
-                viewCache.set(request.workspaceId, data);
-            }
             store.set({
                 status: 'ready',
                 ...(request.sessionId === undefined ? {} : { sessionId: request.sessionId }),
@@ -220,6 +225,9 @@ export function createWorktreeContextProjection(input) {
             const identity = identityFrom(input.sessions, input.workspaces);
             if (workspaceId !== undefined && workspaceId !== identity.workspaceId)
                 return;
+            if (identity.workspaceId === undefined)
+                return;
+            input.viewReader.invalidate(identity.workspaceId);
             await refresh();
             await waitForLatestRefresh(workspaceId ?? identity.workspaceId);
         },
@@ -231,7 +239,6 @@ export function createWorktreeContextProjection(input) {
             cancelScheduledRefresh();
             unsubscribeSessions();
             unsubscribeWorkspaces();
-            viewCache.clear();
             store.set({ status: 'idle', value: notReady() });
         },
     };

package/lib/client/worktree-context-store.js.map

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

package/lib/client/worktree-expand-state.d.ts

@@ -1,4 +1,4 @@
-import type { createSnapshotStore as runtimeCreateSnapshotStore, SnapshotStore } from '@deepseek-ai/dsh-client-runtime/client';
+import type { createSnapshotStore as dshCreateSnapshotStore, SnapshotStore } from '@deepseek-ai/dsh-client-store';
 /** Browser-local storage identity; never sent to DSH or the plugin sidecar. */
 export declare const WORKTREE_EXPAND_STATE_STORAGE_KEY = "clutch-dsh-worktree.expand-state";
 /** Persisted structural exceptions; absent IDs are expanded. */
@@ -19,10 +19,11 @@ export interface WorktreeExpandStateStore extends SnapshotStore<WorktreeExpandSt
     readonly actions: WorktreeExpandStateActions;
 }
 /**
- * The public rc.8 SnapshotStore factory consumed by this browser-local state.
- * Task 3's client entry must pass the runtime `createSnapshotStore` here.
+ * The public rc.1 SnapshotStore factory consumed by this browser-local state.
+ * Client entry passes DSH's `createSnapshotStore` here so this state remains
+ * independent from the concrete DSH UI runtime.
  */
-export type SnapshotStoreFactory = typeof runtimeCreateSnapshotStore;
+export type SnapshotStoreFactory = typeof dshCreateSnapshotStore;
 /** Turn any persisted JSON value into the current state shape. */
 export declare function normalizeWorktreeExpandState(value: unknown): WorktreeExpandState;
 export declare function isWorkspaceExpanded(state: WorktreeExpandState, workspaceId: string): boolean;

package/lib/client/worktree-expand-state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worktree-expand-state.d.ts","sourceRoot":"","sources":["../../src/client/worktree-expand-state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,IAAI,0BAA0B,EACjD,aAAa,EACd,MAAM,wCAAwC,CAAC;AAEhD,+EAA+E;AAC/E,eAAO,MAAM,iCAAiC,qCAAqC,CAAC;AAEpF,gEAAgE;AAChE,MAAM,WAAW,mBAAmB;IAClC,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5C,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAChD,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;CAC5C;AAED,kEAAkE;AAClE,MAAM,WAAW,0BAA0B;IACzC,eAAe,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/C,UAAU,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,cAAc,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7C,MAAM,EAAE,CAAC,YAAY,EAAE,SAAS,MAAM,EAAE,EAAE,WAAW,EAAE,SAAS,MAAM,EAAE,KAAK,IAAI,CAAC;CACnF;AAED,2DAA2D;AAC3D,MAAM,WAAW,wBAAyB,SAAQ,aAAa,CAAC,mBAAmB,CAAC;IAClF,QAAQ,CAAC,OAAO,EAAE,0BAA0B,CAAC;CAC9C;AAED;;;GAGG;AACH,MAAM,MAAM,oBAAoB,GAAG,OAAO,0BAA0B,CAAC;AAqBrE,kEAAkE;AAClE,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,OAAO,GAAG,mBAAmB,CAOhF;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAE5F;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAEvF;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAE1F;AAcD,6EAA6E;AAC7E,wBAAgB,8BAA8B,CAC5C,oBAAoB,EAAE,oBAAoB,GACzC,wBAAwB,CAkC1B"}
+{"version":3,"file":"worktree-expand-state.d.ts","sourceRoot":"","sources":["../../src/client/worktree-expand-state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,IAAI,sBAAsB,EAC7C,aAAa,EACd,MAAM,+BAA+B,CAAC;AAEvC,+EAA+E;AAC/E,eAAO,MAAM,iCAAiC,qCAAqC,CAAC;AAEpF,gEAAgE;AAChE,MAAM,WAAW,mBAAmB;IAClC,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5C,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAChD,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;CAC5C;AAED,kEAAkE;AAClE,MAAM,WAAW,0BAA0B;IACzC,eAAe,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/C,UAAU,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,cAAc,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7C,MAAM,EAAE,CAAC,YAAY,EAAE,SAAS,MAAM,EAAE,EAAE,WAAW,EAAE,SAAS,MAAM,EAAE,KAAK,IAAI,CAAC;CACnF;AAED,2DAA2D;AAC3D,MAAM,WAAW,wBAAyB,SAAQ,aAAa,CAAC,mBAAmB,CAAC;IAClF,QAAQ,CAAC,OAAO,EAAE,0BAA0B,CAAC;CAC9C;AAED;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG,OAAO,sBAAsB,CAAC;AAqBjE,kEAAkE;AAClE,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,OAAO,GAAG,mBAAmB,CAOhF;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAE5F;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAEvF;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAE1F;AAcD,6EAA6E;AAC7E,wBAAgB,8BAA8B,CAC5C,oBAAoB,EAAE,oBAAoB,GACzC,wBAAwB,CAkC1B"}

package/lib/client/worktree-expand-state.js.map

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

package/lib/client/worktree-session-fork.d.ts

@@ -29,16 +29,29 @@ export interface WorktreeForkRecovery {
 export interface WorktreeForkRecoverySnapshot {
     readonly revision: number;
     readonly pending: readonly WorktreeForkRecovery[];
+    readonly affectedWorkspaceIds: readonly string[];
 }
 export interface WorktreeForkRecoveryStore {
     getSnapshot(): WorktreeForkRecoverySnapshot;
     subscribe(listener: () => void): () => void;
 }
+export type WorktreeForkBindingLookupResult = {
+    readonly status: 'found';
+    readonly binding: SessionBinding;
+} | {
+    readonly status: 'missing';
+} | {
+    readonly status: 'error';
+    readonly error: unknown;
+};
+export interface WorktreeForkBindingIndex {
+    readonly bySessionId: ReadonlyMap<string, WorktreeForkBindingLookupResult>;
+}
 export interface WorktreeForkCoordinatorOptions {
     /** The unwrapped DSH fork method. */
     readonly fork: (input: WorktreeForkInput) => Promise<string>;
-    /** Find the parent's active sidecar binding across all native Workspaces. */
-    readonly findBinding: (sessionId: string) => Promise<SessionBinding | undefined>;
+    /** Find active sidecar bindings across all native Workspaces. */
+    readonly findBindings: (sessionIds: readonly string[]) => Promise<WorktreeForkBindingIndex>;
     /** Existing Worktree sidecar mutation; it remains the only binding writer. */
     readonly bindSession: (input: {
         workspaceId: string;
@@ -52,7 +65,9 @@ export interface WorktreeForkCoordinatorOptions {
 export interface WorktreeForkCoordinator {
     readonly recovery: WorktreeForkRecoveryStore;
     fork(input: WorktreeForkInput): Promise<string>;
-    reconcile(): Promise<void>;
+    reconcile(options?: {
+        readonly force?: boolean;
+    }): Promise<void>;
     retry(key: string): Promise<boolean>;
     dispose(): void;
 }

package/lib/client/worktree-session-fork.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worktree-session-fork.d.ts","sourceRoot":"","sources":["../../src/client/worktree-session-fork.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D,0EAA0E;AAC1E,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,+DAA+D;AAC/D,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,+BAA+B;IAC9C,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC;IACrC,QAAQ,CAAC,GAAG,EAAE,SAAS,MAAM,EAAE,CAAC;IAChC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,0BAA0B,GAAG,SAAS,CAAC,CAAC,CAAC;CACjF;AAED,MAAM,WAAW,6BAA6B;IAC5C,WAAW,IAAI,+BAA+B,CAAC;CAChD;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC;IAClC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,SAAS,oBAAoB,EAAE,CAAC;CACnD;AAED,MAAM,WAAW,yBAAyB;IACxC,WAAW,IAAI,4BAA4B,CAAC;IAC5C,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC;CAC7C;AAED,MAAM,WAAW,8BAA8B;IAC7C,qCAAqC;IACrC,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7D,6EAA6E;IAC7E,QAAQ,CAAC,WAAW,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAAC;IACjF,8EAA8E;IAC9E,QAAQ,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE;QAC5B,WAAW,EAAE,MAAM,CAAC;QACpB,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;KACnB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACvB,QAAQ,CAAC,QAAQ,CAAC,EAAE,6BAA6B,CAAC;IAClD,mFAAmF;IACnF,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAC;CACtD;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,QAAQ,EAAE,yBAAyB,CAAC;IAC7C,IAAI,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAChD,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACrC,OAAO,IAAI,IAAI,CAAC;CACjB;AAUD;;;;GAIG;AACH,wBAAgB,oCAAoC,CAClD,OAAO,EAAE,8BAA8B,GACtC,uBAAuB,CAgLzB"}
+{"version":3,"file":"worktree-session-fork.d.ts","sourceRoot":"","sources":["../../src/client/worktree-session-fork.ts"],"names":[],"mappings":"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"}