@object-ui/app-shell 6.0.1 → 6.0.3

package/CHANGELOG.md

@@ -1,5 +1,53 @@
 # @object-ui/app-shell — Changelog
 
+## 6.0.3
+
+### Patch Changes
+
+- 58f0af6: Fix marketplace install dialog showing "No environments found" even when the
+  signed-in user has cloud environments. Cloud's data API returns rows under
+  `records`, not `data`/`items`; the dialog now reads the correct key. As a
+  hardening pass, also filter `sys_member` rows by the caller's session
+  `user_id` so a leaky data endpoint cannot widen the install target list to
+  other tenants' organizations.
+  - @object-ui/types@6.0.3
+  - @object-ui/core@6.0.3
+  - @object-ui/i18n@6.0.3
+  - @object-ui/react@6.0.3
+  - @object-ui/components@6.0.3
+  - @object-ui/fields@6.0.3
+  - @object-ui/layout@6.0.3
+  - @object-ui/data-objectstack@6.0.3
+  - @object-ui/auth@6.0.3
+  - @object-ui/permissions@6.0.3
+  - @object-ui/collaboration@6.0.3
+  - @object-ui/providers@6.0.3
+
+## 6.0.2
+
+### Patch Changes
+
+- d0e63f1: Migrate AI chat history from localStorage to the server-backed
+  `ai_conversations` / `ai_messages` REST API. The studio `AiChatPanel`,
+  the console `ConsoleFloatingChatbot`, and any other consumer of the new
+  `useChatConversation` hook (in `@object-ui/app-shell`) now resolve a
+  durable conversation id per signed-in user, hydrate prior messages on
+  mount, and rotate the conversation on reset. The previous
+  `objectstack:ai-chat-messages` localStorage entries are no longer read
+  or written.
+  - @object-ui/types@6.0.2
+  - @object-ui/core@6.0.2
+  - @object-ui/i18n@6.0.2
+  - @object-ui/react@6.0.2
+  - @object-ui/components@6.0.2
+  - @object-ui/fields@6.0.2
+  - @object-ui/layout@6.0.2
+  - @object-ui/data-objectstack@6.0.2
+  - @object-ui/auth@6.0.2
+  - @object-ui/permissions@6.0.2
+  - @object-ui/collaboration@6.0.2
+  - @object-ui/providers@6.0.2
+
 ## 6.0.1
 
 ### Patch Changes

package/dist/console/AppContent.js

@@ -237,7 +237,7 @@ export function AppContent({ extraRoutes, extraRoutesNoApp } = {}) {
     const expressionUser = user
         ? { name: user.name, email: user.email, role: user.role ?? 'user' }
         : { name: 'Anonymous', email: '', role: 'guest' };
-    return (_jsxs(ExpressionProvider, { user: expressionUser, app: activeApp, data: {}, children: [_jsx(NavigationSyncEffect, {}), _jsxs(ConsoleLayout, { activeAppName: activeApp.name, activeApp: activeApp, onAppChange: handleAppChange, objects: allObjects, connectionState: connectionState, children: [_jsx(CommandPalette, { apps: apps, activeApp: activeApp, objects: allObjects, onAppChange: handleAppChange, dataSource: dataSource }), _jsx(KeyboardShortcutsDialog, {}), _jsx(OnboardingWalkthrough, {}), _jsx(ErrorBoundary, { children: _jsx(Suspense, { fallback: _jsx(LoadingScreen, {}), children: _jsx(RouteFader, { children: _jsxs(Routes, { children: [_jsx(Route, { path: "/", element: _jsx(Navigate, { to: resolveLandingRoute(activeApp), replace: true }) }), _jsx(Route, { path: ":objectName", element: _jsx(ObjectView, { dataSource: dataSource, objects: allObjects, onEdit: handleEdit, externalRefreshKey: refreshKey }) }), _jsx(Route, { path: ":objectName/new", element: _jsx(RecordFormPage, { mode: "create" }) }), _jsx(Route, { path: ":objectName/view/:viewId", element: _jsx(ObjectView, { dataSource: dataSource, objects: allObjects, onEdit: handleEdit, externalRefreshKey: refreshKey }) }), _jsx(Route, { path: ":objectName/record/:recordId", element: _jsx(RecordDetailView, { dataSource: dataSource, objects: allObjects, onEdit: handleEdit }, refreshKey) }), _jsx(Route, { path: ":objectName/record/:recordId/edit", element: _jsx(RecordFormPage, { mode: "edit" }) }), _jsx(Route, { path: "dashboard/:dashboardName", element: _jsx(DashboardView, { dataSource: dataSource }) }), _jsx(Route, { path: "report/:reportName", element: _jsx(ReportView, { dataSource: dataSource }) }), _jsx(Route, { path: "page/:pageName", element: _jsx(PageView, {}) }), _jsx(Route, { path: "design/page/:pageName", element: _jsx(PageDesignPage, {}) }), _jsx(Route, { path: "design/dashboard/:dashboardName", element: _jsx(DashboardDesignPage, {}) }), _jsx(Route, { path: "search", element: _jsx(SearchResultsPage, {}) }), _jsx(Route, { path: "create-app", element: _jsx(CreateAppPage, {}) }), _jsx(Route, { path: "edit-app/:editAppName", element: _jsx(EditAppPage, {}) }), _jsx(Route, { path: "system/marketplace", element: _jsx(MarketplacePage, {}) }), _jsx(Route, { path: "system/marketplace/installed", element: _jsx(MarketplaceInstalledPage, {}) }), _jsx(Route, { path: "system/marketplace/:packageId", element: _jsx(MarketplacePackagePage, {}) }), extraRoutes, _jsx(Route, { path: ":objectName/:maybeRecordId", element: _jsx(ShorthandRecordRedirect, {}) }), _jsx(Route, { path: "*", element: _jsx(RouteNotFound, {}) })] }) }) }) }), currentObjectDef && (_jsx(ModalForm, { schema: {
+    return (_jsxs(ExpressionProvider, { user: expressionUser, app: activeApp, data: {}, children: [_jsx(NavigationSyncEffect, {}), _jsxs(ConsoleLayout, { activeAppName: activeApp.name, activeApp: activeApp, onAppChange: handleAppChange, objects: allObjects, connectionState: connectionState, userId: user?.id, children: [_jsx(CommandPalette, { apps: apps, activeApp: activeApp, objects: allObjects, onAppChange: handleAppChange, dataSource: dataSource }), _jsx(KeyboardShortcutsDialog, {}), _jsx(OnboardingWalkthrough, {}), _jsx(ErrorBoundary, { children: _jsx(Suspense, { fallback: _jsx(LoadingScreen, {}), children: _jsx(RouteFader, { children: _jsxs(Routes, { children: [_jsx(Route, { path: "/", element: _jsx(Navigate, { to: resolveLandingRoute(activeApp), replace: true }) }), _jsx(Route, { path: ":objectName", element: _jsx(ObjectView, { dataSource: dataSource, objects: allObjects, onEdit: handleEdit, externalRefreshKey: refreshKey }) }), _jsx(Route, { path: ":objectName/new", element: _jsx(RecordFormPage, { mode: "create" }) }), _jsx(Route, { path: ":objectName/view/:viewId", element: _jsx(ObjectView, { dataSource: dataSource, objects: allObjects, onEdit: handleEdit, externalRefreshKey: refreshKey }) }), _jsx(Route, { path: ":objectName/record/:recordId", element: _jsx(RecordDetailView, { dataSource: dataSource, objects: allObjects, onEdit: handleEdit }, refreshKey) }), _jsx(Route, { path: ":objectName/record/:recordId/edit", element: _jsx(RecordFormPage, { mode: "edit" }) }), _jsx(Route, { path: "dashboard/:dashboardName", element: _jsx(DashboardView, { dataSource: dataSource }) }), _jsx(Route, { path: "report/:reportName", element: _jsx(ReportView, { dataSource: dataSource }) }), _jsx(Route, { path: "page/:pageName", element: _jsx(PageView, {}) }), _jsx(Route, { path: "design/page/:pageName", element: _jsx(PageDesignPage, {}) }), _jsx(Route, { path: "design/dashboard/:dashboardName", element: _jsx(DashboardDesignPage, {}) }), _jsx(Route, { path: "search", element: _jsx(SearchResultsPage, {}) }), _jsx(Route, { path: "create-app", element: _jsx(CreateAppPage, {}) }), _jsx(Route, { path: "edit-app/:editAppName", element: _jsx(EditAppPage, {}) }), _jsx(Route, { path: "system/marketplace", element: _jsx(MarketplacePage, {}) }), _jsx(Route, { path: "system/marketplace/installed", element: _jsx(MarketplaceInstalledPage, {}) }), _jsx(Route, { path: "system/marketplace/:packageId", element: _jsx(MarketplacePackagePage, {}) }), extraRoutes, _jsx(Route, { path: ":objectName/:maybeRecordId", element: _jsx(ShorthandRecordRedirect, {}) }), _jsx(Route, { path: "*", element: _jsx(RouteNotFound, {}) })] }) }) }) }), currentObjectDef && (_jsx(ModalForm, { schema: {
                             type: 'object-form',
                             formType: 'modal',
                             objectName: currentObjectDef.name,

package/dist/console/home/HomeLayout.d.ts

@@ -10,6 +10,11 @@
 import React from 'react';
 interface HomeLayoutProps {
     children: React.ReactNode;
+    /**
+     * Signed-in user id. Forwarded to the floating chatbot so it can hydrate
+     * server-backed conversation history.
+     */
+    userId?: string;
 }
-export declare function HomeLayout({ children }: HomeLayoutProps): import("react/jsx-runtime").JSX.Element;
+export declare function HomeLayout({ children, userId }: HomeLayoutProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/console/home/HomeLayout.js

@@ -15,7 +15,7 @@ import { useDiscovery } from '@object-ui/react';
 // 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 }) {
+export function HomeLayout({ children, userId }) {
     const { setContext } = useNavigationContext();
     const { isAiEnabled } = useDiscovery();
     // Render the chatbot whenever AI is reachable. If the developer has explicitly
@@ -26,5 +26,5 @@ export function HomeLayout({ children }) {
     useEffect(() => {
         setContext('home');
     }, [setContext]);
-    return (_jsxs("div", { className: "flex min-h-svh w-full flex-col bg-background", "data-testid": "home-layout", children: [_jsx("header", { className: "sticky top-0 z-30 flex h-14 w-full shrink-0 items-center gap-2 border-b bg-background px-2 sm:px-4", children: _jsx(AppHeader, { variant: "home" }) }), _jsx("main", { className: "flex-1 min-w-0 overflow-auto pb-20 sm:pb-0", children: children }), showChatbot && _jsx(ConsoleChatbotFab, { appLabel: "Workspace", objects: [] })] }));
+    return (_jsxs("div", { className: "flex min-h-svh w-full flex-col bg-background", "data-testid": "home-layout", children: [_jsx("header", { className: "sticky top-0 z-30 flex h-14 w-full shrink-0 items-center gap-2 border-b bg-background px-2 sm:px-4", children: _jsx(AppHeader, { variant: "home" }) }), _jsx("main", { className: "flex-1 min-w-0 overflow-auto pb-20 sm:pb-0", children: children }), showChatbot && _jsx(ConsoleChatbotFab, { appLabel: "Workspace", objects: [], userId: userId })] }));
 }

package/dist/console/marketplace/MarketplacePackagePage.js

@@ -1,4 +1,4 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /**
  * Marketplace Package Detail Page.
  *
@@ -7,8 +7,8 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  */
 import { useEffect, useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
-import { Button, Badge, Card, CardContent, CardHeader, CardTitle, Skeleton, Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle, Label, Checkbox, Select, SelectContent, SelectItem, SelectTrigger, SelectValue, } from '@object-ui/components';
-import { ArrowLeft, ExternalLink, Download, AlertCircle, Package, Trash2 } from 'lucide-react';
+import { Button, Badge, Card, CardContent, CardHeader, CardTitle, Skeleton, Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle, Label, Checkbox, Select, SelectContent, SelectItem, SelectTrigger, SelectValue, DropdownMenu, DropdownMenuTrigger, DropdownMenuContent, DropdownMenuItem, } from '@object-ui/components';
+import { ArrowLeft, ExternalLink, Download, AlertCircle, Package, Trash2, MoreHorizontal, CheckCircle2 } from 'lucide-react';
 import { PackageIcon } from './PackageIcon';
 import { MarkdownText } from './MarkdownText';
 import { getMarketplacePackage, installPackage, installLocal, uninstallLocal, listLocalInstalls, listCloudEnvironments, listInstallableOrgIds, cloudInstallDeepLink, } from './marketplaceApi';
@@ -186,18 +186,29 @@ export function MarketplacePackagePage() {
         }
     };
     if (loading) {
-        return (_jsxs("div", { className: "flex flex-col gap-6 p-4 sm:p-6", children: [_jsx(Skeleton, { className: "h-8 w-32" }), _jsx(Skeleton, { className: "h-16 w-full" }), _jsx(Skeleton, { className: "h-64 w-full" })] }));
+        return (_jsxs("div", { className: "mx-auto w-full max-w-6xl flex flex-col gap-6 p-4 sm:p-6", children: [_jsx(Skeleton, { className: "h-8 w-32" }), _jsx(Skeleton, { className: "h-16 w-full" }), _jsx(Skeleton, { className: "h-64 w-full" })] }));
     }
     if (error || !data) {
-        return (_jsxs("div", { className: "flex flex-col gap-6 p-4 sm:p-6", children: [_jsxs(Button, { variant: "ghost", size: "sm", onClick: () => navigate(`${basePath}/system/marketplace`), children: [_jsx(ArrowLeft, { className: "h-4 w-4 mr-1.5", "aria-hidden": "true" }), "Back to marketplace"] }), _jsxs("div", { className: "flex items-start gap-3 rounded-md border border-destructive/30 bg-destructive/5 p-4 text-sm", children: [_jsx(AlertCircle, { className: "h-4 w-4 mt-0.5 text-destructive", "aria-hidden": "true" }), _jsxs("div", { children: [_jsx("div", { className: "font-medium text-destructive", children: "Failed to load package" }), _jsx("div", { className: "text-muted-foreground mt-1", children: error ?? 'Not found.' })] })] })] }));
+        return (_jsxs("div", { className: "mx-auto w-full max-w-6xl flex flex-col gap-6 p-4 sm:p-6", children: [_jsxs(Button, { variant: "ghost", size: "sm", onClick: () => navigate(`${basePath}/system/marketplace`), children: [_jsx(ArrowLeft, { className: "h-4 w-4 mr-1.5", "aria-hidden": "true" }), "Back to marketplace"] }), _jsxs("div", { className: "flex items-start gap-3 rounded-md border border-destructive/30 bg-destructive/5 p-4 text-sm", children: [_jsx(AlertCircle, { className: "h-4 w-4 mt-0.5 text-destructive", "aria-hidden": "true" }), _jsxs("div", { children: [_jsx("div", { className: "font-medium text-destructive", children: "Failed to load package" }), _jsx("div", { className: "text-muted-foreground mt-1", children: error ?? 'Not found.' })] })] })] }));
     }
     const pkg = data.package;
     const latestVersion = pkg.latest_version?.version ?? data.versions[0]?.version ?? null;
     const localInstall = localInstalls.find((i) => i.manifestId === pkg.manifest_id) ?? null;
-    return (_jsxs("div", { className: "flex flex-col gap-6 p-4 sm:p-6 max-w-5xl", children: [_jsxs(Button, { variant: "ghost", size: "sm", className: "self-start", onClick: () => navigate(`${basePath}/system/marketplace`), children: [_jsx(ArrowLeft, { className: "h-4 w-4 mr-1.5", "aria-hidden": "true" }), "Back to marketplace"] }), _jsxs("div", { className: "flex items-start gap-5 flex-wrap rounded-2xl border bg-gradient-to-br from-primary/5 via-background to-background p-6", children: [_jsx(PackageIcon, { iconUrl: pkg.icon_url, displayName: pkg.display_name, manifestId: pkg.manifest_id, className: "h-20 w-20 rounded-2xl shadow-sm ring-1 ring-border", initialClassName: "text-3xl font-bold" }), _jsxs("div", { className: "flex-1 min-w-0", children: [_jsx("h1", { className: "text-3xl font-bold tracking-tight truncate", children: pkg.display_name || pkg.manifest_id }), _jsxs("div", { className: "text-sm text-muted-foreground mt-2 flex flex-wrap items-center gap-2", children: [_jsx("code", { className: "font-mono text-xs px-1.5 py-0.5 rounded bg-muted", children: pkg.manifest_id }), latestVersion && (_jsxs(Badge, { variant: "outline", children: ["v", latestVersion] })), pkg.publisher && pkg.publisher !== 'private' && (_jsx(Badge, { variant: pkg.publisher === 'objectstack' ? 'default' : 'secondary', children: pkg.publisher })), pkg.category && _jsx(Badge, { variant: "outline", children: pkg.category }), pkg.license && _jsx(Badge, { variant: "outline", className: "font-normal", children: pkg.license }), localInstall && (_jsxs(Badge, { variant: "default", className: "bg-green-600 hover:bg-green-600", children: ["Installed \u00B7 v", localInstall.version] }))] }), pkg.description && (_jsx("p", { className: "text-base text-foreground/80 mt-4 max-w-2xl leading-relaxed", children: pkg.description }))] }), _jsxs("div", { className: "flex flex-col gap-2 shrink-0 min-w-[14rem]", children: [getRuntimeConfig().features.installLocal && (_jsxs(_Fragment, { children: [_jsxs(Button, { onClick: doInstallLocal, disabled: !latestVersion || installingLocal, size: "lg", children: [_jsx(Download, { className: "h-4 w-4 mr-1.5", "aria-hidden": "true" }), installingLocal
-                                                ? 'Working…'
-                                                : localInstall
-                                                    ? `Reinstall to this runtime`
-                                                    : 'Install to this runtime'] }), localInstall && (_jsxs(Button, { variant: "outline", onClick: doUninstallLocal, disabled: installingLocal, children: [_jsx(Trash2, { className: "h-4 w-4 mr-1.5", "aria-hidden": "true" }), "Uninstall from this runtime"] }))] })), _jsxs(Button, { variant: "ghost", onClick: openInstall, disabled: !latestVersion, size: "sm", children: [_jsx(Download, { className: "h-4 w-4 mr-1.5", "aria-hidden": "true" }), "Install to cloud environment\u2026"] }), pkg.homepage_url && (_jsx("a", { href: pkg.homepage_url, target: "_blank", rel: "noopener noreferrer", children: _jsxs(Button, { variant: "ghost", size: "sm", className: "w-full", children: [_jsx(ExternalLink, { className: "h-4 w-4 mr-1.5", "aria-hidden": "true" }), "Homepage"] }) })), localResult && (_jsx("div", { className: `rounded-md border p-2 text-xs whitespace-pre-wrap ${localResult.ok ? 'border-green-500/30 bg-green-500/5 text-green-700 dark:text-green-400' : 'border-destructive/30 bg-destructive/5 text-destructive'}`, children: localResult.message }))] })] }), _jsxs("div", { className: "grid gap-4 lg:grid-cols-3", children: [_jsx("div", { className: "lg:col-span-2 space-y-4", children: _jsxs(Card, { children: [_jsx(CardHeader, { children: _jsx(CardTitle, { className: "text-base", children: "About" }) }), _jsx(CardContent, { children: pkg.readme ? (_jsx(MarkdownText, { source: pkg.readme })) : (_jsx("p", { className: "text-sm text-muted-foreground", children: "No readme provided." })) })] }) }), _jsx("div", { className: "space-y-4", children: _jsxs(Card, { children: [_jsx(CardHeader, { children: _jsx(CardTitle, { className: "text-base", children: "Versions" }) }), _jsx(CardContent, { children: data.versions.length === 0 ? (_jsx("p", { className: "text-sm text-muted-foreground", children: "No approved versions." })) : (_jsx("ul", { className: "space-y-2", children: data.versions.map((v) => (_jsxs("li", { className: "flex items-center justify-between gap-2 text-sm", children: [_jsxs("span", { className: "flex items-center gap-1.5", children: [_jsx(Package, { className: "h-3.5 w-3.5 text-muted-foreground", "aria-hidden": "true" }), _jsxs("code", { className: "font-mono", children: ["v", v.version] }), v.is_prerelease && _jsx(Badge, { variant: "outline", className: "text-xs", children: "pre" })] }), _jsx("span", { className: "text-xs text-muted-foreground", children: v.published_at ? new Date(v.published_at).toLocaleDateString() : '—' })] }, v.id))) })) })] }) })] }), _jsx(Dialog, { open: installOpen, onOpenChange: (o) => { setInstallOpen(o); if (!o)
+    const supportsLocal = getRuntimeConfig().features.installLocal;
+    const primaryDisabled = !latestVersion || installingLocal || installing;
+    const primaryAction = supportsLocal
+        ? {
+            label: installingLocal
+                ? 'Working…'
+                : localInstall
+                    ? 'Reinstall'
+                    : 'Install',
+            onClick: doInstallLocal,
+        }
+        : {
+            label: installing ? 'Installing…' : 'Install to cloud…',
+            onClick: openInstall,
+        };
+    return (_jsxs("div", { className: "mx-auto w-full max-w-6xl flex flex-col gap-6 p-4 sm:p-6", children: [_jsxs(Button, { variant: "ghost", size: "sm", className: "self-start -ml-2 text-muted-foreground hover:text-foreground", onClick: () => navigate(`${basePath}/system/marketplace`), children: [_jsx(ArrowLeft, { className: "h-4 w-4 mr-1.5", "aria-hidden": "true" }), "Back to marketplace"] }), _jsxs("div", { className: "flex items-start gap-5 flex-wrap sm:flex-nowrap rounded-2xl border bg-gradient-to-br from-primary/5 via-background to-background p-6 sm:p-8", children: [_jsx(PackageIcon, { iconUrl: pkg.icon_url, displayName: pkg.display_name, manifestId: pkg.manifest_id, className: "h-20 w-20 rounded-2xl shadow-sm ring-1 ring-border shrink-0", initialClassName: "text-3xl font-bold" }), _jsxs("div", { className: "flex-1 min-w-0", children: [_jsxs("div", { className: "flex items-center gap-2 flex-wrap", children: [_jsx("h1", { className: "text-2xl sm:text-3xl font-bold tracking-tight truncate", children: pkg.display_name || pkg.manifest_id }), pkg.homepage_url && (_jsxs("a", { href: pkg.homepage_url, target: "_blank", rel: "noopener noreferrer", className: "inline-flex items-center gap-1 text-xs text-muted-foreground hover:text-foreground transition-colors", title: "Homepage", children: [_jsx(ExternalLink, { className: "h-3.5 w-3.5", "aria-hidden": "true" }), _jsx("span", { className: "hidden sm:inline", children: "Homepage" })] }))] }), _jsxs("div", { className: "text-sm text-muted-foreground mt-2 flex flex-wrap items-center gap-1.5", children: [_jsx("code", { className: "font-mono text-xs px-1.5 py-0.5 rounded bg-muted", children: pkg.manifest_id }), latestVersion && _jsxs(Badge, { variant: "outline", children: ["v", latestVersion] }), pkg.publisher && pkg.publisher !== 'private' && (_jsx(Badge, { variant: pkg.publisher === 'objectstack' ? 'default' : 'secondary', children: pkg.publisher })), pkg.category && _jsx(Badge, { variant: "outline", children: pkg.category }), pkg.license && _jsx(Badge, { variant: "outline", className: "font-normal", children: pkg.license }), localInstall && (_jsxs(Badge, { variant: "default", className: "bg-green-600 hover:bg-green-600 gap-1", children: [_jsx(CheckCircle2, { className: "h-3 w-3", "aria-hidden": "true" }), "Installed \u00B7 v", localInstall.version] }))] }), pkg.description && (_jsx("p", { className: "text-sm sm:text-base text-foreground/80 mt-3 max-w-2xl leading-relaxed", children: pkg.description }))] }), _jsxs("div", { className: "flex items-center gap-2 shrink-0 self-start", children: [_jsxs(Button, { onClick: primaryAction.onClick, disabled: primaryDisabled, size: "lg", className: "min-w-[8rem]", children: [_jsx(Download, { className: "h-4 w-4 mr-1.5", "aria-hidden": "true" }), primaryAction.label] }), localInstall && (_jsxs(DropdownMenu, { children: [_jsx(DropdownMenuTrigger, { asChild: true, children: _jsx(Button, { variant: "outline", size: "lg", className: "px-2.5", "aria-label": "More install options", children: _jsx(MoreHorizontal, { className: "h-4 w-4", "aria-hidden": "true" }) }) }), _jsx(DropdownMenuContent, { align: "end", className: "w-56", children: _jsxs(DropdownMenuItem, { onSelect: doUninstallLocal, disabled: installingLocal, className: "text-destructive focus:text-destructive", children: [_jsx(Trash2, { className: "h-4 w-4 mr-2", "aria-hidden": "true" }), "Uninstall from this runtime"] }) })] }))] })] }), localResult && (_jsxs("div", { role: "status", className: `flex items-start gap-2 rounded-md border p-3 text-sm whitespace-pre-wrap ${localResult.ok ? 'border-green-500/30 bg-green-500/5 text-green-700 dark:text-green-400' : 'border-destructive/30 bg-destructive/5 text-destructive'}`, children: [localResult.ok ? _jsx(CheckCircle2, { className: "h-4 w-4 mt-0.5 shrink-0", "aria-hidden": "true" }) : _jsx(AlertCircle, { className: "h-4 w-4 mt-0.5 shrink-0", "aria-hidden": "true" }), _jsx("div", { className: "flex-1", children: localResult.message }), _jsx("button", { type: "button", className: "text-xs underline opacity-60 hover:opacity-100", onClick: () => setLocalResult(null), children: "Dismiss" })] })), _jsxs("div", { className: "grid gap-4 lg:grid-cols-3", children: [_jsx("div", { className: "lg:col-span-2 space-y-4", children: _jsxs(Card, { children: [_jsx(CardHeader, { children: _jsx(CardTitle, { className: "text-base", children: "About" }) }), _jsx(CardContent, { children: pkg.readme ? (_jsx(MarkdownText, { source: pkg.readme })) : (_jsx("p", { className: "text-sm text-muted-foreground", children: "No readme provided." })) })] }) }), _jsx("div", { className: "space-y-4", children: _jsxs(Card, { children: [_jsx(CardHeader, { children: _jsx(CardTitle, { className: "text-base", children: "Versions" }) }), _jsx(CardContent, { children: data.versions.length === 0 ? (_jsx("p", { className: "text-sm text-muted-foreground", children: "No approved versions." })) : (_jsx("ul", { className: "space-y-2", children: data.versions.map((v) => (_jsxs("li", { className: "flex items-center justify-between gap-2 text-sm", children: [_jsxs("span", { className: "flex items-center gap-1.5", children: [_jsx(Package, { className: "h-3.5 w-3.5 text-muted-foreground", "aria-hidden": "true" }), _jsxs("code", { className: "font-mono", children: ["v", v.version] }), v.is_prerelease && _jsx(Badge, { variant: "outline", className: "text-xs", children: "pre" })] }), _jsx("span", { className: "text-xs text-muted-foreground", children: v.published_at ? new Date(v.published_at).toLocaleDateString() : '—' })] }, v.id))) })) })] }) })] }), _jsx(Dialog, { open: installOpen, onOpenChange: (o) => { setInstallOpen(o); if (!o)
                     setInstallResult(null); }, children: _jsxs(DialogContent, { children: [_jsxs(DialogHeader, { children: [_jsxs(DialogTitle, { children: ["Install ", pkg.display_name || pkg.manifest_id] }), _jsx(DialogDescription, { children: "Choose an environment to install this app into. You need to be signed into ObjectStack Cloud." })] }), envsLoading ? (_jsx(Skeleton, { className: "h-10 w-full" })) : envsError ? (_jsxs("div", { className: "rounded-md border border-amber-500/30 bg-amber-500/5 p-3 text-sm space-y-2", children: [_jsxs("div", { className: "flex items-start gap-2", children: [_jsx(AlertCircle, { className: "h-4 w-4 mt-0.5 text-amber-600", "aria-hidden": "true" }), _jsx("div", { className: "flex-1", children: envsError })] }), _jsx("a", { href: cloudInstallDeepLink(pkg.id), target: "_blank", rel: "noopener noreferrer", children: _jsxs(Button, { variant: "outline", size: "sm", className: "w-full", children: [_jsx(ExternalLink, { className: "h-4 w-4 mr-1.5", "aria-hidden": "true" }), "Open on cloud"] }) })] })) : envs.length === 0 ? (_jsx("p", { className: "text-sm text-muted-foreground", children: "No environments found in your active organization." })) : (_jsxs("div", { className: "space-y-4", children: [_jsxs("div", { className: "space-y-1.5", children: [_jsx(Label, { htmlFor: "env-select", children: "Environment" }), _jsxs(Select, { value: selectedEnv, onValueChange: setSelectedEnv, children: [_jsx(SelectTrigger, { id: "env-select", children: _jsx(SelectValue, { placeholder: "Pick an environment" }) }), _jsx(SelectContent, { children: envs.map((e) => (_jsxs(SelectItem, { value: e.id, children: [e.display_name || e.hostname || e.id, e.plan && _jsxs("span", { className: "text-muted-foreground", children: [" \u00B7 ", e.plan] })] }, e.id))) })] })] }), _jsxs("div", { className: "flex items-center gap-2", children: [_jsx(Checkbox, { id: "seed", checked: seedSampleData, onCheckedChange: (c) => setSeedSampleData(c === true) }), _jsx(Label, { htmlFor: "seed", className: "text-sm font-normal cursor-pointer", children: "Include sample data" })] })] })), installResult && (_jsx("div", { className: `rounded-md border p-3 text-sm ${installResult.ok ? 'border-green-500/30 bg-green-500/5 text-green-700' : 'border-destructive/30 bg-destructive/5 text-destructive'}`, children: installResult.message })), _jsxs(DialogFooter, { children: [_jsx(Button, { variant: "outline", onClick: () => setInstallOpen(false), children: "Close" }), !envsError && (_jsx(Button, { onClick: doInstall, disabled: !selectedEnv || installing || installResult?.ok === true, children: installing ? 'Installing…' : 'Install' }))] })] }) })] }));
 }

package/dist/console/marketplace/marketplaceApi.d.ts

@@ -108,6 +108,11 @@ export declare function listCloudEnvironments(): Promise<CloudEnvironment[]>;
  *
  * Returns an empty set on 401 / network failure so the install dialog
  * can render a clean "no installable environments" state.
+ *
+ * Hardening: we *always* re-filter rows by the caller's session
+ * `user_id` because the data API currently returns sys_member rows
+ * without per-caller scoping. Without this, the dialog would pick up
+ * every org in the system and offer their envs as install targets.
  */
 export declare function listInstallableOrgIds(): Promise<Set<string>>;
 export declare function cloudInstallDeepLink(packageId: string): string;

package/dist/console/marketplace/marketplaceApi.js

@@ -94,7 +94,9 @@ export async function listCloudEnvironments() {
         throw err;
     }
     const payload = await res.json().catch(() => ({}));
-    const rows = payload?.data ?? payload?.items ?? payload ?? [];
+    // Cloud's data API returns `{ object, records, total, hasMore }`.
+    // We keep `data` / `items` as fallbacks for older builds.
+    const rows = payload?.records ?? payload?.data ?? payload?.items ?? payload ?? [];
     return Array.isArray(rows) ? rows : [];
 }
 /**
@@ -105,10 +107,30 @@ export async function listCloudEnvironments() {
  *
  * Returns an empty set on 401 / network failure so the install dialog
  * can render a clean "no installable environments" state.
+ *
+ * Hardening: we *always* re-filter rows by the caller's session
+ * `user_id` because the data API currently returns sys_member rows
+ * without per-caller scoping. Without this, the dialog would pick up
+ * every org in the system and offer their envs as install targets.
  */
 export async function listInstallableOrgIds() {
     const base = getCloudBase() || SERVER_URL;
-    // sys_member rows are scoped to the caller; better-auth-managed table.
+    let meId = null;
+    try {
+        const meRes = await fetch(`${base}/api/v1/auth/get-session`, {
+            credentials: 'include',
+            headers: { 'Accept': 'application/json' },
+        });
+        if (meRes.ok) {
+            const meBody = await meRes.json().catch(() => ({}));
+            meId = meBody?.user?.id ?? null;
+        }
+    }
+    catch {
+        /* fall through — meId stays null and we return empty set */
+    }
+    if (!meId)
+        return new Set();
     const url = `${base}/api/v1/data/sys_member?limit=200`;
     let payload = null;
     try {
@@ -123,11 +145,14 @@ export async function listInstallableOrgIds() {
     catch {
         return new Set();
     }
-    const rows = payload?.data ?? payload?.items ?? payload ?? [];
+    const rows = payload?.records ?? payload?.data ?? payload?.items ?? payload ?? [];
     if (!Array.isArray(rows))
         return new Set();
     const ids = new Set();
     for (const row of rows) {
+        const rowUserId = String(row?.user_id ?? row?.userId ?? '');
+        if (rowUserId !== meId)
+            continue;
         const role = String(row?.role ?? '').toLowerCase();
         const orgId = row?.organization_id ?? row?.organizationId;
         if (orgId && (role === 'owner' || role === 'admin')) {

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

@@ -2,18 +2,17 @@
  * Resolve the absolute URL of the console "home" route used after switching
  * the active organization.
  *
- * Earlier versions concatenated `import.meta.env.BASE_URL` to
- * `window.location.origin` ("`${origin}${base}home`"). That was correct for
- * apps built with an absolute Vite base (e.g. `base: '/_console/'`), but
- * silently broken for portable builds that ship with `base: './'` — the
- * resulting URL `https://host./home` has a trailing-dot host (`host.` is a
- * fully-qualified-domain marker the browser keeps) AND drops the mount
- * prefix, landing the user on a 404.
+ * History:
+ *   - `${origin}${import.meta.env.BASE_URL}home` broke portable builds
+ *     (`base: './'`), producing `https://host./home` — trailing-dot host.
+ *   - `new URL('home', document.baseURI)` fixed that, but `document.baseURI`
+ *     falls back to the current page URL when no `<base>` tag is present.
+ *     From `/home/home/` that resolves to `/home/home/home`, and each
+ *     subsequent navigation appended another `/home` segment.
  *
- * The fix is to resolve `home` against `document.baseURI`, which already
- * accounts for any `<base href="...">` injected by the host page. This works
- * for both `<base href="/_console/">` (tenant deployments) and
- * `<base href="/">` (root-mount deployments), and also for hosts that omit
- * `<base>` entirely (falls back to the current document URL's directory).
+ * The robust resolution: read `<base href>` explicitly. When present it
+ * carries the deployment mount (`/_console/`, `/`, or `./`); when absent
+ * we resolve against the document origin root, which is independent of the
+ * current SPA route.
  */
 export declare function resolveHomeUrl(baseURI?: string): string;

package/dist/console/organizations/resolveHomeUrl.js

@@ -2,20 +2,26 @@
  * Resolve the absolute URL of the console "home" route used after switching
  * the active organization.
  *
- * Earlier versions concatenated `import.meta.env.BASE_URL` to
- * `window.location.origin` ("`${origin}${base}home`"). That was correct for
- * apps built with an absolute Vite base (e.g. `base: '/_console/'`), but
- * silently broken for portable builds that ship with `base: './'` — the
- * resulting URL `https://host./home` has a trailing-dot host (`host.` is a
- * fully-qualified-domain marker the browser keeps) AND drops the mount
- * prefix, landing the user on a 404.
+ * History:
+ *   - `${origin}${import.meta.env.BASE_URL}home` broke portable builds
+ *     (`base: './'`), producing `https://host./home` — trailing-dot host.
+ *   - `new URL('home', document.baseURI)` fixed that, but `document.baseURI`
+ *     falls back to the current page URL when no `<base>` tag is present.
+ *     From `/home/home/` that resolves to `/home/home/home`, and each
+ *     subsequent navigation appended another `/home` segment.
  *
- * The fix is to resolve `home` against `document.baseURI`, which already
- * accounts for any `<base href="...">` injected by the host page. This works
- * for both `<base href="/_console/">` (tenant deployments) and
- * `<base href="/">` (root-mount deployments), and also for hosts that omit
- * `<base>` entirely (falls back to the current document URL's directory).
+ * The robust resolution: read `<base href>` explicitly. When present it
+ * carries the deployment mount (`/_console/`, `/`, or `./`); when absent
+ * we resolve against the document origin root, which is independent of the
+ * current SPA route.
  */
-export function resolveHomeUrl(baseURI = document.baseURI) {
-    return new URL('home', baseURI).toString();
+export function resolveHomeUrl(baseURI) {
+    if (baseURI !== undefined) {
+        return new URL('home', baseURI).toString();
+    }
+    const baseHref = document.querySelector('base')?.getAttribute('href');
+    const root = baseHref
+        ? new URL(baseHref, window.location.origin)
+        : new URL('/', window.location.origin);
+    return new URL('home', root).toString();
 }

package/dist/hooks/index.d.ts

@@ -7,3 +7,4 @@ export { useRecentItems, type RecentItem } from './useRecentItems';
 export { useRecordApprovals, type ApprovalProcessLite, type ApprovalRequestLite } from './useRecordApprovals';
 export { useResponsiveSidebar } from './useResponsiveSidebar';
 export { useTrackRouteAsRecent, type UseTrackRouteAsRecentOptions } from './useTrackRouteAsRecent';
+export { useChatConversation, type HydratedUIMessage, type UseChatConversationOptions, type UseChatConversationReturn, } from './useChatConversation';

package/dist/hooks/index.js

@@ -7,3 +7,4 @@ export { useRecentItems } from './useRecentItems';
 export { useRecordApprovals } from './useRecordApprovals';
 export { useResponsiveSidebar } from './useResponsiveSidebar';
 export { useTrackRouteAsRecent } from './useTrackRouteAsRecent';
+export { useChatConversation, } from './useChatConversation';

package/dist/hooks/useChatConversation.d.ts

@@ -0,0 +1,31 @@
+/** Minimal UIMessage shape compatible with `@ai-sdk/react`'s `useChat`. */
+export interface HydratedUIMessage {
+    id: string;
+    role: 'user' | 'assistant' | 'system';
+    parts: Array<{
+        type: 'text';
+        text: string;
+    }>;
+}
+export interface UseChatConversationOptions {
+    /** Authenticated user id; hook is inert until this is defined. */
+    userId: string | undefined;
+    /**
+     * Optional scope (e.g. agent name) for keying separate conversations under
+     * the same user.
+     */
+    scope?: string;
+    /**
+     * Base URL of the AI service (no trailing slash). Hook calls
+     * `${apiBase}/conversations[/...]`. Required.
+     */
+    apiBase: string;
+}
+export interface UseChatConversationReturn {
+    conversationId: string | undefined;
+    initialMessages: HydratedUIMessage[];
+    isLoading: boolean;
+    /** Delete the current conversation + start a fresh one. */
+    reset: () => Promise<void>;
+}
+export declare function useChatConversation(options: UseChatConversationOptions): UseChatConversationReturn;

package/dist/hooks/useChatConversation.js

@@ -0,0 +1,188 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+/**
+ * Server-backed AI chat conversation lifecycle.
+ *
+ * Binds a chat UI to an `ai_conversations` row owned by the signed-in user.
+ * On mount it tries the cached id (per user, optionally per scope); falls
+ * back to creating a fresh conversation when the cached one is gone
+ * (404/403).
+ */
+import { useCallback, useEffect, useRef, useState } from 'react';
+const CACHE_PREFIX = 'objectstack:ai-chat-conversation-id';
+function cacheKey(userId, scope) {
+    return scope ? `${CACHE_PREFIX}:${userId}:${scope}` : `${CACHE_PREFIX}:${userId}`;
+}
+function readCache(key) {
+    try {
+        return localStorage.getItem(key) ?? undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function writeCache(key, value) {
+    try {
+        if (value)
+            localStorage.setItem(key, value);
+        else
+            localStorage.removeItem(key);
+    }
+    catch {
+        /* ignore — private mode, quota, etc. */
+    }
+}
+function contentToText(content) {
+    if (typeof content === 'string')
+        return content;
+    if (Array.isArray(content)) {
+        return content
+            .map((part) => {
+            if (typeof part === 'string')
+                return part;
+            if (part &&
+                typeof part === 'object' &&
+                'text' in part &&
+                typeof part.text === 'string') {
+                return part.text;
+            }
+            return '';
+        })
+            .join('');
+    }
+    return '';
+}
+function toUIMessages(rows) {
+    if (!rows)
+        return [];
+    const out = [];
+    rows.forEach((row, idx) => {
+        const role = row.role;
+        if (role !== 'user' && role !== 'assistant' && role !== 'system')
+            return;
+        const text = contentToText(row.content);
+        if (!text)
+            return;
+        out.push({
+            id: row.id ?? `msg-${idx}`,
+            role,
+            parts: [{ type: 'text', text }],
+        });
+    });
+    return out;
+}
+async function fetchConversation(apiBase, id) {
+    const res = await fetch(`${apiBase}/conversations/${encodeURIComponent(id)}`, {
+        credentials: 'include',
+    });
+    if (res.status === 404 || res.status === 403)
+        return null;
+    if (!res.ok)
+        throw new Error(`GET conversation failed: ${res.status}`);
+    return (await res.json());
+}
+async function createConversation(apiBase) {
+    const res = await fetch(`${apiBase}/conversations`, {
+        method: 'POST',
+        credentials: 'include',
+        headers: { 'Content-Type': 'application/json' },
+        body: '{}',
+    });
+    if (!res.ok)
+        throw new Error(`POST conversation failed: ${res.status}`);
+    return (await res.json());
+}
+async function deleteConversation(apiBase, id) {
+    await fetch(`${apiBase}/conversations/${encodeURIComponent(id)}`, {
+        method: 'DELETE',
+        credentials: 'include',
+    }).catch(() => {
+        /* best-effort */
+    });
+}
+export function useChatConversation(options) {
+    const { userId, scope, apiBase } = options;
+    const [conversationId, setConversationId] = useState(undefined);
+    const [initialMessages, setInitialMessages] = useState([]);
+    const [isLoading, setIsLoading] = useState(Boolean(userId));
+    const mountedRef = useRef(true);
+    useEffect(() => {
+        mountedRef.current = true;
+        return () => {
+            mountedRef.current = false;
+        };
+    }, []);
+    useEffect(() => {
+        if (!userId) {
+            setConversationId(undefined);
+            setInitialMessages([]);
+            setIsLoading(false);
+            return;
+        }
+        let cancelled = false;
+        const key = cacheKey(userId, scope);
+        setIsLoading(true);
+        (async () => {
+            try {
+                const cached = readCache(key);
+                if (cached) {
+                    const existing = await fetchConversation(apiBase, cached);
+                    if (cancelled)
+                        return;
+                    if (existing) {
+                        setConversationId(existing.id);
+                        setInitialMessages(toUIMessages(existing.messages));
+                        return;
+                    }
+                    writeCache(key, undefined);
+                }
+                const fresh = await createConversation(apiBase);
+                if (cancelled)
+                    return;
+                writeCache(key, fresh.id);
+                setConversationId(fresh.id);
+                setInitialMessages(toUIMessages(fresh.messages));
+            }
+            catch {
+                if (!cancelled) {
+                    setConversationId(undefined);
+                    setInitialMessages([]);
+                }
+            }
+            finally {
+                if (!cancelled)
+                    setIsLoading(false);
+            }
+        })();
+        return () => {
+            cancelled = true;
+        };
+    }, [userId, scope, apiBase]);
+    const reset = useCallback(async () => {
+        if (!userId)
+            return;
+        const key = cacheKey(userId, scope);
+        setIsLoading(true);
+        try {
+            if (conversationId)
+                await deleteConversation(apiBase, conversationId);
+            writeCache(key, undefined);
+            const fresh = await createConversation(apiBase);
+            writeCache(key, fresh.id);
+            if (!mountedRef.current)
+                return;
+            setConversationId(fresh.id);
+            setInitialMessages([]);
+        }
+        catch {
+            if (mountedRef.current) {
+                setConversationId(undefined);
+                setInitialMessages([]);
+            }
+        }
+        finally {
+            if (mountedRef.current)
+                setIsLoading(false);
+        }
+    }, [conversationId, userId, scope, apiBase]);
+    return { conversationId, initialMessages, isLoading, reset };
+}

package/dist/layout/ConsoleFloatingChatbot.d.ts

@@ -14,6 +14,12 @@ export interface ConsoleFloatingChatbotProps {
     defaultAgent?: string;
     /** Whether the floating panel should open immediately on mount. */
     defaultOpen?: boolean;
+    /**
+     * Authenticated user id. When provided, the chat hydrates from (and writes
+     * to) a server-backed `ai_conversations` row keyed by `userId` + agent.
+     * Inert until defined — the floating panel still works in local-only mode.
+     */
+    userId?: string;
 }
-export default function ConsoleFloatingChatbot({ appLabel, objects, apiBase: apiBaseProp, defaultAgent: defaultAgentProp, defaultOpen, }: ConsoleFloatingChatbotProps): import("react/jsx-runtime").JSX.Element;
+export default function ConsoleFloatingChatbot({ appLabel, objects, apiBase: apiBaseProp, defaultAgent: defaultAgentProp, defaultOpen, userId, }: ConsoleFloatingChatbotProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/layout/ConsoleFloatingChatbot.js

@@ -14,6 +14,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
 import { FloatingChatbot, useObjectChat, useAgents, useHitlInChat, } from '@object-ui/plugin-chatbot';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue, } from '@object-ui/components';
+import { useChatConversation } from '../hooks';
 const DEFAULT_AI_PATH = '/api/v1/ai';
 function resolveApiBase(explicit) {
     if (explicit)
@@ -25,7 +26,7 @@ function resolveApiBase(explicit) {
     const serverUrl = env.VITE_SERVER_URL ?? '';
     return `${serverUrl.replace(/\/$/, '')}${DEFAULT_AI_PATH}`;
 }
-function ChatbotInner({ appLabel, objects, agents, agentsLoading, agentsError, activeAgent, onAgentChange, chatApi, apiBase, defaultOpen = false, }) {
+function ChatbotInner({ appLabel, objects, agents, agentsLoading, agentsError, activeAgent, onAgentChange, chatApi, apiBase, defaultOpen = false, conversationId, }) {
     const objectNames = objects.map((o) => o.label || o.name).join(', ');
     const activeAgentLabel = React.useMemo(() => {
         const found = agents.find((a) => a.name === activeAgent);
@@ -36,7 +37,7 @@ function ChatbotInner({ appLabel, objects, agents, agentsLoading, agentsError, a
         : `Hello! I'm your **${appLabel}** assistant. ${agentsError ? '(Backend unreachable — running in offline demo mode.)' : ''}`;
     const { messages, isLoading, error, sendMessage, stop, reload, clear, } = useObjectChat({
         api: chatApi,
-        conversationId: activeAgent ? `${appLabel}:${activeAgent}` : undefined,
+        conversationId,
         body: {
             context: {
                 activeApp: appLabel,
@@ -85,7 +86,7 @@ function ChatbotInner({ appLabel, objects, agents, agentsLoading, agentsError, a
                 ? 'Loading agents...'
                 : 'Ask anything...', onSendMessage: (content) => sendMessage(content), onClear: clear, onStop: isLoading ? stop : undefined, onReload: reload, isLoading: isLoading, error: error, enableMarkdown: true, onToolApprove: hitl.decide, toolDecisions: hitl.decisions, toolApproveLabel: "Approve & run", toolDenyLabel: "Reject", toolDenyReason: "Operator rejected from chat" }));
 }
-export default function ConsoleFloatingChatbot({ appLabel, objects, apiBase: apiBaseProp, defaultAgent: defaultAgentProp, defaultOpen = false, }) {
+export default function ConsoleFloatingChatbot({ appLabel, objects, apiBase: apiBaseProp, defaultAgent: defaultAgentProp, defaultOpen = false, userId, }) {
     const apiBase = React.useMemo(() => resolveApiBase(apiBaseProp), [apiBaseProp]);
     const env = import.meta.env ?? {};
     const envDefaultAgent = env.VITE_AI_DEFAULT_AGENT;
@@ -101,8 +102,16 @@ export default function ConsoleFloatingChatbot({ appLabel, objects, apiBase: api
     const chatApi = activeAgent
         ? `${apiBase}/agents/${encodeURIComponent(activeAgent)}/chat`
         : undefined;
-    // `key` forces a clean remount whenever the active agent (and therefore the
-    // chat API URL) changes — required because `useObjectChat` locks its mode
-    // (api vs local) on first render.
-    return (_jsx(ChatbotInner, { appLabel: appLabel, objects: objects, agents: agents, agentsLoading: agentsLoading, agentsError: agentsError, activeAgent: activeAgent, onAgentChange: setActiveAgent, chatApi: chatApi, apiBase: apiBase, defaultOpen: defaultOpen }, chatApi ?? 'local'));
+    // 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).
+    const { conversationId } = useChatConversation({
+        userId,
+        scope: activeAgent,
+        apiBase,
+    });
+    // `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, objects: objects, agents: agents, agentsLoading: agentsLoading, agentsError: agentsError, activeAgent: activeAgent, onAgentChange: setActiveAgent, chatApi: chatApi, apiBase: apiBase, defaultOpen: defaultOpen, conversationId: conversationId }, `${chatApi ?? 'local'}:${conversationId ?? 'pending'}`));
 }

package/dist/layout/ConsoleLayout.d.ts

@@ -16,7 +16,12 @@ interface ConsoleLayoutProps {
     onAppChange: (name: string) => void;
     objects: any[];
     connectionState?: ConnectionState;
+    /**
+     * Signed-in user id. Forwarded to the floating chatbot so it can hydrate
+     * server-backed conversation history. Omit for unauthenticated/local-only.
+     */
+    userId?: string;
 }
 /** Floating chatbot wired with useObjectChat for demo auto-response */
-export declare function ConsoleLayout({ children, activeAppName, activeApp, onAppChange, objects, connectionState }: ConsoleLayoutProps): import("react/jsx-runtime").JSX.Element;
+export declare function ConsoleLayout({ children, activeAppName, activeApp, onAppChange, objects, connectionState, userId, }: ConsoleLayoutProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/layout/ConsoleLayout.js

@@ -28,7 +28,7 @@ function ConsoleLayoutInner({ children }) {
 }
 /** Floating chatbot wired with useObjectChat for demo auto-response */
 // (moved to ./ConsoleFloatingChatbot.tsx for code-splitting)
-export function ConsoleLayout({ children, activeAppName, activeApp, onAppChange, objects, connectionState }) {
+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
@@ -51,5 +51,5 @@ export function ConsoleLayout({ children, activeAppName, activeApp, onAppChange,
                         ? `${resolveI18nLabel(activeApp.label)} — ObjectStack Console`
                         : undefined,
                 }
-                : undefined, children: [_jsx(ConsoleLayoutInner, { children: children }), showChatbot && (_jsx(ConsoleChatbotFab, { appLabel: appLabel, objects: objects }))] }) }));
+                : undefined, children: [_jsx(ConsoleLayoutInner, { children: children }), showChatbot && (_jsx(ConsoleChatbotFab, { appLabel: appLabel, objects: objects, userId: userId }))] }) }));
 }

package/dist/views/RecordDetailView.js

@@ -386,7 +386,8 @@ export function RecordDetailView({ dataSource, objects, onEdit, objectNameOverri
             const shouldRefresh = action.refreshAfter !== false;
             if (shouldRefresh)
                 setActionRefreshKey(k => k + 1);
-            return { success: true, data: json?.data, reload: shouldRefresh };
+            const result = json?.data;
+            return { success: true, data: result, reload: shouldRefresh };
         }
         catch (error) {
             return { success: false, error: error.message };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@object-ui/app-shell",
-  "version": "6.0.1",
+  "version": "6.0.3",
   "type": "module",
   "license": "MIT",
   "description": "Minimal application shell for ObjectUI - framework-agnostic rendering engine",
@@ -28,35 +28,35 @@
     "@sentry/react": "^8.55.2",
     "lucide-react": "^1.16.0",
     "sonner": "^2.0.7",
-    "@object-ui/auth": "6.0.1",
-    "@object-ui/collaboration": "6.0.1",
-    "@object-ui/components": "6.0.1",
-    "@object-ui/core": "6.0.1",
-    "@object-ui/data-objectstack": "6.0.1",
-    "@object-ui/fields": "6.0.1",
-    "@object-ui/i18n": "6.0.1",
-    "@object-ui/layout": "6.0.1",
-    "@object-ui/permissions": "6.0.1",
-    "@object-ui/providers": "6.0.1",
-    "@object-ui/react": "6.0.1",
-    "@object-ui/types": "6.0.1"
+    "@object-ui/auth": "6.0.3",
+    "@object-ui/collaboration": "6.0.3",
+    "@object-ui/components": "6.0.3",
+    "@object-ui/core": "6.0.3",
+    "@object-ui/data-objectstack": "6.0.3",
+    "@object-ui/fields": "6.0.3",
+    "@object-ui/i18n": "6.0.3",
+    "@object-ui/layout": "6.0.3",
+    "@object-ui/permissions": "6.0.3",
+    "@object-ui/providers": "6.0.3",
+    "@object-ui/react": "6.0.3",
+    "@object-ui/types": "6.0.3"
   },
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0",
     "react-dom": "^18.0.0 || ^19.0.0",
     "react-router-dom": "^6.0.0 || ^7.0.0",
-    "@object-ui/plugin-calendar": "^6.0.1",
-    "@object-ui/plugin-charts": "^6.0.1",
-    "@object-ui/plugin-chatbot": "^6.0.1",
-    "@object-ui/plugin-dashboard": "^6.0.1",
-    "@object-ui/plugin-designer": "^6.0.1",
-    "@object-ui/plugin-detail": "^6.0.1",
-    "@object-ui/plugin-form": "^6.0.1",
-    "@object-ui/plugin-grid": "^6.0.1",
-    "@object-ui/plugin-kanban": "^6.0.1",
-    "@object-ui/plugin-list": "^6.0.1",
-    "@object-ui/plugin-report": "^6.0.1",
-    "@object-ui/plugin-view": "^6.0.1"
+    "@object-ui/plugin-calendar": "^6.0.3",
+    "@object-ui/plugin-charts": "^6.0.3",
+    "@object-ui/plugin-chatbot": "^6.0.3",
+    "@object-ui/plugin-dashboard": "^6.0.3",
+    "@object-ui/plugin-designer": "^6.0.3",
+    "@object-ui/plugin-detail": "^6.0.3",
+    "@object-ui/plugin-form": "^6.0.3",
+    "@object-ui/plugin-grid": "^6.0.3",
+    "@object-ui/plugin-kanban": "^6.0.3",
+    "@object-ui/plugin-list": "^6.0.3",
+    "@object-ui/plugin-report": "^6.0.3",
+    "@object-ui/plugin-view": "^6.0.3"
   },
   "devDependencies": {
     "@types/node": "^25.9.0",