@cerbur/clutch-dsh-worktree 0.1.9 → 0.1.10

package/lib/client/surface/state/useSessionOrdering.js

@@ -0,0 +1,68 @@
+import { useEffect, useMemo } from 'react';
+import { filterVisibleSessionIds } from '../../session/session-view.js';
+import { unboundSessionIds, workspaceSessionIds } from '../../view/view-mode.js';
+import { nextSessionOrderAccount, } from '../../session/worktree-session-order.js';
+import { filterArchivedSessionIds } from '../../view/worktree-view.js';
+import { bindingIdsFor } from '../selectors.js';
+import { updatedAtById } from '../shared.js';
+export function useSessionOrdering({ read, source, props }) {
+    const { readState, viewByWorkspace } = read;
+    const { workspaces, sessions, archivedSessionIds, sessionOrderSnapshot, mode } = source;
+    const { sessionOrder } = props;
+    const sessionOrderInputs = useMemo(() => {
+        if (readState.status !== 'ready')
+            return [];
+        const inputs = [];
+        for (const workspace of workspaces.items) {
+            const view = viewByWorkspace.get(workspace.workspaceId);
+            const allWorkspaceSessionIds = filterArchivedSessionIds(workspaceSessionIds(workspaces, workspace.workspaceId, sessions.ids), archivedSessionIds);
+            const bindings = view?.bindings ?? [];
+            const boundSessionIds = new Set(bindings.map((binding) => binding.sessionId));
+            const mainSessionIds = filterVisibleSessionIds(unboundSessionIds(allWorkspaceSessionIds, [...boundSessionIds]), sessions);
+            inputs.push({
+                accountKey: `main:${workspace.workspaceId}`,
+                sessionIds: mainSessionIds,
+                updatedAtById: updatedAtById(mainSessionIds, sessions),
+            });
+            for (const record of view?.worktrees ?? []) {
+                const worktreeSessionIds = filterVisibleSessionIds(filterArchivedSessionIds(bindingIdsFor(bindings, record.worktreeId).filter((sessionId) => sessions.ids.includes(sessionId)), archivedSessionIds), sessions);
+                inputs.push({
+                    accountKey: `worktree:${record.worktreeId}`,
+                    sessionIds: worktreeSessionIds,
+                    updatedAtById: updatedAtById(worktreeSessionIds, sessions),
+                });
+            }
+        }
+        return inputs;
+    }, [
+        archivedSessionIds,
+        readState.status,
+        sessions.byId,
+        sessions.ids,
+        viewByWorkspace,
+        workspaces,
+        workspaces.items,
+    ]);
+    const orderedSessionIdsByAccount = useMemo(() => {
+        const ordered = new Map();
+        for (const input of sessionOrderInputs) {
+            const previous = sessionOrderSnapshot.accounts[input.accountKey];
+            ordered.set(input.accountKey, nextSessionOrderAccount({
+                baseIds: input.sessionIds,
+                updatedAtById: input.updatedAtById,
+                previous,
+            }).order);
+        }
+        return ordered;
+    }, [sessionOrderInputs, sessionOrderSnapshot]);
+    useEffect(() => {
+        if (mode !== 'worktree' || readState.status !== 'ready')
+            return;
+        for (const input of sessionOrderInputs) {
+            sessionOrder.actions.reconcile(input.accountKey, input.sessionIds, input.updatedAtById);
+        }
+        sessionOrder.actions.retain(sessionOrderInputs.map((input) => input.accountKey));
+    }, [mode, readState.status, sessionOrder, sessionOrderInputs]);
+    return { sessionOrderInputs, orderedSessionIdsByAccount };
+}
+//# sourceMappingURL=useSessionOrdering.js.map

package/lib/client/surface/state/useSessionOrdering.js.map

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

package/lib/client/surface/state/useSurfaceMenus.d.ts

@@ -0,0 +1,9 @@
+export declare function useSurfaceMenus(): {
+    openWorkspaceMenuId: string | undefined;
+    setOpenWorkspaceMenuId: import("react").Dispatch<import("react").SetStateAction<string | undefined>>;
+    openMainMenuId: string | undefined;
+    setOpenMainMenuId: import("react").Dispatch<import("react").SetStateAction<string | undefined>>;
+    openWorktreeMenuId: string | undefined;
+    setOpenWorktreeMenuId: import("react").Dispatch<import("react").SetStateAction<string | undefined>>;
+};
+//# sourceMappingURL=useSurfaceMenus.d.ts.map

package/lib/client/surface/state/useSurfaceMenus.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useSurfaceMenus.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/state/useSurfaceMenus.tsx"],"names":[],"mappings":"AAEA,wBAAgB,eAAe;;;;;;;EAY9B"}

package/lib/client/surface/state/useSurfaceMenus.js

@@ -0,0 +1,15 @@
+import { useState } from 'react';
+export function useSurfaceMenus() {
+    const [openWorkspaceMenuId, setOpenWorkspaceMenuId] = useState();
+    const [openMainMenuId, setOpenMainMenuId] = useState();
+    const [openWorktreeMenuId, setOpenWorktreeMenuId] = useState();
+    return {
+        openWorkspaceMenuId,
+        setOpenWorkspaceMenuId,
+        openMainMenuId,
+        setOpenMainMenuId,
+        openWorktreeMenuId,
+        setOpenWorktreeMenuId,
+    };
+}
+//# sourceMappingURL=useSurfaceMenus.js.map

package/lib/client/surface/state/useSurfaceMenus.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useSurfaceMenus.js","sourceRoot":"","sources":["../../../../src/client/surface/state/useSurfaceMenus.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEjC,MAAM,UAAU,eAAe;IAC7B,MAAM,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG,QAAQ,EAAU,CAAC;IACzE,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,EAAU,CAAC;IAC/D,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,QAAQ,EAAU,CAAC;IACvE,OAAO;QACL,mBAAmB;QACnB,sBAAsB;QACtB,cAAc;QACd,iBAAiB;QACjB,kBAAkB;QAClB,qBAAqB;KACtB,CAAC;AACJ,CAAC"}

package/lib/client/surface/state/useSurfaceRefresh.d.ts

@@ -0,0 +1,39 @@
+import type { ReadState, RefreshOptions, WorktreeSurfaceProps } from '../types.js';
+import type { useRegistrationState } from './useRegistrationState.js';
+import type { useSurfaceSources } from './useSurfaceSources.js';
+type Input = {
+    source: Pick<ReturnType<typeof useSurfaceSources>, 'forkRecoverySnapshot' | 'workspaceIdsRef' | 'mode' | 'workspaceIds' | 'sessionPresentations'>;
+    props: Pick<WorktreeSurfaceProps, 'manager' | 'viewReader' | 'invalidateWorktreeContext' | 'syncSessionWorkspaces'>;
+    registrationState: Pick<ReturnType<typeof useRegistrationState>, 'modalReadViewRef' | 'setModalReadError' | 'setModalReadLoading' | 'modalReadLoader' | 'setWorktreeModalWorkspaceId'>;
+};
+export declare function useSurfaceRefresh({ source, props, registrationState }: Input): {
+    readState: ReadState;
+    setReadState: import("react").Dispatch<import("react").SetStateAction<ReadState>>;
+    readStateRef: import("react").MutableRefObject<ReadState>;
+    refreshGuard: import("react").MutableRefObject<{
+        begin: () => number;
+        isCurrent: (generation: number) => boolean;
+        invalidate: () => void;
+        run<T>(load: () => Promise<T>, onSuccess: (value: T) => void, onError: (error: unknown) => void): Promise<void>;
+    }>;
+    targetRefreshGuards: import("react").MutableRefObject<Map<string, {
+        begin: () => number;
+        isCurrent: (generation: number) => boolean;
+        invalidate: () => void;
+        run<T>(load: () => Promise<T>, onSuccess: (value: T) => void, onError: (error: unknown) => void): Promise<void>;
+    }>>;
+    forkRecoveryRevisionRef: import("react").MutableRefObject<number>;
+    guardFor: (workspaceId: string) => {
+        begin: () => number;
+        isCurrent: (generation: number) => boolean;
+        invalidate: () => void;
+        run<T>(load: () => Promise<T>, onSuccess: (value: T) => void, onError: (error: unknown) => void): Promise<void>;
+    };
+    refresh: (options?: RefreshOptions) => Promise<void>;
+    loadModalWorktreeView: (workspaceId: string) => void;
+    previousWorkspaceIdsRef: import("react").MutableRefObject<readonly string[]>;
+    viewByWorkspace: Map<string, import("../../view/worktree-view-read.js").WorktreeWorkspaceView>;
+    previousActivityRef: import("react").MutableRefObject<Readonly<Record<string, import("../../session/session-view.js").SessionPresentation>>>;
+};
+export {};
+//# sourceMappingURL=useSurfaceRefresh.d.ts.map

package/lib/client/surface/state/useSurfaceRefresh.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useSurfaceRefresh.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/state/useSurfaceRefresh.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAEhE,KAAK,KAAK,GAAG;IACX,MAAM,EAAE,IAAI,CACV,UAAU,CAAC,OAAO,iBAAiB,CAAC,EACpC,sBAAsB,GAAG,iBAAiB,GAAG,MAAM,GAAG,cAAc,GAAG,sBAAsB,CAC9F,CAAC;IACF,KAAK,EAAE,IAAI,CACT,oBAAoB,EACpB,SAAS,GAAG,YAAY,GAAG,2BAA2B,GAAG,uBAAuB,CACjF,CAAC;IACF,iBAAiB,EAAE,IAAI,CACrB,UAAU,CAAC,OAAO,oBAAoB,CAAC,EACrC,kBAAkB,GAClB,mBAAmB,GACnB,qBAAqB,GACrB,iBAAiB,GACjB,6BAA6B,CAChC,CAAC;CACH,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,EAAE,KAAK;;;;;;;;;;;;;;;;;4BAmB5C,MAAM;;;;;;wBAQnB,cAAc,KAAQ,OAAO,CAAC,IAAI,CAAC;yCA6HrC,MAAM,KAAG,IAAI;;;;EA0J9B"}

package/lib/client/surface/state/useSurfaceRefresh.js

@@ -0,0 +1,274 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { createWorktreeRefreshGuard, mergeWorktreeView, mergeWorktreeViews, toWorktreeViewError, } from '../../view/worktree-view.js';
+import { worktreeActivityRefreshWorkspaceIds } from '../selectors.js';
+import { EMPTY_READ_STATE } from '../shared.js';
+export function useSurfaceRefresh({ source, props, registrationState }) {
+    const { forkRecoverySnapshot, workspaceIdsRef, mode, workspaceIds, sessionPresentations } = source;
+    const { manager, viewReader, invalidateWorktreeContext, syncSessionWorkspaces } = props;
+    const { modalReadViewRef, setModalReadError, setModalReadLoading, modalReadLoader, setWorktreeModalWorkspaceId, } = registrationState;
+    const [readState, setReadState] = useState(EMPTY_READ_STATE);
+    const readStateRef = useRef(readState);
+    readStateRef.current = readState;
+    const refreshGuard = useRef(createWorktreeRefreshGuard());
+    const targetRefreshGuards = useRef(new Map());
+    const forkRecoveryRevisionRef = useRef(forkRecoverySnapshot.revision);
+    const guardFor = (workspaceId) => {
+        const current = targetRefreshGuards.current.get(workspaceId);
+        if (current !== undefined)
+            return current;
+        const created = createWorktreeRefreshGuard();
+        targetRefreshGuards.current.set(workspaceId, created);
+        return created;
+    };
+    const refresh = useCallback(async (options = {}) => {
+        if (manager === undefined) {
+            refreshGuard.current.invalidate();
+            for (const guard of targetRefreshGuards.current.values())
+                guard.invalidate();
+            setReadState(EMPTY_READ_STATE);
+            return;
+        }
+        const scope = options.scope ?? { kind: 'global' };
+        const preserveCurrent = options.preserveCurrent === true;
+        const currentWorkspaceIds = workspaceIdsRef.current;
+        if (scope.kind === 'global') {
+            if (!preserveCurrent) {
+                setReadState({ status: 'loading', views: [] });
+            }
+            const selectedWorkspaceIds = [...currentWorkspaceIds];
+            for (const workspaceId of selectedWorkspaceIds) {
+                viewReader.invalidate(workspaceId);
+            }
+            const contextRefresh = options.invalidateContext === false ? undefined : invalidateWorktreeContext?.();
+            await refreshGuard.current.run(async () => {
+                const [views] = await Promise.all([
+                    viewReader.readMany(selectedWorkspaceIds),
+                    contextRefresh ?? Promise.resolve(),
+                ]);
+                return views;
+            }, (views) => {
+                setReadState((current) => {
+                    const merged = mergeWorktreeViews(current.views, workspaceIdsRef.current, views);
+                    return {
+                        status: 'ready',
+                        views: modalReadViewRef.current === undefined
+                            ? merged
+                            : mergeWorktreeView(merged, modalReadViewRef.current),
+                    };
+                });
+            }, (error) => {
+                if (preserveCurrent)
+                    throw error;
+                setReadState({
+                    status: 'error',
+                    views: modalReadViewRef.current === undefined ? [] : [modalReadViewRef.current],
+                    error: toWorktreeViewError(error),
+                });
+            });
+            return;
+        }
+        const requestedWorkspaceIds = scope.kind === 'workspace' ? [scope.workspaceId] : scope.workspaceIds;
+        const selectedWorkspaceIds = [...new Set(requestedWorkspaceIds)].filter((workspaceId) => currentWorkspaceIds.includes(workspaceId));
+        if (selectedWorkspaceIds.length === 0)
+            return;
+        await Promise.allSettled(selectedWorkspaceIds.map(async (workspaceId) => {
+            const guard = guardFor(workspaceId);
+            viewReader.invalidate(workspaceId, { reuseInFlight: options.reuseInFlight });
+            const contextRefresh = options.invalidateContext === false
+                ? undefined
+                : invalidateWorktreeContext?.(workspaceId);
+            const generation = guard.begin();
+            try {
+                const view = await viewReader.read(workspaceId);
+                if (!guard.isCurrent(generation))
+                    return;
+                if (!workspaceIdsRef.current.includes(workspaceId))
+                    return;
+                setReadState((current) => {
+                    const remainingTargetError = current.targetError?.workspaceIds.filter((candidate) => candidate !== workspaceId) ?? [];
+                    const next = {
+                        ...current,
+                        status: 'ready',
+                        views: mergeWorktreeViews(current.views, workspaceIdsRef.current, [view]),
+                        error: undefined,
+                    };
+                    if (remainingTargetError.length === 0) {
+                        const withoutTargetError = { ...next };
+                        delete withoutTargetError.targetError;
+                        return withoutTargetError;
+                    }
+                    return {
+                        ...next,
+                        targetError: {
+                            workspaceIds: remainingTargetError,
+                            error: current.targetError.error,
+                        },
+                    };
+                });
+            }
+            catch (error) {
+                if (!guard.isCurrent(generation))
+                    return;
+                if (!workspaceIdsRef.current.includes(workspaceId))
+                    return;
+                setReadState((current) => {
+                    const previousIds = current.targetError?.workspaceIds ?? [];
+                    return {
+                        ...current,
+                        status: 'ready',
+                        views: mergeWorktreeViews(current.views, workspaceIdsRef.current, []),
+                        error: undefined,
+                        targetError: {
+                            workspaceIds: [...new Set([...previousIds, workspaceId])],
+                            error: {
+                                ...toWorktreeViewError(error),
+                                retryable: true,
+                            },
+                        },
+                    };
+                });
+            }
+            finally {
+                await contextRefresh?.catch(() => undefined);
+            }
+        }));
+    }, [invalidateWorktreeContext, manager, viewReader]);
+    const loadModalWorktreeView = useCallback((workspaceId) => {
+        setModalReadError(undefined);
+        setModalReadLoading(true);
+        if (manager === undefined) {
+            setModalReadLoading(false);
+            setModalReadError({
+                code: 'WORKTREE_VIEW_UNAVAILABLE',
+                message: '',
+                retryable: true,
+            });
+            return;
+        }
+        void modalReadLoader.current.load(workspaceId, (view) => {
+            modalReadViewRef.current = view;
+            setModalReadLoading(false);
+            setReadState((current) => ({
+                ...current,
+                views: mergeWorktreeView(current.views, view),
+            }));
+        }, (error) => {
+            setModalReadLoading(false);
+            setModalReadError(toWorktreeViewError(error));
+        });
+    }, [manager, viewReader]);
+    useEffect(() => {
+        if (mode === 'worktree') {
+            void refresh({ preserveCurrent: readStateRef.current.status === 'ready' });
+        }
+        else {
+            refreshGuard.current.invalidate();
+            for (const guard of targetRefreshGuards.current.values())
+                guard.invalidate();
+            modalReadLoader.current.invalidate();
+            modalReadViewRef.current = undefined;
+            setWorktreeModalWorkspaceId(undefined);
+            setModalReadError(undefined);
+            setModalReadLoading(false);
+            setReadState(EMPTY_READ_STATE);
+        }
+    }, [mode, refresh]);
+    const previousWorkspaceIdsRef = useRef(workspaceIds);
+    useEffect(() => {
+        const previousWorkspaceIds = previousWorkspaceIdsRef.current;
+        previousWorkspaceIdsRef.current = workspaceIds;
+        if (mode !== 'worktree')
+            return;
+        const addedWorkspaceIds = workspaceIds.filter((workspaceId) => !previousWorkspaceIds.includes(workspaceId));
+        const removedWorkspaceIds = previousWorkspaceIds.filter((workspaceId) => !workspaceIds.includes(workspaceId));
+        for (const workspaceId of removedWorkspaceIds) {
+            targetRefreshGuards.current.delete(workspaceId);
+        }
+        setReadState((current) => {
+            const views = mergeWorktreeViews(current.views, workspaceIds, []);
+            const remainingTargetError = current.targetError?.workspaceIds.filter((workspaceId) => workspaceIds.includes(workspaceId)) ?? [];
+            const next = { ...current, views };
+            if (remainingTargetError.length === 0) {
+                const withoutTargetError = { ...next };
+                delete withoutTargetError.targetError;
+                return withoutTargetError;
+            }
+            return {
+                ...next,
+                targetError: {
+                    workspaceIds: remainingTargetError,
+                    error: current.targetError.error,
+                },
+            };
+        });
+        for (const workspaceId of addedWorkspaceIds) {
+            void refresh({
+                scope: { kind: 'workspace', workspaceId },
+                preserveCurrent: true,
+            }).catch(() => {
+                // The target error remains visible and can be retried explicitly.
+            });
+        }
+    }, [mode, refresh, workspaceIds]);
+    useEffect(() => {
+        if (forkRecoveryRevisionRef.current === forkRecoverySnapshot.revision)
+            return;
+        forkRecoveryRevisionRef.current = forkRecoverySnapshot.revision;
+        if (mode !== 'worktree' || manager === undefined)
+            return;
+        if (forkRecoverySnapshot.affectedWorkspaceIds.length === 0)
+            return;
+        void refresh({
+            scope: {
+                kind: 'workspaces',
+                workspaceIds: forkRecoverySnapshot.affectedWorkspaceIds,
+            },
+            preserveCurrent: readStateRef.current.status === 'ready',
+        }).catch(() => {
+            // Recovery state remains visible; the next explicit retry can refresh it again.
+        });
+    }, [
+        forkRecoverySnapshot.affectedWorkspaceIds,
+        forkRecoverySnapshot.revision,
+        manager,
+        mode,
+        refresh,
+    ]);
+    useEffect(() => {
+        if (readState.status !== 'ready' || syncSessionWorkspaces === undefined)
+            return;
+        syncSessionWorkspaces(readState.views.flatMap((view) => view.bindings.map((binding) => ({
+            workspaceId: binding.workspaceId,
+            sessionId: binding.sessionId,
+        }))));
+    }, [readState.status, readState.views, syncSessionWorkspaces]);
+    const viewByWorkspace = useMemo(() => new Map(readState.views.map((view) => [view.workspaceId, view])), [readState.views]);
+    const previousActivityRef = useRef(sessionPresentations);
+    useEffect(() => {
+        const previous = previousActivityRef.current;
+        previousActivityRef.current = sessionPresentations;
+        if (mode !== 'worktree')
+            return;
+        const affected = worktreeActivityRefreshWorkspaceIds(readStateRef.current.views, previous, sessionPresentations);
+        if (affected.length > 0)
+            void refresh({
+                scope: { kind: 'workspaces', workspaceIds: affected },
+                preserveCurrent: true,
+            });
+    }, [mode, refresh, sessionPresentations]);
+    return {
+        readState,
+        setReadState,
+        readStateRef,
+        refreshGuard,
+        targetRefreshGuards,
+        forkRecoveryRevisionRef,
+        guardFor,
+        refresh,
+        loadModalWorktreeView,
+        previousWorkspaceIdsRef,
+        viewByWorkspace,
+        previousActivityRef,
+    };
+}
+//# sourceMappingURL=useSurfaceRefresh.js.map

package/lib/client/surface/state/useSurfaceRefresh.js.map

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

package/lib/client/surface/state/useSurfaceSources.d.ts

@@ -0,0 +1,31 @@
+import { type SessionListLike } from '../../session/session-view.js';
+import type { WorkspaceListLike, WorktreeSurfaceProps } from '../types.js';
+type Input = {
+    props: Pick<WorktreeSurfaceProps, 'useStore' | 'available' | 'manager' | 'useSessions' | 'useWorkspaces' | 'forkRecovery' | 'expandState' | 'permissionNotice' | 'fullAccessConfirmation' | 'sessionOrder'>;
+};
+export declare function useSurfaceSources({ props }: Input): {
+    preferredMode: import("../../view/view-mode.js").WorktreeViewMode;
+    mode: import("../../view/view-mode.js").WorktreeViewMode;
+    sessions: SessionListLike;
+    workspaces: WorkspaceListLike;
+    forkRecoveryStore: import("../../session/worktree-session-fork.js").WorktreeForkRecoveryStore;
+    forkRecoverySnapshot: import("../../session/worktree-session-fork.js").WorktreeForkRecoverySnapshot;
+    currentSessionId: string | undefined;
+    workspaceIds: readonly string[];
+    workspaceIdsRef: import("react").MutableRefObject<readonly string[]>;
+    expandSnapshot: import("../../view/worktree-expand-state.js").WorktreeExpandState;
+    permissionNoticeSnapshot: import("../types.js").WorktreePermissionNotice | undefined;
+    fullAccessConfirmationSnapshot: import("../../index.js").WorktreeFullAccessConfirmationInput | undefined;
+    fullAccessConfirmationKey: string;
+    fullAccessAcknowledged: boolean;
+    setFullAccessAcknowledged: import("react").Dispatch<import("react").SetStateAction<boolean>>;
+    sessionOrderSnapshot: import("../../session/worktree-session-order.js").WorktreeSessionOrderState;
+    sessionPresentations: Readonly<Record<string, import("../../session/session-view.js").SessionPresentation>>;
+    ref: import("react").RefObject<HTMLDivElement>;
+    width: number;
+    bounds: import("../../overlay/overlay-bounds.js").OverlayBounds;
+    collapsed: boolean;
+    archivedSessionIds: readonly string[];
+};
+export {};
+//# sourceMappingURL=useSurfaceSources.d.ts.map

package/lib/client/surface/state/useSurfaceSources.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useSurfaceSources.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/state/useSurfaceSources.tsx"],"names":[],"mappings":"AACA,OAAO,EAAkC,KAAK,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAWrG,OAAO,KAAK,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAE3E,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,IAAI,CACT,oBAAoB,EAClB,UAAU,GACV,WAAW,GACX,SAAS,GACT,aAAa,GACb,eAAe,GACf,cAAc,GACd,aAAa,GACb,kBAAkB,GAClB,wBAAwB,GACxB,cAAc,CACjB,CAAC;CACH,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK;;;;;;;;;;;;;;;;;;;;;;;EA2FjD"}

package/lib/client/surface/state/useSurfaceSources.js

@@ -0,0 +1,63 @@
+import { useEffect, useMemo, useRef, useState, useSyncExternalStore } from 'react';
+import { deriveSessionPresentationIndex } from '../../session/session-view.js';
+import { useSidebarOverlayGeometry } from '../../overlay/sidebar-overlay-geometry.js';
+import { effectiveViewMode } from '../../view/view-mode.js';
+import { EMPTY_FORK_RECOVERY_STORE, EMPTY_FULL_ACCESS_CONFIRMATION_SNAPSHOT, EMPTY_FULL_ACCESS_CONFIRMATION_SUBSCRIBE, EMPTY_PERMISSION_NOTICE_SNAPSHOT, EMPTY_PERMISSION_NOTICE_SUBSCRIBE, useStableWorkspaceIds, } from '../shared.js';
+export function useSurfaceSources({ props }) {
+    const { useStore, available, manager, useSessions, useWorkspaces, forkRecovery, expandState, permissionNotice, fullAccessConfirmation, sessionOrder, } = props;
+    const preferredMode = useStore((state) => state.viewMode);
+    const mode = effectiveViewMode(preferredMode, available && manager !== undefined);
+    const sessions = useSessions((state) => state);
+    const workspaces = useWorkspaces((state) => state);
+    const forkRecoveryStore = forkRecovery ?? EMPTY_FORK_RECOVERY_STORE;
+    const forkRecoverySnapshot = useSyncExternalStore(forkRecoveryStore.subscribe, forkRecoveryStore.getSnapshot, forkRecoveryStore.getSnapshot);
+    const currentSessionId = sessions.current;
+    const workspaceIds = useStableWorkspaceIds(workspaces.items);
+    const workspaceIdsRef = useRef(workspaceIds);
+    workspaceIdsRef.current = workspaceIds;
+    const expandSnapshot = useSyncExternalStore(expandState.subscribe, expandState.getSnapshot, expandState.getSnapshot);
+    const permissionNoticeSnapshot = useSyncExternalStore(permissionNotice?.subscribe ?? EMPTY_PERMISSION_NOTICE_SUBSCRIBE, permissionNotice?.getSnapshot ?? EMPTY_PERMISSION_NOTICE_SNAPSHOT, permissionNotice?.getSnapshot ?? EMPTY_PERMISSION_NOTICE_SNAPSHOT);
+    const fullAccessConfirmationSnapshot = useSyncExternalStore(fullAccessConfirmation?.subscribe ?? EMPTY_FULL_ACCESS_CONFIRMATION_SUBSCRIBE, fullAccessConfirmation?.getSnapshot ?? EMPTY_FULL_ACCESS_CONFIRMATION_SNAPSHOT, fullAccessConfirmation?.getSnapshot ?? EMPTY_FULL_ACCESS_CONFIRMATION_SNAPSHOT);
+    const fullAccessConfirmationKey = fullAccessConfirmationSnapshot === undefined
+        ? ''
+        : [
+            fullAccessConfirmationSnapshot.workspaceId,
+            fullAccessConfirmationSnapshot.worktreeId,
+            fullAccessConfirmationSnapshot.sessionId,
+            fullAccessConfirmationSnapshot.cwd,
+        ].join('\u0000');
+    const [fullAccessAcknowledged, setFullAccessAcknowledged] = useState(false);
+    useEffect(() => {
+        setFullAccessAcknowledged(false);
+    }, [fullAccessConfirmationKey]);
+    const sessionOrderSnapshot = useSyncExternalStore(sessionOrder.subscribe, sessionOrder.getSnapshot, sessionOrder.getSnapshot);
+    const sessionPresentations = useMemo(() => deriveSessionPresentationIndex(sessions), [sessions.byId]);
+    const { ref, width, bounds } = useSidebarOverlayGeometry(mode === 'worktree');
+    const collapsed = width <= 64;
+    const archivedSessionIds = workspaces.archivedSessionIds ?? [];
+    return {
+        preferredMode,
+        mode,
+        sessions,
+        workspaces,
+        forkRecoveryStore,
+        forkRecoverySnapshot,
+        currentSessionId,
+        workspaceIds,
+        workspaceIdsRef,
+        expandSnapshot,
+        permissionNoticeSnapshot,
+        fullAccessConfirmationSnapshot,
+        fullAccessConfirmationKey,
+        fullAccessAcknowledged,
+        setFullAccessAcknowledged,
+        sessionOrderSnapshot,
+        sessionPresentations,
+        ref,
+        width,
+        bounds,
+        collapsed,
+        archivedSessionIds,
+    };
+}
+//# sourceMappingURL=useSurfaceSources.js.map

package/lib/client/surface/state/useSurfaceSources.js.map

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