@object-ui/app-shell 7.1.0 → 7.3.0

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;

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

@@ -20,6 +20,8 @@ import * as React from 'react';
 import { Plus, X } from 'lucide-react';
 import { Button, Input, Label } from '@object-ui/components';
 import { uniqueId } from './_shared';
+import { VariableTextInput } from './VariableTextInput';
+import { FlowExprIssue } from './FlowExprIssue';
 function isPlainObject(v) {
     return typeof v === 'object' && v !== null && !Array.isArray(v);
 }
@@ -58,49 +60,90 @@ function parseValue(raw) {
     }
     return raw;
 }
-function toRows(obj, existingIds) {
+/**
+ * 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 function toEntries(value) {
+    if (Array.isArray(value)) {
+        return value
+            .filter((it) => isPlainObject(it))
+            .map((it) => {
+            const k = it.variable ?? it.name ?? it.key;
+            return [typeof k === 'string' ? k : '', it.value];
+        });
+    }
+    if (isPlainObject(value))
+        return Object.entries(value);
+    return [];
+}
+function toRows(value, existingIds) {
     const ids = [...existingIds];
-    return Object.entries(obj).map(([key, value]) => {
+    return toEntries(value).map(([key, val]) => {
         const id = uniqueId('kv', ids);
         ids.push(id);
-        return { id, key, raw: toRaw(value) };
+        return { id, key, raw: toRaw(val) };
     });
 }
-/** Flush rows to an object, skipping empty/duplicate keys (first wins). */
-function rowsToObject(rows) {
+/** Flush rows back to the SAME shape, skipping empty/duplicate keys (first wins). */
+export function rowsToValue(rows, arrayShape) {
+    const seen = new Set();
+    if (arrayShape) {
+        const list = [];
+        for (const r of rows) {
+            const k = r.key.trim();
+            if (!k || seen.has(k))
+                continue;
+            seen.add(k);
+            list.push({ variable: k, value: parseValue(r.raw) });
+        }
+        return list;
+    }
     const out = {};
     for (const r of rows) {
         const k = r.key.trim();
-        if (!k || k in out)
+        if (!k || seen.has(k))
             continue;
+        seen.add(k);
         out[k] = parseValue(r.raw);
     }
     return out;
 }
-function serialize(obj) {
+/** Stable serialization for the resync guard (order-insensitive for objects). */
+function serialize(value) {
+    if (Array.isArray(value))
+        return JSON.stringify(value);
+    const obj = value ?? {};
     const sorted = Object.keys(obj).sort().reduce((acc, k) => {
         acc[k] = obj[k];
         return acc;
     }, {});
     return JSON.stringify(sorted);
 }
-export function FlowKeyValueField({ label, value, onCommit, disabled, help, addLabel, keyLabel, valueLabel, removeLabel, emptyLabel, }) {
-    const external = isPlainObject(value) ? value : {};
-    const [rows, setRows] = React.useState(() => toRows(external, []));
-    // Track the last value we committed so an external change (node switch) can
-    // resync rows without clobbering an in-progress edit of the same node.
-    const lastCommitted = React.useRef(serialize(external));
+export function FlowKeyValueField({ label, value, onCommit, disabled, help, addLabel, keyLabel, valueLabel, removeLabel, emptyLabel, scopeGroups, }) {
+    // Preserve whichever shape the value was authored in (object map vs the
+    // assignment-node array form) across edits.
+    const arrayShape = Array.isArray(value);
+    // Normalized serialization of the stored value — used only to detect an
+    // EXTERNAL change (node switch) that should resync the rows.
+    const external = React.useMemo(() => serialize(rowsToValue(toRows(value, []), arrayShape)), [value, arrayShape]);
+    const [rows, setRows] = React.useState(() => toRows(value, []));
+    // Track the last value we committed so an external change can resync rows
+    // without clobbering an in-progress edit of the same node.
+    const lastCommitted = React.useRef(external);
     React.useEffect(() => {
-        const next = serialize(external);
-        if (next !== lastCommitted.current) {
-            setRows(toRows(external, []));
-            lastCommitted.current = next;
+        if (external !== lastCommitted.current) {
+            setRows(toRows(value, []));
+            lastCommitted.current = external;
         }
-    }, [external]);
+    }, [external, value]);
     const flush = (nextRows) => {
-        const obj = rowsToObject(nextRows);
-        lastCommitted.current = serialize(obj);
-        onCommit(Object.keys(obj).length ? obj : undefined);
+        const out = rowsToValue(nextRows, arrayShape);
+        lastCommitted.current = serialize(out);
+        const empty = Array.isArray(out) ? out.length === 0 : Object.keys(out).length === 0;
+        onCommit(empty ? undefined : out);
     };
     const setRowField = (id, patch) => {
         setRows((rs) => rs.map((r) => (r.id === id ? { ...r, ...patch } : r)));
@@ -115,11 +158,11 @@ export function FlowKeyValueField({ label, value, onCommit, disabled, help, addL
             return next;
         });
     };
-    return (_jsxs("div", { className: "space-y-1.5", children: [_jsx(Label, { className: "text-xs text-muted-foreground", children: label }), _jsxs("div", { className: "space-y-1.5", children: [rows.length === 0 && (_jsx("p", { className: "text-[11px] italic text-muted-foreground", children: emptyLabel })), rows.map((row) => (_jsxs("div", { className: "flex items-center gap-1.5", children: [_jsx(Input, { value: row.key, onChange: (e) => setRowField(row.id, { key: e.target.value }), onBlur: () => flush(rows), onKeyDown: (e) => {
-                                    if (e.key === 'Enter')
-                                        e.target.blur();
-                                }, placeholder: keyLabel, disabled: disabled, className: "h-8 flex-1 font-mono text-xs" }), _jsx(Input, { value: row.raw, onChange: (e) => setRowField(row.id, { raw: e.target.value }), onBlur: () => flush(rows), onKeyDown: (e) => {
-                                    if (e.key === 'Enter')
-                                        e.target.blur();
-                                }, placeholder: valueLabel, disabled: disabled, className: "h-8 flex-1 text-xs" }), _jsx(Button, { type: "button", variant: "ghost", size: "sm", className: "h-8 w-8 shrink-0 p-0 text-muted-foreground", onClick: () => removeRow(row.id), disabled: disabled, "aria-label": removeLabel, title: removeLabel, children: _jsx(X, { className: "h-3.5 w-3.5" }) })] }, row.id)))] }), _jsxs(Button, { type: "button", variant: "outline", size: "sm", className: "h-7 w-full text-xs", onClick: addRow, disabled: disabled, children: [_jsx(Plus, { className: "mr-1 h-3.5 w-3.5" }), addLabel] }), help && _jsx("p", { className: "text-[11px] leading-snug text-muted-foreground", children: help })] }));
+    return (_jsxs("div", { className: "space-y-1.5", children: [_jsx(Label, { className: "text-xs text-muted-foreground", children: label }), _jsxs("div", { className: "space-y-1.5", children: [rows.length === 0 && (_jsx("p", { className: "text-[11px] italic text-muted-foreground", children: emptyLabel })), rows.map((row) => (_jsxs("div", { className: "space-y-1", children: [_jsxs("div", { className: "flex items-center gap-1.5", children: [_jsx(Input, { value: row.key, onChange: (e) => setRowField(row.id, { key: e.target.value }), onBlur: () => flush(rows), onKeyDown: (e) => {
+                                            if (e.key === 'Enter')
+                                                e.target.blur();
+                                        }, placeholder: keyLabel, disabled: disabled, className: "h-8 flex-1 font-mono text-xs" }), _jsx(VariableTextInput, { mode: "template", value: row.raw, onValueChange: (v) => setRowField(row.id, { raw: v }), onBlur: () => flush(rows), onKeyDown: (e) => {
+                                            if (e.key === 'Enter')
+                                                e.target.blur();
+                                        }, groups: scopeGroups ?? [], placeholder: valueLabel, disabled: disabled, className: "flex-1" }), _jsx(Button, { type: "button", variant: "ghost", size: "sm", className: "h-8 w-8 shrink-0 p-0 text-muted-foreground", onClick: () => removeRow(row.id), disabled: disabled, "aria-label": removeLabel, title: removeLabel, children: _jsx(X, { className: "h-3.5 w-3.5" }) })] }), _jsx(FlowExprIssue, { value: row.raw, role: "template", scopeGroups: scopeGroups })] }, row.id)))] }), _jsxs(Button, { type: "button", variant: "outline", size: "sm", className: "h-7 w-full text-xs", onClick: addRow, disabled: disabled, children: [_jsx(Plus, { className: "mr-1 h-3.5 w-3.5" }), addLabel] }), help && _jsx("p", { className: "text-[11px] leading-snug text-muted-foreground", children: help })] }));
 }

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

@@ -6,6 +6,7 @@
 import * as React from 'react';
 import type { FlowConfigField } from './flow-node-config';
 import { type FlowReferenceContext } from './FlowReferenceField';
+import type { ScopeGroup } from './useFlowScope';
 export interface FlowNodeConfigFieldProps {
     field: FlowConfigField;
     value: unknown;
@@ -14,5 +15,7 @@ export interface FlowNodeConfigFieldProps {
     locale?: string;
     /** Draft + node context so `reference` fields can resolve their options. */
     context?: FlowReferenceContext;
+    /** In-scope variable references for the data-picker (#1934). */
+    scopeGroups?: ScopeGroup[];
 }
-export declare function FlowNodeConfigField({ field, value, onCommit, disabled, locale, context }: FlowNodeConfigFieldProps): React.JSX.Element;
+export declare function FlowNodeConfigField({ field, value, onCommit, disabled, locale, context, scopeGroups }: FlowNodeConfigFieldProps): React.JSX.Element;

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

@@ -1,23 +1,26 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { t } from '../i18n';
-import { InspectorTextField, InspectorNumberField, InspectorSelectField, InspectorCheckboxField, } from './_shared';
+import { InspectorNumberField, InspectorSelectField, InspectorCheckboxField, } from './_shared';
 import { Label } from '@object-ui/components';
 import { FlowKeyValueField } from './FlowKeyValueField';
 import { FlowStringListField } from './FlowStringListField';
 import { FlowObjectListField } from './FlowObjectListField';
 import { FlowReferenceField } from './FlowReferenceField';
 import { validateExpressionClient } from './expression-validate';
-export function FlowNodeConfigField({ field, value, onCommit, disabled, locale, context }) {
+import { VariableTextInput } from './VariableTextInput';
+import { findUnknownRefs, scopeRoots, describeUnknownRefs } from './flow-ref-check';
+export function FlowNodeConfigField({ field, value, onCommit, disabled, locale, context, scopeGroups }) {
+    const refMode = field.refMode ?? (field.kind === 'expression' ? 'expression' : 'template');
     const control = (() => {
         switch (field.kind) {
             case 'reference':
                 return (_jsx(FlowReferenceField, { field: field, value: value, onCommit: (v) => onCommit(v), disabled: disabled, context: context }));
             case 'keyValue':
-                return (_jsx(FlowKeyValueField, { label: field.label, value: value, onCommit: (v) => onCommit(v), disabled: disabled, addLabel: t('engine.inspector.flowNode.kv.add', locale), keyLabel: t('engine.inspector.flowNode.kv.key', locale), valueLabel: t('engine.inspector.flowNode.kv.value', locale), removeLabel: t('engine.inspector.flowNode.kv.remove', locale), emptyLabel: t('engine.inspector.flowNode.kv.empty', locale) }));
+                return (_jsx(FlowKeyValueField, { label: field.label, value: value, onCommit: (v) => onCommit(v), disabled: disabled, addLabel: t('engine.inspector.flowNode.kv.add', locale), keyLabel: t('engine.inspector.flowNode.kv.key', locale), valueLabel: t('engine.inspector.flowNode.kv.value', locale), removeLabel: t('engine.inspector.flowNode.kv.remove', locale), emptyLabel: t('engine.inspector.flowNode.kv.empty', locale), scopeGroups: scopeGroups }));
             case 'stringList':
                 return (_jsx(FlowStringListField, { label: field.label, value: value, onCommit: (v) => onCommit(v), disabled: disabled, addLabel: t('engine.inspector.flowNode.list.add', locale), itemLabel: t('engine.inspector.flowNode.list.item', locale), removeLabel: t('engine.inspector.flowNode.list.remove', locale), emptyLabel: t('engine.inspector.flowNode.list.empty', locale) }));
             case 'objectList':
-                return (_jsx(FlowObjectListField, { label: field.label, columns: field.columns ?? [], value: value, onCommit: (v) => onCommit(v), disabled: disabled, addLabel: t('engine.inspector.flowNode.list.add', locale), removeLabel: t('engine.inspector.flowNode.list.remove', locale), emptyLabel: t('engine.inspector.flowNode.list.empty', locale), context: context }));
+                return (_jsx(FlowObjectListField, { label: field.label, columns: field.columns ?? [], value: value, onCommit: (v) => onCommit(v), disabled: disabled, addLabel: t('engine.inspector.flowNode.list.add', locale), removeLabel: t('engine.inspector.flowNode.list.remove', locale), emptyLabel: t('engine.inspector.flowNode.list.empty', locale), context: context, scopeGroups: scopeGroups }));
             case 'number':
                 return (_jsx(InspectorNumberField, { label: field.label, value: typeof value === 'number' ? value : value != null && value !== '' ? Number(value) : undefined, placeholder: field.placeholder, onCommit: (v) => onCommit(v), disabled: disabled }));
             case 'boolean':
@@ -25,16 +28,28 @@ export function FlowNodeConfigField({ field, value, onCommit, disabled, locale,
             case 'select':
                 return (_jsx(InspectorSelectField, { label: field.label, value: value != null ? String(value) : '', options: field.options ?? [], onCommit: (v) => onCommit(v), disabled: disabled }));
             case 'textarea':
-                return (_jsxs("div", { className: "space-y-1", children: [_jsx(Label, { className: "text-xs text-muted-foreground", children: field.label }), _jsx("textarea", { value: value != null ? String(value) : '', onChange: (e) => onCommit(e.target.value), placeholder: field.placeholder, disabled: disabled, rows: 4, className: "w-full rounded border bg-background px-2 py-1.5 font-mono text-xs" })] }));
+                return (_jsxs("div", { className: "space-y-1", children: [_jsx(Label, { className: "text-xs text-muted-foreground", children: field.label }), _jsx(VariableTextInput, { multiline: true, rows: 4, mode: refMode, value: value != null ? String(value) : '', onValueChange: (v) => onCommit(v), groups: scopeGroups ?? [], placeholder: field.placeholder, disabled: disabled })] }));
             case 'expression':
             case 'text':
             default:
-                return (_jsx(InspectorTextField, { label: field.label, value: value != null ? String(value) : '', placeholder: field.placeholder, onCommit: (v) => onCommit(v), disabled: disabled, mono: field.kind === 'expression' }));
+                return (_jsxs("div", { className: "space-y-1", children: [_jsx(Label, { className: "text-xs text-muted-foreground", children: field.label }), _jsx(VariableTextInput, { mode: refMode, mono: field.kind === 'expression', value: value != null ? String(value) : '', onValueChange: (v) => onCommit(v), groups: scopeGroups ?? [], placeholder: field.placeholder, disabled: disabled })] }));
         }
     })();
     // ADR-0032 — surface a malformed condition (e.g. the `{record.x}` brace-in-CEL
-    // mistake) inline, as the author types, with the same corrective message the
-    // build and the agent tool emit. Only checked for expression-bearing fields.
+    // mistake) inline, with the same corrective message the build/agent emit. Only
+    // for expression fields (a genuine template uses single-brace `{var}` legally).
     const exprIssue = field.kind === 'expression' ? validateExpressionClient('predicate', value) : null;
-    return (_jsxs("div", { className: "space-y-1", children: [control, exprIssue && (_jsx("p", { className: "text-[11px] leading-snug text-destructive", role: "alert", children: exprIssue.message })), field.help && !exprIssue && (_jsx("p", { className: "text-[11px] leading-snug text-muted-foreground", children: field.help }))] }));
+    // #1934 — pair the picker with a gentle, scope-aware "unknown reference"
+    // warning: CEL for expression fields, `{…}` holes for template fields. Skipped
+    // for free-form code (refMode 'expression' on a textarea, e.g. a script body)
+    // and when scope is unknown. The brace error above takes precedence.
+    const scopeRole = field.kind === 'expression'
+        ? 'predicate'
+        : refMode === 'template' && (field.kind === 'text' || field.kind === 'textarea')
+            ? 'template'
+            : null;
+    const unknownRefs = !exprIssue && scopeRole && scopeGroups && scopeGroups.length > 0
+        ? findUnknownRefs(value, scopeRole, scopeRoots(scopeGroups.flatMap((g) => g.refs)))
+        : [];
+    return (_jsxs("div", { className: "space-y-1", children: [control, exprIssue && (_jsx("p", { className: "text-[11px] leading-snug text-destructive", role: "alert", children: exprIssue.message })), !exprIssue && unknownRefs.length > 0 && (_jsx("p", { className: "text-[11px] leading-snug text-amber-600 dark:text-amber-400", role: "note", children: describeUnknownRefs(unknownRefs) })), field.help && !exprIssue && unknownRefs.length === 0 && (_jsx("p", { className: "text-[11px] leading-snug text-muted-foreground", children: field.help }))] }));
 }

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

@@ -19,6 +19,7 @@ import { fieldsForNodeType, isFieldVisible, getFieldValue, configKeyOf, FLOW_NOD
 import { jsonSchemaToFlowFields } from './json-schema-to-fields';
 import { useActionConfigSchemas } from '../previews/useFlowNodePalette';
 import { FlowNodeConfigField } from './FlowNodeConfigField';
+import { useFlowScope } from './useFlowScope';
 import { ScreenPreview } from '../previews/ScreenPreview';
 /**
  * Mirror a decision node's `conditions` (branches) onto its outgoing sequence
@@ -101,6 +102,8 @@ export function FlowNodeInspector({ selection, draft, onPatch, onClearSelection,
     // with the backend. Falls back to the hardcoded field group when no schema is
     // published (offline / plugin absent / older backend).
     const configSchemas = useActionConfigSchemas();
+    // In-scope variable references for this node, for the data-picker (#1934).
+    const { groups: scopeGroups } = useFlowScope(draft, node?.id);
     const fields = React.useMemo(() => {
         const schema = node?.type ? configSchemas[node.type] : undefined;
         const serverFields = schema !== undefined ? jsonSchemaToFlowFields(schema) : null;
@@ -127,6 +130,10 @@ export function FlowNodeInspector({ selection, draft, onPatch, onClearSelection,
             const k = configKeyOf(f);
             if (k)
                 s.add(k);
+            // A loose-shape fallback rooted at `config` is claimed too, so a tolerated
+            // legacy key (e.g. a wait node's `config.eventType`) never leaks to Advanced.
+            if (f.fallbackPath && f.fallbackPath.length >= 2 && f.fallbackPath[0] === 'config')
+                s.add(f.fallbackPath[1]);
         }
         return s;
     }, [fields]);
@@ -155,8 +162,13 @@ export function FlowNodeInspector({ selection, draft, onPatch, onClearSelection,
     const hasExtras = extraJson.trim() !== '';
     // Screen nodes (and the `user_task` alias) get a live end-user preview.
     const isScreen = node.type === 'screen' || node.type === 'user_task';
-    const setField = (path, value) => {
-        const nextNode = setAtPath(node, path, value);
+    const setField = (field, value) => {
+        const path = field.path;
+        let nextNode = setAtPath(node, path, value);
+        // Migrate-on-edit: writing the canonical path drops any looser fallback
+        // location, so the node never carries a stale duplicate (engine + designer agree).
+        if (field.fallbackPath)
+            nextNode = setAtPath(nextNode, field.fallbackPath, undefined);
         const patch = { nodes: spliceArray(nodes, index, nextNode) };
         // Decision branches drive routing — mirror them onto the node's outgoing
         // edges so the engine/simulator can actually branch (they read
@@ -198,7 +210,7 @@ export function FlowNodeInspector({ selection, draft, onPatch, onClearSelection,
     const typeOptions = FLOW_NODE_TYPE_OPTIONS.includes(node.type)
         ? [...FLOW_NODE_TYPE_OPTIONS]
         : [...FLOW_NODE_TYPE_OPTIONS, node.type ?? ''].filter(Boolean);
-    return (_jsxs(InspectorShell, { kindLabel: t('engine.inspector.flowNode.kind', locale), title: node.label || node.id, onClose: onClearSelection, closeLabel: t('engine.inspector.flowNode.close', locale), footer: _jsx(InspectorRemoveButton, { label: t('engine.inspector.flowNode.remove', locale), onClick: remove, disabled: readOnly }), children: [_jsx(InspectorTextField, { label: t('engine.inspector.flowNode.id', locale), value: node.id, onCommit: (v) => patchNode({ id: v }), disabled: readOnly, mono: true }), _jsx(InspectorTextField, { label: t('engine.inspector.flowNode.label', locale), value: node.label ?? '', onCommit: (v) => patchNode({ label: v }), disabled: readOnly }), _jsx(InspectorSelectField, { label: t('engine.inspector.flowNode.type', locale), value: node.type, options: typeOptions.map((v) => ({ value: v, label: v })), onCommit: (v) => patchNode({ type: v }), disabled: readOnly }), _jsx(InspectorTextField, { label: t('engine.inspector.flowNode.description', locale), value: node.description ?? '', onCommit: (v) => patchNode({ description: v || undefined }), disabled: readOnly }), fields.length === 0 ? (_jsx("p", { className: "pt-1 text-xs italic text-muted-foreground", children: t('engine.inspector.flowNode.noConfig', locale) })) : (visibleFields.length > 0 && (_jsxs("div", { className: "flex items-center gap-2 pt-1", children: [_jsx("span", { className: "text-[11px] font-semibold uppercase tracking-wide text-muted-foreground", children: t('engine.inspector.flowNode.configuration', locale) }), _jsx("span", { className: "h-px flex-1 bg-border", "aria-hidden": true })] }))), visibleFields.map((field) => (_jsx(FlowNodeConfigField, { field: field, value: getFieldValue(node, field), onCommit: (v) => setField(field.path, v), disabled: readOnly, locale: locale, context: { draft, node } }, field.id))), isScreen && _jsx(ScreenPreview, { node: node, variables: screenVars, className: "mt-1" }), hasExtras || advReveal ? (_jsxs("details", { className: "group rounded border bg-muted/20", open: advOpen, onToggle: (e) => setAdvOpen(e.target.open), children: [_jsx("summary", { className: "cursor-pointer select-none px-2 py-1.5 text-xs font-medium text-muted-foreground", children: t('engine.inspector.flowNode.advanced', locale) }), _jsxs("div", { className: "space-y-1 border-t p-2", children: [_jsx("p", { className: "text-[11px] leading-snug text-muted-foreground", children: t('engine.inspector.flowNode.advancedHint', locale) }), _jsx("textarea", { value: advText, onChange: (e) => setAdvText(e.target.value), onBlur: commitAdvanced, disabled: readOnly, rows: 6, placeholder: "{ }", className: "w-full rounded border bg-background px-2 py-1.5 font-mono text-xs" }), advError && _jsx("div", { className: "text-xs text-destructive", children: advError })] })] })) : (!readOnly && (_jsxs("button", { type: "button", onClick: () => {
+    return (_jsxs(InspectorShell, { kindLabel: t('engine.inspector.flowNode.kind', locale), title: node.label || node.id, onClose: onClearSelection, closeLabel: t('engine.inspector.flowNode.close', locale), footer: _jsx(InspectorRemoveButton, { label: t('engine.inspector.flowNode.remove', locale), onClick: remove, disabled: readOnly }), children: [_jsx(InspectorTextField, { label: t('engine.inspector.flowNode.id', locale), value: node.id, onCommit: (v) => patchNode({ id: v }), disabled: readOnly, mono: true }), _jsx(InspectorTextField, { label: t('engine.inspector.flowNode.label', locale), value: node.label ?? '', onCommit: (v) => patchNode({ label: v }), disabled: readOnly }), _jsx(InspectorSelectField, { label: t('engine.inspector.flowNode.type', locale), value: node.type, options: typeOptions.map((v) => ({ value: v, label: v })), onCommit: (v) => patchNode({ type: v }), disabled: readOnly }), _jsx(InspectorTextField, { label: t('engine.inspector.flowNode.description', locale), value: node.description ?? '', onCommit: (v) => patchNode({ description: v || undefined }), disabled: readOnly }), fields.length === 0 ? (_jsx("p", { className: "pt-1 text-xs italic text-muted-foreground", children: t('engine.inspector.flowNode.noConfig', locale) })) : (visibleFields.length > 0 && (_jsxs("div", { className: "flex items-center gap-2 pt-1", children: [_jsx("span", { className: "text-[11px] font-semibold uppercase tracking-wide text-muted-foreground", children: t('engine.inspector.flowNode.configuration', locale) }), _jsx("span", { className: "h-px flex-1 bg-border", "aria-hidden": true })] }))), visibleFields.map((field) => (_jsx(FlowNodeConfigField, { field: field, value: getFieldValue(node, field), onCommit: (v) => setField(field, v), disabled: readOnly, locale: locale, context: { draft, node }, scopeGroups: scopeGroups }, field.id))), isScreen && _jsx(ScreenPreview, { node: node, variables: screenVars, className: "mt-1" }), hasExtras || advReveal ? (_jsxs("details", { className: "group rounded border bg-muted/20", open: advOpen, onToggle: (e) => setAdvOpen(e.target.open), children: [_jsx("summary", { className: "cursor-pointer select-none px-2 py-1.5 text-xs font-medium text-muted-foreground", children: t('engine.inspector.flowNode.advanced', locale) }), _jsxs("div", { className: "space-y-1 border-t p-2", children: [_jsx("p", { className: "text-[11px] leading-snug text-muted-foreground", children: t('engine.inspector.flowNode.advancedHint', locale) }), _jsx("textarea", { value: advText, onChange: (e) => setAdvText(e.target.value), onBlur: commitAdvanced, disabled: readOnly, rows: 6, placeholder: "{ }", className: "w-full rounded border bg-background px-2 py-1.5 font-mono text-xs" }), advError && _jsx("div", { className: "text-xs text-destructive", children: advError })] })] })) : (!readOnly && (_jsxs("button", { type: "button", onClick: () => {
                     setAdvReveal(true);
                     setAdvOpen(true);
                 }, className: "inline-flex items-center gap-1 self-start text-[11px] text-muted-foreground transition-colors hover:text-foreground", children: [_jsx(Plus, { className: "h-3 w-3" }), t('engine.inspector.flowNode.advanced', locale)] })))] }));

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

@@ -11,6 +11,7 @@
 import * as React from 'react';
 import type { FlowConfigColumn } from './flow-node-config';
 import { type FlowReferenceContext } from './FlowReferenceField';
+import type { ScopeGroup } from './useFlowScope';
 export interface FlowObjectListFieldProps {
     label: string;
     columns: FlowConfigColumn[];
@@ -22,5 +23,7 @@ export interface FlowObjectListFieldProps {
     emptyLabel: string;
     /** Draft + node context so `reference` columns can resolve their options. */
     context?: FlowReferenceContext;
+    /** In-scope variable references for `expression` columns (#1934). */
+    scopeGroups?: ScopeGroup[];
 }
-export declare function FlowObjectListField({ label, columns, value, onCommit, disabled, addLabel, removeLabel, emptyLabel, context, }: FlowObjectListFieldProps): React.JSX.Element;
+export declare function FlowObjectListField({ label, columns, value, onCommit, disabled, addLabel, removeLabel, emptyLabel, context, scopeGroups, }: FlowObjectListFieldProps): React.JSX.Element;

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

@@ -15,6 +15,8 @@ import { Plus, X } from 'lucide-react';
 import { Button, Input, Label, Checkbox } from '@object-ui/components';
 import { uniqueId } from './_shared';
 import { ReferenceCombobox, resolveRefKind } from './FlowReferenceField';
+import { VariableTextInput } from './VariableTextInput';
+import { FlowExprIssue } from './FlowExprIssue';
 function toRows(list, columns) {
     const ids = [];
     return list.map((item) => {
@@ -56,7 +58,7 @@ function rowsToList(rows, columns) {
     }
     return out;
 }
-export function FlowObjectListField({ label, columns, value, onCommit, disabled, addLabel, removeLabel, emptyLabel, context, }) {
+export function FlowObjectListField({ label, columns, value, onCommit, disabled, addLabel, removeLabel, emptyLabel, context, scopeGroups, }) {
     const external = React.useMemo(() => Array.isArray(value)
         ? value.filter((v) => v && typeof v === 'object')
         : [], [value]);
@@ -98,8 +100,11 @@ export function FlowObjectListField({ label, columns, value, onCommit, disabled,
                                                     flush(next);
                                                     return next;
                                                 });
-                                            }, disabled: disabled })) : col.kind === 'reference' ? (_jsx("div", { className: "flex-1", children: _jsx(ReferenceCombobox, { resolved: resolveRefKind(col.ref, (k) => row.values[k]), value: typeof row.values[col.key] === 'string' ? row.values[col.key] : '', onCommit: (v) => setCell(row.id, col.key, typeof v === 'string' ? v : ''), onBlur: () => flush(rows), placeholder: col.placeholder, disabled: disabled, context: context, showHint: false }) })) : (_jsx(Input, { value: typeof row.values[col.key] === 'string' ? row.values[col.key] : '', onChange: (e) => setCell(row.id, col.key, e.target.value), onBlur: () => flush(rows), onKeyDown: (e) => {
+                                            }, disabled: disabled })) : col.kind === 'reference' ? (_jsx("div", { className: "flex-1", children: _jsx(ReferenceCombobox, { resolved: resolveRefKind(col.ref, (k) => row.values[k]), value: typeof row.values[col.key] === 'string' ? row.values[col.key] : '', onCommit: (v) => setCell(row.id, col.key, typeof v === 'string' ? v : ''), onBlur: () => flush(rows), placeholder: col.placeholder, disabled: disabled, context: context, showHint: false }) })) : col.kind === 'expression' ? (_jsxs("div", { className: "flex-1 space-y-1", children: [_jsx(VariableTextInput, { mode: "expression", mono: true, value: typeof row.values[col.key] === 'string' ? row.values[col.key] : '', onValueChange: (v) => setCell(row.id, col.key, v), onBlur: () => flush(rows), onKeyDown: (e) => {
+                                                        if (e.key === 'Enter')
+                                                            e.target.blur();
+                                                    }, groups: scopeGroups ?? [], placeholder: col.placeholder, disabled: disabled }), _jsx(FlowExprIssue, { value: typeof row.values[col.key] === 'string' ? row.values[col.key] : '', role: "predicate", scopeGroups: scopeGroups })] })) : (_jsx(Input, { value: typeof row.values[col.key] === 'string' ? row.values[col.key] : '', onChange: (e) => setCell(row.id, col.key, e.target.value), onBlur: () => flush(rows), onKeyDown: (e) => {
                                                 if (e.key === 'Enter')
                                                     e.target.blur();
-                                            }, placeholder: col.placeholder, disabled: disabled, className: `h-8 flex-1 text-xs${col.kind === 'expression' ? ' font-mono' : ''}` }))] }, col.key))) })] }, row.id)))] }), _jsxs(Button, { type: "button", variant: "outline", size: "sm", className: "h-7 w-full text-xs", onClick: addRow, disabled: disabled, children: [_jsx(Plus, { className: "mr-1 h-3.5 w-3.5" }), addLabel] })] }));
+                                            }, placeholder: col.placeholder, disabled: disabled, className: "h-8 flex-1 text-xs" }))] }, col.key))) })] }, row.id)))] }), _jsxs(Button, { type: "button", variant: "outline", size: "sm", className: "h-7 w-full text-xs", onClick: addRow, disabled: disabled, children: [_jsx(Plus, { className: "mr-1 h-3.5 w-3.5" }), addLabel] })] }));
 }

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

@@ -0,0 +1,47 @@
+/**
+ * VariableTextInput — a single-line input (or textarea) for an expression /
+ * template flow-config value, with a "{x}" data-picker (#1934) that inserts an
+ * in-scope reference at the cursor.
+ *
+ * Brace handling is done FOR the author (ADR-0032): the picker inserts the BARE
+ * reference (`discount_pct`) in `expression` fields and the braced
+ * `{discount_pct}` in `template` (text / textarea) fields — killing the
+ * recurring `{record.x}` brace-in-CEL trap. Free-text typing is untouched, and
+ * the picker button is hidden entirely when nothing is in scope, so an empty
+ * scope degrades to a plain input.
+ */
+import * as React from 'react';
+import type { ScopeGroup } from './useFlowScope';
+export type VariableFieldMode = 'expression' | 'template';
+/** Wrap a bare reference token for insertion into the given field mode. */
+export declare function formatToken(token: string, mode: VariableFieldMode): string;
+/**
+ * Splice a reference into `value` at the selection `[selStart, selEnd]`, in the
+ * brace mode for the field, returning the new string and the caret position
+ * just after the inserted token. Pure (the DOM caret restore lives in the
+ * component); selection bounds are clamped and order-normalized so a reversed or
+ * out-of-range selection can't corrupt the value.
+ */
+export declare function insertToken(value: string, mode: VariableFieldMode, token: string, selStart: number, selEnd: number): {
+    next: string;
+    caret: number;
+};
+export interface VariableTextInputProps {
+    value: string;
+    onValueChange: (v: string) => void;
+    onBlur?: () => void;
+    onKeyDown?: (e: React.KeyboardEvent<HTMLInputElement | HTMLTextAreaElement>) => void;
+    /** Brace rule: bare token for `expression`, `{token}` for `template`. */
+    mode: VariableFieldMode;
+    /** In-scope reference groups (from useFlowScope). Empty → no picker button. */
+    groups: ScopeGroup[];
+    placeholder?: string;
+    disabled?: boolean;
+    /** Render a multi-line `<textarea>` instead of a single-line input. */
+    multiline?: boolean;
+    rows?: number;
+    /** Monospace the input text (expressions). Textareas are always mono. */
+    mono?: boolean;
+    className?: string;
+}
+export declare function VariableTextInput({ value, onValueChange, onBlur, onKeyDown, mode, groups, placeholder, disabled, multiline, rows, mono, className, }: VariableTextInputProps): React.JSX.Element;