@cerbur/clutch-dsh-worktree 0.1.16 → 0.1.17

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

@@ -1,6 +1,4 @@
-import { jsx as _jsx } from "react/jsx-runtime";
 import { mergeWorktreeView, toWorktreeViewError, } from '../../view/worktree-view.js';
-import styles from '../../worktree.css';
 export function useLifecycleActions({ read, lifecycleState, source, props, mutation }) {
     const { viewByWorkspace, readStateRef, refresh, setReadState } = read;
     const { worktreeCleanDisk, worktreeForget, permissionRetryPending, cleanupGuard, setWorktreeBranchAdoption, worktreeBranchAdoption, branchAdoptionGuard, } = lifecycleState;
@@ -57,14 +55,25 @@ export function useLifecycleActions({ read, lifecycleState, source, props, mutat
     };
     const recoveryAction = (error) => {
         const workspaceId = error?.details?.workspaceId;
-        if (!manager || error?.code !== 'WORKTREE_RECOVERY_REQUIRED' || typeof workspaceId !== 'string')
+        if (!manager ||
+            error === undefined ||
+            ![
+                'WORKTREE_RECOVERY_REQUIRED',
+                'SIDECAR_SYNC_REQUIRED',
+                'WORKTREE_IDENTITY_CHANGED',
+            ].includes(error.code) ||
+            typeof workspaceId !== 'string')
             return null;
-        return (_jsx("button", { type: "button", className: styles.retryButton, disabled: actionPending, onClick: () => {
+        return {
+            label: t('worktree.retryRecovery'),
+            disabled: actionPending,
+            onClick: () => {
                 void runMutation(() => manager.recoverWorktrees({ workspaceId }), {
                     scope: { kind: 'workspace', workspaceId },
                     preserveCurrent: true,
                 });
-            }, children: t('worktree.retryRecovery') }));
+            },
+        };
     };
     const branchActions = (record) => ({
         onAdoptBranch: record.health === 'branch-drift' && typeof record.currentBranch === 'string'

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

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

package/lib/client/surface/actions/useSessionActions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useSessionActions.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/actions/useSessionActions.tsx"],"names":[],"mappings":"AAGA,OAAO,EAIL,KAAK,6BAA6B,EACnC,MAAM,6BAA6B,CAAC;AAErC,OAAO,KAAK,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAC/E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,KAAK,KAAK,GAAG;IACX,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,EAAE,oBAAoB,CAAC,CAAC;IACzE,KAAK,EAAE,IAAI,CACT,oBAAoB,EAClB,0BAA0B,GAC1B,SAAS,GACT,wBAAwB,GACxB,YAAY,GACZ,mBAAmB,GACnB,oBAAoB,GACpB,aAAa,GACb,kBAAkB,CACrB,CAAC;IACF,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,kBAAkB,CAAC,EAAE,gBAAgB,GAAG,kBAAkB,CAAC,CAAC;IAC7F,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,EAAE,SAAS,CAAC,CAAC;CAC7D,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,KAAK;;;;;;2BAmBpC,6BAA6B,KAAG,OAAO,CAAC,IAAI,CAAC;+BAkC3C,OAAO,CAAC,IAAI,CAAC;4BAiCd,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;wCAWhB,MAAM,aAAa,MAAM,KAAG,IAAI;EAe5E"}
+{"version":3,"file":"useSessionActions.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/actions/useSessionActions.tsx"],"names":[],"mappings":"AAGA,OAAO,EAIL,KAAK,6BAA6B,EACnC,MAAM,6BAA6B,CAAC;AAErC,OAAO,KAAK,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAC/E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,KAAK,KAAK,GAAG;IACX,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,EAAE,oBAAoB,CAAC,CAAC;IACzE,KAAK,EAAE,IAAI,CACT,oBAAoB,EAClB,0BAA0B,GAC1B,SAAS,GACT,wBAAwB,GACxB,YAAY,GACZ,mBAAmB,GACnB,oBAAoB,GACpB,aAAa,GACb,kBAAkB,CACrB,CAAC;IACF,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,kBAAkB,CAAC,EAAE,gBAAgB,GAAG,kBAAkB,CAAC,CAAC;IAC7F,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,EAAE,SAAS,CAAC,CAAC;CAC7D,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,KAAK;;;;;;2BAmBpC,6BAA6B,KAAG,OAAO,CAAC,IAAI,CAAC;+BAmC3C,OAAO,CAAC,IAAI,CAAC;4BAgCd,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;wCAWhB,MAAM,aAAa,MAAM,KAAG,IAAI;EAe5E"}

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

@@ -32,14 +32,15 @@ export function useSessionActions({ source, props, mutation, read }) {
             });
         }
         catch (error) {
-            if (error instanceof WorktreeSessionBindingError && error.retryable) {
-                setPendingSessionBinding({ ...input, sessionId: error.sessionId });
+            if (error instanceof WorktreeSessionBindingError) {
+                setPendingSessionBinding({ ...input, sessionId: error.sessionId, error: toWorktreeViewError(error) });
             }
             if (error instanceof WorktreeSessionPermissionError && error.retryable) {
                 setPendingSessionBinding({
                     ...input,
                     sessionId: error.sessionId,
                     permissionRequired: true,
+                    error: toWorktreeViewError(error),
                 });
             }
             setActionError(toWorktreeViewError(error));
@@ -49,7 +50,8 @@ export function useSessionActions({ source, props, mutation, read }) {
         }
     };
     const retrySessionBinding = async () => {
-        if (manager === undefined || pendingSessionBinding === undefined || pendingSessionArchived)
+        if (manager === undefined || pendingSessionBinding === undefined || pendingSessionArchived ||
+            pendingSessionBinding.error?.retryable === false)
             return;
         const pending = pendingSessionBinding;
         setActionPending(true);
@@ -74,9 +76,7 @@ export function useSessionActions({ source, props, mutation, read }) {
             });
         }
         catch (error) {
-            if (error instanceof WorktreeSessionBindingError && !error.retryable) {
-                setPendingSessionBinding(undefined);
-            }
+            setPendingSessionBinding({ ...pending, error: toWorktreeViewError(error) });
             setActionError(toWorktreeViewError(error));
         }
         finally {

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

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

package/lib/client/surface/actions/useWorktreeRegistration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useWorktreeRegistration.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/actions/useWorktreeRegistration.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAWjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,KAAK,EACV,aAAa,EACb,wBAAwB,EACxB,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,KAAK,KAAK,GAAG;IACX,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,EAAE,YAAY,CAAC,CAAC;IACjE,iBAAiB,EAAE,IAAI,CACrB,UAAU,CAAC,OAAO,oBAAoB,CAAC,EACrC,0BAA0B,GAC1B,kBAAkB,GAClB,mBAAmB,GACnB,cAAc,GACd,qBAAqB,GACrB,uBAAuB,GACvB,qBAAqB,GACrB,iBAAiB,GACjB,kBAAkB,GAClB,6BAA6B,GAC7B,mBAAmB,GACnB,qBAAqB,GACrB,sBAAsB,GACtB,uBAAuB,GACvB,kBAAkB,GAClB,WAAW,GACX,oBAAoB,GACpB,mBAAmB,GACnB,gBAAgB,CACnB,CAAC;IACF,IAAI,EAAE,IAAI,CACR,UAAU,CAAC,OAAO,iBAAiB,CAAC,EACpC,iBAAiB,GAAG,uBAAuB,GAAG,SAAS,CACxD,CAAC;IACF,KAAK,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,GAAG,0BAA0B,CAAC,CAAC;IAC1E,QAAQ,EAAE,IAAI,CACZ,UAAU,CAAC,OAAO,kBAAkB,CAAC,EACrC,eAAe,GAAG,gBAAgB,GAAG,kBAAkB,CACxD,CAAC;IACF,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,EAAE,0BAA0B,CAAC,CAAC;CACjF,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,EACtC,MAAM,EACN,iBAAiB,EACjB,IAAI,EACJ,KAAK,EACL,QAAQ,EACR,OAAO,GACR,EAAE,KAAK;;;;;;wCA+DgB,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;+CAqBE,IAAI;qCAUrC,aAAa,aACd,sBAAsB,KAC/B,IAAI;oCA2BgC,wBAAwB,KAAG,IAAI;uDAWhD,cAAc,KACjC,OAAO,CAAC,IAAI,CAAC;0BAwCiB,OAAO,CAAC,IAAI,CAAC;EA4D/C"}
+{"version":3,"file":"useWorktreeRegistration.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/actions/useWorktreeRegistration.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAWjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,KAAK,EACV,aAAa,EACb,wBAAwB,EACxB,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,KAAK,KAAK,GAAG;IACX,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,EAAE,YAAY,CAAC,CAAC;IACjE,iBAAiB,EAAE,IAAI,CACrB,UAAU,CAAC,OAAO,oBAAoB,CAAC,EACrC,0BAA0B,GAC1B,kBAAkB,GAClB,mBAAmB,GACnB,cAAc,GACd,qBAAqB,GACrB,uBAAuB,GACvB,qBAAqB,GACrB,iBAAiB,GACjB,kBAAkB,GAClB,6BAA6B,GAC7B,mBAAmB,GACnB,qBAAqB,GACrB,sBAAsB,GACtB,uBAAuB,GACvB,kBAAkB,GAClB,WAAW,GACX,oBAAoB,GACpB,mBAAmB,GACnB,gBAAgB,CACnB,CAAC;IACF,IAAI,EAAE,IAAI,CACR,UAAU,CAAC,OAAO,iBAAiB,CAAC,EACpC,iBAAiB,GAAG,uBAAuB,GAAG,SAAS,CACxD,CAAC;IACF,KAAK,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,GAAG,0BAA0B,CAAC,CAAC;IAC1E,QAAQ,EAAE,IAAI,CACZ,UAAU,CAAC,OAAO,kBAAkB,CAAC,EACrC,eAAe,GAAG,gBAAgB,GAAG,kBAAkB,CACxD,CAAC;IACF,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,EAAE,0BAA0B,CAAC,CAAC;CACjF,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,EACtC,MAAM,EACN,iBAAiB,EACjB,IAAI,EACJ,KAAK,EACL,QAAQ,EACR,OAAO,GACR,EAAE,KAAK;;;;;;wCA+DgB,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;+CAqBE,IAAI;qCAUrC,aAAa,aACd,sBAAsB,KAC/B,IAAI;oCA2BgC,wBAAwB,KAAG,IAAI;uDAWhD,cAAc,KACjC,OAAO,CAAC,IAAI,CAAC;0BA0CiB,OAAO,CAAC,IAAI,CAAC;EA4D/C"}

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

@@ -123,14 +123,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;

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/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"}

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

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