@object-ui/app-shell 11.2.0 → 11.4.0

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);

package/dist/console/organizations/OrganizationsPage.js

@@ -121,19 +121,28 @@ export function OrganizationsPage() {
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [isOrganizationsLoading, orgList.length, manageMode, wantsCreate]);
     // Open the create dialog when arriving via the header "Create workspace"
-    // entry (`?create=1`). Guarded so closing the dialog doesn't re-open it.
+    // entry (`?create=1`), OR for a brand-new user who has ZERO organizations:
+    // they have nothing to pick, so land them straight on the "name your
+    // workspace" form instead of an empty picker (one hop fewer on first run).
+    // The empty-state (with its own "New organization" button) remains the
+    // backdrop if they dismiss the dialog. Guarded so closing never re-opens it.
     const createOpenedRef = useRef(false);
     useEffect(() => {
-        if (wantsCreate && !createOpenedRef.current) {
+        if (isOrganizationsLoading)
+            return;
+        const firstRunNoOrg = orgList.length === 0 && canCreateOrg;
+        if ((wantsCreate || firstRunNoOrg) && !createOpenedRef.current) {
             createOpenedRef.current = true;
             setIsCreateOpen(true);
         }
-    }, [wantsCreate]);
-    // Show a spinner while we're either still loading, or about to auto-redirect
-    // because there's only one org. This prevents the picker from briefly
-    // flashing on screen for single-org users.
+    }, [wantsCreate, orgList.length, canCreateOrg, isOrganizationsLoading]);
+    // Show a spinner while we're either still loading, about to auto-redirect
+    // because there's only one org, or about to auto-open the create dialog for a
+    // brand-new zero-org user. This prevents the picker / empty-state from
+    // briefly flashing on screen before the redirect or dialog.
     const willAutoSelect = !wantsCreate && !isOrganizationsLoading && orgList.length === 1;
-    if (isOrganizationsLoading || willAutoSelect) {
+    const willAutoCreate = !isOrganizationsLoading && orgList.length === 0 && canCreateOrg && !createOpenedRef.current;
+    if (isOrganizationsLoading || willAutoSelect || willAutoCreate) {
         return (_jsx("div", { className: "flex flex-1 items-center justify-center py-20", children: _jsx(Loader2, { className: "h-5 w-5 animate-spin text-muted-foreground" }) }));
     }
     return (_jsxs("div", { className: "mx-auto w-full max-w-5xl px-4 sm:px-6 py-8 sm:py-12", children: [_jsxs("div", { className: "mb-8", children: [_jsx("h1", { className: "text-2xl sm:text-3xl font-bold tracking-tight", children: t('organizations.heading', { defaultValue: 'Your Organizations' }) }), _jsx("p", { className: "text-sm text-muted-foreground mt-1", children: t('organizations.subtitle', {

package/dist/hooks/useConsoleActionRuntime.js

@@ -37,6 +37,21 @@ import { EnvironmentEntitlementDialog } from '../environment/EnvironmentEntitlem
 import { entitlementDialogFromError } from '../environment/entitlements';
 import { resolvePageVarTokens } from '../utils/resolvePageVarTokens';
 const FALLBACK_USER = { id: 'current-user', name: 'Demo User', isPlatformAdmin: false };
+/**
+ * An action that also mounts on list rows (`list_item`) or record pages is
+ * designed to run against a single record. When such an action is launched
+ * from the list toolbar with nothing selected, there is no record context to
+ * resolve — block up front instead of triggering a run that fails at its
+ * first record-bound step (#2210: "Update requires an ID"). Actions declaring
+ * only object-level locations (e.g. `['list_toolbar']`) are left alone: they
+ * legitimately run without a record.
+ */
+function isRecordScoped(action) {
+    const locations = action.locations;
+    if (!Array.isArray(locations))
+        return false;
+    return locations.some((l) => l === 'list_item' || l === 'record_header' || l === 'record_more' || l === 'record_section');
+}
 export function useConsoleActionRuntime(opts) {
     const { dataSource, objects, objectName, onRefresh } = opts;
     const navigate = useNavigate();
@@ -297,6 +312,10 @@ export function useConsoleActionRuntime(opts) {
             // context as `selectedRecords`. Flows take a single `recordId` input
             // variable, so a multi-row selection is ambiguous: block with a message
             // instead of triggering a run that fails at its first record-bound node.
+            // Zero selection is blocked too when the action is record-scoped (it
+            // also mounts on list rows) — otherwise the wizard opens, collects
+            // input, and dies at its first record-bound node ("Update requires an
+            // ID"). Pure object-level toolbar flows keep triggering with no record.
             if (recordId == null) {
                 const selected = Array.isArray(context?.selectedRecords) ? context.selectedRecords : [];
                 if (selected.length === 1) {
@@ -305,6 +324,9 @@ export function useConsoleActionRuntime(opts) {
                 else if (selected.length > 1) {
                     return { success: false, error: 'This flow runs on a single record — select exactly one row.' };
                 }
+                else if (isRecordScoped(action)) {
+                    return { success: false, error: 'This flow runs on a single record — select a row first.' };
+                }
             }
             if (recordId != null && params.recordId == null)
                 params.recordId = recordId;
@@ -358,7 +380,8 @@ export function useConsoleActionRuntime(opts) {
         // Same list_toolbar fallback as flowHandler: no `_rowRecord` means the
         // action came from the toolbar — resolve the recordId from the grid's
         // checkbox selection (published as `selectedRecords`). Multi-select is
-        // ambiguous for a single-record action, so block with a message.
+        // ambiguous for a single-record action, so block with a message; so is
+        // zero selection when the action is record-scoped (see isRecordScoped).
         if (resolvedRecordId == null) {
             const selected = Array.isArray(context?.selectedRecords) ? context.selectedRecords : [];
             if (selected.length === 1) {
@@ -368,6 +391,9 @@ export function useConsoleActionRuntime(opts) {
                 // The runner's post-execution hook surfaces `error` as a toast.
                 return { success: false, error: 'This action runs on a single record — select exactly one row.' };
             }
+            else if (isRecordScoped(action)) {
+                return { success: false, error: 'This action runs on a single record — select a row first.' };
+            }
         }
         // Re-entrancy guard.
         const inflightKey = `${targetName}:${resolvedRecordId ?? ''}`;
@@ -464,7 +490,9 @@ export function useConsoleActionRuntime(opts) {
                     }
                     catch { /* ignore */ }
                 }
-                toast.error(errMsg);
+                // Don't toast here — the ActionRunner's post-execution hook surfaces
+                // `error` as a toast (see apiHandler/flowHandler, which likewise only
+                // return). Toasting here too double-fires the error (two identical toasts).
                 return { success: false, error: errMsg };
             }
             const shouldRefresh = action.refreshAfter !== false;
@@ -525,7 +553,8 @@ export function useConsoleActionRuntime(opts) {
                 catch { /* ignore */ }
             }
             const msg = error.message;
-            toast.error(msg);
+            // The ActionRunner's post-execution hook toasts `error`; returning it here
+            // (without a local toast.error) avoids the double toast.
             return { success: false, error: msg };
         }
         finally {

package/dist/index.d.ts

@@ -61,6 +61,8 @@ import './console/marketplace/InstalledListWidget';
 import './console/home/CloudOnboardingNext';
 export { MetadataDirectoryPage, MetadataResourceRouter, MetadataResourceListPage, MetadataResourceEditPage, MetadataResourceHistoryPage, MetadataDiagnosticsPage, MetadataQuickFind, MetadataPageShell, SchemaForm, LayeredDiff, registerMetadataResource, getMetadataResource, listMetadataResources, resolveResourceConfig, useMetadataClient, useMetadataTypes, useTypesIndex, useGlobalDiagnostics, matchesQuery, registerMetadataPreview, getMetadataPreview, listMetadataPreviewTypes, registerMetadataInspector, getMetadataInspector, listMetadataInspectorTypes, } from './views/metadata-admin';
 export type { MetadataResourceConfig, MetadataDomain, RichMetadataTypeEntry, MetadataPreview, MetadataPreviewProps, MetadataSelection, MetadataInspector, MetadataInspectorProps, } from './views/metadata-admin';
+export { StudioDesignSurface, type StudioDesignSurfaceProps, } from './views/studio-design/StudioDesignSurface';
+export { BuilderLanding } from './views/studio-design/BuilderLanding';
 export { assistantBus, useAssistant, useRegisterAssistantEditor, requestAssistantOpen, } from './assistant/assistantBus';
 export type { AssistantSnapshot, AssistantEditorContext, AssistantEditorField, } from './assistant/assistantBus';
 export { RemediationOverlay } from './console/RemediationOverlay';

package/dist/index.js

@@ -79,6 +79,12 @@ import './console/home/CloudOnboardingNext';
 // list / edit / create components, and host apps can compose the
 // page primitives directly when needed.
 export { MetadataDirectoryPage, MetadataResourceRouter, MetadataResourceListPage, MetadataResourceEditPage, MetadataResourceHistoryPage, MetadataDiagnosticsPage, MetadataQuickFind, MetadataPageShell, SchemaForm, LayeredDiff, registerMetadataResource, getMetadataResource, listMetadataResources, resolveResourceConfig, useMetadataClient, useMetadataTypes, useTypesIndex, useGlobalDiagnostics, matchesQuery, registerMetadataPreview, getMetadataPreview, listMetadataPreviewTypes, registerMetadataInspector, getMetadataInspector, listMetadataInspectorTypes, } from './views/metadata-admin';
+// Studio WYSIWYG design surface (ADR-0080) — the open-source design surface.
+// The left AI copilot is an injected `aiSlot`; OSS renders three zones.
+export { StudioDesignSurface, } from './views/studio-design/StudioDesignSurface';
+// The builder's front door: pick/create a writable package → pillar builder.
+// Standalone at `/studio` and embedded via the `studio:builder` component ref.
+export { BuilderLanding } from './views/studio-design/BuilderLanding';
 // AI assistant bus — connects the metadata designers to the global chat.
 export { assistantBus, useAssistant, useRegisterAssistantEditor, requestAssistantOpen, } from './assistant/assistantBus';
 export { RemediationOverlay } from './console/RemediationOverlay';

package/dist/preview/DraftChangesPanel.d.ts

@@ -15,5 +15,7 @@ export interface DraftChangeEntry {
 export interface DraftChangesPanelProps {
     open: boolean;
     onOpenChange: (open: boolean) => void;
+    /** When set, list only pending drafts belonging to this package (Studio is package-scoped). */
+    packageId?: string | null;
 }
-export declare function DraftChangesPanel({ open, onOpenChange }: DraftChangesPanelProps): import("react").JSX.Element;
+export declare function DraftChangesPanel({ open, onOpenChange, packageId }: DraftChangesPanelProps): import("react").JSX.Element;

package/dist/preview/DraftChangesPanel.js

@@ -22,8 +22,9 @@ import { FilePlus2, FilePen, Loader2 } from 'lucide-react';
 import { Badge, Sheet, SheetContent, SheetDescription, SheetHeader, SheetTitle, } from '@object-ui/components';
 import { useObjectTranslation } from '@object-ui/i18n';
 /** Pending drafts straight from the ADR-0033 `_drafts` endpoint. */
-async function listPendingDrafts() {
-    const res = await fetch('/api/v1/meta/_drafts', {
+async function listPendingDrafts(packageId) {
+    const qs = packageId ? `?packageId=${encodeURIComponent(packageId)}` : '';
+    const res = await fetch(`/api/v1/meta/_drafts${qs}`, {
         credentials: 'include',
         headers: { Accept: 'application/json' },
         cache: 'no-store',
@@ -61,7 +62,7 @@ async function publishedNamesOf(type) {
         .map((it) => (typeof it?.name === 'string' ? it.name : null))
         .filter((n) => n !== null));
 }
-export function DraftChangesPanel({ open, onOpenChange }) {
+export function DraftChangesPanel({ open, onOpenChange, packageId }) {
     const { t } = useObjectTranslation();
     const [entries, setEntries] = useState(null);
     const [error, setError] = useState(null);
@@ -69,7 +70,7 @@ export function DraftChangesPanel({ open, onOpenChange }) {
         setEntries(null);
         setError(null);
         try {
-            const drafts = await listPendingDrafts();
+            const drafts = await listPendingDrafts(packageId);
             setEntries(drafts);
             // Classify new-vs-update per TYPE: one published-list read covers every
             // draft of that type. A type whose read fails stays unclassified
@@ -93,7 +94,7 @@ export function DraftChangesPanel({ open, onOpenChange }) {
         catch (e) {
             setError(e.message);
         }
-    }, []);
+    }, [packageId]);
     useEffect(() => {
         if (open)
             void load();

package/dist/utils/deriveRelatedLists.d.ts

@@ -9,20 +9,29 @@
  *
  * This helper scans every object for fields whose `reference`/`reference_to`
  * points back at the parent object and produces one related-list descriptor per
- * child collection. The detail page (`RecordDetailView`) feeds these into the
+ * eligible FK. The detail page (`RecordDetailView`) feeds these into the
  * `record:related_list` renderers (and the legacy `DetailView.related`).
  *
  * Rules (kept in lockstep with the relationship-level `relatedList` spec flag):
  *   - Owned children (`master_detail`) and `lookup` children are SHOWN by
  *     default. Set `relatedList: false` on the FK field to suppress a noisy
- *     association/audit link.
+ *     association/audit link; set `relatedList: 'primary'` to mark a CORE
+ *     relationship — the detail page promotes it to its own tab (the tab-vs-
+ *     Related split is decided downstream in `buildDefaultTabs`).
  *   - `relatedListTitle` / `relatedListColumns` on the FK field override the
- *     derived title / columns.
+ *     derived title / columns (columns default to the child object's own list
+ *     columns when omitted — resolved by the renderer).
  *   - Audit FKs (`created_by` / `updated_by` / `owner_id`) are skipped — they
  *     exist on virtually every object and would balloon the detail page into
  *     dozens of duplicate cards.
- *   - One related list per child object (deduped by child object name): the
- *     first non-audit, non-suppressed FK wins.
+ *   - ONE related list per eligible FK. A child may point at the parent through
+ *     MORE THAN ONE relationship (e.g. `opportunity.primary_account` +
+ *     `opportunity.partner_account`); each surfaces as its own list. When a
+ *     child appears more than once and gave no explicit `relatedListTitle`, the
+ *     FK's label is suffixed to disambiguate ("Opportunity · Partner Account").
+ *   - Self-references are allowed (e.g. `account.parent_account` → `account`):
+ *     the parent record lists the records whose self-FK points back at it
+ *     ("Child Accounts"). Suppress with `relatedList: false` if unwanted.
  *   - Owned (`master_detail`) children are ordered before plain `lookup`
  *     children, preserving discovery order within each group.
  */
@@ -39,6 +48,12 @@ export interface DerivedRelatedList {
     columns?: any[];
     /** True when the child→parent link is a `master_detail` (owned) relationship. */
     isOwned: boolean;
+    /**
+     * True when the FK declares `relatedList: 'primary'`. A prominence hint
+     * (ADR-0085): the detail page promotes this relationship to its OWN tab,
+     * while non-primary lists collapse into a single "Related" tab.
+     */
+    isPrimary: boolean;
 }
 interface ObjectLike {
     name?: string;

package/dist/utils/deriveRelatedLists.js

@@ -9,20 +9,29 @@
  *
  * This helper scans every object for fields whose `reference`/`reference_to`
  * points back at the parent object and produces one related-list descriptor per
- * child collection. The detail page (`RecordDetailView`) feeds these into the
+ * eligible FK. The detail page (`RecordDetailView`) feeds these into the
  * `record:related_list` renderers (and the legacy `DetailView.related`).
  *
  * Rules (kept in lockstep with the relationship-level `relatedList` spec flag):
  *   - Owned children (`master_detail`) and `lookup` children are SHOWN by
  *     default. Set `relatedList: false` on the FK field to suppress a noisy
- *     association/audit link.
+ *     association/audit link; set `relatedList: 'primary'` to mark a CORE
+ *     relationship — the detail page promotes it to its own tab (the tab-vs-
+ *     Related split is decided downstream in `buildDefaultTabs`).
  *   - `relatedListTitle` / `relatedListColumns` on the FK field override the
- *     derived title / columns.
+ *     derived title / columns (columns default to the child object's own list
+ *     columns when omitted — resolved by the renderer).
  *   - Audit FKs (`created_by` / `updated_by` / `owner_id`) are skipped — they
  *     exist on virtually every object and would balloon the detail page into
  *     dozens of duplicate cards.
- *   - One related list per child object (deduped by child object name): the
- *     first non-audit, non-suppressed FK wins.
+ *   - ONE related list per eligible FK. A child may point at the parent through
+ *     MORE THAN ONE relationship (e.g. `opportunity.primary_account` +
+ *     `opportunity.partner_account`); each surfaces as its own list. When a
+ *     child appears more than once and gave no explicit `relatedListTitle`, the
+ *     FK's label is suffixed to disambiguate ("Opportunity · Partner Account").
+ *   - Self-references are allowed (e.g. `account.parent_account` → `account`):
+ *     the parent record lists the records whose self-FK points back at it
+ *     ("Child Accounts"). Suppress with `relatedList: false` if unwanted.
  *   - Owned (`master_detail`) children are ordered before plain `lookup`
  *     children, preserving discovery order within each group.
  */
@@ -50,9 +59,8 @@ export function deriveRelatedLists(objectDef, objects) {
     const parentName = objectDef.name;
     const owned = [];
     const referenced = [];
-    const seenChild = new Set();
     for (const child of objects) {
-        if (!child?.name || child.name === parentName)
+        if (!child?.name)
             continue;
         for (const [fieldName, fieldDef] of fieldEntries(child.fields)) {
             if (!fieldDef)
@@ -67,15 +75,13 @@ export function deriveRelatedLists(objectDef, objects) {
             // Explicit opt-out lives on the relationship.
             if (fieldDef.relatedList === false)
                 continue;
-            // One related list per child object — the first eligible FK wins.
-            if (seenChild.has(child.name))
-                continue;
-            seenChild.add(child.name);
             const entry = {
                 childObject: child.name,
                 childLabel: child.label || child.name,
                 referenceField: fieldName,
                 isOwned: type === 'master_detail',
+                isPrimary: fieldDef.relatedList === 'primary',
+                _fkLabel: (typeof fieldDef.label === 'string' && fieldDef.label) || fieldName,
                 ...(typeof fieldDef.relatedListTitle === 'string' && fieldDef.relatedListTitle
                     ? { title: fieldDef.relatedListTitle }
                     : {}),
@@ -83,9 +89,21 @@ export function deriveRelatedLists(objectDef, objects) {
                     ? { columns: fieldDef.relatedListColumns }
                     : {}),
             };
+            // NO `break`: a child object may reference this parent through several FKs.
             (entry.isOwned ? owned : referenced).push(entry);
-            break; // move on to the next child object
         }
     }
-    return [...owned, ...referenced];
+    const all = [...owned, ...referenced];
+    // Multi-FK disambiguation: when a child object points here through more than
+    // one relationship and gave no explicit title, suffix the FK label so the two
+    // lists are distinguishable (e.g. "Opportunity · Partner Account").
+    const counts = {};
+    for (const r of all)
+        counts[r.childObject] = (counts[r.childObject] || 0) + 1;
+    return all.map(({ _fkLabel, ...rest }) => {
+        if (!rest.title && counts[rest.childObject] > 1) {
+            return { ...rest, title: `${rest.childLabel} · ${_fkLabel}` };
+        }
+        return rest;
+    });
 }

package/dist/utils/index.d.ts

@@ -1,6 +1,8 @@
 /**
  * Utility functions for ObjectStack Console
  */
+export { getRecordDisplayName, deriveTitleField, isTitleEligibleField, formatTitleTemplate as formatRecordTitle, } from '@object-ui/core';
+export type { RecordDisplayNameOptions } from '@object-ui/core';
 export { resolveRecordFormTarget, resolveFormViewLayout, } from './recordFormNavigation';
 export type { ObjectDefinitionForNavigation, RecordFormTarget, ObjectDefinitionForFormView, FormViewDefinition, FormViewModalLayout, } from './recordFormNavigation';
 export { deriveRelatedLists } from './deriveRelatedLists';
@@ -23,27 +25,3 @@ export declare function resolveI18nLabel(label: string | {
  * Preferred over CSS `capitalize` for i18n compatibility.
  */
 export declare function capitalizeFirst(str: string): string;
-/**
- * Format a record title using the titleFormat pattern.
- *
- * Accepts either a legacy string template or an Expression envelope
- * (`{ dialect: 'template', source: string }`) emitted by `@objectstack/spec`'s
- * normalized templates. The placeholder syntax (`{field}`) is identical in both
- * shapes; only the wrapping object is new.
- *
- * Empty placeholders (missing or null/empty fields) are stripped along with
- * any orphan separator they leave behind, so a template like
- *   "{full_name} - {company}"
- * evaluated against `{ company: "Acme" }` resolves to `"Acme"` rather than
- * `" - Acme"`. Returns an empty string when no placeholder resolved.
- */
-export declare function formatRecordTitle(titleFormat: string | {
-    source?: string;
-} | undefined, record: any): string;
-/**
- * Get display name for a record using titleFormat or fallback
- * @param objectDef Object definition with optional titleFormat
- * @param record The record data
- * @returns Display name for the record
- */
-export declare function getRecordDisplayName(objectDef: any, record: any): string;