@object-ui/app-shell 11.0.0 → 11.2.0

package/dist/console/home/CloudOnboardingNext.js

@@ -0,0 +1,117 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+/**
+ * CloudOnboardingNext — the state-aware "next step" block for the Cloud
+ * control-plane Welcome page, registered as the SDUI widget
+ * `cloud:onboarding-next`.
+ *
+ * The Welcome page is otherwise static SDUI, but the single most useful thing
+ * it can show — "what do I do next?" — depends on live state the metadata can't
+ * carry: does the caller's org already have its production environment? New
+ * signups are auto-provisioned one, so a static "Step 1: create an environment"
+ * is wrong for most first-time users. This widget resolves that one signal from
+ * the same `/cloud/environment-entitlements` endpoint the environment list uses
+ * and renders the right primary action:
+ *
+ *   • has production env  → "Open Production" (the doorway into the env, where
+ *                            building happens) + a "Manage environments" link.
+ *   • no production env   → "Create your environment" (the real first step).
+ *   • loading             → a neutral skeleton (no CTA flashes / layout jump).
+ *   • unknown / error     → degrade to BOTH actions, so the button always works.
+ *
+ * Routes and the "Open Production" endpoint come from the page metadata
+ * (`properties`) so the Cloud app owns its URLs; this component owns only the
+ * state logic. It mirrors `useEnvironmentEntitlements`' authoritative summary
+ * fetch (org-scoped GET) without its list-only gating.
+ */
+import { useEffect, useMemo, useState } from 'react';
+import { useNavigate } from 'react-router-dom';
+import { Button, Skeleton } from '@object-ui/components';
+import { Rocket, Plus, Settings2 } from 'lucide-react';
+import { useAuth } from '@object-ui/auth';
+import { createAuthenticatedFetch } from '@object-ui/auth';
+import { ComponentRegistry } from '@object-ui/core';
+const DEFAULT_OPEN_PRODUCTION_URL = '/api/v1/cloud/environments/production/sso-open';
+const DEFAULT_ENVIRONMENTS_ROUTE = '/apps/cloud_control/sys_environment';
+/** Resolve the active locale's string (cheap; the page uses {en,zh} pairs). */
+function pick(label) {
+    const lang = (typeof document !== 'undefined' && document.documentElement.getAttribute('lang')) || 'en';
+    return lang.toLowerCase().startsWith('zh') ? label.zh : label.en;
+}
+/**
+ * Resolve `hasProductionEnv` from the org-scoped entitlements summary. Returns
+ * `unknown` on any failure so the caller degrades gracefully rather than
+ * blocking the user behind a wrong "create" CTA.
+ */
+function useProductionEnvState() {
+    const { activeOrganization } = useAuth();
+    const orgId = activeOrganization?.id;
+    const authFetch = useMemo(() => createAuthenticatedFetch(), []);
+    const [state, setState] = useState({ phase: 'loading' });
+    useEffect(() => {
+        let cancelled = false;
+        const apiBase = (import.meta.env?.VITE_SERVER_URL || '').replace(/\/+$/, '');
+        const qs = orgId ? `?organizationId=${encodeURIComponent(orgId)}` : '';
+        (async () => {
+            try {
+                const res = await authFetch(`${apiBase}/api/v1/cloud/environment-entitlements${qs}`, {
+                    method: 'GET',
+                    credentials: 'include',
+                });
+                if (!res.ok)
+                    throw new Error(`entitlements ${res.status}`);
+                const json = await res.json().catch(() => null);
+                const data = (json?.data ?? json);
+                if (cancelled)
+                    return;
+                if (!data || typeof data !== 'object') {
+                    setState({ phase: 'unknown' });
+                    return;
+                }
+                setState({ phase: 'ready', hasProductionEnv: data.hasProductionEnv === true });
+            }
+            catch {
+                if (!cancelled)
+                    setState({ phase: 'unknown' });
+            }
+        })();
+        return () => {
+            cancelled = true;
+        };
+    }, [authFetch, orgId]);
+    return state;
+}
+/** Full-page nav to the backend SSO endpoint so the browser follows its 302. */
+function openProduction(url) {
+    window.location.href = url;
+}
+export function CloudOnboardingNext({ properties }) {
+    const navigate = useNavigate();
+    const state = useProductionEnvState();
+    const openUrl = properties?.openProductionUrl || DEFAULT_OPEN_PRODUCTION_URL;
+    const envsRoute = properties?.environmentsRoute || DEFAULT_ENVIRONMENTS_ROUTE;
+    // Loading — a neutral skeleton sized like the button row, so the hero doesn't
+    // jump when the real CTA lands.
+    if (state.phase === 'loading') {
+        return (_jsxs("div", { className: "flex flex-wrap items-center justify-center gap-3", "data-onboarding": "loading", children: [_jsx(Skeleton, { className: "h-11 w-44 rounded-md" }), _jsx(Skeleton, { className: "h-11 w-44 rounded-md" })] }));
+    }
+    const hint = state.phase === 'ready' && !state.hasProductionEnv
+        ? {
+            en: 'Spin up your first environment — a private workspace with its own URL, database, and plan. Building happens inside it.',
+            zh: '创建你的第一个环境——一个独立的工作区,有自己的网址、数据库和套餐。应用的搭建在里面进行。',
+        }
+        : {
+            en: 'Your production environment is ready. Open it to build and run your apps — that all happens inside the environment.',
+            zh: '你的生产环境已就绪。打开它来搭建和运行应用——这些都在环境内部进行。',
+        };
+    // No production env yet → the real first step is "create", not "open".
+    const showCreatePrimary = state.phase === 'ready' && !state.hasProductionEnv;
+    return (_jsxs("div", { className: "flex flex-col items-center gap-3", "data-onboarding": state.phase, children: [_jsxs("div", { className: "flex flex-wrap items-center justify-center gap-3", children: [showCreatePrimary ? (_jsxs(Button, { size: "lg", onClick: () => navigate(envsRoute), children: [_jsx(Plus, { className: "mr-2 h-4 w-4" }), pick({ en: 'Create your environment', zh: '创建你的环境' })] })) : (_jsxs(Button, { size: "lg", onClick: () => openProduction(openUrl), children: [_jsx(Rocket, { className: "mr-2 h-4 w-4" }), pick({ en: 'Open Production', zh: '打开生产环境' })] })), _jsxs(Button, { size: "lg", variant: "secondary", onClick: () => navigate(envsRoute), children: [_jsx(Settings2, { className: "mr-2 h-4 w-4" }), pick({ en: 'Manage environments', zh: '管理环境' })] })] }), _jsx("p", { className: "max-w-xl text-center text-sm text-muted-foreground", children: pick(hint) })] }));
+}
+// SDUI registration — the Cloud Welcome page references this widget by type.
+ComponentRegistry.register('cloud:onboarding-next', (props) => (_jsx(CloudOnboardingNext, { ...props })), {
+    namespace: 'app-shell',
+    label: 'Cloud Onboarding Next-Step',
+    category: 'plugin',
+    inputs: [],
+});

package/dist/console/home/HomePage.js

@@ -32,6 +32,7 @@ import { Sparkles, ShieldAlert, X, UploadCloud, MessageSquareText } from 'lucide
 import { useMetadataClient } from '../../views/metadata-admin/useMetadata';
 import { usePublishAllDrafts } from '../../preview/usePublishAllDrafts';
 import { resolveAiApiBase } from '../../hooks/useAiSurface';
+import { getRuntimeConfig } from '../../runtime-config';
 /**
  * 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
@@ -180,7 +181,7 @@ export function HomePage() {
         return (_jsx("div", { className: "flex flex-1 items-center justify-center py-20", children: _jsx("div", { className: "text-muted-foreground", children: t('home.loading', { defaultValue: 'Loading workspace…' }) }) }));
     }
     if (activeApps.length === 0) {
-        return (_jsxs("div", { className: "flex flex-col flex-1", children: [_jsx(PendingDraftsBanner, { t: t }), _jsx(RecoveryPasswordReminder, { t: t }), _jsx("div", { className: "flex flex-1 items-center justify-center p-6", children: isAdmin ? (_jsxs(Empty, { children: [_jsx(EmptyTitle, { children: t('home.welcome', { defaultValue: 'Welcome to ObjectUI' }) }), _jsx(EmptyDescription, { children: buildAvailable
+        return (_jsxs("div", { className: "flex flex-col flex-1", children: [_jsx(PendingDraftsBanner, { t: t }), _jsx(RecoveryPasswordReminder, { t: t }), _jsx("div", { className: "flex flex-1 items-center justify-center p-6", children: isAdmin ? (_jsxs(Empty, { children: [_jsx(EmptyTitle, { children: t('home.welcome', { product: getRuntimeConfig().branding.productName, defaultValue: 'Welcome to {{product}}' }) }), _jsx(EmptyDescription, { children: buildAvailable
                                     ? t('home.welcomeAdminDescription', {
                                         defaultValue: 'Describe your business in one sentence — AI generates the objects, screens, APIs and agent tools. Or set things up yourself from the Administration menu on the left.',
                                     })

package/dist/console/organizations/OrganizationsPage.js

@@ -14,7 +14,7 @@ import { useAuth } from '@object-ui/auth';
 import { useObjectTranslation } from '@object-ui/i18n';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import { CreateWorkspaceDialog } from './CreateWorkspaceDialog';
-import { resolveHomeUrl } from './resolveHomeUrl';
+import { resolveRootUrl } from './resolveHomeUrl';
 function getOrgInitials(name) {
     return name
         .split(/[\s_-]+/)
@@ -72,7 +72,11 @@ export function OrganizationsPage() {
             if (org.id !== activeOrganization?.id) {
                 await switchOrganization(org.id);
             }
-            window.location.href = resolveHomeUrl();
+            // Land on the console ROOT so RootLandingRedirect resolves the right
+            // landing — a single-app workspace (e.g. a fresh cloud signup, whose only
+            // app is Cloud) goes straight INTO that app instead of the redundant
+            // workspace launcher; multi-app workspaces still fall back to /home.
+            window.location.href = resolveRootUrl();
         }
         catch (err) {
             console.error('[OrganizationsPage] Failed to switch:', err);

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

@@ -16,3 +16,10 @@
  * current SPA route.
  */
 export declare function resolveHomeUrl(baseURI?: string): string;
+/**
+ * The console ROOT URL (not `/home`). Used after switching/creating an org so
+ * the SPA's root route runs `RootLandingRedirect`, which resolves the right
+ * landing: a single-app workspace lands IN that app (skipping the redundant
+ * launcher), and only a multi-app workspace falls back to `/home`.
+ */
+export declare function resolveRootUrl(baseURI?: string): string;

package/dist/console/organizations/resolveHomeUrl.js

@@ -19,9 +19,26 @@ export function resolveHomeUrl(baseURI) {
     if (baseURI !== undefined) {
         return new URL('home', baseURI).toString();
     }
+    return new URL('home', consoleRoot()).toString();
+}
+/** The deployment-mounted console root (`/_console/`, `/`, …). */
+function consoleRoot() {
     const baseHref = document.querySelector('base')?.getAttribute('href');
-    const root = baseHref
+    return baseHref
         ? new URL(baseHref, window.location.origin)
         : new URL('/', window.location.origin);
-    return new URL('home', root).toString();
+}
+/**
+ * The console ROOT URL (not `/home`). Used after switching/creating an org so
+ * the SPA's root route runs `RootLandingRedirect`, which resolves the right
+ * landing: a single-app workspace lands IN that app (skipping the redundant
+ * launcher), and only a multi-app workspace falls back to `/home`.
+ */
+export function resolveRootUrl(baseURI) {
+    if (baseURI !== undefined) {
+        // The mount directory of the base URI ('.' resolves to the dir), e.g.
+        // '/_console/organizations' → '/_console/', '/_console/' → '/_console/'.
+        return new URL('.', baseURI).toString();
+    }
+    return consoleRoot().toString();
 }

package/dist/hooks/useChatConversation.d.ts

@@ -39,6 +39,21 @@ export interface UseChatConversationOptions {
      * conversation is created. Ignored while `activeId` is set.
      */
     forceNew?: boolean;
+    /**
+     * How a plain visit (no `activeId`, no `forceNew`) treats the cached
+     * conversation:
+     *   - `'resume'` (default): re-open the last conversation. Right for the full
+     *     `/ai` page and the stateful BUILD surface, where losing an in-progress
+     *     build (staged drafts, the awaiting-confirm plan) is harmful.
+     *   - `'fresh'`: open a clean thread instead. Used by the floating assistant's
+     *     ASK/data surface, where each open should feel new. To avoid littering
+     *     the history (the list endpoint keeps empty rows — there's no prune), an
+     *     UNTOUCHED (zero-message) cached conversation is REUSED rather than
+     *     re-created; a cached conversation that the user actually used is left in
+     *     history and a fresh one is minted.
+     * Ignored when `activeId` or `forceNew` is set.
+     */
+    resumeMode?: 'resume' | 'fresh';
 }
 export interface UseChatConversationReturn {
     conversationId: string | undefined;
@@ -53,6 +68,13 @@ export interface UseChatConversationReturn {
     isLoading: boolean;
     /** Delete the current conversation + start a fresh one. */
     reset: () => Promise<void>;
+    /**
+     * Start a NEW conversation WITHOUT deleting the current one (the floating
+     * assistant's "New chat" button). Mints a fresh row and switches to it; the
+     * prior thread stays in history (reachable from the `/ai` sidebar). Contrast
+     * with {@link reset}, which deletes the current conversation first.
+     */
+    startNew: () => Promise<void>;
 }
 /**
  * The subset of plugin-chatbot's `DraftReview` (mapMessages.ts) that the chat's

package/dist/hooks/useChatConversation.js

@@ -360,7 +360,7 @@ async function deleteConversation(apiBase, id) {
     });
 }
 export function useChatConversation(options) {
-    const { userId, scope, apiBase, activeId, forceNew } = options;
+    const { userId, scope, apiBase, activeId, forceNew, resumeMode = 'resume' } = options;
     const [conversationId, setConversationId] = useState(undefined);
     const [initialMessages, setInitialMessages] = useState([]);
     const [isLoading, setIsLoading] = useState(Boolean(userId));
@@ -436,15 +436,33 @@ export function useChatConversation(options) {
                         if (cancelled)
                             return;
                         if (existing) {
-                            setConversationId(existing.id);
                             const messages = toUIMessages(existing.messages);
-                            setInitialMessages(messages.length > 0 ? messages : readMessageCache(existing.id));
-                            resolvedForUserRef.current = userId;
-                            resolvedScopeRef.current = scope;
-                            return;
+                            // 'fresh' (the floating ASK surface): only reuse the cached
+                            // conversation while it's untouched — once the user has actually
+                            // used it, start a clean thread instead so opening the assistant
+                            // feels new. Reusing an empty conversation (rather than minting
+                            // another) keeps repeated opens from littering the history with
+                            // empty rows. 'resume' (default) re-opens the prior thread.
+                            const reuse = resumeMode !== 'fresh' || messages.length === 0;
+                            if (reuse) {
+                                setConversationId(existing.id);
+                                setInitialMessages(resumeMode === 'fresh'
+                                    ? []
+                                    : messages.length > 0
+                                        ? messages
+                                        : readMessageCache(existing.id));
+                                resolvedForUserRef.current = userId;
+                                resolvedScopeRef.current = scope;
+                                return;
+                            }
+                            // 'fresh' + a used conversation: fall through to create a fresh
+                            // one; the used thread stays in history (writeCache below repoints
+                            // the cache to the new conversation).
+                        }
+                        else {
+                            writeCache(key, undefined);
+                            writeConversationMessagesCache(cached, []);
                         }
-                        writeCache(key, undefined);
-                        writeConversationMessagesCache(cached, []);
                     }
                 }
                 const fresh = await createConversation(apiBase);
@@ -474,7 +492,7 @@ export function useChatConversation(options) {
         // short-circuit guard, which is governed by the ref. Including it would
         // re-run the effect after we successfully resolved an id.
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [userId, scope, apiBase, activeId, forceNew]);
+    }, [userId, scope, apiBase, activeId, forceNew, resumeMode]);
     const reset = useCallback(async () => {
         if (!userId)
             return;
@@ -504,8 +522,37 @@ export function useChatConversation(options) {
                 setIsLoading(false);
         }
     }, [conversationId, userId, scope, apiBase]);
+    const startNew = useCallback(async () => {
+        if (!userId)
+            return;
+        const key = cacheKey(userId, scope);
+        setIsLoading(true);
+        try {
+            // Mint a fresh conversation and switch to it. The current conversation is
+            // intentionally NOT deleted — it stays in history (reachable from the
+            // `/ai` sidebar), unlike reset(). The remount keyed on `conversationId`
+            // in the host clears the visible thread.
+            const fresh = await createConversation(apiBase);
+            writeCache(key, fresh.id);
+            writeConversationMessagesCache(fresh.id, []);
+            if (!mountedRef.current)
+                return;
+            setConversationId(fresh.id);
+            setInitialMessages([]);
+            resolvedForUserRef.current = userId;
+            resolvedScopeRef.current = scope;
+        }
+        catch {
+            // Keep the current conversation on failure — better than dropping the
+            // user into a broken empty state.
+        }
+        finally {
+            if (mountedRef.current)
+                setIsLoading(false);
+        }
+    }, [userId, scope, apiBase]);
     // `resolvedScopeRef` is updated in lockstep with every `setConversationId`
     // (same async tick), so at render time it always describes the scope the
     // current `conversationId` was resolved under.
-    return { conversationId, conversationScope: resolvedScopeRef.current, initialMessages, isLoading, reset };
+    return { conversationId, conversationScope: resolvedScopeRef.current, initialMessages, isLoading, reset, startNew };
 }

package/dist/hooks/useReconcileOnError.js

@@ -13,6 +13,18 @@ export function useReconcileOnError(opts) {
     const [errorSuppressed, setErrorSuppressed] = useState(false);
     const setMessagesRef = useRef(undefined);
     const handleChatError = useCallback(async (_err) => {
+        // A request rejected BEFORE any reply streamed (429 rate-limit, 5xx, or a
+        // network failure — tagged `notSent` by sendAwareFetch) never reached the
+        // server: there is no completed turn to reconcile and NOTHING to suppress.
+        // Surfacing it is the whole point — the composer shows the error + restores
+        // the input (useObjectChat already rolled back the optimistic user bubble).
+        // Without this guard, a 429 after a few turns looked like a completed turn
+        // (the thread still ends with the PREVIOUS assistant reply) and got
+        // silently reconciled away — the reported "message vanished, no error".
+        if (_err?.notSent) {
+            setErrorSuppressed(false);
+            return;
+        }
         const aiBase = chatApi?.replace(/\/agents\/[^/]+\/chat$/, '');
         if (!conversationId || !aiBase) {
             setErrorSuppressed(false);

package/dist/index.d.ts

@@ -58,7 +58,9 @@ export type { AppComponentRegistryEntry } from './services/componentRegistry';
 import './services/builtinComponents';
 import './console/cloud-connection/CloudConnectionPanel';
 import './console/marketplace/InstalledListWidget';
+import './console/home/CloudOnboardingNext';
 export { MetadataDirectoryPage, MetadataResourceRouter, MetadataResourceListPage, MetadataResourceEditPage, MetadataResourceHistoryPage, MetadataDiagnosticsPage, MetadataQuickFind, MetadataPageShell, SchemaForm, LayeredDiff, registerMetadataResource, getMetadataResource, listMetadataResources, resolveResourceConfig, useMetadataClient, useMetadataTypes, useTypesIndex, useGlobalDiagnostics, matchesQuery, registerMetadataPreview, getMetadataPreview, listMetadataPreviewTypes, registerMetadataInspector, getMetadataInspector, listMetadataInspectorTypes, } from './views/metadata-admin';
 export type { MetadataResourceConfig, MetadataDomain, RichMetadataTypeEntry, MetadataPreview, MetadataPreviewProps, MetadataSelection, MetadataInspector, MetadataInspectorProps, } from './views/metadata-admin';
 export { assistantBus, useAssistant, useRegisterAssistantEditor, requestAssistantOpen, } from './assistant/assistantBus';
 export type { AssistantSnapshot, AssistantEditorContext, AssistantEditorField, } from './assistant/assistantBus';
+export { RemediationOverlay } from './console/RemediationOverlay';

package/dist/index.js

@@ -72,6 +72,8 @@ import './services/builtinComponents';
 // SDUI widget for the metadata-driven Cloud Connection page (cloud ADR-0008).
 import './console/cloud-connection/CloudConnectionPanel';
 import './console/marketplace/InstalledListWidget';
+// SDUI widget for the Cloud Welcome page's state-aware onboarding next-step.
+import './console/home/CloudOnboardingNext';
 // Phase 3c — generic metadata admin engine. Re-exported so plugins
 // can call `registerMetadataResource()` to override the per-type
 // list / edit / create components, and host apps can compose the
@@ -79,3 +81,4 @@ import './console/marketplace/InstalledListWidget';
 export { MetadataDirectoryPage, MetadataResourceRouter, MetadataResourceListPage, MetadataResourceEditPage, MetadataResourceHistoryPage, MetadataDiagnosticsPage, MetadataQuickFind, MetadataPageShell, SchemaForm, LayeredDiff, registerMetadataResource, getMetadataResource, listMetadataResources, resolveResourceConfig, useMetadataClient, useMetadataTypes, useTypesIndex, useGlobalDiagnostics, matchesQuery, registerMetadataPreview, getMetadataPreview, listMetadataPreviewTypes, registerMetadataInspector, getMetadataInspector, listMetadataInspectorTypes, } from './views/metadata-admin';
 // AI assistant bus — connects the metadata designers to the global chat.
 export { assistantBus, useAssistant, useRegisterAssistantEditor, requestAssistantOpen, } from './assistant/assistantBus';
+export { RemediationOverlay } from './console/RemediationOverlay';

package/dist/layout/ConsoleFloatingChatbot.js

@@ -14,7 +14,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, useAiModels, useHitlInChat, resolveDefaultAgentName, uiMessagesToChatMessages, publishHealthFromResponse, agentRouteName, } from '@object-ui/plugin-chatbot';
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue, Button, ShareDialog, } from '@object-ui/components';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue, Tabs, TabsList, TabsTrigger, Button, ShareDialog, } from '@object-ui/components';
 import { Share2, SquarePen } from 'lucide-react';
 import { useObjectTranslation } from '@object-ui/i18n';
 import { toast } from 'sonner';
@@ -77,6 +77,19 @@ function buildChatLocale(language, appLabel, agentName, fallbackAgentLabel, obje
                 connectionWaiting: '正在等待服务器响应…',
                 connectionStalledLabel: '仍在处理中…',
                 connectionOfflineLabel: '网络已断开，正在重连…',
+                designingPlanLabel: '正在为你设计方案…',
+                designingPlanHints: [
+                    '梳理需要记录的数据…',
+                    '设计对象与字段…',
+                    '关联相关记录…',
+                    '配置关系与查找字段…',
+                    '规划页面与视图…',
+                    '布置表单与列表…',
+                    '补充默认值与校验…',
+                    '规划一个看板来跟踪…',
+                    '复核整体结构是否自洽…',
+                    '汇总成完整方案…',
+                ],
                 toolDetailsHidden: '已隐藏工具参数和原始结果，仅保留过程摘要。',
                 copy: '复制',
                 copied: '已复制',
@@ -85,6 +98,8 @@ function buildChatLocale(language, appLabel, agentName, fallbackAgentLabel, obje
                 submit: '发送',
                 uploadFiles: '上传文件',
                 stopResponse: '停止生成',
+                sendFailedRateLimited: '发送过于频繁，请稍候再试。你的消息已保留在输入框中。',
+                sendFailedGeneric: '消息发送失败，请重试。你的消息已保留在输入框中。',
                 trace: '调试 trace',
                 viewTrace: '查看调试 trace',
             },
@@ -100,10 +115,12 @@ function buildChatLocale(language, appLabel, agentName, fallbackAgentLabel, obje
             planTitle: '方案预览',
             planQuestions: '搭建前请确认',
             planAssumptions: '假设',
+            planDeferred: '待补 / 暂未搭建',
             planApproveHint: '回复以确认或调整该方案。',
             planApprove: '开始搭建',
             planAdjust: '调整方案',
             planBuilt: '已搭建',
+            planReady: '方案已就绪。点击开始搭建，或告诉我需要调整什么。',
             // These messages the button SENDS must match the cloud confirm gate's
             // APPROVAL_RE (service-ai-studio confirm-gate.ts) or the agent re-proposes
             // and "开始搭建" looks inert — the gate anchors Chinese approval on 确认 /
@@ -140,6 +157,19 @@ function buildChatLocale(language, appLabel, agentName, fallbackAgentLabel, obje
             connectionWaiting: 'Waiting for server…',
             connectionStalledLabel: 'Still working…',
             connectionOfflineLabel: 'Connection lost — reconnecting…',
+            designingPlanLabel: 'Designing your app…',
+            designingPlanHints: [
+                'Mapping out the data you’ll track…',
+                'Shaping objects and their fields…',
+                'Connecting related records…',
+                'Setting up relationships and lookups…',
+                'Planning the screens and views…',
+                'Laying out forms and lists…',
+                'Adding sensible defaults and validations…',
+                'Sketching a dashboard to track it…',
+                'Double-checking the structure hangs together…',
+                'Pulling the plan together…',
+            ],
             toolDetailsHidden: 'Tool inputs and raw results are hidden in this view.',
             copy: 'Copy',
             copied: 'Copied',
@@ -148,6 +178,8 @@ function buildChatLocale(language, appLabel, agentName, fallbackAgentLabel, obje
             submit: 'Submit',
             uploadFiles: 'Upload files',
             stopResponse: 'Stop response',
+            sendFailedRateLimited: "You're sending messages too quickly. Your message is kept below — wait a moment and try again.",
+            sendFailedGeneric: "Couldn't send your message. It's kept below — please try again.",
             trace: 'trace',
             viewTrace: 'View trace',
         },
@@ -163,10 +195,12 @@ function buildChatLocale(language, appLabel, agentName, fallbackAgentLabel, obje
         planTitle: 'Proposed plan',
         planQuestions: 'Confirm before building',
         planAssumptions: 'Assumptions',
+        planDeferred: 'Not yet built',
         planApproveHint: 'Reply to approve or adjust this plan.',
         planApprove: 'Build it',
         planAdjust: 'Adjust',
         planBuilt: 'Built',
+        planReady: 'The plan is ready. Build it now, or tell me what to adjust.',
         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}.`,
@@ -249,7 +283,7 @@ function resolveCurrentRouteObject(pathname, objects) {
     const recordId = recordSeg && recordSeg !== 'new' ? recordSeg : undefined;
     return { objectName: objectSeg, ...(recordId ? { recordId } : {}) };
 }
-function ChatbotInner({ appLabel, appName, objects, agents, agentsLoading, activeAgent, onAgentChange, showAgentPicker, chatApi, apiBase, defaultOpen = false, conversationId, initialMessages: persistedMessages, }) {
+function ChatbotInner({ appLabel, appName, objects, agents, agentsLoading, activeAgent, onAgentChange, showAgentPicker, chatApi, apiBase, defaultOpen = false, conversationId, initialMessages: persistedMessages, onNewChat, }) {
     const { language } = useObjectTranslation();
     const navigate = useNavigate();
     const location = useLocation();
@@ -349,13 +383,19 @@ function ChatbotInner({ appLabel, appName, objects, agents, agentsLoading, activ
     // 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;
+    //
+    // For the common 2–3 agent case (Ask/Build) render a Claude-Code-style
+    // segmented switcher so BOTH modes are visible at a glance — a dropdown hid
+    // the distinction. Fall back to the compact Select when an env exposes many
+    // custom agents and the inline pills would overflow the header.
+    const isZh = (language ?? '').toLowerCase().startsWith('zh');
+    const headerExtra = !(showAgentPicker && agents.length > 1) ? null : agents.length <= 3 ? (_jsx(Tabs, { value: activeAgent, onValueChange: onAgentChange, children: _jsx(TabsList, { className: "h-7 gap-0.5 p-0.5", "data-testid": "floating-chatbot-agent-picker", children: agents.map((agent) => (_jsx(TabsTrigger, { value: agent.name, disabled: agentsLoading, title: agent.description || undefined, className: "h-6 px-2.5 text-xs", children: localizeAgentLabel(isZh, agent.name, agent.label) }, agent.name))) }) })) : (_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))) })] }));
     // Share-link control. Sits to the left of the panel's built-in
     // fullscreen / close buttons so users can mint a public link without
     // jumping out to the full `/ai/:id` page.
     const [shareOpen, setShareOpen] = React.useState(false);
     const restApiBase = React.useMemo(() => apiBase.replace(/\/v1\/ai$/, '').replace(/\/ai$/, '') || '/api', [apiBase]);
-    const headerActions = (_jsxs(_Fragment, { children: [messages.length > 0 ? (_jsx(Button, { variant: "ghost", size: "icon", className: "h-7 w-7", "aria-label": locale.newChat, title: locale.newChat, "data-testid": "floating-chatbot-new", onClick: clear, children: _jsx(SquarePen, { className: "h-4 w-4" }) })) : null, conversationId ? (_jsx(Button, { variant: "ghost", size: "icon", className: "h-7 w-7", "aria-label": locale.share, title: locale.share, "data-testid": "floating-chatbot-share", onClick: () => setShareOpen(true), children: _jsx(Share2, { className: "h-4 w-4" }) })) : null] }));
+    const headerActions = (_jsxs(_Fragment, { children: [messages.length > 0 ? (_jsx(Button, { variant: "ghost", size: "icon", className: "h-7 w-7", "aria-label": locale.newChat, title: locale.newChat, "data-testid": "floating-chatbot-new", onClick: onNewChat, children: _jsx(SquarePen, { className: "h-4 w-4" }) })) : null, conversationId ? (_jsx(Button, { variant: "ghost", size: "icon", className: "h-7 w-7", "aria-label": locale.share, title: locale.share, "data-testid": "floating-chatbot-share", onClick: () => setShareOpen(true), children: _jsx(Share2, { className: "h-4 w-4" }) })) : null] }));
     return (_jsxs(_Fragment, { children: [_jsx(FloatingChatbot, { onUpgrade: () => window.open(cloudPricingDeepLink(), '_blank', 'noopener,noreferrer'), floatingConfig: {
                     position: 'bottom-right',
                     defaultOpen,
@@ -450,7 +490,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, planBuiltLabel: locale.planBuilt, 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, planDeferredLabel: locale.planDeferred, planApproveHintLabel: locale.planApproveHint, planApproveLabel: locale.planApprove, planAdjustLabel: locale.planAdjust, planBuiltLabel: locale.planBuilt, planReadyLabel: locale.planReady, 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
@@ -488,18 +528,25 @@ export default function ConsoleFloatingChatbot({ appLabel, appName, objects, api
     const chatApi = activeAgent
         ? `${apiBase}/agents/${encodeURIComponent(activeAgent)}/chat`
         : undefined;
+    // The stateful BUILD surface resumes its in-progress conversation (staged
+    // drafts + the awaiting-confirm plan would otherwise be orphaned on reload);
+    // the ASK/data surface opens a fresh thread each visit (each question is
+    // largely self-contained, and resuming stale data answers is confusing). See
+    // `resumeMode` in useChatConversation.
+    const isBuildAgent = activeAgent ? agentRouteName(activeAgent) === 'build' : false;
     // Server-backed conversation. Scoped by agent so each agent gets its own
     // persistent history. Hook is inert until `userId` is provided; without it
     // the FAB continues to work in local-only mode (no persistence). Gate `userId`
     // on the agent being resolved so the conversation binds to the right scope
     // from the first resolve (not a scopeless one during the catalog load).
-    const { conversationId, initialMessages } = useChatConversation({
+    const { conversationId, initialMessages, startNew } = useChatConversation({
         userId: activeAgent ? userId : undefined,
         scope: activeAgent,
         apiBase,
+        resumeMode: isBuildAgent ? 'resume' : 'fresh',
     });
     // `key` forces a clean remount whenever the chat endpoint OR the resolved
     // conversation id changes — required because `useObjectChat` locks its mode
     // (api vs local) and its `conversationId` on first render.
-    return (_jsx(ChatbotInner, { appLabel: appLabel, appName: appName, objects: objects, agents: agents, agentsLoading: agentsLoading, agentsError: agentsError, activeAgent: activeAgent, onAgentChange: setActiveAgent, showAgentPicker: showAgentPicker, chatApi: chatApi, apiBase: apiBase, defaultOpen: defaultOpen, conversationId: conversationId, initialMessages: initialMessages }, `${chatApi ?? 'local'}:${conversationId ?? 'pending'}`));
+    return (_jsx(ChatbotInner, { appLabel: appLabel, appName: appName, objects: objects, agents: agents, agentsLoading: agentsLoading, agentsError: agentsError, activeAgent: activeAgent, onAgentChange: setActiveAgent, showAgentPicker: showAgentPicker, chatApi: chatApi, apiBase: apiBase, defaultOpen: defaultOpen, conversationId: conversationId, initialMessages: initialMessages, onNewChat: startNew }, `${chatApi ?? 'local'}:${conversationId ?? 'pending'}`));
 }

package/dist/layout/WorkspaceSwitcher.d.ts

@@ -4,8 +4,10 @@
  * Header-left organization (workspace) switcher — the standard place users
  * expect "which org am I in / switch org" to live (Linear/Vercel/GitHub style).
  *
- * - Single-org users (the vast majority): just the org name, NO dropdown. There
- *   is nothing to switch to, so a one-item menu would be pure friction.
+ * - Single-org users (the vast majority): render NOTHING. With one org there is
+ *   nothing to switch to and the name isn't actionable, so it's pure chrome —
+ *   the product logo already carries branding / "go home". The switcher is a
+ *   multi-org affordance.
  * - Multi-org users: the active org name + a dropdown to switch orgs inline
  *   (full-page reload so the active-org context refreshes app-wide, mirroring
  *   OrganizationsPage), plus shortcuts to manage members / create a workspace.

package/dist/layout/WorkspaceSwitcher.js

@@ -5,8 +5,10 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * Header-left organization (workspace) switcher — the standard place users
  * expect "which org am I in / switch org" to live (Linear/Vercel/GitHub style).
  *
- * - Single-org users (the vast majority): just the org name, NO dropdown. There
- *   is nothing to switch to, so a one-item menu would be pure friction.
+ * - Single-org users (the vast majority): render NOTHING. With one org there is
+ *   nothing to switch to and the name isn't actionable, so it's pure chrome —
+ *   the product logo already carries branding / "go home". The switcher is a
+ *   multi-org affordance.
  * - Multi-org users: the active org name + a dropdown to switch orgs inline
  *   (full-page reload so the active-org context refreshes app-wide, mirroring
  *   OrganizationsPage), plus shortcuts to manage members / create a workspace.
@@ -18,7 +20,7 @@ import { useAuth } from '@object-ui/auth';
 import { useObjectTranslation } from '@object-ui/i18n';
 import { DropdownMenu, DropdownMenuTrigger, DropdownMenuContent, DropdownMenuItem, DropdownMenuLabel, DropdownMenuSeparator, } from '@object-ui/components';
 import { ChevronsUpDown, Check, Plus, Users } from 'lucide-react';
-import { resolveHomeUrl } from '../console/organizations/resolveHomeUrl';
+import { resolveRootUrl } from '../console/organizations/resolveHomeUrl';
 function getOrgInitials(name) {
     return name
         .split(/[\s_-]+/)
@@ -55,18 +57,21 @@ export function WorkspaceSwitcher() {
     // nothing rather than an empty switcher.
     if (!current)
         return null;
-    // Single-org: static label, no dropdown.
-    if (orgList.length <= 1) {
-        return (_jsxs("span", { className: "ml-2 hidden max-w-[12rem] items-center gap-1.5 sm:inline-flex", "data-testid": "workspace-name", children: [_jsx(OrgBadge, { name: current.name }), _jsx("span", { className: "truncate text-sm font-medium text-foreground/80", children: current.name })] }));
-    }
+    // Single-org: render nothing. With only one org there's nothing to switch to
+    // and the name carries no actionable meaning, so it's just noise next to the
+    // product logo. The switcher appears only once a second org exists.
+    if (orgList.length <= 1)
+        return null;
     const handleSwitch = async (org) => {
         if (org.id === current.id)
             return;
         try {
             await switchOrganization(org.id);
-            // switchOrganization only updates state; reload to home so the new active
-            // org propagates to every data scope app-wide (same as OrganizationsPage).
-            window.location.href = resolveHomeUrl();
+            // switchOrganization only updates state; reload to the console root so the
+            // new active org propagates to every data scope app-wide AND
+            // RootLandingRedirect resolves the right landing (single-app workspace →
+            // that app, not the redundant launcher). Same as OrganizationsPage.
+            window.location.href = resolveRootUrl();
         }
         catch (err) {
             console.error('[WorkspaceSwitcher] switch failed', err);