@cerbur/clutch-dsh-worktree 0.1.28 → 0.1.29

package/lib/client/view/sidebar-workspace-slot.js

@@ -2,16 +2,20 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { useLayoutEffect, useRef } from 'react';
 import styles from '../worktree.css';
 /** The shell owns placement and fold state; no native DOM discovery is needed. */
-export function WorktreeWorkspaceSeat({ wide, publish }) {
+export function WorktreeWorkspaceSeat({ wide, useSectionScroller: useScroller, publish }) {
     const ref = useRef(null);
+    const useSectionScroller = useScroller ?? useLegacySectionScroller;
+    const bindScrollerRef = useSectionScroller()?.bindScrollerRef;
     useLayoutEffect(() => {
         const element = ref.current;
         if (element)
-            publish({ element, wide });
+            publish({ element, wide, bindScrollerRef: wide ? bindScrollerRef : undefined });
         return () => publish(undefined);
-    }, [wide, publish]);
-    return _jsx("div", { ref: ref, className: styles.workspaceSeat, "data-worktree-workspace-seat": true });
+    }, [wide, publish, bindScrollerRef]);
+    return _jsx("div", { ref: ref, className: styles.workspaceSeat, "data-worktree-workspace-seat": true, "data-worktree-section-scroller": bindScrollerRef !== undefined || undefined });
 }
+// rc.1 supplies the same slot without the rc.2 scrolling capability.
+function useLegacySectionScroller() { return undefined; }
 /** Shadow only the browsing region, preserving the native registration and its children. */
 export function workspaceSidebarMount(slots) {
     return (publish) => slots.inject('sidebar.workspaces', () => slots.register({

package/lib/client/view/sidebar-workspace-slot.js.map

@@ -1 +1 @@
-{"version":3,"file":"sidebar-workspace-slot.js","sourceRoot":"","sources":["../../../src/client/view/sidebar-workspace-slot.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAGhD,OAAO,MAAM,MAAM,iBAAiB,CAAC;AASrC,kFAAkF;AAClF,MAAM,UAAU,qBAAqB,CAAC,EAAE,IAAI,EAAE,OAAO,EAEpD;IACC,MAAM,GAAG,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAC;IACzC,eAAe,CAAC,GAAG,EAAE;QACnB,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAC5B,IAAI,OAAO;YAAE,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QACxC,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAClC,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IACpB,OAAO,cAAK,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,aAAa,yCAAiC,CAAC;AACzF,CAAC;AAED,4FAA4F;AAC5F,MAAM,UAAU,qBAAqB,CAAC,KAA2B;IAC/D,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,oBAAoB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC;QAC1E,IAAI,EAAE,oBAAoB;QAC1B,QAAQ,EAAE,CAAC,EAAE;QACb,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC;KAC5B,EAAE,qBAAqB,CAAC,CAAC,CAAC;AAC7B,CAAC"}
+{"version":3,"file":"sidebar-workspace-slot.js","sourceRoot":"","sources":["../../../src/client/view/sidebar-workspace-slot.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,EAAoB,MAAM,OAAO,CAAC;AAGlE,OAAO,MAAM,MAAM,iBAAiB,CAAC;AAUrC,kFAAkF;AAClF,MAAM,UAAU,qBAAqB,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,WAAW,EAAE,OAAO,EAErF;IACC,MAAM,GAAG,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAC;IACzC,MAAM,kBAAkB,GAAG,WAAW,IAAI,wBAAwB,CAAC;IACnE,MAAM,eAAe,GAAG,kBAAkB,EAAE,EAAE,eAAe,CAAC;IAC9D,eAAe,CAAC,GAAG,EAAE;QACnB,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAC5B,IAAI,OAAO;YAAE,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;QAC7F,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAClC,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC;IACrC,OAAO,cAAK,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,aAAa,0EACnB,eAAe,KAAK,SAAS,IAAI,SAAS,GAAI,CAAC;AACnF,CAAC;AAED,qEAAqE;AACrE,SAAS,wBAAwB,KAAK,OAAO,SAAS,CAAC,CAAC,CAAC;AAEzD,4FAA4F;AAC5F,MAAM,UAAU,qBAAqB,CAAC,KAA2B;IAC/D,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,oBAAoB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC;QAC1E,IAAI,EAAE,oBAAoB;QAC1B,QAAQ,EAAE,CAAC,EAAE;QACb,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC;KAC5B,EAAE,qBAAqB,CAAC,CAAC,CAAC;AAC7B,CAAC"}

package/lib/client/view/workspace-directory-flow.d.ts

@@ -0,0 +1,20 @@
+import type { DirectoryFlowOwnerProps } from '@deepseek-ai/dsh-client-ui-workspace/client';
+import type { SlotCore } from '@deepseek-ai/dsh-client-ui-slots';
+declare const WORKTREE_FLOW = "clutch.worktree.directoryFlow";
+export interface WorkspaceDirectoryFlowState {
+    readonly available: boolean;
+    readonly owner: DirectoryFlowOwnerProps;
+}
+type FlowRegistry = Pick<SlotCore, 'entriesOfSlot' | 'subscribe'> & {
+    inject: (key: typeof WORKTREE_FLOW, callback: () => () => void) => () => void;
+    register: SlotCore['register'];
+};
+/** The composed picker owns selection; Worktree owns only adoption and its pending action. */
+export declare function createWorkspaceDirectoryFlow(slots: FlowRegistry, adopt: (path: string) => Promise<void>): {
+    store: import("@deepseek-ai/dsh-client-store").SnapshotStore<WorkspaceDirectoryFlowState>;
+    request: () => Promise<void>;
+    cancel: () => void;
+    dispose: () => void;
+};
+export {};
+//# sourceMappingURL=workspace-directory-flow.d.ts.map

package/lib/client/view/workspace-directory-flow.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-directory-flow.d.ts","sourceRoot":"","sources":["../../../src/client/view/workspace-directory-flow.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6CAA6C,CAAC;AAC3F,OAAO,KAAK,EAAE,QAAQ,EAAe,MAAM,kCAAkC,CAAC;AAG9E,QAAA,MAAM,aAAa,kCAAkC,CAAC;AAEtD,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,KAAK,EAAE,uBAAuB,CAAC;CACzC;AAED,KAAK,YAAY,GAAG,IAAI,CAAC,QAAQ,EAAE,eAAe,GAAG,WAAW,CAAC,GAAG;IAClE,MAAM,EAAE,CAAC,GAAG,EAAE,OAAO,aAAa,EAAE,QAAQ,EAAE,MAAM,MAAM,IAAI,KAAK,MAAM,IAAI,CAAC;IAC9E,QAAQ,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;CAChC,CAAC;AAQF,8FAA8F;AAC9F,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC;;mBAuClF,OAAO,CAAC,IAAI,CAAC;;;EAgClC"}

package/lib/client/view/workspace-directory-flow.js

@@ -0,0 +1,85 @@
+import { createSnapshotStore } from '@deepseek-ai/dsh-client-store';
+const NATIVE_FLOW = 'sidebar.workspaces.directoryFlow';
+const WORKTREE_FLOW = 'clutch.worktree.directoryFlow';
+/** The composed picker owns selection; Worktree owns only adoption and its pending action. */
+export function createWorkspaceDirectoryFlow(slots, adopt) {
+    const idle = {
+        open: false, busy: false, onPicked() { }, onCancel() { }, onError() { },
+    };
+    const store = createSnapshotStore({ available: false, owner: idle });
+    let pending;
+    let disposed = false;
+    const cancel = () => {
+        const request = pending;
+        pending = undefined;
+        store.set({ ...store.getSnapshot(), owner: idle });
+        request?.resolve();
+    };
+    // The native browser keeps its declaration even while our sidebar seat wins.
+    // Mirror its elected picker into our own child hole: redeclaring the native
+    // hole or rendering it through ctx.slots would violate renderer ownership.
+    const stop = slots.inject(WORKTREE_FLOW, () => {
+        let current;
+        let remove;
+        const sync = () => {
+            const next = slots.entriesOfSlot(NATIVE_FLOW)[0];
+            if (next === current)
+                return;
+            cancel();
+            remove?.();
+            current = next;
+            remove = next === undefined ? undefined : slots.register({
+                name: WORKTREE_FLOW,
+                ...(next.inject === undefined ? {} : { inject: next.inject }),
+                ...(next.store === undefined ? {} : { store: next.store }),
+                ...(next.locale === undefined ? {} : { locale: next.locale }),
+            }, next.component);
+            store.set({ available: next !== undefined, owner: idle });
+        };
+        const unsubscribe = slots.subscribe(NATIVE_FLOW, sync);
+        sync();
+        return () => { unsubscribe(); remove?.(); cancel(); store.set({ available: false, owner: idle }); };
+    });
+    const request = () => {
+        if (pending !== undefined)
+            return pending.promise;
+        if (disposed || !store.getSnapshot().available)
+            return Promise.resolve();
+        let resolve;
+        let reject;
+        const promise = new Promise((yes, no) => { resolve = yes; reject = no; });
+        const active = { promise, resolve, reject, busy: false };
+        pending = active;
+        const finish = (error) => {
+            if (pending !== active)
+                return;
+            pending = undefined;
+            store.set({ ...store.getSnapshot(), owner: idle });
+            if (error)
+                reject(error);
+            else
+                resolve();
+        };
+        const owner = {
+            open: true, busy: false,
+            onPicked: (path) => {
+                if (pending !== active || active.busy)
+                    return;
+                active.busy = true;
+                store.set({ available: true, owner: { ...owner, busy: true } });
+                void Promise.resolve().then(() => {
+                    if (pending === active)
+                        return adopt(path);
+                }).then(() => finish(), (error) => finish(error instanceof Error ? error : new Error(String(error))));
+            },
+            onCancel: () => { if (!active.busy)
+                finish(); },
+            onError: (message) => { if (!active.busy)
+                finish(new Error(message)); },
+        };
+        store.set({ available: true, owner });
+        return promise;
+    };
+    return { store, request, cancel, dispose: () => { disposed = true; stop(); cancel(); } };
+}
+//# sourceMappingURL=workspace-directory-flow.js.map

package/lib/client/view/workspace-directory-flow.js.map

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