@object-ui/app-shell 11.4.0 → 11.5.0

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

@@ -56,12 +56,12 @@ export function resolveRefKind(ref, sibling) {
     if (!ref)
         return undefined;
     if (ref.kind)
-        return { kind: ref.kind, objectSource: ref.objectSource };
+        return { kind: ref.kind, objectSource: ref.objectSource, connectorSource: ref.connectorSource };
     if (ref.kindFrom && ref.map) {
         const disc = sibling(ref.kindFrom);
         const k = typeof disc === 'string' ? ref.map[disc] : undefined;
         if (k)
-            return { kind: k, objectSource: ref.objectSource };
+            return { kind: k, objectSource: ref.objectSource, connectorSource: ref.connectorSource };
     }
     return undefined;
 }
@@ -86,6 +86,31 @@ function resolveObjectName(kind, objectSource, ctx) {
     // A sibling config key on the same node (CRUD nodes carry their own objectName).
     return configString(ctx.node, src);
 }
+/**
+ * Resolve the chosen connector name for a `connector-action` reference — read
+ * from the sibling key on this node's `connectorConfig` block (default
+ * `connectorId`), which is where the connector picker writes it.
+ */
+export function resolveConnectorName(kind, connectorSource, ctx) {
+    if (kind !== 'connector-action')
+        return undefined;
+    const cc = ctx.node?.connectorConfig;
+    if (!cc || typeof cc !== 'object' || Array.isArray(cc))
+        return undefined;
+    const v = cc[connectorSource || 'connectorId'];
+    return typeof v === 'string' && v ? v : undefined;
+}
+/** A connector descriptor's action list → combobox options (exported for test). */
+export function connectorActionsToOptions(actions) {
+    if (!Array.isArray(actions))
+        return [];
+    return actions
+        .filter((a) => !!a && typeof a.key === 'string' && !!a.key)
+        .map((a) => ({
+        value: a.key,
+        label: typeof a.label === 'string' && a.label && a.label !== a.key ? `${a.label} (${a.key})` : a.key,
+    }));
+}
 /**
  * Fetch a metadata type's items as combobox options. `type === undefined`
  * disables the fetch (returns empty), so the hook can be called
@@ -127,6 +152,45 @@ function useMetadataListOptions(type) {
     }, [client, type]);
     return state;
 }
+/**
+ * Fetch a connector's actions as combobox options from the runtime connector
+ * descriptors (`GET /api/v1/automation/connectors`, each `{ name, actions:
+ * [{key,label}] }`). `connectorName === undefined` disables the fetch (so the
+ * hook is safe to call unconditionally). Degrades to empty on any failure.
+ */
+function useConnectorActionOptions(connectorName) {
+    const [state, setState] = React.useState({
+        options: [],
+        loading: !!connectorName,
+    });
+    React.useEffect(() => {
+        if (!connectorName) {
+            setState({ options: [], loading: false });
+            return;
+        }
+        let cancelled = false;
+        setState((s) => ({ ...s, loading: true }));
+        fetch('/api/v1/automation/connectors', { credentials: 'include', headers: { Accept: 'application/json' } })
+            .then((r) => (r.ok ? r.json() : null))
+            .then((payload) => {
+            if (cancelled)
+                return;
+            const connectors = payload?.data?.connectors ?? payload?.connectors ?? [];
+            const conn = Array.isArray(connectors)
+                ? connectors.find((c) => c?.name === connectorName)
+                : undefined;
+            setState({ options: connectorActionsToOptions(conn?.actions), loading: false });
+        })
+            .catch(() => {
+            if (!cancelled)
+                setState({ options: [], loading: false });
+        });
+        return () => {
+            cancelled = true;
+        };
+    }, [connectorName]);
+    return state;
+}
 /**
  * The bare reference combobox — suggestions for `resolved.kind`, always
  * free-text editable. Hooks are called unconditionally (kind-gated args) so the
@@ -139,8 +203,11 @@ export function ReferenceCombobox({ resolved, value, onCommit, onBlur, disabled,
     // object-field: resolve the target object, then its field catalog.
     const objectName = resolved ? resolveObjectName(resolved.kind, resolved.objectSource, ctx) : undefined;
     const { fields: objectFields } = useObjectFields(kind === 'object-field' ? objectName : undefined);
+    // connector-action: resolve the chosen connector, then its action catalog.
+    const connectorName = resolved ? resolveConnectorName(resolved.kind, resolved.connectorSource, ctx) : undefined;
+    const { options: connectorActionOptions } = useConnectorActionOptions(kind === 'connector-action' ? connectorName : undefined);
     // Flat metadata-list kinds (object / flow / role / user / team / …).
-    const listType = kind && kind !== 'object-field' && kind !== 'node' ? KIND_TO_META_TYPE[kind] : undefined;
+    const listType = kind && kind !== 'object-field' && kind !== 'node' && kind !== 'connector-action' ? KIND_TO_META_TYPE[kind] : undefined;
     const { options: listOptions } = useMetadataListOptions(listType);
     const options = React.useMemo(() => {
         if (kind === 'object-field') {
@@ -149,6 +216,8 @@ export function ReferenceCombobox({ resolved, value, onCommit, onBlur, disabled,
                 label: f.label && f.label !== f.name ? `${f.label} (${f.name})` : f.name,
             }));
         }
+        if (kind === 'connector-action')
+            return connectorActionOptions;
         if (kind === 'node') {
             const nodes = Array.isArray(ctx.draft.nodes) ? ctx.draft.nodes : [];
             const currentId = typeof ctx.node?.id === 'string' ? ctx.node.id : undefined;
@@ -163,11 +232,13 @@ export function ReferenceCombobox({ resolved, value, onCommit, onBlur, disabled,
         if (listType)
             return listOptions;
         return [];
-    }, [kind, listType, objectFields, listOptions, ctx.draft, ctx.node]);
+    }, [kind, listType, objectFields, connectorActionOptions, listOptions, ctx.draft, ctx.node]);
     // For an object-field whose object can't be resolved, tell the author why the
     // suggestions are empty — but still let them type a value.
     const unresolvedObject = kind === 'object-field' && !objectName;
-    return (_jsxs("div", { className: "w-full space-y-1", children: [_jsx(Input, { list: options.length ? listId : undefined, value: value != null ? String(value) : '', onChange: (e) => onCommit(e.target.value), onBlur: onBlur, placeholder: placeholder, disabled: disabled, className: "h-8 text-sm" }), options.length > 0 && (_jsx("datalist", { id: listId, children: options.map((o) => (_jsx("option", { value: o.value, children: o.label }, o.value))) })), showHint && kind === 'object-field' && objectName && (_jsxs("p", { className: "text-[11px] leading-snug text-muted-foreground", children: ["Fields of ", objectName, "."] })), showHint && unresolvedObject && (_jsx("p", { className: "text-[11px] leading-snug text-muted-foreground", children: "Set the flow\u2019s trigger object (on the Start node) to list fields." }))] }));
+    // Same for a connector-action with no connector chosen yet.
+    const unresolvedConnector = kind === 'connector-action' && !connectorName;
+    return (_jsxs("div", { className: "w-full space-y-1", children: [_jsx(Input, { list: options.length ? listId : undefined, value: value != null ? String(value) : '', onChange: (e) => onCommit(e.target.value), onBlur: onBlur, placeholder: placeholder, disabled: disabled, className: "h-8 text-sm" }), options.length > 0 && (_jsx("datalist", { id: listId, children: options.map((o) => (_jsx("option", { value: o.value, children: o.label }, o.value))) })), showHint && kind === 'object-field' && objectName && (_jsxs("p", { className: "text-[11px] leading-snug text-muted-foreground", children: ["Fields of ", objectName, "."] })), showHint && unresolvedObject && (_jsx("p", { className: "text-[11px] leading-snug text-muted-foreground", children: "Set the flow\u2019s trigger object (on the Start node) to list fields." })), showHint && kind === 'connector-action' && connectorName && (_jsxs("p", { className: "text-[11px] leading-snug text-muted-foreground", children: ["Actions of ", connectorName, "."] })), showHint && unresolvedConnector && (_jsx("p", { className: "text-[11px] leading-snug text-muted-foreground", children: "Choose a Connector above to list its actions." }))] }));
 }
 /**
  * Inspector field wrapper: a labelled reference combobox. A polymorphic ref is

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

@@ -21,7 +21,6 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  * auto-rewritten — callers should re-validate downstream.
  */
 import * as React from 'react';
-import { slugify } from '../createDerive';
 import { useMetadataClient } from '../useMetadata';
 import { InspectorShell, InspectorReorderButtons, InspectorTextField, InspectorNumberField, InspectorSelectField, InspectorCheckboxField, InspectorRemoveButton, InspectorEmptyState, moveArray, } from './_shared';
 import { Button, Input, Label, Badge } from '@object-ui/components';
@@ -128,28 +127,33 @@ export function ObjectFieldInspector({ selection, draft, onPatch, onClearSelecti
         writeView({ shape: view.shape, entries: nextEntries });
         onSelectionChange?.({ kind: 'field', id: nextName, label: String(def.label ?? nextName) });
     };
-    // Derive the API name from the label (on blur, so we use the complete
-    // string — not per keystroke, which would churn the field key) while the
-    // name is still an auto-generated default and the user hasn't customised it.
-    // Mirrors the object Name behaviour; slugify() returns '' for non-Latin
-    // labels, in which case the unique default name is kept.
-    const maybeDeriveName = (label) => {
+    // Derive the API name from the label live, per keystroke — with
+    // toFieldNameLoose (prefix-stable, unlike slugify which trims trailing
+    // underscores and would fight mid-word typing) — while the name is still
+    // an auto-generated default and the user hasn't customised it. Mirrors the
+    // object/app Name behaviour. toFieldNameLoose returns '' for non-Latin
+    // labels, in which case the unique default name is kept. Pure — the
+    // caller applies the label and (if any) the derived name in one write,
+    // since two separate writeView() calls from the same stale `entry` closure
+    // would have the second clobber the first.
+    const deriveNameFor = (label) => {
         if (readOnly)
-            return;
+            return null;
         const base = type === 'select' ? 'status' : type;
         const isAutoName = entry.name === base ||
-            (entry.name.startsWith(`${base}_`) && /^\d+$/.test(entry.name.slice(base.length + 1)));
+            (entry.name.startsWith(`${base}_`) && /^\d+$/.test(entry.name.slice(base.length + 1))) ||
+            // Freshly added fields are named by nextFieldName() as `field_<N>`
+            // (StudioDesignSurface.tsx), independent of the field's type — match
+            // that scheme too, or a type-typed rename right after add never derives.
+            /^field_\d+$/.test(entry.name);
         if (!isAutoName)
-            return;
-        const derived = slugify(label);
+            return null;
+        const derived = toFieldNameLoose(label);
         if (!derived || derived === entry.name)
-            return;
+            return null;
         if (view.entries.some((e, i) => i !== idx && e.name === derived))
-            return;
-        const nextEntries = [...view.entries];
-        nextEntries[idx] = { ...entry, name: derived };
-        writeView({ shape: view.shape, entries: nextEntries });
-        onSelectionChange?.({ kind: 'field', id: derived, label: String(def.label ?? derived) });
+            return null;
+        return derived;
     };
     const removeField = () => {
         const nextEntries = view.entries.filter((_, i) => i !== idx);
@@ -201,7 +205,19 @@ export function ObjectFieldInspector({ selection, draft, onPatch, onClearSelecti
             label: typeof def.label === 'string' ? def.label : entry.name,
         }), onClick: removeField, disabled: readOnly }));
     const typeMetaLabel = isZh(locale) ? typeMeta?.labelZh : typeMeta?.label;
-    return (_jsxs(InspectorShell, { kindLabel: tr('designer.field.kind'), title: typeof def.label === 'string' && def.label ? def.label : entry.name, onClose: onClearSelection, closeLabel: tr('designer.field.close'), headerActions: headerActions, footer: footer, children: [_jsxs(Section, { title: tr('designer.field.section.basic'), children: [_jsx(InspectorTextField, { label: tr('designer.field.apiName'), value: entry.name, onCommit: setKey, disabled: readOnly, mono: true, testId: "field-apiname-input" }), _jsx(InspectorTextField, { label: tr('designer.field.label'), value: typeof def.label === 'string' ? def.label : '', onCommit: (v) => patchDef({ label: v }), onBlur: maybeDeriveName, disabled: readOnly, testId: "field-label-input" }), _jsx(InspectorSelectField, { label: tr('designer.field.type'), value: type, options: typeOptions, onCommit: (v) => patchDef({ type: v }), disabled: readOnly }), _jsxs("div", { className: "flex items-center gap-4 pt-1", children: [_jsx(InspectorCheckboxField, { label: tr('designer.field.required'), value: !!def.required, onCommit: (v) => patchDef({ required: v || undefined }), disabled: readOnly }), _jsx(InspectorCheckboxField, { label: tr('designer.field.unique'), value: !!def.unique, onCommit: (v) => patchDef({ unique: v || undefined }), disabled: readOnly })] }), _jsx(TextareaField, { label: tr('designer.field.description'), value: typeof def.description === 'string' ? def.description : '', onCommit: (v) => patchDef({ description: v || undefined }), disabled: readOnly, rows: 2 }), defaultValueKind(type) && (_jsx(DefaultValueField, { kind: defaultValueKind(type), value: def.defaultValue, options: options, onCommit: (v) => patchDef({ defaultValue: v }), disabled: readOnly, locale: locale })), _jsx(TextareaField, { label: tr('designer.field.helpText'), value: typeof def.inlineHelpText === 'string' ? def.inlineHelpText : '', onCommit: (v) => patchDef({ inlineHelpText: v || undefined }), disabled: readOnly, rows: 2, placeholder: tr('designer.field.helpTextPlaceholder') })] }), (isPicklist(type) || isLookup(type) || isComputed(type) || isNumeric(type) || isTexty(type)) && (_jsxs(Section, { title: tFormat('designer.field.section.options', locale, { type: typeMetaLabel ?? type }), children: [isPicklist(type) && (_jsx(OptionsEditor, { options: options, onChange: patchOptions, disabled: readOnly, locale: locale }, entry.name)), isLookup(type) && (_jsxs(_Fragment, { children: [_jsx(ObjectPicker, { label: tr('designer.field.relatedObject'), value: typeof def.reference === 'string' ? def.reference : '', options: objectOptions, onCommit: (v) => patchDef({ reference: v || undefined }), disabled: readOnly, placeholder: tr('designer.field.objectNamePlaceholder') }), _jsx(InspectorTextField, { label: tr('designer.field.relationshipName'), value: typeof def.relationshipName === 'string' ? def.relationshipName : '', onCommit: (v) => patchDef({ relationshipName: v || undefined }), disabled: readOnly, placeholder: tr('designer.field.relationshipNameHint') }), _jsx(LookupConfigFields, { def: def, patchDef: patchDef, hostFieldNames: view.entries.map((e) => e.name).filter((n) => n !== entry.name), readOnly: readOnly, locale: locale })] })), isComputed(type) && (_jsx(TextareaField, { label: tr('designer.field.formula'), value: typeof def.formula === 'string' ? def.formula : '', onCommit: (v) => patchDef({ formula: v || undefined }), disabled: readOnly, rows: 4, mono: true, placeholder: "record.amount * 0.2" })), isNumeric(type) && (_jsxs("div", { className: "grid grid-cols-2 gap-2", children: [_jsx(InspectorNumberField, { label: tr('designer.field.precision'), value: typeof def.precision === 'number' ? def.precision : undefined, onCommit: (v) => patchDef({ precision: v }), disabled: readOnly }), _jsx(InspectorNumberField, { label: tr('designer.field.scale'), value: typeof def.scale === 'number' ? def.scale : undefined, onCommit: (v) => patchDef({ scale: v }), disabled: readOnly }), _jsx(InspectorNumberField, { label: tr('designer.field.min'), value: typeof def.min === 'number' ? def.min : undefined, onCommit: (v) => patchDef({ min: v }), disabled: readOnly }), _jsx(InspectorNumberField, { label: tr('designer.field.max'), value: typeof def.max === 'number' ? def.max : undefined, onCommit: (v) => patchDef({ max: v }), disabled: readOnly })] })), isTexty(type) && (_jsxs("div", { className: "grid grid-cols-2 gap-2", children: [_jsx(InspectorNumberField, { label: tr('designer.field.minLength'), value: typeof def.minLength === 'number' ? def.minLength : undefined, onCommit: (v) => patchDef({ minLength: v }), disabled: readOnly, placeholder: "0" }), _jsx(InspectorNumberField, { label: tr('designer.field.maxLength'), value: typeof def.maxLength === 'number' ? def.maxLength : undefined, onCommit: (v) => patchDef({ maxLength: v }), disabled: readOnly, placeholder: "255" })] }))] })), _jsxs(Section, { title: tr('designer.field.section.advanced'), children: [_jsxs("div", { className: "grid grid-cols-2 gap-2", children: [_jsx(InspectorCheckboxField, { label: tr('designer.field.readonly'), value: !!def.readonly, onCommit: (v) => patchDef({ readonly: v || undefined }), disabled: readOnly }), _jsx(InspectorCheckboxField, { label: tr('designer.field.hidden'), value: !!def.hidden, onCommit: (v) => patchDef({ hidden: v || undefined }), disabled: readOnly }), _jsx(InspectorCheckboxField, { label: tr('designer.field.indexed'), value: !!def.indexed, onCommit: (v) => patchDef({ indexed: v || undefined }), disabled: readOnly }), _jsx(InspectorCheckboxField, { label: tr('designer.field.externalId'), value: !!def.externalId, onCommit: (v) => patchDef({ externalId: v || undefined }), disabled: readOnly }), _jsx(InspectorCheckboxField, { label: tr('designer.field.trackHistory'), value: !!def.trackHistory, onCommit: (v) => patchDef({ trackHistory: v || undefined }), disabled: readOnly })] }), _jsx(InspectorTextField, { label: tr('designer.field.placeholder'), value: typeof def.placeholder === 'string' ? def.placeholder : '', onCommit: (v) => patchDef({ placeholder: v || undefined }), disabled: readOnly }), _jsxs("div", { className: "space-y-1", children: [_jsx(InspectorTextField, { label: tr('designer.field.conditionalRequired'), value: typeof def.conditionalRequired === 'string' ? def.conditionalRequired : '', onCommit: (v) => patchDef({ conditionalRequired: v || undefined }), disabled: readOnly, mono: true, placeholder: "record.status == 'closed'" }), _jsx("p", { className: "text-[11px] text-muted-foreground/80 px-0.5 leading-snug", children: tr('designer.field.conditionalRequiredHint') })] }), fieldGroups.length > 0 && (_jsx(InspectorSelectField, { label: tr('designer.field.group'), value: typeof def.group === 'string' ? def.group : '', options: [
+    return (_jsxs(InspectorShell, { kindLabel: tr('designer.field.kind'), title: typeof def.label === 'string' && def.label ? def.label : entry.name, onClose: onClearSelection, closeLabel: tr('designer.field.close'), headerActions: headerActions, footer: footer, children: [_jsxs(Section, { title: tr('designer.field.section.basic'), children: [_jsx(InspectorTextField, { label: tr('designer.field.apiName'), value: entry.name, onCommit: setKey, disabled: readOnly, mono: true, testId: "field-apiname-input" }), _jsx(InspectorTextField, { label: tr('designer.field.label'), value: typeof def.label === 'string' ? def.label : '', onCommit: (v) => {
+                            const derivedName = deriveNameFor(v);
+                            const nextEntries = [...view.entries];
+                            nextEntries[idx] = {
+                                ...entry,
+                                name: derivedName ?? entry.name,
+                                def: { ...def, label: v },
+                            };
+                            writeView({ shape: view.shape, entries: nextEntries });
+                            if (derivedName) {
+                                onSelectionChange?.({ kind: 'field', id: derivedName, label: v });
+                            }
+                        }, disabled: readOnly, testId: "field-label-input" }), _jsx(InspectorSelectField, { label: tr('designer.field.type'), value: type, options: typeOptions, onCommit: (v) => patchDef({ type: v }), disabled: readOnly }), _jsxs("div", { className: "flex items-center gap-4 pt-1", children: [_jsx(InspectorCheckboxField, { label: tr('designer.field.required'), value: !!def.required, onCommit: (v) => patchDef({ required: v || undefined }), disabled: readOnly }), _jsx(InspectorCheckboxField, { label: tr('designer.field.unique'), value: !!def.unique, onCommit: (v) => patchDef({ unique: v || undefined }), disabled: readOnly })] }), _jsx(TextareaField, { label: tr('designer.field.description'), value: typeof def.description === 'string' ? def.description : '', onCommit: (v) => patchDef({ description: v || undefined }), disabled: readOnly, rows: 2 }), defaultValueKind(type) && (_jsx(DefaultValueField, { kind: defaultValueKind(type), value: def.defaultValue, options: options, onCommit: (v) => patchDef({ defaultValue: v }), disabled: readOnly, locale: locale })), _jsx(TextareaField, { label: tr('designer.field.helpText'), value: typeof def.inlineHelpText === 'string' ? def.inlineHelpText : '', onCommit: (v) => patchDef({ inlineHelpText: v || undefined }), disabled: readOnly, rows: 2, placeholder: tr('designer.field.helpTextPlaceholder') })] }), (isPicklist(type) || isLookup(type) || isComputed(type) || isNumeric(type) || isTexty(type)) && (_jsxs(Section, { title: tFormat('designer.field.section.options', locale, { type: typeMetaLabel ?? type }), children: [isPicklist(type) && (_jsx(OptionsEditor, { options: options, onChange: patchOptions, disabled: readOnly, locale: locale }, entry.name)), isLookup(type) && (_jsxs(_Fragment, { children: [_jsx(ObjectPicker, { label: tr('designer.field.relatedObject'), value: typeof def.reference === 'string' ? def.reference : '', options: objectOptions, onCommit: (v) => patchDef({ reference: v || undefined }), disabled: readOnly, placeholder: tr('designer.field.objectNamePlaceholder') }), _jsx(InspectorTextField, { label: tr('designer.field.relationshipName'), value: typeof def.relationshipName === 'string' ? def.relationshipName : '', onCommit: (v) => patchDef({ relationshipName: v || undefined }), disabled: readOnly, placeholder: tr('designer.field.relationshipNameHint') }), _jsx(LookupConfigFields, { def: def, patchDef: patchDef, hostFieldNames: view.entries.map((e) => e.name).filter((n) => n !== entry.name), readOnly: readOnly, locale: locale })] })), isComputed(type) && (_jsx(TextareaField, { label: tr('designer.field.formula'), value: typeof def.formula === 'string' ? def.formula : '', onCommit: (v) => patchDef({ formula: v || undefined }), disabled: readOnly, rows: 4, mono: true, placeholder: "record.amount * 0.2" })), isNumeric(type) && (_jsxs("div", { className: "grid grid-cols-2 gap-2", children: [_jsx(InspectorNumberField, { label: tr('designer.field.precision'), value: typeof def.precision === 'number' ? def.precision : undefined, onCommit: (v) => patchDef({ precision: v }), disabled: readOnly }), _jsx(InspectorNumberField, { label: tr('designer.field.scale'), value: typeof def.scale === 'number' ? def.scale : undefined, onCommit: (v) => patchDef({ scale: v }), disabled: readOnly }), _jsx(InspectorNumberField, { label: tr('designer.field.min'), value: typeof def.min === 'number' ? def.min : undefined, onCommit: (v) => patchDef({ min: v }), disabled: readOnly }), _jsx(InspectorNumberField, { label: tr('designer.field.max'), value: typeof def.max === 'number' ? def.max : undefined, onCommit: (v) => patchDef({ max: v }), disabled: readOnly })] })), isTexty(type) && (_jsxs("div", { className: "grid grid-cols-2 gap-2", children: [_jsx(InspectorNumberField, { label: tr('designer.field.minLength'), value: typeof def.minLength === 'number' ? def.minLength : undefined, onCommit: (v) => patchDef({ minLength: v }), disabled: readOnly, placeholder: "0" }), _jsx(InspectorNumberField, { label: tr('designer.field.maxLength'), value: typeof def.maxLength === 'number' ? def.maxLength : undefined, onCommit: (v) => patchDef({ maxLength: v }), disabled: readOnly, placeholder: "255" })] }))] })), _jsxs(Section, { title: tr('designer.field.section.advanced'), children: [_jsxs("div", { className: "grid grid-cols-2 gap-2", children: [_jsx(InspectorCheckboxField, { label: tr('designer.field.readonly'), value: !!def.readonly, onCommit: (v) => patchDef({ readonly: v || undefined }), disabled: readOnly }), _jsx(InspectorCheckboxField, { label: tr('designer.field.hidden'), value: !!def.hidden, onCommit: (v) => patchDef({ hidden: v || undefined }), disabled: readOnly }), _jsx(InspectorCheckboxField, { label: tr('designer.field.indexed'), value: !!def.indexed, onCommit: (v) => patchDef({ indexed: v || undefined }), disabled: readOnly }), _jsx(InspectorCheckboxField, { label: tr('designer.field.externalId'), value: !!def.externalId, onCommit: (v) => patchDef({ externalId: v || undefined }), disabled: readOnly }), _jsx(InspectorCheckboxField, { label: tr('designer.field.trackHistory'), value: !!def.trackHistory, onCommit: (v) => patchDef({ trackHistory: v || undefined }), disabled: readOnly })] }), _jsx(InspectorTextField, { label: tr('designer.field.placeholder'), value: typeof def.placeholder === 'string' ? def.placeholder : '', onCommit: (v) => patchDef({ placeholder: v || undefined }), disabled: readOnly }), _jsxs("div", { className: "space-y-1", children: [_jsx(InspectorTextField, { label: tr('designer.field.conditionalRequired'), value: typeof def.conditionalRequired === 'string' ? def.conditionalRequired : '', onCommit: (v) => patchDef({ conditionalRequired: v || undefined }), disabled: readOnly, mono: true, placeholder: "record.status == 'closed'" }), _jsx("p", { className: "text-[11px] text-muted-foreground/80 px-0.5 leading-snug", children: tr('designer.field.conditionalRequiredHint') })] }), fieldGroups.length > 0 && (_jsx(InspectorSelectField, { label: tr('designer.field.group'), value: typeof def.group === 'string' ? def.group : '', options: [
                             { value: '', label: tr('designer.field.noGroup') },
                             ...fieldGroups
                                 .filter((g) => typeof g.key === 'string')
@@ -265,7 +281,7 @@ function OptionsEditor({ options, onChange, disabled, locale, }) {
     const remove = (i) => commit(rows.filter((_, j) => j !== i));
     const move = (i, to) => commit(moveArray(rows, i, to));
     const add = () => commit([...rows, { value: '', label: '' }]);
-    return (_jsxs("div", { className: "space-y-1.5", children: [_jsxs("div", { className: "flex items-center justify-between", children: [_jsx(Label, { className: "text-xs text-muted-foreground", children: t('designer.field.picklistValues', locale) }), _jsx(Badge, { variant: "outline", className: "text-[10px]", children: rows.length })] }), rows.length === 0 ? (_jsx("div", { className: "text-[11px] italic text-muted-foreground px-1", children: t('designer.field.noValues', locale) })) : (_jsx("div", { className: "space-y-1", children: rows.map((o, i) => (_jsxs("div", { className: "flex items-center gap-1", children: [_jsx(Input, { value: o.value, onChange: (e) => update(i, { value: e.target.value }), placeholder: t('designer.field.optValue', locale), disabled: disabled, className: "h-7 text-xs font-mono flex-1" }), _jsx(Input, { value: o.label ?? '', onChange: (e) => update(i, { label: e.target.value }), placeholder: t('designer.field.optLabel', locale), disabled: disabled, className: "h-7 text-xs flex-1" }), _jsx("input", { type: "color", value: o.color ?? '#cccccc', onChange: (e) => update(i, { color: e.target.value }), disabled: disabled, className: "h-7 w-7 rounded border bg-background cursor-pointer p-0.5", title: t('designer.field.optColor', locale) }), _jsx(Button, { variant: "ghost", size: "sm", className: "h-7 w-7 p-0", onClick: () => move(i, i - 1), disabled: disabled || i === 0, "aria-label": t('designer.field.moveUp', locale), children: _jsx(ArrowUp, { className: "h-3 w-3" }) }), _jsx(Button, { variant: "ghost", size: "sm", className: "h-7 w-7 p-0", onClick: () => move(i, i + 1), disabled: disabled || i === rows.length - 1, "aria-label": t('designer.field.moveDown', locale), children: _jsx(ArrowDown, { className: "h-3 w-3" }) }), _jsx(Button, { variant: "ghost", size: "sm", className: "h-7 w-7 p-0 text-destructive", onClick: () => remove(i), disabled: disabled, "aria-label": t('designer.field.removeValue', locale), children: _jsx(X, { className: "h-3 w-3" }) })] }, i))) })), !disabled && (_jsxs(Button, { variant: "outline", size: "sm", className: "h-7 gap-1 text-xs", onClick: add, children: [_jsx(Plus, { className: "h-3 w-3" }), t('designer.field.addValue', locale)] }))] }));
+    return (_jsxs("div", { className: "space-y-1.5", children: [_jsxs("div", { className: "flex items-center justify-between", children: [_jsx(Label, { className: "text-xs text-muted-foreground", children: t('designer.field.picklistValues', locale) }), _jsx(Badge, { variant: "outline", className: "text-[10px]", children: rows.length })] }), rows.length === 0 ? (_jsx("div", { className: "text-[11px] italic text-muted-foreground px-1", children: t('designer.field.noValues', locale) })) : (_jsx("div", { className: "space-y-1.5", children: rows.map((o, i) => (_jsxs("div", { className: "rounded-md border border-border/60 p-1.5 space-y-1", children: [_jsxs("div", { className: "flex items-center gap-1", children: [_jsx(Input, { value: o.value, onChange: (e) => update(i, { value: e.target.value }), placeholder: t('designer.field.optValue', locale), disabled: disabled, className: "h-7 min-w-0 flex-1 text-xs font-mono" }), _jsx(Input, { value: o.label ?? '', onChange: (e) => update(i, { label: e.target.value }), placeholder: t('designer.field.optLabel', locale), disabled: disabled, className: "h-7 min-w-0 flex-1 text-xs" })] }), _jsxs("div", { className: "flex items-center gap-1", children: [_jsx("input", { type: "color", value: o.color ?? '#cccccc', onChange: (e) => update(i, { color: e.target.value }), disabled: disabled, className: "h-6 w-6 rounded border bg-background cursor-pointer p-0.5", title: t('designer.field.optColor', locale) }), _jsx("span", { className: "flex-1" }), _jsx(Button, { variant: "ghost", size: "sm", className: "h-6 w-6 p-0", onClick: () => move(i, i - 1), disabled: disabled || i === 0, "aria-label": t('designer.field.moveUp', locale), children: _jsx(ArrowUp, { className: "h-3 w-3" }) }), _jsx(Button, { variant: "ghost", size: "sm", className: "h-6 w-6 p-0", onClick: () => move(i, i + 1), disabled: disabled || i === rows.length - 1, "aria-label": t('designer.field.moveDown', locale), children: _jsx(ArrowDown, { className: "h-3 w-3" }) }), _jsx(Button, { variant: "ghost", size: "sm", className: "h-6 w-6 p-0 text-destructive", onClick: () => remove(i), disabled: disabled, "aria-label": t('designer.field.removeValue', locale), children: _jsx(X, { className: "h-3 w-3" }) })] })] }, i))) })), !disabled && (_jsxs(Button, { variant: "outline", size: "sm", className: "h-7 gap-1 text-xs", onClick: add, children: [_jsx(Plus, { className: "h-3 w-3" }), t('designer.field.addValue', locale)] }))] }));
 }
 /* ─────────────── Lookup picker config (displayField / filters / dependent) ─────────────── */
 const LOOKUP_OPERATORS = [

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

@@ -42,7 +42,7 @@ export type FlowConfigFieldKind = 'text' | 'expression' | 'number' | 'boolean' |
  * Kinds that have no catalog in the current tenant simply degrade to a plain
  * text box — the control is always an editable combobox, never a hard dropdown.
  */
-export type ReferenceKind = 'object' | 'object-field' | 'flow' | 'role' | 'node' | 'user' | 'team' | 'queue' | 'department' | 'connector' | 'email-template';
+export type ReferenceKind = 'object' | 'object-field' | 'flow' | 'role' | 'node' | 'user' | 'team' | 'queue' | 'department' | 'connector' | 'connector-action' | 'email-template';
 export interface FlowReferenceSpec {
     /**
      * Concrete reference kind. Omit when the kind is *polymorphic* — chosen at
@@ -57,6 +57,13 @@ export interface FlowReferenceSpec {
      *     the object name (e.g. CRUD nodes resolve from their own `objectName`).
      */
     objectSource?: string;
+    /**
+     * For `connector-action` only: the sibling key (on this node's
+     * `connectorConfig` block) holding the chosen connector's name. Defaults to
+     * `'connectorId'`. The picker lists THAT connector's actions (from the runtime
+     * connector descriptors); with no connector chosen it degrades to free text.
+     */
+    connectorSource?: string;
     /**
      * Polymorphic reference: the kind is selected at render time by the value of
      * a sibling field/column named `kindFrom`, looked up in {@link map}. A value

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

@@ -347,9 +347,10 @@ const FLOW_NODE_CONFIG = {
     ],
     connector_action: [
         at('connectorConfig', 'connectorId', 'Connector', 'reference', { ref: { kind: 'connector' }, placeholder: 'slack · email · salesforce' }),
-        // actionId is polymorphic on the chosen connector and has no flat catalog
+        // actionId is polymorphic on the chosen connector: the picker lists THAT
+        // connector's actions (runtime descriptors), degrading to free text if none.
         // (a deliberate open extension point) — stays free text.
-        at('connectorConfig', 'actionId', 'Action', 'text', { placeholder: 'sendMessage · send' }),
+        at('connectorConfig', 'actionId', 'Action', 'reference', { ref: { kind: 'connector-action', connectorSource: 'connectorId' }, placeholder: 'sendMessage · send' }),
         at('connectorConfig', 'input', 'Input', 'keyValue', { help: 'Mapped inputs for the connector action.' }),
         { id: 'timeoutMs', path: ['timeoutMs'], label: 'Timeout (ms)', kind: 'number', placeholder: '30000' },
     ],

package/dist/views/metadata-admin/inspectors/nav-target.d.ts

@@ -0,0 +1,52 @@
+/**
+ * Nav-item target resolution (#2245) — the pure logic behind
+ * AppNavInspector's type + per-type target editing.
+ *
+ * The nav contract is a discriminated union on `type`; each type carries its
+ * own typed target field. `object` items additionally have FOUR mutually
+ * exclusive landing modes matching resolveHref's precedence
+ * (`recordId` → `filters` → `viewName` → bare default). The mode is NEVER
+ * persisted — it is derived from which fields are present — and switching
+ * type/mode explicitly clears the other target fields plus the legacy
+ * off-spec keys (`path` / `kind` / aliases), so every edit normalizes the
+ * item to spec shape ("edit is the migration").
+ */
+/** Nav item types the inspector offers (spec union minus separator/action). */
+export declare const NAV_ITEM_TYPES: readonly ["object", "page", "dashboard", "report", "url", "group"];
+export type NavItemType = (typeof NAV_ITEM_TYPES)[number];
+/** Landing modes for `type: 'object'`, in resolveHref precedence order. */
+export declare const OBJECT_TARGET_MODES: readonly ["default", "view", "record", "filters"];
+export type ObjectTargetMode = (typeof OBJECT_TARGET_MODES)[number];
+/**
+ * Per-type target descriptor: which field the picker writes and which
+ * metadata list feeds its options (`client.list(metaType)`); free-text
+ * types have no metaType.
+ */
+export declare const NAV_TYPE_TARGETS: Record<NavItemType, {
+    targetKey?: string;
+    metaType?: string;
+}>;
+/**
+ * Infer the effective type of a (possibly legacy) nav node for display:
+ * spec `type` wins; else legacy `kind`; else the presence of typed or
+ * legacy target fields; else children ⇒ group; else null (unset).
+ */
+export declare function inferNavItemType(node: Record<string, unknown>): NavItemType | null;
+/**
+ * Derive an object item's landing mode from field presence, following
+ * resolveHref's precedence — the mode is a projection, never stored.
+ */
+export declare function deriveObjectTargetMode(node: Record<string, unknown>): ObjectTargetMode;
+/**
+ * The patch that clears everything EXCEPT the fields the given type+mode
+ * legitimately owns. Always includes the legacy keys. Spread this before
+ * the fields being set so a type/mode switch leaves no stale target behind.
+ */
+export declare function clearedTargetPatch(keep?: ReadonlyArray<string>): Record<string, undefined>;
+/** Fields each object landing mode owns (besides objectName). */
+export declare const OBJECT_MODE_FIELDS: Record<ObjectTargetMode, ReadonlyArray<string>>;
+/**
+ * Ensure a spec-valid snake_case `id`. Existing ids are kept; otherwise one
+ * is derived from the target/label and uniqued against sibling ids.
+ */
+export declare function ensureNavId(node: Record<string, unknown>, siblings: ReadonlyArray<Record<string, unknown>>, seed?: string): string;

package/dist/views/metadata-admin/inspectors/nav-target.js

@@ -0,0 +1,149 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+/**
+ * Nav-item target resolution (#2245) — the pure logic behind
+ * AppNavInspector's type + per-type target editing.
+ *
+ * The nav contract is a discriminated union on `type`; each type carries its
+ * own typed target field. `object` items additionally have FOUR mutually
+ * exclusive landing modes matching resolveHref's precedence
+ * (`recordId` → `filters` → `viewName` → bare default). The mode is NEVER
+ * persisted — it is derived from which fields are present — and switching
+ * type/mode explicitly clears the other target fields plus the legacy
+ * off-spec keys (`path` / `kind` / aliases), so every edit normalizes the
+ * item to spec shape ("edit is the migration").
+ */
+/** Nav item types the inspector offers (spec union minus separator/action). */
+export const NAV_ITEM_TYPES = ['object', 'page', 'dashboard', 'report', 'url', 'group'];
+/** Landing modes for `type: 'object'`, in resolveHref precedence order. */
+export const OBJECT_TARGET_MODES = ['default', 'view', 'record', 'filters'];
+/**
+ * Per-type target descriptor: which field the picker writes and which
+ * metadata list feeds its options (`client.list(metaType)`); free-text
+ * types have no metaType.
+ */
+export const NAV_TYPE_TARGETS = {
+    object: { targetKey: 'objectName', metaType: 'object' },
+    page: { targetKey: 'pageName', metaType: 'page' },
+    dashboard: { targetKey: 'dashboardName', metaType: 'dashboard' },
+    report: { targetKey: 'reportName', metaType: 'report' },
+    url: { targetKey: 'url' },
+    group: {},
+};
+/** Typed target fields across the whole union. */
+const TYPED_TARGET_FIELDS = [
+    'objectName',
+    'viewName',
+    'recordId',
+    'recordMode',
+    'filters',
+    'pageName',
+    'dashboardName',
+    'reportName',
+    'url',
+    'target',
+    'params',
+];
+/**
+ * Legacy / off-spec keys that runtime resolution ignores and save-time
+ * validation rejects. Cleared on EVERY inspector edit so stale keys never
+ * hijack behavior or fail validation (`navigation.0: Invalid input`).
+ */
+const LEGACY_KEYS = ['path', 'kind', 'href', 'route', 'object', 'page', 'dashboard', 'report'];
+/**
+ * Map a legacy `kind` value (the old inspector's vocabulary) to the spec
+ * type; `link` was never a spec member — it maps to `url`.
+ */
+const LEGACY_KIND_TO_TYPE = {
+    object: 'object',
+    page: 'page',
+    dashboard: 'dashboard',
+    report: 'report',
+    link: 'url',
+    url: 'url',
+    group: 'group',
+};
+/**
+ * Infer the effective type of a (possibly legacy) nav node for display:
+ * spec `type` wins; else legacy `kind`; else the presence of typed or
+ * legacy target fields; else children ⇒ group; else null (unset).
+ */
+export function inferNavItemType(node) {
+    const t = node.type;
+    if (typeof t === 'string' && NAV_ITEM_TYPES.includes(t)) {
+        return t;
+    }
+    const kind = node.kind;
+    if (typeof kind === 'string' && LEGACY_KIND_TO_TYPE[kind])
+        return LEGACY_KIND_TO_TYPE[kind];
+    if (node.objectName || node.object)
+        return 'object';
+    if (node.pageName || node.page)
+        return 'page';
+    if (node.dashboardName || node.dashboard)
+        return 'dashboard';
+    if (node.reportName || node.report)
+        return 'report';
+    if (node.url || node.href)
+        return 'url';
+    if (Array.isArray(node.children) && node.children.length > 0)
+        return 'group';
+    const path = node.path;
+    if (typeof path === 'string' && /^https?:/i.test(path))
+        return 'url';
+    return null;
+}
+/**
+ * Derive an object item's landing mode from field presence, following
+ * resolveHref's precedence — the mode is a projection, never stored.
+ */
+export function deriveObjectTargetMode(node) {
+    if (node.recordId)
+        return 'record';
+    const filters = node.filters;
+    if (filters && typeof filters === 'object' && !Array.isArray(filters))
+        return 'filters';
+    if (node.viewName)
+        return 'view';
+    return 'default';
+}
+/**
+ * The patch that clears everything EXCEPT the fields the given type+mode
+ * legitimately owns. Always includes the legacy keys. Spread this before
+ * the fields being set so a type/mode switch leaves no stale target behind.
+ */
+export function clearedTargetPatch(keep = []) {
+    const patch = {};
+    for (const key of [...TYPED_TARGET_FIELDS, ...LEGACY_KEYS]) {
+        if (!keep.includes(key))
+            patch[key] = undefined;
+    }
+    return patch;
+}
+/** Fields each object landing mode owns (besides objectName). */
+export const OBJECT_MODE_FIELDS = {
+    default: ['objectName'],
+    view: ['objectName', 'viewName'],
+    record: ['objectName', 'recordId', 'recordMode'],
+    filters: ['objectName', 'filters'],
+};
+/**
+ * Ensure a spec-valid snake_case `id`. Existing ids are kept; otherwise one
+ * is derived from the target/label and uniqued against sibling ids.
+ */
+export function ensureNavId(node, siblings, seed) {
+    const existing = node.id;
+    if (typeof existing === 'string' && existing)
+        return existing;
+    const raw = (seed ?? String(node.objectName ?? node.label ?? 'item'))
+        .toLowerCase()
+        .replace(/[^a-z0-9]+/g, '_')
+        .replace(/^_+|_+$/g, '') || 'item';
+    const base = `nav_${raw}`;
+    const taken = new Set(siblings.map((s) => (typeof s.id === 'string' ? s.id : '')).filter(Boolean));
+    if (!taken.has(base))
+        return base;
+    let n = 2;
+    while (taken.has(`${base}_${n}`))
+        n++;
+    return `${base}_${n}`;
+}

package/dist/views/metadata-admin/nav-selection.d.ts

@@ -0,0 +1,20 @@
+/** Search param carrying the designer's selected element. */
+export declare const DESIGNER_SEL_PARAM = "sel";
+/** Parse a `sel` param value; returns the nav item id for `nav:<id>`. */
+export declare function parseNavSelParam(value: string | null | undefined): string | null;
+export declare function formatNavSelParam(navId: string): string;
+/**
+ * Locate a nav item by its `id` across all accepted root keys, returning
+ * the positional selection id the canvas/inspector pair uses
+ * (`<rootKey>[i]` / `<rootKey>[i].children[j]`), or null when absent.
+ */
+export declare function findNavPositionById(draft: Record<string, unknown>, navId: string): {
+    selectionId: string;
+    label?: string;
+} | null;
+/**
+ * Read the nav item `id` at a positional selection id (the inverse of
+ * {@link findNavPositionById}); null when the path is invalid or the node
+ * has no id.
+ */
+export declare function navIdAtPosition(draft: Record<string, unknown>, positionalId: string): string | null;

package/dist/views/metadata-admin/nav-selection.js

@@ -0,0 +1,81 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+/**
+ * Nav-item deep-link selection (#2272).
+ *
+ * The designer's internal selection ids are POSITIONAL (`navigation[2]`,
+ * `nav[0].children[1]`) — cheap for canvas/inspector wiring but unstable:
+ * they drift on reorder and mean nothing outside one editing session. The
+ * EXTERNAL contract is the nav item's spec-required snake_case `id`,
+ * carried in the URL as `?sel=nav:<id>`. These helpers translate between
+ * the two at the designer boundary; positions never leave component state.
+ */
+import { APP_NAV_ROOT_KEYS } from './inspectors/AppNavInspector';
+/** Search param carrying the designer's selected element. */
+export const DESIGNER_SEL_PARAM = 'sel';
+/** Parse a `sel` param value; returns the nav item id for `nav:<id>`. */
+export function parseNavSelParam(value) {
+    if (!value || !value.startsWith('nav:'))
+        return null;
+    const id = value.slice(4);
+    return id.length > 0 ? id : null;
+}
+export function formatNavSelParam(navId) {
+    return `nav:${navId}`;
+}
+/**
+ * Locate a nav item by its `id` across all accepted root keys, returning
+ * the positional selection id the canvas/inspector pair uses
+ * (`<rootKey>[i]` / `<rootKey>[i].children[j]`), or null when absent.
+ */
+export function findNavPositionById(draft, navId) {
+    const walk = (nodes, prefix) => {
+        for (let i = 0; i < nodes.length; i++) {
+            const node = nodes[i];
+            if (!node || typeof node !== 'object')
+                continue;
+            const pos = `${prefix}[${i}]`;
+            if (node.id === navId) {
+                const label = node.label ?? node.title ?? node.name;
+                return { selectionId: pos, label: typeof label === 'string' ? label : undefined };
+            }
+            if (Array.isArray(node.children)) {
+                const hit = walk(node.children, `${pos}.children`);
+                if (hit)
+                    return hit;
+            }
+        }
+        return null;
+    };
+    for (const rootKey of APP_NAV_ROOT_KEYS) {
+        const arr = draft[rootKey];
+        if (!Array.isArray(arr))
+            continue;
+        const hit = walk(arr, rootKey);
+        if (hit)
+            return hit;
+    }
+    return null;
+}
+/**
+ * Read the nav item `id` at a positional selection id (the inverse of
+ * {@link findNavPositionById}); null when the path is invalid or the node
+ * has no id.
+ */
+export function navIdAtPosition(draft, positionalId) {
+    const segs = positionalId.split('.');
+    let node;
+    for (let s = 0; s < segs.length; s++) {
+        const m = /^([a-zA-Z_]\w*)\[(\d+)\]$/.exec(segs[s]);
+        if (!m)
+            return null;
+        const key = m[1];
+        const index = Number(m[2]);
+        const arr = s === 0 ? draft[key] : node?.[key];
+        if (!Array.isArray(arr))
+            return null;
+        node = arr[index];
+        if (!node || typeof node !== 'object')
+            return null;
+    }
+    return typeof node?.id === 'string' && node.id ? node.id : null;
+}

package/dist/views/metadata-admin/previews/AppNavCanvas.js

@@ -117,7 +117,15 @@ export function AppNavCanvas({ draft, rootKey, onPatch, selection, onSelectionCh
         if (!onPatch)
             return;
         const newLabel = t('engine.appNav.newItem', locale);
-        const newItem = { label: newLabel, path: '' };
+        // Spec invariants from birth (#2245): a snake_case `id` and a `type`
+        // (object is the 80% case per the app-composition guide) — never the
+        // old `{label, path:''}` placeholder that failed save validation. The
+        // item completes once the inspector's object picker fills `objectName`.
+        const taken = new Set(items.map((it) => (typeof it.id === 'string' ? it.id : '')).filter(Boolean));
+        let navId = `nav_item_${items.length + 1}`;
+        for (let n = items.length + 2; taken.has(navId); n++)
+            navId = `nav_item_${n}`;
+        const newItem = { id: navId, type: 'object', label: newLabel };
         const next = appendArray(items, newItem);
         setItems(next);
         onSelectionChange?.({

package/dist/views/metadata-admin/previews/AppPreview.js

@@ -80,8 +80,10 @@ export function AppPreview({ name, draft, editing, selection, onSelectionChange,
         }
         return { rootKey: null, navItems: [] };
     }, [draft]);
-    // For Add we need a root key even when empty — default to "nav".
-    const addRootKey = rootKey ?? 'nav';
+    // For Add we need a root key even when empty — default to `navigation`,
+    // the only root key the spec (AppSchema) actually accepts; `nav` /
+    // `tabs` / `items` are read-back tolerances, not write targets (#2245).
+    const addRootKey = rootKey ?? 'navigation';
     const designMode = !!(editing && onSelectionChange);
     const canEdit = designMode && !!onPatch;
     const selectedId = selection && selection.kind === 'nav' ? selection.id : null;