@object-ui/app-shell 11.3.0 → 11.5.0

package/README.md

@@ -152,6 +152,15 @@ for each metadata type. Every type has a pure-renderer **preview** that doubles
 as its **designer** when given `editing` + `onPatch` props — no backend round
 trip is required to edit a draft.
 
+### App → Studio reverse bridge
+
+Inside a running app, workspace admins get a "Design in Studio" entry in the
+top bar (`AppHeader`) that deep-links to the app's owning package on the Studio
+design surface (`/studio/:packageId/data`). It is the reverse of the builder's
+"Open app" bridge (ADR-0080): the entry only renders for admins and only when
+the app has an owning package (`_packageId`), and package writability stays a
+server-side concern — a read-only package opens in Studio as browse-only.
+
 ### Studio package scope
 
 Studio treats the selected package as the authoring scope. The package selector
@@ -164,6 +173,29 @@ enable, or disable packages; direct `/metadata/package` links redirect there.
 The Studio sidebar also flattens the root Overview group so Home and package
 navigation sit directly under the package selector.
 
+### Access matrix (package-scoped)
+
+The Access pillar's permission matrix follows the active package (ADR-0086 P0).
+A Permission Set / Profile is a single record whose `objects` / `fields` maps
+accumulate authorization rows contributed by many packages, so the matrix:
+
+- lists **only the objects the active package declares** — the panel never
+  exposes the whole environment's objects; and
+- saves via **slice-merge** — it re-reads the record and writes back just this
+  package's slice, leaving rows contributed by other packages untouched.
+
+The left rail lists only permission sets this package owns — the metadata API
+filters `permission` by the record-level `package_id` provenance server-side
+(framework ADR-0086 P1), via `client.list('permission', { packageId })`, so
+environment-owned platform defaults (`admin_full_access`, `member_default`, …)
+are excluded by the backend. (The `?package=` list rows don't echo the
+provenance columns, so a client-side filter can't do this.) Save writes a
+package draft and publishes with the whole package (ADR-0086 P2). Rendering
+`PermissionMatrixEditPage` without a `packageId` keeps the environment-wide
+behavior (full object list, whole-record save). The scope/merge helpers
+(`scopePermissionSet`, `mergePermissionSlice`) live in
+`metadata-admin/permission-slice.ts`.
+
 ### Visual flow canvas
 
 The `flow` designer (`FlowPreview` → `FlowCanvas`) renders an automation as an

package/dist/chrome/KeyboardShortcutsDialog.js

@@ -9,12 +9,13 @@ import { useEffect, useMemo } from 'react';
 import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription, } from '@object-ui/components';
 import { useObjectTranslation } from '@object-ui/i18n';
 import { useUrlOverlay } from '../hooks/useUrlOverlay';
+import { KEYBOARD_SHORTCUTS_PARAM } from '../urlParams';
 export function KeyboardShortcutsDialog() {
     const { t } = useObjectTranslation();
     // URL-addressable (?shortcuts=1) so the dialog is deep-linkable and openable
     // from the header Help menu, not only via the `?` keyboard accelerator (ADR-0054
     // C1/C2/C3).
-    const { open, setOpen, toggleOverlay } = useUrlOverlay('shortcuts');
+    const { open, setOpen, toggleOverlay } = useUrlOverlay(KEYBOARD_SHORTCUTS_PARAM);
     const shortcutGroups = useMemo(() => [
         {
             title: t('console.shortcuts.groups.general'),

package/dist/console/AppContent.js

@@ -8,13 +8,13 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * AuthGuard, AdapterProvider, MetadataProvider, theme/toaster, /home, /login,
  * /organizations) is provided by `createConsole` from @object-ui/app-shell.
  */
-import { Routes, Route, Navigate, useNavigate, useLocation, useParams } from 'react-router-dom';
+import { Routes, Route, Navigate, useNavigate, useLocation, useParams, useSearchParams } from 'react-router-dom';
 import { useState, useEffect, useCallback, useRef, lazy, Suspense, useMemo } from 'react';
 import { useAssistant } from '../assistant/assistantBus';
 import { ModalForm } from '@object-ui/plugin-form';
 import { Empty, EmptyTitle, EmptyDescription, Button } from '@object-ui/components';
 import { toast } from 'sonner';
-import { useActionRunner, useGlobalUndo } from '@object-ui/react';
+import { useActionRunner, useGlobalUndo, useMutationInvalidationBridge, notifyDataChanged } from '@object-ui/react';
 import { useObjectTranslation, useObjectLabel } from '@object-ui/i18n';
 import { useAuth } from '@object-ui/auth';
 import { useMetadata } from '../providers/MetadataProvider';
@@ -23,7 +23,9 @@ import { usePreviewDrafts } from '../preview/PreviewModeContext';
 import { PreviewDraftEmptyState } from '../preview/PreviewDraftEmptyState';
 import { ExpressionProvider, evaluateVisibility } from '../providers/ExpressionProvider';
 import { useTrackRouteAsRecent } from '../hooks/useTrackRouteAsRecent';
-import { resolveRecordFormTarget, resolveFormViewLayout, resolveNavigateCreateUrl, resolveNavigateEditUrl } from '../utils/recordFormNavigation';
+import { resolveRecordFormTarget, resolveFormViewLayout, resolveNavigateCreateUrl, resolveNavigateEditUrl, resolvePostCreateTarget } from '../utils/recordFormNavigation';
+import { deriveRecordSurface, deriveRecordFlowSurface } from '@object-ui/plugin-view';
+import { RECORD_FORM_PARAM, RECORD_FORM_OBJECT_PARAM, RECORD_FORM_LINK_PARAM } from '../urlParams';
 import { matchAppBySegment } from '../utils/appRoute';
 import { resolveHref } from '@object-ui/layout';
 import { ExpressionEvaluator } from '@object-ui/core';
@@ -45,6 +47,7 @@ const ReportView = lazy(() => import('../views/ReportView').then(m => ({ default
 const SearchResultsPage = lazy(() => import('../views/SearchResultsPage').then(m => ({ default: m.SearchResultsPage })));
 const RecordFormPage = lazy(() => import('../views/RecordFormPage').then(m => ({ default: m.RecordFormPage })));
 const ComponentNavView = lazy(() => import('../views/ComponentNavView').then(m => ({ default: m.ComponentNavView })));
+const ObjectDataPage = lazy(() => import('../views/ObjectDataPage').then(m => ({ default: m.ObjectDataPage })));
 // Metadata admin — mounted under /apps/:app/metadata. Lives at the top
 // level so URLs read like a normal nested resource (RFC-style) instead of
 // piggy-backing on the legacy ComponentRegistry fan-out.
@@ -201,30 +204,80 @@ export function AppContent({ extraRoutes, extraRoutesNoApp } = {}) {
             navigate(`/apps/${seg}/component/developer/packages`, { replace: true });
         }
     }, [activeApp?.name, appName, location.pathname, navigate]);
-    const [isDialogOpen, setIsDialogOpen] = useState(false);
-    const [editingRecord, setEditingRecord] = useState(null);
+    // #2604 — the create/edit overlay is URL-driven (`?form=new` / `?form=<id>`),
+    // not component state: the record form is a TASK overlay over the origin
+    // route, and putting its open-state in the URL makes browser Back close the
+    // overlay (returning to the intact origin) instead of abandoning the route
+    // with the overlay marooned on top. Same pattern as the detail drawer's
+    // `?recordId=…` (useUrlOverlay / ADR-0054 C3). Open pushes a history entry;
+    // every close strips the param with `replace` so no stale reopen-entry stays
+    // ahead in history.
+    const [searchParams, setSearchParams] = useSearchParams();
+    const recordFormParam = searchParams.get(RECORD_FORM_PARAM);
+    // #2604 D3 — child-task extension of the record-form URL contract:
+    // `formObject` names the object the form edits when it is NOT the route's
+    // object (a subtable child opened over its parent's detail); `formLink`
+    // ("field:id") pre-links the parent on create. Keeping the whole task in
+    // the URL means Back closes the overlay and a refresh reopens it still
+    // correctly parent-linked — no transient component state to lose.
+    const formObjectParam = searchParams.get(RECORD_FORM_OBJECT_PARAM);
+    const formLinkParam = searchParams.get(RECORD_FORM_LINK_PARAM);
+    const editingRecord = useMemo(() => (recordFormParam && recordFormParam !== 'new' ? { id: recordFormParam } : null), [recordFormParam]);
+    const formLinkValues = useMemo(() => {
+        if (!formLinkParam)
+            return undefined;
+        const i = formLinkParam.indexOf(':');
+        if (i <= 0)
+            return undefined;
+        return { [formLinkParam.slice(0, i)]: formLinkParam.slice(i + 1) };
+    }, [formLinkParam]);
     const [refreshKey, setRefreshKey] = useState(0);
+    const isDialogOpen = !!recordFormParam;
+    // Close the record-form overlay by stripping `?form` in place. Reads the
+    // LIVE location (not the hook's render-time snapshot) so it stays a no-op
+    // when a success handler already navigated away in the same tick (the
+    // post-create redirect below).
+    const closeRecordForm = useCallback(() => {
+        const sp = new URLSearchParams(window.location.search);
+        if (!sp.has(RECORD_FORM_PARAM) && !sp.has(RECORD_FORM_OBJECT_PARAM) && !sp.has(RECORD_FORM_LINK_PARAM))
+            return;
+        sp.delete(RECORD_FORM_PARAM);
+        sp.delete(RECORD_FORM_OBJECT_PARAM);
+        sp.delete(RECORD_FORM_LINK_PARAM);
+        setSearchParams(sp, { replace: true });
+    }, [setSearchParams]);
     const { execute: executeAction, runner } = useActionRunner();
+    // objectui#2269 — bridge every dataSource write (create/update/delete →
+    // MutationEvent) onto the invalidation bus, ONCE for the whole console.
+    // Readers (record detail, related lists, count badges) refetch in place;
+    // nothing is remounted for a data refresh.
+    useMutationInvalidationBridge(dataSource);
     useGlobalUndo({
         dataSource: dataSource ?? undefined,
         onUndo: (op) => {
             toast.info(`Undo: ${op.description}`, { duration: 4000 });
             setRefreshKey(k => k + 1);
+            // Precisely-scoped invalidation — UndoableOperation carries the target
+            // (objectName + recordId), so detail readers refresh in place too.
+            if (op?.objectName)
+                notifyDataChanged({ objectName: op.objectName, recordId: op.recordId });
         },
         onRedo: (op) => {
             toast.info(`Redo: ${op.description}`, { duration: 3000 });
             setRefreshKey(k => k + 1);
+            if (op?.objectName)
+                notifyDataChanged({ objectName: op.objectName, recordId: op.recordId });
         },
     });
     useEffect(() => {
         runner.registerHandler('crud_success', async (action) => {
-            setIsDialogOpen(false);
+            closeRecordForm();
             setRefreshKey(k => k + 1);
             toast.success(action.params?.message ?? 'Record saved successfully');
             return { success: true, reload: true };
         });
         runner.registerHandler('dialog_cancel', async () => {
-            setIsDialogOpen(false);
+            closeRecordForm();
             return { success: true };
         });
         // Page-mode navigation handlers — declarative counterparts to the
@@ -274,7 +327,7 @@ export function AppContent({ extraRoutes, extraRoutesNoApp } = {}) {
         // `flow` handler on this top-level useActionRunner — it lives on a
         // different ActionRunner instance and would never be invoked from the
         // record/list action buttons.
-    }, [runner, navigate, appName]);
+    }, [runner, navigate, appName, closeRecordForm]);
     useEffect(() => {
         if (!dataSource)
             return;
@@ -296,8 +349,15 @@ export function AppContent({ extraRoutes, extraRoutesNoApp } = {}) {
         objectNameFromPath = '';
     }
     const currentObjectDef = allObjects.find((o) => o.name === objectNameFromPath);
+    // The object the record-form overlay edits: the route's object by default,
+    // or the `formObject` child override (#2604 D3 — subtable child task opened
+    // over its parent's detail).
+    const formObjectDef = formObjectParam
+        ? allObjects.find((o) => o.name === formObjectParam)
+        : currentObjectDef;
+    const isChildFormTask = !!formObjectParam && formObjectParam !== currentObjectDef?.name;
     const handleCrudSuccess = useCallback(() => {
-        const label = currentObjectDef ? objectLabel(currentObjectDef) : t('common.record', { defaultValue: 'Record' });
+        const label = formObjectDef ? objectLabel(formObjectDef) : t('common.record', { defaultValue: 'Record' });
         executeAction({
             type: 'crud_success',
             params: {
@@ -306,10 +366,45 @@ export function AppContent({ extraRoutes, extraRoutesNoApp } = {}) {
                     : t('form.createSuccess', { object: label, defaultValue: `${label} created successfully` }),
             },
         });
-    }, [executeAction, editingRecord, currentObjectDef, objectLabel, t]);
+    }, [executeAction, editingRecord, formObjectDef, objectLabel, t]);
     const handleDialogCancel = useCallback(() => {
         executeAction({ type: 'dialog_cancel' });
     }, [executeAction]);
+    // #2604 save invariant — *edit never moves you; create takes you to the
+    // record you made.* Edit save: the origin route is untouched (crud_success
+    // bumps refreshKey → origin refetches in place). Create save: land on the
+    // new record's detail, on ITS derived surface — a light object's detail is
+    // the drawer over the still-intact list; a heavy one is the detail route.
+    // `replace: true` swaps out the transient `?form=…` entry so Back returns
+    // to the pre-create origin.
+    const handleRecordFormSuccess = useCallback(async (saved) => {
+        // Child task (#2604 D3): the parent detail must stay EXACTLY as it was —
+        // active tab, scroll, everything. So do NOT go through crud_success;
+        // the child's open related lists refetch on their own via the
+        // invalidation bus (#2269): the dataSource write already emitted a
+        // MutationEvent that the bridge fans out — no manual notify needed.
+        if (isChildFormTask) {
+            const label = formObjectDef ? objectLabel(formObjectDef) : t('common.record', { defaultValue: 'Record' });
+            toast.success(editingRecord
+                ? t('form.updateSuccess', { object: label, defaultValue: `${label} updated successfully` })
+                : t('form.createSuccess', { object: label, defaultValue: `${label} created successfully` }));
+            closeRecordForm();
+            return;
+        }
+        handleCrudSuccess();
+        if (editingRecord || !currentObjectDef)
+            return;
+        const target = resolvePostCreateTarget({
+            objectName: currentObjectDef.name,
+            baseUrl: appName ? `/apps/${appName}` : (activeApp?.name ? `/apps/${activeApp.name}` : ''),
+            pathname: location.pathname,
+            search: window.location.search,
+            surface: deriveRecordSurface(currentObjectDef),
+            recordId: saved?.id ?? saved?._id,
+        });
+        if (target.kind !== 'none')
+            navigate(target.url, { replace: true });
+    }, [handleCrudSuccess, isChildFormTask, formObjectDef, editingRecord, currentObjectDef, appName, activeApp?.name, location.pathname, navigate, closeRecordForm, objectLabel, t]);
     // Track recent items on route change.
     useTrackRouteAsRecent({
         pathname: location.pathname,
@@ -330,8 +425,16 @@ export function AppContent({ extraRoutes, extraRoutesNoApp } = {}) {
             navigate(target.url);
             return;
         }
-        setEditingRecord(record);
-        setIsDialogOpen(true);
+        // Open the overlay via the URL (pushes one history entry → Back closes
+        // the overlay, origin intact). `new` = create; a record id = edit.
+        const rawId = record?.id ?? record?._id;
+        const sp = new URLSearchParams(window.location.search);
+        sp.set(RECORD_FORM_PARAM, rawId != null && rawId !== '' ? String(rawId) : 'new');
+        // Top-level task on the route's own object — drop any stale child-task
+        // overrides (see the record-form URL contract above).
+        sp.delete(RECORD_FORM_OBJECT_PARAM);
+        sp.delete(RECORD_FORM_LINK_PARAM);
+        setSearchParams(sp);
     };
     const handleAppChange = (newAppName) => {
         navigate(`/apps/${newAppName}`);
@@ -395,12 +498,27 @@ export function AppContent({ extraRoutes, extraRoutesNoApp } = {}) {
                                                 // overview instead of a blank `<Navigate to="">`.
                                                 const landing = resolveLandingRoute(activeApp, { currentUserId: user?.id ?? null });
                                                 return landing ? _jsx(Navigate, { to: landing, replace: true }) : _jsx(StudioHomePage, {});
-                                            })() }), _jsx(Route, { path: "metadata/package/*", element: _jsx(Navigate, { to: `/apps/${appName ?? activeApp.name}/component/developer/packages`, replace: true }) }), _jsxs(Route, { path: "metadata", children: [_jsx(Route, { index: true, element: _jsx(MetadataDirectoryPage, {}) }), _jsx(Route, { path: "_diagnostics", element: _jsx(MetadataDiagnosticsPage, {}) }), _jsx(Route, { path: ":type", element: _jsx(MetadataResourceListPage, {}) }), _jsx(Route, { path: ":type/new", element: _jsx(MetadataResourceEditPage, { createMode: true }) }), _jsx(Route, { path: ":type/:name", element: _jsx(MetadataResourceEditPage, {}) }), _jsx(Route, { path: ":type/:name/history", element: _jsx(MetadataResourceHistoryPage, {}) })] }), _jsx(Route, { path: ":objectName", element: _jsx(ObjectView, { dataSource: dataSource, objects: allObjects, onEdit: handleEdit, externalRefreshKey: refreshKey }) }), _jsx(Route, { path: ":objectName/new", element: _jsx(RecordFormPage, { mode: "create" }) }), _jsx(Route, { path: ":objectName/view/:viewId", element: _jsx(ObjectView, { dataSource: dataSource, objects: allObjects, onEdit: handleEdit, externalRefreshKey: refreshKey }) }), _jsx(Route, { path: ":objectName/record/:recordId", element: _jsx(RecordDetailView, { dataSource: dataSource, objects: allObjects, onEdit: handleEdit }, refreshKey) }), _jsx(Route, { path: ":objectName/record/:recordId/edit", element: _jsx(RecordFormPage, { mode: "edit" }) }), _jsx(Route, { path: "dashboard/:dashboardName", element: _jsx(DashboardView, { dataSource: dataSource }) }), _jsx(Route, { path: "report/:reportName", element: _jsx(ReportView, { dataSource: dataSource }) }), _jsx(Route, { path: "page/:pageName", element: _jsx(PageView, {}) }), _jsx(Route, { path: "component/:ns/:name/*", element: _jsx(ComponentNavView, {}) }), _jsx(Route, { path: "component/metadata/directory", element: _jsx(LegacyMetadataRedirect, { mode: "directory" }) }), _jsx(Route, { path: "component/metadata/resource/*", element: _jsx(LegacyMetadataRedirect, { mode: "resource" }) }), _jsx(Route, { path: "design/dashboard/:dashboardName", element: _jsx(DashboardDesignPage, {}) }), _jsx(Route, { path: "search", element: _jsx(SearchResultsPage, {}) }), _jsx(Route, { path: "create-app", element: _jsx(CreateAppPage, {}) }), _jsx(Route, { path: "edit-app/:editAppName", element: _jsx(EditAppPage, {}) }), _jsx(Route, { path: "system/marketplace", element: _jsx(MarketplacePage, {}) }), _jsx(Route, { path: "system/marketplace/installed", element: _jsx(MarketplaceInstalledPage, {}) }), _jsx(Route, { path: "system/marketplace/:packageId", element: _jsx(MarketplacePackagePage, {}) }), extraRoutes, _jsx(Route, { path: ":objectName/:maybeRecordId", element: _jsx(ShorthandRecordRedirect, {}) }), _jsx(Route, { path: "*", element: _jsx(RouteNotFound, {}) })] }) }) }) }), currentObjectDef && (_jsx(ModalForm, { schema: {
+                                            })() }), _jsx(Route, { path: "metadata/package/*", element: _jsx(Navigate, { to: `/apps/${appName ?? activeApp.name}/component/developer/packages`, replace: true }) }), _jsxs(Route, { path: "metadata", children: [_jsx(Route, { index: true, element: _jsx(MetadataDirectoryPage, {}) }), _jsx(Route, { path: "_diagnostics", element: _jsx(MetadataDiagnosticsPage, {}) }), _jsx(Route, { path: ":type", element: _jsx(MetadataResourceListPage, {}) }), _jsx(Route, { path: ":type/new", element: _jsx(MetadataResourceEditPage, { createMode: true }) }), _jsx(Route, { path: ":type/:name", element: _jsx(MetadataResourceEditPage, {}) }), _jsx(Route, { path: ":type/:name/history", element: _jsx(MetadataResourceHistoryPage, {}) })] }), _jsx(Route, { path: ":objectName", element: _jsx(ObjectView, { dataSource: dataSource, objects: allObjects, onEdit: handleEdit, externalRefreshKey: refreshKey }) }), _jsx(Route, { path: ":objectName/new", element: _jsx(RecordFormPage, { mode: "create" }) }), _jsx(Route, { path: ":objectName/view/:viewId", element: _jsx(ObjectView, { dataSource: dataSource, objects: allObjects, onEdit: handleEdit, externalRefreshKey: refreshKey }) }), _jsx(Route, { path: ":objectName/data", element: _jsx(ObjectDataPage, { dataSource: dataSource, objects: allObjects }) }), _jsx(Route, { path: ":objectName/record/:recordId", element: _jsx(RecordDetailView, { dataSource: dataSource, objects: allObjects, onEdit: handleEdit }) }), _jsx(Route, { path: ":objectName/record/:recordId/edit", element: _jsx(RecordFormPage, { mode: "edit" }) }), _jsx(Route, { path: "dashboard/:dashboardName", element: _jsx(DashboardView, { dataSource: dataSource }) }), _jsx(Route, { path: "report/:reportName", element: _jsx(ReportView, { dataSource: dataSource }) }), _jsx(Route, { path: "page/:pageName", element: _jsx(PageView, {}) }), _jsx(Route, { path: "component/:ns/:name/*", element: _jsx(ComponentNavView, {}) }), _jsx(Route, { path: "component/metadata/directory", element: _jsx(LegacyMetadataRedirect, { mode: "directory" }) }), _jsx(Route, { path: "component/metadata/resource/*", element: _jsx(LegacyMetadataRedirect, { mode: "resource" }) }), _jsx(Route, { path: "design/dashboard/:dashboardName", element: _jsx(DashboardDesignPage, {}) }), _jsx(Route, { path: "search", element: _jsx(SearchResultsPage, {}) }), _jsx(Route, { path: "create-app", element: _jsx(CreateAppPage, {}) }), _jsx(Route, { path: "edit-app/:editAppName", element: _jsx(EditAppPage, {}) }), _jsx(Route, { path: "system/marketplace", element: _jsx(MarketplacePage, {}) }), _jsx(Route, { path: "system/marketplace/installed", element: _jsx(MarketplaceInstalledPage, {}) }), _jsx(Route, { path: "system/marketplace/:packageId", element: _jsx(MarketplacePackagePage, {}) }), extraRoutes, _jsx(Route, { path: ":objectName/:maybeRecordId", element: _jsx(ShorthandRecordRedirect, {}) }), _jsx(Route, { path: "*", element: _jsx(RouteNotFound, {}) })] }) }) }) }), formObjectDef && (_jsx(ModalForm, { schema: {
                             type: 'object-form',
                             formType: 'modal',
-                            objectName: currentObjectDef.name,
+                            objectName: formObjectDef.name,
                             mode: editingRecord ? 'edit' : 'create',
                             recordId: editingRecord?.id,
+                            // Child create task (#2604 D3): pre-link the parent from the
+                            // `formLink` URL param (refresh-safe — the link survives).
+                            ...(formLinkValues && !editingRecord ? { initialValues: formLinkValues } : {}),
+                            // #2604 D1: create/edit follow the flow-surface derivation —
+                            // field-heavy → full-screen modal (the same big canvas the
+                            // detail page gets, with overlay return semantics); light
+                            // objects keep the existing auto-sized modal (ModalForm
+                            // infers from columns when modalSize is unset). Derived
+                            // default only — anything spread later (form view layout)
+                            // would win. Child tasks size to the CHILD object's def.
+                            ...(deriveRecordFlowSurface(formObjectDef, isChildFormTask
+                                ? (editingRecord ? 'child-edit' : 'child-create')
+                                : (editingRecord ? 'edit' : 'create')).size === 'full'
+                                ? { modalSize: 'full' }
+                                : {}),
                             // Honor the object's DEFAULT FORM VIEW: curated sections (field
                             // selection + order + grouping), `contentLayout: 'tabbed'` when the
                             // view is tabbed, and inline child collections (master-detail).
@@ -408,30 +526,31 @@ export function AppContent({ extraRoutes, extraRoutesNoApp } = {}) {
                             // win over the flat `fields` list below; otherwise this resolves to
                             // {} and `fields` (every field, raw schema order) is used as before.
                             // `formType` stays 'modal' (the container). (#1890 / ADR-0050.)
-                            ...resolveFormViewLayout(currentObjectDef),
+                            ...resolveFormViewLayout(formObjectDef),
                             title: editingRecord
-                                ? t('form.editTitle', { object: objectLabel(currentObjectDef) })
-                                : t('form.createTitle', { object: objectLabel(currentObjectDef) }),
+                                ? t('form.editTitle', { object: objectLabel(formObjectDef) })
+                                : t('form.createTitle', { object: objectLabel(formObjectDef) }),
                             description: editingRecord
-                                ? t('form.editDescription', { object: objectLabel(currentObjectDef) })
-                                : t('form.createDescription', { object: objectLabel(currentObjectDef) }),
+                                ? t('form.editDescription', { object: objectLabel(formObjectDef) })
+                                : t('form.createDescription', { object: objectLabel(formObjectDef) }),
                             open: isDialogOpen,
-                            onOpenChange: setIsDialogOpen,
+                            onOpenChange: (open) => { if (!open)
+                                closeRecordForm(); },
                             layout: 'vertical',
-                            fields: currentObjectDef.fields
-                                ? (Array.isArray(currentObjectDef.fields)
-                                    ? currentObjectDef.fields
+                            fields: formObjectDef.fields
+                                ? (Array.isArray(formObjectDef.fields)
+                                    ? formObjectDef.fields
                                         .filter((f) => {
                                         if (typeof f === 'string')
                                             return true;
                                         return evaluateVisibility(f.visible, expressionEvaluator);
                                     })
                                         .map((f) => typeof f === 'string' ? f : f.name)
-                                    : Object.entries(currentObjectDef.fields)
+                                    : Object.entries(formObjectDef.fields)
                                         .filter(([_, f]) => evaluateVisibility(f.visible, expressionEvaluator))
                                         .map(([key]) => key))
                                 : [],
-                            onSuccess: handleCrudSuccess,
+                            onSuccess: handleRecordFormSuccess,
                             onCancel: handleDialogCancel,
                             showSubmit: true,
                             showCancel: true,
@@ -439,7 +558,7 @@ export function AppContent({ extraRoutes, extraRoutesNoApp } = {}) {
                                 ? t('form.update', { defaultValue: t('common.save', { defaultValue: 'Save' }) })
                                 : t('form.create', { defaultValue: t('common.create', { defaultValue: 'Create' }) }),
                             cancelText: t('common.cancel'),
-                        }, dataSource: dataSource }, editingRecord?.id || 'new'))] })] }));
+                        }, dataSource: dataSource }, `${formObjectDef.name}:${editingRecord?.id || 'new'}`))] })] }));
 }
 function findFirstRoute(items, ctx) {
     if (!items || items.length === 0)

package/dist/console/ConsoleShell.js

@@ -14,7 +14,8 @@ import { Suspense, useEffect, useRef, useState } from 'react';
 import { Navigate, useLocation } from 'react-router-dom';
 import { AuthGuard, useAuth } from '@object-ui/auth';
 import { useObjectTranslation } from '@object-ui/i18n';
-import { SchemaRendererProvider } from '@object-ui/react';
+import { SchemaRendererProvider, ActionProvider } from '@object-ui/react';
+import { useActionModal } from '../hooks/useActionModal';
 import { createObjectStackUserStateAdapter } from '@object-ui/data-objectstack';
 import { AdapterProvider, useAdapter } from '../providers/AdapterProvider';
 import { MetadataProvider, useMetadata } from '../providers/MetadataProvider';
@@ -25,9 +26,30 @@ import { FavoritesProvider } from '../context/FavoritesProvider';
 import { RecentItemsProvider } from '../context/RecentItemsProvider';
 import { UserStateAdaptersProvider, useAttachUserStateAdapters, } from '../context/UserStateAdapters';
 import { ThemeProvider } from '../chrome/ThemeProvider';
+import { LoadingScreen } from '../chrome/LoadingScreen';
 import { RemediationOverlay } from './RemediationOverlay';
+// The console's every pre-React / pre-auth gate (Suspense fallback, adapter
+// not ready, org/auth loading) renders this. It used to be a bare, unbranded
+// "Loading…" line — ~8s of blank chrome before the login redirect on a cold
+// /_console load (framework#2615 P3). Delegate to the branded, boot-safe
+// splash (logo + product name + step list) that the rest of the shell already
+// uses, so the cold load looks like the product from the first frame.
 export function LoadingFallback() {
-    return (_jsx("div", { className: "h-screen flex items-center justify-center text-sm text-muted-foreground", children: "Loading\u2026" }));
+    return _jsx(LoadingScreen, {});
+}
+/**
+ * Provide a MODAL handler at the console ROOT — the same level the global
+ * SchemaRendererProvider (dataSource) sits — so it reaches EVERY field widget,
+ * including a relation field inside a create/edit form that renders in a Radix
+ * Dialog portal (which sits above the lower per-view ActionProviders). This is
+ * what lets a lookup's inline "create the referenced record" open that object's
+ * OWN create form and select the result. Only ADDS the modal capability where
+ * none existed; richer per-view ActionProviders still override it where they
+ * apply. Must render inside MetadataProvider (useActionModal reads useMetadata).
+ */
+function GlobalCreateModalProvider({ dataSource, children }) {
+    const { modalHandler, modalElement } = useActionModal(dataSource);
+    return (_jsxs(ActionProvider, { onModal: modalHandler, children: [children, modalElement] }));
 }
 /**
  * ConsoleShell — top-level provider stack shared by every console route.
@@ -87,7 +109,7 @@ function ConnectedShellInner({ children }) {
         return _jsx(LoadingFallback, {});
     // Expose the adapter via SchemaRendererContext so descendant hooks like
     // useDiscovery() (used to gate the global AI chatbot) can resolve it.
-    return (_jsx(SchemaRendererProvider, { dataSource: adapter, children: _jsxs(MetadataProvider, { adapter: adapter, children: [_jsx(UserStateBridge, {}), children] }, language) }));
+    return (_jsx(SchemaRendererProvider, { dataSource: adapter, children: _jsxs(MetadataProvider, { adapter: adapter, children: [_jsx(UserStateBridge, {}), _jsx(GlobalCreateModalProvider, { dataSource: adapter, children: children })] }, language) }));
 }
 /**
  * UserStateBridge — once we have an authenticated user + a connected data

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

@@ -4,6 +4,15 @@ interface CloudOnboardingNextProps {
         openProductionUrl?: string;
         /** SPA route to the environments list (create / open / manage). */
         environmentsRoute?: string;
+        /**
+         * Optional backend pre-warm endpoint. When set and the caller already has
+         * a production env, the widget fires a best-effort GET the moment it knows
+         * the env exists — nudging a possibly-asleep container awake WHILE the user
+         * reads the hint, so the later "Open Production" click lands in an
+         * already-waking env instead of paying the full cold-start. No-op when
+         * unset (older page metadata), so this is safe to ship ahead of the page.
+         */
+        warmUrl?: string;
     };
 }
 export declare function CloudOnboardingNext({ properties }: CloudOnboardingNextProps): import("react").JSX.Element;

package/dist/console/home/CloudOnboardingNext.js

@@ -43,7 +43,7 @@ function pick(label) {
  * `unknown` on any failure so the caller degrades gracefully rather than
  * blocking the user behind a wrong "create" CTA.
  */
-function useProductionEnvState() {
+function useProductionEnvState(warmUrl) {
     const { activeOrganization } = useAuth();
     const orgId = activeOrganization?.id;
     const authFetch = useMemo(() => createAuthenticatedFetch(), []);
@@ -68,7 +68,17 @@ function useProductionEnvState() {
                     setState({ phase: 'unknown' });
                     return;
                 }
-                setState({ phase: 'ready', hasProductionEnv: data.hasProductionEnv === true });
+                const hasProductionEnv = data.hasProductionEnv === true;
+                setState({ phase: 'ready', hasProductionEnv });
+                // Pre-warm the prod env the instant we know it exists — fire-and-forget,
+                // best-effort, once per resolve. The user is now reading the hint and
+                // will click "Open Production" seconds later; by then the container is
+                // already waking. The sso-open click warms again, so a failed warm here
+                // costs nothing. Only when the page passes a warmUrl (else no-op).
+                if (hasProductionEnv && warmUrl) {
+                    void authFetch(`${apiBase}${warmUrl}`, { method: 'GET', credentials: 'include' })
+                        .catch(() => { });
+                }
             }
             catch {
                 if (!cancelled)
@@ -78,7 +88,7 @@ function useProductionEnvState() {
         return () => {
             cancelled = true;
         };
-    }, [authFetch, orgId]);
+    }, [authFetch, orgId, warmUrl]);
     return state;
 }
 /** Full-page nav to the backend SSO endpoint so the browser follows its 302. */
@@ -87,7 +97,7 @@ function openProduction(url) {
 }
 export function CloudOnboardingNext({ properties }) {
     const navigate = useNavigate();
-    const state = useProductionEnvState();
+    const state = useProductionEnvState(properties?.warmUrl);
     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

package/dist/console/home/HomePage.js

@@ -28,7 +28,7 @@ import { HomeActionCenter, HomeContinue, HomeActivity } from './HomeRail';
 import { useHomeInbox } from '../../hooks/useHomeInbox';
 import { appRouteSegment } from '../../utils';
 import { Empty, EmptyTitle, EmptyDescription, Button } from '@object-ui/components';
-import { Sparkles, ShieldAlert, X, UploadCloud, MessageSquareText } from 'lucide-react';
+import { Sparkles, ShieldAlert, X, UploadCloud, MessageSquareText, Hammer, LayoutTemplate } from 'lucide-react';
 import { useMetadataClient } from '../../views/metadata-admin/useMetadata';
 import { usePublishAllDrafts } from '../../preview/usePublishAllDrafts';
 import { resolveAiApiBase } from '../../hooks/useAiSurface';
@@ -135,18 +135,41 @@ function PendingDraftsBanner({ t }) {
  */
 function RecoveryPasswordReminder({ t }) {
     const navigate = useNavigate();
-    const { hasLocalPassword } = useAuth();
+    const { hasLocalPassword, getAuthConfig } = useAuth();
     const [show, setShow] = useState(false);
     useEffect(() => {
         if (typeof localStorage !== 'undefined' && localStorage.getItem('os:recovery-pw-dismissed') === '1')
             return;
+        // Don't nag on the very first landing: let a brand-new SSO user reach
+        // their magic moment (build their first app) before asking them to set a
+        // recovery password. Record the first home visit; show the reminder only
+        // from the next one on. (The component already intends 'not before the
+        // first session'; previously the code still fired on the very first screen.)
+        if (typeof localStorage !== 'undefined' && localStorage.getItem('os:recovery-pw-first-seen') !== '1') {
+            try {
+                localStorage.setItem('os:recovery-pw-first-seen', '1');
+            }
+            catch { /* ignore */ }
+            return;
+        }
         let cancelled = false;
-        Promise.resolve(hasLocalPassword?.())
-            .then((has) => { if (!cancelled && has === false)
-            setShow(true); })
+        Promise.all([
+            Promise.resolve(hasLocalPassword?.()),
+            Promise.resolve(getAuthConfig?.()).catch(() => null),
+        ])
+            .then(([has, config]) => {
+            if (cancelled)
+                return;
+            // Skip on SSO-enforced envs: password login is disabled there, so a
+            // recovery password can't be used — nudging for one is misleading and
+            // gives a false sense of security. Same signal LoginForm uses.
+            const passwordUnavailable = config?.features?.ssoEnforced === true || config?.emailPassword?.enabled === false;
+            if (has === false && !passwordUnavailable)
+                setShow(true);
+        })
             .catch(() => { });
         return () => { cancelled = true; };
-    }, [hasLocalPassword]);
+    }, [hasLocalPassword, getAuthConfig]);
     const dismiss = () => {
         try {
             localStorage.setItem('os:recovery-pw-dismissed', '1');
@@ -195,5 +218,9 @@ export function HomePage() {
                                     defaultValue: 'There are no applications available to you yet. Please contact your workspace administrator.',
                                 }) })] })) })] }));
     }
-    return (_jsxs("div", { className: "relative min-h-full bg-background", children: [_jsx(PendingDraftsBanner, { t: t }), _jsx(RecoveryPasswordReminder, { t: t }), _jsx("div", { className: "px-4 sm:px-6 lg:px-8 pt-8 pb-16", children: _jsxs("div", { className: "max-w-7xl mx-auto", children: [_jsxs("div", { className: "mb-7 flex flex-col gap-4 lg:flex-row lg:items-center lg:justify-between", children: [_jsxs("div", { className: "min-w-0", children: [_jsxs("h1", { className: "text-2xl sm:text-3xl font-bold tracking-tight text-pretty", children: [_jsxs("span", { className: "text-foreground", children: [greeting, displayName ? ', ' : ''] }), displayName && _jsx("span", { className: "text-primary", children: displayName }), _jsx("span", { className: "text-foreground/40", children: "." })] }), _jsx("p", { className: "mt-1 text-sm sm:text-base text-muted-foreground", children: t('home.heroTagline', { defaultValue: 'Pick up where you left off, or explore something new.' }) })] }), _jsx(HomeAiActions, { askAvailable: askAvailable, buildAvailable: buildAvailable, navigate: navigate, t: t })] }), _jsx(HomeAppsStrip, { apps: activeApps, favorites: favorites, onOpen: (app) => navigate(`/apps/${appRouteSegment(app) ?? app.name}`), onBrowseMarketplace: () => navigate('/apps/setup/system/marketplace'), isAdmin: isAdmin }), _jsx("div", { className: "mb-6", children: _jsx(HomeActionCenter, { pendingApprovalsCount: pendingApprovalsCount, notifications: notifications, onOpenApprovals: () => navigate('/apps/setup/system/approvals'), onOpenNotification: (n) => navigate(n.actionUrl || '/apps/setup/sys_inbox_message?view=mine'), t: t }) }), _jsxs("div", { className: "grid grid-cols-1 items-start gap-6 lg:grid-cols-[minmax(0,1fr)_360px]", children: [_jsx(HomeContinue, { items: recentApps, onOpen: (href) => navigate(href), t: t }), _jsx(HomeActivity, { items: activities, onViewAll: () => navigate('/apps/setup/sys_activity'), t: t })] })] }) })] }));
+    return (_jsxs("div", { className: "relative min-h-full bg-background", children: [_jsx(PendingDraftsBanner, { t: t }), _jsx(RecoveryPasswordReminder, { t: t }), _jsx("div", { className: "px-4 sm:px-6 lg:px-8 pt-8 pb-16", children: _jsxs("div", { className: "max-w-7xl mx-auto", children: [_jsxs("div", { className: "mb-7 flex flex-col gap-4 lg:flex-row lg:items-center lg:justify-between", children: [_jsxs("div", { className: "min-w-0", children: [_jsxs("h1", { className: "text-2xl sm:text-3xl font-bold tracking-tight text-pretty", children: [_jsxs("span", { className: "text-foreground", children: [greeting, displayName ? ', ' : ''] }), displayName && _jsx("span", { className: "text-primary", children: displayName }), _jsx("span", { className: "text-foreground/40", children: "." })] }), _jsx("p", { className: "mt-1 text-sm sm:text-base text-muted-foreground", children: t('home.heroTagline', { defaultValue: 'Pick up where you left off, or explore something new.' }) })] }), _jsx(HomeAiActions, { askAvailable: askAvailable, buildAvailable: buildAvailable, navigate: navigate, t: t })] }), isAdmin && (_jsxs("div", { className: "mb-6 grid grid-cols-1 gap-3 sm:grid-cols-2", children: [_jsxs("button", { type: "button", onClick: () => navigate('/studio'), className: "flex items-start gap-3 rounded-xl border bg-card px-4 py-3.5 text-left transition-colors hover:border-primary/50 hover:bg-muted/40", children: [_jsx("span", { className: "mt-0.5 flex h-9 w-9 shrink-0 items-center justify-center rounded-lg bg-primary/10 text-primary", children: _jsx(Hammer, { className: "h-4.5 w-4.5" }) }), _jsxs("span", { className: "min-w-0", children: [_jsx("span", { className: "block text-sm font-semibold", children: t('home.build.title', { defaultValue: 'Build an app' }) }), _jsx("span", { className: "mt-0.5 block text-xs text-muted-foreground", children: t('home.build.subtitle', {
+                                                        defaultValue: 'Start from scratch — design objects, forms, automations and interfaces.',
+                                                    }) })] })] }), _jsxs("button", { type: "button", onClick: () => navigate('/apps/setup/system/marketplace'), className: "flex items-start gap-3 rounded-xl border bg-card px-4 py-3.5 text-left transition-colors hover:border-primary/50 hover:bg-muted/40", children: [_jsx("span", { className: "mt-0.5 flex h-9 w-9 shrink-0 items-center justify-center rounded-lg bg-primary/10 text-primary", children: _jsx(LayoutTemplate, { className: "h-4.5 w-4.5" }) }), _jsxs("span", { className: "min-w-0", children: [_jsx("span", { className: "block text-sm font-semibold", children: t('home.template.title', { defaultValue: 'Start with a template' }) }), _jsx("span", { className: "mt-0.5 block text-xs text-muted-foreground", children: t('home.template.subtitle', {
+                                                        defaultValue: 'Install a template app from the marketplace and customize it.',
+                                                    }) })] })] })] })), _jsx(HomeAppsStrip, { apps: activeApps, favorites: favorites, onOpen: (app) => navigate(`/apps/${appRouteSegment(app) ?? app.name}`), onBrowseMarketplace: () => navigate('/apps/setup/system/marketplace'), isAdmin: isAdmin }), _jsx("div", { className: "mb-6", children: _jsx(HomeActionCenter, { pendingApprovalsCount: pendingApprovalsCount, notifications: notifications, onOpenApprovals: () => navigate('/apps/setup/system/approvals'), onOpenNotification: (n) => navigate(n.actionUrl || '/apps/setup/sys_inbox_message?view=mine'), t: t }) }), _jsxs("div", { className: "grid grid-cols-1 items-start gap-6 lg:grid-cols-[minmax(0,1fr)_360px]", children: [_jsx(HomeContinue, { items: recentApps, onOpen: (href) => navigate(href), t: t }), _jsx(HomeActivity, { items: activities, onViewAll: () => navigate('/apps/setup/sys_activity'), t: t })] })] }) })] }));
 }

package/dist/console/organizations/CreateWorkspaceDialog.js

@@ -13,15 +13,40 @@ import { useAuth } from '@object-ui/auth';
 import { useObjectTranslation } from '@object-ui/i18n';
 import { Loader2 } from 'lucide-react';
 import { provisionProductionEnvironment } from './provisionEnvironment';
-/** Convert a display name to a URL-friendly slug */
+/**
+ * Convert a display name to a URL-friendly slug.
+ *
+ * The ASCII pass strips everything outside [a-z0-9 _-]. For a name written
+ * entirely in a non-Latin script (中文 / 日本語 / 한국어 / العربية …) that pass
+ * yields the empty string — and an empty slug left the "Create workspace"
+ * button permanently disabled (`!slug.trim()`), dead-ending the FIRST step of
+ * onboarding for every non-Latin-name user. Rather than block them, fall back
+ * to a deterministic, non-empty slug they can still edit.
+ *
+ * Deterministic (not random) on purpose: a name-derived hash means the slug
+ * doesn't jitter on every keystroke while typing a CJK name, and re-typing the
+ * same name reproduces the same slug. Uniqueness across different names comes
+ * from the hash; the server still enforces global slug uniqueness on submit.
+ */
 function nameToSlug(name) {
-    return name
+    const ascii = name
         .toLowerCase()
         .replace(/[^a-z0-9\s_-]/g, '')
         .replace(/[\s_]+/g, '-')
         .replace(/-+/g, '-')
         .replace(/^-|-$/g, '')
         .slice(0, 48);
+    if (ascii)
+        return ascii;
+    // Empty name → empty slug (keep the button disabled; nothing to create yet).
+    const trimmed = name.trim();
+    if (!trimmed)
+        return '';
+    // Non-empty name with no ASCII-sluggable chars → deterministic fallback.
+    let hash = 0;
+    for (const ch of trimmed)
+        hash = (Math.imul(hash, 31) + ch.charCodeAt(0)) >>> 0;
+    return `workspace-${hash.toString(36).slice(0, 6)}`;
 }
 export function CreateWorkspaceDialog({ open, onOpenChange, onCreated, }) {
     const { t } = useObjectTranslation();
@@ -90,7 +115,12 @@ export function CreateWorkspaceDialog({ open, onOpenChange, onCreated, }) {
             // resolves this to `alreadyProvisioned`; a genuine failure falls through
             // to the onboarding gate (lazy provision on first navigation).
             try {
-                await provisionProductionEnvironment({ organizationId: org.id });
+                // PR-5 (naming collapse): name the production environment after the
+                // workspace, so the user sees one consistent name instead of a
+                // workspace "Bloom Studio" whose environment is a generic "Production".
+                // The control plane inherits this displayName verbatim; auto-provision
+                // races that skip this call fall back to the org name server-side.
+                await provisionProductionEnvironment({ organizationId: org.id, displayName: name.trim() });
             }
             catch (provisionErr) {
                 console.warn('[CreateWorkspace] eager env provision failed; onboarding gate will provision lazily', provisionErr);