@object-ui/app-shell 6.2.3 → 7.1.0

package/dist/chrome/ConsoleToaster.js

@@ -9,13 +9,15 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { Toaster as Sonner } from 'sonner';
 import { CircleCheck, Info, LoaderCircle, OctagonX, TriangleAlert } from 'lucide-react';
 import { useTheme } from './ThemeProvider';
+import { useObjectTranslation } from '@object-ui/i18n';
 export function ConsoleToaster(props) {
     const { theme = 'system' } = useTheme();
+    const { t } = useObjectTranslation();
     return (_jsx(Sonner, { theme: theme, className: "toaster group", 
         // UX defaults chosen for an enterprise console — match the Linear /
         // Notion pattern users expect. Callers can still override any of
         // these via the spread `{...props}` below.
-        position: "top-right", closeButton: true, richColors: true, expand: true, visibleToasts: 4, icons: {
+        position: "top-right", closeButton: true, richColors: true, expand: true, visibleToasts: 4, containerAriaLabel: t('notifications.regionLabel', { defaultValue: 'Notifications' }), icons: {
             success: _jsx(CircleCheck, { className: "h-4 w-4" }),
             info: _jsx(Info, { className: "h-4 w-4" }),
             warning: _jsx(TriangleAlert, { className: "h-4 w-4" }),

package/dist/chrome/ErrorBoundary.d.ts

@@ -34,6 +34,6 @@ export declare class ErrorBoundary extends Component<ErrorBoundaryProps, ErrorBo
     static getDerivedStateFromError(error: Error): ErrorBoundaryState;
     componentDidCatch(error: Error, errorInfo: ErrorInfo): void;
     resetErrorBoundary: () => void;
-    render(): string | number | bigint | boolean | Iterable<ReactNode> | Promise<string | number | bigint | boolean | import("react").ReactPortal | import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | Iterable<ReactNode> | null | undefined> | import("react/jsx-runtime").JSX.Element | null | undefined;
+    render(): string | number | bigint | boolean | Iterable<ReactNode> | Promise<string | number | bigint | boolean | import("react").ReactPortal | import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | Iterable<ReactNode> | null | undefined> | import("react").JSX.Element | null | undefined;
 }
 export {};

package/dist/chrome/KeyboardShortcutsDialog.d.ts

@@ -4,4 +4,4 @@
  * A dialog listing all available keyboard shortcuts, triggered by pressing "?".
  * @module
  */
-export declare function KeyboardShortcutsDialog(): import("react/jsx-runtime").JSX.Element;
+export declare function KeyboardShortcutsDialog(): import("react").JSX.Element;

package/dist/chrome/KeyboardShortcutsDialog.js

@@ -5,12 +5,16 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * A dialog listing all available keyboard shortcuts, triggered by pressing "?".
  * @module
  */
-import { useEffect, useState, useMemo } from 'react';
+import { useEffect, useMemo } from 'react';
 import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription, } from '@object-ui/components';
 import { useObjectTranslation } from '@object-ui/i18n';
+import { useUrlOverlay } from '../hooks/useUrlOverlay';
 export function KeyboardShortcutsDialog() {
     const { t } = useObjectTranslation();
-    const [open, setOpen] = useState(false);
+    // URL-addressable (?shortcuts=1) so the dialog is deep-linkable and openable
+    // from the header Help menu, not only via the `?` keyboard accelerator (ADR-0054
+    // C1/C2/C3).
+    const { open, setOpen, toggleOverlay } = useUrlOverlay('shortcuts');
     const shortcutGroups = useMemo(() => [
         {
             title: t('console.shortcuts.groups.general'),
@@ -35,6 +39,13 @@ export function KeyboardShortcutsDialog() {
                 { keys: ['⌘', 'E'], description: t('console.shortcuts.editRecord') },
             ],
         },
+        {
+            title: t('console.shortcuts.groups.aiChat', { defaultValue: 'AI assistant' }),
+            shortcuts: [
+                { keys: ['⌘', '⇧', 'O'], description: t('console.shortcuts.newChat', { defaultValue: 'New chat' }) },
+                { keys: ['⌘', '⇧', 'S'], description: t('console.shortcuts.toggleChatsList', { defaultValue: 'Toggle conversations list' }) },
+            ],
+        },
         {
             title: t('console.shortcuts.groups.preferences'),
             shortcuts: [
@@ -53,11 +64,11 @@ export function KeyboardShortcutsDialog() {
             }
             if (e.key === '?' && !e.metaKey && !e.ctrlKey && !e.altKey) {
                 e.preventDefault();
-                setOpen(prev => !prev);
+                toggleOverlay();
             }
         }
         document.addEventListener('keydown', handleKeyDown);
         return () => document.removeEventListener('keydown', handleKeyDown);
-    }, []);
-    return (_jsx(Dialog, { open: open, onOpenChange: setOpen, children: _jsxs(DialogContent, { className: "sm:max-w-lg max-h-[80vh] overflow-y-auto", children: [_jsxs(DialogHeader, { children: [_jsx(DialogTitle, { children: t('console.shortcuts.title') }), _jsx(DialogDescription, { children: t('console.shortcuts.description') })] }), _jsx("div", { className: "space-y-6 pt-2", children: shortcutGroups.map(group => (_jsxs("div", { children: [_jsx("h3", { className: "text-sm font-medium text-muted-foreground mb-3", children: group.title }), _jsx("div", { className: "space-y-2", children: group.shortcuts.map((shortcut, idx) => (_jsxs("div", { className: "flex items-center justify-between py-1.5", children: [_jsx("span", { className: "text-sm", children: shortcut.description }), _jsx("div", { className: "flex items-center gap-1", children: shortcut.keys.map((key, kidx) => (_jsx("kbd", { className: "inline-flex h-6 min-w-[24px] items-center justify-center rounded border bg-muted px-1.5 text-xs font-medium text-muted-foreground", children: key }, kidx))) })] }, idx))) })] }, group.title))) })] }) }));
+    }, [toggleOverlay]);
+    return (_jsx(Dialog, { open: open, onOpenChange: setOpen, children: _jsxs(DialogContent, { className: "sm:max-w-lg max-h-[80vh] overflow-y-auto", "data-testid": "overlay:keyboard-shortcuts", children: [_jsxs(DialogHeader, { children: [_jsx(DialogTitle, { children: t('console.shortcuts.title') }), _jsx(DialogDescription, { children: t('console.shortcuts.description') })] }), _jsx("div", { className: "space-y-6 pt-2", children: shortcutGroups.map(group => (_jsxs("div", { children: [_jsx("h3", { className: "text-sm font-medium text-muted-foreground mb-3", children: group.title }), _jsx("div", { className: "space-y-2", children: group.shortcuts.map((shortcut, idx) => (_jsxs("div", { className: "flex items-center justify-between py-1.5", children: [_jsx("span", { className: "text-sm", children: shortcut.description }), _jsx("div", { className: "flex items-center gap-1", children: shortcut.keys.map((key, kidx) => (_jsx("kbd", { className: "inline-flex h-6 min-w-[24px] items-center justify-center rounded border bg-muted px-1.5 text-xs font-medium text-muted-foreground", children: key }, kidx))) })] }, idx))) })] }, group.title))) })] }) }));
 }

package/dist/chrome/LoadingScreen.d.ts

@@ -8,5 +8,5 @@ interface LoadingScreenProps {
     /** When true, disables the retry button and shows a spinner */
     retrying?: boolean;
 }
-export declare function LoadingScreen({ message, error, onRetry, retrying }: LoadingScreenProps): import("react/jsx-runtime").JSX.Element;
+export declare function LoadingScreen({ message, error, onRetry, retrying }: LoadingScreenProps): import("react").JSX.Element;
 export {};

package/dist/chrome/LoadingScreen.js

@@ -2,36 +2,32 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { Spinner, Button } from '@object-ui/components';
 import { Database, CheckCircle2, Loader2, AlertCircle, RefreshCw } from 'lucide-react';
 import { useState, useEffect, useMemo } from 'react';
+import { getProductName } from '../runtime-config';
+import { en as enLocale, zh as zhLocale } from '@object-ui/i18n';
 // Bootstrap-critical UI: must render before i18n is loaded (especially when the
 // server is unreachable, which is also when i18n can't load translations).
-// We deliberately do NOT use useObjectTranslation here — it suspends on first
-// render and would prevent the splash from rendering at all on a server-down
-// boot. Strings stay hardcoded English; localized error UX should happen
-// post-bootstrap, after i18n has loaded successfully.
-const STRINGS = {
-    title: 'ObjectUI Console',
-    initializing: 'Initializing…',
-    steps: {
-        connecting: 'Connecting to server',
-        loadingConfig: 'Loading configuration',
-        preparingWorkspace: 'Preparing workspace',
-    },
-    error: {
-        connectionFailed: 'Cannot connect to server',
-        checkServer: 'Please check your network connection or that the backend is running.',
-    },
-    actions: {
-        retry: 'Retry',
-        retrying: 'Retrying…',
-    },
-};
+// Do not use useObjectTranslation here — it can suspend on first render and
+// prevent the splash from rendering at all on a server-down boot. Keep a small
+// synchronous dictionary for the startup shell instead.
+// The product name is read from the runtime-config singleton (sync) so it
+// reflects server-pushed branding when available, falling back to 'ObjectOS'.
+function getStartupStrings() {
+    if (typeof document !== 'undefined' && document.documentElement.lang?.startsWith('zh')) {
+        return zhLocale.console;
+    }
+    if (typeof navigator !== 'undefined' && navigator.language?.startsWith('zh')) {
+        return zhLocale.console;
+    }
+    return enLocale.console;
+}
 export function LoadingScreen({ message, error, onRetry, retrying }) {
     const [currentStep, setCurrentStep] = useState(0);
+    const strings = getStartupStrings();
     const loadingSteps = useMemo(() => [
-        STRINGS.steps.connecting,
-        STRINGS.steps.loadingConfig,
-        STRINGS.steps.preparingWorkspace,
-    ], []);
+        strings.loadingSteps.connecting,
+        strings.loadingSteps.loadingConfig,
+        strings.loadingSteps.preparingWorkspace,
+    ], [strings]);
     useEffect(() => {
         if (message || error)
             return; // skip auto-progression when overridden or in error state
@@ -40,5 +36,5 @@ export function LoadingScreen({ message, error, onRetry, retrying }) {
         }, 1200);
         return () => clearInterval(timer);
     }, [message, error, loadingSteps.length]);
-    return (_jsx("div", { className: "flex flex-col items-center justify-center h-screen bg-background", children: _jsxs("div", { className: "flex flex-col items-center gap-6", children: [_jsxs("div", { className: "relative", children: [_jsx("div", { className: "absolute inset-0 bg-primary/20 rounded-2xl blur-xl animate-pulse" }), _jsx("div", { className: "relative bg-linear-to-br from-primary to-primary/80 p-4 rounded-2xl shadow-lg", children: _jsx(Database, { className: "h-10 w-10 text-primary-foreground" }) })] }), _jsxs("div", { className: "text-center space-y-2", children: [_jsx("h1", { className: "text-2xl font-bold tracking-tight", children: STRINGS.title }), _jsx("p", { className: "text-sm text-muted-foreground", children: STRINGS.initializing })] }), error ? (_jsxs("div", { className: "flex flex-col items-center gap-4 max-w-md w-full px-6", children: [_jsxs("div", { className: "flex flex-col items-center gap-3 p-5 rounded-lg border border-destructive/30 bg-destructive/5 w-full", children: [_jsxs("div", { className: "flex items-center gap-2 text-destructive", children: [_jsx(AlertCircle, { className: "h-5 w-5 shrink-0" }), _jsx("span", { className: "text-sm font-semibold", children: STRINGS.error.connectionFailed })] }), _jsx("p", { className: "text-xs text-muted-foreground text-center break-words", children: error }), _jsx("p", { className: "text-xs text-muted-foreground text-center", children: STRINGS.error.checkServer })] }), onRetry && (_jsx(Button, { onClick: onRetry, disabled: retrying, variant: "default", size: "sm", className: "gap-2", children: retrying ? (_jsxs(_Fragment, { children: [_jsx(Loader2, { className: "h-4 w-4 animate-spin" }), STRINGS.actions.retrying] })) : (_jsxs(_Fragment, { children: [_jsx(RefreshCw, { className: "h-4 w-4" }), STRINGS.actions.retry] })) }))] })) : message ? (_jsxs("div", { className: "flex items-center gap-3 px-4 py-2 bg-muted/50 rounded-full", children: [_jsx(Spinner, { className: "h-4 w-4 text-primary" }), _jsx("span", { className: "text-sm text-muted-foreground", children: message })] })) : (_jsx("div", { className: "flex flex-col gap-2 w-64", children: loadingSteps.map((step, index) => (_jsxs("div", { className: "flex items-center gap-2.5 text-sm transition-opacity duration-300", style: { opacity: index <= currentStep ? 1 : 0.3 }, children: [index < currentStep ? (_jsx(CheckCircle2, { className: "h-4 w-4 text-primary shrink-0" })) : index === currentStep ? (_jsx(Loader2, { className: "h-4 w-4 text-primary shrink-0 animate-spin" })) : (_jsx("div", { className: "h-4 w-4 rounded-full border border-muted-foreground/30 shrink-0" })), _jsx("span", { className: index <= currentStep ? 'text-foreground' : 'text-muted-foreground', children: step })] }, step))) }))] }) }));
+    return (_jsx("div", { className: "flex flex-col items-center justify-center h-screen bg-background", children: _jsxs("div", { className: "flex flex-col items-center gap-6", children: [_jsxs("div", { className: "relative", children: [_jsx("div", { className: "absolute inset-0 bg-primary/20 rounded-2xl blur-xl animate-pulse" }), _jsx("div", { className: "relative bg-linear-to-br from-primary to-primary/80 p-4 rounded-2xl shadow-lg", children: _jsx(Database, { className: "h-10 w-10 text-primary-foreground" }) })] }), _jsxs("div", { className: "text-center space-y-2", children: [_jsx("h1", { className: "text-2xl font-bold tracking-tight", children: getProductName() }), _jsx("p", { className: "text-sm text-muted-foreground", children: strings.initializing })] }), error ? (_jsxs("div", { className: "flex flex-col items-center gap-4 max-w-md w-full px-6", children: [_jsxs("div", { className: "flex flex-col items-center gap-3 p-5 rounded-lg border border-destructive/30 bg-destructive/5 w-full", children: [_jsxs("div", { className: "flex items-center gap-2 text-destructive", children: [_jsx(AlertCircle, { className: "h-5 w-5 shrink-0" }), _jsx("span", { className: "text-sm font-semibold", children: strings.error.connectionFailed })] }), _jsx("p", { className: "text-xs text-muted-foreground text-center break-words", children: error }), _jsx("p", { className: "text-xs text-muted-foreground text-center", children: strings.error.checkServer })] }), onRetry && (_jsx(Button, { onClick: onRetry, disabled: retrying, variant: "default", size: "sm", className: "gap-2", children: retrying ? (_jsxs(_Fragment, { children: [_jsx(Loader2, { className: "h-4 w-4 animate-spin" }), strings.actions.retrying] })) : (_jsxs(_Fragment, { children: [_jsx(RefreshCw, { className: "h-4 w-4" }), strings.actions.retry] })) }))] })) : message ? (_jsxs("div", { className: "flex items-center gap-3 px-4 py-2 bg-muted/50 rounded-full", children: [_jsx(Spinner, { className: "h-4 w-4 text-primary" }), _jsx("span", { className: "text-sm text-muted-foreground", children: message })] })) : (_jsx("div", { className: "flex flex-col gap-2 w-64", children: loadingSteps.map((step, index) => (_jsxs("div", { className: "flex items-center gap-2.5 text-sm transition-opacity duration-300", style: { opacity: index <= currentStep ? 1 : 0.3 }, children: [index < currentStep ? (_jsx(CheckCircle2, { className: "h-4 w-4 text-primary shrink-0" })) : index === currentStep ? (_jsx(Loader2, { className: "h-4 w-4 text-primary shrink-0 animate-spin" })) : (_jsx("div", { className: "h-4 w-4 rounded-full border border-muted-foreground/30 shrink-0" })), _jsx("span", { className: index <= currentStep ? 'text-foreground' : 'text-muted-foreground', children: step })] }, step))) }))] }) }));
 }

package/dist/chrome/RouteFader.d.ts

@@ -29,4 +29,4 @@ export interface RouteFaderProps {
     children: React.ReactNode;
     className?: string;
 }
-export declare function RouteFader({ children, className }: RouteFaderProps): import("react/jsx-runtime").JSX.Element;
+export declare function RouteFader({ children, className }: RouteFaderProps): React.JSX.Element;

package/dist/chrome/ThemeProvider.d.ts

@@ -8,6 +8,6 @@ type ThemeProviderState = {
     theme: Theme;
     setTheme: (theme: Theme) => void;
 };
-export declare function ThemeProvider({ children, defaultTheme, storageKey, ...props }: ThemeProviderProps): import("react/jsx-runtime").JSX.Element;
+export declare function ThemeProvider({ children, defaultTheme, storageKey, ...props }: ThemeProviderProps): import("react").JSX.Element;
 export declare const useTheme: () => ThemeProviderState;
 export {};

package/dist/components/ManagedByBadge.d.ts

@@ -6,5 +6,5 @@ export interface ManagedByBadgeProps {
     /** Optional extra classes. */
     className?: string;
 }
-export declare function ManagedByBadge({ managedBy, label, className }: ManagedByBadgeProps): import("react/jsx-runtime").JSX.Element | null;
+export declare function ManagedByBadge({ managedBy, label, className }: ManagedByBadgeProps): import("react").JSX.Element | null;
 export default ManagedByBadge;

package/dist/console/AppContent.d.ts

@@ -22,5 +22,5 @@ interface AppContentProps {
      */
     extraRoutesNoApp?: ReactNode;
 }
-export declare function AppContent({ extraRoutes, extraRoutesNoApp }?: AppContentProps): import("react/jsx-runtime").JSX.Element;
+export declare function AppContent({ extraRoutes, extraRoutesNoApp }?: AppContentProps): import("react").JSX.Element;
 export {};

package/dist/console/AppContent.js

@@ -9,7 +9,8 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * /organizations) is provided by `createConsole` from @object-ui/app-shell.
  */
 import { Routes, Route, Navigate, useNavigate, useLocation, useParams } from 'react-router-dom';
-import { useState, useEffect, useCallback, lazy, Suspense, useMemo } from 'react';
+import { useState, useEffect, useCallback, useRef, lazy, Suspense, useMemo } from 'react';
+import { useAssistant } from '../assistant/assistantBus';
 import { ModalForm } from '@object-ui/plugin-form';
 import { Empty, EmptyTitle, EmptyDescription, Button } from '@object-ui/components';
 import { toast } from 'sonner';
@@ -18,9 +19,13 @@ import { useObjectTranslation, useObjectLabel } from '@object-ui/i18n';
 import { useAuth } from '@object-ui/auth';
 import { useMetadata } from '../providers/MetadataProvider';
 import { useAdapter } from '../providers/AdapterProvider';
+import { usePreviewDrafts } from '../preview/PreviewModeContext';
+import { PreviewDraftEmptyState } from '../preview/PreviewDraftEmptyState';
 import { ExpressionProvider, evaluateVisibility } from '../providers/ExpressionProvider';
 import { useTrackRouteAsRecent } from '../hooks/useTrackRouteAsRecent';
 import { resolveRecordFormTarget, resolveNavigateCreateUrl, resolveNavigateEditUrl } from '../utils/recordFormNavigation';
+import { matchAppBySegment } from '../utils/appRoute';
+import { resolveHref } from '@object-ui/layout';
 import { ExpressionEvaluator } from '@object-ui/core';
 // Components (eagerly loaded — always needed)
 import { ConsoleLayout } from '../layout/ConsoleLayout';
@@ -44,20 +49,42 @@ const ComponentNavView = lazy(() => import('../views/ComponentNavView').then(m =
 // level so URLs read like a normal nested resource (RFC-style) instead of
 // piggy-backing on the legacy ComponentRegistry fan-out.
 const MetadataDirectoryPage = lazy(() => import('../views/metadata-admin').then(m => ({ default: m.MetadataDirectoryPage })));
+const StudioHomePage = lazy(() => import('../views/metadata-admin').then(m => ({ default: m.StudioHomePage })));
 const MetadataResourceListPage = lazy(() => import('../views/metadata-admin').then(m => ({ default: m.MetadataResourceListPage })));
 const MetadataResourceEditPage = lazy(() => import('../views/metadata-admin').then(m => ({ default: m.MetadataResourceEditPage })));
 const MetadataResourceHistoryPage = lazy(() => import('../views/metadata-admin').then(m => ({ default: m.MetadataResourceHistoryPage })));
-// Designer pages — sourced from @object-ui/plugin-designer so third-party hosts
-// can opt out by not registering these routes.
+const MetadataDiagnosticsPage = lazy(() => import('../views/metadata-admin').then(m => ({ default: m.MetadataDiagnosticsPage })));
+// App authoring + dashboard editor pages — sourced from
+// @object-ui/plugin-designer so third-party hosts can opt out by not
+// registering these routes.
 const CreateAppPage = lazy(() => import('@object-ui/plugin-designer').then(m => ({ default: m.CreateAppPage })));
 const EditAppPage = lazy(() => import('@object-ui/plugin-designer').then(m => ({ default: m.EditAppPage })));
-const PageDesignPage = lazy(() => import('@object-ui/plugin-designer').then(m => ({ default: m.PageDesignPage })));
 const DashboardDesignPage = lazy(() => import('@object-ui/plugin-designer').then(m => ({ default: m.DashboardDesignPage })));
 // Marketplace pages — first-class platform feature; mounted at `system/marketplace`
 // under any active app so admins can browse + install from inside the runtime.
 const MarketplacePage = lazy(() => import('./marketplace/MarketplacePage').then(m => ({ default: m.MarketplacePage })));
 const MarketplacePackagePage = lazy(() => import('./marketplace/MarketplacePackagePage').then(m => ({ default: m.MarketplacePackagePage })));
 const MarketplaceInstalledPage = lazy(() => import('./marketplace/MarketplaceInstalledPage').then(m => ({ default: m.MarketplaceInstalledPage })));
+/**
+ * Bridges the global chat's "Review N change(s)" affordance (ADR-0033 Phase B)
+ * to the metadata designer. The chat publishes a review target on `assistantBus`;
+ * this navigator — which lives inside the app router and knows the app base —
+ * routes to `/apps/:appName/metadata/:type/:name?review=1`, where the designer
+ * reloads the pending draft and opens its review/diff.
+ */
+function DraftReviewNavigator({ appName }) {
+    const { reviewSeq, reviewTarget } = useAssistant();
+    const navigate = useNavigate();
+    const lastSeq = useRef(reviewSeq);
+    useEffect(() => {
+        if (reviewSeq === lastSeq.current || !reviewTarget || !appName)
+            return;
+        lastSeq.current = reviewSeq;
+        const { type, name } = reviewTarget;
+        navigate(`/apps/${appName}/metadata/${encodeURIComponent(type)}/${encodeURIComponent(name)}?review=1`);
+    }, [reviewSeq, reviewTarget, appName, navigate]);
+    return null;
+}
 export function AppContent({ extraRoutes, extraRoutesNoApp } = {}) {
     const [connectionState, setConnectionState] = useState('disconnected');
     const { user, getAuthConfig } = useAuth();
@@ -86,7 +113,8 @@ export function AppContent({ extraRoutes, extraRoutesNoApp } = {}) {
     const navigate = useNavigate();
     const location = useLocation();
     const { appName } = useParams();
-    const { apps, objects: allObjects, loading: metadataLoading, ensureType } = useMetadata();
+    const { apps, objects: allObjects, loading: metadataLoading, ensureType, error: metadataError, refresh: refreshMetadata } = useMetadata();
+    const previewDrafts = usePreviewDrafts();
     const { t } = useObjectTranslation();
     const { objectLabel } = useObjectLabel();
     // Preload the metadata buckets that the routes under /apps/:appName/* assume
@@ -110,10 +138,69 @@ export function AppContent({ extraRoutes, extraRoutesNoApp } = {}) {
         });
         return () => { cancelled = true; };
     }, [ensureType]);
+    // Hidden apps (`App.hidden`) are excluded from app-listing surfaces
+    // (sidebar switcher, home grid, app switcher). The active app for the
+    // current route is still looked up across ALL apps so /apps/account
+    // resolves correctly; only the fallback (no appName → first app)
+    // skips hidden apps to avoid landing the user on a personal-settings
+    // app by default.
     const activeApps = apps.filter((a) => a.active !== false);
-    const activeApp = apps.find((a) => a.name === appName) ||
-        activeApps.find((a) => a.isDefault === true) ||
-        activeApps[0];
+    const launcherApps = activeApps.filter((a) => a.hidden !== true);
+    // ADR-0048 (A) — the route segment is the package id; resolve by it,
+    // falling back to the app name (legacy/alias URL).
+    // Built-in pseudo-routes under /apps/* that are NOT metadata apps (create-app,
+    // system/*, metadata/*, setup). They must keep working — and may fall back to
+    // a default app — regardless of whether the segment resolves to an app.
+    const isCreateAppRoute = location.pathname.endsWith('/create-app');
+    const isSystemRoute = location.pathname.includes('/system');
+    const isMetadataRoute = location.pathname.includes('/metadata');
+    const isSetupRoute = location.pathname === '/apps/setup' || location.pathname.startsWith('/apps/setup/');
+    const isSpecialRoute = isCreateAppRoute || isSystemRoute || isMetadataRoute || isSetupRoute;
+    const matchedApp = matchAppBySegment(apps, appName);
+    const activeApp = matchedApp ||
+        // Fall back to a default/first app only when NO specific app was requested
+        // (bare /apps, the default redirect) OR for a built-in pseudo-route above.
+        // A normal unmatched appName must NOT silently render a DIFFERENT app — the
+        // readiness guard below shows loading / not-available instead. (Fixes "the
+        // preview / nav renders the WRONG app right after building a new one".)
+        ((!appName || isSpecialRoute)
+            ? (launcherApps.find((a) => a.isDefault === true) || launcherApps[0])
+            : undefined);
+    // A normal app was requested but isn't present in the loaded metadata — the
+    // post-publish readiness lag, or a genuinely-missing app. Applies in BOTH
+    // preview and published mode (preview already guarded this; published used to
+    // fall through to the wrong-app fallback above — the bug). Pseudo-routes are
+    // excluded so they keep their default-app fallback.
+    const requestedAppMissing = !!appName && !matchedApp && !isSpecialRoute;
+    // Post-publish readiness: when a requested app isn't in the loaded metadata,
+    // re-check ONCE (the registry can lag a beat behind a publish) before
+    // concluding it's absent — so a just-built app resolves on its own instead
+    // of flashing "not available", while we still never render a foreign app.
+    const [missingRecheck, setMissingRecheck] = useState('idle');
+    useEffect(() => {
+        if (!requestedAppMissing) {
+            if (missingRecheck !== 'idle')
+                setMissingRecheck('idle');
+            return;
+        }
+        if (missingRecheck === 'idle' && !metadataLoading && !previewDrafts) {
+            setMissingRecheck('checking');
+            Promise.resolve(refreshMetadata()).finally(() => setMissingRecheck('done'));
+        }
+    }, [requestedAppMissing, metadataLoading, previewDrafts, missingRecheck, refreshMetadata]);
+    useEffect(() => {
+        if (!activeApp?.name)
+            return;
+        // ADR-0048 — build against the URL's own segment (`appName`, which may be the
+        // package id) so the match works and the redirect keeps the same segment;
+        // `activeApp.name` would flip a `/apps/<packageId>/…` URL to the name form.
+        const seg = appName ?? activeApp.name;
+        const packageMetadataPath = `/apps/${seg}/metadata/package`;
+        if (location.pathname === packageMetadataPath ||
+            location.pathname.startsWith(`${packageMetadataPath}/`)) {
+            navigate(`/apps/${seg}/component/developer/packages`, { replace: true });
+        }
+    }, [activeApp?.name, appName, location.pathname, navigate]);
     const [isDialogOpen, setIsDialogOpen] = useState(false);
     const [editingRecord, setEditingRecord] = useState(null);
     const [refreshKey, setRefreshKey] = useState(0);
@@ -236,7 +323,7 @@ export function AppContent({ extraRoutes, extraRoutesNoApp } = {}) {
         // preserved for any object without the flag.
         const target = resolveRecordFormTarget({
             objectDef: currentObjectDef,
-            baseUrl: activeApp?.name ? `/apps/${activeApp.name}` : '',
+            baseUrl: appName ? `/apps/${appName}` : (activeApp?.name ? `/apps/${activeApp.name}` : ''),
             record,
         });
         if (target.kind === 'page') {
@@ -256,22 +343,78 @@ export function AppContent({ extraRoutes, extraRoutesNoApp } = {}) {
     }), [user, activeApp, editingRecord]);
     if (!dataSource || metadataLoading || !scopeMetaReady)
         return _jsx(LoadingScreen, {});
-    const isCreateAppRoute = location.pathname.endsWith('/create-app');
-    const isSystemRoute = location.pathname.includes('/system');
-    if (!activeApp && !isCreateAppRoute && !isSystemRoute)
+    // ADR-0037 — preview mode renders its OWN empty/error states and never
+    // falls through to the generic "No Apps Configured" guard below: inside a
+    // draft preview (the Live Canvas iframe, or a hand-opened ?preview=draft
+    // URL) that screen both lies ("nothing has been registered") and misdirects
+    // ("Create Your First App") about an app the AI may have just drafted.
+    if (previewDrafts && (requestedAppMissing || !activeApp)) {
+        return (_jsx(PreviewDraftEmptyState, { appName: appName, error: metadataError, onRetry: () => void refreshMetadata() }));
+    }
+    // (isCreateAppRoute / isSystemRoute / isMetadataRoute / isSetupRoute are
+    // computed near the top — before activeApp — so the fallback + readiness
+    // logic can use them. The metadata designer (Studio) in particular must stay
+    // reachable with no active app: a fresh env where AI just drafted everything
+    // has ZERO published apps, and that is the surface you review & publish from.)
+    // A normal app was requested but isn't in the loaded metadata. Re-check once
+    // for the post-publish lag, then say it's not available — NEVER render a
+    // different app, and don't show the misleading "no apps configured" screen
+    // below (there ARE apps). requestedAppMissing already excludes pseudo-routes.
+    if (requestedAppMissing) {
+        if (missingRecheck !== 'done')
+            return _jsx(LoadingScreen, {});
+        return (_jsx("div", { className: "h-screen flex items-center justify-center", children: _jsxs(Empty, { children: [_jsx(EmptyTitle, { children: t('empty.appNotAvailable', { defaultValue: 'App not available' }) }), _jsx(EmptyDescription, { children: t('empty.appNotAvailableDescription', {
+                            defaultValue: 'This app is not available yet — it may still be publishing. Try again in a moment.',
+                        }) }), _jsx("div", { className: "mt-4", children: _jsx(Button, { onClick: () => setMissingRecheck('idle'), "data-testid": "app-not-available-retry", children: t('common.retry', { defaultValue: 'Retry' }) }) })] }) }));
+    }
+    if (!activeApp && !isCreateAppRoute && !isSystemRoute && !isMetadataRoute)
         return (_jsx("div", { className: "h-screen flex items-center justify-center", children: _jsxs(Empty, { children: [_jsx(EmptyTitle, { children: t('empty.noAppsConfigured') }), _jsx(EmptyDescription, { children: t('empty.noAppsConfiguredDescription') }), _jsxs("div", { className: "mt-4 flex flex-col sm:flex-row items-center gap-3", children: [_jsx(Button, { onClick: () => navigate('/create-app'), "data-testid": "create-first-app-btn", children: t('empty.createFirstApp') }), _jsx(Button, { variant: "outline", onClick: () => navigate('/apps/setup'), "data-testid": "go-to-settings-btn", children: t('empty.systemSettings') })] })] }) }));
-    if (!activeApp && (isCreateAppRoute || isSystemRoute)) {
-        return (_jsx(Suspense, { fallback: _jsx(LoadingScreen, {}), children: _jsxs(Routes, { children: [_jsx(Route, { path: "create-app", element: _jsx(CreateAppPage, {}) }), _jsx(Route, { path: "system/marketplace", element: _jsx(MarketplacePage, {}) }), _jsx(Route, { path: "system/marketplace/installed", element: _jsx(MarketplaceInstalledPage, {}) }), _jsx(Route, { path: "system/marketplace/:packageId", element: _jsx(MarketplacePackagePage, {}) }), extraRoutesNoApp] }) }));
+    if (!activeApp && (isCreateAppRoute || isSystemRoute || isMetadataRoute)) {
+        return (_jsx(Suspense, { fallback: _jsx(LoadingScreen, {}), children: _jsxs(Routes, { children: [_jsx(Route, { path: "create-app", element: _jsx(CreateAppPage, {}) }), _jsx(Route, { path: "system/marketplace", element: _jsx(MarketplacePage, {}) }), _jsx(Route, { path: "system/marketplace/installed", element: _jsx(MarketplaceInstalledPage, {}) }), _jsx(Route, { path: "system/marketplace/:packageId", element: _jsx(MarketplacePackagePage, {}) }), _jsx(Route, { path: "metadata", element: _jsx(MetadataDirectoryPage, {}) }), _jsx(Route, { path: "metadata/_diagnostics", element: _jsx(MetadataDiagnosticsPage, {}) }), _jsx(Route, { path: "metadata/:type", element: _jsx(MetadataResourceListPage, {}) }), _jsx(Route, { path: "metadata/:type/new", element: _jsx(MetadataResourceEditPage, { createMode: true }) }), _jsx(Route, { path: "metadata/:type/:name", element: _jsx(MetadataResourceEditPage, {}) }), _jsx(Route, { path: "metadata/:type/:name/history", element: _jsx(MetadataResourceHistoryPage, {}) }), extraRoutesNoApp] }) }));
     }
     const expressionUser = user
-        ? { name: user.name, email: user.email, role: user.role ?? 'user' }
-        : { name: 'Anonymous', email: '', role: 'guest' };
-    return (_jsxs(ExpressionProvider, { user: expressionUser, app: activeApp, data: {}, features: features, children: [_jsx(NavigationSyncEffect, {}), _jsxs(ConsoleLayout, { activeAppName: activeApp.name, activeApp: activeApp, onAppChange: handleAppChange, objects: allObjects, connectionState: connectionState, userId: user?.id, children: [_jsx(CommandPalette, { apps: apps, activeApp: activeApp, objects: allObjects, onAppChange: handleAppChange, dataSource: dataSource }), _jsx(KeyboardShortcutsDialog, {}), _jsx(OnboardingWalkthrough, {}), _jsx(ErrorBoundary, { children: _jsx(Suspense, { fallback: _jsx(LoadingScreen, {}), children: _jsx(RouteFader, { children: _jsxs(Routes, { children: [_jsx(Route, { path: "/", element: _jsx(Navigate, { to: resolveLandingRoute(activeApp), replace: true }) }), _jsxs(Route, { path: "metadata", children: [_jsx(Route, { index: true, element: _jsx(MetadataDirectoryPage, {}) }), _jsx(Route, { path: ":type", element: _jsx(MetadataResourceListPage, {}) }), _jsx(Route, { path: ":type/new", element: _jsx(MetadataResourceEditPage, { createMode: true }) }), _jsx(Route, { path: ":type/:name", element: _jsx(MetadataResourceEditPage, {}) }), _jsx(Route, { path: ":type/:name/history", element: _jsx(MetadataResourceHistoryPage, {}) })] }), _jsx(Route, { path: ":objectName", element: _jsx(ObjectView, { dataSource: dataSource, objects: allObjects, onEdit: handleEdit, externalRefreshKey: refreshKey }) }), _jsx(Route, { path: ":objectName/new", element: _jsx(RecordFormPage, { mode: "create" }) }), _jsx(Route, { path: ":objectName/view/:viewId", element: _jsx(ObjectView, { dataSource: dataSource, objects: allObjects, onEdit: handleEdit, externalRefreshKey: refreshKey }) }), _jsx(Route, { path: ":objectName/record/:recordId", element: _jsx(RecordDetailView, { dataSource: dataSource, objects: allObjects, onEdit: handleEdit }, refreshKey) }), _jsx(Route, { path: ":objectName/record/:recordId/edit", element: _jsx(RecordFormPage, { mode: "edit" }) }), _jsx(Route, { path: "dashboard/:dashboardName", element: _jsx(DashboardView, { dataSource: dataSource }) }), _jsx(Route, { path: "report/:reportName", element: _jsx(ReportView, { dataSource: dataSource }) }), _jsx(Route, { path: "page/:pageName", element: _jsx(PageView, {}) }), _jsx(Route, { path: "component/:ns/:name/*", element: _jsx(ComponentNavView, {}) }), _jsx(Route, { path: "component/metadata/directory", element: _jsx(LegacyMetadataRedirect, { mode: "directory" }) }), _jsx(Route, { path: "component/metadata/resource/*", element: _jsx(LegacyMetadataRedirect, { mode: "resource" }) }), _jsx(Route, { path: "design/page/:pageName", element: _jsx(PageDesignPage, {}) }), _jsx(Route, { path: "design/dashboard/:dashboardName", element: _jsx(DashboardDesignPage, {}) }), _jsx(Route, { path: "search", element: _jsx(SearchResultsPage, {}) }), _jsx(Route, { path: "create-app", element: _jsx(CreateAppPage, {}) }), _jsx(Route, { path: "edit-app/:editAppName", element: _jsx(EditAppPage, {}) }), _jsx(Route, { path: "system/marketplace", element: _jsx(MarketplacePage, {}) }), _jsx(Route, { path: "system/marketplace/installed", element: _jsx(MarketplaceInstalledPage, {}) }), _jsx(Route, { path: "system/marketplace/:packageId", element: _jsx(MarketplacePackagePage, {}) }), extraRoutes, _jsx(Route, { path: ":objectName/:maybeRecordId", element: _jsx(ShorthandRecordRedirect, {}) }), _jsx(Route, { path: "*", element: _jsx(RouteNotFound, {}) })] }) }) }) }), currentObjectDef && (_jsx(ModalForm, { schema: {
+        ? {
+            id: user.id,
+            name: user.name,
+            email: user.email,
+            role: user.role ?? 'user',
+            roles: user.roles,
+            // Surface the platform-admin flag so action `visible` CEL predicates
+            // gated on `ctx.user.isPlatformAdmin == true` (e.g. sys_environment
+            // "Change Plan (admin)") evaluate correctly. Previously only
+            // name/email/role were forwarded → isPlatformAdmin-gated actions were
+            // hidden even for platform admins.
+            isPlatformAdmin: user.isPlatformAdmin ?? false,
+        }
+        : { name: 'Anonymous', email: '', role: 'guest', isPlatformAdmin: false };
+    return (_jsxs(ExpressionProvider, { user: expressionUser, app: activeApp, data: {}, features: features, children: [_jsx(NavigationSyncEffect, {}), _jsxs(ConsoleLayout, { activeAppName: activeApp.name, activeApp: activeApp, onAppChange: handleAppChange, objects: allObjects, connectionState: connectionState, userId: user?.id, children: [_jsx(CommandPalette, { apps: apps, activeApp: activeApp, objects: allObjects, onAppChange: handleAppChange, dataSource: dataSource }), _jsx(KeyboardShortcutsDialog, {}), _jsx(OnboardingWalkthrough, {}), _jsx(DraftReviewNavigator, { appName: appName }), _jsx(ErrorBoundary, { children: _jsx(Suspense, { fallback: _jsx(LoadingScreen, {}), children: _jsx(RouteFader, { className: "h-full", children: _jsxs(Routes, { children: [_jsx(Route, { path: "/", element: (() => {
+                                                // When the app declares a landing target (home page or
+                                                // first nav route) honour it; otherwise — e.g. the
+                                                // metadata-admin "Studio" app whose nav is built from
+                                                // domains and has no single landing — render the rich
+                                                // overview instead of a blank `<Navigate to="">`.
+                                                const landing = resolveLandingRoute(activeApp, { currentUserId: user?.id ?? null });
+                                                return landing ? _jsx(Navigate, { to: landing, replace: true }) : _jsx(StudioHomePage, {});
+                                            })() }), _jsx(Route, { path: "metadata/package/*", element: _jsx(Navigate, { to: `/apps/${appName ?? activeApp.name}/component/developer/packages`, replace: true }) }), _jsxs(Route, { path: "metadata", children: [_jsx(Route, { index: true, element: _jsx(MetadataDirectoryPage, {}) }), _jsx(Route, { path: "_diagnostics", element: _jsx(MetadataDiagnosticsPage, {}) }), _jsx(Route, { path: ":type", element: _jsx(MetadataResourceListPage, {}) }), _jsx(Route, { path: ":type/new", element: _jsx(MetadataResourceEditPage, { createMode: true }) }), _jsx(Route, { path: ":type/:name", element: _jsx(MetadataResourceEditPage, {}) }), _jsx(Route, { path: ":type/:name/history", element: _jsx(MetadataResourceHistoryPage, {}) })] }), _jsx(Route, { path: ":objectName", element: _jsx(ObjectView, { dataSource: dataSource, objects: allObjects, onEdit: handleEdit, externalRefreshKey: refreshKey }) }), _jsx(Route, { path: ":objectName/new", element: _jsx(RecordFormPage, { mode: "create" }) }), _jsx(Route, { path: ":objectName/view/:viewId", element: _jsx(ObjectView, { dataSource: dataSource, objects: allObjects, onEdit: handleEdit, externalRefreshKey: refreshKey }) }), _jsx(Route, { path: ":objectName/record/:recordId", element: _jsx(RecordDetailView, { dataSource: dataSource, objects: allObjects, onEdit: handleEdit }, refreshKey) }), _jsx(Route, { path: ":objectName/record/:recordId/edit", element: _jsx(RecordFormPage, { mode: "edit" }) }), _jsx(Route, { path: "dashboard/:dashboardName", element: _jsx(DashboardView, { dataSource: dataSource }) }), _jsx(Route, { path: "report/:reportName", element: _jsx(ReportView, { dataSource: dataSource }) }), _jsx(Route, { path: "page/:pageName", element: _jsx(PageView, {}) }), _jsx(Route, { path: "component/:ns/:name/*", element: _jsx(ComponentNavView, {}) }), _jsx(Route, { path: "component/metadata/directory", element: _jsx(LegacyMetadataRedirect, { mode: "directory" }) }), _jsx(Route, { path: "component/metadata/resource/*", element: _jsx(LegacyMetadataRedirect, { mode: "resource" }) }), _jsx(Route, { path: "design/dashboard/:dashboardName", element: _jsx(DashboardDesignPage, {}) }), _jsx(Route, { path: "search", element: _jsx(SearchResultsPage, {}) }), _jsx(Route, { path: "create-app", element: _jsx(CreateAppPage, {}) }), _jsx(Route, { path: "edit-app/:editAppName", element: _jsx(EditAppPage, {}) }), _jsx(Route, { path: "system/marketplace", element: _jsx(MarketplacePage, {}) }), _jsx(Route, { path: "system/marketplace/installed", element: _jsx(MarketplaceInstalledPage, {}) }), _jsx(Route, { path: "system/marketplace/:packageId", element: _jsx(MarketplacePackagePage, {}) }), extraRoutes, _jsx(Route, { path: ":objectName/:maybeRecordId", element: _jsx(ShorthandRecordRedirect, {}) }), _jsx(Route, { path: "*", element: _jsx(RouteNotFound, {}) })] }) }) }) }), currentObjectDef && (_jsx(ModalForm, { schema: {
                             type: 'object-form',
                             formType: 'modal',
                             objectName: currentObjectDef.name,
                             mode: editingRecord ? 'edit' : 'create',
                             recordId: editingRecord?.id,
+                            // Master-detail by config: if the object's form view declares
+                            // inline child collections, the standard New/Edit modal renders
+                            // them as an atomic master-detail form (no bespoke page).
+                            subforms: currentObjectDef.form?.subforms
+                                ?? currentObjectDef.formViews?.default?.subforms,
+                            // ADR-0050 (#1890): forward the default form view's layout so the
+                            // New/Edit modal can be tabbed (not just a flat stack). `formType`
+                            // stays 'modal' (the container); `contentLayout` carries the layout.
+                            ...(() => {
+                                const fd = currentObjectDef.form ?? currentObjectDef.formViews?.default;
+                                return fd?.type === 'tabbed' && Array.isArray(fd?.sections)
+                                    ? { contentLayout: 'tabbed', sections: fd.sections }
+                                    : {};
+                            })(),
                             title: editingRecord
                                 ? t('form.editTitle', { object: objectLabel(currentObjectDef) })
                                 : t('form.createTitle', { object: objectLabel(currentObjectDef) }),
@@ -304,20 +447,20 @@ export function AppContent({ extraRoutes, extraRoutesNoApp } = {}) {
                             cancelText: t('common.cancel'),
                         }, dataSource: dataSource }, editingRecord?.id || 'new'))] })] }));
 }
-function findFirstRoute(items) {
+function findFirstRoute(items, ctx) {
     if (!items || items.length === 0)
         return '';
     for (const item of items) {
-        if (item.type === 'object')
-            return item.viewName ? `${item.objectName}/view/${item.viewName}` : `${item.objectName}`;
-        if (item.type === 'page')
-            return item.pageName ? `page/${item.pageName}` : '';
-        if (item.type === 'dashboard')
-            return item.dashboardName ? `dashboard/${item.dashboardName}` : '';
+        if (item.type === 'object' || item.type === 'page' || item.type === 'dashboard' || item.type === 'report') {
+            const route = buildItemRoute(item, ctx);
+            if (route)
+                return route;
+            continue;
+        }
         if (item.type === 'url')
             continue;
         if (item.type === 'group' && item.children) {
-            const childRoute = findFirstRoute(item.children);
+            const childRoute = findFirstRoute(item.children, ctx);
             if (childRoute !== '')
                 return childRoute;
         }
@@ -326,19 +469,21 @@ function findFirstRoute(items) {
 }
 // Build the per-item route segment without recursing through groups —
 // used when `homePageId` resolved to an exact match and we just need to
-// know how to address it.
-function buildItemRoute(item) {
+// know how to address it. Delegates to the layout package's resolveHref()
+// so `recordId`/`recordMode`/`componentRef` semantics stay consistent
+// with the sidebar.
+function buildItemRoute(item, ctx) {
     if (!item)
         return '';
-    if (item.type === 'object')
-        return item.viewName ? `${item.objectName}/view/${item.viewName}` : `${item.objectName}`;
-    if (item.type === 'page')
-        return item.pageName ? `page/${item.pageName}` : '';
-    if (item.type === 'dashboard')
-        return item.dashboardName ? `dashboard/${item.dashboardName}` : '';
-    if (item.type === 'report')
-        return item.reportName ? `report/${item.reportName}` : '';
-    return '';
+    if (item.type === 'url' || item.type === 'action' || item.type === 'separator' || item.type === 'group')
+        return '';
+    const { href, external } = resolveHref(item, '', ctx);
+    if (external || !href || href === '#')
+        return '';
+    // resolveHref returns leading-slash paths (`/sys_user/...`); the
+    // Navigate target inside <Routes basename="/apps/:appName"> wants a
+    // *relative* path so it composes with the app base.
+    return href.replace(/^\//, '');
 }
 function findNavItemById(items, id) {
     if (!items)
@@ -362,16 +507,16 @@ function findNavItemById(items, id) {
  * at something that doesn't yield a route. This is what lets the CRM
  * example open on the Sales Dashboard instead of the Lead list.
  */
-function resolveLandingRoute(activeApp) {
+function resolveLandingRoute(activeApp, ctx) {
     const homePageId = activeApp?.homePageId;
     const navigation = activeApp?.navigation || [];
     if (homePageId) {
         const item = findNavItemById(navigation, homePageId);
-        const route = buildItemRoute(item);
+        const route = buildItemRoute(item, ctx);
         if (route)
             return route;
     }
-    return findFirstRoute(navigation);
+    return findFirstRoute(navigation, ctx);
 }
 /**
  * Heuristic: distinguish a record id from a route fragment.

package/dist/console/ConsoleShell.d.ts

@@ -10,7 +10,7 @@
  * apps/console/src/App.tsx for one with custom system routes + CreateApp.
  */
 import { type ReactNode } from 'react';
-export declare function LoadingFallback(): import("react/jsx-runtime").JSX.Element;
+export declare function LoadingFallback(): import("react").JSX.Element;
 /**
  * ConsoleShell — top-level provider stack shared by every console route.
  * Wraps children in ThemeProvider + NavigationProvider + FavoritesProvider +
@@ -27,7 +27,7 @@ export declare function LoadingFallback(): import("react/jsx-runtime").JSX.Eleme
  */
 export declare function ConsoleShell({ children }: {
     children: ReactNode;
-}): import("react/jsx-runtime").JSX.Element;
+}): import("react").JSX.Element;
 /**
  * ConnectedShell — mounts the data layer (AdapterProvider + MetadataProvider).
  * Use this around any route element that needs metadata access, i.e. anything
@@ -35,7 +35,7 @@ export declare function ConsoleShell({ children }: {
  */
 export declare function ConnectedShell({ children }: {
     children: ReactNode;
-}): import("react/jsx-runtime").JSX.Element;
+}): import("react").JSX.Element;
 /**
  * RequireOrganization — redirects to /organizations when the multi-tenant
  * feature is enabled (user has orgs but no active one). Single-tenant
@@ -43,7 +43,7 @@ export declare function ConnectedShell({ children }: {
  */
 export declare function RequireOrganization({ children }: {
     children: ReactNode;
-}): import("react/jsx-runtime").JSX.Element;
+}): import("react").JSX.Element;
 /**
  * AuthenticatedRoute — convenience wrapper composing AuthGuard + ConnectedShell
  * (+ optional RequireOrganization). Covers the common case for protected
@@ -53,14 +53,14 @@ export declare function AuthenticatedRoute({ children, requireOrganization, logi
     children: ReactNode;
     requireOrganization?: boolean;
     loginPath?: string;
-}): import("react/jsx-runtime").JSX.Element;
+}): import("react").JSX.Element;
 /**
  * RootRedirect — element for <Route path="/" />. Waits for metadata to load
  * then sends the user to /home.
  */
-export declare function RootRedirect(): import("react/jsx-runtime").JSX.Element;
+export declare function RootRedirect(): import("react").JSX.Element;
 /**
  * SystemRedirect — forwards legacy /system/* URLs to the canonical
  * /apps/setup/* location so bookmarks keep working. Suffix is preserved.
  */
-export declare function SystemRedirect(): import("react/jsx-runtime").JSX.Element;
+export declare function SystemRedirect(): import("react").JSX.Element;