@object-ui/app-shell 7.0.0 → 7.2.0

package/dist/console/ConsoleShell.d.ts

@@ -44,6 +44,22 @@ export declare function ConnectedShell({ children }: {
 export declare function RequireOrganization({ children }: {
     children: ReactNode;
 }): import("react").JSX.Element;
+/**
+ * RequireAiSurface — gate for the `/ai*` routes. The console is edition-agnostic
+ * (MIT, runtime-gated): a Community Edition runtime serves no AI agent, so a
+ * stale `/ai` bookmark or external link must not land on a broken/empty chat.
+ * When the server serves no agent it redirects to `redirectTo` (home) instead.
+ *
+ * Availability is the live agent catalog (see {@link useAiSurfaceEnabled}) — the
+ * same signal every other AI entry point now gates on, so the route is reachable
+ * from exactly the entry points that are visible (no shown CTA that bounces back
+ * to home, no hidden FAB to a working route). Waits for the catalog to resolve
+ * before deciding so the redirect never flashes on first paint.
+ */
+export declare function RequireAiSurface({ children, redirectTo, }: {
+    children: ReactNode;
+    redirectTo?: string;
+}): import("react").JSX.Element;
 /**
  * AuthenticatedRoute — convenience wrapper composing AuthGuard + ConnectedShell
  * (+ optional RequireOrganization). Covers the common case for protected

package/dist/console/ConsoleShell.js

@@ -10,7 +10,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  * JSX in App.tsx. See examples/console-starter/src/App.tsx for a minimal example,
  * apps/console/src/App.tsx for one with custom system routes + CreateApp.
  */
-import { Suspense, useEffect, useRef } from 'react';
+import { Suspense, useEffect, useRef, useState } from 'react';
 import { Navigate, useLocation } from 'react-router-dom';
 import { AuthGuard, useAuth } from '@object-ui/auth';
 import { useObjectTranslation } from '@object-ui/i18n';
@@ -18,6 +18,7 @@ import { SchemaRendererProvider } from '@object-ui/react';
 import { createObjectStackUserStateAdapter } from '@object-ui/data-objectstack';
 import { AdapterProvider, useAdapter } from '../providers/AdapterProvider';
 import { MetadataProvider, useMetadata } from '../providers/MetadataProvider';
+import { useAiSurfaceEnabled } from '../hooks/useAiSurface';
 import { PreviewModeProvider } from '../preview/PreviewModeContext';
 import { NavigationProvider } from '../context/NavigationContext';
 import { FavoritesProvider } from '../context/FavoritesProvider';
@@ -131,13 +132,53 @@ function UserStateBridge() {
  * deployments (empty organizations list) render through.
  */
 export function RequireOrganization({ children }) {
-    const { activeOrganization, organizations, isOrganizationsLoading } = useAuth();
+    const { activeOrganization, organizations, isOrganizationsLoading, getAuthConfig } = useAuth();
+    // Multi-org (cloud) deployments route a brand-new, org-less user into the
+    // guided "Create your workspace" flow; single-tenant self-host renders through.
+    const [multiOrgEnabled, setMultiOrgEnabled] = useState(null);
+    useEffect(() => {
+        let cancelled = false;
+        getAuthConfig()
+            .then((cfg) => { if (!cancelled)
+            setMultiOrgEnabled(cfg?.features?.multiOrgEnabled !== false); })
+            .catch(() => { if (!cancelled)
+            setMultiOrgEnabled(false); });
+        return () => { cancelled = true; };
+    }, [getAuthConfig]);
     if (isOrganizationsLoading)
         return _jsx(LoadingFallback, {});
     const orgList = organizations ?? [];
     const orgFeatureEnabled = orgList.length > 0 || !!activeOrganization;
     if (orgFeatureEnabled && !activeOrganization)
         return _jsx(Navigate, { to: "/organizations", replace: true });
+    // No org at all: on multi-org, send them to /organizations (the create
+    // screen); wait for the flag so we don't flash /home then redirect.
+    if (orgList.length === 0 && !activeOrganization) {
+        if (multiOrgEnabled === null)
+            return _jsx(LoadingFallback, {});
+        if (multiOrgEnabled)
+            return _jsx(Navigate, { to: "/organizations", replace: true });
+    }
+    return _jsx(_Fragment, { children: children });
+}
+/**
+ * RequireAiSurface — gate for the `/ai*` routes. The console is edition-agnostic
+ * (MIT, runtime-gated): a Community Edition runtime serves no AI agent, so a
+ * stale `/ai` bookmark or external link must not land on a broken/empty chat.
+ * When the server serves no agent it redirects to `redirectTo` (home) instead.
+ *
+ * Availability is the live agent catalog (see {@link useAiSurfaceEnabled}) — the
+ * same signal every other AI entry point now gates on, so the route is reachable
+ * from exactly the entry points that are visible (no shown CTA that bounces back
+ * to home, no hidden FAB to a working route). Waits for the catalog to resolve
+ * before deciding so the redirect never flashes on first paint.
+ */
+export function RequireAiSurface({ children, redirectTo = '/home', }) {
+    const { enabled, isLoading } = useAiSurfaceEnabled();
+    if (isLoading)
+        return _jsx(LoadingFallback, {});
+    if (!enabled)
+        return _jsx(Navigate, { to: redirectTo, replace: true });
     return _jsx(_Fragment, { children: children });
 }
 /**

package/dist/console/ai/AiChatPage.js

@@ -1,4 +1,4 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 // Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
 /**
  * AiChatPage — full-page ChatGPT-style AI surface.
@@ -17,7 +17,7 @@ import { useNavigate, useParams, useSearchParams } from 'react-router-dom';
 import { useAuth } from '@object-ui/auth';
 import { useObjectTranslation } from '@object-ui/i18n';
 import { toast } from 'sonner';
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue, Button, ShareDialog, Sheet, SheetContent, SheetDescription, SheetHeader, SheetTitle, cn, } from '@object-ui/components';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue, Button, ShareDialog, Sheet, SheetContent, SheetDescription, SheetHeader, SheetTitle, Empty, EmptyTitle, EmptyDescription, cn, } from '@object-ui/components';
 import { PanelLeft, PanelLeftClose, PanelLeftOpen, Share2 } from 'lucide-react';
 import { ChatbotEnhanced, useAgents, useObjectChat, useHitlInChat, resolveDefaultAgentName, PLATFORM_DEFAULT_AGENT, agentRouteName, resolveAgentParam, isBuiltinAgentName, isBuildAgent, isAskAgent, publishHealthFromResponse, detectDraftResult, detectProposedPlan, buildProgressFromDraftReview, } from '@object-ui/plugin-chatbot';
 import { AppHeader } from '../../layout/AppHeader';
@@ -371,8 +371,15 @@ export function AiChatPage({ apiBase: apiBaseProp, defaultAgent: defaultAgentPro
     const apiBase = useMemo(() => resolveApiBase(apiBaseProp), [apiBaseProp]);
     const env = import.meta.env ?? {};
     const envDefaultAgent = env.VITE_AI_DEFAULT_AGENT;
-    const { agents, isLoading: agentsLoading, error: agentsError } = useAgents({ apiBase });
+    const { agents, isLoading: agentsLoading, error: agentsError, refetch: refetchAgents } = useAgents({ apiBase });
     const catalogNames = useMemo(() => agents.map((a) => a.name), [agents]);
+    // Catalog resolved with no agent to talk to. The `/ai` route guard already
+    // redirects when discovery reports AI unavailable (Community Edition), so this
+    // is the secondary safety net: a deployment that reports AI enabled but serves
+    // no agent (misconfig), a transient `/agents` failure, or a `VITE_AI_BASE_URL`
+    // server that returns an empty list. Either way, degrade to a graceful state
+    // instead of the agent-less echo chat (autoResponse) that ChatPane falls into.
+    const noAgents = !agentsLoading && agents.length === 0;
     // Is the first path segment an agent? It is when it resolves to one (friendly
     // alias / new id / legacy id). When it doesn't, it's a legacy bare
     // `/ai/:conversationId` link (redirected below). `undefined` = catalog still
@@ -598,11 +605,27 @@ export function AiChatPage({ apiBase: apiBaseProp, defaultAgent: defaultAgentPro
         void t1;
         void t2;
     }, [conversationId]);
-    return (_jsxs("div", { className: "flex h-svh w-full flex-col bg-background", "data-testid": "ai-chat-page", children: [_jsxs("header", { className: "sticky top-0 z-30 flex h-14 w-full shrink-0 items-center gap-2 border-b bg-background/95 px-2 backdrop-blur sm:px-4", children: [_jsx(Button, { variant: "ghost", size: "icon", className: "h-8 w-8 shrink-0 md:hidden", onClick: () => setMobileChatsOpen(true), "aria-label": t('console.ai.openChats'), "data-testid": "ai-chat-mobile-sidebar-trigger", children: _jsx(PanelLeft, { className: "h-4 w-4" }) }), _jsx(Button, { variant: "ghost", size: "icon", className: "hidden h-8 w-8 shrink-0 md:inline-flex", onClick: toggleChatsCollapsed, "aria-label": chatsCollapsed
-                            ? t('console.ai.showChats', { defaultValue: 'Show chats' })
-                            : t('console.ai.hideChats', { defaultValue: 'Hide chats' }), title: chatsCollapsed
-                            ? t('console.ai.showChats', { defaultValue: 'Show chats' })
-                            : t('console.ai.hideChats', { defaultValue: 'Hide chats' }), "data-testid": "ai-chat-collapse-sidebar-trigger", "aria-pressed": chatsCollapsed, children: chatsCollapsed ? _jsx(PanelLeftOpen, { className: "h-4 w-4" }) : _jsx(PanelLeftClose, { className: "h-4 w-4" }) }), _jsx("div", { className: "min-w-0 flex-1", children: _jsx(AppHeader, { variant: "home" }) })] }), _jsx(Sheet, { open: mobileChatsOpen, onOpenChange: setMobileChatsOpen, children: _jsxs(SheetContent, { side: "left", className: "w-[320px] p-0 sm:max-w-[360px]", "data-testid": "ai-chat-mobile-sidebar", children: [_jsxs(SheetHeader, { className: "sr-only", children: [_jsx(SheetTitle, { children: t('console.ai.chats') }), _jsx(SheetDescription, { children: t('console.ai.chatsDescription') })] }), _jsx(ConversationsSidebar, { userId: userId, apiBase: apiBase, activeAgent: activeAgent, refreshKey: refreshKey, titleHints: titleHints, className: "h-full border-r-0", onNavigate: () => setMobileChatsOpen(false) })] }) }), conversationId && (_jsx(ShareDialog, { open: shareOpen, onOpenChange: setShareOpen, objectName: "ai_conversations", recordId: conversationId, recordLabel: "this conversation", apiBase: restApiBase, publicBaseUrl: publicShareBase })), _jsxs("div", { className: "flex min-h-0 flex-1 w-full bg-muted/20", children: [!chatsCollapsed && (_jsx(ConversationsSidebar, { userId: userId, apiBase: apiBase, activeAgent: activeAgent, refreshKey: refreshKey, titleHints: titleHints, className: "hidden w-72 shrink-0 border-r md:flex" })), _jsx("main", { className: "flex min-w-0 flex-1 flex-col", children: _jsx(ChatPane, { agents: agents, agentsLoading: agentsLoading, agentsError: agentsError, activeAgent: activeAgent, chatApi: chatApi, apiBase: apiBase, conversationId: conversationId, initialMessages: initialMessages, onSent: handleSent, onShare: () => setShareOpen(true), onCanvasOpenChange: handleCanvasOpenChange }, `${chatApi ?? 'local'}:${conversationId ?? 'pending'}`) })] })] }));
+    return (_jsxs("div", { className: "flex h-svh w-full flex-col bg-background", "data-testid": "ai-chat-page", children: [_jsxs("header", { className: "sticky top-0 z-30 flex h-14 w-full shrink-0 items-center gap-2 border-b bg-background/95 px-2 backdrop-blur sm:px-4", children: [!noAgents && (_jsxs(_Fragment, { children: [_jsx(Button, { variant: "ghost", size: "icon", className: "h-8 w-8 shrink-0 md:hidden", onClick: () => setMobileChatsOpen(true), "aria-label": t('console.ai.openChats'), "data-testid": "ai-chat-mobile-sidebar-trigger", children: _jsx(PanelLeft, { className: "h-4 w-4" }) }), _jsx(Button, { variant: "ghost", size: "icon", className: "hidden h-8 w-8 shrink-0 md:inline-flex", onClick: toggleChatsCollapsed, "aria-label": chatsCollapsed
+                                    ? t('console.ai.showChats', { defaultValue: 'Show chats' })
+                                    : t('console.ai.hideChats', { defaultValue: 'Hide chats' }), title: chatsCollapsed
+                                    ? t('console.ai.showChats', { defaultValue: 'Show chats' })
+                                    : t('console.ai.hideChats', { defaultValue: 'Hide chats' }), "data-testid": "ai-chat-collapse-sidebar-trigger", "aria-pressed": chatsCollapsed, children: chatsCollapsed ? _jsx(PanelLeftOpen, { className: "h-4 w-4" }) : _jsx(PanelLeftClose, { className: "h-4 w-4" }) })] })), _jsx("div", { className: "min-w-0 flex-1", children: _jsx(AppHeader, { variant: "home" }) })] }), noAgents ? (_jsx(AiUnavailable, { hasError: Boolean(agentsError), onRetry: refetchAgents, onHome: () => navigate('/home'), t: t })) : (_jsxs(_Fragment, { children: [_jsx(Sheet, { open: mobileChatsOpen, onOpenChange: setMobileChatsOpen, children: _jsxs(SheetContent, { side: "left", className: "w-[320px] p-0 sm:max-w-[360px]", "data-testid": "ai-chat-mobile-sidebar", children: [_jsxs(SheetHeader, { className: "sr-only", children: [_jsx(SheetTitle, { children: t('console.ai.chats') }), _jsx(SheetDescription, { children: t('console.ai.chatsDescription') })] }), _jsx(ConversationsSidebar, { userId: userId, apiBase: apiBase, activeAgent: activeAgent, refreshKey: refreshKey, titleHints: titleHints, className: "h-full border-r-0", onNavigate: () => setMobileChatsOpen(false) })] }) }), conversationId && (_jsx(ShareDialog, { open: shareOpen, onOpenChange: setShareOpen, objectName: "ai_conversations", recordId: conversationId, recordLabel: "this conversation", apiBase: restApiBase, publicBaseUrl: publicShareBase })), _jsxs("div", { className: "flex min-h-0 flex-1 w-full bg-muted/20", children: [!chatsCollapsed && (_jsx(ConversationsSidebar, { userId: userId, apiBase: apiBase, activeAgent: activeAgent, refreshKey: refreshKey, titleHints: titleHints, className: "hidden w-72 shrink-0 border-r md:flex" })), _jsx("main", { className: "flex min-w-0 flex-1 flex-col", children: _jsx(ChatPane, { agents: agents, agentsLoading: agentsLoading, agentsError: agentsError, activeAgent: activeAgent, chatApi: chatApi, apiBase: apiBase, conversationId: conversationId, initialMessages: initialMessages, onSent: handleSent, onShare: () => setShareOpen(true), onCanvasOpenChange: handleCanvasOpenChange }, `${chatApi ?? 'local'}:${conversationId ?? 'pending'}`) })] })] }))] }));
+}
+/**
+ * Graceful state for `/ai` when the agent catalog resolved empty — shown
+ * instead of an agent-less echo chat. `hasError` distinguishes "AI not enabled
+ * on this deployment" (Community Edition) from "couldn't reach the AI service"
+ * (offline/misconfig), which also offers a retry. Either way there's a way out
+ * (back to home), so the route never dead-ends.
+ */
+function AiUnavailable({ hasError, onRetry, onHome, t, }) {
+    return (_jsx("div", { className: "flex flex-1 items-center justify-center p-6", "data-testid": "ai-unavailable", children: _jsxs(Empty, { children: [_jsx(EmptyTitle, { children: t('console.ai.unavailableTitle', { defaultValue: 'AI assistant unavailable' }) }), _jsx(EmptyDescription, { children: hasError
+                        ? t('console.ai.unavailableError', {
+                            defaultValue: "Couldn't reach the AI service. It may be temporarily offline — try again, or head back home.",
+                        })
+                        : t('console.ai.unavailableDescription', {
+                            defaultValue: "This deployment doesn't have an AI assistant enabled. Everything else works as usual.",
+                        }) }), _jsxs("div", { className: "mt-6 flex flex-col items-center gap-3 sm:flex-row", children: [hasError && (_jsx(Button, { variant: "outline", onClick: onRetry, "data-testid": "ai-unavailable-retry", children: t('console.ai.unavailableRetry', { defaultValue: 'Try again' }) })), _jsx(Button, { onClick: onHome, "data-testid": "ai-unavailable-home", children: t('console.ai.unavailableHome', { defaultValue: 'Back to home' }) })] })] }) }));
 }
 function ChatPane({ agents, agentsLoading, agentsError, activeAgent, chatApi, apiBase, conversationId, initialMessages, onSent, onShare, onCanvasOpenChange, }) {
     const { t } = useObjectTranslation();
@@ -631,10 +654,11 @@ function ChatPane({ agents, agentsLoading, agentsError, activeAgent, chatApi, ap
     }, [canvasOpen, onCanvasOpenChange]);
     // Draggable chat ↔ preview split (active only while the preview is open).
     const split = useResizableChatPane(canvasOpen);
-    const handleDraftArtifacts = useCallback((artifacts) => {
+    const handleDraftArtifacts = useCallback((artifacts, appSegment) => {
         const app = artifacts.find((a) => a.type === 'app');
+        // Route the preview on the app's package id (ADR-0048), not its name.
         if (app)
-            setCanvasApp((prev) => prev ?? { name: app.name, materialized: false });
+            setCanvasApp((prev) => prev ?? { name: app.name, segment: appSegment, materialized: false });
         if (canvasTimerRef.current)
             window.clearTimeout(canvasTimerRef.current);
         canvasTimerRef.current = window.setTimeout(() => setCanvasRefreshKey((k) => k + 1), 800);
@@ -644,7 +668,7 @@ function ChatPane({ agents, agentsLoading, agentsError, activeAgent, chatApi, ap
     // app URL — the reload that follows shows live rows in every list.
     const handleBuildMaterialized = useCallback((appName) => {
         setCanvasApp((prev) => prev && prev.name === appName && !prev.materialized
-            ? { name: appName, materialized: true }
+            ? { ...prev, materialized: true } // keep the package-id segment
             : prev ?? { name: appName, materialized: true });
     }, []);
     // A different conversation is a different build session — close the pane.
@@ -721,7 +745,11 @@ function ChatPane({ agents, agentsLoading, agentsError, activeAgent, chatApi, ap
     return (_jsxs("div", { ref: split.containerRef, className: "relative flex min-h-0 flex-1 px-0", children: [_jsx("div", { "data-chat-column": true, className: canvasApp
                     ? 'flex min-h-0 shrink-0 justify-center'
                     : 'flex min-h-0 flex-1 justify-center', style: canvasApp ? { width: split.width } : undefined, children: _jsx(ChatbotEnhanced, { className: "min-h-0 flex-1 bg-background md:max-w-5xl", onUpgrade: () => window.open(cloudPricingDeepLink(), '_blank', 'noopener,noreferrer'), surface: "plain", maxHeight: "100%", headerSlot: headerSlot, messages: messages, placeholder: activeAgent
-                        ? t('console.ai.askAgent', { agent: activeAgentLabel })
+                        ? agentRouteName(activeAgent) === 'ask'
+                            // The generic "Ask {agent}…" doubles to "Ask Ask…" for the data-query
+                            // agent whose label IS "Ask". Use its purpose-built placeholder instead.
+                            ? t('console.ai.askAnything')
+                            : t('console.ai.askAgent', { agent: activeAgentLabel })
                         : agentsLoading
                             ? t('console.ai.loadingAgents')
                             : t('console.ai.askAnything'), labels: {
@@ -734,6 +762,9 @@ function ChatPane({ agents, agentsLoading, agentsError, activeAgent, chatApi, ap
                         toolRunning: t('console.ai.toolRunning'),
                         toolAwaitingApproval: t('console.ai.toolAwaitingApproval'),
                         toolFailed: t('console.ai.toolFailed'),
+                        connectionWaiting: t('console.ai.connectionWaiting', { defaultValue: 'Waiting for server…' }),
+                        connectionStalledLabel: t('console.ai.connectionStalled', { defaultValue: 'Still working…' }),
+                        connectionOfflineLabel: t('console.ai.connectionOffline', { defaultValue: 'Connection lost — reconnecting…' }),
                         toolDetailsHidden: t('console.ai.toolDetailsHidden'),
                         copy: t('console.ai.copy'),
                         copied: t('console.ai.copied'),
@@ -746,7 +777,7 @@ function ChatPane({ agents, agentsLoading, agentsError, activeAgent, chatApi, ap
                         viewTrace: t('console.ai.viewTrace'),
                     }, suggestions: suggestions, onSendMessage: handleSend, onClear: clear, hideClearBar: true, onStop: isLoading ? stop : undefined, onReload: reload, isLoading: isLoading, error: errorSuppressed ? undefined : error, enableMarkdown: true, onToolApprove: hitl.decide, toolDecisions: hitl.decisions, toolApproveLabel: "Approve & run", toolDenyLabel: "Reject", toolDenyReason: "Operator rejected from chat", 
                     // Build-tree "Open app": jump straight into the app the agent just built.
-                    onOpenBuiltApp: (appName) => navigate(`/apps/${encodeURIComponent(appName)}`), openBuiltAppLabel: t('console.ai.openBuiltApp', { defaultValue: 'Open app' }), 
+                    onOpenBuiltApp: (appName, appSegment) => navigate(`/apps/${encodeURIComponent(appSegment ?? appName)}`), openBuiltAppLabel: t('console.ai.openBuiltApp', { defaultValue: 'Open app' }), 
                     // Live lifecycle truth for draft cards: the server's pending count per
                     // package, so reloaded conversations show Published/Publish honestly.
                     fetchPendingDraftCount: fetchPendingDraftCount, onPublishDrafts: async (packageId) => {
@@ -799,7 +830,7 @@ function ChatPane({ agents, agentsLoading, agentsError, activeAgent, chatApi, ap
                         }
                     }, publishDraftsLabel: t('console.ai.publishDrafts', { defaultValue: 'Publish' }), publishedLabel: t('console.ai.published', { defaultValue: 'Published' }), nextStepsLabel: t('console.ai.nextSteps', { defaultValue: "What's next" }), planTitleLabel: t('console.ai.planTitle', { defaultValue: 'Proposed plan' }), planQuestionsLabel: t('console.ai.planQuestions', { defaultValue: 'Confirm before building' }), planAssumptionsLabel: t('console.ai.planAssumptions', { defaultValue: 'Assumptions' }), planApproveHintLabel: t('console.ai.planApproveHint', {
                         defaultValue: 'Reply to approve or adjust this plan.',
-                    }), planApproveLabel: t('console.ai.planApprove', { defaultValue: 'Build it' }), planAdjustLabel: t('console.ai.planAdjust', { defaultValue: 'Adjust' }), planApproveMessage: t('console.ai.planApproveMessage', {
+                    }), planApproveLabel: t('console.ai.planApprove', { defaultValue: 'Build it' }), planAdjustLabel: t('console.ai.planAdjust', { defaultValue: 'Adjust' }), planBuiltLabel: t('console.ai.planBuilt', { defaultValue: 'Built' }), planApproveMessage: t('console.ai.planApproveMessage', {
                         defaultValue: 'Looks good — build it as proposed.',
                     }), planApproveDefaultsMessage: t('console.ai.planApproveDefaultsMessage', {
                         defaultValue: 'Build it with your best assumptions; use sensible defaults for the open questions.',
@@ -814,10 +845,10 @@ function ChatPane({ agents, agentsLoading, agentsError, activeAgent, chatApi, ap
                     autoPublishDrafts: getRuntimeConfig().features.autoPublishAiBuilds, 
                     // ADR-0037 Live Canvas: open/refresh the draft-preview pane as the
                     // agent's artifacts land; Preview buttons deep-link the same route.
-                    onDraftArtifacts: handleDraftArtifacts, onPreviewDraftApp: (appName, opts) => setCanvasApp({ name: appName, materialized: opts?.materialized === true }), 
+                    onDraftArtifacts: handleDraftArtifacts, onPreviewDraftApp: (appName, opts) => setCanvasApp({ name: appName, segment: opts?.appSegment, materialized: opts?.materialized === true }), 
                     // ADR-0045: build materialized → canvas leaves the draft overlay for
                     // the real (unlisted) app; the reload shows live seed rows.
-                    onBuildMaterialized: handleBuildMaterialized, previewDraftLabel: t('console.ai.previewDraft', { defaultValue: 'Preview' }), "data-testid": "ai-chat-panel" }) }), canvasApp ? (_jsxs(_Fragment, { children: [_jsxs("div", { role: "separator", "aria-orientation": "vertical", "aria-label": t('console.ai.resizeSplit', { defaultValue: 'Resize chat and preview' }), tabIndex: 0, onPointerDown: split.onHandlePointerDown, onKeyDown: split.onHandleKeyDown, onDoubleClick: split.reset, "data-testid": "ai-chat-split-handle", className: cn('group relative hidden w-1.5 shrink-0 cursor-col-resize touch-none select-none md:block', 'focus:outline-none'), children: [_jsx("span", { "aria-hidden": true, className: "absolute inset-y-0 -left-1.5 -right-1.5" }), _jsx("span", { "aria-hidden": true, className: cn('absolute inset-y-0 left-1/2 w-px -translate-x-1/2 bg-border transition-colors', 'group-hover:bg-primary/60 group-focus-visible:bg-primary', split.dragging && 'bg-primary') })] }), _jsx(LiveCanvas, { appName: canvasApp.name, materialized: canvasApp.materialized, refreshKey: canvasRefreshKey, onClose: () => setCanvasApp(null) }), split.dragging ? _jsx("div", { className: "fixed inset-0 z-50 cursor-col-resize", "data-testid": "ai-chat-split-overlay" }) : null] })) : null] }));
+                    onBuildMaterialized: handleBuildMaterialized, previewDraftLabel: t('console.ai.previewDraft', { defaultValue: 'Preview' }), "data-testid": "ai-chat-panel" }) }), canvasApp ? (_jsxs(_Fragment, { children: [_jsxs("div", { role: "separator", "aria-orientation": "vertical", "aria-label": t('console.ai.resizeSplit', { defaultValue: 'Resize chat and preview' }), tabIndex: 0, onPointerDown: split.onHandlePointerDown, onKeyDown: split.onHandleKeyDown, onDoubleClick: split.reset, "data-testid": "ai-chat-split-handle", className: cn('group relative hidden w-1.5 shrink-0 cursor-col-resize touch-none select-none md:block', 'focus:outline-none'), children: [_jsx("span", { "aria-hidden": true, className: "absolute inset-y-0 -left-1.5 -right-1.5" }), _jsx("span", { "aria-hidden": true, className: cn('absolute inset-y-0 left-1/2 w-px -translate-x-1/2 bg-border transition-colors', 'group-hover:bg-primary/60 group-focus-visible:bg-primary', split.dragging && 'bg-primary') })] }), _jsx(LiveCanvas, { appName: canvasApp.name, appSegment: canvasApp.segment, materialized: canvasApp.materialized, refreshKey: canvasRefreshKey, onClose: () => setCanvasApp(null) }), split.dragging ? _jsx("div", { className: "fixed inset-0 z-50 cursor-col-resize", "data-testid": "ai-chat-split-overlay" }) : null] })) : null] }));
 }
 function dataChatSuggestions(t) {
     return [

package/dist/console/ai/LiveCanvas.d.ts

@@ -6,8 +6,14 @@
  * LICENSE file in the root directory of this source tree.
  */
 export interface LiveCanvasProps {
-    /** The drafted app to render (its `app` metadata name). */
+    /** The drafted app to render (its `app` metadata name) — used for display. */
     appName: string;
+    /**
+     * ADR-0048: the app's ROUTE SEGMENT — its package id (`app.<slug>`), which is
+     * globally unique, unlike the display name (two AI apps can both be `library`).
+     * The iframe URL keys on this; falls back to `appName` when absent.
+     */
+    appSegment?: string;
     /**
      * ADR-0045: the build was materialized — the app is live (real tables and
      * seed rows) but unlisted. The canvas then renders the REAL app URL: full
@@ -19,4 +25,4 @@ export interface LiveCanvasProps {
     refreshKey: number;
     onClose: () => void;
 }
-export declare function LiveCanvas({ appName, materialized, refreshKey, onClose }: LiveCanvasProps): import("react").JSX.Element;
+export declare function LiveCanvas({ appName, appSegment, materialized, refreshKey, onClose }: LiveCanvasProps): import("react").JSX.Element;

package/dist/console/ai/LiveCanvas.js

@@ -37,15 +37,17 @@ function canvasSrc(appName, materialized) {
     const base = `${spaBase()}/apps/${encodeURIComponent(appName)}`;
     return materialized ? base : `${base}?preview=draft`;
 }
-export function LiveCanvas({ appName, materialized = false, refreshKey, onClose }) {
+export function LiveCanvas({ appName, appSegment, materialized = false, refreshKey, onClose }) {
     const { t } = useObjectTranslation();
     const iframeRef = useRef(null);
+    // Route on the package-id segment (unique), display by name (friendly).
+    const routeSeg = appSegment && appSegment.length ? appSegment : appName;
     // Materialized world swap: changing src on the SAME iframe element
     // navigates it in place (no white-flash remount).
     useEffect(() => {
         if (!iframeRef.current)
             return;
-        const next = canvasSrc(appName, materialized);
+        const next = canvasSrc(routeSeg, materialized);
         try {
             if (iframeRef.current.getAttribute('src') !== next)
                 iframeRef.current.setAttribute('src', next);
@@ -53,7 +55,7 @@ export function LiveCanvas({ appName, materialized = false, refreshKey, onClose
         catch {
             /* not ready — the mount src covers it */
         }
-    }, [appName, materialized]);
+    }, [routeSeg, materialized]);
     // Refresh in place (src reload) instead of remounting the iframe — keeps
     // the pane from flashing white on every invalidation.
     useEffect(() => {
@@ -74,5 +76,5 @@ export function LiveCanvas({ appName, materialized = false, refreshKey, onClose
                             : t('console.ai.liveCanvas', {
                                 app: appName,
                                 defaultValue: 'Live preview — {{app}} (draft)',
-                            }) }), _jsx(Button, { size: "sm", variant: "ghost", onClick: onClose, "data-testid": "live-canvas-close", children: _jsx(X, { className: "h-3.5 w-3.5" }) })] }), _jsx("iframe", { ref: iframeRef, title: `Draft preview: ${appName}`, src: canvasSrc(appName, materialized), className: "h-full w-full flex-1 border-0 bg-background", "data-testid": "live-canvas-frame" })] }));
+                            }) }), _jsx(Button, { size: "sm", variant: "ghost", onClick: onClose, "data-testid": "live-canvas-close", children: _jsx(X, { className: "h-3.5 w-3.5" }) })] }), _jsx("iframe", { ref: iframeRef, title: `Draft preview: ${appName}`, src: canvasSrc(routeSeg, materialized), className: "h-full w-full flex-1 border-0 bg-background", "data-testid": "live-canvas-frame" })] }));
 }

package/dist/console/home/HomeLayout.js

@@ -11,20 +11,18 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect } from 'react';
 import { useNavigationContext } from '../../context/NavigationContext';
 import { AppHeader } from '../../layout/AppHeader';
-import { useDiscovery } from '@object-ui/react';
+import { useAiSurfaceEnabled } from '../../hooks/useAiSurface';
 import { useObjectTranslation } from '@object-ui/i18n';
 // Lightweight FAB stub — the heavy chat chunk graph only downloads on
 // first hover/click. See ../../layout/ConsoleChatbotFab.tsx.
 import { ConsoleChatbotFab } from '../../layout/ConsoleChatbotFab';
 export function HomeLayout({ children, userId }) {
     const { setContext } = useNavigationContext();
-    const { isAiEnabled } = useDiscovery();
     const { t } = useObjectTranslation();
-    // Render the chatbot whenever AI is reachable. If the developer has explicitly
-    // configured `VITE_AI_BASE_URL`, trust that 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;
+    // Render the chatbot only when the server serves AI (or an explicit
+    // `VITE_AI_BASE_URL` opt-in is set) — same runtime signal as the rest of the
+    // console's AI surface. See useAiSurfaceEnabled.
+    const { enabled: showChatbot } = useAiSurfaceEnabled();
     useEffect(() => {
         setContext('home');
     }, [setContext]);

package/dist/console/home/HomePage.js

@@ -31,15 +31,7 @@ import { Empty, EmptyTitle, EmptyDescription, Button } from '@object-ui/componen
 import { Sparkles, ShieldAlert, X, UploadCloud, MessageSquareText } from 'lucide-react';
 import { useMetadataClient } from '../../views/metadata-admin/useMetadata';
 import { usePublishAllDrafts } from '../../preview/usePublishAllDrafts';
-/** Resolve the AI service base, mirroring AiChatPage/ConsoleFloatingChatbot. */
-function resolveAiApiBase() {
-    const env = import.meta.env ?? {};
-    const fromEnv = env.VITE_AI_BASE_URL;
-    if (fromEnv)
-        return fromEnv.replace(/\/$/, '');
-    const serverUrl = env.VITE_SERVER_URL ?? '';
-    return `${serverUrl.replace(/\/$/, '')}/api/v1/ai`;
-}
+import { resolveAiApiBase } from '../../hooks/useAiSurface';
 /**
  * Which AI home CTAs to surface, driven by the live agent catalog (the single
  * source of truth) — gated PER agent, because the community edition can be in

package/dist/console/organizations/CreateWorkspaceDialog.js

@@ -12,6 +12,7 @@ import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, D
 import { useAuth } from '@object-ui/auth';
 import { useObjectTranslation } from '@object-ui/i18n';
 import { Loader2 } from 'lucide-react';
+import { provisionProductionEnvironment } from './provisionEnvironment';
 /** Convert a display name to a URL-friendly slug */
 function nameToSlug(name) {
     return name
@@ -81,6 +82,19 @@ export function CreateWorkspaceDialog({ open, onOpenChange, onCreated, }) {
         setError(null);
         try {
             const org = await createOrganization({ name: name.trim(), slug: slug.trim() });
+            // Born-with-env: eagerly ensure the new org's production environment so
+            // the user lands in a ready workspace with no onboarding-wizard detour.
+            // `createOrganization` already switched the active org; we also pass
+            // `organizationId` explicitly so the target is unambiguous. Idempotent +
+            // best-effort: a control plane that auto-provisions the env on create
+            // resolves this to `alreadyProvisioned`; a genuine failure falls through
+            // to the onboarding gate (lazy provision on first navigation).
+            try {
+                await provisionProductionEnvironment({ organizationId: org.id });
+            }
+            catch (provisionErr) {
+                console.warn('[CreateWorkspace] eager env provision failed; onboarding gate will provision lazily', provisionErr);
+            }
             onCreated?.(org);
         }
         catch (err) {
@@ -89,7 +103,7 @@ export function CreateWorkspaceDialog({ open, onOpenChange, onCreated, }) {
         finally {
             setIsSubmitting(false);
         }
-    }, [name, slug, createOrganization, onCreated]);
+    }, [name, slug, multiOrgDisabled, t, createOrganization, onCreated]);
     return (_jsx(Dialog, { open: open, onOpenChange: onOpenChange, children: _jsx(DialogContent, { className: "sm:max-w-[425px]", "data-testid": "create-workspace-dialog", children: _jsxs("form", { onSubmit: handleSubmit, children: [_jsxs(DialogHeader, { children: [_jsx(DialogTitle, { children: t('workspace.createTitle', { defaultValue: 'Create a workspace' }) }), _jsx(DialogDescription, { children: t('workspace.createDescription', {
                                     defaultValue: 'A workspace is a shared space for your team to collaborate.',
                                 }) })] }), _jsxs("div", { className: "grid gap-4 py-4", children: [_jsxs("div", { className: "grid gap-2", children: [_jsx(Label, { htmlFor: "workspace-name", children: t('workspace.nameLabel', { defaultValue: 'Workspace name' }) }), _jsx(Input, { id: "workspace-name", placeholder: t('workspace.namePlaceholder', { defaultValue: 'e.g., Acme Inc' }), value: name, onChange: (e) => setName(e.target.value), autoFocus: true, "data-testid": "workspace-name-input" })] }), _jsxs("div", { className: "grid gap-2", children: [_jsx(Label, { htmlFor: "workspace-slug", children: t('workspace.slugLabel', { defaultValue: 'URL slug' }) }), _jsx(Input, { id: "workspace-slug", placeholder: "acme-inc", value: slug, onChange: (e) => {

package/dist/console/organizations/OrganizationsPage.js

@@ -12,7 +12,7 @@ import { Avatar, AvatarImage, AvatarFallback, Button, Input, Empty, EmptyTitle,
 import { Plus, Search, Loader2 } from 'lucide-react';
 import { useAuth } from '@object-ui/auth';
 import { useObjectTranslation } from '@object-ui/i18n';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate, useSearchParams } from 'react-router-dom';
 import { CreateWorkspaceDialog } from './CreateWorkspaceDialog';
 import { resolveHomeUrl } from './resolveHomeUrl';
 function getOrgInitials(name) {
@@ -26,6 +26,14 @@ function getOrgInitials(name) {
 export function OrganizationsPage() {
     const { t } = useObjectTranslation();
     const navigate = useNavigate();
+    // Two deliberate ways to reach this page (vs the auto-skipping post-login
+    // redirect): `?manage=1` (avatar menu "My Organizations") shows the picker;
+    // `?create=1` (avatar menu "Create workspace") additionally opens the create
+    // dialog directly. Both suppress the single-org auto-skip below so a
+    // single-org user can actually reach "New organization" / the dialog.
+    const [searchParams] = useSearchParams();
+    const manageMode = searchParams.get('manage') === '1';
+    const wantsCreate = searchParams.get('create') === '1';
     const { organizations, activeOrganization, isOrganizationsLoading, switchOrganization, getAuthConfig, } = useAuth();
     const [query, setQuery] = useState('');
     const [isCreateOpen, setIsCreateOpen] = useState(false);
@@ -91,16 +99,27 @@ export function OrganizationsPage() {
             return;
         if (isOrganizationsLoading)
             return;
+        if (manageMode || wantsCreate)
+            return; // came to manage/create — don't bounce
         if (orgList.length !== 1)
             return;
         autoSelectedRef.current = true;
         void handleSelect(orgList[0]);
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [isOrganizationsLoading, orgList.length]);
+    }, [isOrganizationsLoading, orgList.length, manageMode, wantsCreate]);
+    // Open the create dialog when arriving via the header "Create workspace"
+    // entry (`?create=1`). Guarded so closing the dialog doesn't re-open it.
+    const createOpenedRef = useRef(false);
+    useEffect(() => {
+        if (wantsCreate && !createOpenedRef.current) {
+            createOpenedRef.current = true;
+            setIsCreateOpen(true);
+        }
+    }, [wantsCreate]);
     // Show a spinner while we're either still loading, or about to auto-redirect
     // because there's only one org. This prevents the picker from briefly
     // flashing on screen for single-org users.
-    const willAutoSelect = !isOrganizationsLoading && orgList.length === 1;
+    const willAutoSelect = !manageMode && !wantsCreate && !isOrganizationsLoading && orgList.length === 1;
     if (isOrganizationsLoading || willAutoSelect) {
         return (_jsx("div", { className: "flex flex-1 items-center justify-center py-20", children: _jsx(Loader2, { className: "h-5 w-5 animate-spin text-muted-foreground" }) }));
     }

package/dist/console/organizations/provisionEnvironment.d.ts

@@ -0,0 +1,53 @@
+/**
+ * provisionEnvironment
+ *
+ * Eagerly ensure a freshly created organization has its **production**
+ * environment so a self-service "create another workspace" lands the user in a
+ * ready console — no onboarding-wizard detour.
+ *
+ * ObjectStack runs a 1-production-environment-per-organization model: an org's
+ * FIRST environment is born as its production env (allowed on every plan,
+ * including free). The cloud control plane exposes this as
+ * `POST /api/v1/cloud/environments`, which only needs a `displayName`; the org
+ * is resolved from `organizationId` (preferred) → the better-auth active org →
+ * the actor's first membership.
+ *
+ * Idempotent + best-effort by contract:
+ *   - Some control planes auto-provision the production env on org create (the
+ *     `auto-default-environment` plugin). This call then races that plugin and
+ *     the loser gets a 403 `PRODUCTION_ENV_LIMIT` / 409 — which is SUCCESS for
+ *     us (the org is already born-with-env), not a failure.
+ *   - On a genuine failure (5xx / network) the caller swallows the error and
+ *     the onboarding gate provisions the env lazily on first navigation.
+ *
+ * @module
+ */
+/** Result of ensuring the org's production environment exists. */
+export interface ProvisionedEnvironment {
+    /** Environment id (control-plane `sys_environment` row), when this call minted it. */
+    id?: string;
+    /** Opaque system hostname, e.g. `os-<shortId>.<rootDomain>` for production. */
+    hostname?: string;
+    /**
+     * True when the org already had its production env (the control plane
+     * provisioned it on create). The born-with-env contract is still satisfied.
+     */
+    alreadyProvisioned?: boolean;
+}
+/**
+ * Ensure the production environment exists for a just-created organization.
+ *
+ * Uses {@link createAuthenticatedFetch} so the request carries the Bearer token
+ * and the active-org `X-Tenant-ID` header; `organizationId` is also sent in the
+ * body so the target org is unambiguous even before the session active-org
+ * switch has propagated. The env is named `Production` to match the
+ * born-with-env convention used by the signup org.
+ *
+ * @throws on a genuine control-plane failure (5xx / network). A 403/409
+ *   "already has its production env" is NOT an error — it resolves to
+ *   `{ alreadyProvisioned: true }`.
+ */
+export declare function provisionProductionEnvironment(opts: {
+    organizationId: string;
+    displayName?: string;
+}): Promise<ProvisionedEnvironment>;

package/dist/console/organizations/provisionEnvironment.js

@@ -0,0 +1,64 @@
+/**
+ * provisionEnvironment
+ *
+ * Eagerly ensure a freshly created organization has its **production**
+ * environment so a self-service "create another workspace" lands the user in a
+ * ready console — no onboarding-wizard detour.
+ *
+ * ObjectStack runs a 1-production-environment-per-organization model: an org's
+ * FIRST environment is born as its production env (allowed on every plan,
+ * including free). The cloud control plane exposes this as
+ * `POST /api/v1/cloud/environments`, which only needs a `displayName`; the org
+ * is resolved from `organizationId` (preferred) → the better-auth active org →
+ * the actor's first membership.
+ *
+ * Idempotent + best-effort by contract:
+ *   - Some control planes auto-provision the production env on org create (the
+ *     `auto-default-environment` plugin). This call then races that plugin and
+ *     the loser gets a 403 `PRODUCTION_ENV_LIMIT` / 409 — which is SUCCESS for
+ *     us (the org is already born-with-env), not a failure.
+ *   - On a genuine failure (5xx / network) the caller swallows the error and
+ *     the onboarding gate provisions the env lazily on first navigation.
+ *
+ * @module
+ */
+import { createAuthenticatedFetch } from '@object-ui/auth';
+import { getCloudBase } from '../../runtime-config';
+/**
+ * Ensure the production environment exists for a just-created organization.
+ *
+ * Uses {@link createAuthenticatedFetch} so the request carries the Bearer token
+ * and the active-org `X-Tenant-ID` header; `organizationId` is also sent in the
+ * body so the target org is unambiguous even before the session active-org
+ * switch has propagated. The env is named `Production` to match the
+ * born-with-env convention used by the signup org.
+ *
+ * @throws on a genuine control-plane failure (5xx / network). A 403/409
+ *   "already has its production env" is NOT an error — it resolves to
+ *   `{ alreadyProvisioned: true }`.
+ */
+export async function provisionProductionEnvironment(opts) {
+    const authFetch = createAuthenticatedFetch();
+    const res = await authFetch(`${getCloudBase()}/api/v1/cloud/environments`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+            displayName: opts.displayName ?? 'Production',
+            organizationId: opts.organizationId,
+        }),
+    });
+    if (!res.ok) {
+        // 403 PRODUCTION_ENV_LIMIT / 409 ⇒ the org already owns its (one) production
+        // env — born-with-env is satisfied, so this is success, not a failure.
+        if (res.status === 403 || res.status === 409) {
+            return { alreadyProvisioned: true };
+        }
+        throw new Error(`Failed to provision production environment (status ${res.status})`);
+    }
+    // The control plane wraps payloads as `{ success, data }`; tolerate both.
+    const body = (await res.json().catch(() => ({})));
+    if (body && typeof body === 'object' && 'data' in body && body.data) {
+        return body.data;
+    }
+    return body ?? {};
+}

package/dist/environment/EnvironmentEntitlementDialog.d.ts

@@ -0,0 +1,34 @@
+/**
+ * EnvironmentEntitlementDialog — a friendly upgrade / limit dialog shown instead
+ * of a raw red error toast when an environment-create is gated by plan or
+ * capacity (DEV_ENV_PLAN_LOCKED / DEV_ENV_LIMIT / PRODUCTION_ENV_LIMIT).
+ *
+ * Driven by a single {@link EntitlementDialogSpec}, opened from two places:
+ *   • proactively, from the env-list toolbar (a free-plan org clicking
+ *     "Add environment" — see EnvironmentListToolbar), and
+ *   • reactively, from the action runtime's apiHandler when the create POST
+ *     comes back with an entitlement 403 (the safety net).
+ *
+ * The CTA renders as an anchor (not an SPA navigation) so a control-plane URL
+ * like `/settings/billing` always lands on the real page regardless of the
+ * console's own router. Relative URLs resolve against the control-plane origin
+ * (`apiBase`); absolute / mailto URLs are used as-is.
+ */
+import type { EntitlementDialogSpec } from './entitlements';
+export interface EntitlementDialogState {
+    open: boolean;
+    spec?: EntitlementDialogSpec;
+}
+/** Resolve a CTA URL to a concrete href + whether it should open in a new tab. */
+export declare function resolveCtaHref(url: string, apiBase: string): {
+    href: string;
+    external: boolean;
+};
+interface Props {
+    state: EntitlementDialogState;
+    /** Control-plane origin used to resolve relative CTA URLs. */
+    apiBase: string;
+    onOpenChange: (open: boolean) => void;
+}
+export declare function EnvironmentEntitlementDialog({ state, apiBase, onOpenChange }: Props): import("react").JSX.Element;
+export {};