@cerbur/clutch-dsh-worktree 0.1.16 → 0.1.18

package/lib/client/settings/ToolSettings.js.map

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

package/lib/client/settings/WorktreeSettings.d.ts

@@ -0,0 +1,8 @@
+import type { WorktreeTranslate } from '../surface/types.js';
+import type { WorktreeToolSettingsManager } from '../../contract/tool-settings.js';
+export declare function WorktreeSettings({ t, close, manager, }: {
+    readonly t: WorktreeTranslate;
+    readonly close: () => void;
+    readonly manager?: WorktreeToolSettingsManager;
+}): import("react").JSX.Element;
+//# sourceMappingURL=WorktreeSettings.d.ts.map

package/lib/client/settings/WorktreeSettings.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WorktreeSettings.d.ts","sourceRoot":"","sources":["../../../src/client/settings/WorktreeSettings.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAK7D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,iCAAiC,CAAC;AAEnF,wBAAgB,gBAAgB,CAAC,EAC/B,CAAC,EACD,KAAK,EACL,OAAO,GACR,EAAE;IACD,QAAQ,CAAC,CAAC,EAAE,iBAAiB,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,MAAM,IAAI,CAAC;IAC3B,QAAQ,CAAC,OAAO,CAAC,EAAE,2BAA2B,CAAC;CAChD,+BAoIA"}

package/lib/client/settings/WorktreeSettings.js

@@ -0,0 +1,46 @@
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { Button, SegmentedTabs, Tag } from '@deepseek-ai/dsh-client-ui-primitives';
+import { useId, useState, useSyncExternalStore } from 'react';
+import { formatWorktreeViewError } from '../view/worktree-error-copy.js';
+import { worktreeDiagnostics } from './diagnostics.js';
+import styles from './settings.css';
+import { ToolSettings } from './ToolSettings.js';
+export function WorktreeSettings({ t, close, manager, }) {
+    const entries = useSyncExternalStore(worktreeDiagnostics.subscribe, worktreeDiagnostics.getSnapshot, worktreeDiagnostics.getSnapshot);
+    const [tab, setTab] = useState(entries.some((entry) => entry.status === 'active') ? 'errors' : 'general');
+    const id = useId();
+    return (_jsxs("section", { className: styles.settings, "data-worktree-settings": true, children: [_jsx("h2", { className: styles.settingsTitle, children: t('settings.title') }), _jsx(SegmentedTabs, { label: t('settings.title'), className: styles.settingsTabs, value: tab, onChange: setTab, items: [
+                    {
+                        value: 'general',
+                        label: t('settings.general'),
+                        id: id + 'general',
+                        panelId: id + 'panel',
+                    },
+                    {
+                        value: 'errors',
+                        label: t('settings.errors'),
+                        id: id + 'errors',
+                        panelId: id + 'panel',
+                    },
+                ] }), _jsx("div", { className: styles.settingsPanel, role: "tabpanel", id: id + 'panel', "aria-labelledby": id + tab, children: tab === 'general' ? (_jsx(ToolSettings, { manager: manager, scope: { kind: 'general' }, t: t })) : (_jsxs(_Fragment, { children: [_jsxs("div", { className: styles.settingsToolbar, children: [_jsx("p", { className: styles.settingsHint, children: t('settings.retention') }), _jsx(Button, { className: styles.settingsAction, size: "sm", variant: "outline", disabled: !entries.some((entry) => entry.status !== 'active'), onClick: () => worktreeDiagnostics.clearHistory(), children: t('settings.clearHistory') })] }), entries.length === 0 && _jsx("p", { className: styles.settingsEmpty, children: t('settings.empty') }), _jsx("div", { className: styles.issueList, children: [...entries].reverse().map((entry) => (_jsxs("article", { className: styles.issue, "data-worktree-diagnostic": true, children: [_jsxs("div", { className: styles.issueHeader, children: [_jsx("h3", { className: styles.issueTitle, children: entry.describe?.(t) ?? entry.context ?? t('settings.operation') }), _jsx(Tag, { className: styles.issueStatus, tone: entry.status === 'active'
+                                                    ? 'danger'
+                                                    : entry.status === 'resolved'
+                                                        ? 'quiet'
+                                                        : 'neutral', children: t(entry.status === 'active'
+                                                    ? 'settings.active'
+                                                    : entry.status === 'resolved'
+                                                        ? 'settings.resolved'
+                                                        : 'settings.inactive') })] }), _jsx("p", { className: styles.issueMessage, children: entry.message?.(t) ??
+                                            (entry.error === undefined
+                                                ? entry.text
+                                                : formatWorktreeViewError(entry.error, t)) }), entry.status === 'inactive' && (_jsx("p", { className: styles.settingsHint, children: t('settings.reopen') })), entry.actions.length > 0 && (_jsx("div", { className: styles.issueActions, children: entry.actions.map((action, index) => (_jsx(Button, { className: styles.settingsAction, size: "sm", variant: "outline", disabled: action.disabled, onClick: () => {
+                                                if (action.leaveSettings)
+                                                    close();
+                                                action.onClick();
+                                            }, children: action.label }, index))) })), entry.error !== undefined && (_jsxs("details", { className: styles.issueDiagnostics, children: [_jsx("summary", { children: t('settings.diagnostics') }), _jsx("pre", { children: JSON.stringify({
+                                                    code: entry.error.code,
+                                                    message: entry.error.message,
+                                                    details: entry.error.details,
+                                                }, null, 2) })] }))] }, entry.key))) })] })) })] }));
+}
+//# sourceMappingURL=WorktreeSettings.js.map

package/lib/client/settings/WorktreeSettings.js.map

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

package/lib/client/settings/WorktreeSettingsNavIcon.d.ts

@@ -0,0 +1,6 @@
+import type { WorktreeTranslate } from '../surface/types.js';
+/** The native settings shell has no section-icon slot; decorate only our nav row. */
+export declare function WorktreeSettingsNavIcon({ t }: {
+    t: WorktreeTranslate;
+}): import("react").ReactPortal | null;
+//# sourceMappingURL=WorktreeSettingsNavIcon.d.ts.map

package/lib/client/settings/WorktreeSettingsNavIcon.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WorktreeSettingsNavIcon.d.ts","sourceRoot":"","sources":["../../../src/client/settings/WorktreeSettingsNavIcon.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAK7D,qFAAqF;AACrF,wBAAgB,uBAAuB,CAAC,EAAE,CAAC,EAAE,EAAE;IAAE,CAAC,EAAE,iBAAiB,CAAA;CAAE,sCA4CtE"}

package/lib/client/settings/WorktreeSettingsNavIcon.js

@@ -0,0 +1,51 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useEffect, useLayoutEffect, useState } from 'react';
+import { createPortal } from 'react-dom';
+import { IconBranchOutline16 } from '../dsh-icons.js';
+import styles from './settings.css';
+const ATTRIBUTE = 'data-worktree-settings-nav-icon';
+/** The native settings shell has no section-icon slot; decorate only our nav row. */
+export function WorktreeSettingsNavIcon({ t }) {
+    const [target, setTarget] = useState();
+    const label = t('settings.title');
+    useEffect(() => {
+        if (typeof document === 'undefined')
+            return;
+        let active = true;
+        let queued = false;
+        const scan = () => {
+            if (!active || queued)
+                return;
+            queued = true;
+            queueMicrotask(() => {
+                queued = false;
+                if (!active)
+                    return;
+                const rows = Array.from(document.querySelectorAll('[data-shortcut-modal="settings"] nav button')).filter((row) => row.textContent?.trim() === label && row.querySelector(':scope > svg') !== null);
+                // Ambiguous labels or changed shell markup leave the native icon intact.
+                setTarget(rows.length === 1 ? rows[0] : undefined);
+            });
+        };
+        const observer = new MutationObserver(scan);
+        observer.observe(document.documentElement, {
+            childList: true,
+            characterData: true,
+            subtree: true,
+        });
+        scan();
+        return () => {
+            active = false;
+            observer.disconnect();
+        };
+    }, [label]);
+    useLayoutEffect(() => {
+        if (!target)
+            return;
+        target.setAttribute(ATTRIBUTE, '');
+        return () => target.removeAttribute(ATTRIBUTE);
+    }, [target]);
+    return target
+        ? createPortal(_jsx(IconBranchOutline16, { size: 16, className: styles.settingsNavIcon }), target)
+        : null;
+}
+//# sourceMappingURL=WorktreeSettingsNavIcon.js.map

package/lib/client/settings/WorktreeSettingsNavIcon.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WorktreeSettingsNavIcon.js","sourceRoot":"","sources":["../../../src/client/settings/WorktreeSettingsNavIcon.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtD,OAAO,MAAM,MAAM,gBAAgB,CAAC;AAEpC,MAAM,SAAS,GAAG,iCAAiC,CAAC;AAEpD,qFAAqF;AACrF,MAAM,UAAU,uBAAuB,CAAC,EAAE,CAAC,EAA4B;IACrE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,EAAW,CAAC;IAChD,MAAM,KAAK,GAAG,CAAC,CAAC,gBAAgB,CAAC,CAAC;IAClC,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO,QAAQ,KAAK,WAAW;YAAE,OAAO;QAC5C,IAAI,MAAM,GAAG,IAAI,CAAC;QAClB,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,MAAM,IAAI,GAAG,GAAG,EAAE;YAChB,IAAI,CAAC,MAAM,IAAI,MAAM;gBAAE,OAAO;YAC9B,MAAM,GAAG,IAAI,CAAC;YACd,cAAc,CAAC,GAAG,EAAE;gBAClB,MAAM,GAAG,KAAK,CAAC;gBACf,IAAI,CAAC,MAAM;oBAAE,OAAO;gBACpB,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CACrB,QAAQ,CAAC,gBAAgB,CAAC,6CAA6C,CAAC,CACzE,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CACf,GAAG,CAAC,WAAW,EAAE,IAAI,EAAE,KAAK,KAAK,IAAI,GAAG,CAAC,aAAa,CAAC,cAAc,CAAC,KAAK,IAAI,CAChF,CAAC;gBACF,yEAAyE;gBACzE,SAAS,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YACrD,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QACF,MAAM,QAAQ,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAC5C,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,eAAe,EAAE;YACzC,SAAS,EAAE,IAAI;YACf,aAAa,EAAE,IAAI;YACnB,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;QACH,IAAI,EAAE,CAAC;QACP,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,KAAK,CAAC;YACf,QAAQ,CAAC,UAAU,EAAE,CAAC;QACxB,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAEZ,eAAe,CAAC,GAAG,EAAE;QACnB,IAAI,CAAC,MAAM;YAAE,OAAO;QACpB,MAAM,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QACnC,OAAO,GAAG,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;IACjD,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEb,OAAO,MAAM;QACX,CAAC,CAAC,YAAY,CAAC,KAAC,mBAAmB,IAAC,IAAI,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,eAAe,GAAI,EAAE,MAAM,CAAC;QAC5F,CAAC,CAAC,IAAI,CAAC;AACX,CAAC"}

package/lib/client/settings/diagnostics.d.ts

@@ -0,0 +1,24 @@
+import type { WorktreeNotification } from '../surface/notification-queue.js';
+export interface WorktreeDiagnostic extends WorktreeNotification {
+    readonly source: string;
+    readonly status: 'active' | 'resolved' | 'inactive';
+    readonly actions: NonNullable<WorktreeNotification['actions']>;
+}
+/** Browser-memory history. Unmount is not proof of recovery; stale actions are revoked. */
+export declare function createWorktreeDiagnostics(): {
+    getSnapshot: () => readonly WorktreeDiagnostic[];
+    subscribe: (listener: () => void) => () => void;
+    publish(source: string, notices: readonly WorktreeNotification[]): void;
+    deactivate(source: string): void;
+    clearHistory(): void;
+    dispose(): void;
+};
+export declare const worktreeDiagnostics: {
+    getSnapshot: () => readonly WorktreeDiagnostic[];
+    subscribe: (listener: () => void) => () => void;
+    publish(source: string, notices: readonly WorktreeNotification[]): void;
+    deactivate(source: string): void;
+    clearHistory(): void;
+    dispose(): void;
+};
+//# sourceMappingURL=diagnostics.d.ts.map

package/lib/client/settings/diagnostics.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"diagnostics.d.ts","sourceRoot":"","sources":["../../../src/client/settings/diagnostics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAE7E,MAAM,WAAW,kBAAmB,SAAQ,oBAAoB;IAC9D,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,QAAQ,GAAG,UAAU,GAAG,UAAU,CAAC;IACpD,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,CAAC;CAChE;AAED,2FAA2F;AAC3F,wBAAgB,yBAAyB;;0BAmBf,MAAM,IAAI;oBAIhB,MAAM,WAAW,SAAS,oBAAoB,EAAE;uBAqB7C,MAAM;;;EAe5B;AAGD,eAAO,MAAM,mBAAmB;;0BA3CN,MAAM,IAAI;oBAIhB,MAAM,WAAW,SAAS,oBAAoB,EAAE;uBAqB7C,MAAM;;;CAkBiC,CAAC"}

package/lib/client/settings/diagnostics.js

@@ -0,0 +1,63 @@
+/** Browser-memory history. Unmount is not proof of recovery; stale actions are revoked. */
+export function createWorktreeDiagnostics() {
+    let snapshot = [];
+    const sources = new Map();
+    const listeners = new Set();
+    const emit = () => listeners.forEach((listener) => listener());
+    const limitHistory = () => {
+        const history = snapshot.filter((entry) => entry.status !== 'active').slice(-100);
+        snapshot = [...history, ...snapshot.filter((entry) => entry.status === 'active')];
+    };
+    const retire = (source, status, keys = new Set()) => {
+        snapshot = snapshot.map((entry) => entry.source === source && entry.status === 'active' && !keys.has(entry.key)
+            ? { ...entry, status, actions: [] }
+            : entry);
+        limitHistory();
+    };
+    return {
+        getSnapshot: () => snapshot,
+        subscribe: (listener) => {
+            listeners.add(listener);
+            return () => { listeners.delete(listener); };
+        },
+        publish(source, notices) {
+            sources.set(source, notices);
+            retire(source, 'resolved', new Set(notices.map((notice) => notice.key)));
+            for (const notice of notices) {
+                const entry = {
+                    ...notice, source, status: 'active',
+                    actions: (notice.actions ?? []).map((action) => ({
+                        ...action,
+                        onClick: () => {
+                            const current = sources.get(source)?.find((item) => item.key === notice.key)?.actions
+                                ?.find((item) => item.label === action.label);
+                            if (current !== undefined && !current.disabled)
+                                current.onClick();
+                        },
+                    })),
+                };
+                snapshot = [...snapshot.filter((item) => item.key !== notice.key), entry];
+            }
+            // Keep active recoveries even when many historical failures have accumulated.
+            limitHistory();
+            emit();
+        },
+        deactivate(source) {
+            sources.delete(source);
+            retire(source, 'inactive');
+            emit();
+        },
+        clearHistory() {
+            snapshot = snapshot.filter((entry) => entry.status === 'active');
+            emit();
+        },
+        dispose() {
+            sources.clear();
+            snapshot = [];
+            emit();
+        },
+    };
+}
+// Shared by the native Settings seat and surface within one loaded Client module.
+export const worktreeDiagnostics = createWorktreeDiagnostics();
+//# sourceMappingURL=diagnostics.js.map

package/lib/client/settings/diagnostics.js.map

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

package/lib/client/settings/settings-navigation.d.ts

@@ -0,0 +1,7 @@
+/** The rc.1 native Settings shell shares one viewing store between mouse and command entry. */
+export declare function openWorktreeErrorSettings(slots: {
+    readonly entriesOfSlot: (name: 'sidebar.settings') => readonly {
+        readonly store?: unknown;
+    }[];
+}): boolean;
+//# sourceMappingURL=settings-navigation.d.ts.map

package/lib/client/settings/settings-navigation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"settings-navigation.d.ts","sourceRoot":"","sources":["../../../src/client/settings/settings-navigation.ts"],"names":[],"mappings":"AAAA,+FAA+F;AAC/F,wBAAgB,yBAAyB,CAAC,KAAK,EAAE;IAC/C,QAAQ,CAAC,aAAa,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,SAAS;QAC7D,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;KAC1B,EAAE,CAAC;CACL,GAAG,OAAO,CAQV"}

package/lib/client/settings/settings-navigation.js

@@ -0,0 +1,12 @@
+/** The rc.1 native Settings shell shares one viewing store between mouse and command entry. */
+export function openWorktreeErrorSettings(slots) {
+    const store = slots.entriesOfSlot('sidebar.settings')[0]?.store;
+    if (typeof store?.create !== 'function')
+        return false;
+    const instance = store.create();
+    if (typeof instance?.actions?.openSection !== 'function')
+        return false;
+    instance.actions.openSection('clutch-dsh-worktree');
+    return true;
+}
+//# sourceMappingURL=settings-navigation.js.map

package/lib/client/settings/settings-navigation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"settings-navigation.js","sourceRoot":"","sources":["../../../src/client/settings/settings-navigation.ts"],"names":[],"mappings":"AAAA,+FAA+F;AAC/F,MAAM,UAAU,yBAAyB,CAAC,KAIzC;IACC,MAAM,KAAK,GAAG,KAAK,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,EAAE,KAC2B,CAAC;IACtF,IAAI,OAAO,KAAK,EAAE,MAAM,KAAK,UAAU;QAAE,OAAO,KAAK,CAAC;IACtD,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;IAChC,IAAI,OAAO,QAAQ,EAAE,OAAO,EAAE,WAAW,KAAK,UAAU;QAAE,OAAO,KAAK,CAAC;IACvE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;IACpD,OAAO,IAAI,CAAC;AACd,CAAC"}

package/lib/client/surface/actions/useLifecycleActions.d.ts

@@ -1,5 +1,6 @@
 import type { WorktreeRecord } from '../../../contract/index.js';
 import { type WorktreeViewError } from '../../view/worktree-view.js';
+import type { WorktreeNotification } from '../notification-queue.js';
 import type { WorktreeSurfaceProps } from '../types.js';
 import type { useLifecycleState } from '../state/useLifecycleState.js';
 import type { useSurfaceMutation } from './useSurfaceMutation.js';
@@ -18,7 +19,7 @@ export declare function useLifecycleActions({ read, lifecycleState, source, prop
     forgetTarget: WorktreeRecord | undefined;
     permissionRetryTarget: WorktreeRecord | undefined;
     retryCleanupPermissions: () => Promise<void>;
-    recoveryAction: (error: WorktreeViewError | undefined) => import("react").JSX.Element | null;
+    recoveryAction: (error: WorktreeViewError | undefined) => NonNullable<WorktreeNotification["actions"]>[number] | null;
     branchActions: (record: WorktreeRecord) => {
         onAdoptBranch: (() => void) | undefined;
         onRecover: (() => void) | undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"useLifecycleActions.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/actions/useLifecycleActions.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAGL,KAAK,iBAAiB,EACvB,MAAM,6BAA6B,CAAC;AAErC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,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,IAAI,EAAE,IAAI,CACR,UAAU,CAAC,OAAO,iBAAiB,CAAC,EACpC,iBAAiB,GAAG,cAAc,GAAG,SAAS,GAAG,cAAc,CAChE,CAAC;IACF,cAAc,EAAE,IAAI,CAClB,UAAU,CAAC,OAAO,iBAAiB,CAAC,EAClC,mBAAmB,GACnB,gBAAgB,GAChB,wBAAwB,GACxB,cAAc,GACd,2BAA2B,GAC3B,wBAAwB,GACxB,qBAAqB,CACxB,CAAC;IACF,MAAM,EAAE,IAAI,CACV,UAAU,CAAC,OAAO,iBAAiB,CAAC,EACpC,MAAM,GAAG,0BAA0B,GAAG,iBAAiB,CACxD,CAAC;IACF,KAAK,EAAE,IAAI,CACT,oBAAoB,EACpB,YAAY,GAAG,kBAAkB,GAAG,oBAAoB,GAAG,SAAS,GAAG,GAAG,GAAG,YAAY,CAC1F,CAAC;IACF,QAAQ,EAAE,IAAI,CACZ,UAAU,CAAC,OAAO,kBAAkB,CAAC,EACrC,eAAe,GAAG,kBAAkB,GAAG,aAAa,GAAG,gBAAgB,CACxE,CAAC;CACH,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,KAAK;oCAcnD,cAAc,GAAG,SAAS;;;;mCAoBvB,OAAO,CAAC,IAAI,CAAC;4BAmCxB,iBAAiB,GAAG,SAAS;4BAoB7B,cAAc;;;;iCAmBL,OAAO,CAAC,IAAI,CAAC;0BAiCxB,cAAc,KAAG,MAAM;EAerD"}
+{"version":3,"file":"useLifecycleActions.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/actions/useLifecycleActions.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAGL,KAAK,iBAAiB,EACvB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,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,IAAI,EAAE,IAAI,CACR,UAAU,CAAC,OAAO,iBAAiB,CAAC,EACpC,iBAAiB,GAAG,cAAc,GAAG,SAAS,GAAG,cAAc,CAChE,CAAC;IACF,cAAc,EAAE,IAAI,CAClB,UAAU,CAAC,OAAO,iBAAiB,CAAC,EAClC,mBAAmB,GACnB,gBAAgB,GAChB,wBAAwB,GACxB,cAAc,GACd,2BAA2B,GAC3B,wBAAwB,GACxB,qBAAqB,CACxB,CAAC;IACF,MAAM,EAAE,IAAI,CACV,UAAU,CAAC,OAAO,iBAAiB,CAAC,EACpC,MAAM,GAAG,0BAA0B,GAAG,iBAAiB,CACxD,CAAC;IACF,KAAK,EAAE,IAAI,CACT,oBAAoB,EACpB,YAAY,GAAG,kBAAkB,GAAG,oBAAoB,GAAG,SAAS,GAAG,GAAG,GAAG,YAAY,CAC1F,CAAC;IACF,QAAQ,EAAE,IAAI,CACZ,UAAU,CAAC,OAAO,kBAAkB,CAAC,EACrC,eAAe,GAAG,kBAAkB,GAAG,aAAa,GAAG,gBAAgB,CACxE,CAAC;CACH,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,KAAK;oCAcnD,cAAc,GAAG,SAAS;;;;mCAoBvB,OAAO,CAAC,IAAI,CAAC;4BAoC9C,iBAAiB,GAAG,SAAS,KACnC,WAAW,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI;4BAwB/B,cAAc;;;;iCAmBL,OAAO,CAAC,IAAI,CAAC;0BAiCxB,cAAc,KAAG,MAAM;EAerD"}

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'
@@ -123,7 +132,7 @@ export function useLifecycleActions({ read, lifecycleState, source, props, mutat
         }
     };
     const branchLabel = (record) => record.health === 'branch-drift'
-        ? `${record.branch} → ${record.currentBranch ?? t('worktree.detachedHead')}`
+        ? `${record.branch} → ${record.currentHead?.name ?? record.currentBranch ?? t('worktree.detachedHead')}`
         : record.branch;
     return {
         latestLifecycleTarget,

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

@@ -8,7 +8,7 @@ import type { useSurfaceRefresh } from '../state/useSurfaceRefresh.js';
 import type { useSurfaceSources } from '../state/useSurfaceSources.js';
 type Input = {
     source: Pick<ReturnType<typeof useSurfaceSources>, 'workspaces'>;
-    registrationState: Pick<ReturnType<typeof useRegistrationState>, 'worktreeModalWorkspaceId' | 'modalReadLoading' | 'setSelectedBranch' | 'setNewBranch' | 'setImportCandidates' | 'importCandidatesGuard' | 'modalWorkspaceIdRef' | 'modalReadLoader' | 'modalReadViewRef' | 'setWorktreeModalWorkspaceId' | 'setModalReadError' | 'setModalReadLoading' | 'setWorktreeModalMode' | 'setSelectedImportPath' | 'importCandidates' | 'newBranch' | 'selectedImportPath' | 'worktreeModalMode' | 'selectedBranch'>;
+    registrationState: Pick<ReturnType<typeof useRegistrationState>, 'worktreeModalWorkspaceId' | 'modalReadLoading' | 'modalBranches' | 'setModalBranches' | 'setSelectedBranch' | 'setNewBranch' | 'setImportCandidates' | 'importCandidatesGuard' | 'modalWorkspaceIdRef' | 'modalGenerationRef' | 'modalLifetimeRef' | 'modalReadLoader' | 'modalReadViewRef' | 'setWorktreeModalWorkspaceId' | 'setModalReadError' | 'setModalReadLoading' | 'setWorktreeModalMode' | 'setSelectedImportPath' | 'importCandidates' | 'newBranch' | 'selectedImportPath' | 'worktreeModalMode' | 'selectedBranch'>;
     read: Pick<ReturnType<typeof useSurfaceRefresh>, 'viewByWorkspace' | 'loadModalWorktreeView' | 'refresh'>;
     props: Pick<WorktreeSurfaceProps, 'manager' | 'createSessionForWorktree'>;
     mutation: Pick<ReturnType<typeof useSurfaceMutation>, 'actionPending' | 'setActionError' | 'setActionPending'>;

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,eAAe,GACf,kBAAkB,GAClB,mBAAmB,GACnB,cAAc,GACd,qBAAqB,GACrB,uBAAuB,GACvB,qBAAqB,GACrB,oBAAoB,GACpB,kBAAkB,GAClB,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;;;;;;wCAyEgB,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;+CAqBE,IAAI;qCAarC,aAAa,aACd,sBAAsB,KAC/B,IAAI;oCAgCgC,wBAAwB,KAAG,IAAI;uDAYhD,cAAc,KACjC,OAAO,CAAC,IAAI,CAAC;0BA0CiB,OAAO,CAAC,IAAI,CAAC;EAgE/C"}