@object-ui/app-shell 7.1.0 → 7.2.0

package/dist/views/metadata-admin/PackagesPage.js

@@ -17,7 +17,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  */
 import * as React from 'react';
 import { Link, useLocation } from 'react-router-dom';
-import { Package as PackageIcon, Plus, RefreshCw, Search, Upload, Download, FileUp, Undo2, Power, PowerOff, ExternalLink, AlertTriangle, Trash2, } from 'lucide-react';
+import { Package as PackageIcon, Plus, RefreshCw, Search, Upload, Download, FileUp, Undo2, Power, PowerOff, ExternalLink, AlertTriangle, Trash2, Copy, Inbox, } from 'lucide-react';
 import { Button, Input, Badge, Switch, Label, Separator, Skeleton, Empty, EmptyTitle, EmptyDescription, Table, TableBody, TableCell, TableHead, TableHeader, TableRow, Sheet, SheetContent, SheetHeader, SheetTitle, SheetDescription, Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription, DialogFooter, } from '@object-ui/components';
 import { detectLocale, t, tFormat } from './i18n';
 const API = '/api/v1/packages';
@@ -65,7 +65,7 @@ function StatusBadge({ pkg }) {
 /* -------------------------------------------------------------------------- */
 const ID_RE = /^[a-z0-9][a-z0-9._-]{1,254}$/i;
 const VERSION_RE = /^\d+\.\d+\.\d+$/;
-function CreatePackageDialog({ open, onOpenChange, onCreated, }) {
+export function CreatePackageDialog({ open, onOpenChange, onCreated, }) {
     const locale = React.useMemo(() => detectLocale(), []);
     const [id, setId] = React.useState('');
     const [name, setName] = React.useState('');
@@ -242,10 +242,13 @@ function PackageDetailSheet({ pkg, appBase, open, onOpenChange, onChanged, }) {
         const ok = window.confirm(tFormat('engine.packages.detail.deleteConfirm', locale, { name: pkg?.manifest.name || id }));
         if (!ok)
             return;
+        // ADR-0070 D4 (Q3) — let the user keep records (delete structure only).
+        const alsoData = window.confirm(t('engine.packages.detail.deleteKeepData', locale));
+        const qs = alsoData ? '' : '?keepData=true';
         setBusy('delete');
         setMsg(null);
         try {
-            await apiJson(`${API}/${encodeURIComponent(id)}`, { method: 'DELETE' });
+            await apiJson(`${API}/${encodeURIComponent(id)}${qs}`, { method: 'DELETE' });
             onChanged();
             onOpenChange(false);
         }
@@ -256,6 +259,48 @@ function PackageDetailSheet({ pkg, appBase, open, onOpenChange, onChanged, }) {
             setBusy(null);
         }
     };
+    // ADR-0070 D4 — duplicate this base into a NEW writable package (re-namespaced).
+    const duplicateApp = async () => {
+        const target = window.prompt(t('engine.packages.detail.duplicatePrompt', locale), `${id}-copy`);
+        if (!target || !target.trim())
+            return;
+        setBusy('duplicate');
+        setMsg(null);
+        try {
+            await apiJson(`${API}/${encodeURIComponent(id)}/duplicate`, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({ targetPackageId: target.trim(), targetName: `${pkg?.manifest.name ?? id} (copy)` }),
+            });
+            setMsg({ kind: 'ok', text: t('engine.packages.detail.duplicated', locale) });
+            onChanged();
+        }
+        catch (e) {
+            setMsg({ kind: 'err', text: e?.message ?? 'Duplicate failed' });
+        }
+        finally {
+            setBusy(null);
+        }
+    };
+    // ADR-0070 D5 — adopt every package-less (loose) item in this env INTO this base.
+    const adoptOrphans = async () => {
+        const ok = window.confirm(tFormat('engine.packages.detail.adoptConfirm', locale, { name: pkg?.manifest.name || id }));
+        if (!ok)
+            return;
+        setBusy('adopt');
+        setMsg(null);
+        try {
+            await apiJson(`${API}/${encodeURIComponent(id)}/adopt-orphans`, { method: 'POST' });
+            setMsg({ kind: 'ok', text: t('engine.packages.detail.adopted', locale) });
+            onChanged();
+        }
+        catch (e) {
+            setMsg({ kind: 'err', text: e?.message ?? 'Adopt failed' });
+        }
+        finally {
+            setBusy(null);
+        }
+    };
     const toggleEnable = () => run('toggle', () => apiJson(`${API}/${encodeURIComponent(id)}/${enabled ? 'disable' : 'enable'}`, {
         method: 'PATCH',
     }), enabled ? t('engine.packages.detail.disabled', locale) : t('engine.packages.detail.enabled', locale));
@@ -277,7 +322,7 @@ function PackageDetailSheet({ pkg, appBase, open, onOpenChange, onChanged, }) {
                                                     ? t('engine.packages.detail.publishing', locale)
                                                     : tFormat('engine.packages.detail.publishApp', locale, { count: drafts.length })] }), _jsxs(Button, { size: "sm", variant: "outline", onClick: discardDrafts, disabled: !!busy, children: [_jsx(Undo2, { className: "mr-1.5 h-3.5 w-3.5" }), busy === 'discard-drafts'
                                                     ? t('engine.packages.detail.discarding', locale)
-                                                    : tFormat('engine.packages.detail.discardChanges', locale, { count: drafts.length })] })] })), _jsx("ul", { className: "space-y-1", children: drafts.map((d) => (_jsx("li", { children: _jsxs(Link, { to: `${appBase}/metadata/${encodeURIComponent(d.type)}/${encodeURIComponent(d.name)}?review=1`, className: "inline-flex items-center gap-1.5 text-sm text-primary hover:underline", onClick: () => onOpenChange(false), children: [_jsx(FileUp, { className: "h-3.5 w-3.5" }), _jsx("span", { className: "font-mono text-xs", children: d.type }), _jsx("span", { className: "text-muted-foreground", children: "\u00B7" }), d.name] }) }, `${d.type}/${d.name}`))) })] })] })), _jsx(Separator, { className: "my-4" }), isKernel ? (_jsx("p", { className: "text-sm text-muted-foreground", children: t('engine.packages.detail.kernelReadOnly', locale) })) : (_jsxs("div", { className: "space-y-2", children: [_jsx("p", { className: "text-xs font-medium uppercase tracking-wide text-muted-foreground", children: t('engine.packages.detail.actions', locale) }), _jsxs("div", { className: "flex flex-wrap gap-2", children: [_jsxs(Button, { size: "sm", onClick: publish, disabled: !!busy, children: [_jsx(Upload, { className: "mr-1.5 h-3.5 w-3.5" }), busy === 'publish' ? t('engine.packages.detail.publishing', locale) : t('engine.packages.detail.publish', locale)] }), _jsxs(Button, { size: "sm", variant: "outline", onClick: revert, disabled: !!busy, children: [_jsx(Undo2, { className: "mr-1.5 h-3.5 w-3.5" }), t('engine.packages.detail.revert', locale)] }), _jsxs(Button, { size: "sm", variant: "outline", onClick: toggleEnable, disabled: !!busy, children: [enabled ? (_jsx(PowerOff, { className: "mr-1.5 h-3.5 w-3.5" })) : (_jsx(Power, { className: "mr-1.5 h-3.5 w-3.5" })), enabled ? t('engine.packages.detail.disable', locale) : t('engine.packages.detail.enable', locale)] }), _jsxs(Button, { size: "sm", variant: "outline", onClick: exportPkg, disabled: !!busy, children: [_jsx(Download, { className: "mr-1.5 h-3.5 w-3.5" }), busy === 'export' ? t('engine.packages.detail.exporting', locale) : t('engine.packages.detail.export', locale)] }), _jsxs(Button, { size: "sm", variant: "outline", onClick: deleteApp, disabled: !!busy, className: "text-destructive hover:bg-destructive/10 hover:text-destructive", children: [_jsx(Trash2, { className: "mr-1.5 h-3.5 w-3.5" }), busy === 'delete' ? t('engine.packages.detail.deleting', locale) : t('engine.packages.detail.deleteApp', locale)] })] })] })), msg && (_jsx("div", { className: `mt-4 rounded-md border p-2 text-sm ${msg.kind === 'ok'
+                                                    : tFormat('engine.packages.detail.discardChanges', locale, { count: drafts.length })] })] })), _jsx("ul", { className: "space-y-1", children: drafts.map((d) => (_jsx("li", { children: _jsxs(Link, { to: `${appBase}/metadata/${encodeURIComponent(d.type)}/${encodeURIComponent(d.name)}?review=1`, className: "inline-flex items-center gap-1.5 text-sm text-primary hover:underline", onClick: () => onOpenChange(false), children: [_jsx(FileUp, { className: "h-3.5 w-3.5" }), _jsx("span", { className: "font-mono text-xs", children: d.type }), _jsx("span", { className: "text-muted-foreground", children: "\u00B7" }), d.name] }) }, `${d.type}/${d.name}`))) })] })] })), _jsx(Separator, { className: "my-4" }), isKernel ? (_jsx("p", { className: "text-sm text-muted-foreground", children: t('engine.packages.detail.kernelReadOnly', locale) })) : (_jsxs("div", { className: "space-y-2", children: [_jsx("p", { className: "text-xs font-medium uppercase tracking-wide text-muted-foreground", children: t('engine.packages.detail.actions', locale) }), _jsxs("div", { className: "flex flex-wrap gap-2", children: [_jsxs(Button, { size: "sm", onClick: publish, disabled: !!busy, children: [_jsx(Upload, { className: "mr-1.5 h-3.5 w-3.5" }), busy === 'publish' ? t('engine.packages.detail.publishing', locale) : t('engine.packages.detail.publish', locale)] }), _jsxs(Button, { size: "sm", variant: "outline", onClick: revert, disabled: !!busy, children: [_jsx(Undo2, { className: "mr-1.5 h-3.5 w-3.5" }), t('engine.packages.detail.revert', locale)] }), _jsxs(Button, { size: "sm", variant: "outline", onClick: toggleEnable, disabled: !!busy, children: [enabled ? (_jsx(PowerOff, { className: "mr-1.5 h-3.5 w-3.5" })) : (_jsx(Power, { className: "mr-1.5 h-3.5 w-3.5" })), enabled ? t('engine.packages.detail.disable', locale) : t('engine.packages.detail.enable', locale)] }), _jsxs(Button, { size: "sm", variant: "outline", onClick: exportPkg, disabled: !!busy, children: [_jsx(Download, { className: "mr-1.5 h-3.5 w-3.5" }), busy === 'export' ? t('engine.packages.detail.exporting', locale) : t('engine.packages.detail.export', locale)] }), _jsxs(Button, { size: "sm", variant: "outline", onClick: duplicateApp, disabled: !!busy, children: [_jsx(Copy, { className: "mr-1.5 h-3.5 w-3.5" }), busy === 'duplicate' ? t('engine.packages.detail.duplicating', locale) : t('engine.packages.detail.duplicate', locale)] }), _jsxs(Button, { size: "sm", variant: "outline", onClick: adoptOrphans, disabled: !!busy, children: [_jsx(Inbox, { className: "mr-1.5 h-3.5 w-3.5" }), busy === 'adopt' ? t('engine.packages.detail.adopting', locale) : t('engine.packages.detail.adoptOrphans', locale)] }), _jsxs(Button, { size: "sm", variant: "outline", onClick: deleteApp, disabled: !!busy, className: "text-destructive hover:bg-destructive/10 hover:text-destructive", children: [_jsx(Trash2, { className: "mr-1.5 h-3.5 w-3.5" }), busy === 'delete' ? t('engine.packages.detail.deleting', locale) : t('engine.packages.detail.deleteApp', locale)] })] })] })), msg && (_jsx("div", { className: `mt-4 rounded-md border p-2 text-sm ${msg.kind === 'ok'
                         ? 'border-emerald-500/40 bg-emerald-500/10 text-emerald-700 dark:text-emerald-400'
                         : 'border-destructive/40 bg-destructive/10 text-destructive'}`, children: msg.text }))] }) }));
 }

package/dist/views/metadata-admin/PermissionMatrixEditor.js

@@ -47,6 +47,7 @@ import { PageShell } from './PageShell';
 import { useMetadataClient, useMetadataTypes } from './useMetadata';
 import { resolveResourceConfig } from './registry';
 import { t as translate, detectLocale } from './i18n';
+import { AssignedUsersSection } from './AssignedUsersSection';
 function getObjectActions(locale) {
     return [
         { key: 'allowCreate', short: 'C', tip: translate('perm.action.create', locale) },
@@ -264,7 +265,7 @@ export function PermissionMatrixEditPage({ type, name }) {
     if (loading) {
         return (_jsx(PageShell, { entry: entry, itemName: name, children: _jsxs("div", { className: "p-6 text-sm text-muted-foreground flex items-center gap-2", children: [_jsx(Loader2, { className: "h-4 w-4 animate-spin" }), " ", t('perm.loading').replace('{name}', name)] }) }));
     }
-    return (_jsxs(PageShell, { entry: entry ?? { type, label: type }, itemName: name, subtitle: draft.isProfile ? t('perm.subtitle.profile') : t('perm.subtitle.set'), stats: stats, actions: _jsxs(_Fragment, { children: [_jsxs(Button, { variant: "ghost", size: "sm", onClick: () => navigate(`./history?type=${encodeURIComponent(type)}`), children: [_jsx(HistoryIcon, { className: "h-4 w-4 mr-1" }), " ", t('engine.edit.history')] }), writable && (_jsxs(Button, { size: "sm", onClick: () => doSave(false), disabled: saving, children: [saving ? (_jsx(Loader2, { className: "h-4 w-4 mr-1 animate-spin" })) : (_jsx(Save, { className: "h-4 w-4 mr-1" })), t('engine.edit.save')] }))] }), children: [_jsxs("div", { className: "flex flex-col h-full overflow-hidden", children: [error && (_jsxs("div", { className: "m-4 rounded-md border border-destructive/40 bg-destructive/5 p-3 text-sm text-destructive flex items-start gap-2", children: [_jsx(AlertTriangle, { className: "h-4 w-4 mt-0.5 shrink-0" }), _jsx("span", { children: error })] })), _jsxs("div", { className: "px-6 py-3 border-b bg-muted/30 flex flex-wrap items-end gap-4", children: [_jsxs("div", { className: "space-y-1", children: [_jsx(Label, { htmlFor: "perm-name", className: "text-xs", children: t('perm.field.name') }), _jsx(Input, { id: "perm-name", value: draft.name, disabled: !writable, onChange: (e) => setDraft((p) => ({ ...p, name: e.target.value })), className: "h-8 w-56" })] }), _jsxs("div", { className: "space-y-1", children: [_jsx(Label, { htmlFor: "perm-label", className: "text-xs", children: t('perm.field.label') }), _jsx(Input, { id: "perm-label", value: draft.label ?? '', disabled: !writable, onChange: (e) => setDraft((p) => ({ ...p, label: e.target.value })), className: "h-8 w-72" })] }), _jsxs("div", { className: "flex items-center gap-2 pb-1", children: [_jsx(Switch, { id: "perm-is-profile", checked: !!draft.isProfile, disabled: !writable, onCheckedChange: (v) => setDraft((p) => ({ ...p, isProfile: !!v })) }), _jsx(Label, { htmlFor: "perm-is-profile", className: "text-xs", children: t('perm.field.isProfile') })] }), !writable && (_jsx(Badge, { variant: "secondary", className: "ml-auto", children: t('perm.readOnly') }))] }), _jsxs("div", { className: "px-6 py-3 border-b flex items-center gap-3", children: [_jsx(Input, { placeholder: t('perm.filter.placeholder'), value: filter, onChange: (e) => setFilter(e.target.value), className: "h-8 w-72" }), _jsxs("div", { className: "flex items-center gap-2", children: [_jsx(Switch, { id: "only-enabled", checked: showOnlyEnabled, onCheckedChange: (v) => setShowOnlyEnabled(!!v) }), _jsx(Label, { htmlFor: "only-enabled", className: "text-xs", children: t('perm.filter.onlyGranted') })] }), _jsxs("span", { className: "text-xs text-muted-foreground ml-auto", children: [filteredObjects.length, " / ", objects.length, " ", t('perm.stat.objectsSuffix')] })] }), _jsx("div", { className: "flex-1 overflow-auto", children: _jsx(PermissionTable, { objects: filteredObjects, draft: draft, expanded: expanded, fieldsByObject: fieldsByObject, writable: writable, objectActions: OBJECT_ACTIONS, t: t, onToggleExpand: toggleExpand, onObjectPerm: updateObjectPerm, onFieldPerm: updateFieldPerm, onBulkSet: bulkSetObject }) })] }), _jsx(Dialog, { open: !!destructive, onOpenChange: (open) => !open && setDestructive(null), children: _jsxs(DialogContent, { children: [_jsxs(DialogHeader, { children: [_jsxs(DialogTitle, { className: "flex items-center gap-2", children: [_jsx(AlertTriangle, { className: "h-4 w-4 text-amber-500" }), " ", t('engine.edit.destructive')] }), _jsx(DialogDescription, { children: t('engine.edit.destructiveHint') })] }), _jsx("ul", { className: "text-sm space-y-1 max-h-64 overflow-auto", children: destructive?.issues.map((i, idx) => (_jsxs("li", { className: "border-l-2 border-amber-500 pl-2", children: [i.kind && _jsx(Badge, { variant: "outline", className: "mr-2", children: i.kind }), i.message ?? JSON.stringify(i)] }, idx))) }), _jsxs(DialogFooter, { children: [_jsx(Button, { variant: "ghost", onClick: () => setDestructive(null), children: t('engine.cancel') }), _jsxs(Button, { variant: "destructive", onClick: () => destructive && doSave(true, destructive.pending), disabled: saving, children: [saving && _jsx(Loader2, { className: "h-4 w-4 mr-1 animate-spin" }), t('engine.edit.forceSave')] })] })] }) })] }));
+    return (_jsxs(PageShell, { entry: entry ?? { type, label: type }, itemName: name, subtitle: draft.isProfile ? t('perm.subtitle.profile') : t('perm.subtitle.set'), stats: stats, actions: _jsxs(_Fragment, { children: [_jsxs(Button, { variant: "ghost", size: "sm", onClick: () => navigate(`./history?type=${encodeURIComponent(type)}`), children: [_jsx(HistoryIcon, { className: "h-4 w-4 mr-1" }), " ", t('engine.edit.history')] }), writable && (_jsxs(Button, { size: "sm", onClick: () => doSave(false), disabled: saving, children: [saving ? (_jsx(Loader2, { className: "h-4 w-4 mr-1 animate-spin" })) : (_jsx(Save, { className: "h-4 w-4 mr-1" })), t('engine.edit.save')] }))] }), children: [_jsxs("div", { className: "flex flex-col h-full overflow-hidden", children: [error && (_jsxs("div", { className: "m-4 rounded-md border border-destructive/40 bg-destructive/5 p-3 text-sm text-destructive flex items-start gap-2", children: [_jsx(AlertTriangle, { className: "h-4 w-4 mt-0.5 shrink-0" }), _jsx("span", { children: error })] })), _jsxs("div", { className: "px-6 py-3 border-b bg-muted/30 flex flex-wrap items-end gap-4", children: [_jsxs("div", { className: "space-y-1", children: [_jsx(Label, { htmlFor: "perm-name", className: "text-xs", children: t('perm.field.name') }), _jsx(Input, { id: "perm-name", value: draft.name, disabled: !writable, onChange: (e) => setDraft((p) => ({ ...p, name: e.target.value })), className: "h-8 w-56" })] }), _jsxs("div", { className: "space-y-1", children: [_jsx(Label, { htmlFor: "perm-label", className: "text-xs", children: t('perm.field.label') }), _jsx(Input, { id: "perm-label", value: draft.label ?? '', disabled: !writable, onChange: (e) => setDraft((p) => ({ ...p, label: e.target.value })), className: "h-8 w-72" })] }), _jsxs("div", { className: "flex items-center gap-2 pb-1", children: [_jsx(Switch, { id: "perm-is-profile", checked: !!draft.isProfile, disabled: !writable, onCheckedChange: (v) => setDraft((p) => ({ ...p, isProfile: !!v })) }), _jsx(Label, { htmlFor: "perm-is-profile", className: "text-xs", children: t('perm.field.isProfile') })] }), !writable && (_jsx(Badge, { variant: "secondary", className: "ml-auto", children: t('perm.readOnly') }))] }), _jsxs("div", { className: "px-6 py-3 border-b flex items-center gap-3", children: [_jsx(Input, { placeholder: t('perm.filter.placeholder'), value: filter, onChange: (e) => setFilter(e.target.value), className: "h-8 w-72" }), _jsxs("div", { className: "flex items-center gap-2", children: [_jsx(Switch, { id: "only-enabled", checked: showOnlyEnabled, onCheckedChange: (v) => setShowOnlyEnabled(!!v) }), _jsx(Label, { htmlFor: "only-enabled", className: "text-xs", children: t('perm.filter.onlyGranted') })] }), _jsxs("span", { className: "text-xs text-muted-foreground ml-auto", children: [filteredObjects.length, " / ", objects.length, " ", t('perm.stat.objectsSuffix')] })] }), _jsx("div", { className: "flex-1 overflow-auto", children: _jsx(PermissionTable, { objects: filteredObjects, draft: draft, expanded: expanded, fieldsByObject: fieldsByObject, writable: writable, objectActions: OBJECT_ACTIONS, t: t, onToggleExpand: toggleExpand, onObjectPerm: updateObjectPerm, onFieldPerm: updateFieldPerm, onBulkSet: bulkSetObject }) }), _jsx("div", { className: "shrink-0 border-t max-h-80 overflow-auto bg-background", children: _jsx(AssignedUsersSection, { permissionSetName: name }) })] }), _jsx(Dialog, { open: !!destructive, onOpenChange: (open) => !open && setDestructive(null), children: _jsxs(DialogContent, { children: [_jsxs(DialogHeader, { children: [_jsxs(DialogTitle, { className: "flex items-center gap-2", children: [_jsx(AlertTriangle, { className: "h-4 w-4 text-amber-500" }), " ", t('engine.edit.destructive')] }), _jsx(DialogDescription, { children: t('engine.edit.destructiveHint') })] }), _jsx("ul", { className: "text-sm space-y-1 max-h-64 overflow-auto", children: destructive?.issues.map((i, idx) => (_jsxs("li", { className: "border-l-2 border-amber-500 pl-2", children: [i.kind && _jsx(Badge, { variant: "outline", className: "mr-2", children: i.kind }), i.message ?? JSON.stringify(i)] }, idx))) }), _jsxs(DialogFooter, { children: [_jsx(Button, { variant: "ghost", onClick: () => setDestructive(null), children: t('engine.cancel') }), _jsxs(Button, { variant: "destructive", onClick: () => destructive && doSave(true, destructive.pending), disabled: saving, children: [saving && _jsx(Loader2, { className: "h-4 w-4 mr-1 animate-spin" }), t('engine.edit.forceSave')] })] })] }) })] }));
 }
 function PermissionTable({ objects, draft, expanded, fieldsByObject, writable, objectActions, t, onToggleExpand, onObjectPerm, onFieldPerm, onBulkSet, }) {
     return (_jsxs("table", { className: "w-full text-sm", children: [_jsx("thead", { className: "sticky top-0 bg-background border-b z-10", children: _jsxs("tr", { children: [_jsx("th", { className: "text-left px-4 py-2 font-medium w-72", children: t('perm.col.object') }), objectActions.map((a) => (_jsx("th", { className: "px-2 py-2 font-medium text-center w-14", title: a.tip, children: a.short }, a.key))), _jsx("th", { className: "px-2 py-2 font-medium w-44 text-right", children: t('perm.col.bulk') })] }) }), _jsxs("tbody", { children: [objects.length === 0 && (_jsx("tr", { children: _jsx("td", { colSpan: objectActions.length + 2, className: "px-4 py-8 text-center text-muted-foreground", children: t('perm.filter.empty') }) })), objects.map((o) => {

package/dist/views/metadata-admin/ResourceEditPage.js

@@ -49,6 +49,7 @@ import { detectLocale, t, tFormat, translateValidationMessage } from './i18n';
 import { JsonSourceEditor } from './JsonSourceEditor';
 import { validateMetadataDraft, hasClientValidator } from './clientValidation';
 import { describeIssuePath } from './issuePath';
+import { buildCreateModeBody } from './createBody';
 // react-resizable-panels' `direction` prop type does not always narrow
 // cleanly in our TS config; cast at the boundary (precedent:
 // packages/components/src/custom/navigation-overlay.tsx).
@@ -311,6 +312,25 @@ function MetadataResourceEditPageImpl({ type, name, createMode, embedded, }) {
     // Issues to DISPLAY (banner + inline). Suppressed on a pristine create form
     // so a blank new item doesn't open covered in required-field errors.
     const displayIssues = React.useMemo(() => (createMode && !createDirty ? [] : issues), [createMode, createDirty, issues]);
+    // Server-computed diagnostics handed to a canvas Preview (e.g. the flow
+    // Problems panel + on-canvas badges). Errors prefer the live client-side Zod
+    // issues when a client validator exists (so they track every keystroke);
+    // warnings stay server-sourced. Mirrors the read-only banner's source
+    // selection, flattened to a path-keyed, severity-tagged list.
+    const previewDiagnostics = React.useMemo(() => {
+        const diag = layered?._diagnostics;
+        const errs = hasClientValidator(type)
+            ? displayIssues.map((i) => ({ path: i.path, message: translateValidationMessage(i.message, locale) }))
+            : (diag?.errors ?? []).map((i) => ({ path: i.path, message: translateValidationMessage(i.message, locale) }));
+        const warns = (diag?.warnings ?? []).map((i) => ({
+            path: i.path,
+            message: translateValidationMessage(i.message, locale),
+        }));
+        return [
+            ...errs.map((e) => ({ path: e.path || undefined, message: e.message, severity: 'error' })),
+            ...warns.map((w) => ({ path: w.path || undefined, message: w.message, severity: 'warning' })),
+        ];
+    }, [layered, displayIssues, type, locale]);
     // Per-item draft pending publish (mode=draft saves land here).
     // When non-null, the editor is "viewing the draft" and we surface
     // Publish / Discard-draft actions.
@@ -853,10 +873,14 @@ function MetadataResourceEditPageImpl({ type, name, createMode, embedded, }) {
             // or `{ list: { data: { object } } }` for view) is present so
             // the saved body satisfies its JSONSchema. User-supplied values
             // always win over the defaults.
+            // Prefer the server's authoritative create seed (from /meta/types — the
+            // single source of truth in @objectstack/spec) over the locally hardcoded
+            // createDefaults, so the create shape can't drift from the spec's required
+            // fields (the dashboard-`layout` / action-`body` 422 family). `createSeed`
+            // is a runtime field absent from the bundled GetMetaTypes type, hence the cast.
+            const specCreateSeed = entry?.createSeed;
             let builtBody = createMode
-                ? (config.createBuildBody
-                    ? config.createBuildBody(draft)
-                    : { ...(config.createDefaults ?? {}), ...draft })
+                ? buildCreateModeBody(config, draft, specCreateSeed)
                 // Edit mode: serialise the editor draft back to the wire shape
                 // (inverse of `toDraft` — e.g. `view` folds the `{ list | form }`
                 // family key back into the ViewItem `config` wrapper).
@@ -958,6 +982,14 @@ function MetadataResourceEditPageImpl({ type, name, createMode, embedded, }) {
                 setDestructiveIssues(Array.isArray(i) ? i : []);
                 setPendingItem(draft);
             }
+            // ADR-0070 D1/D3 — the kernel rejects authoring into a read-only
+            // code/installed package (`writable_package_required`, also HTTP 422,
+            // so this MUST precede the generic invalid_metadata branch below).
+            // Surface an actionable message guiding the author to pick or create a
+            // writable base rather than mangling it into phantom field issues.
+            else if (err?.code === 'writable_package_required') {
+                setError(t('engine.package.writableRequired', locale));
+            }
             // Map schema validation → inline field errors.
             else if (err?.status === 422 || err?.code === 'invalid_metadata' || err?.code === 'invalid_payload') {
                 const i = err?.body?.issues ?? [];
@@ -1448,7 +1480,7 @@ function MetadataResourceEditPageImpl({ type, name, createMode, embedded, }) {
                                                                                 ? t('engine.edit.exitFullscreen', locale)
                                                                                 : t('engine.edit.fullscreen', locale), children: isFullscreen ? (_jsx(Minimize2, { className: "h-3.5 w-3.5" })) : (_jsx(Maximize2, { className: "h-3.5 w-3.5" })) })] })] }), _jsx("div", { className: "flex-1 min-h-0 overflow-auto p-4 bg-[radial-gradient(circle_at_1px_1px,theme(colors.border)_1px,transparent_0)] [background-size:16px_16px] bg-muted/30", children: _jsx(PreviewComponent, { type: type, name: name, draft: draft, baseline: !createMode
                                                                     ? (layered?.effective ?? undefined)
-                                                                    : undefined, editing: editing && !previewOnly, selection: previewOnly ? null : selection, onSelectionChange: setSelection, locale: locale, onPatch: (patch) => handleDraftChange((d) => ({ ...d, ...patch })) }) })] }) }), _jsx(ResizableHandle, { withHandle: true, className: inspectorCollapsed
+                                                                    : undefined, editing: editing && !previewOnly, selection: previewOnly ? null : selection, onSelectionChange: setSelection, locale: locale, diagnostics: previewDiagnostics, onPatch: (patch) => handleDraftChange((d) => ({ ...d, ...patch })) }) })] }) }), _jsx(ResizableHandle, { withHandle: true, className: inspectorCollapsed
                                                     ? 'hidden'
                                                     : 'w-1.5 bg-border/40 hover:bg-primary/40 active:bg-primary/60 transition-colors' }), _jsx(ResizablePanel, { panelRef: inspectorPanelRef, defaultSize: lastInspectorSizeRef.current, minSize: 22, collapsible: true, collapsedSize: 0, onResize: (size) => {
                                                     const pct = size.asPercentage;

package/dist/views/metadata-admin/ResourceListPage.js

@@ -21,10 +21,11 @@ import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue, } from '
 import { Empty, EmptyTitle, EmptyDescription } from '@object-ui/components';
 import { PageShell } from './PageShell';
 import { MetadataTypeActions } from './MetadataTypeActions';
+import { CreatePackageDialog } from './PackagesPage';
 import { useMetadataClient, useMetadataTypes, matchesQuery, } from './useMetadata';
 import { getMetadataResource, resolveResourceConfig, } from './registry';
 import { t, tFormat, translateMetadataType, detectLocale } from './i18n';
-import { buildPackageScopeOptions, LOCAL_PACKAGE_ID } from './package-scope';
+import { buildPackageScopeOptions, LOCAL_PACKAGE_ID, isLocalScope } from './package-scope';
 /**
  * Derive provenance from item._packageId. The `loadMetaFromDb` path
  * tags objects with the synthetic packageId 'sys_metadata' (see
@@ -184,6 +185,22 @@ function DefaultMetadataList({ type, appName }) {
     const pkgSuffix = activePackage
         ? `?package=${encodeURIComponent(activePackage)}`
         : '';
+    // ADR-0070 D3 — never start a create that would orphan the item. When a real
+    // writable base exists, create into it (defaulting away from the Local/null
+    // scope); when none exists yet, prompt to create a base first.
+    const [showCreateBase, setShowCreateBase] = React.useState(false);
+    const handleCreate = React.useCallback(() => {
+        const realBases = (projectPackages ?? []).filter((p) => !isLocalScope(p.id));
+        if (projectPackages !== null && realBases.length === 0) {
+            setShowCreateBase(true);
+            return;
+        }
+        if (realBases.length > 0 && (!activePackage || isLocalScope(activePackage))) {
+            navigate(`./new?package=${encodeURIComponent(realBases[0].id)}`);
+            return;
+        }
+        navigate(`./new${pkgSuffix}`);
+    }, [projectPackages, activePackage, pkgSuffix, navigate]);
     React.useEffect(() => {
         let cancelled = false;
         setLoading(true);
@@ -295,14 +312,14 @@ function DefaultMetadataList({ type, appName }) {
                     },
                 ]
                 : []),
-        ], actions: _jsxs(_Fragment, { children: [_jsx(MetadataTypeActions, { entry: entry, location: "list_toolbar", onAfter: () => setRefreshKey((k) => k + 1) }), _jsx(Button, { variant: "ghost", size: "sm", onClick: () => setRefreshKey((k) => k + 1), title: t('engine.list.refresh', locale), children: _jsx(RefreshCw, { className: "h-4 w-4" }) }), (entry?.allowOrgOverride || entry?.allowRuntimeCreate) && (_jsxs(Button, { size: "sm", variant: config.createFields ? 'default' : 'outline', onClick: () => navigate(`./new${pkgSuffix}`), title: config.createFields
+        ], actions: _jsxs(_Fragment, { children: [_jsx(MetadataTypeActions, { entry: entry, location: "list_toolbar", onAfter: () => setRefreshKey((k) => k + 1) }), _jsx(Button, { variant: "ghost", size: "sm", onClick: () => setRefreshKey((k) => k + 1), title: t('engine.list.refresh', locale), children: _jsx(RefreshCw, { className: "h-4 w-4" }) }), (entry?.allowOrgOverride || entry?.allowRuntimeCreate) && (_jsxs(Button, { size: "sm", variant: config.createFields ? 'default' : 'outline', onClick: handleCreate, title: config.createFields
                         ? tFormat('engine.list.createHint', locale, { type: typeLabel })
-                        : undefined, children: [_jsx(Plus, { className: "h-4 w-4 mr-1" }), t('engine.list.create', locale)] }))] }), children: _jsxs("div", { className: "p-6 space-y-4", children: [_jsxs("div", { className: "flex items-center gap-3 flex-wrap", children: [_jsxs("div", { className: "relative flex-1 min-w-[200px] max-w-md", children: [_jsx(Search, { className: "absolute left-2.5 top-1/2 -translate-y-1/2 h-3.5 w-3.5 text-muted-foreground" }), _jsx(Input, { className: "pl-8", placeholder: t('engine.list.search', locale), value: query, onChange: (e) => setQuery(e.target.value) })] }), _jsxs(Select, { value: sourceFilter, onValueChange: setSourceFilter, children: [_jsx(SelectTrigger, { className: "w-[180px]", children: _jsx(SelectValue, {}) }), _jsxs(SelectContent, { children: [_jsxs(SelectItem, { value: "all", children: [t('engine.list.allSources', locale), " (", sourceCounts.all, ")"] }), _jsxs(SelectItem, { value: "artifact", children: [t('engine.list.source.artifact', locale), " (", sourceCounts.artifact, ")"] }), _jsxs(SelectItem, { value: "runtime", children: [t('engine.list.source.runtime', locale), " (", sourceCounts.runtime, ")"] })] })] })] }), (loading || projectPackages === null) && (_jsxs("div", { className: "text-sm text-muted-foreground", children: [t('engine.edit.loading', locale), " ", type, "\u2026"] })), error && (_jsx("div", { className: "text-sm text-destructive border border-destructive/30 rounded p-3 bg-destructive/5", children: error })), !loading && !error && projectPackages !== null && projectPackages.length === 0 && (_jsxs(Empty, { children: [_jsx(EmptyTitle, { children: "No project packages installed" }), _jsx(EmptyDescription, { children: "Studio only shows metadata that belongs to a project software package. Install or create a project package to manage its metadata here." })] })), !loading && !error && projectPackages !== null && projectPackages.length > 0 && filtered.length === 0 && (_jsxs(Empty, { children: [_jsx(EmptyTitle, { children: scopedItems.length === 0
+                        : undefined, children: [_jsx(Plus, { className: "h-4 w-4 mr-1" }), t('engine.list.create', locale)] }))] }), children: _jsxs("div", { className: "p-6 space-y-4", children: [_jsx(CreatePackageDialog, { open: showCreateBase, onOpenChange: setShowCreateBase, onCreated: (id) => navigate(`./new?package=${encodeURIComponent(id)}`) }), _jsxs("div", { className: "flex items-center gap-3 flex-wrap", children: [_jsxs("div", { className: "relative flex-1 min-w-[200px] max-w-md", children: [_jsx(Search, { className: "absolute left-2.5 top-1/2 -translate-y-1/2 h-3.5 w-3.5 text-muted-foreground" }), _jsx(Input, { className: "pl-8", placeholder: t('engine.list.search', locale), value: query, onChange: (e) => setQuery(e.target.value) })] }), _jsxs(Select, { value: sourceFilter, onValueChange: setSourceFilter, children: [_jsx(SelectTrigger, { className: "w-[180px]", children: _jsx(SelectValue, {}) }), _jsxs(SelectContent, { children: [_jsxs(SelectItem, { value: "all", children: [t('engine.list.allSources', locale), " (", sourceCounts.all, ")"] }), _jsxs(SelectItem, { value: "artifact", children: [t('engine.list.source.artifact', locale), " (", sourceCounts.artifact, ")"] }), _jsxs(SelectItem, { value: "runtime", children: [t('engine.list.source.runtime', locale), " (", sourceCounts.runtime, ")"] })] })] })] }), (loading || projectPackages === null) && (_jsxs("div", { className: "text-sm text-muted-foreground", children: [t('engine.edit.loading', locale), " ", type, "\u2026"] })), error && (_jsx("div", { className: "text-sm text-destructive border border-destructive/30 rounded p-3 bg-destructive/5", children: error })), !loading && !error && projectPackages !== null && projectPackages.length === 0 && (_jsxs(Empty, { children: [_jsx(EmptyTitle, { children: "No project packages installed" }), _jsx(EmptyDescription, { children: "Studio only shows metadata that belongs to a project software package. Install or create a project package to manage its metadata here." })] })), !loading && !error && projectPackages !== null && projectPackages.length > 0 && filtered.length === 0 && (_jsxs(Empty, { children: [_jsx(EmptyTitle, { children: scopedItems.length === 0
                                 ? tFormat('engine.list.emptyType', locale, { type: typeLabel })
                                 : tFormat('engine.list.emptyQuery', locale, { query }) }), _jsx(EmptyDescription, { children: config.emptyStateHint ??
                                 (entry?.allowOrgOverride || entry?.allowRuntimeCreate
                                     ? tFormat('engine.list.createHint', locale, { type: typeLabel })
-                                    : t('engine.list.readOnlyHint', locale)) }), scopedItems.length === 0 && (entry?.allowOrgOverride || entry?.allowRuntimeCreate) && (_jsx("div", { className: "mt-4", children: _jsxs(Button, { onClick: () => navigate(`./new${pkgSuffix}`), children: [_jsx(Plus, { className: "h-4 w-4 mr-1" }), t('engine.list.create', locale)] }) }))] })), !loading && filtered.length > 0 && (_jsx("div", { className: "border rounded-lg overflow-hidden", children: _jsxs("table", { className: "w-full text-sm", children: [_jsx("thead", { className: "bg-muted/40 text-xs uppercase tracking-wider text-muted-foreground", children: _jsxs("tr", { children: [columns.map((c) => (_jsx("th", { className: "px-3 py-2 text-left font-medium", style: c.width ? { width: c.width } : undefined, children: localizeColumnLabel(c) }, c.key))), _jsx("th", { className: "px-3 py-2 text-right font-medium w-[80px]", children: t('engine.list.col.source', locale) })] }) }), _jsx("tbody", { className: "divide-y", children: filtered.map((row, i) => {
+                                    : t('engine.list.readOnlyHint', locale)) }), scopedItems.length === 0 && (entry?.allowOrgOverride || entry?.allowRuntimeCreate) && (_jsx("div", { className: "mt-4", children: _jsxs(Button, { onClick: handleCreate, children: [_jsx(Plus, { className: "h-4 w-4 mr-1" }), t('engine.list.create', locale)] }) }))] })), !loading && filtered.length > 0 && (_jsx("div", { className: "border rounded-lg overflow-hidden", children: _jsxs("table", { className: "w-full text-sm", children: [_jsx("thead", { className: "bg-muted/40 text-xs uppercase tracking-wider text-muted-foreground", children: _jsxs("tr", { children: [columns.map((c) => (_jsx("th", { className: "px-3 py-2 text-left font-medium", style: c.width ? { width: c.width } : undefined, children: localizeColumnLabel(c) }, c.key))), _jsx("th", { className: "px-3 py-2 text-right font-medium w-[80px]", children: t('engine.list.col.source', locale) })] }) }), _jsx("tbody", { className: "divide-y", children: filtered.map((row, i) => {
                                     const pk = config.primaryKey ?? 'name';
                                     const name = String(row.item[pk] ?? `(unnamed-${i})`);
                                     // ADR-0048 — link to this row's OWNING package so the editor

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

@@ -0,0 +1,26 @@
+/**
+ * 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.
+ */
+import type { MetadataResourceConfig } from './registry';
+/**
+ * Build the create-mode save body for a new metadata item.
+ *
+ * Prefers the server's authoritative **create seed** (delivered per type on the
+ * `/meta/types` registry entry — the single source of truth in
+ * `@objectstack/spec`) over the locally hardcoded `createDefaults`. This is the
+ * drift-stop for the recurring "the designer emits a minimal shape the spec
+ * rejects, so create→save 422s" family (dashboard `layout`, action `body`):
+ * the structural defaults now come from the same place the spec validates
+ * against, so they cannot diverge. Falls back to `createDefaults` when the
+ * server provides no seed (older server, or canvas-create types whose shape is
+ * built interactively).
+ *
+ * User-supplied draft values always win over the seed's placeholders.
+ * `createBuildBody` (dynamic identity, e.g. a view's qualified name) still takes
+ * precedence — it incorporates user input the static seed cannot.
+ */
+export declare function buildCreateModeBody(config: Pick<MetadataResourceConfig, 'createBuildBody' | 'createDefaults'>, draft: Record<string, unknown>, specCreateSeed: Record<string, unknown> | undefined): Record<string, unknown>;

package/dist/views/metadata-admin/createBody.js

@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+/**
+ * Build the create-mode save body for a new metadata item.
+ *
+ * Prefers the server's authoritative **create seed** (delivered per type on the
+ * `/meta/types` registry entry — the single source of truth in
+ * `@objectstack/spec`) over the locally hardcoded `createDefaults`. This is the
+ * drift-stop for the recurring "the designer emits a minimal shape the spec
+ * rejects, so create→save 422s" family (dashboard `layout`, action `body`):
+ * the structural defaults now come from the same place the spec validates
+ * against, so they cannot diverge. Falls back to `createDefaults` when the
+ * server provides no seed (older server, or canvas-create types whose shape is
+ * built interactively).
+ *
+ * User-supplied draft values always win over the seed's placeholders.
+ * `createBuildBody` (dynamic identity, e.g. a view's qualified name) still takes
+ * precedence — it incorporates user input the static seed cannot.
+ */
+export function buildCreateModeBody(config, draft, specCreateSeed) {
+    if (config.createBuildBody) {
+        return config.createBuildBody(draft);
+    }
+    return { ...(specCreateSeed ?? config.createDefaults ?? {}), ...draft };
+}

package/dist/views/metadata-admin/i18n.js

@@ -182,6 +182,7 @@ const ENGINE_STRINGS_EN = {
     'engine.list.allSources': 'All sources',
     'engine.list.allPackages': 'All packages',
     'engine.package.local': 'Local / Custom (this env)',
+    'engine.package.writableRequired': 'Pick or create a writable base (package) first — this item cannot be authored into a read-only code package.',
     'engine.list.packageFilter': 'Package',
     'engine.list.source.artifact': 'Artifact',
     'engine.list.source.runtime': 'Runtime',
@@ -599,6 +600,15 @@ const ENGINE_STRINGS_EN = {
     'engine.packages.detail.disabled': 'Package disabled.',
     'engine.packages.detail.enabled': 'Package enabled.',
     'engine.packages.detail.exported': 'Package exported.',
+    'engine.packages.detail.duplicate': 'Duplicate',
+    'engine.packages.detail.duplicating': 'Duplicating…',
+    'engine.packages.detail.duplicatePrompt': 'New package id for the duplicate (a fresh writable base):',
+    'engine.packages.detail.duplicated': 'Package duplicated into a new base.',
+    'engine.packages.detail.adoptOrphans': 'Adopt loose items',
+    'engine.packages.detail.adopting': 'Adopting…',
+    'engine.packages.detail.adoptConfirm': 'Move all package-less (loose) metadata in this environment INTO "{name}"? This rebinds orphaned items to this base.',
+    'engine.packages.detail.adopted': 'Loose items adopted into this base.',
+    'engine.packages.detail.deleteKeepData': 'Delete the DATA too?\n\nOK = also drop all records (destructive). Cancel = keep records, delete only the structure.',
     'engine.quickfind.placeholder': "Find metadata types or items… (try 'view', 'account')",
     'engine.quickfind.empty': 'Type to search across all metadata types.',
     'engine.quickfind.title': 'Quick Find',
@@ -798,6 +808,7 @@ const ENGINE_STRINGS_EN = {
     'designer.canvas.askAiGenerate': 'Generate fields with AI',
 };
 const ENGINE_STRINGS_ZH = {
+    'engine.package.writableRequired': '请先选择或新建一个可写的基座（package）——只读的代码包中无法新建该项。',
     'engine.directory.title': '元数据',
     'engine.directory.description': '平台协议共暴露 {count} 个元数据类型（其中 {writable} 个支持运行时覆盖）。点击任意卡片即可浏览、覆盖或创建实例。',
     'engine.directory.search': '搜索元数据类型…',
@@ -1284,6 +1295,15 @@ const ENGINE_STRINGS_ZH = {
     'engine.packages.detail.disabled': '软件包已禁用。',
     'engine.packages.detail.enabled': '软件包已启用。',
     'engine.packages.detail.exported': '软件包已导出。',
+    'engine.packages.detail.duplicate': '复制',
+    'engine.packages.detail.duplicating': '复制中…',
+    'engine.packages.detail.duplicatePrompt': '副本的新软件包 id（一个全新的可写基座）：',
+    'engine.packages.detail.duplicated': '软件包已复制为新基座。',
+    'engine.packages.detail.adoptOrphans': '收编散落项',
+    'engine.packages.detail.adopting': '收编中…',
+    'engine.packages.detail.adoptConfirm': '把本环境中所有无软件包（散落）的元数据移动到 "{name}" 吗？这会把孤儿项重新绑定到此基座。',
+    'engine.packages.detail.adopted': '散落项已收编进此基座。',
+    'engine.packages.detail.deleteKeepData': '同时删除数据吗？\n\n确定 = 同时删除所有记录（破坏性）。取消 = 保留记录，仅删除结构。',
     'engine.quickfind.placeholder': '搜索元数据类型或条目…（如：view、account）',
     'engine.quickfind.empty': '输入关键字以搜索所有元数据类型。',
     'engine.quickfind.title': '快速查找',

package/dist/views/metadata-admin/inspectors/DatasetDefaultInspector.d.ts

@@ -18,4 +18,12 @@
  */
 import * as React from 'react';
 import type { MetadataDefaultInspectorProps } from '../default-inspector-registry';
+/**
+ * Patch for a base-object change. A dataset's joins (`include`), `dimensions`,
+ * `measures`, and `filter` all reference the OLD object's fields, so a real
+ * object change re-bases the dataset and clears them — preventing stale field
+ * refs from silently producing broken/ambiguous queries. Selecting the SAME
+ * object is a no-op (only sets `object`).
+ */
+export declare function objectChangePatch(next: string, current: string): Record<string, unknown>;
 export declare function DatasetDefaultInspector({ draft, onPatch, readOnly, name }: MetadataDefaultInspectorProps): React.JSX.Element;

package/dist/views/metadata-admin/inspectors/DatasetDefaultInspector.js

@@ -123,11 +123,13 @@ function MeasureFormatField({ measure, onPatch, disabled }) {
     const sample = formatMeasure(kind === 'percent' ? 0.1234 : 1234.5, measure.format, measure.currency);
     return (_jsxs("div", { className: "space-y-1.5", children: [_jsxs("div", { className: "grid grid-cols-2 gap-1.5", children: [_jsx(InspectorSelectField, { label: "Display format", value: kind, options: FORMAT_KIND_OPTIONS, onCommit: (v) => apply(v, decimals, currency), disabled: disabled }), kind !== 'raw' && (_jsx(InspectorSelectField, { label: "Decimals", value: String(decimals), options: DECIMALS_OPTIONS, onCommit: (v) => apply(kind, parseInt(v, 10) || 0, currency), disabled: disabled }))] }), kind === 'currency' && (_jsx(InspectorSelectField, { label: "Currency", value: currency, options: CURRENCY_OPTIONS, onCommit: (v) => apply(kind, decimals, v), disabled: disabled })), kind !== 'raw' && (_jsxs("p", { className: "text-[10px] text-muted-foreground", children: ["Sample: ", _jsx("span", { className: "font-mono tabular-nums", children: sample })] }))] }));
 }
-/** The relationship prefix of a `relationship.field` path that isn't yet in `include`, else null. */
+/** The relationship PATH of a `relationship[.relationship].field` reference (all
+ *  segments but the final column) that isn't yet in `include`, else null. ADR-0071
+ *  multi-hop: `account.owner.region` → `account.owner`. */
 function missingRelationship(field, include) {
     if (!field || !field.includes('.'))
         return null;
-    const rel = field.split('.')[0];
+    const rel = field.slice(0, field.lastIndexOf('.'));
     return rel && !include.includes(rel) ? rel : null;
 }
 /** Inline author-time warning: a `relationship.field` whose join isn't declared in `include`. */
@@ -146,6 +148,18 @@ function DatasetFilterField({ label, help, value, onCommit, fields, disabled })
     const count = group.conditions.length;
     return (_jsxs("div", { className: "space-y-1", children: [_jsx(Label, { className: "text-xs text-muted-foreground", children: label }), !representable ? (_jsxs("p", { className: "rounded-md border border-dashed bg-muted/30 px-2.5 py-1.5 text-[11px] text-muted-foreground", children: ["Advanced filter (nested / OR) \u2014 edit it in the ", _jsx("span", { className: "font-medium", children: "Source" }), " tab."] })) : (_jsxs(Popover, { children: [_jsx(PopoverTrigger, { asChild: true, children: _jsxs(Button, { type: "button", variant: "outline", size: "sm", disabled: disabled, className: "h-8 w-full justify-between text-xs font-normal", children: [_jsx("span", { className: "truncate text-left", children: count ? `${count} condition${count === 1 ? '' : 's'}` : _jsx("span", { className: "text-muted-foreground", children: "+ Add filter\u2026" }) }), _jsx(ChevronDown, { className: "h-3.5 w-3.5 opacity-60 shrink-0" })] }) }), _jsx(PopoverContent, { align: "start", className: "w-[440px] max-w-[90vw] p-3", children: fields.length === 0 ? (_jsx("p", { className: "text-xs text-muted-foreground", children: "Pick a base object to add filter conditions." })) : (_jsx(FilterBuilder, { fields: fields, value: group, onChange: (g) => onCommit(groupToCondition(g)) })) })] })), help && _jsx("p", { className: "text-[10px] text-muted-foreground", children: help })] }));
 }
+/**
+ * Patch for a base-object change. A dataset's joins (`include`), `dimensions`,
+ * `measures`, and `filter` all reference the OLD object's fields, so a real
+ * object change re-bases the dataset and clears them — preventing stale field
+ * refs from silently producing broken/ambiguous queries. Selecting the SAME
+ * object is a no-op (only sets `object`).
+ */
+export function objectChangePatch(next, current) {
+    if (next === current)
+        return { object: next };
+    return { object: next, include: [], dimensions: [], measures: [], filter: undefined };
+}
 export function DatasetDefaultInspector({ draft, onPatch, readOnly, name }) {
     const label = typeof draft.label === 'string' ? draft.label : '';
     const description = typeof draft.description === 'string' ? draft.description : '';
@@ -203,7 +217,7 @@ export function DatasetDefaultInspector({ draft, onPatch, readOnly, name }) {
                     if (createMode && !nameTouched.current)
                         patch.name = toFieldName(v);
                     onPatch(patch);
-                }, disabled: readOnly }), _jsx(InspectorTextField, { label: "Description", value: description, onCommit: (v) => onPatch({ description: v }), disabled: readOnly }), _jsx(InspectorComboField, { label: "Base object", value: object, onCommit: (v) => onPatch({ object: v }), options: objectComboOptions, loading: objectsLoading, placeholder: "Select an object\u2026", searchPlaceholder: "Search objects\u2026", disabled: readOnly, mono: true }), _jsxs("div", { className: "border-t pt-3 space-y-1.5", children: [_jsx(SectionHeader, { title: "Included relationships", count: include.length, addLabel: "Add", onAdd: readOnly ? undefined : () => onPatch({ include: appendArray(include, '') }) }), include.length === 0 ? (_jsxs("p", { className: "rounded-md border border-dashed bg-muted/30 px-3 py-2 text-center text-[11px] text-muted-foreground", children: ["No joins. Add a relationship (a lookup field on ", _jsx("code", { children: baseLabel || 'the base object' }), ") to use ", _jsx("code", { children: "relationship.field" }), " dimensions/measures."] })) : (include.map((rel, i) => (_jsxs("div", { className: "flex items-center gap-1.5", children: [_jsx(InspectorComboField, { value: rel, onCommit: (v) => onPatch({ include: include.map((r, idx) => (idx === i ? v : r)) }), options: relationshipComboOptions, loading: catalogLoading, placeholder: "Select a relationship\u2026", searchPlaceholder: "Search relationships\u2026", disabled: readOnly, mono: true }), !readOnly && (_jsx(Button, { type: "button", variant: "ghost", size: "sm", className: "h-7 w-7 shrink-0 p-0", onClick: () => onPatch({ include: spliceArray(include, i, null) }), "aria-label": "Remove relationship", children: _jsx(X, { className: "h-3.5 w-3.5" }) }))] }, i)))), object && include.length > 0 && (_jsxs("div", { className: "flex flex-wrap items-center gap-x-1 gap-y-0.5 pt-0.5 text-[10px] text-muted-foreground", children: [_jsx("span", { className: "font-mono font-medium", children: baseLabel }), include.map((rel, i) => {
+                }, disabled: readOnly }), _jsx(InspectorTextField, { label: "Description", value: description, onCommit: (v) => onPatch({ description: v }), disabled: readOnly }), _jsx(InspectorComboField, { label: "Base object", value: object, onCommit: (v) => onPatch(objectChangePatch(v, object)), options: objectComboOptions, loading: objectsLoading, placeholder: "Select an object\u2026", searchPlaceholder: "Search objects\u2026", disabled: readOnly, mono: true }), object && (dimensions.length > 0 || measures.length > 0 || include.length > 0 || !!datasetFilter) && (_jsx("p", { className: "text-[10px] text-muted-foreground", children: "Changing the base object clears its dimensions, measures, joins & filters." })), _jsxs("div", { className: "border-t pt-3 space-y-1.5", children: [_jsx(SectionHeader, { title: "Included relationships", count: include.length, addLabel: "Add", onAdd: readOnly ? undefined : () => onPatch({ include: appendArray(include, '') }) }), include.length === 0 ? (_jsxs("p", { className: "rounded-md border border-dashed bg-muted/30 px-3 py-2 text-center text-[11px] text-muted-foreground", children: ["No joins. Add a relationship (a lookup field on ", _jsx("code", { children: baseLabel || 'the base object' }), ") to use ", _jsx("code", { children: "relationship.field" }), " dimensions/measures."] })) : (include.map((rel, i) => (_jsxs("div", { className: "flex items-center gap-1.5", children: [_jsx(InspectorComboField, { value: rel, onCommit: (v) => onPatch({ include: include.map((r, idx) => (idx === i ? v : r)) }), options: relationshipComboOptions, loading: catalogLoading, placeholder: "Select a relationship\u2026", searchPlaceholder: "Search relationships\u2026", disabled: readOnly, mono: true }), !readOnly && (_jsx(Button, { type: "button", variant: "ghost", size: "sm", className: "h-7 w-7 shrink-0 p-0", onClick: () => onPatch({ include: spliceArray(include, i, null) }), "aria-label": "Remove relationship", children: _jsx(X, { className: "h-3.5 w-3.5" }) }))] }, i)))), object && include.length > 0 && (_jsxs("div", { className: "flex flex-wrap items-center gap-x-1 gap-y-0.5 pt-0.5 text-[10px] text-muted-foreground", children: [_jsx("span", { className: "font-mono font-medium", children: baseLabel }), include.map((rel, i) => {
                                 const r = relationships.find((x) => x.name === rel);
                                 return (_jsxs("span", { className: "inline-flex items-center gap-1", children: [_jsx(ArrowRight, { className: "h-3 w-3 opacity-60" }), _jsxs("span", { className: "font-mono", children: [rel, r?.referenceTo ? ` (${r.referenceTo})` : ''] })] }, i));
                             })] }))] }), _jsx("div", { className: "border-t pt-3", children: _jsx(DatasetFilterField, { label: "Scope filter", help: "Intrinsic scope, ANDed into every query (e.g. exclude soft-deleted records).", value: datasetFilter, onCommit: (fc) => onPatch({ filter: fc }), fields: filterFields, disabled: readOnly }) }), _jsxs("div", { className: "border-t pt-3 space-y-2", children: [_jsx(SectionHeader, { title: "Dimensions", count: dimensions.length, addLabel: "Add dimension", onAdd: readOnly ? undefined : () => onPatch({ dimensions: appendArray(dimensions, { name: '', field: '', type: 'string' }) }) }), dimensions.map((d, i) => (_jsxs("div", { className: "rounded-md border p-2 space-y-1.5", children: [_jsxs("div", { className: "flex items-center justify-between", children: [_jsxs("span", { className: "text-[11px] font-medium text-muted-foreground", children: ["Dimension ", i + 1] }), !readOnly && (_jsx(Button, { type: "button", variant: "ghost", size: "sm", "aria-label": "Remove dimension", title: "Remove dimension", className: "h-6 w-6 shrink-0 p-0 text-muted-foreground hover:text-destructive", onClick: () => onPatch({ dimensions: spliceArray(dimensions, i, null) }), children: _jsx(Trash2, { className: "h-3.5 w-3.5" }) }))] }), _jsx(InspectorTextField, { label: "Name", value: d.name ?? '', onCommit: (v) => patchDimension(i, { name: v }), placeholder: "e.g. region", disabled: readOnly, mono: true }), _jsx(InspectorComboField, { label: "Field", value: d.field ?? '', onCommit: (v) => pickDimensionField(i, v), options: fieldComboOptions, loading: catalogLoading, placeholder: "field or relationship.field", searchPlaceholder: "Search fields\u2026", disabled: readOnly, mono: true }), (() => { const rel = missingRelationship(d.field, include); return rel ? _jsx(RelWarning, { rel: rel, disabled: readOnly, onAdd: () => onPatch({ include: appendArray(include, rel) }) }) : null; })(), _jsx(InspectorSelectField, { label: "Type", value: d.type, options: DIMENSION_TYPE_OPTIONS, onCommit: (v) => patchDimension(i, { type: v }), disabled: readOnly }), _jsxs(Advanced, { children: [_jsx(InspectorTextField, { label: "Label (optional)", value: d.label ?? '', onCommit: (v) => patchDimension(i, { label: v || undefined }), placeholder: d.name || 'Display label', disabled: readOnly }), d.type === 'date' && (_jsx(InspectorSelectField, { label: "Date bucket", value: d.dateGranularity ?? '', options: DATE_GRANULARITY_OPTIONS, onCommit: (v) => patchDimension(i, { dateGranularity: v || undefined }), disabled: readOnly }))] })] }, i)))] }), _jsxs("div", { className: "border-t pt-3 space-y-2", children: [_jsx(SectionHeader, { title: "Measures", count: measures.length, addLabel: "Add measure", onAdd: readOnly ? undefined : () => onPatch({ measures: appendArray(measures, { name: '', aggregate: 'sum', field: '' }) }) }), measures.map((m, i) => {

package/dist/views/metadata-admin/inspectors/FlowEdgeInspector.js

@@ -4,6 +4,9 @@ import { InspectorShell, InspectorTextField, InspectorSelectField, InspectorChec
 import { Label } from '@object-ui/components';
 import { edgeKey, conditionText } from '../previews/flow-canvas-layout';
 import { validateExpressionClient } from './expression-validate';
+import { useFlowScope } from './useFlowScope';
+import { VariableTextInput } from './VariableTextInput';
+import { findUnknownRefs, scopeRoots, describeUnknownRefs } from './flow-ref-check';
 /** Read-only display of an edge endpoint (source / target node id). */
 function EndpointRow({ label, value }) {
     return (_jsxs("div", { className: "space-y-1", children: [_jsx(Label, { className: "text-xs text-muted-foreground", children: label }), _jsx("div", { className: "flex h-8 items-center rounded border bg-muted/30 px-2 font-mono text-sm text-muted-foreground", children: value })] }));
@@ -12,6 +15,9 @@ export function FlowEdgeInspector({ selection, draft, onPatch, onClearSelection,
     const edges = Array.isArray(draft.edges) ? draft.edges : [];
     const index = edges.findIndex((e, i) => edgeKey(e, i) === selection.id);
     const edge = index >= 0 ? edges[index] : null;
+    // References available on this edge are those in scope at its SOURCE node
+    // (#1934). Called unconditionally — `edge?.source` is undefined when missing.
+    const { groups: scopeGroups } = useFlowScope(draft, edge?.source);
     if (!edge) {
         return (_jsx(InspectorShell, { kindLabel: t('engine.inspector.flowEdge.kind', locale), title: selection.label ?? selection.id, onClose: onClearSelection, closeLabel: t('engine.inspector.flowEdge.close', locale), children: _jsx(InspectorEmptyState, { message: t('engine.inspector.flowEdge.missing', locale) }) }));
     }
@@ -109,11 +115,19 @@ export function FlowEdgeInspector({ selection, draft, onPatch, onClearSelection,
                 // Picking a branch writes the matching label; "Custom" keeps the
                 // free-text label the author typed below.
                 onCommit: (v) => { if (v)
-                    patchEdge({ label: v }); }, disabled: readOnly })), _jsx(InspectorTextField, { label: t('engine.inspector.flowEdge.label', locale), value: edge.label ?? '', onCommit: (v) => patchEdge({ label: v }), placeholder: t('engine.inspector.flowEdge.labelHint', locale), disabled: readOnly || isDefault }), _jsx(InspectorTextField, { label: t('engine.inspector.flowEdge.condition', locale), value: conditionText(edge.condition) ?? '', onCommit: (v) => patchEdge({ condition: v || undefined }), placeholder: t('engine.inspector.flowEdge.conditionHint', locale), disabled: readOnly || isDefault, mono: true }), (() => {
+                    patchEdge({ label: v }); }, disabled: readOnly })), _jsx(InspectorTextField, { label: t('engine.inspector.flowEdge.label', locale), value: edge.label ?? '', onCommit: (v) => patchEdge({ label: v }), placeholder: t('engine.inspector.flowEdge.labelHint', locale), disabled: readOnly || isDefault }), _jsxs("div", { className: "space-y-1", children: [_jsx(Label, { className: "text-xs text-muted-foreground", children: t('engine.inspector.flowEdge.condition', locale) }), _jsx(VariableTextInput, { mode: "expression", mono: true, value: conditionText(edge.condition) ?? '', onValueChange: (v) => patchEdge({ condition: v || undefined }), groups: scopeGroups, placeholder: t('engine.inspector.flowEdge.conditionHint', locale), disabled: readOnly || isDefault })] }), (() => {
                 // ADR-0032 — flag a malformed edge guard (e.g. `{record.x}` brace-in-CEL)
                 // inline, with the same corrective message as build/agent validation.
                 const issue = isDefault ? null : validateExpressionClient('predicate', edge.condition);
-                return issue ? (_jsx("p", { className: "text-[11px] leading-snug text-destructive", role: "alert", children: issue.message })) : null;
+                if (issue) {
+                    return (_jsx("p", { className: "text-[11px] leading-snug text-destructive", role: "alert", children: issue.message }));
+                }
+                // #1934 — gentle scope-aware "unknown reference" warning (refs in scope
+                // at the edge's SOURCE node), once the guard is structurally valid.
+                const unknown = isDefault
+                    ? []
+                    : findUnknownRefs(conditionText(edge.condition), 'predicate', scopeRoots(scopeGroups.flatMap((g) => g.refs)));
+                return unknown.length > 0 ? (_jsx("p", { className: "text-[11px] leading-snug text-amber-600 dark:text-amber-400", role: "note", children: describeUnknownRefs(unknown) })) : null;
             })(), _jsx(InspectorCheckboxField, { label: t('engine.inspector.flowEdge.isDefault', locale), value: isDefault, 
                 // The default ("else") branch is taken when no other guard matches, so
                 // it carries neither a condition nor a branch label — clear both.

package/dist/views/metadata-admin/inspectors/FlowExprIssue.d.ts

@@ -0,0 +1,21 @@
+/**
+ * FlowExprIssue — the shared inline validation line for an expression / template
+ * value in the flow inspector (#1934). Renders, in precedence order:
+ *   1. an ADR-0032 brace/shape ERROR (red) — CEL fields only; a genuine template
+ *      uses single-brace `{var}` legally, so the brace check never runs there;
+ *   2. else a scope-aware "unknown reference" WARNING (amber) — a referenced
+ *      root not in scope at the node, with a "did you mean?" hint.
+ * Returns null when the value is clean (or scope is unknown). Used by the picker
+ * repeater cells (decision Branches, screen visibleWhen, key/value values) that
+ * carry the picker but otherwise had no inline validation.
+ */
+import * as React from 'react';
+import { type ExprFieldRole } from './expression-validate';
+import type { ScopeGroup } from './useFlowScope';
+export interface FlowExprIssueProps {
+    value: unknown;
+    /** `'predicate'` / `'value'` → CEL (brace-checked); `'template'` → `{…}` holes. */
+    role: ExprFieldRole;
+    scopeGroups?: ScopeGroup[];
+}
+export declare function FlowExprIssue({ value, role, scopeGroups }: FlowExprIssueProps): React.ReactElement | null;

package/dist/views/metadata-admin/inspectors/FlowExprIssue.js

@@ -0,0 +1,13 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { validateExpressionClient } from './expression-validate';
+import { findUnknownRefs, scopeRoots, describeUnknownRefs } from './flow-ref-check';
+export function FlowExprIssue({ value, role, scopeGroups }) {
+    // Brace / shape error — CEL roles only (single-brace is valid in a template).
+    const issue = role === 'template' ? null : validateExpressionClient(role, value);
+    if (issue) {
+        return (_jsx("p", { className: "text-[11px] leading-snug text-destructive", role: "alert", children: issue.message }));
+    }
+    const roots = scopeGroups && scopeGroups.length > 0 ? scopeRoots(scopeGroups.flatMap((g) => g.refs)) : null;
+    const unknown = roots ? findUnknownRefs(value, role, roots) : [];
+    return unknown.length > 0 ? (_jsx("p", { className: "text-[11px] leading-snug text-amber-600 dark:text-amber-400", role: "note", children: describeUnknownRefs(unknown) })) : null;
+}

package/dist/views/metadata-admin/inspectors/FlowKeyValueField.d.ts

@@ -15,10 +15,26 @@
  *    rows take precedence).
  */
 import * as React from 'react';
+import type { ScopeGroup } from './useFlowScope';
+export interface Row {
+    id: string;
+    key: string;
+    /** Display string for the value cell. */
+    raw: string;
+}
+/**
+ * Read the stored value as `[key, value]` entries, accepting BOTH shapes a
+ * key/value config field can hold: the common object map (`{ var: value }`) and
+ * the assignment-node ARRAY form (`[{ variable|name|key, value }]`). The shape
+ * is preserved on write (see {@link rowsToValue}).
+ */
+export declare function toEntries(value: unknown): Array<[string, unknown]>;
+/** Flush rows back to the SAME shape, skipping empty/duplicate keys (first wins). */
+export declare function rowsToValue(rows: Row[], arrayShape: boolean): Record<string, unknown> | Array<Record<string, unknown>>;
 export interface FlowKeyValueFieldProps {
     label: string;
     value: unknown;
-    onCommit: (value: Record<string, unknown> | undefined) => void;
+    onCommit: (value: Record<string, unknown> | Array<Record<string, unknown>> | undefined) => void;
     disabled?: boolean;
     help?: string;
     addLabel: string;
@@ -26,5 +42,7 @@ export interface FlowKeyValueFieldProps {
     valueLabel: string;
     removeLabel: string;
     emptyLabel: string;
+    /** In-scope variable references for the data-picker (#1934). */
+    scopeGroups?: ScopeGroup[];
 }
-export declare function FlowKeyValueField({ label, value, onCommit, disabled, help, addLabel, keyLabel, valueLabel, removeLabel, emptyLabel, }: FlowKeyValueFieldProps): React.JSX.Element;
+export declare function FlowKeyValueField({ label, value, onCommit, disabled, help, addLabel, keyLabel, valueLabel, removeLabel, emptyLabel, scopeGroups, }: FlowKeyValueFieldProps): React.JSX.Element;