@undefineds.co/xpod 0.4.18 → 0.4.20

package/node_modules/@undefineds.co/extension-sdk/dist/react/solid-auth-boundary.js

@@ -1,83 +1,19 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { useState } from 'react';
-import { AuthSurface, Button, Card, CardContent, CardDescription, CardHeader, CardTitle, StorageBootstrapView, WebIdLoginRouteView, } from '@undefineds.co/shared-ui';
-const routeCopy = {
-    title: 'Connect to Solid',
-    description: 'Choose an identity route to continue.',
-    startLabel: 'Continue',
-    restoringLabel: 'Restoring your session…',
-    connectingLabel: 'Connecting…',
-    rememberedLabel: 'Remembered identity',
-    expiredTitle: 'Session expired',
-    retryLabel: 'Try again',
-    cancelLabel: 'Cancel',
-    storageConflictTitle: 'Storage conflict',
-    failureTitle: 'Could not sign in',
-    switchAccountLabel: 'Switch account',
-};
-const storageCopy = {
-    title: 'Prepare storage',
-    description: 'The host is preparing the selected storage binding.',
-    creationMessage: 'Storage is not ready yet.',
-    waitingMessage: 'Waiting for the storage binding.',
-    readyMessage: 'Storage is ready.',
-    conflictMessage: 'The selected storage conflicts with this identity.',
-    errorMessage: 'Storage could not be prepared.',
-    createLabel: 'Create storage',
-    continueLabel: 'Continue',
-    retryLabel: 'Try again',
-    cancelLabel: 'Cancel',
-};
-function presentationState(state, storageState) {
-    if (storageState?.status === 'conflict') {
-        return { status: 'storage-conflict', message: storageState.message };
-    }
-    if (storageState?.status === 'error') {
-        return { status: 'error', message: storageState.message };
-    }
-    switch (state.status) {
-        case 'restoring':
-            return state.remembered
-                ? { status: 'restoring', remembered: state.remembered }
-                : { status: 'restoring' };
-        case 'anonymous':
-            return state.remembered
-                ? { status: 'remembered', remembered: state.remembered }
-                : { status: 'anonymous' };
-        case 'connecting':
-            return { status: 'connecting' };
-        case 'authenticated':
-            return { status: 'authenticated', webId: state.webId };
-        case 'expired':
-            return state.remembered
-                ? { status: 'expired', remembered: state.remembered }
-                : { status: 'expired' };
-        case 'error':
-            return { status: 'error', message: state.message };
+import { useRef, useState } from 'react';
+import { Button, PodSignIn, PodSignInFrame, SourceMark, formatCopy, resolvePodSignInCopy, webIdShortName, } from '@undefineds.co/shared-ui';
+const DEFAULT_APP_NAME = 'Solid';
+function presentationFor(mode) {
+    switch (mode) {
+        case 'page': return { presentation: 'page', modal: false };
+        case 'modal': return { presentation: 'dialog', modal: true };
+        case 'embedded': return { presentation: 'dialog', modal: false };
     }
 }
-function storageViewState(state) {
-    switch (state.status) {
-        case 'loading':
-            return 'waiting';
-        case 'empty':
-            return 'creation';
-        case 'selecting':
-            return 'waiting_for_binding';
-        case 'creating':
-            return 'creating';
-        case 'waiting_for_binding':
-            return 'waiting_for_binding';
-        case 'ready':
-            return 'ready';
-        case 'conflict':
-            return { status: 'conflict', message: state.message };
-        case 'error':
-            return { status: 'error', message: state.message };
-    }
-}
-function isStorageReady(state) {
-    return state === undefined || state.status === 'ready';
+function rememberedIdentity(remembered) {
+    return {
+        displayName: remembered.displayName,
+        ...(remembered.avatarUrl ? { avatarUrl: remembered.avatarUrl } : {}),
+    };
 }
 function storageBindingLabel(binding) {
     if (binding.label?.trim())
@@ -87,62 +23,143 @@ function storageBindingLabel(binding) {
 function storageBindingKey(binding) {
     return `${binding.storageUrl}\u0000${binding.webId}`;
 }
-function StorageSelectionView({ state, copy, onSelectStorage, onContinueStorage, }) {
+/** The Pod chooser: the same 360px body and tokens as the sign-in states. */
+function StorageSelectionView({ state, app, copy, storageCopy, onSelectStorage, onContinueStorage, }) {
     const [selectedKey, setSelectedKey] = useState();
     const selected = state.candidates.find((candidate) => storageBindingKey(candidate) === selectedKey);
     const canSelect = Boolean(onSelectStorage || onContinueStorage);
-    return (_jsxs(Card, { className: "w-full rounded-none border-0 bg-transparent text-card-foreground shadow-none", children: [copy.title || copy.description ? (_jsxs(CardHeader, { children: [copy.title ? _jsx(CardTitle, { children: copy.title }) : null, copy.description ? _jsx(CardDescription, { children: copy.description }) : null] })) : null, _jsxs(CardContent, { className: "space-y-4 px-4 pb-4 pt-0", children: [_jsx("p", { role: "status", "aria-live": "polite", className: "text-sm text-foreground", children: "Choose a storage binding to continue." }), _jsx("div", { className: "space-y-2", children: state.candidates.map((candidate) => {
-                            const key = storageBindingKey(candidate);
-                            const label = storageBindingLabel(candidate);
-                            const isSelected = key === selectedKey;
-                            const content = (_jsxs(_Fragment, { children: [_jsx("span", { className: "min-w-0 truncate", children: label }), _jsx("span", { className: "shrink-0 text-xs text-muted-foreground", children: isSelected ? 'Selected' : 'Select' })] }));
-                            return canSelect ? (_jsx(Button, { type: "button", variant: isSelected ? 'secondary' : 'outline', className: "h-auto w-full justify-between gap-3 px-3 py-3 text-left", "aria-label": `${isSelected ? 'Selected' : 'Select'} ${label}`, "aria-pressed": isSelected, onClick: () => {
-                                    setSelectedKey(key);
-                                    if (onSelectStorage)
-                                        void onSelectStorage(candidate);
-                                }, children: content }, key)) : (_jsx("div", { className: "flex items-center justify-between gap-3 rounded-md border border-border/60 px-3 py-3 text-sm", children: content }, key));
-                        }) }), selected && onContinueStorage ? (_jsx(Button, { type: "button", className: "w-full", onClick: () => void onContinueStorage(selected), children: copy.continueLabel })) : null] })] }));
+    const title = storageCopy?.title || copy.choosePodTitle;
+    const continueLabel = storageCopy?.continueLabel || copy.customSubmit;
+    return (_jsxs("div", { "data-pod-sign-in-state": "choose-pod", className: "flex flex-col gap-6", children: [_jsx(SourceMark, { icon: app.icon, name: app.name }), _jsxs("div", { className: "flex flex-col gap-1", children: [_jsx("h1", { className: "text-xl font-semibold text-foreground", children: title }), _jsx("p", { role: "status", "aria-live": "polite", className: "text-sm text-muted-foreground", children: storageCopy?.description || copy.choosePodLead })] }), _jsx("div", { className: "flex flex-col gap-2", children: state.candidates.map((candidate) => {
+                    const key = storageBindingKey(candidate);
+                    const label = storageBindingLabel(candidate);
+                    const isSelected = key === selectedKey;
+                    const stateLabel = isSelected ? copy.selected : copy.select;
+                    const content = (_jsxs(_Fragment, { children: [_jsx("span", { className: "min-w-0 truncate text-sm text-foreground", children: label }), _jsx("span", { className: "shrink-0 text-[13px] text-muted-foreground", children: stateLabel })] }));
+                    return canSelect ? (_jsx("button", { type: "button", "aria-label": `${stateLabel} ${label}`, "aria-pressed": isSelected, className: `flex min-h-11 w-full items-center justify-between gap-3 rounded-lg border px-3 py-2 text-left focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-ring ${isSelected ? 'border-primary bg-accent' : 'border-border bg-card'}`, onClick: () => {
+                            setSelectedKey(key);
+                            if (onSelectStorage)
+                                void onSelectStorage(candidate);
+                        }, children: content }, key)) : (_jsx("div", { className: "flex min-h-11 items-center justify-between gap-3 rounded-lg border border-border bg-card px-3 py-2", children: content }, key));
+                }) }), selected && onContinueStorage ? (_jsx(Button, { type: "button", className: "h-11 w-full rounded-lg text-sm font-medium", onClick: () => void onContinueStorage(selected), children: continueLabel })) : null] }));
+}
+function isStorageReady(state) {
+    return state === undefined || state.status === 'ready';
 }
-export function SolidAuthBoundary({ state, storageState, routes, storageRouteId, onCreateStorage, onContinueStorage, onSelectStorage, copy, onLogin, onRetry, onCancel, onSwitchAccount, surfaceMode = 'page', onSurfaceClose, auxiliary, children, }) {
-    const visibleRouteCopy = { ...routeCopy, ...copy?.route };
-    const visibleStorageCopy = { ...storageCopy, ...copy?.storage };
-    // AuthSurface owns both the accessible heading and the card frame for the
-    // boundary. The nested views render unframed with presentation-only titles
-    // so the surface does not show double cards or two equally named headings.
-    const routeViewCopy = { ...visibleRouteCopy, title: '' };
-    const storageViewCopy = { ...visibleStorageCopy, title: '' };
-    const surface = (title, content) => (_jsx(AuthSurface, { mode: surfaceMode, title: title, onClose: onSurfaceClose, closeLabel: "Close", children: content }));
+/**
+ * The application front door for third-party apps: maps the WebID and Pod
+ * selection state onto the shared `PodSignIn` states (A0-A3, plus a one-line
+ * C notice). It renders no second login flow; every action calls the host.
+ */
+export function SolidAuthBoundary({ state, storageState, routes, storageRouteId, onCreateStorage, onContinueStorage, onSelectStorage, copy, onLogin, onRetry, onCancel, onSwitchAccount, surfaceMode = 'page', onSurfaceClose, auxiliary, app: appProp, locale = 'en', podSignInCopy, developerMode = false, children, }) {
+    const text = resolvePodSignInCopy(locale, podSignInCopy);
+    // `connecting` carries only the route, so the screen the user pressed the button on
+    // (remembered identity or first visit) is remembered from the states before it.
+    const lastRemembered = useRef(undefined);
+    if (state.status === 'anonymous' || state.status === 'restoring' || state.status === 'expired') {
+        lastRemembered.current = state.remembered;
+    }
+    const app = appProp ?? { name: DEFAULT_APP_NAME };
+    const { presentation, modal } = presentationFor(surfaceMode);
+    const frame = (content) => (_jsxs(PodSignInFrame, { presentation: presentation, modal: modal, ariaLabel: text.chooseTitle, onClose: onSurfaceClose ? () => void onSurfaceClose() : undefined, closeLabel: onSurfaceClose ? text.close : undefined, children: [content, auxiliary ? _jsx("div", { className: "mt-4", children: auxiliary }) : null] }));
     if (state.status === 'authenticated' && isStorageReady(storageState)) {
         return _jsx(_Fragment, { children: children });
     }
     if (state.status === 'authenticated' && storageState?.status === 'selecting') {
-        return surface(visibleStorageCopy.title, (_jsx(StorageSelectionView, { state: storageState, copy: storageViewCopy, onSelectStorage: onSelectStorage, onContinueStorage: onContinueStorage })));
+        return frame(_jsx(StorageSelectionView, { state: storageState, app: app, copy: text, storageCopy: copy?.storage, onSelectStorage: onSelectStorage, onContinueStorage: onContinueStorage }));
+    }
+    // Route used by "sign in" and "sign in again": the remembered identity's route,
+    // else the only route. With several routes and nothing remembered the first is the primary one.
+    const rememberedOf = (s) => (s.status === 'anonymous' || s.status === 'restoring' || s.status === 'expired' ? s.remembered : undefined);
+    const remembered = rememberedOf(state);
+    const primaryRoute = state.status === 'connecting'
+        ? state.route
+        : routes.find((route) => route.id === remembered?.routeId) ?? routes[0];
+    const login = () => { if (primaryRoute)
+        void onLogin(primaryRoute.id); };
+    const relogin = () => {
+        const routeId = state.status === 'error' ? state.retryRouteId : primaryRoute?.id;
+        if (routeId && onRetry)
+            void onRetry(routeId);
+        else
+            login();
+    };
+    const noop = () => undefined;
+    const extraRoutes = state.status === 'anonymous' && !remembered ? routes.filter((route) => route !== primaryRoute) : [];
+    let podState;
+    let notice;
+    let onPrimary = login;
+    let onUseAnother = onSwitchAccount ? () => void onSwitchAccount() : undefined;
+    const serviceLabel = primaryRoute?.label;
+    // Route-specific label for the primary button on the first-visit screen.
+    const routeCopy = serviceLabel
+        ? { useXpod: formatCopy(text.signInWith, { service: serviceLabel }) }
+        : undefined;
+    if (state.status === 'authenticated') {
+        // Valid WebID sessions stay valid while their Pod opens or retries: never
+        // turn a Pod problem into a second login.
+        const identity = { displayName: webIdShortName(state.webId) };
+        const busy = storageState?.status === 'loading'
+            || storageState?.status === 'waiting_for_binding'
+            || storageState?.status === 'creating';
+        podState = { kind: 'remembered', identity, busy };
+        onUseAnother = undefined;
+        onPrimary = noop;
+        if (storageState?.status === 'error') {
+            notice = { tone: 'warning', text: text.noticeUnreachable, primaryLabel: text.retry, developerDetail: storageState.message };
+            const retryRouteId = storageRouteId;
+            onPrimary = retryRouteId && onRetry ? () => void onRetry(retryRouteId) : noop;
+        }
+        else if (storageState?.status === 'conflict') {
+            notice = { tone: 'warning', text: text.noticeIncomplete, primaryLabel: text.useAnother, developerDetail: storageState.message };
+            onPrimary = onSwitchAccount
+                ? () => void onSwitchAccount()
+                : storageRouteId && onRetry ? () => void onRetry(storageRouteId) : noop;
+        }
+        else if (storageState?.status === 'empty') {
+            notice = { tone: 'neutral', text: text.noticeNoWebId, primaryLabel: text.goCreate };
+            onPrimary = onCreateStorage ? () => void onCreateStorage() : noop;
+        }
+    }
+    else if (state.status === 'restoring') {
+        podState = { kind: 'restoring', ...(remembered ? { identity: rememberedIdentity(remembered) } : {}) };
+    }
+    else if (state.status === 'connecting') {
+        // The screen the user pressed the button on, with the button spinning.
+        podState = lastRemembered.current
+            ? { kind: 'remembered', identity: rememberedIdentity(lastRemembered.current), busy: true }
+            : { kind: 'choose-service', busy: true };
+        if (lastRemembered.current)
+            onUseAnother = undefined;
+    }
+    else if (state.status === 'expired') {
+        podState = {
+            kind: 'expired',
+            identity: rememberedIdentity(remembered ?? { displayName: serviceLabel ?? app.name }),
+        };
+        onPrimary = relogin;
     }
-    if (state.status === 'authenticated' && storageState) {
-        const storageStateView = storageViewState(storageState);
-        const canRetryStorage = Boolean(onRetry && storageRouteId
-            && (storageState.status === 'conflict' || storageState.status === 'error'));
-        const canCancelStorage = Boolean(onCancel
-            && (storageState.status === 'creating' || storageState.status === 'waiting_for_binding'));
-        return surface(visibleStorageCopy.title, (_jsx(StorageBootstrapView, { state: storageStateView, copy: storageViewCopy, onCreate: storageState.status === 'empty' ? onCreateStorage : undefined, onRetry: canRetryStorage ? () => void onRetry?.(storageRouteId) : undefined, onCancel: canCancelStorage ? onCancel : undefined, framed: false })));
+    else {
+        // anonymous, or error (same screens plus a C4 notice)
+        podState = remembered
+            ? { kind: 'remembered', identity: rememberedIdentity(remembered) }
+            : { kind: 'choose-service' };
+        if (state.status === 'error') {
+            notice = {
+                tone: 'warning',
+                text: text.noticeIncomplete,
+                primaryLabel: text.reauthenticate,
+                developerDetail: state.message,
+            };
+            onPrimary = relogin;
+        }
+        if (primaryRoute?.availability === 'starting') {
+            podState = { ...podState, busy: true };
+        }
+        else if (primaryRoute?.availability === 'unavailable' && !notice) {
+            notice = { tone: 'warning', text: primaryRoute.unavailableReason ?? text.noticeUnreachable };
+            onPrimary = noop;
+        }
     }
-    const routeList = state.status === 'connecting'
-        ? [state.route]
-        : routes.length > 0
-            ? routes
-            : [];
-    const mappedState = presentationState(state, storageState);
-    return surface(visibleRouteCopy.title, (_jsxs("div", { className: "flex w-full flex-col gap-4", children: [routeList.map((route) => {
-                const retryRouteId = state.status === 'error'
-                    ? state.retryRouteId
-                    : state.status === 'expired'
-                        ? state.remembered?.routeId ?? (routes.length === 1 ? routes[0]?.id : undefined)
-                        : undefined;
-                const canRetry = Boolean(onRetry && (retryRouteId === route.id
-                    || (storageRouteId === route.id
-                        && (storageState?.status === 'conflict' || storageState?.status === 'error'))));
-                const canStart = state.status === 'anonymous';
-                const canCancel = state.status === 'connecting';
-                return (_jsx(WebIdLoginRouteView, { route: route, state: mappedState, copy: routeViewCopy, onStart: canStart ? onLogin : undefined, onRetry: canRetry ? onRetry : undefined, onCancel: canCancel ? onCancel : undefined, onSwitchAccount: onSwitchAccount, framed: false }, route.id));
-            }), auxiliary ? _jsx("div", { children: auxiliary }) : null] })));
+    return frame(_jsxs(_Fragment, { children: [_jsx(PodSignIn, { app: app, state: podState, notice: notice, locale: locale, copy: { ...routeCopy, ...podSignInCopy }, developerMode: developerMode, primaryIcon: null, capabilities: { customService: false, register: false }, onPrimary: onPrimary, onUseAnother: onUseAnother }), extraRoutes.length > 0 ? (_jsx("div", { className: "mt-3 flex flex-col gap-2", children: extraRoutes.map((route) => (_jsx(Button, { type: "button", variant: "outline", className: "h-11 w-full rounded-lg text-sm font-medium", disabled: route.availability === 'unavailable', onClick: () => void onLogin(route.id), children: formatCopy(text.signInWith, { service: route.label }) }, route.id))) })) : null, state.status === 'connecting' && onCancel ? (_jsx(Button, { type: "button", variant: "ghost", className: "mt-2 h-9 w-full rounded-lg px-2 text-sm font-medium", onClick: () => void onCancel(), children: text.cancel })) : null] }));
 }

package/node_modules/@undefineds.co/extension-sdk/dist/react/workspace-layout.d.ts

@@ -1,16 +1,7 @@
 import { type ReactNode } from 'react';
-import { type AppletPageType } from '../layout';
 import { type WorkspaceLayoutMode, type WorkspaceLayoutPane } from './layout-context';
 export type TwoPaneLayoutMode = 'auto' | WorkspaceLayoutMode;
-export interface WorkspacePageTypeProps {
-    /**
-     * §8.3 页型。概览、固定配置、诊断不会渲染对象列；只有 `collection` 且确有集合才在宽断点出现。
-     * 默认保持旧行为（集合页 + 有集合），新页面应显式声明。
-     */
-    pageType?: AppletPageType;
-    hasObjectCollection?: boolean;
-}
-export interface TwoPaneLayoutProps extends WorkspacePageTypeProps {
+export interface TwoPaneLayoutProps {
     listHeader: ReactNode;
     list: ReactNode;
     mainHeader: ReactNode;
@@ -28,7 +19,7 @@ export interface ThreePaneLayoutContextConfig {
     collapsible?: boolean;
     initiallyCollapsed?: boolean;
 }
-export interface ThreePaneLayoutProps extends WorkspacePageTypeProps {
+export interface ThreePaneLayoutProps {
     header?: ReactNode;
     list: ReactNode;
     main: ReactNode;
@@ -42,6 +33,6 @@ export interface WorkspaceLayoutHistoryAdapter {
     push(pane: WorkspaceLayoutPane): void;
     subscribe(listener: (pane: WorkspaceLayoutPane) => void): () => void;
 }
-export declare function TwoPaneLayout({ listHeader, list, mainHeader, main, mode, history, className, pageType, hasObjectCollection, }: TwoPaneLayoutProps): import("react").JSX.Element;
+export declare function TwoPaneLayout({ listHeader, list, mainHeader, main, mode, history, className, }: TwoPaneLayoutProps): import("react").JSX.Element;
 export declare function SinglePaneLayout({ header, main, className, }: SinglePaneLayoutProps): import("react").JSX.Element;
-export declare function ThreePaneLayout({ header, list, main, context, mode, history, contextConfig, className, pageType, hasObjectCollection, }: ThreePaneLayoutProps): import("react").JSX.Element;
+export declare function ThreePaneLayout({ header, list, main, context, mode, history, contextConfig, className, }: ThreePaneLayoutProps): import("react").JSX.Element;

package/node_modules/@undefineds.co/extension-sdk/dist/react/workspace-layout.js

@@ -1,7 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useCallback, useLayoutEffect, useMemo, useRef, useState, useSyncExternalStore, } from 'react';
 import { cn } from '@undefineds.co/shared-ui';
-import { resolveAppletPanePlan, XPOD_LAYOUT_BREAKPOINTS, XPOD_LAYOUT_RAIL_WIDTH, } from '../layout.js';
 import { WorkspaceLayoutContext, } from './layout-context.js';
 const stackMediaQuery = '(max-width: 767px)';
 const twoPaneGridStyle = {
@@ -34,54 +33,6 @@ function useResolvedMode(mode) {
     const autoMode = useSyncExternalStore(subscribeToStackModeChange, getAutoModeSnapshot, getServerAutoModeSnapshot);
     return mode === 'auto' ? autoMode : mode;
 }
-/**
- * 对象列的可用宽度媒体查询：§8.3 的 1100px 是**内容**宽度，宽窗口还有一个 184px 导航列，
- * 所以视口阈值要加上它。
- */
-const objectColumnMediaQuery = `(min-width: ${XPOD_LAYOUT_BREAKPOINTS.wideObjects + XPOD_LAYOUT_RAIL_WIDTH}px)`;
-/**
- * 是否够放对象列。
- *
- * 没有 `matchMedia` 的环境（服务端渲染、旧测试环境）按宽窗口处理——与 `getServerAutoModeSnapshot`
- * 的既有默认一致：产品主要跑在桌面壳里，未知环境不应把已有的两栏布局变成堆叠。
- */
-function useRoomForObjectColumn() {
-    return useSyncExternalStore((onStoreChange) => {
-        if (typeof window === 'undefined' || typeof window.matchMedia !== 'function') {
-            return () => undefined;
-        }
-        const media = window.matchMedia(objectColumnMediaQuery);
-        media.addEventListener('change', onStoreChange);
-        return () => media.removeEventListener('change', onStoreChange);
-    }, () => (typeof window === 'undefined' || typeof window.matchMedia !== 'function'
-        ? true
-        : window.matchMedia(objectColumnMediaQuery).matches), () => true);
-}
-/**
- * 把 §8.3 的页型、宽度与集合事实落到布局上：复用 `resolveAppletPanePlan` 作为唯一判断处，
- * 概览/固定配置/诊断在任何宽度都不出现对象列，集合页在 1100px 以下改为堆叠。
- */
-function useObjectColumn(input) {
-    const narrow = useSyncExternalStore(subscribeToStackModeChange, getAutoModeSnapshot, getServerAutoModeSnapshot) === 'stack';
-    const roomForObjects = useRoomForObjectColumn();
-    // 只需要区分三个区间，因此给 plan 一个能代表当前区间的宽度
-    const contentWidth = roomForObjects
-        ? XPOD_LAYOUT_BREAKPOINTS.wideObjects
-        : narrow
-            ? XPOD_LAYOUT_BREAKPOINTS.narrow - 1
-            : XPOD_LAYOUT_BREAKPOINTS.narrow;
-    const plan = resolveAppletPanePlan({
-        pageType: input.pageType,
-        contentWidth,
-        hasObjectCollection: input.hasObjectCollection,
-    });
-    // §8.3：只有真正的集合列出现时才是并排；其余（含窄窗的集合页）都走 list→detail 的堆叠
-    const autoMode = plan.panes === 'list-detail' ? 'split' : 'stack';
-    return {
-        resolvedMode: input.mode === 'auto' ? autoMode : input.mode,
-        showObjectColumn: plan.showObjectColumn,
-    };
-}
 function useStackNavigation({ resolvedMode, history, resolvePane, }) {
     const [activePane, setActivePane] = useState('list');
     const focusPaneRef = useRef(null);
@@ -135,11 +86,8 @@ function useStackNavigation({ resolvedMode, history, resolvePane, }) {
         openContext,
     };
 }
-export function TwoPaneLayout({ listHeader, list, mainHeader, main, mode = 'auto', history, className, pageType = 'collection', hasObjectCollection = true, }) {
-    const { resolvedMode } = useObjectColumn({ mode, pageType, hasObjectCollection });
-    // §8.3：非集合页不渲染对象列；集合页只有宽断点才显示
-    // §8.3：只有集合页才有对象列表；宽度决定它是并排的对象列还是堆叠的第一屏
-    const showList = pageType === 'collection' && hasObjectCollection;
+export function TwoPaneLayout({ listHeader, list, mainHeader, main, mode = 'auto', history, className, }) {
+    const resolvedMode = useResolvedMode(mode);
     const { activePane, paneRefs, openList, openMain, openContext, } = useStackNavigation({
         resolvedMode,
         history,
@@ -153,19 +101,15 @@ export function TwoPaneLayout({ listHeader, list, mainHeader, main, mode = 'auto
         openContext,
     }), [activePane, openContext, openList, openMain, resolvedMode]);
     const isStack = resolvedMode === 'stack';
-    const stacked = showList && isStack;
-    const listHidden = !showList || (stacked && activePane !== 'list');
-    const mainHidden = stacked && activePane !== 'main';
-    return (_jsx(WorkspaceLayoutContext.Provider, { value: navigation, children: _jsx("section", { className: cn('flex min-h-0 flex-1 flex-col bg-background', className), "data-workspace-layout": "two-pane", "data-workspace-mode": resolvedMode, children: _jsxs("div", { className: cn('grid min-h-0 flex-1', stacked || !showList ? 'grid-cols-1' : null), style: stacked || !showList ? undefined : twoPaneGridStyle, "data-workspace-layout-mode": mode, "data-workspace-object-column": showList && resolvedMode === 'split' ? 'shown' : 'hidden', "data-workspace-active-pane": activePane, children: [_jsxs("aside", { ref: paneRefs.list, className: cn('min-h-0 flex-col overflow-hidden bg-layout-list-item @container', listHidden ? 'hidden' : 'flex', stacked ? 'border-r-0' : 'border-r border-border'), "data-testid": "workspace-list-pane", "data-workspace-pane": "list", hidden: listHidden, tabIndex: stacked ? -1 : undefined, children: [_jsx("header", { className: "h-12 shrink-0 border-b border-border bg-layout-list-header", "data-workspace-list-header": "true", children: listHeader }), _jsx("div", { className: "min-h-0 flex-1 overflow-y-auto", children: list })] }), _jsxs("main", { ref: paneRefs.main, className: cn('min-h-0 flex-col overflow-hidden bg-layout-content @container', mainHidden ? 'hidden' : 'flex'), "data-testid": "workspace-main-pane", "data-workspace-pane": "main", hidden: mainHidden, tabIndex: stacked ? -1 : undefined, children: [_jsx("header", { className: "h-12 shrink-0 border-b border-border bg-layout-content", "data-workspace-main-header": "true", children: mainHeader }), _jsxs("div", { className: "min-h-0 flex-1 overflow-y-auto", children: [stacked ? (_jsx("button", { type: "button", className: "inline-flex items-center px-4 py-3 text-sm text-muted-foreground hover:text-foreground", onClick: openList, children: "\u8FD4\u56DE\u5217\u8868" })) : null, main] })] })] }) }) }));
+    const listHidden = isStack && activePane !== 'list';
+    const mainHidden = isStack && activePane !== 'main';
+    return (_jsx(WorkspaceLayoutContext.Provider, { value: navigation, children: _jsx("section", { className: cn('flex min-h-0 flex-1 flex-col bg-background', className), "data-workspace-layout": "two-pane", "data-workspace-mode": resolvedMode, children: _jsxs("div", { className: cn('grid min-h-0 flex-1', isStack ? 'grid-cols-1' : null), style: isStack ? undefined : twoPaneGridStyle, "data-workspace-layout-mode": mode, "data-workspace-active-pane": activePane, children: [_jsxs("aside", { ref: paneRefs.list, className: cn('min-h-0 flex-col overflow-hidden bg-layout-list-item @container', listHidden ? 'hidden' : 'flex', isStack ? 'border-r-0' : 'border-r border-border'), "data-testid": "workspace-list-pane", "data-workspace-pane": "list", hidden: listHidden, tabIndex: isStack ? -1 : undefined, children: [_jsx("header", { className: "h-12 shrink-0 border-b border-border bg-layout-list-header", "data-workspace-list-header": "true", children: listHeader }), _jsx("div", { className: "min-h-0 flex-1 overflow-y-auto", children: list })] }), _jsxs("main", { ref: paneRefs.main, className: cn('min-h-0 flex-col overflow-hidden bg-layout-content @container', mainHidden ? 'hidden' : 'flex'), "data-testid": "workspace-main-pane", "data-workspace-pane": "main", hidden: mainHidden, tabIndex: isStack ? -1 : undefined, children: [_jsx("header", { className: "h-12 shrink-0 border-b border-border bg-layout-content", "data-workspace-main-header": "true", children: mainHeader }), _jsxs("div", { className: "min-h-0 flex-1 overflow-y-auto", children: [isStack ? (_jsx("button", { type: "button", className: "inline-flex items-center px-4 py-3 text-sm text-muted-foreground hover:text-foreground", onClick: openList, children: "\u8FD4\u56DE\u5217\u8868" })) : null, main] })] })] }) }) }));
 }
 export function SinglePaneLayout({ header, main, className, }) {
     return (_jsxs("section", { className: cn('flex min-h-0 flex-1 flex-col bg-background', className), "data-workspace-layout": "single-pane", children: [header ? (_jsx("header", { className: "h-16 shrink-0 border-b border-border bg-layout-content", children: header })) : null, _jsx("main", { className: "min-h-0 flex-1 overflow-y-auto bg-layout-content @container", "data-testid": "workspace-content-pane", "data-workspace-pane": "content", children: main })] }));
 }
-export function ThreePaneLayout({ header, list, main, context, mode = 'auto', history, contextConfig, className, pageType = 'collection', hasObjectCollection = true, }) {
-    const { resolvedMode } = useObjectColumn({ mode, pageType, hasObjectCollection });
-    // §8.3：非集合页不渲染对象列
-    // §8.3：只有集合页才有对象列表；宽度决定它是并排的对象列还是堆叠的第一屏
-    const showList = pageType === 'collection' && hasObjectCollection;
+export function ThreePaneLayout({ header, list, main, context, mode = 'auto', history, contextConfig, className, }) {
+    const resolvedMode = useResolvedMode(mode);
     const [contextCollapsed, setContextCollapsed] = useState(contextConfig?.initiallyCollapsed ?? false);
     const { activePane, paneRefs, openList, openMain, openContext, } = useStackNavigation({ resolvedMode, history });
     const toggleContextCollapsed = useCallback(() => {
@@ -179,11 +123,10 @@ export function ThreePaneLayout({ header, list, main, context, mode = 'auto', hi
         openContext,
     }), [activePane, openContext, openList, openMain, resolvedMode]);
     const isStack = resolvedMode === 'stack';
-    const stacked = showList && isStack;
-    const listHidden = !showList || (stacked && activePane !== 'list');
-    const mainHidden = stacked && activePane !== 'main';
-    const contextHidden = stacked
+    const listHidden = isStack && activePane !== 'list';
+    const mainHidden = isStack && activePane !== 'main';
+    const contextHidden = isStack
         ? activePane !== 'context'
         : Boolean(contextConfig?.collapsible && contextCollapsed);
-    return (_jsx(WorkspaceLayoutContext.Provider, { value: navigation, children: _jsxs("section", { className: cn('flex min-h-0 flex-1 flex-col bg-background', className), "data-workspace-layout": "three-pane", "data-workspace-mode": resolvedMode, children: [header ? (_jsx("header", { className: "h-16 shrink-0 border-b border-border bg-layout-content", children: header })) : null, contextConfig?.collapsible && !stacked ? (_jsx("div", { className: "shrink-0 border-b border-border bg-layout-content px-3 py-2", children: _jsx("button", { type: "button", "aria-expanded": !contextCollapsed, className: "inline-flex items-center rounded-md px-3 py-1.5 text-sm text-muted-foreground hover:bg-accent hover:text-foreground", onClick: toggleContextCollapsed, children: contextCollapsed ? '展开上下文面板' : '折叠上下文面板' }) })) : null, _jsxs("div", { className: cn('grid min-h-0 flex-1', stacked ? 'grid-cols-1' : null), style: stacked || !showList ? undefined : threePaneGridStyle, "data-workspace-layout-mode": mode, "data-workspace-active-pane": activePane, children: [_jsx("aside", { ref: paneRefs.list, className: cn('min-h-0 overflow-y-auto bg-layout-list-item @container', listHidden ? 'hidden' : null, stacked ? 'border-r-0' : 'border-r border-border'), "data-testid": "workspace-list-pane", "data-workspace-pane": "list", hidden: listHidden, tabIndex: stacked ? -1 : undefined, children: list }), _jsxs("main", { ref: paneRefs.main, className: cn('min-h-0 overflow-y-auto bg-layout-content @container', mainHidden ? 'hidden' : null), "data-testid": "workspace-main-pane", "data-workspace-pane": "main", hidden: mainHidden, tabIndex: stacked ? -1 : undefined, children: [stacked ? (_jsx("button", { type: "button", className: "inline-flex items-center px-4 py-3 text-sm text-muted-foreground hover:text-foreground", onClick: openList, children: "\u8FD4\u56DE\u5217\u8868" })) : null, main] }), _jsxs("aside", { ref: paneRefs.context, className: cn('min-h-0 overflow-y-auto bg-layout-content @container', contextHidden ? 'hidden' : null, stacked ? 'border-l-0' : 'border-l border-border'), "data-testid": "workspace-context-pane", "data-workspace-pane": "context", hidden: contextHidden, tabIndex: stacked ? -1 : undefined, children: [stacked ? (_jsx("button", { type: "button", className: "inline-flex items-center px-4 py-3 text-sm text-muted-foreground hover:text-foreground", onClick: openMain, children: "\u8FD4\u56DE\u4E3B\u533A\u57DF" })) : null, context] })] })] }) }));
+    return (_jsx(WorkspaceLayoutContext.Provider, { value: navigation, children: _jsxs("section", { className: cn('flex min-h-0 flex-1 flex-col bg-background', className), "data-workspace-layout": "three-pane", "data-workspace-mode": resolvedMode, children: [header ? (_jsx("header", { className: "h-16 shrink-0 border-b border-border bg-layout-content", children: header })) : null, contextConfig?.collapsible && !isStack ? (_jsx("div", { className: "shrink-0 border-b border-border bg-layout-content px-3 py-2", children: _jsx("button", { type: "button", "aria-expanded": !contextCollapsed, className: "inline-flex items-center rounded-md px-3 py-1.5 text-sm text-muted-foreground hover:bg-accent hover:text-foreground", onClick: toggleContextCollapsed, children: contextCollapsed ? '展开上下文面板' : '折叠上下文面板' }) })) : null, _jsxs("div", { className: cn('grid min-h-0 flex-1', isStack ? 'grid-cols-1' : null), style: isStack ? undefined : threePaneGridStyle, "data-workspace-layout-mode": mode, "data-workspace-active-pane": activePane, children: [_jsx("aside", { ref: paneRefs.list, className: cn('min-h-0 overflow-y-auto bg-layout-list-item @container', listHidden ? 'hidden' : null, isStack ? 'border-r-0' : 'border-r border-border'), "data-testid": "workspace-list-pane", "data-workspace-pane": "list", hidden: listHidden, tabIndex: isStack ? -1 : undefined, children: list }), _jsxs("main", { ref: paneRefs.main, className: cn('min-h-0 overflow-y-auto bg-layout-content @container', mainHidden ? 'hidden' : null), "data-testid": "workspace-main-pane", "data-workspace-pane": "main", hidden: mainHidden, tabIndex: isStack ? -1 : undefined, children: [isStack ? (_jsx("button", { type: "button", className: "inline-flex items-center px-4 py-3 text-sm text-muted-foreground hover:text-foreground", onClick: openList, children: "\u8FD4\u56DE\u5217\u8868" })) : null, main] }), _jsxs("aside", { ref: paneRefs.context, className: cn('min-h-0 overflow-y-auto bg-layout-content @container', contextHidden ? 'hidden' : null, isStack ? 'border-l-0' : 'border-l border-border'), "data-testid": "workspace-context-pane", "data-workspace-pane": "context", hidden: contextHidden, tabIndex: isStack ? -1 : undefined, children: [isStack ? (_jsx("button", { type: "button", className: "inline-flex items-center px-4 py-3 text-sm text-muted-foreground hover:text-foreground", onClick: openMain, children: "\u8FD4\u56DE\u4E3B\u533A\u57DF" })) : null, context] })] })] }) }));
 }