@object-ui/app-shell 7.0.0 → 7.2.0

package/dist/hooks/useChatConversation.d.ts

@@ -136,6 +136,36 @@ interface ServerConversation {
     messages?: ServerMessage[];
 }
 export declare function toUIMessages(rows: ServerMessage[] | undefined): HydratedUIMessage[];
+/**
+ * A FLAT `ai_messages` row as returned by the public share endpoint
+ * (`GET /api/v1/share-links/:token/messages`), which streams the raw object
+ * rows rather than the reconstructed ModelMessage history that the
+ * authenticated `GET /conversations/:id` returns.
+ */
+export interface RawAiMessageRow {
+    id?: string;
+    role: string;
+    /** Persisted text (assistant/user/system) OR a JSON-stringified tool-result array (tool role). */
+    content?: unknown;
+    /** Assistant tool CALLS, JSON-stringified (`tool-call` parts). */
+    tool_calls?: string | null;
+    /** Tool RESULT's owning call id (legacy plain-string tool rows). */
+    tool_call_id?: string | null;
+}
+/**
+ * Reconstruct the ModelMessage-shaped `content` that {@link toUIMessages}
+ * expects from the FLAT columns the public share endpoint returns raw.
+ *
+ * The authenticated path gets this reconstruction server-side
+ * (`ObjqlConversationService.toMessage`): an assistant turn's tool CALLS live
+ * in the separate `tool_calls` column, and a `tool` row's RESULTS are a
+ * JSON-stringified array in `content`. The share endpoint skips that step and
+ * dumps the rows verbatim — so the shared transcript previously rendered the
+ * raw `{"type":"tool-result",…}` envelope as text instead of a card. Mirroring
+ * `toMessage` here lets the share page reuse the exact same hydrate → render
+ * pipeline as the live chat. Keep this in lockstep with `toMessage`.
+ */
+export declare function aiMessageRowsToServerMessages(rows: RawAiMessageRow[] | undefined): ServerMessage[];
 export declare function fetchConversation(apiBase: string, id: string): Promise<ServerConversation | null>;
 export declare function useChatConversation(options: UseChatConversationOptions): UseChatConversationReturn;
 export {};

package/dist/hooks/useChatConversation.js

@@ -267,6 +267,69 @@ export function toUIMessages(rows) {
     });
     return out;
 }
+function safeParseArray(value) {
+    if (typeof value !== 'string' || !value)
+        return undefined;
+    try {
+        const parsed = JSON.parse(value);
+        return Array.isArray(parsed) ? parsed : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * Reconstruct the ModelMessage-shaped `content` that {@link toUIMessages}
+ * expects from the FLAT columns the public share endpoint returns raw.
+ *
+ * The authenticated path gets this reconstruction server-side
+ * (`ObjqlConversationService.toMessage`): an assistant turn's tool CALLS live
+ * in the separate `tool_calls` column, and a `tool` row's RESULTS are a
+ * JSON-stringified array in `content`. The share endpoint skips that step and
+ * dumps the rows verbatim — so the shared transcript previously rendered the
+ * raw `{"type":"tool-result",…}` envelope as text instead of a card. Mirroring
+ * `toMessage` here lets the share page reuse the exact same hydrate → render
+ * pipeline as the live chat. Keep this in lockstep with `toMessage`.
+ */
+export function aiMessageRowsToServerMessages(rows) {
+    if (!rows)
+        return [];
+    return rows.map((row) => {
+        const id = row.id;
+        const text = typeof row.content === 'string' ? row.content : '';
+        if (row.role === 'assistant') {
+            const toolCalls = safeParseArray(row.tool_calls);
+            if (toolCalls && toolCalls.length > 0) {
+                const content = [];
+                if (text)
+                    content.push({ type: 'text', text });
+                content.push(...toolCalls);
+                return { id, role: 'assistant', content };
+            }
+            return { id, role: 'assistant', content: text };
+        }
+        if (row.role === 'tool') {
+            const results = safeParseArray(row.content);
+            if (results && results.length > 0 && results[0]?.type === 'tool-result') {
+                return { id, role: 'tool', content: results };
+            }
+            // Back-compat: pre-array tool rows persisted a plain string.
+            return {
+                id,
+                role: 'tool',
+                content: [
+                    {
+                        type: 'tool-result',
+                        toolCallId: row.tool_call_id ?? '',
+                        toolName: 'unknown',
+                        output: { type: 'text', value: text },
+                    },
+                ],
+            };
+        }
+        return { id, role: row.role, content: text };
+    });
+}
 export async function fetchConversation(apiBase, id) {
     const res = await fetch(`${apiBase}/conversations/${encodeURIComponent(id)}`, {
         credentials: 'include',

package/dist/hooks/useConsoleActionRuntime.d.ts

@@ -23,6 +23,7 @@
 import React from 'react';
 import { createAuthenticatedFetch } from '@object-ui/auth';
 import type { ActionContext, ActionDef, ActionResult, ConfirmationHandler, NavigationHandler, ParamCollectionHandler, ResultDialogHandler, ToastHandler } from '@object-ui/core';
+import { type EntitlementDialogSpec } from '../environment/entitlements';
 export interface ConsoleActionRuntimeOptions {
     /** Adapter for generic CRUD / execute calls. */
     dataSource: any;
@@ -45,6 +46,8 @@ export interface ConsoleActionRuntime {
     serverActionHandler: (action: ActionDef, context?: ActionContext) => Promise<ActionResult>;
     /** Authenticated fetch wrapper (Bearer + tenant + cookies). */
     authFetch: ReturnType<typeof createAuthenticatedFetch>;
+    /** Open the shared environment entitlement (upgrade / limit) dialog. */
+    openEntitlementDialog: (spec: EntitlementDialogSpec) => void;
     /** Props to spread onto `<ActionProvider>`. */
     actionProviderProps: {
         context: Record<string, any>;

package/dist/hooks/useConsoleActionRuntime.js

@@ -24,6 +24,7 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
 import { useCallback, useMemo, useRef, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useAuth, createAuthenticatedFetch } from '@object-ui/auth';
+import { usePermissions } from '@object-ui/permissions';
 import { useObjectLabel } from '@object-ui/i18n';
 import { ActionProvider, useGlobalUndo } from '@object-ui/react';
 import { toast } from 'sonner';
@@ -32,11 +33,17 @@ import { ActionParamDialog } from '../views/ActionParamDialog';
 import { ActionResultDialog } from '../views/ActionResultDialog';
 import { FlowRunner } from '../views/FlowRunner';
 import { resolveActionParams } from '../utils/resolveActionParams';
+import { EnvironmentEntitlementDialog } from '../environment/EnvironmentEntitlementDialog';
+import { entitlementDialogFromError } from '../environment/entitlements';
+import { resolvePageVarTokens } from '../utils/resolvePageVarTokens';
 const FALLBACK_USER = { id: 'current-user', name: 'Demo User', isPlatformAdmin: false };
 export function useConsoleActionRuntime(opts) {
     const { dataSource, objects, objectName, onRefresh } = opts;
     const navigate = useNavigate();
     const { user, activeOrganization } = useAuth();
+    // [ADR-0066 D4] System capabilities for the action capability gate (fail-open
+    // when no PermissionProvider is mounted — usePermissions returns []).
+    const { systemPermissions } = usePermissions();
     const { fieldLabel, fieldOptionLabel, actionParamText, actionParamOptionLabel, actionDescription } = useObjectLabel();
     const objectDef = useMemo(() => (objectName ? objects?.find((o) => o.name === objectName) : undefined), [objects, objectName]);
     // Object name used for API paths / generic CRUD. Falls back to the action's
@@ -56,6 +63,9 @@ export function useConsoleActionRuntime(opts) {
     const [resultDialogState, setResultDialogState] = useState({ open: false });
     // A paused `screen`-node flow awaiting user input.
     const [screenFlow, setScreenFlow] = useState(null);
+    // Plan/capacity gate dialog (upgrade / limit), shared by the env-list toolbar
+    // (proactive) and the api-action error path below (reactive safety net).
+    const [entitlementDialog, setEntitlementDialog] = useState({ open: false });
     // Guards against double-firing a server action (slow SSO handoff, etc.).
     const serverActionInFlight = useRef(new Set());
     const resultDialogHandler = useCallback((spec, data) => new Promise((resolve) => {
@@ -103,8 +113,8 @@ export function useConsoleActionRuntime(opts) {
         });
     }, [objectName, objectDef, objects, fieldLabel, fieldOptionLabel, actionParamText, actionParamOptionLabel]);
     const currentUser = user
-        ? { id: user.id, name: user.name, avatar: user.image, isPlatformAdmin: user?.isPlatformAdmin ?? false }
-        : FALLBACK_USER;
+        ? { id: user.id, name: user.name, avatar: user.image, isPlatformAdmin: user?.isPlatformAdmin ?? false, systemPermissions: systemPermissions ?? [] }
+        : { ...FALLBACK_USER, systemPermissions: systemPermissions ?? [] };
     const toastHandler = useCallback((message, options) => {
         if (options?.type === 'error') {
             toast.error(message);
@@ -129,7 +139,10 @@ export function useConsoleActionRuntime(opts) {
     }, [navigate]);
     // Authenticated fetch for direct backend calls. Declared before apiHandler.
     const authFetch = useMemo(() => createAuthenticatedFetch(), []);
-    const apiHandler = useCallback(async (action) => {
+    const openEntitlementDialog = useCallback((spec) => {
+        setEntitlementDialog({ open: true, spec });
+    }, []);
+    const apiHandler = useCallback(async (action, context) => {
         try {
             const target = action.target || action.name;
             const params = action.params || {};
@@ -144,6 +157,12 @@ export function useConsoleActionRuntime(opts) {
                 const rawParams = { ...params };
                 const rowRecord = rawParams._rowRecord;
                 delete rawParams._rowRecord;
+                // Resolve `{{page.<var>}}` tokens against the live page-variable snapshot
+                // (published into the action context by PageVariableActionBridge). This is
+                // what lets a pure-SDUI form submit the values its inputs wrote into page
+                // variables; whole-value tokens preserve type. See resolvePageVarTokens.
+                const pageVars = (context?.pageVariables ?? undefined);
+                const resolvedParams = resolvePageVarTokens(rawParams, pageVars);
                 // Interpolate `{field}` tokens in the target URL from the row record.
                 let resolvedTarget = targetStr;
                 if (rowRecord && /\{[a-z_][a-z0-9_]*\}/i.test(resolvedTarget)) {
@@ -156,7 +175,7 @@ export function useConsoleActionRuntime(opts) {
                 const wrap = action.bodyShape && typeof action.bodyShape === 'object' && action.bodyShape.wrap
                     ? action.bodyShape.wrap
                     : undefined;
-                const body = wrap ? { [wrap]: rawParams } : { ...rawParams };
+                const body = wrap ? { [wrap]: resolvedParams } : { ...resolvedParams };
                 if (rowRecord && action.recordIdParam) {
                     const rowField = action.recordIdField || 'id';
                     const rowValue = rowRecord[rowField];
@@ -168,7 +187,7 @@ export function useConsoleActionRuntime(opts) {
                     body.organizationId = activeOrganization.id;
                 }
                 if (action.bodyExtra && typeof action.bodyExtra === 'object') {
-                    Object.assign(body, action.bodyExtra);
+                    Object.assign(body, resolvePageVarTokens(action.bodyExtra, pageVars));
                 }
                 const method = (action.method || 'POST').toUpperCase();
                 const init = {
@@ -181,12 +200,23 @@ export function useConsoleActionRuntime(opts) {
                 }
                 const res = await authFetch(url, init);
                 if (!res.ok) {
-                    let detail = `HTTP ${res.status}`;
+                    let body = null;
                     try {
-                        const j = await res.json();
-                        detail = j?.error || j?.message || detail;
+                        body = await res.json();
                     }
                     catch { /* response body not JSON */ }
+                    // Plan/capacity gates (e.g. creating an environment the org's plan
+                    // doesn't include) come back as coded 403s. Surface them as a friendly
+                    // upgrade/limit DIALOG with a CTA — never a generic red error toast.
+                    // Returning success:false WITHOUT an `error` suppresses the runner's
+                    // error toast (ActionRunner.handlePostExecution); the dialog owns the
+                    // messaging.
+                    const entitlementSpec = entitlementDialogFromError(body);
+                    if (entitlementSpec) {
+                        openEntitlementDialog(entitlementSpec);
+                        return { success: false };
+                    }
+                    const detail = body?.error || body?.message || `HTTP ${res.status}`;
                     return { success: false, error: detail };
                 }
                 const data = await res.json().catch(() => ({}));
@@ -247,7 +277,7 @@ export function useConsoleActionRuntime(opts) {
         catch (error) {
             return { success: false, error: error.message };
         }
-    }, [dataSource, objApiName, authFetch, activeOrganization, refresh]);
+    }, [dataSource, objApiName, authFetch, activeOrganization, refresh, openEntitlementDialog]);
     // Flow action handler — POST to /api/v1/automation/{name}/trigger.
     // `context` is the shared ActionRunner context (registered handlers are
     // invoked as `handler(action, runnerContext)`).
@@ -533,7 +563,8 @@ export function useConsoleActionRuntime(opts) {
                 } }), _jsx(ActionResultDialog, { state: resultDialogState, onAcknowledge: () => {
                     resultDialogState.resolve?.();
                     setResultDialogState({ open: false });
-                } }), _jsx(FlowRunner, { state: screenFlow, authFetch: authFetch, baseUrl: import.meta.env.VITE_SERVER_URL || '', dataSource: dataSource, objects: objects, onClose: () => setScreenFlow(null), onComplete: () => { setScreenFlow(null); refresh(); } })] }));
+                } }), _jsx(FlowRunner, { state: screenFlow, authFetch: authFetch, baseUrl: import.meta.env.VITE_SERVER_URL || '', dataSource: dataSource, objects: objects, onClose: () => setScreenFlow(null), onComplete: () => { setScreenFlow(null); refresh(); } }), _jsx(EnvironmentEntitlementDialog, { state: entitlementDialog, apiBase: import.meta.env.VITE_SERVER_URL || '', onOpenChange: (open) => { if (!open)
+                    setEntitlementDialog({ open: false }); } })] }));
     return {
         confirmHandler,
         toastHandler,
@@ -544,6 +575,7 @@ export function useConsoleActionRuntime(opts) {
         flowHandler,
         serverActionHandler,
         authFetch,
+        openEntitlementDialog,
         actionProviderProps,
         dialogs,
     };

package/dist/index.d.ts

@@ -19,7 +19,9 @@ export type { AppShellProps, } from './types';
 export type { MetadataState, MetadataContextValue, MetadataTypeStatus, } from './providers/MetadataProvider';
 export type { ExpressionContextValue, } from './providers/ExpressionProvider';
 export type { RecentItem, } from './hooks/useRecentItems';
-export { ConsoleShell, ConnectedShell, RequireOrganization, AuthenticatedRoute, RootRedirect, SystemRedirect, LoadingFallback, } from './console/ConsoleShell';
+export { ConsoleShell, ConnectedShell, RequireOrganization, RequireAiSurface, AuthenticatedRoute, RootRedirect, SystemRedirect, LoadingFallback, } from './console/ConsoleShell';
+export { useAiSurfaceEnabled } from './hooks/useAiSurface';
+export type { AiSurfaceState } from './hooks/useAiSurface';
 export { ConsoleLayout, AppHeader, AppSidebar, UnifiedSidebar, AppSwitcher, ConnectionStatus, ActivityFeed, LocaleSwitcher, ModeToggle, AuthPageLayout, } from './layout';
 export type { ActivityItem } from './layout';
 export { CommandPalette, KeyboardShortcutsDialog, OnboardingWalkthrough, ConditionalAuthWrapper, ConsoleToaster, RouteFader, toastWithUndo, type ToastWithUndoOptions, ErrorBoundary, LoadingScreen, ThemeProvider, useTheme, } from './chrome';
@@ -48,8 +50,9 @@ export { MembersPage as DefaultMembersPage } from './console/organizations/manag
 export { InvitationsPage as DefaultInvitationsPage } from './console/organizations/manage/InvitationsPage';
 export { SettingsPage as DefaultSettingsPage } from './console/organizations/manage/SettingsPage';
 export { AcceptInvitationPage as DefaultAcceptInvitationPage } from './console/organizations/manage/AcceptInvitationPage';
-export { AiChatPage as DefaultAiChatPage, AiChatPage } from './console/ai/AiChatPage';
+export { AiChatPage as DefaultAiChatPage, AiChatPage, hydratedMessagesToChatMessages, } from './console/ai/AiChatPage';
 export { ConversationsSidebar } from './console/ai/ConversationsSidebar';
+export { toUIMessages, aiMessageRowsToServerMessages, type HydratedUIMessage, type RawAiMessageRow, } from './hooks/useChatConversation';
 export { registerAppComponent, getAppComponent, listAppComponents, componentRefToUrlSegments, urlSegmentsToComponentRef, } from './services/componentRegistry';
 export type { AppComponentRegistryEntry } from './services/componentRegistry';
 import './services/builtinComponents';

package/dist/index.js

@@ -18,7 +18,11 @@ export { getPendingRequests, isIdle, subscribeSettle, whenIdle, withSettleSignal
 export { useRecentItems } from './hooks/useRecentItems';
 // Console building blocks — compose these in your App.tsx to build the console
 // routing tree. See examples/console-starter/src/App.tsx for a minimal example.
-export { ConsoleShell, ConnectedShell, RequireOrganization, AuthenticatedRoute, RootRedirect, SystemRedirect, LoadingFallback, } from './console/ConsoleShell';
+export { ConsoleShell, ConnectedShell, RequireOrganization, RequireAiSurface, AuthenticatedRoute, RootRedirect, SystemRedirect, LoadingFallback, } from './console/ConsoleShell';
+// Runtime AI-availability signal — the single source of truth every AI entry
+// point gates on (FAB, /ai routes, designer "Ask AI"). Server-pushed, no
+// build-time edition flag. See ./hooks/useAiSurface.
+export { useAiSurfaceEnabled } from './hooks/useAiSurface';
 // Layout chrome
 export { ConsoleLayout, AppHeader, AppSidebar, UnifiedSidebar, AppSwitcher, ConnectionStatus, ActivityFeed, LocaleSwitcher, ModeToggle, AuthPageLayout, } from './layout';
 // Top-level chrome (dialogs, providers, error boundaries)
@@ -52,8 +56,12 @@ export { MembersPage as DefaultMembersPage } from './console/organizations/manag
 export { InvitationsPage as DefaultInvitationsPage } from './console/organizations/manage/InvitationsPage';
 export { SettingsPage as DefaultSettingsPage } from './console/organizations/manage/SettingsPage';
 export { AcceptInvitationPage as DefaultAcceptInvitationPage } from './console/organizations/manage/AcceptInvitationPage';
-export { AiChatPage as DefaultAiChatPage, AiChatPage } from './console/ai/AiChatPage';
+export { AiChatPage as DefaultAiChatPage, AiChatPage, hydratedMessagesToChatMessages, } from './console/ai/AiChatPage';
 export { ConversationsSidebar } from './console/ai/ConversationsSidebar';
+// Conversation-history hydration helpers — reused by the public read-only
+// share page (`/s/:token`) so a shared transcript renders identically to the
+// live chat (tool cards included) instead of dumping raw envelopes.
+export { toUIMessages, aiMessageRowsToServerMessages, } from './hooks/useChatConversation';
 // Phase 3b: Component nav registry — plugins use this to register
 // admin/setup UI surfaces that are addressable from App metadata via
 // `{ type: 'component', componentRef: 'ns:name' }` nav items.

package/dist/layout/AppHeader.js

@@ -20,7 +20,7 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
  */
 import { useLocation, useParams, Link, useNavigate } from 'react-router-dom';
 import { Button, DropdownMenu, DropdownMenuTrigger, DropdownMenuContent, DropdownMenuItem, DropdownMenuLabel, DropdownMenuSeparator, DropdownMenuGroup, Avatar, AvatarImage, AvatarFallback, cn, } from '@object-ui/components';
-import { Search, HelpCircle, ChevronDown, Check, Lock, LogOut, Boxes, Layers, Bot, User, BookOpen, ExternalLink, Keyboard, } from 'lucide-react';
+import { Search, HelpCircle, ChevronDown, Check, Lock, LogOut, Boxes, Plus, Layers, Bot, User, BookOpen, ExternalLink, Keyboard, } from 'lucide-react';
 import { useState, useEffect, useCallback, useRef } from 'react';
 import { useOffline } from '@object-ui/react';
 import { PresenceAvatars, useTenantPresence } from '@object-ui/collaboration';
@@ -39,6 +39,7 @@ import { useMobileViewSwitcher } from './MobileViewSwitcherContext';
 import { useNavigationContext } from '../context/NavigationContext';
 import { useCommandPalette } from '../context/CommandPaletteProvider';
 import { useUrlOverlay } from '../hooks/useUrlOverlay';
+import { useAiSurfaceEnabled } from '../hooks/useAiSurface';
 import { getProductName } from '../runtime-config';
 import { LocalizedSidebarTrigger } from './LocalizedSidebarTrigger';
 function humanizeSlug(slug) {
@@ -64,8 +65,12 @@ export function AppHeader({ variant, appName, objects, connectionState, presence
     // Click-reachable entry for the keyboard-shortcuts dialog (was `?`-key only).
     // Shares the `?shortcuts=1` URL param with KeyboardShortcutsDialog (C2/C3).
     const { openOverlay: openShortcuts } = useUrlOverlay('shortcuts');
-    const { user, signOut, isAuthEnabled, organizations, activeOrganization, isOrganizationsLoading, } = useAuth();
+    const { user, signOut, isAuthEnabled, organizations, activeOrganization, isOrganizationsLoading, getAuthConfig, } = useAuth();
     const dataSource = useAdapter();
+    // Runtime AI gating: hide the top-bar AI entry point when the server serves
+    // no AI (Community Edition) so it can't dead-end on a chat with no agent.
+    // Same signal as the FAB and the `/ai` route guard.
+    const { enabled: aiEnabled } = useAiSurfaceEnabled();
     const { t } = useObjectTranslation();
     const { objectLabel, dashboardLabel, pageLabel, reportLabel, viewLabel, appLabel } = useObjectLabel();
     const { apps: metadataApps, dashboards: metadataDashboards, pages: metadataPages, reports: metadataReports } = useMetadata();
@@ -432,6 +437,25 @@ export function AppHeader({ variant, appName, objects, connectionState, presence
     const activeActivities = activities ?? apiActivities ?? [];
     const orgList = organizations ?? [];
     const hasOrgSection = isOrganizationsLoading || orgList.length > 0 || !!activeOrganization;
+    // Mirror the server's `beforeCreateOrganization` gate so the "Create
+    // workspace" entry only shows where multi-org self-service is enabled.
+    // Default to allowed until the config resolves (avoids hiding it on slow
+    // networks); the server still enforces.
+    const [multiOrgDisabled, setMultiOrgDisabled] = useState(false);
+    useEffect(() => {
+        let cancelled = false;
+        getAuthConfig?.()
+            .then((cfg) => {
+            if (!cancelled)
+                setMultiOrgDisabled(cfg?.features?.multiOrgEnabled === false);
+        })
+            .catch(() => {
+            /* leave default — server still enforces */
+        });
+        return () => {
+            cancelled = true;
+        };
+    }, [getAuthConfig]);
     // Build path segments (only used in `app` variant)
     const pathParts = location.pathname.split('/').filter(Boolean);
     const appNameFromRoute = params.appName || pathParts[1];
@@ -545,10 +569,10 @@ export function AppHeader({ variant, appName, objects, connectionState, presence
                                                     if (!isActive)
                                                         mobileSwitcher.onChange(v.id);
                                                 }, className: "gap-2", children: [v.icon ? (_jsx("span", { className: "shrink-0 text-muted-foreground [&>svg]:h-4 [&>svg]:w-4", children: v.icon })) : null, _jsx("span", { className: "flex-1 truncate", children: v.label }), v.locked ? (_jsx(Lock, { className: "h-3 w-3 shrink-0 text-muted-foreground", "aria-hidden": true })) : null, isActive ? (_jsx(Check, { className: "h-4 w-4 shrink-0 text-foreground", "aria-hidden": true })) : null] }, v.id));
-                                        }) })] })) : (_jsx("span", { className: "text-sm font-medium sm:hidden truncate min-w-0 ml-1", children: mobileSwitcher.triggerLabel ?? mobileSwitcher.views[0].label }))) : (_jsx("span", { className: "text-sm font-medium sm:hidden truncate min-w-0 ml-1", children: lastSegmentLabel }))] }))] }), _jsxs("div", { className: "flex items-center gap-0.5 sm:gap-1 shrink-0 [&>*+*[data-topbar-group]]:ml-1 [&>[data-topbar-group]+[data-topbar-group]]:border-l [&>[data-topbar-group]+[data-topbar-group]]:border-border/60 [&>[data-topbar-group]+[data-topbar-group]]:pl-1 sm:[&>[data-topbar-group]+[data-topbar-group]]:pl-2 sm:[&>[data-topbar-group]+[data-topbar-group]]:ml-2", children: [!isOnline && (_jsxs("div", { className: "flex items-center gap-1 px-2 py-1 rounded-full bg-yellow-100 dark:bg-yellow-900/30 text-yellow-800 dark:text-yellow-200 text-xs font-medium", children: [_jsx("span", { className: "h-2 w-2 rounded-full bg-yellow-500 animate-pulse" }), t('topbar.offline', { defaultValue: 'Offline' })] })), isApp && connectionState && _jsx(ConnectionStatus, { state: connectionState }), isApp && activeUsers.length > 0 && (_jsx("div", { className: "hidden md:flex items-center shrink-0", title: t('topbar.usersOnline', { defaultValue: 'Users currently online' }), children: _jsx(PresenceAvatars, { users: activeUsers, size: "sm", maxVisible: 3, showStatus: true }) })), _jsxs("div", { "data-topbar-group": true, className: "flex items-center gap-0.5 sm:gap-1 shrink-0", children: [_jsxs("button", { type: "button", "data-testid": "action:command-palette:open", "aria-label": t('console.search', { defaultValue: 'Search…' }), "aria-keyshortcuts": "Meta+K Control+K", onClick: openCommandPalette, className: "hidden lg:flex relative items-center gap-2 w-48 xl:w-64 h-8 px-3 text-sm rounded-md border bg-muted/50 text-muted-foreground hover:bg-muted transition-colors", children: [_jsx(Search, { className: "h-3.5 w-3.5 shrink-0" }), _jsx("span", { className: "flex-1 text-left text-xs", children: t('console.search', { defaultValue: 'Search…' }) }), _jsxs("kbd", { className: "pointer-events-none inline-flex h-5 items-center gap-0.5 rounded border bg-background px-1.5 text-[10px] font-medium text-muted-foreground", children: [_jsx("span", { className: "text-xs", children: "\u2318" }), "K"] })] }), _jsx(Button, { variant: "ghost", size: "icon", className: "lg:hidden h-8 w-8 shrink-0", "data-testid": "action:command-palette:open-mobile", onClick: openCommandPalette, "aria-label": t('console.search', { defaultValue: 'Search…' }), children: _jsx(Search, { className: "h-4 w-4" }) })] }), _jsxs("div", { "data-topbar-group": true, className: "flex items-center gap-0.5 shrink-0", children: [_jsx(InboxPopover, { notifications: notifications, unreadCount: unreadCount, pendingApprovalsCount: pendingApprovalsCount, activities: activeActivities, onMarkAllRead: markAllRead, onMarkRead: markNotificationRead }), _jsx(Button, { variant: "ghost", size: "icon", className: "h-8 w-8 shrink-0", asChild: true, "aria-label": t('topbar.aiAssistant', { defaultValue: 'AI Assistant' }), children: _jsx(Link, { to: "/ai", children: _jsx(Bot, { className: "h-4 w-4" }) }) }), _jsxs(DropdownMenu, { onOpenChange: (open) => { if (open)
+                                        }) })] })) : (_jsx("span", { className: "text-sm font-medium sm:hidden truncate min-w-0 ml-1", children: mobileSwitcher.triggerLabel ?? mobileSwitcher.views[0].label }))) : (_jsx("span", { className: "text-sm font-medium sm:hidden truncate min-w-0 ml-1", children: lastSegmentLabel }))] }))] }), _jsxs("div", { className: "flex items-center gap-0.5 sm:gap-1 shrink-0 [&>*+*[data-topbar-group]]:ml-1 [&>[data-topbar-group]+[data-topbar-group]]:border-l [&>[data-topbar-group]+[data-topbar-group]]:border-border/60 [&>[data-topbar-group]+[data-topbar-group]]:pl-1 sm:[&>[data-topbar-group]+[data-topbar-group]]:pl-2 sm:[&>[data-topbar-group]+[data-topbar-group]]:ml-2", children: [!isOnline && (_jsxs("div", { className: "flex items-center gap-1 px-2 py-1 rounded-full bg-yellow-100 dark:bg-yellow-900/30 text-yellow-800 dark:text-yellow-200 text-xs font-medium", children: [_jsx("span", { className: "h-2 w-2 rounded-full bg-yellow-500 animate-pulse" }), t('topbar.offline', { defaultValue: 'Offline' })] })), isApp && connectionState && _jsx(ConnectionStatus, { state: connectionState }), isApp && activeUsers.length > 0 && (_jsx("div", { className: "hidden md:flex items-center shrink-0", title: t('topbar.usersOnline', { defaultValue: 'Users currently online' }), children: _jsx(PresenceAvatars, { users: activeUsers, size: "sm", maxVisible: 3, showStatus: true }) })), _jsxs("div", { "data-topbar-group": true, className: "flex items-center gap-0.5 sm:gap-1 shrink-0", children: [_jsxs("button", { type: "button", "data-testid": "action:command-palette:open", "aria-label": t('console.search', { defaultValue: 'Search…' }), "aria-keyshortcuts": "Meta+K Control+K", onClick: openCommandPalette, className: "hidden lg:flex relative items-center gap-2 w-48 xl:w-64 h-8 px-3 text-sm rounded-md border bg-muted/50 text-muted-foreground hover:bg-muted transition-colors", children: [_jsx(Search, { className: "h-3.5 w-3.5 shrink-0" }), _jsx("span", { className: "flex-1 text-left text-xs", children: t('console.search', { defaultValue: 'Search…' }) }), _jsxs("kbd", { className: "pointer-events-none inline-flex h-5 items-center gap-0.5 rounded border bg-background px-1.5 text-[10px] font-medium text-muted-foreground", children: [_jsx("span", { className: "text-xs", children: "\u2318" }), "K"] })] }), _jsx(Button, { variant: "ghost", size: "icon", className: "lg:hidden h-8 w-8 shrink-0", "data-testid": "action:command-palette:open-mobile", onClick: openCommandPalette, "aria-label": t('console.search', { defaultValue: 'Search…' }), children: _jsx(Search, { className: "h-4 w-4" }) })] }), _jsxs("div", { "data-topbar-group": true, className: "flex items-center gap-0.5 shrink-0", children: [_jsx(InboxPopover, { notifications: notifications, unreadCount: unreadCount, pendingApprovalsCount: pendingApprovalsCount, activities: activeActivities, onMarkAllRead: markAllRead, onMarkRead: markNotificationRead }), aiEnabled && (_jsx(Button, { variant: "ghost", size: "icon", className: "h-8 w-8 shrink-0", asChild: true, "aria-label": t('topbar.aiAssistant', { defaultValue: 'AI Assistant' }), children: _jsx(Link, { to: "/ai", children: _jsx(Bot, { className: "h-4 w-4" }) }) })), _jsxs(DropdownMenu, { onOpenChange: (open) => { if (open)
                                     void loadHelpDocs(); }, children: [_jsx(DropdownMenuTrigger, { asChild: true, children: _jsx(Button, { variant: "ghost", size: "icon", className: "h-8 w-8 hidden md:flex shrink-0", "aria-label": t('sidebar.helpTooltip', { defaultValue: 'Help & Documentation' }), children: _jsx(HelpCircle, { className: "h-4 w-4" }) }) }), _jsxs(DropdownMenuContent, { align: "end", className: "min-w-56 rounded-lg", sideOffset: 4, children: [currentAppDocs.length > 0 && currentAppPackageId ? (_jsxs(DropdownMenuItem, { className: "cursor-pointer", onClick: () => navigate(currentAppDocs.length === 1
                                                     ? `/apps/${currentAppPackageId}/docs/${currentAppDocs[0].name}`
-                                                    : `/apps/${currentAppPackageId}/docs`), children: [_jsx(BookOpen, { className: "mr-2 h-4 w-4" }), t('help.appDocs', { defaultValue: "This app's docs" })] })) : null, _jsxs(DropdownMenuItem, { className: "cursor-pointer", onClick: () => navigate('/docs'), children: [_jsx(Layers, { className: "mr-2 h-4 w-4" }), t('help.allDocs', { defaultValue: 'All documentation' })] }), isApp ? (_jsxs(DropdownMenuItem, { className: "cursor-pointer", "data-testid": "action:keyboard-shortcuts:open", onClick: openShortcuts, children: [_jsx(Keyboard, { className: "mr-2 h-4 w-4" }), t('help.keyboardShortcuts', { defaultValue: 'Keyboard shortcuts' })] })) : null, _jsx(DropdownMenuSeparator, {}), _jsx(DropdownMenuItem, { asChild: true, className: "cursor-pointer", children: _jsxs("a", { href: "https://docs.objectstack.ai", target: "_blank", rel: "noopener noreferrer", children: [_jsx(ExternalLink, { className: "mr-2 h-4 w-4" }), t('help.onlineDocs', { defaultValue: 'Online documentation' })] }) })] })] })] }), _jsxs("div", { "data-topbar-group": true, className: "flex items-center gap-0.5 shrink-0", children: ["        ", _jsxs(DropdownMenu, { children: [_jsx(DropdownMenuTrigger, { asChild: true, children: _jsx(Button, { variant: "ghost", size: "icon", className: "h-8 w-8 shrink-0 rounded-full", children: _jsxs(Avatar, { className: "h-7 w-7 rounded-full", children: [_jsx(AvatarImage, { src: user?.image, alt: user?.name ?? 'User' }), _jsx(AvatarFallback, { className: "rounded-full bg-primary text-primary-foreground text-xs", children: getUserInitials(user) })] }) }) }), _jsxs(DropdownMenuContent, { align: "end", className: "min-w-64 rounded-lg", sideOffset: 4, children: [_jsx(DropdownMenuLabel, { className: "p-0 font-normal", children: _jsxs("div", { className: "flex items-center gap-2 px-2 py-2", children: [_jsxs(Avatar, { className: "h-8 w-8 rounded-lg", children: [_jsx(AvatarImage, { src: user?.image, alt: user?.name ?? 'User' }), _jsx(AvatarFallback, { className: "rounded-lg bg-primary text-primary-foreground", children: getUserInitials(user) })] }), _jsxs("div", { className: "grid flex-1 text-left text-sm leading-tight", children: [_jsx("span", { className: "truncate font-semibold", children: user?.name ?? 'User' }), _jsx("span", { className: "truncate text-xs text-muted-foreground", children: user?.email ?? '' })] })] }) }), _jsx(DropdownMenuSeparator, {}), _jsxs(DropdownMenuGroup, { children: [_jsxs(DropdownMenuItem, { onClick: () => navigate('/apps/account/component/account/profile_card'), className: "cursor-pointer", children: [_jsx(User, { className: "mr-2 h-4 w-4" }), t('user.profile', { defaultValue: 'Profile' })] }), hasOrgSection && (_jsxs(DropdownMenuItem, { onClick: () => navigate('/organizations'), className: "cursor-pointer", children: [_jsx(Boxes, { className: "mr-2 h-4 w-4" }), t('organizations.mine', { defaultValue: 'My Organizations' })] })), (metadataApps || [])
+                                                    : `/apps/${currentAppPackageId}/docs`), children: [_jsx(BookOpen, { className: "mr-2 h-4 w-4" }), t('help.appDocs', { defaultValue: "This app's docs" })] })) : null, _jsxs(DropdownMenuItem, { className: "cursor-pointer", onClick: () => navigate('/docs'), children: [_jsx(Layers, { className: "mr-2 h-4 w-4" }), t('help.allDocs', { defaultValue: 'All documentation' })] }), isApp ? (_jsxs(DropdownMenuItem, { className: "cursor-pointer", "data-testid": "action:keyboard-shortcuts:open", onClick: openShortcuts, children: [_jsx(Keyboard, { className: "mr-2 h-4 w-4" }), t('help.keyboardShortcuts', { defaultValue: 'Keyboard shortcuts' })] })) : null, _jsx(DropdownMenuSeparator, {}), _jsx(DropdownMenuItem, { asChild: true, className: "cursor-pointer", children: _jsxs("a", { href: "https://docs.objectstack.ai", target: "_blank", rel: "noopener noreferrer", children: [_jsx(ExternalLink, { className: "mr-2 h-4 w-4" }), t('help.onlineDocs', { defaultValue: 'Online documentation' })] }) })] })] })] }), _jsxs("div", { "data-topbar-group": true, className: "flex items-center gap-0.5 shrink-0", children: ["        ", _jsxs(DropdownMenu, { children: [_jsx(DropdownMenuTrigger, { asChild: true, children: _jsx(Button, { variant: "ghost", size: "icon", className: "h-8 w-8 shrink-0 rounded-full", children: _jsxs(Avatar, { className: "h-7 w-7 rounded-full", children: [_jsx(AvatarImage, { src: user?.image, alt: user?.name ?? 'User' }), _jsx(AvatarFallback, { className: "rounded-full bg-primary text-primary-foreground text-xs", children: getUserInitials(user) })] }) }) }), _jsxs(DropdownMenuContent, { align: "end", className: "min-w-64 rounded-lg", sideOffset: 4, children: [_jsx(DropdownMenuLabel, { className: "p-0 font-normal", children: _jsxs("div", { className: "flex items-center gap-2 px-2 py-2", children: [_jsxs(Avatar, { className: "h-8 w-8 rounded-lg", children: [_jsx(AvatarImage, { src: user?.image, alt: user?.name ?? 'User' }), _jsx(AvatarFallback, { className: "rounded-lg bg-primary text-primary-foreground", children: getUserInitials(user) })] }), _jsxs("div", { className: "grid flex-1 text-left text-sm leading-tight", children: [_jsx("span", { className: "truncate font-semibold", children: user?.name ?? 'User' }), _jsx("span", { className: "truncate text-xs text-muted-foreground", children: user?.email ?? '' })] })] }) }), _jsx(DropdownMenuSeparator, {}), _jsxs(DropdownMenuGroup, { children: [_jsxs(DropdownMenuItem, { onClick: () => navigate('/apps/account/component/account/profile_card'), className: "cursor-pointer", children: [_jsx(User, { className: "mr-2 h-4 w-4" }), t('user.profile', { defaultValue: 'Profile' })] }), hasOrgSection && (_jsxs(DropdownMenuItem, { onClick: () => navigate('/organizations?manage=1'), className: "cursor-pointer", children: [_jsx(Boxes, { className: "mr-2 h-4 w-4" }), t('organizations.mine', { defaultValue: 'My Organizations' })] })), hasOrgSection && !multiOrgDisabled && (_jsxs(DropdownMenuItem, { onClick: () => navigate('/organizations?create=1'), className: "cursor-pointer", "data-testid": "header-create-workspace", children: [_jsx(Plus, { className: "mr-2 h-4 w-4" }), t('organizations.create', { defaultValue: 'Create workspace' })] })), (metadataApps || [])
                                                         .filter((a) => a.active !== false && a.hidden === true && a.name !== 'account')
                                                         .map((app) => {
                                                         const AppIcon = getIcon(app.icon);

package/dist/layout/ConsoleFloatingChatbot.d.ts

@@ -36,10 +36,12 @@ export interface ConsoleFloatingChatbotProps {
      */
     defaultAgent?: string;
     /**
-     * Show the in-header agent switcher. Off by default: end users get the
-     * single agent bound to their app and never have to choose. Enable for
-     * power users / admins (or via `VITE_AI_SHOW_AGENT_PICKER`) when a
-     * surface genuinely exposes multiple agents.
+     * Force the in-header agent switcher on (`true`) or off (`false`),
+     * overriding the default. When left undefined the switcher auto-reveals
+     * only when AI development is unlocked for the viewer — the live catalog
+     * serves BOTH an `ask` and a `build` agent and `aiStudio` isn't disabled —
+     * so pure end-user apps (only `ask`) stay clean while builders can flip
+     * Ask↔Build inline. `VITE_AI_SHOW_AGENT_PICKER=true` also forces it on.
      */
     showAgentPicker?: boolean;
     /** Whether the floating panel should open immediately on mount. */

package/dist/layout/ConsoleFloatingChatbot.js

@@ -13,7 +13,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  */
 import React from 'react';
 import { useReconcileOnError } from '../hooks/useReconcileOnError';
-import { FloatingChatbot, useObjectChat, useAgents, useHitlInChat, resolveDefaultAgentName, uiMessagesToChatMessages, publishHealthFromResponse, agentRouteName, } from '@object-ui/plugin-chatbot';
+import { FloatingChatbot, useObjectChat, useAgents, useAiModels, useHitlInChat, resolveDefaultAgentName, uiMessagesToChatMessages, publishHealthFromResponse, agentRouteName, } from '@object-ui/plugin-chatbot';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue, Button, ShareDialog, } from '@object-ui/components';
 import { Share2, SquarePen } from 'lucide-react';
 import { useObjectTranslation } from '@object-ui/i18n';
@@ -24,6 +24,7 @@ import { useAssistant, requestAssistantReview, emitCanvasInvalidate } from '../a
 import { fetchPendingDraftCount } from '../preview/draftStatus';
 import { getRuntimeConfig } from '../runtime-config';
 import { cloudPricingDeepLink } from '../console/marketplace/marketplaceApi';
+import { shouldShowAgentPicker } from './agentPicker';
 /**
  * Display names for the two built-in platform agents (ADR-0063: `ask` / `build`,
  * bound by surface). The backend ships English labels ("Assistant" / "Builder");
@@ -73,6 +74,9 @@ function buildChatLocale(language, appLabel, agentName, fallbackAgentLabel, obje
                 toolRunning: '运行中',
                 toolAwaitingApproval: '等待确认',
                 toolFailed: '失败',
+                connectionWaiting: '正在等待服务器响应…',
+                connectionStalledLabel: '仍在处理中…',
+                connectionOfflineLabel: '网络已断开，正在重连…',
                 toolDetailsHidden: '已隐藏工具参数和原始结果，仅保留过程摘要。',
                 copy: '复制',
                 copied: '已复制',
@@ -99,6 +103,7 @@ function buildChatLocale(language, appLabel, agentName, fallbackAgentLabel, obje
             planApproveHint: '回复以确认或调整该方案。',
             planApprove: '开始搭建',
             planAdjust: '调整方案',
+            planBuilt: '已搭建',
             planApproveMessage: '就按这个方案搭建吧。',
             planApproveDefaultsMessage: '就按你的合理假设直接搭建，未决问题用默认即可。',
             planAnswer: (question, option) => `关于「${question}」，我选择「${option}」。`,
@@ -128,6 +133,9 @@ function buildChatLocale(language, appLabel, agentName, fallbackAgentLabel, obje
             toolRunning: 'Running',
             toolAwaitingApproval: 'Awaiting approval',
             toolFailed: 'Failed',
+            connectionWaiting: 'Waiting for server…',
+            connectionStalledLabel: 'Still working…',
+            connectionOfflineLabel: 'Connection lost — reconnecting…',
             toolDetailsHidden: 'Tool inputs and raw results are hidden in this view.',
             copy: 'Copy',
             copied: 'Copied',
@@ -154,6 +162,7 @@ function buildChatLocale(language, appLabel, agentName, fallbackAgentLabel, obje
         planApproveHint: 'Reply to approve or adjust this plan.',
         planApprove: 'Build it',
         planAdjust: 'Adjust',
+        planBuilt: 'Built',
         planApproveMessage: 'Looks good — build it as proposed.',
         planApproveDefaultsMessage: 'Build it with your best assumptions; use sensible defaults for the open questions.',
         planAnswer: (question, option) => `For "${question}", go with: ${option}.`,
@@ -248,6 +257,14 @@ function ChatbotInner({ appLabel, appName, objects, agents, agentsLoading, activ
     // the agent context so "add a priority field" acts on the open object,
     // and drives context-aware starter suggestions.
     const { editor } = useAssistant();
+    // ADR-0028: the plan-filtered AI-model allowlist this env offers in the
+    // picker (free / single-model envs return one entry → the footer picker
+    // hides itself). The selected id is sent with each turn; the backend
+    // validates it against the same allowlist and weights the quota by the
+    // chosen model's cost_weight.
+    const { models: aiModels, defaultModelId } = useAiModels({ apiBase });
+    const [selectedModelId, setSelectedModelId] = React.useState(undefined);
+    const effectiveModelId = selectedModelId ?? defaultModelId;
     // Replay persisted history when present.
     const hydratedHistory = React.useMemo(() => {
         if (!persistedMessages || persistedMessages.length === 0)
@@ -268,6 +285,9 @@ function ChatbotInner({ appLabel, appName, objects, agents, agentsLoading, activ
     const { messages, isLoading, error, sendMessage, stop, reload, clear, setMessages, } = useObjectChat({
         api: chatApi,
         conversationId,
+        // ADR-0028: the user's picked model (or the env default) — sent in each
+        // request body; the agent route validates it + routes the turn to it.
+        model: effectiveModelId,
         onError: handleChatError,
         body: {
             context: {
@@ -321,10 +341,10 @@ function ChatbotInner({ appLabel, appName, objects, agents, agentsLoading, activ
             sendMessage(prompt);
         },
     });
-    // Agent switcher — deliberately hidden by default. End users get the
-    // single agent bound to their app (Studio → metadata_assistant, others
-    // → data_chat) and are never asked to choose. Only surfaces when the
-    // host explicitly opts in AND there is more than one agent to pick.
+    // Agent switcher — Ask ↔ Build (plus any custom agents). Restrained by
+    // design: end users bound to a single agent never see it. `showAgentPicker`
+    // is true when AI development is unlocked (catalog serves both ask & build)
+    // or forced on; it still needs more than one agent to be a real choice.
     const headerExtra = showAgentPicker && agents.length > 1 ? (_jsxs(Select, { value: activeAgent, onValueChange: onAgentChange, disabled: agentsLoading, children: [_jsx(SelectTrigger, { className: "h-7 w-[180px] text-xs", "data-testid": "floating-chatbot-agent-picker", children: _jsx(SelectValue, { placeholder: "Choose agent..." }) }), _jsx(SelectContent, { align: "end", children: agents.map((agent) => (_jsxs(SelectItem, { value: agent.name, className: "text-xs", children: [_jsx("span", { className: "font-medium", children: agent.label }), agent.description ? (_jsx("span", { className: "block text-muted-foreground text-[10px] truncate max-w-[220px]", children: agent.description })) : null] }, agent.name))) })] })) : null;
     // Share-link control. Sits to the left of the panel's built-in
     // fullscreen / close buttons so users can mint a public link without
@@ -339,7 +359,10 @@ function ChatbotInner({ appLabel, appName, objects, agents, agentsLoading, activ
                     panelHeight: 560,
                     title: locale.title,
                     triggerSize: 56,
-                }, headerExtra: headerExtra, headerActions: headerActions, messages: messages, labels: locale.labels, showAvatars: true, hideClearBar: true, assistantAvatarFallback: locale.agentLabel, suggestions: messages.length === 0 ? (editorSuggestions ?? locale.suggestions) : undefined, placeholder: activeAgent
+                }, headerExtra: headerExtra, headerActions: headerActions, messages: messages, labels: locale.labels, 
+                // ADR-0028: model picker — ChatbotEnhanced renders the footer <select>
+                // only when 2+ models are offered, so free / single-model envs see none.
+                models: aiModels, selectedModelId: effectiveModelId, onModelChange: setSelectedModelId, showAvatars: true, hideClearBar: true, assistantAvatarFallback: locale.agentLabel, suggestions: messages.length === 0 ? (editorSuggestions ?? locale.suggestions) : undefined, placeholder: activeAgent
                     ? locale.placeholder
                     : agentsLoading
                         ? locale.loadingPlaceholder
@@ -423,7 +446,7 @@ function ChatbotInner({ appLabel, appName, objects, agents, agentsLoading, activ
                         });
                         return false;
                     }
-                }, publishDraftsLabel: locale.publishDrafts, nextStepsLabel: locale.nextSteps, planTitleLabel: locale.planTitle, planQuestionsLabel: locale.planQuestions, planAssumptionsLabel: locale.planAssumptions, planApproveHintLabel: locale.planApproveHint, planApproveLabel: locale.planApprove, planAdjustLabel: locale.planAdjust, planApproveMessage: locale.planApproveMessage, planApproveDefaultsMessage: locale.planApproveDefaultsMessage, planAnswerMessage: locale.planAnswer, publishedLabel: locale.published, 
+                }, publishDraftsLabel: locale.publishDrafts, nextStepsLabel: locale.nextSteps, planTitleLabel: locale.planTitle, planQuestionsLabel: locale.planQuestions, planAssumptionsLabel: locale.planAssumptions, planApproveHintLabel: locale.planApproveHint, planApproveLabel: locale.planApprove, planAdjustLabel: locale.planAdjust, planBuiltLabel: locale.planBuilt, planApproveMessage: locale.planApproveMessage, planApproveDefaultsMessage: locale.planApproveDefaultsMessage, planAnswerMessage: locale.planAnswer, publishedLabel: locale.published, 
                 // Self-use "magic moment": when the plan enables it, auto-publish the
                 // drafted app the instant the agent finishes — the success path above
                 // then navigates straight to the live app, so "build" lands the user on
@@ -434,10 +457,18 @@ export default function ConsoleFloatingChatbot({ appLabel, appName, objects, api
     const apiBase = React.useMemo(() => resolveApiBase(apiBaseProp), [apiBaseProp]);
     const env = import.meta.env ?? {};
     const envDefaultAgent = env.VITE_AI_DEFAULT_AGENT;
-    // Power-user / admin escape hatch: force the picker on globally without
-    // touching app metadata.
-    const showAgentPicker = showAgentPickerProp ?? env.VITE_AI_SHOW_AGENT_PICKER === 'true';
     const { agents, isLoading: agentsLoading, error: agentsError } = useAgents({ apiBase });
+    // Reveal the Build/Ask switcher only when AI development is unlocked for this
+    // viewer — the live catalog serves BOTH an `ask` and a `build` agent and
+    // authoring isn't deployment-disabled. Pure end-user apps (only `ask`) stay
+    // clean; builders can flip "ask about my data" ↔ "extend my app" inline. An
+    // explicit prop or `VITE_AI_SHOW_AGENT_PICKER` still forces it. See agentPicker.
+    const showAgentPicker = shouldShowAgentPicker({
+        agents,
+        showAgentPickerProp,
+        envOptIn: env.VITE_AI_SHOW_AGENT_PICKER === 'true',
+        aiStudioEnabled: getRuntimeConfig().features.aiStudio !== false,
+    });
     const [activeAgent, setActiveAgent] = React.useState(undefined);
     React.useEffect(() => {
         if (!activeAgent && agents.length > 0) {

package/dist/layout/ConsoleLayout.js

@@ -10,7 +10,6 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
  */
 import { useEffect } from 'react';
 import { AppShell } from '@object-ui/layout';
-import { useDiscovery } from '@object-ui/react';
 import { isBuildAgent } from '@object-ui/plugin-chatbot';
 // Lightweight FAB stub — the heavy chat chunk graph (plugin-chatbot,
 // shiki, streamdown, mermaid, @ai-sdk, ~20MB) only downloads on first
@@ -22,6 +21,7 @@ import { UnifiedSidebar } from './UnifiedSidebar';
 import { AppHeader } from './AppHeader';
 import { MobileViewSwitcherProvider } from './MobileViewSwitcherContext';
 import { useResponsiveSidebar } from '../hooks/useResponsiveSidebar';
+import { useAiSurfaceEnabled } from '../hooks/useAiSurface';
 import { useNavigationContext } from '../context/NavigationContext';
 import { CommandPaletteProvider } from '../context/CommandPaletteProvider';
 import { resolveI18nLabel } from '../utils';
@@ -35,11 +35,10 @@ function ConsoleLayoutInner({ children }) {
 // (moved to ./ConsoleFloatingChatbot.tsx for code-splitting)
 export function ConsoleLayout({ children, activeAppName, activeApp, onAppChange, objects, connectionState, userId, }) {
     const appLabel = resolveI18nLabel(activeApp?.label) || activeAppName;
-    const { isAiEnabled } = useDiscovery();
-    // Trust an explicit `VITE_AI_BASE_URL` opt-in even when discovery reports
-    // AI as disabled (e.g. framework started without `--preset full`).
-    const aiBaseUrlConfigured = Boolean(import.meta.env?.VITE_AI_BASE_URL);
-    const showChatbot = isAiEnabled || aiBaseUrlConfigured;
+    // Runtime, server-pushed AI gating (shared with the `/ai` route guard and the
+    // top-bar AI link): show the chatbot only when the server actually serves AI,
+    // or when an explicit `VITE_AI_BASE_URL` opt-in points at an external server.
+    const { enabled: showChatbot } = useAiSurfaceEnabled();
     // AI Studio (AI-driven metadata authoring / "online development") can be
     // turned off per deployment. When off, suppress the metadata-authoring
     // assistant so the chatbot falls back to the generic data assistant — the