@cerbur/clutch-dsh-worktree 0.1.16 → 0.1.18

package/lib/client/surface/actions/useWorktreeRegistration.js

@@ -1,34 +1,41 @@
-import { useCallback, useEffect } from 'react';
+import { useCallback, useEffect, useMemo } from 'react';
 import { createDefaultWorktreeName, executeWorktreeAction, reconcileBaseBranchSelection, selectDefaultBaseBranch, toWorktreeViewError, WorktreeSessionBindingError, WorktreeSessionPermissionError, } from '../../view/worktree-view.js';
 export function useWorktreeRegistration({ source, registrationState, read, props, mutation, session, }) {
     const { workspaces } = source;
-    const { worktreeModalWorkspaceId, modalReadLoading, setSelectedBranch, setNewBranch, setImportCandidates, importCandidatesGuard, modalWorkspaceIdRef, modalReadLoader, modalReadViewRef, setWorktreeModalWorkspaceId, setModalReadError, setModalReadLoading, setWorktreeModalMode, setSelectedImportPath, importCandidates, newBranch, selectedImportPath, worktreeModalMode, selectedBranch, } = registrationState;
+    const { worktreeModalWorkspaceId, modalReadLoading, modalBranches, setModalBranches, setSelectedBranch, setNewBranch, setImportCandidates, importCandidatesGuard, modalWorkspaceIdRef, modalGenerationRef, modalLifetimeRef, modalReadLoader, modalReadViewRef, setWorktreeModalWorkspaceId, setModalReadError, setModalReadLoading, setWorktreeModalMode, setSelectedImportPath, importCandidates, newBranch, selectedImportPath, worktreeModalMode, selectedBranch, } = registrationState;
     const { viewByWorkspace, loadModalWorktreeView, refresh } = read;
     const { manager, createSessionForWorktree: createSessionCallback } = props;
     const { actionPending, setActionError, setActionPending } = mutation;
     const { setPendingSessionBinding } = session;
     const modalWorkspace = workspaces.items.find((workspace) => workspace.workspaceId === worktreeModalWorkspaceId);
-    const modalView = worktreeModalWorkspaceId === undefined
+    const modalProjection = worktreeModalWorkspaceId === undefined
         ? undefined
-        : viewByWorkspace.get(worktreeModalWorkspaceId);
+        : modalReadViewRef.current?.workspaceId === worktreeModalWorkspaceId
+            ? modalReadViewRef.current : viewByWorkspace.get(worktreeModalWorkspaceId);
+    const modalView = useMemo(() => modalProjection === undefined || modalBranches === undefined
+        ? modalProjection : { ...modalProjection, branches: modalBranches }, [modalProjection, modalBranches]);
     const modalReadiness = modalView?.readiness;
     const modalSetupStatus = modalView === undefined
         ? undefined
         : modalReadiness?.status === 'ready'
-            ? modalView.branches.length === 0
-                ? 'noLocalBranch'
-                : undefined
+            ? undefined
             : modalReadiness?.status;
     const modalCanCreate = !modalReadLoading && modalSetupStatus === undefined && modalReadiness?.status === 'ready';
     useEffect(() => {
         if (worktreeModalWorkspaceId === undefined || modalView === undefined)
             return;
+        if (modalReadLoading)
+            return;
         if (modalView.readiness.status !== 'ready') {
             setSelectedBranch('');
             setNewBranch('');
             return;
         }
-        setSelectedBranch((current) => reconcileBaseBranchSelection(current, modalView.branches));
+        setSelectedBranch((current) => current === 'HEAD' && modalView.checkout?.currentHead !== undefined
+            ? current : modalView.checkout?.currentHead?.kind !== 'branch' && modalView.checkout?.currentHead !== undefined && current === ''
+            ? 'HEAD' : modalView.branches.length > 0
+            ? reconcileBaseBranchSelection(current, modalView.branches)
+            : current || modalView.currentBranch || 'HEAD');
         setNewBranch((current) => {
             if (current.length > 0)
                 return current;
@@ -38,7 +45,7 @@ export function useWorktreeRegistration({ source, registrationState, read, props
             ];
             return createDefaultWorktreeName(existingNames);
         });
-    }, [modalView, worktreeModalWorkspaceId]);
+    }, [modalView, worktreeModalWorkspaceId, modalReadLoading]);
     const loadImportCandidates = useCallback(async (workspaceId) => {
         if (manager === undefined)
             return;
@@ -60,39 +67,49 @@ export function useWorktreeRegistration({ source, registrationState, read, props
     const closeWorktreeCreator = (force = false) => {
         if (actionPending && !force)
             return;
+        modalGenerationRef.current++;
+        modalLifetimeRef.current++;
         modalReadLoader.current.invalidate();
         modalReadViewRef.current = undefined;
         importCandidatesGuard.current.invalidate();
         setWorktreeModalWorkspaceId(undefined);
         setModalReadError(undefined);
         setModalReadLoading(false);
+        setModalBranches(undefined);
     };
     const openWorktreeCreator = (workspace, defaults = {}) => {
         const view = viewByWorkspace.get(workspace.workspaceId);
+        modalGenerationRef.current++;
+        modalLifetimeRef.current++;
         modalReadLoader.current.invalidate();
         modalReadViewRef.current = undefined;
         importCandidatesGuard.current.invalidate();
         setWorktreeModalWorkspaceId(workspace.workspaceId);
+        setModalBranches(undefined);
         setWorktreeModalMode('create');
         setImportCandidates({ status: 'idle', candidates: [] });
         setSelectedImportPath(undefined);
         setActionError(undefined);
         setModalReadError(undefined);
         setModalReadLoading(false);
-        if (view === undefined) {
+        if (view === undefined || view.branches.length === 0) {
             setSelectedBranch(defaults.baseBranch ?? '');
             setNewBranch(defaults.newBranch ?? '');
             loadModalWorktreeView(workspace.workspaceId);
             return;
         }
-        setSelectedBranch(defaults.baseBranch ?? selectDefaultBaseBranch(view.branches));
+        setSelectedBranch(defaults.baseBranch ?? (view.checkout?.currentHead !== undefined && view.checkout.currentHead.kind !== 'branch'
+            ? 'HEAD' : selectDefaultBaseBranch(view.branches)));
         setNewBranch(defaults.newBranch ??
             createDefaultWorktreeName([
                 ...view.branches.map((branch) => branch.name),
                 ...view.worktrees.map((worktree) => worktree.branch),
             ]));
+        loadModalWorktreeView(workspace.workspaceId);
     };
     const changeWorktreeModalMode = (mode) => {
+        if (mode !== worktreeModalMode)
+            modalGenerationRef.current++;
         setWorktreeModalMode(mode);
         if (mode === 'import' &&
             worktreeModalWorkspaceId !== undefined &&
@@ -123,14 +140,16 @@ export function useWorktreeRegistration({ source, registrationState, read, props
             await createSessionCallback(sessionInput);
         }
         catch (error) {
-            if (error instanceof WorktreeSessionBindingError && error.retryable) {
-                setPendingSessionBinding({ ...sessionInput, sessionId: error.sessionId });
+            if (error instanceof WorktreeSessionBindingError) {
+                setPendingSessionBinding({ ...sessionInput, sessionId: error.sessionId,
+                    error: toWorktreeViewError(error) });
             }
             if (error instanceof WorktreeSessionPermissionError && error.retryable) {
                 setPendingSessionBinding({
                     ...sessionInput,
                     sessionId: error.sessionId,
                     permissionRequired: true,
+                    error: toWorktreeViewError(error),
                 });
             }
             throw error;
@@ -160,6 +179,10 @@ export function useWorktreeRegistration({ source, registrationState, read, props
                     input: {
                         workspaceId: modalWorkspace.workspaceId,
                         branch: selectedBranch,
+                        ...(selectedBranch === 'HEAD' ? {
+                            fromHead: true,
+                            expectedHeadCommit: modalView?.checkout?.currentHead?.commit,
+                        } : {}),
                         newBranch: worktreeName,
                     },
                 })

package/lib/client/surface/actions/useWorktreeRegistration.js.map

@@ -1 +1 @@
-{"version":3,"file":"useWorktreeRegistration.js","sourceRoot":"","sources":["../../../../src/client/surface/actions/useWorktreeRegistration.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"useWorktreeRegistration.js","sourceRoot":"","sources":["../../../../src/client/surface/actions/useWorktreeRegistration.tsx"],"names":[],"mappings":"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"}

package/lib/client/surface/components/NotificationToasts.d.ts

@@ -1,7 +1,23 @@
+import { type ReactNode } from 'react';
 import { type WorktreeNotification } from '../notification-queue.js';
-/** One native toast at a time; recovery controls remain available after it fades. */
-export declare function NotificationToasts({ notices, detailsLabel, }: {
+import type { WorktreeTranslate } from '../types.js';
+import type { WorktreeViewError } from '../../view/worktree-view.js';
+/** One queue for the list, dialogs and Dashboard; unmount removes a source's notices. */
+export declare function NotificationProvider({ children, t, openSettings }: {
+    children: ReactNode;
+    t: WorktreeTranslate;
+    openSettings?: () => boolean;
+}): import("react").JSX.Element;
+/** Register resolved copy while retaining live callbacks for recovery actions. */
+export declare function NotificationToasts({ notices }: {
     notices: readonly WorktreeNotification[];
-    detailsLabel: string;
 }): import("react").JSX.Element | null;
+export declare function ErrorToast({ error, t, scope, context, actions, describe, }: {
+    readonly error?: WorktreeViewError;
+    readonly t: WorktreeTranslate;
+    readonly scope: string;
+    readonly context?: string;
+    readonly actions?: WorktreeNotification['actions'];
+    readonly describe?: WorktreeNotification['describe'];
+}): import("react").JSX.Element;
 //# sourceMappingURL=NotificationToasts.d.ts.map

package/lib/client/surface/components/NotificationToasts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NotificationToasts.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/components/NotificationToasts.tsx"],"names":[],"mappings":"AAEA,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,0BAA0B,CAAC;AAElC,qFAAqF;AACrF,wBAAgB,kBAAkB,CAAC,EACjC,OAAO,EACP,YAAY,GACb,EAAE;IACD,OAAO,EAAE,SAAS,oBAAoB,EAAE,CAAC;IACzC,YAAY,EAAE,MAAM,CAAC;CACtB,sCAkBA"}
+{"version":3,"file":"NotificationToasts.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/components/NotificationToasts.tsx"],"names":[],"mappings":"AACA,OAAO,EAQL,KAAK,SAAS,EACf,MAAM,OAAO,CAAC;AACf,OAAO,EAIL,KAAK,oBAAoB,EAC1B,MAAM,0BAA0B,CAAC;AAElC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAMrE,yFAAyF;AACzF,wBAAgB,oBAAoB,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,YAAY,EAAE,EAAE;IAClE,QAAQ,EAAE,SAAS,CAAC;IACpB,CAAC,EAAE,iBAAiB,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC;CAC9B,+BAqBA;AAED,kFAAkF;AAClF,wBAAgB,kBAAkB,CAAC,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,SAAS,oBAAoB,EAAE,CAAA;CAAE,sCAqC3F;AAED,wBAAgB,UAAU,CAAC,EACzB,KAAK,EACL,CAAC,EACD,KAAK,EACL,OAAO,EACP,OAAO,EACP,QAAQ,GACT,EAAE;IACD,QAAQ,CAAC,KAAK,CAAC,EAAE,iBAAiB,CAAC;IACnC,QAAQ,CAAC,CAAC,EAAE,iBAAiB,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,OAAO,CAAC,EAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC;IACnD,QAAQ,CAAC,QAAQ,CAAC,EAAE,oBAAoB,CAAC,UAAU,CAAC,CAAC;CACtD,+BAYA"}

package/lib/client/surface/components/NotificationToasts.js

@@ -1,9 +1,74 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Toast } from '@deepseek-ai/dsh-client-ui-primitives';
-import { useCallback, useEffect, useState } from 'react';
-import { reconcileNotifications, } from '../notification-queue.js';
-/** One native toast at a time; recovery controls remain available after it fades. */
-export function NotificationToasts({ notices, detailsLabel, }) {
+import { createContext, useCallback, useContext, useEffect, useId, useRef, useState, } from 'react';
+import { reconcileNotifications, failureToastKey, } from '../notification-queue.js';
+import { formatWorktreeViewError } from '../../view/worktree-error-copy.js';
+import { worktreeDiagnostics } from '../../settings/diagnostics.js';
+const Notifications = createContext(undefined);
+/** One queue for the list, dialogs and Dashboard; unmount removes a source's notices. */
+export function NotificationProvider({ children, t, openSettings }) {
+    const [sources, setSources] = useState(new Map());
+    const publish = useCallback((source, notices) => {
+        setSources((current) => {
+            if (!current.has(source) && notices.length === 0)
+                return current;
+            const next = new Map(current);
+            if (notices.length === 0)
+                next.delete(source);
+            else
+                next.set(source, notices);
+            return next;
+        });
+    }, []);
+    return (_jsxs(Notifications.Provider, { value: publish, children: [children, _jsx(ToastQueue, { notices: [...sources.values()].flat(), hint: t('settings.toastHint'), settingsAction: openSettings === undefined ? undefined
+                    : { label: t('settings.errors'), onClick: openSettings } })] }));
+}
+/** Register resolved copy while retaining live callbacks for recovery actions. */
+export function NotificationToasts({ notices }) {
+    const publish = useContext(Notifications);
+    const id = useId();
+    const latest = useRef(notices);
+    const alive = useRef(true);
+    latest.current = notices;
+    const signature = JSON.stringify(notices.map(({ key, text, context, error, actions }) => [
+        key, text, context, error, actions?.map(({ label, disabled, leaveSettings }) => [label, disabled, leaveSettings]),
+    ]));
+    useEffect(() => {
+        const registered = latest.current.map((notice) => ({
+            ...notice,
+            actions: notice.actions?.map((action) => ({
+                leaveSettings: action.leaveSettings,
+                disabled: action.disabled,
+                label: action.label,
+                onClick: () => {
+                    const current = latest.current.find((item) => item.key === notice.key)?.actions
+                        ?.find((item) => item.label === action.label);
+                    if (alive.current && !current?.disabled)
+                        current?.onClick();
+                },
+            })),
+        }));
+        worktreeDiagnostics.publish(id, registered);
+        publish?.(id, registered);
+    }, [publish, id, signature]);
+    useEffect(() => {
+        alive.current = true;
+        return () => {
+            alive.current = false;
+            worktreeDiagnostics.deactivate(id);
+            publish?.(id, []);
+        };
+    }, [publish, id]);
+    return publish === undefined ? _jsx(ToastQueue, { notices: notices }) : null;
+}
+export function ErrorToast({ error, t, scope, context, actions, describe, }) {
+    const text = error === undefined ? undefined : formatWorktreeViewError(error, t);
+    return (_jsx(NotificationToasts, { notices: text === undefined ? [] : [{
+                key: JSON.stringify([scope, error?.code, error?.details]), text, error, context, actions, describe,
+                toastKey: failureToastKey(error),
+            }] }));
+}
+function ToastQueue({ notices, hint, settingsAction }) {
     const [queue, setQueue] = useState({ seen: [], pending: [] });
     useEffect(() => {
         setQueue((current) => reconcileNotifications(current, notices));
@@ -18,7 +83,8 @@ export function NotificationToasts({ notices, detailsLabel, }) {
     }, [key]);
     if (current === undefined)
         return null;
-    const text = current.text.length > 240 ? current.text.slice(0, 240) + '…' : current.text;
-    return (_jsx(Toast, { text: text + ' · ' + detailsLabel, holdMs: 6000, onDone: onDone }, current.key));
+    // Never truncate recovery guidance. Resolve actions from the current render.
+    const active = notices.find((notice) => (notice.toastKey ?? notice.key) === current.key);
+    return (_jsx(Toast, { text: [active?.text ?? current.text, hint].filter(Boolean).join(' '), actions: settingsAction === undefined ? undefined : [settingsAction], holdMs: 8000, onDone: onDone }, current.key));
 }
 //# sourceMappingURL=NotificationToasts.js.map

package/lib/client/surface/components/NotificationToasts.js.map

@@ -1 +1 @@
-{"version":3,"file":"NotificationToasts.js","sourceRoot":"","sources":["../../../../src/client/surface/components/NotificationToasts.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,uCAAuC,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACzD,OAAO,EACL,sBAAsB,GAGvB,MAAM,0BAA0B,CAAC;AAElC,qFAAqF;AACrF,MAAM,UAAU,kBAAkB,CAAC,EACjC,OAAO,EACP,YAAY,GAIb;IACC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAoB,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;IACjF,SAAS,CAAC,GAAG,EAAE;QACb,QAAQ,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,sBAAsB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IAClE,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IACd,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACjC,MAAM,GAAG,GAAG,OAAO,EAAE,GAAG,CAAC;IACzB,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,EAAE;QAC9B,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACnB,GAAG,KAAK;YACR,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,KAAK,GAAG,CAAC;SAC9D,CAAC,CAAC,CAAC;IACN,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACV,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IACvC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;IACzF,OAAO,CACL,KAAC,KAAK,IAAmB,IAAI,EAAE,IAAI,GAAG,KAAK,GAAG,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,IAA5E,OAAO,CAAC,GAAG,CAAqE,CAC7F,CAAC;AACJ,CAAC"}
+{"version":3,"file":"NotificationToasts.js","sourceRoot":"","sources":["../../../../src/client/surface/components/NotificationToasts.tsx"],"names":[],"mappings":"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"}

package/lib/client/surface/components/OverlayScrollbar.d.ts

@@ -0,0 +1,6 @@
+import { type RefObject } from 'react';
+/** A themed thumb over the native scrollport: the list keeps its full width. */
+export declare function OverlayScrollbar({ scrollportRef, }: {
+    readonly scrollportRef: RefObject<HTMLDivElement>;
+}): import("react").JSX.Element;
+//# sourceMappingURL=OverlayScrollbar.d.ts.map

package/lib/client/surface/components/OverlayScrollbar.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"OverlayScrollbar.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/components/OverlayScrollbar.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAwD,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAG7F,gFAAgF;AAChF,wBAAgB,gBAAgB,CAAC,EAC/B,aAAa,GACd,EAAE;IACD,QAAQ,CAAC,aAAa,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC;CACnD,+BAuGA"}

package/lib/client/surface/components/OverlayScrollbar.js

@@ -0,0 +1,84 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useLayoutEffect, useRef, useState } from 'react';
+import styles from '../../worktree.css';
+/** A themed thumb over the native scrollport: the list keeps its full width. */
+export function OverlayScrollbar({ scrollportRef, }) {
+    const thumbRef = useRef(null);
+    const dragRef = useRef(null);
+    const [dragging, setDragging] = useState(false);
+    const [geometry, setGeometry] = useState({ height: 0, top: 0, range: 0, travel: 0 });
+    useLayoutEffect(() => {
+        const scrollport = scrollportRef.current;
+        const content = scrollport?.firstElementChild;
+        if (scrollport === null || content == null)
+            return;
+        const measure = () => {
+            const viewport = scrollport.clientHeight;
+            const range = Math.max(0, scrollport.scrollHeight - viewport);
+            const height = scrollport.scrollHeight === 0
+                ? 0
+                : Math.min(viewport, Math.max(24, (viewport * viewport) / scrollport.scrollHeight));
+            const travel = viewport - height;
+            setGeometry({
+                height,
+                range,
+                travel,
+                top: range === 0 ? 0 : Math.min(travel, Math.max(0, (scrollport.scrollTop / range) * travel)),
+            });
+        };
+        const observer = new ResizeObserver(measure);
+        observer.observe(scrollport);
+        observer.observe(content);
+        scrollport.addEventListener('scroll', measure, { passive: true });
+        measure();
+        return () => {
+            observer.disconnect();
+            scrollport.removeEventListener('scroll', measure);
+        };
+    }, [scrollportRef]);
+    const releaseDrag = (event) => {
+        if (event.currentTarget.hasPointerCapture(event.pointerId)) {
+            event.currentTarget.releasePointerCapture(event.pointerId);
+        }
+        dragRef.current = null;
+        setDragging(false);
+    };
+    return (_jsx("div", { className: styles.overlayScrollbar, hidden: geometry.range === 0, "aria-hidden": "true", "data-dragging": dragging || undefined, onPointerDown: (event) => {
+            const scrollport = scrollportRef.current;
+            if (event.button !== 0 || scrollport === null || geometry.travel <= 0)
+                return;
+            event.preventDefault();
+            if (event.target !== thumbRef.current) {
+                const top = event.clientY - event.currentTarget.getBoundingClientRect().top - geometry.height / 2;
+                scrollport.scrollTop =
+                    (Math.max(0, Math.min(geometry.travel, top)) / geometry.travel) * geometry.range;
+            }
+            dragRef.current = {
+                pointerId: event.pointerId,
+                y: event.clientY,
+                scrollTop: scrollport.scrollTop,
+            };
+            event.currentTarget.setPointerCapture(event.pointerId);
+            setDragging(true);
+        }, onPointerMove: (event) => {
+            const drag = dragRef.current;
+            const scrollport = scrollportRef.current;
+            if (drag === null ||
+                drag.pointerId !== event.pointerId ||
+                scrollport === null ||
+                geometry.travel <= 0)
+                return;
+            scrollport.scrollTop =
+                drag.scrollTop + ((event.clientY - drag.y) / geometry.travel) * geometry.range;
+        }, onPointerUp: releaseDrag, onPointerCancel: releaseDrag, onLostPointerCapture: () => {
+            dragRef.current = null;
+            setDragging(false);
+        }, onWheel: (event) => {
+            const scrollport = scrollportRef.current;
+            if (scrollport !== null) {
+                const unit = event.deltaMode === 1 ? 20 : event.deltaMode === 2 ? scrollport.clientHeight : 1;
+                scrollport.scrollTop += event.deltaY * unit;
+            }
+        }, children: _jsx("div", { ref: thumbRef, className: styles.scrollbarThumb, style: { height: geometry.height, transform: `translateY(${geometry.top}px)` } }) }));
+}
+//# sourceMappingURL=OverlayScrollbar.js.map

package/lib/client/surface/components/OverlayScrollbar.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OverlayScrollbar.js","sourceRoot":"","sources":["../../../../src/client/surface/components/OverlayScrollbar.tsx"],"names":[],"mappings":"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"}

package/lib/client/surface/components/RegistrationDialog.d.ts

@@ -4,11 +4,11 @@ import type { useSurfaceMutation } from '../actions/useSurfaceMutation.js';
 import type { useSurfaceRefresh } from '../state/useSurfaceRefresh.js';
 import type { useWorktreeRegistration } from '../actions/useWorktreeRegistration.js';
 type Input = {
-    props: Pick<WorktreeSurfaceProps, 't'>;
+    props: Pick<WorktreeSurfaceProps, 't' | 'manager'>;
     registration: Pick<ReturnType<typeof useWorktreeRegistration>, 'modalWorkspace' | 'modalView' | 'modalSetupStatus' | 'modalCanCreate' | 'closeWorktreeCreator' | 'changeWorktreeModalMode' | 'loadImportCandidates' | 'submitWorktree'>;
-    registrationState: Pick<ReturnType<typeof useRegistrationState>, 'modalReadError' | 'worktreeModalMode' | 'importCandidates' | 'selectedImportPath' | 'selectedBranch' | 'newBranch' | 'worktreeModalWorkspaceId' | 'modalReadViewRef' | 'setSelectedBranch' | 'setNewBranch' | 'setSelectedImportPath'>;
+    registrationState: Pick<ReturnType<typeof useRegistrationState>, 'modalReadError' | 'modalReadLoading' | 'worktreeModalMode' | 'importCandidates' | 'selectedImportPath' | 'selectedBranch' | 'newBranch' | 'worktreeModalWorkspaceId' | 'modalReadViewRef' | 'modalWorkspaceIdRef' | 'modalGenerationRef' | 'modalLifetimeRef' | 'setModalBranches' | 'setSelectedBranch' | 'setNewBranch' | 'setSelectedImportPath'>;
     mutation: Pick<ReturnType<typeof useSurfaceMutation>, 'actionPending'>;
-    read: Pick<ReturnType<typeof useSurfaceRefresh>, 'loadModalWorktreeView'>;
+    read: Pick<ReturnType<typeof useSurfaceRefresh>, 'loadModalWorktreeView' | 'refresh'>;
 };
 export declare function RegistrationDialog({ props, registration, registrationState, mutation, read, }: Input): import("react").JSX.Element;
 export {};

package/lib/client/surface/components/RegistrationDialog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RegistrationDialog.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/components/RegistrationDialog.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAErF,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,IAAI,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC;IACvC,YAAY,EAAE,IAAI,CAChB,UAAU,CAAC,OAAO,uBAAuB,CAAC,EACxC,gBAAgB,GAChB,WAAW,GACX,kBAAkB,GAClB,gBAAgB,GAChB,sBAAsB,GACtB,yBAAyB,GACzB,sBAAsB,GACtB,gBAAgB,CACnB,CAAC;IACF,iBAAiB,EAAE,IAAI,CACrB,UAAU,CAAC,OAAO,oBAAoB,CAAC,EACrC,gBAAgB,GAChB,mBAAmB,GACnB,kBAAkB,GAClB,oBAAoB,GACpB,gBAAgB,GAChB,WAAW,GACX,0BAA0B,GAC1B,kBAAkB,GAClB,mBAAmB,GACnB,cAAc,GACd,uBAAuB,CAC1B,CAAC;IACF,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,kBAAkB,CAAC,EAAE,eAAe,CAAC,CAAC;IACvE,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,EAAE,uBAAuB,CAAC,CAAC;CAC3E,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,EACjC,KAAK,EACL,YAAY,EACZ,iBAAiB,EACjB,QAAQ,EACR,IAAI,GACL,EAAE,KAAK,+BAgEP"}
+{"version":3,"file":"RegistrationDialog.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/components/RegistrationDialog.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAErF,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,IAAI,CAAC,oBAAoB,EAAE,GAAG,GAAG,SAAS,CAAC,CAAC;IACnD,YAAY,EAAE,IAAI,CAChB,UAAU,CAAC,OAAO,uBAAuB,CAAC,EACxC,gBAAgB,GAChB,WAAW,GACX,kBAAkB,GAClB,gBAAgB,GAChB,sBAAsB,GACtB,yBAAyB,GACzB,sBAAsB,GACtB,gBAAgB,CACnB,CAAC;IACF,iBAAiB,EAAE,IAAI,CACrB,UAAU,CAAC,OAAO,oBAAoB,CAAC,EACrC,gBAAgB,GAChB,kBAAkB,GAClB,mBAAmB,GACnB,kBAAkB,GAClB,oBAAoB,GACpB,gBAAgB,GAChB,WAAW,GACX,0BAA0B,GAC1B,kBAAkB,GAClB,qBAAqB,GACrB,oBAAoB,GACpB,kBAAkB,GAClB,kBAAkB,GAClB,mBAAmB,GACnB,cAAc,GACd,uBAAuB,CAC1B,CAAC;IACF,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,kBAAkB,CAAC,EAAE,eAAe,CAAC,CAAC;IACvE,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,EAAE,uBAAuB,GAAG,SAAS,CAAC,CAAC;CACvF,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,EACjC,KAAK,EACL,YAAY,EACZ,iBAAiB,EACjB,QAAQ,EACR,IAAI,GACL,EAAE,KAAK,+BAkIP"}

package/lib/client/surface/components/RegistrationDialog.js

@@ -1,22 +1,87 @@
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { useEffect, useRef } from 'react';
 import { WorktreeCreateDialog } from './dialogs.js';
 export function RegistrationDialog({ props, registration, registrationState, mutation, read, }) {
     const { t } = props;
     const { modalWorkspace, modalView, modalSetupStatus, modalCanCreate, closeWorktreeCreator, changeWorktreeModalMode, loadImportCandidates, submitWorktree, } = registration;
-    const { modalReadError, worktreeModalMode, importCandidates, selectedImportPath, selectedBranch, newBranch, worktreeModalWorkspaceId, modalReadViewRef, setSelectedBranch, setNewBranch, setSelectedImportPath, } = registrationState;
+    const { modalReadError, modalReadLoading, worktreeModalMode, importCandidates, selectedImportPath, selectedBranch, newBranch, worktreeModalWorkspaceId, modalReadViewRef, modalWorkspaceIdRef, modalGenerationRef, modalLifetimeRef, setModalBranches, setSelectedBranch, setNewBranch, setSelectedImportPath, } = registrationState;
     const { actionPending } = mutation;
     const { loadModalWorktreeView } = read;
-    return (_jsx(_Fragment, { children: _jsx(WorktreeCreateDialog, { t: t, workspace: modalWorkspace, view: modalView, readError: modalReadError, setupStatus: modalSetupStatus, canCreate: modalCanCreate, mode: worktreeModalMode, importCandidates: importCandidates, selectedImportPath: selectedImportPath, selectedBranch: selectedBranch, newBranch: newBranch, actionPending: actionPending, onClose: closeWorktreeCreator, onRetry: () => {
-                if (worktreeModalWorkspaceId === undefined)
+    // Tab/request invalidation must not restart the native Modal entry animation.
+    const shell = useRef({ workspaceId: worktreeModalWorkspaceId, manager: props.manager,
+        lifetime: modalLifetimeRef.current, generation: 0 });
+    if (shell.current.workspaceId !== worktreeModalWorkspaceId ||
+        shell.current.manager !== props.manager || shell.current.lifetime !== modalLifetimeRef.current) {
+        shell.current = { workspaceId: worktreeModalWorkspaceId, manager: props.manager,
+            lifetime: modalLifetimeRef.current, generation: shell.current.generation + 1 };
+    }
+    // Workspace equality cannot distinguish closing and reopening the same dialog.
+    const lifecycle = useRef({ workspaceId: worktreeModalWorkspaceId, manager: props.manager,
+        mode: worktreeModalMode, ownerGeneration: modalGenerationRef.current, generation: 0 });
+    if (lifecycle.current.workspaceId !== worktreeModalWorkspaceId ||
+        lifecycle.current.manager !== props.manager || lifecycle.current.mode !== worktreeModalMode ||
+        lifecycle.current.ownerGeneration !== modalGenerationRef.current) {
+        lifecycle.current = { workspaceId: worktreeModalWorkspaceId, manager: props.manager,
+            mode: worktreeModalMode, ownerGeneration: modalGenerationRef.current,
+            generation: lifecycle.current.generation + 1 };
+    }
+    const alive = useRef(true);
+    useEffect(() => {
+        alive.current = true;
+        return () => { alive.current = false; };
+    }, []);
+    const generation = lifecycle.current.generation;
+    const ownerGeneration = modalGenerationRef.current;
+    const isCurrent = () => alive.current && lifecycle.current.generation === generation &&
+        modalGenerationRef.current === ownerGeneration &&
+        modalWorkspaceIdRef.current === worktreeModalWorkspaceId;
+    return (_jsx(_Fragment, { children: _jsx(WorktreeCreateDialog, { pickerKey: generation, t: t, workspace: modalWorkspace, view: modalView, readError: modalReadError, setupStatus: modalSetupStatus, canCreate: modalCanCreate, branchesLoading: modalReadLoading || modalView === undefined, mode: worktreeModalMode, importCandidates: importCandidates, selectedImportPath: selectedImportPath, selectedBranch: selectedBranch, newBranch: newBranch, actionPending: actionPending, onClose: () => {
+                if (actionPending || !isCurrent())
                     return;
+                lifecycle.current.generation++;
+                closeWorktreeCreator();
+            }, onRetry: () => {
+                if (worktreeModalWorkspaceId === undefined || !isCurrent())
+                    return;
+                lifecycle.current.generation++;
                 modalReadViewRef.current = undefined;
                 setSelectedBranch('');
                 setNewBranch('');
                 loadModalWorktreeView(worktreeModalWorkspaceId);
-            }, onModeChange: changeWorktreeModalMode, onRetryImportCandidates: () => {
+            }, onModeChange: (mode) => {
+                if (!isCurrent())
+                    return;
+                if (mode !== worktreeModalMode)
+                    lifecycle.current.generation++;
+                changeWorktreeModalMode(mode);
+            }, onRetryImportCandidates: () => {
                 if (worktreeModalWorkspaceId !== undefined) {
                     void loadImportCandidates(worktreeModalWorkspaceId);
                 }
-            }, onSelectedImportPathChange: setSelectedImportPath, onSelectedBranchChange: setSelectedBranch, onNewBranchChange: setNewBranch, onSubmit: submitWorktree }) }));
+            }, onSelectedImportPathChange: setSelectedImportPath, onSelectedBranchChange: setSelectedBranch, onLoadBranches: props.manager === undefined || worktreeModalWorkspaceId === undefined ? undefined
+                : async () => {
+                    if (!isCurrent())
+                        return [];
+                    const branches = await props.manager.listBranches({ workspaceId: worktreeModalWorkspaceId });
+                    if (isCurrent())
+                        setModalBranches(branches);
+                    return branches;
+                }, onFetchBranches: props.manager?.fetchRemoteBranches === undefined || worktreeModalWorkspaceId === undefined ? undefined : async () => {
+                if (!isCurrent())
+                    return [];
+                const workspaceId = worktreeModalWorkspaceId;
+                try {
+                    const branches = await props.manager.fetchRemoteBranches({ workspaceId });
+                    if (isCurrent())
+                        setModalBranches(branches);
+                    return branches;
+                }
+                finally {
+                    if (isCurrent()) {
+                        await read.refresh({ preserveCurrent: true, invalidateContext: false,
+                            scope: { kind: 'workspace', workspaceId } });
+                    }
+                }
+            }, onNewBranchChange: setNewBranch, onSubmit: submitWorktree }, shell.current.generation) }));
 }
 //# sourceMappingURL=RegistrationDialog.js.map

package/lib/client/surface/components/RegistrationDialog.js.map

@@ -1 +1 @@
-{"version":3,"file":"RegistrationDialog.js","sourceRoot":"","sources":["../../../../src/client/surface/components/RegistrationDialog.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAsCpD,MAAM,UAAU,kBAAkB,CAAC,EACjC,KAAK,EACL,YAAY,EACZ,iBAAiB,EACjB,QAAQ,EACR,IAAI,GACE;IACN,MAAM,EAAE,CAAC,EAAE,GAAG,KAAK,CAAC;IACpB,MAAM,EACJ,cAAc,EACd,SAAS,EACT,gBAAgB,EAChB,cAAc,EACd,oBAAoB,EACpB,uBAAuB,EACvB,oBAAoB,EACpB,cAAc,GACf,GAAG,YAAY,CAAC;IACjB,MAAM,EACJ,cAAc,EACd,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,cAAc,EACd,SAAS,EACT,wBAAwB,EACxB,gBAAgB,EAChB,iBAAiB,EACjB,YAAY,EACZ,qBAAqB,GACtB,GAAG,iBAAiB,CAAC;IACtB,MAAM,EAAE,aAAa,EAAE,GAAG,QAAQ,CAAC;IACnC,MAAM,EAAE,qBAAqB,EAAE,GAAG,IAAI,CAAC;IAEvC,OAAO,CACL,4BACE,KAAC,oBAAoB,IACnB,CAAC,EAAE,CAAC,EACJ,SAAS,EAAE,cAAc,EACzB,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,cAAc,EACzB,WAAW,EAAE,gBAAgB,EAC7B,SAAS,EAAE,cAAc,EACzB,IAAI,EAAE,iBAAiB,EACvB,gBAAgB,EAAE,gBAAgB,EAClC,kBAAkB,EAAE,kBAAkB,EACtC,cAAc,EAAE,cAAc,EAC9B,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,GAAG,EAAE;gBACZ,IAAI,wBAAwB,KAAK,SAAS;oBAAE,OAAO;gBACnD,gBAAgB,CAAC,OAAO,GAAG,SAAS,CAAC;gBACrC,iBAAiB,CAAC,EAAE,CAAC,CAAC;gBACtB,YAAY,CAAC,EAAE,CAAC,CAAC;gBACjB,qBAAqB,CAAC,wBAAwB,CAAC,CAAC;YAClD,CAAC,EACD,YAAY,EAAE,uBAAuB,EACrC,uBAAuB,EAAE,GAAG,EAAE;gBAC5B,IAAI,wBAAwB,KAAK,SAAS,EAAE,CAAC;oBAC3C,KAAK,oBAAoB,CAAC,wBAAwB,CAAC,CAAC;gBACtD,CAAC;YACH,CAAC,EACD,0BAA0B,EAAE,qBAAqB,EACjD,sBAAsB,EAAE,iBAAiB,EACzC,iBAAiB,EAAE,YAAY,EAC/B,QAAQ,EAAE,cAAc,GACxB,GACD,CACJ,CAAC;AACJ,CAAC"}
+{"version":3,"file":"RegistrationDialog.js","sourceRoot":"","sources":["../../../../src/client/surface/components/RegistrationDialog.tsx"],"names":[],"mappings":"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"}

package/lib/client/surface/components/RestartToast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RestartToast.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/components/RestartToast.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAClF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAE7D,wBAAgB,YAAY,CAAC,EAC3B,MAAM,EACN,CAAC,GACF,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,WAAW,CAAC,UAAU,CAAC,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAA;CAAE,sCAI9F"}
+{"version":3,"file":"RestartToast.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/components/RestartToast.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAClF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAE7D,wBAAgB,YAAY,CAAC,EAC3B,MAAM,EACN,CAAC,GACF,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,WAAW,CAAC,UAAU,CAAC,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAA;CAAE,sCAU9F"}

package/lib/client/surface/components/RestartToast.js

@@ -2,9 +2,10 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { useSyncExternalStore } from 'react';
 import { Toast } from '@deepseek-ai/dsh-client-ui-primitives';
 export function RestartToast({ notice, t, }) {
-    const visible = useSyncExternalStore(notice.subscribe, notice.getSnapshot, notice.getSnapshot);
-    if (!visible)
+    const reason = useSyncExternalStore(notice.subscribe, notice.getReasonSnapshot, notice.getReasonSnapshot);
+    if (reason === undefined)
         return null;
-    return _jsx(Toast, { text: t('restartRequired'), holdMs: 8_000, onDone: notice.dismiss });
+    const presetMissing = reason === 'permission-preset-unavailable';
+    return _jsx(Toast, { text: t(presetMissing ? 'permission.presetRestartRequired' : 'restartRequired'), holdMs: presetMissing ? 12_000 : 8_000, onDone: () => notice.dismissReason(reason) }, reason);
 }
 //# sourceMappingURL=RestartToast.js.map

package/lib/client/surface/components/RestartToast.js.map

@@ -1 +1 @@
-{"version":3,"file":"RestartToast.js","sourceRoot":"","sources":["../../../../src/client/surface/components/RestartToast.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,uCAAuC,CAAC;AAI9D,MAAM,UAAU,YAAY,CAAC,EAC3B,MAAM,EACN,CAAC,GAC4F;IAC7F,MAAM,OAAO,GAAG,oBAAoB,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAC/F,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAC1B,OAAO,KAAC,KAAK,IAAC,IAAI,EAAE,CAAC,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,GAAI,CAAC;AACtF,CAAC"}
+{"version":3,"file":"RestartToast.js","sourceRoot":"","sources":["../../../../src/client/surface/components/RestartToast.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,uCAAuC,CAAC;AAI9D,MAAM,UAAU,YAAY,CAAC,EAC3B,MAAM,EACN,CAAC,GAC4F;IAC7F,MAAM,MAAM,GAAG,oBAAoB,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAC1G,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IACtC,MAAM,aAAa,GAAG,MAAM,KAAK,+BAA+B,CAAC;IACjE,OAAO,KAAC,KAAK,IAEX,IAAI,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,kCAAkC,CAAC,CAAC,CAAC,iBAAiB,CAAC,EAC/E,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,EACtC,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,IAHrC,MAAM,CAIX,CAAC;AACL,CAAC"}