@object-ui/app-shell 7.1.0 → 7.3.0

package/dist/preview/DraftPreviewBar.js

@@ -1,4 +1,4 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 /**
  * ObjectUI
  * Copyright (c) 2024-present ObjectStack Inc.
@@ -16,7 +16,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
 import { Eye, X, Rocket, GitCompareArrows } from 'lucide-react';
-import { Button } from '@object-ui/components';
+import { Button, cn } from '@object-ui/components';
 import { useObjectTranslation } from '@object-ui/i18n';
 import { usePreviewDrafts, markPreviewExit, PREVIEW_QUERY_FLAG } from './PreviewModeContext';
 import { usePublishAllDrafts } from './usePublishAllDrafts';
@@ -78,9 +78,22 @@ export function DraftPreviewBar() {
         }
         catch { /* ignore */ } }, 300);
     };
-    return (_jsxs("div", { className: "sticky top-0 z-40 flex items-center gap-3 border-b border-amber-300/70 bg-amber-50 px-4 py-2 text-sm text-amber-900 dark:border-amber-700/60 dark:bg-amber-950/40 dark:text-amber-200", "data-testid": "draft-preview-bar", children: [_jsx(Eye, { className: "h-4 w-4 shrink-0" }), _jsx("p", { className: "min-w-0 flex-1 truncate", children: t('preview.draftBar.message', {
-                    defaultValue: 'Draft preview — you are seeing unpublished changes. Nothing here is live until you publish.',
-                }) }), _jsxs(Button, { size: "sm", variant: "outline", onClick: () => setChangesOpen(true), "data-testid": "draft-preview-changes", children: [_jsx(GitCompareArrows, { className: "mr-1 h-3.5 w-3.5" }), t('preview.draftBar.changes', { defaultValue: 'Changes' }), typeof pendingCount === 'number' ? ` (${pendingCount})` : ''] }), _jsxs(Button, { size: "sm", onClick: publish, disabled: publishing, "data-testid": "draft-preview-publish", children: [_jsx(Rocket, { className: "mr-1 h-3.5 w-3.5" }), publishing
-                        ? t('preview.draftBar.publishing', { defaultValue: 'Publishing…' })
-                        : t('preview.draftBar.publish', { defaultValue: 'Publish' })] }), _jsx(DraftChangesPanel, { open: changesOpen, onOpenChange: setChangesOpen }), _jsxs(Button, { size: "sm", variant: "outline", onClick: exit, "data-testid": "draft-preview-exit", children: [_jsx(X, { className: "mr-1 h-3.5 w-3.5" }), t('preview.draftBar.exit', { defaultValue: 'Exit preview' })] })] }));
+    // Under the auto-publish posture (and any time a draft preview is opened with
+    // nothing staged) there are zero pending drafts. Claiming "nothing is live
+    // until you publish" and offering a Publish button then is both false and a
+    // no-op, so the bar drops the publish affordance and softens to a neutral
+    // preview indicator. An UNKNOWN count (null — still loading or the fetch
+    // failed) keeps the publish path: we only relax when we KNOW the count is zero.
+    const noChanges = pendingCount === 0;
+    return (_jsxs("div", { className: cn('sticky top-0 z-40 flex items-center gap-3 border-b px-4 py-2 text-sm', noChanges
+            ? 'border-slate-200 bg-slate-50 text-slate-700 dark:border-slate-700/60 dark:bg-slate-900/40 dark:text-slate-300'
+            : 'border-amber-300/70 bg-amber-50 text-amber-900 dark:border-amber-700/60 dark:bg-amber-950/40 dark:text-amber-200'), "data-testid": "draft-preview-bar", children: [_jsx(Eye, { className: "h-4 w-4 shrink-0" }), _jsx("p", { className: "min-w-0 flex-1 truncate", children: noChanges
+                    ? t('preview.draftBar.messageClean', {
+                        defaultValue: 'Draft preview — no unpublished changes; everything here is already live.',
+                    })
+                    : t('preview.draftBar.message', {
+                        defaultValue: 'Draft preview — you are seeing unpublished changes. Nothing here is live until you publish.',
+                    }) }), !noChanges && (_jsxs(_Fragment, { children: [_jsxs(Button, { size: "sm", variant: "outline", onClick: () => setChangesOpen(true), "data-testid": "draft-preview-changes", children: [_jsx(GitCompareArrows, { className: "mr-1 h-3.5 w-3.5" }), t('preview.draftBar.changes', { defaultValue: 'Changes' }), typeof pendingCount === 'number' ? ` (${pendingCount})` : ''] }), _jsxs(Button, { size: "sm", onClick: publish, disabled: publishing, "data-testid": "draft-preview-publish", children: [_jsx(Rocket, { className: "mr-1 h-3.5 w-3.5" }), publishing
+                                ? t('preview.draftBar.publishing', { defaultValue: 'Publishing…' })
+                                : t('preview.draftBar.publish', { defaultValue: 'Publish' })] }), _jsx(DraftChangesPanel, { open: changesOpen, onOpenChange: setChangesOpen })] })), _jsxs(Button, { size: "sm", variant: "outline", onClick: exit, "data-testid": "draft-preview-exit", children: [_jsx(X, { className: "mr-1 h-3.5 w-3.5" }), t('preview.draftBar.exit', { defaultValue: 'Exit preview' })] })] }));
 }

package/dist/providers/ExpressionProvider.js

@@ -20,14 +20,19 @@ import { PredicateScopeProvider } from '@object-ui/react';
 const ExprCtx = createContext(null);
 export function ExpressionProvider({ children, user = {}, app = {}, data = {}, features = {} }) {
     const value = useMemo(() => {
-        const context = { user, app, data, features };
+        // ADR-0068: expose the SAME user object under the canonical `current_user`
+        // plus the back-compat `user` alias and the server-RLS-parity `ctx.user`
+        // alias, so a predicate authored against any one form evaluates identically
+        // on client, server-formula, and server-RLS.
+        const context = { current_user: user, user, ctx: { user }, app, data, features };
         const evaluator = new ExpressionEvaluator(context);
         return { user, app, data, features, evaluator };
     }, [user, app, data, features]);
     // Also feed the predicate scope used by useCondition/useExpression in
     // @object-ui/react so action visibility predicates (e.g. on toolbar
     // buttons) can see deployment-level flags like features.multiOrgEnabled.
-    const scope = useMemo(() => ({ user, app, data, features }), [user, app, data, features]);
+    // Mirror the canonical `current_user`/`user`/`ctx.user` aliases here too.
+    const scope = useMemo(() => ({ current_user: user, user, ctx: { user }, app, data, features }), [user, app, data, features]);
     return (_jsx(ExprCtx.Provider, { value: value, children: _jsx(PredicateScopeProvider, { scope: scope, children: children }) }));
 }
 /**
@@ -39,7 +44,8 @@ export function useExpressionContext() {
     if (!ctx) {
         // Return a safe default so components can be used outside the provider
         const fallback = { user: {}, app: {}, data: {}, features: {} };
-        return { ...fallback, evaluator: new ExpressionEvaluator(fallback) };
+        const evalContext = { current_user: {}, ctx: { user: {} }, ...fallback };
+        return { ...fallback, evaluator: new ExpressionEvaluator(evalContext) };
     }
     return ctx;
 }

package/dist/utils/index.d.ts

@@ -1,8 +1,8 @@
 /**
  * Utility functions for ObjectStack Console
  */
-export { resolveRecordFormTarget, } from './recordFormNavigation';
-export type { ObjectDefinitionForNavigation, RecordFormTarget, } from './recordFormNavigation';
+export { resolveRecordFormTarget, resolveFormViewLayout, } from './recordFormNavigation';
+export type { ObjectDefinitionForNavigation, RecordFormTarget, ObjectDefinitionForFormView, FormViewDefinition, FormViewModalLayout, } from './recordFormNavigation';
 export { deriveRelatedLists } from './deriveRelatedLists';
 export type { DerivedRelatedList } from './deriveRelatedLists';
 export { preferLocal } from './preferLocal';

package/dist/utils/index.js

@@ -1,7 +1,7 @@
 /**
  * Utility functions for ObjectStack Console
  */
-export { resolveRecordFormTarget, } from './recordFormNavigation';
+export { resolveRecordFormTarget, resolveFormViewLayout, } from './recordFormNavigation';
 export { deriveRelatedLists } from './deriveRelatedLists';
 export { preferLocal } from './preferLocal';
 export { appRouteSegment, matchAppBySegment } from './appRoute';

package/dist/utils/managedByEmptyState.d.ts

@@ -32,5 +32,5 @@ export interface ManagedByEmptyState {
  * `defaultValue` used as the English fallback when a locale lacks the key).
  */
 type TranslateFn = (key: string, options?: Record<string, unknown>) => string;
-export declare function resolveManagedByEmptyState(managedBy: string | undefined | null, t: TranslateFn): ManagedByEmptyState | undefined;
+export declare function resolveManagedByEmptyState(managedBy: string | undefined | null, t: TranslateFn, objectName?: string | null): ManagedByEmptyState | undefined;
 export {};

package/dist/utils/managedByEmptyState.js

@@ -1,4 +1,4 @@
-export function resolveManagedByEmptyState(managedBy, t) {
+export function resolveManagedByEmptyState(managedBy, t, objectName) {
     switch (managedBy) {
         case 'system':
             return {
@@ -17,11 +17,29 @@ export function resolveManagedByEmptyState(managedBy, t) {
                 }),
             };
         case 'better-auth':
+            // `sys_user` is the one identity table with a concrete onboarding
+            // answer, so give it actionable guidance: teammates arrive via an
+            // org-level invite + SSO just-in-time provisioning (ADR-0024 D9), and
+            // app end-users self-register. We deliberately do NOT name the env-level
+            // "Invite User" action — it is multi-org-gated and hidden in single-org —
+            // nor a "Reset Password" toolbar action, which does not exist (cloud#580).
+            // Every other identity table (sessions, accounts, tokens, jwks,
+            // verifications, …) is written purely by auth flows, so keep the generic
+            // copy — naming an invite/signup CTA on a token list would be wrong.
+            if (objectName === 'sys_user') {
+                return {
+                    icon: 'ShieldAlert',
+                    title: t('list.managedBy.betterAuthUser.title', { defaultValue: 'No users yet' }),
+                    message: t('list.managedBy.betterAuthUser.message', {
+                        defaultValue: 'User accounts are provisioned by the authentication provider, not created here. Invite teammates to your organization and they appear automatically on first sign-in (SSO just-in-time provisioning). App end-users arrive when they sign up through your app.',
+                    }),
+                };
+            }
             return {
                 icon: 'ShieldAlert',
                 title: t('list.managedBy.betterAuth.title', { defaultValue: 'No identity records' }),
                 message: t('list.managedBy.betterAuth.message', {
-                    defaultValue: 'Identity rows are managed by the authentication provider. Use the dedicated identity workflows (Invite User, Reset Password, …) to create new entries.',
+                    defaultValue: 'These records are created by the authentication provider — through sign-in, provisioning, and security flows — not added by hand here.',
                 }),
             };
         default:

package/dist/utils/recordFormNavigation.d.ts

@@ -55,6 +55,66 @@ export declare function resolveRecordFormTarget(opts: {
         _id?: string | number;
     } | null | undefined;
 }): RecordFormTarget;
+/**
+ * Subset of the default form-view shape consumed by
+ * {@link resolveFormViewLayout}. This is the flattened `config` body of the
+ * object's default `viewKind: 'form'` ViewItem (ADR-0017), merged onto the
+ * object by `MetadataProvider` as `objectDef.form` (and mirrored under
+ * `objectDef.formViews.default` for the legacy aggregated-container shape).
+ */
+export interface FormViewDefinition {
+    /**
+     * Layout family declared by the form view (`simple` | `tabbed` | `wizard`
+     * | `split`). Only `tabbed` changes the *modal's* internal layout; the
+     * others still render their curated sections, just stacked.
+     */
+    type?: string;
+    /** Curated field sections — the selection, order, and grouping to render. */
+    sections?: any[];
+    /** Inline child collections (master-detail). */
+    subforms?: any[];
+}
+/**
+ * Object metadata subset carrying the default form view, as merged onto the
+ * runtime objects list (`useMetadata().objects`).
+ */
+export interface ObjectDefinitionForFormView {
+    form?: FormViewDefinition | null;
+    formViews?: {
+        default?: FormViewDefinition | null;
+    } | null;
+}
+/**
+ * Layout props derived from an object's default form view, ready to spread
+ * into a `<ModalForm>` schema.
+ */
+export interface FormViewModalLayout {
+    /** Curated sections to render (omitted when the form view declares none). */
+    sections?: any[];
+    /** `'tabbed'` when the form view is tabbed; omitted otherwise (stacked). */
+    contentLayout?: 'tabbed';
+    /** Inline child collections for a master-detail modal. */
+    subforms?: any[];
+}
+/**
+ * Resolve a `<ModalForm>`'s layout props from an object's DEFAULT FORM VIEW
+ * (curated sections + field selection/order, plus master-detail subforms).
+ *
+ * The create / edit record modal otherwise falls back to the raw object
+ * schema — rendering every field in schema order and ignoring the curated
+ * form view entirely. This resolver lets the New/Edit modal honor the same
+ * view-driven layout the full-screen record page (`RecordFormPage`) does.
+ *
+ * Resolution mirrors `RecordFormPage`: prefer `objectDef.form` (the default
+ * ViewItem) and fall back to `objectDef.formViews.default` (legacy container).
+ *
+ * Returns an EMPTY object when the object has no form view, or a form view
+ * that declares no sections — the caller then keeps its existing behavior
+ * (a flat field list, i.e. the raw object schema). Empty `sections` /
+ * `subforms` arrays are treated as absent so an empty curation never blanks
+ * out the form.
+ */
+export declare function resolveFormViewLayout(objectDef: ObjectDefinitionForFormView | null | undefined): FormViewModalLayout;
 /**
  * Action descriptor accepted by the navigate-create / navigate-edit
  * handlers. Loose-typed because the same shape is constructed dynamically

package/dist/utils/recordFormNavigation.js

@@ -41,6 +41,41 @@ export function resolveRecordFormTarget(opts) {
     }
     return { kind: 'page', url: `${baseUrl}/${objectDef.name}/new` };
 }
+/**
+ * Resolve a `<ModalForm>`'s layout props from an object's DEFAULT FORM VIEW
+ * (curated sections + field selection/order, plus master-detail subforms).
+ *
+ * The create / edit record modal otherwise falls back to the raw object
+ * schema — rendering every field in schema order and ignoring the curated
+ * form view entirely. This resolver lets the New/Edit modal honor the same
+ * view-driven layout the full-screen record page (`RecordFormPage`) does.
+ *
+ * Resolution mirrors `RecordFormPage`: prefer `objectDef.form` (the default
+ * ViewItem) and fall back to `objectDef.formViews.default` (legacy container).
+ *
+ * Returns an EMPTY object when the object has no form view, or a form view
+ * that declares no sections — the caller then keeps its existing behavior
+ * (a flat field list, i.e. the raw object schema). Empty `sections` /
+ * `subforms` arrays are treated as absent so an empty curation never blanks
+ * out the form.
+ */
+export function resolveFormViewLayout(objectDef) {
+    const formView = objectDef?.form ?? objectDef?.formViews?.default;
+    if (!formView)
+        return {};
+    const layout = {};
+    if (Array.isArray(formView.sections) && formView.sections.length > 0) {
+        layout.sections = formView.sections;
+        // Only 'tabbed' maps to a modal content layout; 'wizard'/'split' have no
+        // modal equivalent and degrade to a stacked section list.
+        if (formView.type === 'tabbed')
+            layout.contentLayout = 'tabbed';
+    }
+    if (Array.isArray(formView.subforms) && formView.subforms.length > 0) {
+        layout.subforms = formView.subforms;
+    }
+    return layout;
+}
 /**
  * Resolve the URL for a `navigate_create` action.
  *

package/dist/utils/resolvePageVarTokens.d.ts

@@ -0,0 +1,31 @@
+/**
+ * ObjectUI
+ * Copyright (c) 2024-present ObjectStack Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * resolvePageVarTokens — resolve `{{page.<path>}}` tokens against a page-variable
+ * snapshot. The data-entry bridge for SDUI forms: an interactive input
+ * (`element:text_input`, `element:record_picker`) writes a page variable; a
+ * submit action references it in its params/body as `{{page.<var>}}`; this
+ * resolves those tokens against the live snapshot — published into the action
+ * context by `PageVariableActionBridge` — just before the request body is built.
+ *
+ * - A WHOLE-VALUE token (`"{{page.amount}}"`) is replaced by the variable's RAW
+ *   value, preserving its type — a number stays a number, an object stays an
+ *   object — so numeric/boolean/array form fields submit with the right JSON
+ *   type rather than being stringified.
+ * - An EMBEDDED token (`"/orgs/{{page.slug}}/setup"`) is string-interpolated.
+ * - Resolution walks nested objects/arrays. A whole-value miss resolves to ''
+ *   (kept as a present-but-empty field); an embedded miss drops to ''.
+ *
+ * Distinct from the single-brace `{field}` row-record interpolation used in API
+ * target URLs (different brace count, different source) so the two never collide.
+ */
+/**
+ * Deep-resolve every `{{page.<var>}}` token in `value` against `pageVariables`.
+ * Returns `value` unchanged when there is no snapshot. Non-string leaves pass
+ * through untouched; the input is never mutated (objects/arrays are copied).
+ */
+export declare function resolvePageVarTokens<T>(value: T, pageVariables?: Record<string, any> | null): T;

package/dist/utils/resolvePageVarTokens.js

@@ -0,0 +1,72 @@
+/**
+ * ObjectUI
+ * Copyright (c) 2024-present ObjectStack Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * resolvePageVarTokens — resolve `{{page.<path>}}` tokens against a page-variable
+ * snapshot. The data-entry bridge for SDUI forms: an interactive input
+ * (`element:text_input`, `element:record_picker`) writes a page variable; a
+ * submit action references it in its params/body as `{{page.<var>}}`; this
+ * resolves those tokens against the live snapshot — published into the action
+ * context by `PageVariableActionBridge` — just before the request body is built.
+ *
+ * - A WHOLE-VALUE token (`"{{page.amount}}"`) is replaced by the variable's RAW
+ *   value, preserving its type — a number stays a number, an object stays an
+ *   object — so numeric/boolean/array form fields submit with the right JSON
+ *   type rather than being stringified.
+ * - An EMBEDDED token (`"/orgs/{{page.slug}}/setup"`) is string-interpolated.
+ * - Resolution walks nested objects/arrays. A whole-value miss resolves to ''
+ *   (kept as a present-but-empty field); an embedded miss drops to ''.
+ *
+ * Distinct from the single-brace `{field}` row-record interpolation used in API
+ * target URLs (different brace count, different source) so the two never collide.
+ */
+const WHOLE_RE = /^\s*\{\{\s*page\.([A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*)*)\s*\}\}\s*$/;
+function lookup(path, vars) {
+    let node = vars;
+    for (const seg of path.split('.')) {
+        if (node == null)
+            return undefined;
+        node = node[seg];
+    }
+    return node;
+}
+function resolveString(str, vars) {
+    if (!str.includes('{{'))
+        return str;
+    const whole = str.match(WHOLE_RE);
+    if (whole) {
+        const v = lookup(whole[1], vars);
+        return v === undefined ? '' : v;
+    }
+    // Fresh global regex per call — avoids shared `lastIndex` state.
+    return str.replace(/\{\{\s*page\.([A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*)*)\s*\}\}/g, (_m, path) => {
+        const v = lookup(path, vars);
+        return v == null ? '' : String(v);
+    });
+}
+function walk(value, vars) {
+    if (typeof value === 'string')
+        return resolveString(value, vars);
+    if (Array.isArray(value))
+        return value.map((v) => walk(v, vars));
+    if (value && typeof value === 'object') {
+        const out = {};
+        for (const [k, v] of Object.entries(value))
+            out[k] = walk(v, vars);
+        return out;
+    }
+    return value;
+}
+/**
+ * Deep-resolve every `{{page.<var>}}` token in `value` against `pageVariables`.
+ * Returns `value` unchanged when there is no snapshot. Non-string leaves pass
+ * through untouched; the input is never mutated (objects/arrays are copied).
+ */
+export function resolvePageVarTokens(value, pageVariables) {
+    if (!pageVariables)
+        return value;
+    return walk(value, pageVariables);
+}

package/dist/views/CreateViewDialog.js

@@ -18,7 +18,7 @@ import { useEffect, useMemo, useState } from 'react';
 import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle, Input, Button, cn, } from '@object-ui/components';
 import { useObjectTranslation } from '@object-ui/i18n';
 import { deriveFieldOptions, isImageLikeField, isGeoLikeField, pickPreferredField, KANBAN_GROUP_PREFERRED, PRIMARY_DATE_PREFERRED, END_DATE_PREFERRED, } from '@object-ui/plugin-view';
-import { LayoutGrid, KanbanSquare, Calendar as CalendarIcon, Image as ImageIcon, GanttChartSquare, Clock, Map as MapIcon, BarChart3, AlertCircle, } from 'lucide-react';
+import { LayoutGrid, KanbanSquare, Calendar as CalendarIcon, Image as ImageIcon, GanttChartSquare, Clock, Map as MapIcon, BarChart3, ListTree, AlertCircle, } from 'lucide-react';
 function buildViewTypeMeta(t) {
     return [
         { type: 'grid', icon: LayoutGrid, label: t('console.objectView.viewTypeGrid'), description: t('console.objectView.viewTypeGridDesc') },
@@ -29,6 +29,7 @@ function buildViewTypeMeta(t) {
         { type: 'gantt', icon: GanttChartSquare, label: t('console.objectView.viewTypeGantt'), description: t('console.objectView.viewTypeGanttDesc') },
         { type: 'map', icon: MapIcon, label: t('console.objectView.viewTypeMap'), description: t('console.objectView.viewTypeMapDesc') },
         { type: 'chart', icon: BarChart3, label: t('console.objectView.viewTypeChart'), description: t('console.objectView.viewTypeChartDesc') },
+        { type: 'tree', icon: ListTree, label: t('console.objectView.viewTypeTree'), description: t('console.objectView.viewTypeTreeDesc') },
     ];
 }
 /** Suggest a non-colliding default name like "Grid 1", "Grid 2", … */
@@ -154,6 +155,18 @@ const REQUIRED_FIELDS_BY_TYPE = {
             filter: (f) => f.type === 'number',
         },
     ],
+    tree: [
+        {
+            key: 'parentField',
+            i18nKey: 'console.objectView.parentField',
+            helpI18nKey: 'console.objectView.parentFieldHelp',
+            // Self-referencing pointer: a `tree` field, or a lookup/master_detail
+            // back to the same object. `rawType` carries the unnormalized field type.
+            filter: (f) => f.rawType === 'tree' ||
+                f.rawType === 'lookup' ||
+                f.rawType === 'master_detail',
+        },
+    ],
     // grid has no strictly required fields at create time
 };
 export function CreateViewDialog({ open, onOpenChange, onCreate, existingLabels, availableTypes, objectDef, }) {

package/dist/views/ObjectView.js

@@ -42,6 +42,8 @@ import { useRealtimeSubscription, useConflictResolution } from '@object-ui/colla
 import { ActionProvider, useNavigationOverlay, SchemaRenderer } from '@object-ui/react';
 import { toast } from 'sonner';
 import { useConsoleActionRuntime } from '../hooks/useConsoleActionRuntime';
+import { useEnvironmentEntitlements } from '../environment/useEnvironmentEntitlements';
+import { EnvironmentListToolbar } from '../environment/EnvironmentListToolbar';
 /** Map view types to Lucide icons (Airtable-style) */
 const VIEW_TYPE_ICONS = {
     grid: TableIcon,
@@ -272,6 +274,27 @@ function ObjectViewInner({ dataSource, objects, onEdit, externalRefreshKey }) {
         onRefresh: () => setRefreshKey((k) => k + 1),
     });
     const { confirmHandler, toastHandler } = actionRuntime;
+    // Environment list (sys_environment) is entitlement- + state-aware: born
+    // with one production env per org, its single `create_environment` action
+    // means different things — "Set up your production environment", "Add
+    // development environment", or an upgrade prompt — depending on org state.
+    // Resolved org-side here; the hook is a no-op for every other object.
+    const isEnvironmentList = objectDef.name === 'sys_environment';
+    const environmentEntitlements = useEnvironmentEntitlements({
+        enabled: isEnvironmentList,
+        dataSource,
+        authFetch: actionRuntime.authFetch,
+        apiBase: import.meta.env?.VITE_SERVER_URL || '',
+        refreshKey,
+    });
+    // Localized `list_toolbar` actions, shared by the generic action bar and the
+    // environment-aware toolbar (the action:bar renderer filters by location).
+    const localizedToolbarActions = useMemo(() => (objectDef.actions || []).map((a) => ({
+        ...a,
+        label: actionLabel(objectDef.name, a.name, a.label || a.name),
+        ...(a.confirmText !== undefined && { confirmText: actionConfirm(objectDef.name, a.name, a.confirmText) }),
+        ...(a.successMessage !== undefined && { successMessage: actionSuccess(objectDef.name, a.name, a.successMessage) }),
+    })), [objectDef, actionLabel, actionConfirm, actionSuccess]);
     // Resolve which generic CRUD affordances belong in the toolbar for
     // this object's lifecycle bucket (`managedBy`).  config tables show
     // New/Edit/Delete but no CSV Import; system / append-only / better-auth
@@ -1166,7 +1189,7 @@ function ObjectViewInner({ dataSource, objects, onEdit, externalRefreshKey }) {
             virtualScroll: viewDef.virtualScroll ?? listSchema.virtualScroll,
             emptyState: viewEmptyState(objectDef.name, viewDef.name || viewDef.id || '', viewDef.emptyState
                 ?? listSchema.emptyState
-                ?? resolveManagedByEmptyState(objectDef?.managedBy, t)),
+                ?? resolveManagedByEmptyState(objectDef?.managedBy, t, objectDef.name)),
             aria: viewDef.aria ?? listSchema.aria,
             // Propagate filter/sort as default filters/sort for data flow
             ...((() => {
@@ -1333,19 +1356,10 @@ function ObjectViewInner({ dataSource, objects, onEdit, externalRefreshKey }) {
                                             ? t('common.removeFromFavorites', { defaultValue: 'Remove from favorites' })
                                             : t('common.addToFavorites', { defaultValue: 'Add to favorites' }), "data-testid": `object-favorite-btn-${objectName}`, children: isFavorite(`object:${objectName}`)
                                             ? _jsx(Star, { className: "h-4 w-4 fill-amber-400 text-amber-400" })
-                                            : _jsx(StarOff, { className: "h-4 w-4" }) })), affordances.create && can(objectDef.name, 'create') && (_jsxs(Button, { size: "sm", onClick: actions.create, className: "shadow-none gap-1.5 sm:gap-2 h-8 sm:h-9", children: [_jsx(Plus, { className: "h-4 w-4" }), _jsx("span", { className: "hidden sm:inline", children: t('console.objectView.new') })] })), affordances.import && can(objectDef.name, 'create') && (_jsxs(Button, { size: "sm", variant: "outline", onClick: () => setShowImport(true), className: "hidden sm:inline-flex shadow-none gap-1.5 sm:gap-2 h-8 sm:h-9", title: t('console.objectView.importTitle'), "data-testid": "object-view-import-button", children: [_jsx(Upload, { className: "h-4 w-4" }), _jsx("span", { className: "hidden sm:inline", children: t('console.objectView.import') })] })), objectDef.actions?.some((a) => a.locations?.includes('list_toolbar')) && (_jsx(SchemaRenderer, { schema: {
+                                            : _jsx(StarOff, { className: "h-4 w-4" }) })), affordances.create && can(objectDef.name, 'create') && (_jsxs(Button, { size: "sm", onClick: actions.create, className: "shadow-none gap-1.5 sm:gap-2 h-8 sm:h-9", children: [_jsx(Plus, { className: "h-4 w-4" }), _jsx("span", { className: "hidden sm:inline", children: t('console.objectView.new') })] })), affordances.import && can(objectDef.name, 'create') && (_jsxs(Button, { size: "sm", variant: "outline", onClick: () => setShowImport(true), className: "hidden sm:inline-flex shadow-none gap-1.5 sm:gap-2 h-8 sm:h-9", title: t('console.objectView.importTitle'), "data-testid": "object-view-import-button", children: [_jsx(Upload, { className: "h-4 w-4" }), _jsx("span", { className: "hidden sm:inline", children: t('console.objectView.import') })] })), objectDef.actions?.some((a) => a.locations?.includes('list_toolbar')) && (isEnvironmentList ? (_jsx(EnvironmentListToolbar, { actions: localizedToolbarActions, entitlements: environmentEntitlements, onUpgrade: actionRuntime.openEntitlementDialog })) : (_jsx(SchemaRenderer, { schema: {
                                             type: 'action:bar',
                                             location: 'list_toolbar',
-                                            actions: (objectDef.actions || []).map((a) => ({
-                                                ...a,
-                                                label: actionLabel(objectDef.name, a.name, a.label || a.name),
-                                                ...(a.confirmText !== undefined && {
-                                                    confirmText: actionConfirm(objectDef.name, a.name, a.confirmText),
-                                                }),
-                                                ...(a.successMessage !== undefined && {
-                                                    successMessage: actionSuccess(objectDef.name, a.name, a.successMessage),
-                                                }),
-                                            })),
+                                            actions: localizedToolbarActions,
                                             size: 'sm',
                                             variant: 'outline',
                                             // On mobile, collapse all schema-driven toolbar actions
@@ -1353,7 +1367,7 @@ function ObjectViewInner({ dataSource, objects, onEdit, externalRefreshKey }) {
                                             // Import buttons stay visible without pushing the page
                                             // title off-screen.
                                             mobileMaxVisible: 0,
-                                        } }))] }) }) }), affordances.create && can(objectDef.name, 'create') && (_jsx("button", { type: "button", onClick: actions.create, className: "sm:hidden fixed right-4 bottom-36 z-40 h-12 w-12 rounded-full bg-primary text-primary-foreground shadow-lg active:scale-95 transition-transform inline-flex items-center justify-center", "aria-label": t('console.objectView.new'), "data-testid": "mobile-fab-create", children: _jsx(Plus, { className: "h-5 w-5" }) })), showImport && (_jsx(Suspense, { fallback: null, children: _jsx(ImportWizard, { open: showImport, onOpenChange: setShowImport, objectName: objectDef.name, objectLabel: objectLabel(objectDef), fields: Object.entries(objectDef.fields || {}).map(([name, def]) => ({
+                                        } })))] }) }) }), affordances.create && can(objectDef.name, 'create') && (_jsx("button", { type: "button", onClick: actions.create, className: "sm:hidden fixed right-4 bottom-36 z-40 h-12 w-12 rounded-full bg-primary text-primary-foreground shadow-lg active:scale-95 transition-transform inline-flex items-center justify-center", "aria-label": t('console.objectView.new'), "data-testid": "mobile-fab-create", children: _jsx(Plus, { className: "h-5 w-5" }) })), showImport && (_jsx(Suspense, { fallback: null, children: _jsx(ImportWizard, { open: showImport, onOpenChange: setShowImport, objectName: objectDef.name, objectLabel: objectLabel(objectDef), fields: Object.entries(objectDef.fields || {}).map(([name, def]) => ({
                                 name,
                                 label: def?.label || name,
                                 type: def?.type || 'text',

package/dist/views/metadata-admin/AssignedUsersSection.d.ts

@@ -0,0 +1,28 @@
+/**
+ * ObjectUI
+ * Copyright (c) 2024-present ObjectStack Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * AssignedUsersSection — "Manage Assignments" for a permission set.
+ *
+ * The admin's mental model is "who holds this role / AI seat" — so this is a
+ * people-first list (name + email + remove), not a raw junction table. It reads
+ * `sys_user_permission_set` for the set, resolves each `user_id` to a real
+ * person, and uses the reusable `RecordPickerDialog` to assign more. Server-side
+ * rules on the junction insert (e.g. the AI-seat cap) are caught and shown as a
+ * friendly, localized inline message — not a raw developer error.
+ *
+ * Permission-set-agnostic: every role gets the same UI, and the AI seat
+ * (`ai_seat`) is just one of them. The generic add-by-picker engine (spec
+ * RecordRelatedListProps.add) powers the capability; this is the polished
+ * surface for the high-value case.
+ */
+import * as React from 'react';
+export interface AssignedUsersSectionProps {
+    /** The permission set's machine name (e.g. `ai_seat`, `admin_full_access`). */
+    permissionSetName: string;
+}
+export declare function AssignedUsersSection({ permissionSetName }: AssignedUsersSectionProps): React.JSX.Element;
+export default AssignedUsersSection;