@object-ui/app-shell 7.1.0 → 7.2.0

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;

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

@@ -0,0 +1,95 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+/**
+ * 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 { Braces } from 'lucide-react';
+import { cn, Input, Popover, PopoverTrigger, PopoverContent, Command, CommandInput, CommandList, CommandEmpty, CommandGroup, CommandItem, } from '@object-ui/components';
+/** Wrap a bare reference token for insertion into the given field mode. */
+export function formatToken(token, mode) {
+    return mode === 'template' ? `{${token}}` : token;
+}
+/**
+ * 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 function insertToken(value, mode, token, selStart, selEnd) {
+    const text = formatToken(token, mode);
+    const a = Math.min(Math.max(selStart, 0), value.length);
+    const b = Math.min(Math.max(selEnd, 0), value.length);
+    const lo = Math.min(a, b);
+    const hi = Math.max(a, b);
+    return { next: value.slice(0, lo) + text + value.slice(hi), caret: lo + text.length };
+}
+const PICK_LABEL = 'Insert a reference';
+const SEARCH_LABEL = 'Search references…';
+const EMPTY_LABEL = 'No matching references.';
+export function VariableTextInput({ value, onValueChange, onBlur, onKeyDown, mode, groups, placeholder, disabled, multiline, rows = 4, mono, className, }) {
+    const inputRef = React.useRef(null);
+    // Remember the caret across the button press (which blurs the field) so the
+    // token lands where the author was typing — not appended at the end.
+    const caret = React.useRef({ start: 0, end: 0 });
+    const [open, setOpen] = React.useState(false);
+    const setRef = (el) => {
+        inputRef.current = el;
+    };
+    const rememberCaret = () => {
+        const el = inputRef.current;
+        if (el) {
+            caret.current = {
+                start: el.selectionStart ?? value.length,
+                end: el.selectionEnd ?? value.length,
+            };
+        }
+    };
+    const insert = (token) => {
+        const { next, caret: pos } = insertToken(value, mode, token, caret.current.start, caret.current.end);
+        onValueChange(next);
+        setOpen(false);
+        // Restore focus + place the caret just after the inserted token.
+        requestAnimationFrame(() => {
+            const el = inputRef.current;
+            if (!el)
+                return;
+            el.focus();
+            try {
+                el.setSelectionRange(pos, pos);
+            }
+            catch {
+                /* some input types disallow setSelectionRange */
+            }
+            caret.current = { start: pos, end: pos };
+        });
+    };
+    const hasScope = groups.some((g) => g.refs.length > 0);
+    const shared = {
+        value,
+        onChange: (e) => onValueChange(e.target.value),
+        onBlur,
+        onKeyDown,
+        onSelect: rememberCaret,
+        onKeyUp: rememberCaret,
+        onClick: rememberCaret,
+        placeholder,
+        disabled,
+    };
+    return (_jsxs("div", { className: cn('relative', className), children: [multiline ? (_jsx("textarea", { ref: setRef, ...shared, rows: rows, className: "w-full rounded border bg-background px-2 py-1.5 pr-8 font-mono text-xs" })) : (_jsx(Input, { ref: setRef, ...shared, className: cn('h-8 pr-8 text-sm', mono && 'font-mono') })), hasScope && !disabled && (_jsxs(Popover, { open: open, onOpenChange: setOpen, children: [_jsx(PopoverTrigger, { asChild: true, children: _jsx("button", { type: "button", "aria-label": PICK_LABEL, title: PICK_LABEL, 
+                            // Capture the caret on mousedown (fires before the input blur), so
+                            // the insertion point is the author's last position.
+                            onMouseDown: rememberCaret, className: "absolute right-1 top-1 inline-flex h-6 w-6 items-center justify-center rounded text-muted-foreground transition-colors hover:bg-muted hover:text-foreground", children: _jsx(Braces, { className: "h-3.5 w-3.5" }) }) }), _jsx(PopoverContent, { align: "end", className: "w-72 p-0", 
+                        // Keep our rAF focus-restore from fighting Radix's focus return.
+                        onCloseAutoFocus: (e) => e.preventDefault(), children: _jsxs(Command, { children: [_jsx(CommandInput, { placeholder: SEARCH_LABEL, className: "h-9" }), _jsxs(CommandList, { children: [_jsx(CommandEmpty, { children: EMPTY_LABEL }), groups.map((g) => (_jsx(CommandGroup, { heading: g.label, children: g.refs.map((ref) => (_jsxs(CommandItem, { value: `${ref.token} ${ref.label} ${ref.detail ?? ''}`, onSelect: () => insert(ref.token), className: "flex items-center justify-between gap-2", children: [_jsx("span", { className: "truncate font-mono text-xs", children: formatToken(ref.token, mode) }), ref.detail && (_jsx("span", { className: "shrink-0 truncate text-[10px] text-muted-foreground", children: ref.detail }))] }, `${g.id}:${ref.token}`))) }, g.id)))] })] }) })] }))] }));
+}

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

@@ -39,7 +39,12 @@ export function groupToCondition(group) {
         const mop = OP_TO_MONGO[c.operator];
         if (!mop)
             continue; // unmapped (e.g. notContains/between) — drop rather than emit a bad filter
-        parts.push({ [c.field]: { [mop]: c.value } });
+        // Skip incomplete rows (no value typed yet) — emitting `{field:{$op:''}}` would
+        // be a silently-wrong filter (matches only empty), not "no filter".
+        const v = c.value;
+        if (v == null || v === '' || (Array.isArray(v) && v.length === 0))
+            continue;
+        parts.push({ [c.field]: { [mop]: v } });
     }
     if (parts.length === 0)
         return undefined;

package/dist/views/metadata-admin/inspectors/flow-node-config.d.ts

@@ -93,6 +93,14 @@ export interface FlowConfigField {
      * the spec's top-level `node.waitEventConfig.eventType`.
      */
     path: string[];
+    /**
+     * Optional secondary read location used when `path` holds no value — lets the
+     * inspector tolerate a looser on-disk shape the engine also accepts (e.g. a
+     * `wait` node authored with `config.eventType` instead of the spec-canonical
+     * `waitEventConfig.eventType`). Reads fall back to it; the inspector writes the
+     * canonical `path` and prunes the fallback (migrate-on-edit).
+     */
+    fallbackPath?: string[];
     /** Human-readable field label (English — repo is English-only). */
     label: string;
     kind: FlowConfigFieldKind;
@@ -120,10 +128,17 @@ export interface FlowConfigField {
     columns?: FlowConfigColumn[];
     /** Reference target for `reference` fields — drives the combobox data source. */
     ref?: FlowReferenceSpec;
+    /**
+     * Data-picker brace mode override (#1934). Defaults by kind (`expression` →
+     * bare CEL, `text` / `textarea` → `{var}` template). Set `'expression'` on a
+     * code field (e.g. a script body) so the picker inserts bare references, not
+     * `{var}` — `{x}` is a syntax error in a JS/TS script.
+     */
+    refMode?: 'expression' | 'template';
 }
 /** Resolve the config fields for a node type (alias-aware). */
 export declare function fieldsForNodeType(type?: string): FlowConfigField[];
-/** Read the current value at a field's node path. */
+/** Read the current value at a field's node path, falling back to `fallbackPath`. */
 export declare function getFieldValue(node: Record<string, unknown> | null | undefined, field: FlowConfigField): unknown;
 /**
  * The `config` key this field owns, or `undefined` for fields stored outside

package/dist/views/metadata-admin/inspectors/flow-node-config.js

@@ -163,6 +163,7 @@ const FLOW_NODE_CONFIG = {
         cfg('script', 'Code', 'textarea', {
             placeholder: 'return { ok: true };',
             help: 'Script body (JS/TS).',
+            refMode: 'expression',
             showWhen: { field: 'actionType', equals: ['code'] },
         }),
         cfg('outputVariables', 'Output variables', 'stringList', {
@@ -315,23 +316,27 @@ const FLOW_NODE_CONFIG = {
                 { value: 'condition', label: 'Condition' },
             ],
             defaultValue: 'timer',
+            fallbackPath: ['config', 'eventType'],
         }),
         at('waitEventConfig', 'timerDuration', 'Duration', 'text', {
             placeholder: 'PT1H · P3D',
             help: 'ISO 8601 duration (e.g. PT1H, P3D).',
             showWhen: { field: 'waitEventConfig.eventType', equals: ['timer'] },
+            fallbackPath: ['config', 'timerDuration'],
         }),
         at('waitEventConfig', 'signalName', 'Signal name', 'text', {
             placeholder: 'contract.renewed',
             showWhen: { field: 'waitEventConfig.eventType', equals: ['signal', 'webhook'] },
+            fallbackPath: ['config', 'signalName'],
         }),
-        at('waitEventConfig', 'timeoutMs', 'Timeout (ms)', 'number', { placeholder: '3600000' }),
+        at('waitEventConfig', 'timeoutMs', 'Timeout (ms)', 'number', { placeholder: '3600000', fallbackPath: ['config', 'timeoutMs'] }),
         at('waitEventConfig', 'onTimeout', 'On timeout', 'select', {
             options: [
                 { value: 'fail', label: 'Fail' },
                 { value: 'continue', label: 'Continue' },
             ],
             defaultValue: 'fail',
+            fallbackPath: ['config', 'onTimeout'],
         }),
     ],
     subflow: [
@@ -436,16 +441,22 @@ export function fieldsForNodeType(type) {
     const canonical = TYPE_ALIASES[type] ?? type;
     return FLOW_NODE_CONFIG[canonical] ?? [];
 }
-/** Read the current value at a field's node path. */
+/** Read the current value at a field's node path, falling back to `fallbackPath`. */
 export function getFieldValue(node, field) {
-    let cur = node;
-    for (const seg of field.path) {
-        if (cur && typeof cur === 'object' && !Array.isArray(cur))
-            cur = cur[seg];
-        else
-            return undefined;
-    }
-    return cur;
+    const read = (path) => {
+        let cur = node;
+        for (const seg of path) {
+            if (cur && typeof cur === 'object' && !Array.isArray(cur))
+                cur = cur[seg];
+            else
+                return undefined;
+        }
+        return cur;
+    };
+    const primary = read(field.path);
+    if (primary !== undefined)
+        return primary;
+    return field.fallbackPath ? read(field.fallbackPath) : undefined;
 }
 /**
  * The `config` key this field owns, or `undefined` for fields stored outside