@qoretechnologies/reqraft 0.10.54 → 0.10.55-pr.115.g37abdfc

package/dist/components/form/engine/FormEngine.js

@@ -97,22 +97,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FormEngine = exports.getTypeAndCanBeNull = exports.flattenOptions = exports.fixOptions = exports.OptionsContext = exports.hasRequiredOptions = exports.fixOperatorValue = exports.getType = void 0;
+exports.FormEngine = exports.getTypeAndCanBeNull = exports.flattenOptions = exports.shouldEmitLocalValue = exports.agreementFromRebuild = exports.isMirrorOfValue = exports.fixOptions = exports.OptionsContext = exports.hasRequiredOptions = exports.getOptionFieldStorageType = exports.fixOperatorValue = exports.getType = exports.inheritedScopeFor = void 0;
 var react_1 = require("react");
 var jsx_runtime_1 = require("react/jsx-runtime");
 var reqore_1 = require("@qoretechnologies/reqore");
 var colors_1 = require("@qoretechnologies/reqore/dist/helpers/colors");
+var argumentPresence_1 = require("../expressions/argumentPresence");
+var typeChoices_1 = require("./typeChoices");
 var optionActions_1 = require("./optionActions");
 var rendererTypes_1 = require("./rendererTypes");
 var lodash_1 = require("lodash");
-var isArray_1 = __importDefault(require("lodash/isArray"));
 var map_1 = __importDefault(require("lodash/map"));
 var reduce_1 = __importDefault(require("lodash/reduce"));
 var size_1 = __importDefault(require("lodash/size"));
 var react_2 = __importStar(require("react"));
 var react_use_1 = require("react-use");
 var styled_components_1 = __importStar(require("styled-components"));
-var use_context_selector_1 = require("use-context-selector");
 var common_1 = require("../../../helpers/common");
 var options_1 = require("../../../helpers/options");
 var validations_1 = require("../../../helpers/validations");
@@ -124,13 +124,16 @@ var FocusedEditing_1 = require("../../FocusedEditing");
 var Select_1 = require("../fields/select/Select");
 var TemplateField_1 = require("../fields/template/TemplateField");
 var CompactRow_1 = require("./CompactRow");
+var FormFieldsSkeleton_1 = require("./FormFieldsSkeleton");
 var compactRowContext_1 = require("./compactRowContext");
 var compactRowStyles_1 = require("./compactRowStyles");
 var CompactToolbar_1 = require("./CompactToolbar");
 var compactToolbarContext_1 = require("./compactToolbarContext");
 var OptionFieldMessages_1 = require("./OptionFieldMessages");
+var optionsContext_1 = require("./optionsContext");
 var markdownRendererContext_1 = require("../../Description/markdownRendererContext");
 var OptionsHelpDialog_1 = require("./OptionsHelpDialog");
+var optionUiTypes_1 = require("../../../helpers/optionUiTypes");
 var readFirst_1 = require("./readFirst");
 /**
  * Resolve a field's `inherit_props` map against the current available
@@ -170,6 +173,43 @@ var resolveInheritProps = function (inheritProps, availableOptions, inheritedFro
     }
     return out;
 };
+/** One shared "nothing came down from above" bag. See `inheritedScopeFor`. */
+var NO_INHERITED_SCOPE = Object.freeze({});
+/**
+ * The inheritance bag ONE field forwards to any `arg_schema` sub-form it hosts:
+ * whatever the ancestor chain passed down, plus whatever this field's own
+ * `inherit_props` resolves to.
+ *
+ * Written as a function with a stable answer because it is a PROP, and a prop
+ * that is a new object on every render re-renders the field that receives it
+ * every time this form renders — for most fields, forever, over a value that
+ * never changed. It showed up in the console as `Template field kind Updated
+ * because: {inheritedFromParent}` repeating on a form nobody was touching:
+ * `kind` declares no `inherit_props` at all, so the bag it was handed was
+ * `{ ...(undefined ?? {}) }` — a fresh empty object each time, unequal to the
+ * last one, and `TemplateField` is memoised precisely so it does not re-render
+ * on a prop that did not change.
+ *
+ * So a field with nothing of its own to add forwards the bag it was HANDED,
+ * unchanged and unwrapped, and a form with no inherited scope at all forwards
+ * one shared frozen object rather than minting one per field per render.
+ *
+ * Mirrored in qorus-ide's `systemOptions.tsx` (which grew this treatment
+ * first); per the CLAUDE.md rule there, the forwarding logic is kept identical
+ * in both until FormEngine replaces that renderer.
+ *
+ * @param inheritProps the field's `inherit_props` map, if it declares one
+ * @param availableOptions this form's fields, where a sibling's value is read
+ * @param inheritedFromParent the bag threaded in from an outer form
+ */
+var inheritedScopeFor = function (inheritProps, availableOptions, inheritedFromParent) {
+    var resolved = resolveInheritProps(inheritProps, availableOptions, inheritedFromParent);
+    if (!Object.keys(resolved).length) {
+        return inheritedFromParent !== null && inheritedFromParent !== void 0 ? inheritedFromParent : NO_INHERITED_SCOPE;
+    }
+    return __assign(__assign({}, (inheritedFromParent !== null && inheritedFromParent !== void 0 ? inheritedFromParent : {})), resolved);
+};
+exports.inheritedScopeFor = inheritedScopeFor;
 var NegativeColorEffect = {
     gradient: {
         colors: { 0: 'danger', 100: 'danger:darken:2' },
@@ -188,8 +228,7 @@ var PositiveColorEffect = {
 // group panels; colours come in as props so the layout follows the Reqore theme.
 var StyledCompactWrap = styled_components_1.default.div(templateObject_3 || (templateObject_3 = __makeTemplateObject(["\n  display: flex;\n  flex-flow: column;\n  gap: 10px;\n  width: 100%;\n  /* Allow the wrap to shrink inside flex/grid parents so its rows' ellipsis can\n     engage instead of overflowing the container horizontally. */\n  min-width: 0;\n  max-width: 100%;\n\n  /* Scroll ownership \u2014 see `compactScroll`.\n\n     'host' (the default): the page or panel around us already scrolls, so we\n     must not cap our height and scroll our own body, or the reader gets two\n     scrollbars in two styles and cannot tell which moves what.\n\n     `overflow-x: clip`, NOT `hidden`: CSS coerces an `overflow-y: visible`\n     to `auto` whenever the other axis is neither visible nor clip, which would\n     leave this box a scroll container \u2014 the element stops scrolling only\n     because `max-height: none` means nothing overflows, while `position:\n     sticky` inside it still resolves against US instead of the host, so the\n     toolbar silently stops pinning. `clip` keeps the horizontal guard without\n     that coercion. */\n  ", "\n\n  /* Option logos (e.g. language images) render as <img> inside ReqoreIcon's\n     square box; constrain them so portrait PNGs don't overflow the row. */\n  .reqore-icon img {\n    width: 100%;\n    height: 100%;\n    object-fit: contain;\n  }\n"], ["\n  display: flex;\n  flex-flow: column;\n  gap: 10px;\n  width: 100%;\n  /* Allow the wrap to shrink inside flex/grid parents so its rows' ellipsis can\n     engage instead of overflowing the container horizontally. */\n  min-width: 0;\n  max-width: 100%;\n\n  /* Scroll ownership \u2014 see \\`compactScroll\\`.\n\n     'host' (the default): the page or panel around us already scrolls, so we\n     must not cap our height and scroll our own body, or the reader gets two\n     scrollbars in two styles and cannot tell which moves what.\n\n     \\`overflow-x: clip\\`, NOT \\`hidden\\`: CSS coerces an \\`overflow-y: visible\\`\n     to \\`auto\\` whenever the other axis is neither visible nor clip, which would\n     leave this box a scroll container \u2014 the element stops scrolling only\n     because \\`max-height: none\\` means nothing overflows, while \\`position:\n     sticky\\` inside it still resolves against US instead of the host, so the\n     toolbar silently stops pinning. \\`clip\\` keeps the horizontal guard without\n     that coercion. */\n  ", "\n\n  /* Option logos (e.g. language images) render as <img> inside ReqoreIcon's\n     square box; constrain them so portrait PNGs don't overflow the row. */\n  .reqore-icon img {\n    width: 100%;\n    height: 100%;\n    object-fit: contain;\n  }\n"])), function (_a) {
     var $ownScroll = _a.$ownScroll;
-    return $ownScroll
-        ? (0, styled_components_1.css)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n          /* 'own': we are the scroller. The sticky toolbar pins to whatever\n             scrolls, so a host whose scrollport carries top padding would\n             resolve sticky `top: 0` against its padding box and leave an\n             unblurred strip above the toolbar. Scrolling in this unpadded box\n             pins it flush. Cap at the host's available height, but do not grow\n             to fill it \u2014 short forms still hug their content.\n\n             `min-height: 0` is what lets a flex item shrink below its content\n             so there is something to scroll; it belongs to this branch only. */\n          min-height: 0;\n          max-height: 100%;\n          overflow-y: auto;\n          overflow-x: hidden;\n        "], ["\n          /* 'own': we are the scroller. The sticky toolbar pins to whatever\n             scrolls, so a host whose scrollport carries top padding would\n             resolve sticky \\`top: 0\\` against its padding box and leave an\n             unblurred strip above the toolbar. Scrolling in this unpadded box\n             pins it flush. Cap at the host's available height, but do not grow\n             to fill it \u2014 short forms still hug their content.\n\n             \\`min-height: 0\\` is what lets a flex item shrink below its content\n             so there is something to scroll; it belongs to this branch only. */\n          min-height: 0;\n          max-height: 100%;\n          overflow-y: auto;\n          overflow-x: hidden;\n        "]))) : (0, styled_components_1.css)(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n          /* `min-height: auto` is load-bearing, not a default: inside a column\n             flex parent the shrink allowance above collapses this box to zero\n             height while its rows paint outside it, so the form looks right but\n             contributes nothing to layout \u2014 the host cannot size or scroll to\n             it and anything below it stacks against nothing. */\n          min-height: auto;\n          max-height: none;\n          overflow-y: visible;\n          overflow-x: clip;\n        "], ["\n          /* \\`min-height: auto\\` is load-bearing, not a default: inside a column\n             flex parent the shrink allowance above collapses this box to zero\n             height while its rows paint outside it, so the form looks right but\n             contributes nothing to layout \u2014 the host cannot size or scroll to\n             it and anything below it stacks against nothing. */\n          min-height: auto;\n          max-height: none;\n          overflow-y: visible;\n          overflow-x: clip;\n        "])));
+    return $ownScroll ? (0, styled_components_1.css)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n        /* 'own': we are the scroller. The sticky toolbar pins to whatever\n             scrolls, so a host whose scrollport carries top padding would\n             resolve sticky `top: 0` against its padding box and leave an\n             unblurred strip above the toolbar. Scrolling in this unpadded box\n             pins it flush. Cap at the host's available height, but do not grow\n             to fill it \u2014 short forms still hug their content.\n\n             `min-height: 0` is what lets a flex item shrink below its content\n             so there is something to scroll; it belongs to this branch only. */\n        min-height: 0;\n        max-height: 100%;\n        overflow-y: auto;\n        overflow-x: hidden;\n      "], ["\n        /* 'own': we are the scroller. The sticky toolbar pins to whatever\n             scrolls, so a host whose scrollport carries top padding would\n             resolve sticky \\`top: 0\\` against its padding box and leave an\n             unblurred strip above the toolbar. Scrolling in this unpadded box\n             pins it flush. Cap at the host's available height, but do not grow\n             to fill it \u2014 short forms still hug their content.\n\n             \\`min-height: 0\\` is what lets a flex item shrink below its content\n             so there is something to scroll; it belongs to this branch only. */\n        min-height: 0;\n        max-height: 100%;\n        overflow-y: auto;\n        overflow-x: hidden;\n      "]))) : (0, styled_components_1.css)(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n        /* `min-height: auto` is load-bearing, not a default: inside a column\n             flex parent the shrink allowance above collapses this box to zero\n             height while its rows paint outside it, so the form looks right but\n             contributes nothing to layout \u2014 the host cannot size or scroll to\n             it and anything below it stacks against nothing. */\n        min-height: auto;\n        max-height: none;\n        overflow-y: visible;\n        overflow-x: clip;\n      "], ["\n        /* \\`min-height: auto\\` is load-bearing, not a default: inside a column\n             flex parent the shrink allowance above collapses this box to zero\n             height while its rows paint outside it, so the form looks right but\n             contributes nothing to layout \u2014 the host cannot size or scroll to\n             it and anything below it stacks against nothing. */\n        min-height: auto;\n        max-height: none;\n        overflow-y: visible;\n        overflow-x: clip;\n      "])));
 });
 // Batched-commit dock: a floating Save/Discard card pinned bottom-right. Sticky
 // (not fixed) so it stays within the form's own scroll bounds when the engine
@@ -207,7 +246,7 @@ var StyledCommitDock = styled_components_1.default.div(templateObject_4 || (temp
 });
 var getType = function (type, operators, operator) {
     var finalType = getTypeFromOperator(operators, (0, common_1.fixOperatorValue)(operator)) || type;
-    var resolvedType = (0, isArray_1.default)(finalType) ? finalType[0] : finalType;
+    var resolvedType = (0, optionUiTypes_1.firstDeclaredType)(finalType);
     // A value can be received before its server-driven option schema. Keep the
     // renderer type-safe during that transition without guessing a concrete type.
     return (resolvedType || 'any');
@@ -231,20 +270,64 @@ var getOptionSchemaStorageType = function (option, isRendererOnly) {
         : isRendererOnly(option === null || option === void 0 ? void 0 : option.ui_type) ? (option === null || option === void 0 ? void 0 : option.type) || (option === null || option === void 0 ? void 0 : option.ui_type)
             : (option === null || option === void 0 ? void 0 : option.ui_type) || (option === null || option === void 0 ? void 0 : option.type)) || 'any');
 };
-var getOptionFieldStorageType = function (optionName, fieldType, schema, operators, operatorData, isRendererOnly) {
+/**
+ * Whether an option currently holds an expression, in EITHER shape it comes in.
+ *
+ * At runtime the editor writes the flag onto the option itself
+ * (`{ type, is_expression: true, value }`), but a value loaded from a saved
+ * draft carries the envelope NESTED (`{ type, value: { is_expression: true,
+ * value } }`). Same thing, two shapes, and only the flat one was ever checked —
+ * so a freshly typed expression behaved while a reloaded one did not, which is
+ * exactly how this survived several fixes: every test used the runtime shape.
+ */
+var optionHoldsExpression = function (option) {
+    var _a;
+    var o = option;
+    return !!((o === null || o === void 0 ? void 0 : o.is_expression) || ((_a = o === null || o === void 0 ? void 0 : o.value) === null || _a === void 0 ? void 0 : _a.is_expression));
+};
+/**
+ * Which type an option resolves to — the schema's, or the one stored on the
+ * value.
+ *
+ * Exported because this single decision is what every option field is rendered
+ * with, and what an expression's return type is checked against. It deserves
+ * to be assertable without standing up a form.
+ */
+var getOptionFieldStorageType = function (optionName, fieldType, schema, operators, operatorData, isRendererOnly, 
+/** Whether the stored value is an expression — see below. */
+isExpression) {
     if (isRendererOnly === void 0) { isRendererOnly = rendererTypes_1.isRendererOnlyUiType; }
     var schemaOption = schema === null || schema === void 0 ? void 0 : schema[optionName];
-    var storedType = fieldType && !(fieldType === (schemaOption === null || schemaOption === void 0 ? void 0 : schemaOption.ui_type) && isRendererOnly(fieldType)) ?
+    /* A STORED type does not describe an expression.
+  
+       An expression value is `{ is_expression: true, value: {...} }`, so the type
+       recorded beside it describes that envelope — `hash` — and not what the
+       field holds. Letting it win means the SCHEMA's declared type is ignored and
+       the wrong answer is handed to the expression editor as the return type to
+       check against: `1 + 2` on a field declared `"type": "auto"` came back
+       "The expression returns int, and this field holds hash". A literal `1` was
+       fine, because a literal is stored as a plain value whose type matches.
+  
+       `auto`/`any` accept anything, which is exactly why nothing should be
+       checked against them; a concrete declared type still is. The schema is the
+       only party that knows what the field accepts. */
+    var storedType = (!isExpression &&
+        fieldType &&
+        !(fieldType === (schemaOption === null || schemaOption === void 0 ? void 0 : schemaOption.ui_type) && isRendererOnly(fieldType))) ?
         fieldType
         : getOptionSchemaStorageType(schemaOption, isRendererOnly);
     return (0, exports.getType)(storedType, operators, operatorData);
 };
+exports.getOptionFieldStorageType = getOptionFieldStorageType;
 var hasRequiredOptions = function (options) {
     if (options === void 0) { options = {}; }
     return !!(0, lodash_1.findKey)(options, function (option) { return option.required; });
 };
 exports.hasRequiredOptions = hasRequiredOptions;
-exports.OptionsContext = (0, use_context_selector_1.createContext)({});
+/* Re-exported from the module that owns it so the existing import path keeps
+   working; see `optionsContext.ts` for why it is not declared here. */
+var optionsContext_2 = require("./optionsContext");
+Object.defineProperty(exports, "OptionsContext", { enumerable: true, get: function () { return optionsContext_2.OptionsContext; } });
 var fixOptions = function (value, options, operators, isRendererOnly) {
     if (value === void 0) { value = {}; }
     if (isRendererOnly === void 0) { isRendererOnly = rendererTypes_1.isRendererOnlyUiType; }
@@ -370,6 +453,64 @@ var normalizeEmptyFieldValues = function (fields) {
         return acc;
     }, {});
 };
+/**
+ * Does this rebuild say anything the parent does not already hold?
+ *
+ * `false` means the rebuild is a MIRROR: `fixOptions` found no default to
+ * materialise, so the result repeats the `value` the parent handed down. The
+ * compare is empty-normalized because `fixOptions` round-trips a required-empty
+ * field between `{ value: '' }` and no `value` key, and that cosmetic
+ * difference would otherwise read as new information forever.
+ */
+var isMirrorOfValue = function (fixedValue, value) { return (0, lodash_1.isEqual)(normalizeEmptyFieldValues(fixedValue), normalizeEmptyFieldValues(value)); };
+exports.isMirrorOfValue = isMirrorOfValue;
+/**
+ * What this rebuild lets the form agree with the parent on, if anything.
+ *
+ * Returns the rebuild when it mirrors `value`, and `undefined` when it
+ * contributed something the parent has yet to learn.
+ *
+ * Adopting the parent's value IS agreement, and saying so matters as much as
+ * staying quiet about it. The sync-down skips only when the parent echoed what
+ * this form last sent; if adopting a value never updates that record, it points
+ * at an older state forever, the skip can never fire again, and the form
+ * rebuilds on every single change. Holding the mirror back WITHOUT recording
+ * the agreement was measured making the starvation worse, not better — 8 s
+ * became a 45 s timeout — which is why the two belong together.
+ */
+var agreementFromRebuild = function (fixedValue, value) {
+    return (0, exports.isMirrorOfValue)(fixedValue, value) ? fixedValue : undefined;
+};
+exports.agreementFromRebuild = agreementFromRebuild;
+/**
+ * Should the form report `localValue` to its parent as an answer?
+ *
+ * Extracted and pure because the situation it exists for cannot be reproduced
+ * through a rendered form: it needs the emit to be decided against a `value`
+ * NEWER than the `localValue` built from it, which only happens when two
+ * components' effects land in one React commit — and a test renderer flushes
+ * effects between updates, so the two never fall out of step. The states below
+ * were recorded from a live instrumented run instead, and this is what makes
+ * them assertable.
+ *
+ * Two ways the answer is no:
+ *
+ * 1. `localValue` is a mirror — a rebuild of the parent's own value that added
+ *    nothing. Repeating it back is not an answer. **Checked first**, because
+ *    the comparison in (2) reads whatever `value` has become by now, which,
+ *    when a nested engine shares the parent value, is already that engine's
+ *    newer write; comparing against it would find a difference this form never
+ *    made and emit the older mirror over the newer write. That is the loop.
+ * 2. `localValue` already equals `value` — there is nothing to report.
+ */
+var shouldEmitLocalValue = function (_a) {
+    var localValue = _a.localValue, value = _a.value, mirroredValue = _a.mirroredValue;
+    if (mirroredValue !== undefined && (0, lodash_1.isEqual)(localValue, mirroredValue)) {
+        return false;
+    }
+    return !(0, lodash_1.isEqual)(localValue, value);
+};
+exports.shouldEmitLocalValue = shouldEmitLocalValue;
 var flattenOptions = function (options) {
     return (0, reduce_1.default)(options, function (newOptions, option, optionName) {
         var _a;
@@ -390,7 +531,7 @@ var getTypeAndCanBeNull = function (type, allowed_values, operatorData, operator
     return {
         type: realType,
         defaultType: realType,
-        defaultInternalType: realType === 'auto' || realType === 'any' ? undefined : realType,
+        defaultInternalType: (0, optionUiTypes_1.isUntypedOptionType)(realType) ? undefined : realType,
         canBeNull: canBeNull,
     };
 };
@@ -398,29 +539,29 @@ exports.getTypeAndCanBeNull = getTypeAndCanBeNull;
 // Option types rendered full-width (IDE Options parity, commit 8e6b7781).
 var STRECHABLE_TYPES = new Set(['tool-catalog']);
 var FormEngineImpl = function (_a) {
-    var _b, _c, _d, _f, _g, _h;
+    var _b, _c, _d, _f, _g;
     var name = _a.name, uniqueName = _a.uniqueName, value = _a.value, onChange = _a.onChange, onSingleOptionsChange = _a.onSingleOptionsChange, onDependableOptionChange = _a.onDependableOptionChange, placeholder = _a.placeholder, noValueString = _a.noValueString, // eslint-disable-line @typescript-eslint/no-unused-vars
     isValid = _a.isValid, // eslint-disable-line @typescript-eslint/no-unused-vars
-    url = _a.url, customUrl = _a.customUrl, operatorsUrl = _a.operatorsUrl, onOptionsLoaded = _a.onOptionsLoaded, recordRequiresSearchOptions = _a.recordRequiresSearchOptions, readOnly = _a.readOnly, _j = _a.allowTemplates, allowTemplates = _j === void 0 ? true : _j, interfaceContext = _a.interfaceContext, templateFieldProps = _a.templateFieldProps, forceDropdown = _a.forceDropdown, _k = _a.showTypeToggle, showTypeToggle = _k === void 0 ? true : _k, compact = _a.compact, 
+    url = _a.url, customUrl = _a.customUrl, operatorsUrl = _a.operatorsUrl, onOptionsLoaded = _a.onOptionsLoaded, recordRequiresSearchOptions = _a.recordRequiresSearchOptions, readOnly = _a.readOnly, onReadOnlyActivate = _a.onReadOnlyActivate, _h = _a.allowTemplates, allowTemplates = _h === void 0 ? true : _h, interfaceContext = _a.interfaceContext, templateFieldProps = _a.templateFieldProps, forceDropdown = _a.forceDropdown, _j = _a.showTypeToggle, showTypeToggle = _j === void 0 ? true : _j, compact = _a.compact, 
     // Destructured only to keep it out of `rest` (and so off the DOM). The gutter
     // this prop documents was never implemented: it was passed to the wrap as
     // `$flush`, whose styled template had no interpolation slot, so it has always
     // been a no-op. Removing it from the API is a separate, breaking change —
     // every consumer passing it today already gets the flush layout by default.
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    _l = _a.compactFlush, 
+    _k = _a.compactFlush, 
     // Destructured only to keep it out of `rest` (and so off the DOM). The gutter
     // this prop documents was never implemented: it was passed to the wrap as
     // `$flush`, whose styled template had no interpolation slot, so it has always
     // been a no-op. Removing it from the API is a separate, breaking change —
     // every consumer passing it today already gets the flush layout by default.
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    compactFlush = _l === void 0 ? false : _l, _m = _a.compactNested, compactNested = _m === void 0 ? false : _m, _o = _a.compactScroll, compactScroll = _o === void 0 ? 'host' : _o, compactPanelProps = _a.compactPanelProps, _p = _a.compactCollapsedGroups, compactCollapsedGroups = _p === void 0 ? ['optional'] : _p, _q = _a.compactToolbar, compactToolbar = _q === void 0 ? true : _q, _r = _a.commitMode, commitMode = _r === void 0 ? 'immediate' : _r, _s = _a.expandMode, expandMode = _s === void 0 ? 'single' : _s, onCommit = _a.onCommit, operatorsProp = _a.operators, groups = _a.groups, optionsLoader = _a.optionsLoader, onValidityChange = _a.onValidityChange, optionActions = _a.optionActions, _t = _a.optionActionsCollapse, optionActionsCollapse = _t === void 0 ? 'auto' : _t, componentOverrides = _a.componentOverrides, codePreviewRenderer = _a.codePreviewRenderer, 
+    compactFlush = _k === void 0 ? false : _k, _l = _a.compactNested, compactNested = _l === void 0 ? false : _l, _m = _a.compactScroll, compactScroll = _m === void 0 ? 'host' : _m, compactPanelProps = _a.compactPanelProps, compactCollapsedGroupsProp = _a.compactCollapsedGroups, compactBoxLabels = _a.compactBoxLabels, _o = _a.compactStickyBoxHeaders, compactStickyBoxHeaders = _o === void 0 ? true : _o, _p = _a.compactStickyOffset, compactStickyOffset = _p === void 0 ? 0 : _p, _q = _a.compactToolbar, compactToolbar = _q === void 0 ? true : _q, _r = _a.commitMode, commitMode = _r === void 0 ? 'immediate' : _r, _s = _a.expandMode, expandMode = _s === void 0 ? 'single' : _s, onCommit = _a.onCommit, operatorsProp = _a.operators, groups = _a.groups, optionsLoader = _a.optionsLoader, onValidityChange = _a.onValidityChange, optionActions = _a.optionActions, _t = _a.optionActionsCollapse, optionActionsCollapse = _t === void 0 ? 'auto' : _t, componentOverrides = _a.componentOverrides, codePreviewRenderer = _a.codePreviewRenderer, 
     // consumed by the wrapper below, which publishes it to every description this
     // form draws; destructured here only so it cannot reach `rest` and be spread
     // onto a DOM node
     _markdownRenderer = _a.markdownRenderer, // eslint-disable-line @typescript-eslint/no-unused-vars
-    rendererOnlyUiTypes = _a.rendererOnlyUiTypes, inheritedFromParent = _a.inheritedFromParent, autoFocusFirstRequired = _a.autoFocusFirstRequired, expandFirstRequired = _a.expandFirstRequired, initialExpandedOptions = _a.initialExpandedOptions, maxFieldsShown = _a.maxFieldsShown, rest = __rest(_a, ["name", "uniqueName", "value", "onChange", "onSingleOptionsChange", "onDependableOptionChange", "placeholder", "noValueString", "isValid", "url", "customUrl", "operatorsUrl", "onOptionsLoaded", "recordRequiresSearchOptions", "readOnly", "allowTemplates", "interfaceContext", "templateFieldProps", "forceDropdown", "showTypeToggle", "compact", "compactFlush", "compactNested", "compactScroll", "compactPanelProps", "compactCollapsedGroups", "compactToolbar", "commitMode", "expandMode", "onCommit", "operators", "groups", "optionsLoader", "onValidityChange", "optionActions", "optionActionsCollapse", "componentOverrides", "codePreviewRenderer", "markdownRenderer", "rendererOnlyUiTypes", "inheritedFromParent", "autoFocusFirstRequired", "expandFirstRequired", "initialExpandedOptions", "maxFieldsShown"]);
+    rendererOnlyUiTypes = _a.rendererOnlyUiTypes, templateAwareUiTypes = _a.templateAwareUiTypes, anyLikeUiTypes = _a.anyLikeUiTypes, inheritedFromParent = _a.inheritedFromParent, autoFocusFirstRequired = _a.autoFocusFirstRequired, expandFirstRequired = _a.expandFirstRequired, initialExpandedOptions = _a.initialExpandedOptions, maxFieldsShown = _a.maxFieldsShown, rest = __rest(_a, ["name", "uniqueName", "value", "onChange", "onSingleOptionsChange", "onDependableOptionChange", "placeholder", "noValueString", "isValid", "url", "customUrl", "operatorsUrl", "onOptionsLoaded", "recordRequiresSearchOptions", "readOnly", "onReadOnlyActivate", "allowTemplates", "interfaceContext", "templateFieldProps", "forceDropdown", "showTypeToggle", "compact", "compactFlush", "compactNested", "compactScroll", "compactPanelProps", "compactCollapsedGroups", "compactBoxLabels", "compactStickyBoxHeaders", "compactStickyOffset", "compactToolbar", "commitMode", "expandMode", "onCommit", "operators", "groups", "optionsLoader", "onValidityChange", "optionActions", "optionActionsCollapse", "componentOverrides", "codePreviewRenderer", "markdownRenderer", "rendererOnlyUiTypes", "templateAwareUiTypes", "anyLikeUiTypes", "inheritedFromParent", "autoFocusFirstRequired", "expandFirstRequired", "initialExpandedOptions", "maxFieldsShown"]);
     // Built-ins + whatever the consumer declared for its own injected editors.
     var isRendererOnly = (0, react_2.useMemo)(function () { return (0, rendererTypes_1.createRendererOnlyUiTypeCheck)(rendererOnlyUiTypes); }, [JSON.stringify(rendererOnlyUiTypes)]);
     // Pointer CAPABILITY and viewport WIDTH are different questions and both
@@ -429,16 +570,24 @@ var FormEngineImpl = function (_a) {
     // from Reqore's context (one subscription for the whole app) rather than a
     // reqraft-local matchMedia hook.
     //
-    // `isHoverCapable` defaults to `true` in Reqore, but fall back explicitly so
-    // an older Reqore — where the property does not exist — degrades to "this
-    // pointer hovers" (the pre-existing behaviour) instead of collapsing every
-    // action into a menu for everyone.
-    var isHoverCapable = (_b = (0, reqore_1.useReqoreProperty)('isHoverCapable')) !== null && _b !== void 0 ? _b : true;
+    // Both are always set by `ReqoreProvider`, and the peer floor (>= 0.74.0) is
+    // the version that sets them. A defensive `?? true` here would be dead code:
+    // `useReqoreProperty` THROWS on a context that lacks the key, so an older
+    // Reqore fails at the hook rather than degrading to a default.
+    var isHoverCapable = (0, reqore_1.useReqoreProperty)('isHoverCapable');
     var isMobile = (0, reqore_1.useReqoreProperty)('isMobile');
     var collapseOptionActions = optionActionsCollapse === 'always' ? true
         : optionActionsCollapse === 'never' ? false
             : !isHoverCapable || !!isMobile;
-    var _u = (0, react_2.useState)((rest === null || rest === void 0 ? void 0 : rest.options) || undefined), options = _u[0], setOptions = _u[1];
+    /* The schema, as the form should ASK it — not always as it was served.
+       `resolveDegenerateRequiredGroups` turns a one-of group that has a single
+       member in this schema back into a plain required field, because a choice
+       with one option is not a choice. Applied here, at the one place the schema
+       enters the component, so the header, the chips, the messages, the meter and
+       the read-first summary cannot disagree about it: every one of them reads
+       `options`, and none of them has to know the rule. */
+    var _u = (0, react_2.useState)((rest === null || rest === void 0 ? void 0 : rest.options) || undefined), servedOptions = _u[0], setOptions = _u[1];
+    var options = (0, react_2.useMemo)(function () { return (0, options_1.resolveDegenerateRequiredGroups)(servedOptions); }, [servedOptions]);
     // optionsLoader lifecycle: loading feeds the skeleton gate, error the banner.
     var _v = (0, react_2.useState)(!!optionsLoader && !(rest === null || rest === void 0 ? void 0 : rest.options)), optionsLoading = _v[0], setOptionsLoading = _v[1];
     var _w = (0, react_2.useState)(), optionsError = _w[0], setOptionsError = _w[1];
@@ -526,6 +675,65 @@ var FormEngineImpl = function (_a) {
         compactWrapNodeRef.current = node;
         setCompactWrapNode(function (prev) { return (prev === node ? prev : node); });
     }, [compactWrapRef]);
+    /* Declared here, not where it is first USED in the render: the sticky
+       measurement below takes it as a dependency, and a dependency array is
+       evaluated during render — a `const` declared further down would still be
+       in its temporal dead zone. */
+    var compactNarrow = !!compactWrapWidth && compactWrapWidth < 480;
+    /* How much pinned chrome sits above a status-box header.
+    
+       Sticky offsets do not compose on their own: everything pinned in one
+       scroller resolves `top` against the same scrollport, so a box header and
+       this form's own toolbar both asking for 0 land on top of each other — and
+       the toolbar is the loser, because it renders first and the box header wins
+       on z-order. Covering it hides the search, which is the one control that
+       forces a collapsed box open.
+    
+       So the box headers pin BELOW the toolbar, at the host's own offset plus the
+       toolbar's height. Measured, not assumed: the toolbar is a completion meter,
+       a search row and a field picker that each hide themselves when they have
+       nothing to say, and what is left wraps differently at every form width.
+       Zero when this form draws no toolbar at all. */
+    var _9 = (0, react_2.useState)(0), compactToolbarHeight = _9[0], setCompactToolbarHeight = _9[1];
+    (0, react_2.useLayoutEffect)(function () {
+        var wrap = compactWrapNode;
+        if (!compact || !wrap || compactNested || !compactStickyBoxHeaders) {
+            setCompactToolbarHeight(0);
+            return undefined;
+        }
+        var header = wrap.querySelector(':scope > .reqore-panel > .reqore-panel-title');
+        if (!header) {
+            setCompactToolbarHeight(0);
+            return undefined;
+        }
+        var read = function () {
+            return setCompactToolbarHeight(function (prev) {
+                /* Only a toolbar that is ITSELF pinned takes room off the top. A host
+                   can switch the pin off (`compactPanelProps.stickyHeader`), and it
+                   does where the form is a couple of fields inside a longer page — and
+                   a box header offset by a toolbar that scrolls away would float a
+                   header's height below the top edge with nothing under it. Read from
+                   the element rather than from the props that produced it, so every
+                   route to that decision is accounted for. */
+                var pinned = getComputedStyle(header).position === 'sticky';
+                var next = pinned ? Math.round(header.getBoundingClientRect().height) : 0;
+                return prev === next ? prev : next;
+            });
+        };
+        read();
+        /* jsdom and older engines have no ResizeObserver; the one-shot read above
+           still gives the right answer for a form whose toolbar never reflows. */
+        if (typeof ResizeObserver === 'undefined') {
+            return undefined;
+        }
+        var observer = new ResizeObserver(read);
+        observer.observe(header);
+        return function () { return observer.disconnect(); };
+        /* `compactNarrow` is a dependency, not decoration: crossing the width
+           breakpoint takes the pin OFF the toolbar without changing its height, so
+           the ResizeObserver never fires and a stale 124px would go on offsetting
+           the box headers below a toolbar that is no longer there. */
+    }, [compact, compactNested, compactStickyBoxHeaders, compactNarrow, compactWrapNode, options]);
     // Global label-column sizing: size the label column to the WIDEST field label
     // across the whole form, clamped to [MIN, MAX], and publish it as a CSS var on
     // the scroll wrap. Both the grid column and the value-surface offsets read the
@@ -571,8 +779,8 @@ var FormEngineImpl = function (_a) {
     var readRowHeights = (0, react_2.useRef)({});
     // Required-groups linkage: hovering a group chip highlights every member row;
     // clicking a sibling in the chip's popover scrolls to it and flashes it.
-    var _9 = (0, react_2.useState)([]), highlightedOptions = _9[0], setHighlightedOptions = _9[1];
-    var _10 = (0, react_2.useState)([]), flashedOptions = _10[0], setFlashedOptions = _10[1];
+    var _10 = (0, react_2.useState)([]), highlightedOptions = _10[0], setHighlightedOptions = _10[1];
+    var _11 = (0, react_2.useState)([]), flashedOptions = _11[0], setFlashedOptions = _11[1];
     var flashTimeout = (0, react_2.useRef)();
     var flashOptions = (0, react_2.useCallback)(function (optionNames, scrollToFirst) {
         if (scrollToFirst === void 0) { scrollToFirst = false; }
@@ -619,30 +827,59 @@ var FormEngineImpl = function (_a) {
             flashOptions([moved], true);
         }
     });
-    var compactNarrow = !!compactWrapWidth && compactWrapWidth < 480;
     // Info panels auto-open on Tier-1 content; the per-row user override sticks.
-    var _11 = (0, react_2.useState)({}), infoPanelOverrides = _11[0], setInfoPanelOverrides = _11[1];
+    var _12 = (0, react_2.useState)({}), infoPanelOverrides = _12[0], setInfoPanelOverrides = _12[1];
     // Toolbar filters affect the listed rows only — the meter reflects the full set.
-    var _12 = (0, react_2.useState)(false), requiredOnly = _12[0], setRequiredOnly = _12[1];
-    var _13 = (0, react_2.useState)(''), compactQuery = _13[0], setCompactQuery = _13[1];
+    var _13 = (0, react_2.useState)(false), requiredOnly = _13[0], setRequiredOnly = _13[1];
+    var _14 = (0, react_2.useState)(''), compactQuery = _14[0], setCompactQuery = _14[1];
     // Compact field sort (Fields menu → "Sort by"); 'schema' = declared order.
-    var _14 = (0, react_2.useState)('schema'), compactSort = _14[0], setCompactSort = _14[1];
-    var _15 = (0, react_2.useState)(function () { return ({
+    var _15 = (0, react_2.useState)('schema'), compactSort = _15[0], setCompactSort = _15[1];
+    var _16 = (0, react_2.useState)(function () { return ({
         fields: (0, exports.fixOptions)(value, options || {}, undefined, isRendererOnly),
         meta: undefined,
-    }); }), localValue = _15[0], setLocalValue = _15[1];
+    }); }), localValue = _16[0], setLocalValue = _16[1];
     var originalValue = (0, react_2.useRef)();
     // Track the last value we emitted via onChange so we can skip re-applying fixOptions
     // when the parent echoes it back as the new value prop (controlled component loop prevention)
     var lastEmittedValue = (0, react_2.useRef)(value);
+    /**
+     * A `localValue` that is only a MIRROR of the incoming `value`, and so must
+     * never be emitted back as though this form had answered something.
+     *
+     * `localValue` is derived state: the sync-down effect below rebuilds it from
+     * the `value` prop. When that rebuild adds nothing (`fixOptions` had no
+     * default to materialise), the result says exactly what the parent already
+     * holds, and emitting it is not a change — it is this form repeating the
+     * parent's own words back at it.
+     *
+     * That repetition is harmless in a form that owns its state outright and
+     * fatal in one that shares a parent with a NESTED engine. The two write to
+     * the same parent value, so each sees the other's write arrive as an external
+     * change; `lastEmittedValue` is then always one step behind and its guard
+     * never fires. The engines alternate between two states forever, several
+     * times a second, and the newer write is repeatedly overwritten by the older
+     * one. Measured in the test editor: the row's summary flipped between two
+     * readings indefinitely and `setTimeout` was starved past a 45-second
+     * deadline.
+     *
+     * Only a mirror that CHANGES nothing is held back. A rebuild that restores a
+     * required or preselected field's default still emits, because that default
+     * is genuinely new information the parent has to be told about — which is the
+     * whole reason the sync-down runs `fixOptions` at all.
+     */
+    var mirroredValue = (0, react_2.useRef)(undefined);
     if (originalValue.current === undefined && (0, size_1.default)(value)) {
         originalValue.current = localValue.fields;
     }
     var unavailableOptionsCount = (0, react_2.useRef)(0);
-    var _16 = (0, useQorusTypes_1.useQorusTypes)(), compactValue = _16.compactValue, typesLoading = _16.loading;
+    var _17 = (0, useQorusTypes_1.useQorusTypes)(), compactValue = _17.compactValue, typesLoading = _17.loading;
     var templates = (0, useTemplates_1.useTemplates)(allowTemplates, rest.stringTemplates, interfaceContext);
     (0, react_2.useEffect)(function () {
-        if ((0, lodash_1.isEqual)(localValue.fields, value)) {
+        if (!(0, exports.shouldEmitLocalValue)({
+            localValue: localValue.fields,
+            value: value,
+            mirroredValue: mirroredValue.current,
+        })) {
             return;
         }
         var toEmit = (0, size_1.default)(localValue.fields) ? localValue.fields : undefined;
@@ -822,22 +1059,51 @@ var FormEngineImpl = function (_a) {
         // Note: compare fixedValue against value, not localValue.fields — localValue may have been
         // updated by nested FormEngine emissions, so comparing against it would never skip.
         var normalizedValue = normalizeEmptyFieldValues(value);
+        /* What this rebuild lets us agree with the parent on — `undefined` when it
+           contributed something the parent has yet to learn. */
+        var agreed = (0, exports.agreementFromRebuild)(fixedValue, value);
         if ((0, lodash_1.isEqual)(normalizedValue, normalizeEmptyFieldValues(lastEmittedValue.current)) &&
-            (0, lodash_1.isEqual)(normalizeEmptyFieldValues(fixedValue), normalizedValue)) {
+            agreed !== undefined) {
             return;
         }
         if (!originalValue.current && (0, size_1.default)(fixedValue)) {
             originalValue.current = fixedValue;
         }
+        /* Remember a mirror so the emit effect can tell one from an answer, and
+           record the agreement it represents. A rebuild that DID add something
+           leaves both alone — the parent has to learn about it. */
+        mirroredValue.current = agreed;
+        if (agreed !== undefined) {
+            lastEmittedValue.current = agreed;
+        }
         setLocalValue === null || setLocalValue === void 0 ? void 0 : setLocalValue({ fields: fixedValue, meta: undefined });
     }, [JSON.stringify(options), JSON.stringify(value), isRendererOnly]);
+    /**
+     * Fields the reader has actually edited in this instance.
+     *
+     * "This field is required" is an ERROR message, and an error is a report that
+     * something went wrong. Under a field nobody has been in yet it reports
+     * nothing — the form is empty because it is new — while the requirement is
+     * already stated by the asterisk, by the Needs-attention box the row sits in,
+     * and by the completion meter. A form whose first act is to accuse the reader
+     * of a mistake they have not made teaches them to discount its warnings.
+     *
+     * So the message waits for a touch. Being IN the field and leaving it empty
+     * is a real gap, and that one shows. A ref, not state: every edit re-renders
+     * anyway, so the following render reads the current set with no second pass.
+     */
+    var touchedOptionsRef = (0, react_2.useRef)(new Set());
     var handleValueChange = (0, react_2.useCallback)(function (optionName, val, _type, isFunction) {
+        // Every route into this handler is a person acting: typing, picking from a
+        // menu, clearing the value, adding an optional field. Marked here rather
+        // than inside the updater below, which React may invoke twice.
+        touchedOptionsRef.current.add(optionName);
         setLocalValue(function (_a) {
             var _b, _c;
-            var _d, _f, _g, _h, _j, _k, _l, _m, _o, _p;
-            var _q = _a.fields, fields = _q === void 0 ? {} : _q;
+            var _d, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+            var _r = _a.fields, fields = _r === void 0 ? {} : _r;
             var schemaType = getOptionSchemaStorageType(options === null || options === void 0 ? void 0 : options[optionName], isRendererOnly);
-            var isAnyLike = schemaType === 'any' || schemaType === 'auto';
+            var isAnyLike = (0, optionUiTypes_1.isUntypedOptionType)(schemaType);
             // For any/auto schema types, preserve the user's chosen type stored in the field
             var resolvedSchemaType = isAnyLike && ((_d = fields[optionName]) === null || _d === void 0 ? void 0 : _d.type) ?
                 fields[optionName].type
@@ -868,27 +1134,46 @@ var FormEngineImpl = function (_a) {
             // by TemplateField/auto) drives the option's `is_expression` flag;
             // the value itself is the raw AST `{ exp, args }`.
             var updatedValue = __assign(__assign({}, fields), (_c = {}, _c[optionName] = __assign(__assign({}, fields[optionName]), { type: type, value: val }), _c));
-            if (isFunction) {
+            /* The flag belongs to the VALUE, so a change that said nothing about it
+               does not throw it away — `undefined` is no opinion, not a denial.
+               Deleting it unconditionally left the AST on the row with nothing
+               marking it as one: an assertion's Expected Value came back from a
+               saved draft drawn as a two-field hash of `exp` and `args`, because
+               merely opening the row and reverting had stripped the flag. */
+            if ((0, argumentPresence_1.shouldMarkAsExpression)(isFunction, val, (_l = fields[optionName]) === null || _l === void 0 ? void 0 : _l.is_expression)) {
                 updatedValue[optionName].is_expression = true;
             }
             else {
                 delete updatedValue[optionName].is_expression;
             }
             var meta = {};
-            if (((_l = options === null || options === void 0 ? void 0 : options[optionName]) === null || _l === void 0 ? void 0 : _l.has_dependents) &&
+            if (((_m = options === null || options === void 0 ? void 0 : options[optionName]) === null || _m === void 0 ? void 0 : _m.has_dependents) &&
                 val !== undefined &&
-                val !== ((_m = fields[optionName]) === null || _m === void 0 ? void 0 : _m.value)) {
+                val !== ((_o = fields[optionName]) === null || _o === void 0 ? void 0 : _o.value)) {
                 (0, lodash_1.forEach)(options, function (option, depName) {
+                    /* A dependency is `name`, `name=value` or `name!=value`, so the
+                       entry has to be PARSED to find which option it names. Compared as
+                       a whole string, only the bare spelling ever matched — so a field
+                       declared `depends_on: ['subject_iface_kind=workflow']` was never
+                       cleared when that option changed.
+                    
+                       What that cost: a test whose subject was switched from a workflow
+                       to a service kept the workflow's `Subject Interface Version`.
+                       Services and jobs are versioned but only the latest is testable,
+                       so the field no longer applied, yet it stayed on the form as a
+                       locked control in front of a value the author could not clear —
+                       the value being there is exactly what stops the field being
+                       withheld outright. */
                     if (option.depends_on &&
-                        (0, lodash_1.flatten)(option.depends_on).includes(optionName) &&
+                        (0, lodash_1.flatten)(option.depends_on).some(function (dependency) { return (0, validations_1.parseDependency)(dependency).name === optionName; }) &&
                         updatedValue[depName]) {
                         updatedValue[depName].value = undefined;
                     }
                 });
                 onDependableOptionChange === null || onDependableOptionChange === void 0 ? void 0 : onDependableOptionChange(optionName, val, updatedValue, options);
             }
-            if ((0, size_1.default)((_o = options === null || options === void 0 ? void 0 : options[optionName]) === null || _o === void 0 ? void 0 : _o.on_change)) {
-                meta.events = (_p = options === null || options === void 0 ? void 0 : options[optionName]) === null || _p === void 0 ? void 0 : _p.on_change;
+            if ((0, size_1.default)((_p = options === null || options === void 0 ? void 0 : options[optionName]) === null || _p === void 0 ? void 0 : _p.on_change)) {
+                meta.events = (_q = options === null || options === void 0 ? void 0 : options[optionName]) === null || _q === void 0 ? void 0 : _q.on_change;
             }
             onSingleOptionsChange === null || onSingleOptionsChange === void 0 ? void 0 : onSingleOptionsChange(optionName, updatedValue[optionName]);
             if (compact && !readOnly && (0, readFirst_1.shouldAutoCollapseCompactOption)(options === null || options === void 0 ? void 0 : options[optionName], val)) {
@@ -1006,7 +1291,7 @@ var FormEngineImpl = function (_a) {
                 return newValue;
             }
             var rendererType = (0, exports.getType)((options[optionName].ui_type || options[optionName].type), operators, option === null || option === void 0 ? void 0 : option.op);
-            var storageType = getOptionFieldStorageType(optionName, option === null || option === void 0 ? void 0 : option.type, options, operators, option === null || option === void 0 ? void 0 : option.op, isRendererOnly);
+            var storageType = (0, exports.getOptionFieldStorageType)(optionName, option === null || option === void 0 ? void 0 : option.type, options, operators, option === null || option === void 0 ? void 0 : option.op, isRendererOnly, optionHoldsExpression(option));
             if (!(0, lodash_1.isPlainObject)(option)) {
                 return __assign(__assign({}, newValue), (_a = {}, _a[optionName] = {
                     type: storageType || rendererType,
@@ -1038,6 +1323,21 @@ var FormEngineImpl = function (_a) {
         });
         return { members: members, satisfiedBy: satisfiedBy };
     }, [JSON.stringify(options), JSON.stringify(availableOptions)]);
+    /* One bag per field, rebuilt only when something it is made of changes — the
+       schema that declares the `inherit_props`, the sibling values they resolve
+       against, or the scope handed in from an outer form. Held per field rather
+       than per form because each field's bag is different: `inherit_props` is
+       declared on the field. See `inheritedScopeFor` for what a churning bag
+       costs the field that receives it. */
+    var inheritedScopes = (0, react_2.useMemo)(function () {
+        var _a;
+        var scopes = new Map();
+        for (var _i = 0, _b = Object.keys(options !== null && options !== void 0 ? options : {}); _i < _b.length; _i++) {
+            var optionName = _b[_i];
+            scopes.set(optionName, (0, exports.inheritedScopeFor)((_a = options === null || options === void 0 ? void 0 : options[optionName]) === null || _a === void 0 ? void 0 : _a.inherit_props, availableOptions, inheritedFromParent));
+        }
+        return scopes;
+    }, [options, availableOptions, inheritedFromParent]);
     // Dependency linkage (3a): when filling a dependency unlocks rows, flash
     // them once — the form visibly "opens up" instead of silently changing.
     var dependencyLockedNames = (0, react_2.useMemo)(function () {
@@ -1062,6 +1362,49 @@ var FormEngineImpl = function (_a) {
             flashOptions(unlocked);
         }
     }, [dependencyLockedNames.join('|')]);
+    /* The same thing one level down: a CHOICE that becomes available is as
+       invisible as a field that becomes editable, and it is worse, because it
+       opens up inside a control the reader may not have open. So the field that
+       offers it flashes, which is the affordance that says "look here" without
+       claiming the choice was made.
+  
+       Keyed by field and by the value's identity, so a value that merely moves in
+       the list is not mistaken for one that opened. Fields whose values gate on
+       nothing never enter the set, which is nearly all of them. */
+    var lockedAllowedValues = (0, react_2.useMemo)(function () {
+        var locked = [];
+        (0, lodash_1.forEach)(options || {}, function (optionSchema, name) {
+            (0, lodash_1.forEach)((optionSchema === null || optionSchema === void 0 ? void 0 : optionSchema.allowed_values) || [], function (allowedValue) {
+                var _a;
+                if (!(0, OptionFieldMessages_1.getAllowedValueAvailability)(allowedValue, availableOptions, options || {}).available) {
+                    locked.push("".concat(name, "\0").concat(JSON.stringify((_a = allowedValue === null || allowedValue === void 0 ? void 0 : allowedValue.value) === null || _a === void 0 ? void 0 : _a.value)));
+                }
+            });
+        });
+        return locked;
+    }, [JSON.stringify(options), JSON.stringify(availableOptions)]);
+    var previousLockedAllowedValues = (0, react_2.useRef)(null);
+    (0, react_2.useEffect)(function () {
+        var previous = previousLockedAllowedValues.current;
+        previousLockedAllowedValues.current = lockedAllowedValues;
+        if (!previous) {
+            return;
+        }
+        var opened = previous
+            .filter(function (key) { return !lockedAllowedValues.includes(key); })
+            .map(function (key) { return key.split('\u0000')[0]; });
+        var fields = (0, lodash_1.uniq)(opened).filter(function (name) {
+            var _a;
+            return !!(options === null || options === void 0 ? void 0 : options[name]) &&
+                !((_a = options === null || options === void 0 ? void 0 : options[name]) === null || _a === void 0 ? void 0 : _a.disabled) &&
+                // A field that is itself still locked flashes for its OWN unlocking, in
+                // the effect above; two flashes for one change is a flicker, not a cue.
+                !dependencyLockedNames.includes(name);
+        });
+        if (fields.length) {
+            flashOptions(fields);
+        }
+    }, [lockedAllowedValues.join('|')]);
     // The not-yet-added optional fields: everything in the schema the form is not
     // already showing a row for. This ONE list feeds all three ways a field gets
     // added — the inline addable rows, the Fields menu, and its "Select all" — so
@@ -1107,7 +1450,7 @@ var FormEngineImpl = function (_a) {
     var getValidityData = (0, react_2.useCallback)(function () {
         var fields = (0, reduce_1.default)(availableOptions, function (result, option, optionName) {
             var _a, _b;
-            var type = getOptionFieldStorageType(optionName, option.type, options, operators, option.op, isRendererOnly);
+            var type = (0, exports.getOptionFieldStorageType)(optionName, option.type, options, operators, option.op, isRendererOnly, optionHoldsExpression(option));
             var optionValue = option.value;
             var isRequired = (_a = options === null || options === void 0 ? void 0 : options[optionName]) === null || _a === void 0 ? void 0 : _a.required;
             var hasRequiredGroups = !!((_b = options === null || options === void 0 ? void 0 : options[optionName]) === null || _b === void 0 ? void 0 : _b.required_groups);
@@ -1151,7 +1494,7 @@ var FormEngineImpl = function (_a) {
         return (0, reduce_1.default)(availableOptions, function (newValue, option, optionName) {
             var _a;
             if (showInvalidOptionsOnly &&
-                isOptionValid(optionName, getOptionFieldStorageType(optionName, option.type, options, operators, option.op, isRendererOnly), option.value)) {
+                isOptionValid(optionName, (0, exports.getOptionFieldStorageType)(optionName, option.type, options, operators, option.op, isRendererOnly, optionHoldsExpression(option)), option.value)) {
                 return newValue;
             }
             return __assign(__assign({}, newValue), (_a = {}, _a[optionName] = option, _a));
@@ -1185,7 +1528,7 @@ var FormEngineImpl = function (_a) {
         if (hidden)
             return 'optional';
         var schema = options === null || options === void 0 ? void 0 : options[name];
-        var type = getOptionFieldStorageType(name, (_a = availableOptions === null || availableOptions === void 0 ? void 0 : availableOptions[name]) === null || _a === void 0 ? void 0 : _a.type, options, operators, (_b = availableOptions === null || availableOptions === void 0 ? void 0 : availableOptions[name]) === null || _b === void 0 ? void 0 : _b.op, isRendererOnly);
+        var type = (0, exports.getOptionFieldStorageType)(name, (_a = availableOptions === null || availableOptions === void 0 ? void 0 : availableOptions[name]) === null || _a === void 0 ? void 0 : _a.type, options, operators, (_b = availableOptions === null || availableOptions === void 0 ? void 0 : availableOptions[name]) === null || _b === void 0 ? void 0 : _b.op, isRendererOnly, optionHoldsExpression(availableOptions === null || availableOptions === void 0 ? void 0 : availableOptions[name]));
         var value = (_c = availableOptions === null || availableOptions === void 0 ? void 0 : availableOptions[name]) === null || _c === void 0 ? void 0 : _c.value;
         // A schema-declared hash whose every entry is a materialised-but-unset
         // field holds nothing, so it is not "set" — without this the row showed a
@@ -1307,11 +1650,16 @@ var FormEngineImpl = function (_a) {
         if (!names.length) {
             return;
         }
-        hasAppliedInitialExpansionRef.current = true;
         var toExpand = initialExpandedOptions.filter(function (name) { return names.includes(name); });
         if (!toExpand.length) {
+            // Not "there is no such row" — "not YET". A server-driven schema arrives
+            // in pieces, and the row the caller named can be in a later one (a test's
+            // `cases` field materialises once its step-kind catalogue lands). Latching
+            // here would spend the one shot on a form that did not yet contain the
+            // field, and the address would never be applied at all.
             return;
         }
+        hasAppliedInitialExpansionRef.current = true;
         setExpandedOptions(function (prev) { return __spreadArray(__spreadArray([], prev, true), toExpand.filter(function (name) { return !prev.includes(name); }), true); });
     }, [initialExpandedOptions, compact, availableOptions]);
     // --- First-attention-field autofocus (opt-in) -----------------------------
@@ -1331,15 +1679,13 @@ var FormEngineImpl = function (_a) {
     // genuine remount (a fresh instance) auto-focuses again, which is the intended
     // on-mount behaviour.
     var hasAutoFocusedRef = (0, react_2.useRef)(false);
-    // The field expanded programmatically for autofocus. A ref (not state) so
-    // CompactRow's 60ms focus timer reads the current value regardless of render
-    // batching; CompactRow focuses this one with `preventScroll` so an off-screen
-    // (or below-the-fold) form is never scrolled into view on mount.
-    var autoFocusNameRef = (0, react_2.useRef)(undefined);
     (0, react_2.useEffect)(function () {
-        // Two decisions, one scan. `autoFocusFirstRequired` opens the row AND puts
-        // the caret in it; `expandFirstRequired` only opens it. Setting both keeps
-        // the focusing behaviour, since focusing implies opening.
+        // Two decisions, one scan. Both open the row that needs attention;
+        // `autoFocusFirstRequired` additionally promises the caret lands in it, and
+        // so refuses to run at all while the reader holds the caret somewhere else
+        // (the guard below). An opened row takes the caret either way — that is
+        // CompactRow's tap-to-edit rule, and it declines just as firmly to take one
+        // that is already somewhere outside the row.
         var wantsFocus = !!autoFocusFirstRequired;
         if ((!wantsFocus && !expandFirstRequired) || !compact || !options) {
             return;
@@ -1387,14 +1733,16 @@ var FormEngineImpl = function (_a) {
         // again.
         hasAutoFocusedRef.current = true;
         if (target) {
-            // Set the ref before the state update so CompactRow's focus timer sees it.
-            // Expand-only leaves it unset, which is what keeps the caret where it is.
-            if (wantsFocus) {
-                autoFocusNameRef.current = target;
-            }
             setExpandedOptions(function (prev) {
                 return prev.includes(target) ? prev
-                    : expandMode === 'multi' ? __spreadArray(__spreadArray([], prev, true), [target], false) : [target];
+                    : expandMode === 'multi' ? __spreadArray(__spreadArray([], prev, true), [target], false) 
+                    // `expandMode: 'single'` is a rule about what a CLICK does: opening a
+                    // row closes the one the reader last opened. It is not a licence to
+                    // close a row the HOST named through `initialExpandedOptions`. That
+                    // is an address — a statement about what the page is FOR, made before
+                    // the reader did anything — and this scan is a convenience layered on
+                    // top of it. Keep the named rows; replace only what a click could.
+                    : __spreadArray(__spreadArray([], prev.filter(function (name) { return initialExpandedOptions === null || initialExpandedOptions === void 0 ? void 0 : initialExpandedOptions.includes(name); }), true), [target], false);
             });
         }
     }, [
@@ -1407,10 +1755,13 @@ var FormEngineImpl = function (_a) {
         dependencyLockedNames,
         getOptionBucket,
         expandMode,
+        initialExpandedOptions,
     ]);
     // Read-first completion summary (how many shown options have a value set),
     // surfaced as a progress meter at the top of the compact form.
-    var readFirstCompletion = (0, react_2.useMemo)(function () { return (0, readFirst_1.getReadFirstCompletion)(availableOptions); }, [JSON.stringify(availableOptions)]);
+    var readFirstCompletion = (0, react_2.useMemo)(function () {
+        return (0, readFirst_1.getReadFirstCompletion)(availableOptions, function (name) { return getOptionBucket(name) === 'attention'; });
+    }, [JSON.stringify(availableOptions), getOptionBucket]);
     var optionalFields = (0, react_2.useMemo)(function () {
         return Object.keys(filteredOptions).map(function (option) {
             var _a, _b, _c, _d, _f, _g;
@@ -1477,7 +1828,7 @@ var FormEngineImpl = function (_a) {
     // The info panel below the row keeps showing schema messages while editing —
     // rendering them in the editor too would balloon a one-line edit.
     suppressSchemaMessages) {
-        var _b, _c, _d, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+        var _b, _c, _d, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
         var type = _a.type, other = __rest(_a, ["type"]);
         var operatorParts = (0, common_1.fixOperatorValue)(other.op);
         // The RENDERER type for this row — which editor mounts. Distinct from the
@@ -1493,12 +1844,55 @@ var FormEngineImpl = function (_a) {
         // schema has not arrived yet (`type` undefined) instead of crashing.
         var optionSchema = options === null || options === void 0 ? void 0 : options[optionName];
         var schemaUiType = optionSchema === null || optionSchema === void 0 ? void 0 : optionSchema.ui_type;
-        var uiTypeIsAnyLike = schemaUiType === 'any' || schemaUiType === 'auto';
+        var uiTypeIsAnyLike = (0, optionUiTypes_1.isUntypedOptionType)(schemaUiType);
+        /* An EXPRESSION's stored type is skipped in this chain.
+  
+           The value is `{ is_expression: true, value: {...} }`, so the type saved
+           beside it describes that envelope — `hash` — not what the field holds.
+           With no `ui_type` to win first, that `hash` beat the schema's `auto`
+           and was handed to the expression editor as the return type to check
+           against: `1 + 2` on a field declared `auto` came back "This does not
+           fit. The expression returns int, and this field holds hash". A literal
+           `1` was fine, because a literal is stored as a plain value whose type
+           matches.
+  
+           Dropping the stored type here lets the schema decide, which is the
+           only party that knows what the field accepts. This is the row
+           renderer's OWN resolution and does not go through
+           `getOptionFieldStorageType`, so guarding that one alone left this
+           untouched. */
+        var storedRowType = optionHoldsExpression(other) ? undefined : type;
+        /* A RELOADED expression is handed to the editor in the shape the editor
+           was written against.
+  
+           An expression is written as `{ type, is_expression: true, value: ast }`
+           and saved as `{ type, value: { is_expression: true, value: ast } }` —
+           the flag moves ONTO the value. The editor was only ever given
+           `other.is_expression`, which is absent in the saved shape, so a
+           reloaded expression was not recognised as one: an `auto` field then
+           resolved its type from the value it could see, decided the envelope was
+           a `hash`, and rendered `1 + 2` as a raw tree of `is_expression` /
+           `exp` / `args` for the author to edit by hand.
+  
+           Both halves have to move together. Flipping the flag alone would put
+           the editor into expression mode and then hand it the ENVELOPE where it
+           expects the expression, so the value is unwrapped here too — after
+           which a saved expression is indistinguishable from one just typed,
+           which is what every component downstream already assumes.
+  
+           Reported as "after Run assertion the value shows as raw data", but the
+           run is incidental: the field beside it, which no run touched, was
+           equally raw. The trigger is a RELOAD, which is the only thing that puts
+           an expression into its saved shape. */
+        var nestedExpression = !!((_b = other === null || other === void 0 ? void 0 : other.value) === null || _b === void 0 ? void 0 : _b.is_expression);
+        var expressionAwareValue = nestedExpression ?
+            other.value.value
+            : other.value;
         var resolvedType = ((0, readFirst_1.isFixedCompactAllowedValueOption)(optionSchema) ?
             getOptionSchemaStorageType(optionSchema, isRendererOnly)
             : schemaUiType && !uiTypeIsAnyLike ? schemaUiType
                 : undefined) ||
-            type ||
+            storedRowType ||
             schemaUiType ||
             (optionSchema === null || optionSchema === void 0 ? void 0 : optionSchema.type) ||
             'any';
@@ -1537,7 +1931,7 @@ var FormEngineImpl = function (_a) {
                                                 (0, jsx_runtime_1.jsx)(reqore_1.ReqoreButton, { disabled: readOnly, icon: 'DeleteBinLine', effect: NegativeColorEffect, fixed: true, onClick: function () { return handleRemoveOperator(optionName, fixedValue, index); } })
                                                 : null] }, index));
                                 }) }), (0, jsx_runtime_1.jsx)(reqore_1.ReqoreVerticalSpacer, { height: 5 })] })
-                    : null, (0, react_1.createElement)(TemplateField_1.TemplateField, __assign({ fluid: true }, options === null || options === void 0 ? void 0 : options[optionName], resolveInheritProps((_b = options === null || options === void 0 ? void 0 : options[optionName]) === null || _b === void 0 ? void 0 : _b.inherit_props, availableOptions, inheritedFromParent), { 
+                    : null, (0, react_1.createElement)(TemplateField_1.TemplateField, __assign({ fluid: true }, options === null || options === void 0 ? void 0 : options[optionName], resolveInheritProps((_c = options === null || options === void 0 ? void 0 : options[optionName]) === null || _c === void 0 ? void 0 : _c.inherit_props, availableOptions, inheritedFromParent), { 
                     // qorus#347-followup (scope forwarding): merge accumulated
                     // inheritance (`inheritedFromParent`) with THIS field's freshly
                     // resolved inherit_props, and pass down as a single bag so any
@@ -1549,13 +1943,20 @@ var FormEngineImpl = function (_a) {
                     // `inherit_props: { language: 'language' }`, the list renderer
                     // forwards it into each row, and the row's body resolves against
                     // the accumulated bag.
-                    inheritedFromParent: __assign(__assign({}, inheritedFromParent), resolveInheritProps((_c = options === null || options === void 0 ? void 0 : options[optionName]) === null || _c === void 0 ? void 0 : _c.inherit_props, availableOptions, inheritedFromParent)), 
+                    //
+                    // Read from the memoised map rather than built here: this is a
+                    // PROP, and one built inline is a new object on every render of
+                    // the form, which re-renders every field that receives it. The
+                    // `??` chain answers for a field the schema does not describe —
+                    // `inheritedScopeFor` returns the SAME references, so an
+                    // undescribed field is as stable as a described one.
+                    inheritedFromParent: (_f = (_d = inheritedScopes.get(optionName)) !== null && _d !== void 0 ? _d : inheritedFromParent) !== null && _f !== void 0 ? _f : NO_INHERITED_SCOPE, 
                     // Propagate compact so an arg_schema field renders a COMPACT sub-form
                     // (consistent with the parent) rather than the classic FormEngine.
                     compact: compact, 
                     // SEAM: forwarded through TemplateField's rest-spread to AutoFormField,
                     // which renders consumer-injected editors by field type/ui_type.
-                    componentOverrides: componentOverrides, allowTemplates: !!(allowTemplates && ((_d = options === null || options === void 0 ? void 0 : options[optionName]) === null || _d === void 0 ? void 0 : _d.supports_templates)), allowFunctions: !!((_f = options === null || options === void 0 ? void 0 : options[optionName]) === null || _f === void 0 ? void 0 : _f.supports_expressions), 
+                    componentOverrides: componentOverrides, templateAwareUiTypes: templateAwareUiTypes, allowTemplates: !!(allowTemplates && ((_g = options === null || options === void 0 ? void 0 : options[optionName]) === null || _g === void 0 ? void 0 : _g.supports_templates)), allowFunctions: !!((_h = options === null || options === void 0 ? void 0 : options[optionName]) === null || _h === void 0 ? void 0 : _h.supports_expressions), 
                     // reqraft: form-level expression fields get the Visual/Text shell
                     // (DPQL text mode); opt out per-form via `templateFieldProps`.
                     allowTextExpressions: true, 
@@ -1567,25 +1968,42 @@ var FormEngineImpl = function (_a) {
                     // control groups. The allowed-values renderer itself enforces the
                     // fixed catalogue and never exposes free-form entry.
                     allowCustomValues: (0, readFirst_1.isFixedCompactAllowedValueOption)(optionSchema) ||
-                        (((_g = options === null || options === void 0 ? void 0 : options[optionName]) === null || _g === void 0 ? void 0 : _g.supports_custom_values) !== false && resolvedType !== 'any'), templates: templates.value }, (0, exports.getTypeAndCanBeNull)(
+                        (((_j = options === null || options === void 0 ? void 0 : options[optionName]) === null || _j === void 0 ? void 0 : _j.supports_custom_values) !== false && resolvedType !== 'any'), 
+                    // A field may declare a template list OF ITS OWN, and when it does
+                    // that list is the one to offer. The engine-wide `stringTemplates`
+                    // are the form's shared vocabulary - config items, system properties
+                    // - and every field draws on the same set. A per-field list answers a
+                    // question only that field asks: a test assertion's `$.` references
+                    // are the values ITS case captured, and no other field in the form
+                    // should be offering them.
+                    //
+                    // Passing the engine's list unconditionally overwrote the schema's,
+                    // so a field that declared templates had none by the time it
+                    // rendered. On a typed field that only cost the picker; on an
+                    // ANY-LIKE one it changed the question, because `TemplateField`
+                    // opens on the template selector only when there is something to
+                    // pick and otherwise falls back to the type picker. An untyped field
+                    // therefore asked the author to choose `string`/`int`/`hash` before
+                    // it would let them name a value they had already captured.
+                    templates: (_k = optionSchema === null || optionSchema === void 0 ? void 0 : optionSchema.templates) !== null && _k !== void 0 ? _k : templates.value }, (0, exports.getTypeAndCanBeNull)(
                 // The RENDERER type picks the editor — the storage type lives on
                 // the value envelope. Passing storage here rendered a `richtext`
                 // field as a plain string input.
-                resolvedType, (_h = options === null || options === void 0 ? void 0 : options[optionName]) === null || _h === void 0 ? void 0 : _h.allowed_values, other.op), { ui_type: resolvedType, name: optionName, uniqueName: "".concat(uniqueName ? "".concat(uniqueName, ".") : "".concat(name ? "".concat(name, ".") : '')).concat(optionName), onChange: 
+                resolvedType, (_l = options === null || options === void 0 ? void 0 : options[optionName]) === null || _l === void 0 ? void 0 : _l.allowed_values, other.op), { ui_type: resolvedType, name: optionName, uniqueName: "".concat(uniqueName ? "".concat(uniqueName, ".") : "".concat(name ? "".concat(name, ".") : '')).concat(optionName), onChange: 
                     // Identity-stable on purpose: the typed fields debounce on
                     // `[localValue, onChange]` — an inline lambda resets the pending emit
                     // every render and the typed value can starve.
-                    handleValueChange, key: optionName, arg_schema: (_j = options === null || options === void 0 ? void 0 : options[optionName]) === null || _j === void 0 ? void 0 : _j.arg_schema, noSoft: !!(rest === null || rest === void 0 ? void 0 : rest.options), value: other.value, isFunction: other.is_expression, isDefaultFunction: ((_k = options === null || options === void 0 ? void 0 : options[optionName]) === null || _k === void 0 ? void 0 : _k.default_view) === 'expression', sensitive: (_l = options === null || options === void 0 ? void 0 : options[optionName]) === null || _l === void 0 ? void 0 : _l.sensitive, default_value: (0, common_1.getDefaultValue)(options === null || options === void 0 ? void 0 : options[optionName]), isDefaultTemplate: ((_m = options === null || options === void 0 ? void 0 : options[optionName]) === null || _m === void 0 ? void 0 : _m.default_view) === 'template', allowed_values: (_o = options === null || options === void 0 ? void 0 : options[optionName]) === null || _o === void 0 ? void 0 : _o.allowed_values, allowed_values_creatable: (_p = options === null || options === void 0 ? void 0 : options[optionName]) === null || _p === void 0 ? void 0 : _p.allowed_values_creatable, disabled: ((_q = options === null || options === void 0 ? void 0 : options[optionName]) === null || _q === void 0 ? void 0 : _q.disabled) ||
+                    handleValueChange, key: optionName, arg_schema: (_m = options === null || options === void 0 ? void 0 : options[optionName]) === null || _m === void 0 ? void 0 : _m.arg_schema, noSoft: !!(rest === null || rest === void 0 ? void 0 : rest.options), value: expressionAwareValue, isFunction: optionHoldsExpression(other), isDefaultFunction: ((_o = options === null || options === void 0 ? void 0 : options[optionName]) === null || _o === void 0 ? void 0 : _o.default_view) === 'expression', sensitive: (_p = options === null || options === void 0 ? void 0 : options[optionName]) === null || _p === void 0 ? void 0 : _p.sensitive, default_value: (0, common_1.getDefaultValue)(options === null || options === void 0 ? void 0 : options[optionName]), isDefaultTemplate: ((_q = options === null || options === void 0 ? void 0 : options[optionName]) === null || _q === void 0 ? void 0 : _q.default_view) === 'template', allowed_values: (_r = options === null || options === void 0 ? void 0 : options[optionName]) === null || _r === void 0 ? void 0 : _r.allowed_values, allowed_values_creatable: (_s = options === null || options === void 0 ? void 0 : options[optionName]) === null || _s === void 0 ? void 0 : _s.allowed_values_creatable, disabled: ((_t = options === null || options === void 0 ? void 0 : options[optionName]) === null || _t === void 0 ? void 0 : _t.disabled) ||
                         (
                         // a system-owned field states that as `readonly`; only the older
                         // compat projection also sent `disabled`, so honouring only
                         // `disabled` rendered an editable control for a value the user
                         // cannot change (see CompactRow's `fieldReadonly`)
-                        (_r = options === null || options === void 0 ? void 0 : options[optionName]) === null || _r === void 0 ? void 0 : _r.readonly) ||
+                        (_u = options === null || options === void 0 ? void 0 : options[optionName]) === null || _u === void 0 ? void 0 : _u.readonly) ||
                         readOnly ||
-                        !(0, validations_1.hasAllDependenciesFullfilled)((_s = options === null || options === void 0 ? void 0 : options[optionName]) === null || _s === void 0 ? void 0 : _s.depends_on, availableOptions, options || {}), readOnly: readOnly, size: editorSize || rest.size, menuItems: ((_t = options === null || options === void 0 ? void 0 : options[optionName]) === null || _t === void 0 ? void 0 : _t.ui_type) === 'any' ?
+                        !(0, validations_1.hasAllDependenciesFullfilled)((_v = options === null || options === void 0 ? void 0 : options[optionName]) === null || _v === void 0 ? void 0 : _v.depends_on, availableOptions, options || {}), readOnly: readOnly, size: editorSize || rest.size, menuItems: (0, typeChoices_1.offersTypeChoices)(options === null || options === void 0 ? void 0 : options[optionName], anyLikeUiTypes) ?
                         getCustomMenuTemplateItems(optionName)
-                        : undefined }, templateFieldProps, { forceDropdown: effectiveForceDropdown })), (0, jsx_runtime_1.jsx)(OptionFieldMessages_1.OptionFieldMessages, { schema: options || {}, allOptions: availableOptions, name: optionName, option: __assign({ type: resolvedType }, other), getType: getTypeForOption }), operators && (0, size_1.default)(operators) && (0, size_1.default)(other.op) ?
+                        : undefined }, templateFieldProps, { forceDropdown: effectiveForceDropdown })), (0, jsx_runtime_1.jsx)(OptionFieldMessages_1.OptionFieldMessages, { schema: options || {}, allOptions: availableOptions, name: optionName, option: __assign({ type: resolvedType }, other), getType: getTypeForOption, untouched: !touchedOptionsRef.current.has(optionName) }), operators && (0, size_1.default)(operators) && (0, size_1.default)(other.op) ?
                     (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(reqore_1.ReqoreVerticalSpacer, { height: 5 }), (0, jsx_runtime_1.jsx)(reqore_1.ReqoreMessage, { size: 'small', children: (0, jsx_runtime_1.jsxs)(reqore_1.ReqoreTagGroup, { children: [(0, jsx_runtime_1.jsx)(reqore_1.ReqoreTag, { size: 'small', labelKey: 'WHERE', label: optionName }), (0, jsx_runtime_1.jsx)(reqore_1.ReqoreTag, { size: 'small', labelKey: 'IS', label: operatorParts.join(' ') }), (0, jsx_runtime_1.jsx)(reqore_1.ReqoreTag, { size: 'small', intent: 'info', label: other.value ?
                                                 resolvedType === 'richtext' ?
                                                     (0, common_1.richtextToString)(other.value)
@@ -1615,10 +2033,12 @@ var FormEngineImpl = function (_a) {
         handleRemoveOperator,
         getCustomMenuTemplateItems,
         getTypeForOption,
+        inheritedScopes,
+        inheritedFromParent,
     ]);
     // Compact (read-first) rendering.
     // Theme-derived colours so the flat-row layout adapts to light/dark/custom themes.
-    var cText = ((_c = theme === null || theme === void 0 ? void 0 : theme.text) === null || _c === void 0 ? void 0 : _c.color) || '#f1f0ee';
+    var cText = ((_b = theme === null || theme === void 0 ? void 0 : theme.text) === null || _b === void 0 ? void 0 : _b.color) || '#f1f0ee';
     // Text emphasis tiers via reqore's readable-colour helper (key = full readable
     // text, muted = its dimmed variant, faint = the dimmed variant softened
     // further) instead of hand-rolled hex-alpha suffixes on the raw text colour.
@@ -1627,10 +2047,10 @@ var FormEngineImpl = function (_a) {
     var cFaint = "".concat(cMuted, "99");
     var cDivider = "".concat(cText, "14");
     var cHover = "".concat(cText, "0d");
-    var cDanger = ((_d = theme === null || theme === void 0 ? void 0 : theme.intents) === null || _d === void 0 ? void 0 : _d.danger) || '#e35a5a';
-    var cWarning = ((_f = theme === null || theme === void 0 ? void 0 : theme.intents) === null || _f === void 0 ? void 0 : _f.warning) || '#ffdf34';
-    var cInfo = ((_g = theme === null || theme === void 0 ? void 0 : theme.intents) === null || _g === void 0 ? void 0 : _g.info) || '#3b8eea';
-    var cSuccess = ((_h = theme === null || theme === void 0 ? void 0 : theme.intents) === null || _h === void 0 ? void 0 : _h.success) || '#36b37e';
+    var cDanger = ((_c = theme === null || theme === void 0 ? void 0 : theme.intents) === null || _c === void 0 ? void 0 : _c.danger) || '#e35a5a';
+    var cWarning = ((_d = theme === null || theme === void 0 ? void 0 : theme.intents) === null || _d === void 0 ? void 0 : _d.warning) || '#ffdf34';
+    var cInfo = ((_f = theme === null || theme === void 0 ? void 0 : theme.intents) === null || _f === void 0 ? void 0 : _f.info) || '#3b8eea';
+    var cSuccess = ((_g = theme === null || theme === void 0 ? void 0 : theme.intents) === null || _g === void 0 ? void 0 : _g.success) || '#36b37e';
     var cBg = (theme === null || theme === void 0 ? void 0 : theme.main) || '#181818';
     var cRowBg = (0, colors_1.changeDarkness)((0, colors_1.getMainBackgroundColor)(theme), 0.01);
     var cGroupLine = "".concat(cText, "1f");
@@ -1643,6 +2063,7 @@ var FormEngineImpl = function (_a) {
     var compactRowContextValue = (0, react_2.useMemo)(function () { return ({
         templates: templates.value,
         readOnly: readOnly,
+        onReadOnlyActivate: onReadOnlyActivate,
         commitMode: commitMode,
         expandMode: expandMode,
         options: options,
@@ -1652,7 +2073,6 @@ var FormEngineImpl = function (_a) {
         codePreviewRenderer: codePreviewRenderer,
         showAllDescriptions: showAllDescriptions,
         expandedOptions: expandedOptions,
-        autoFocusNameRef: autoFocusNameRef,
         highlightedOptions: highlightedOptions,
         flashedOptions: flashedOptions,
         infoPanelOverrides: infoPanelOverrides,
@@ -1699,7 +2119,6 @@ var FormEngineImpl = function (_a) {
         codePreviewRenderer,
         showAllDescriptions,
         expandedOptions,
-        autoFocusNameRef,
         highlightedOptions,
         flashedOptions,
         infoPanelOverrides,
@@ -1756,7 +2175,21 @@ var FormEngineImpl = function (_a) {
             fields: false,
             help: false,
         },
-        hasMultipleOptions: (0, size_1.default)(availableOptions) > 1,
+        /* From the SCHEMA, not from the value.
+         *
+         * `availableOptions` is keyed off the form's VALUE, so it grows as data
+         * arrives — and the search row is rendered only when this is true
+         * (`CompactToolbar`). A form whose value lands after its first render
+         * therefore ADDED a 38px row to its header a beat later, and everything
+         * below it moved. Measured on the Qorus IDE's test editor, on the nested
+         * sub-form of a case: 33 elements jumped down 51px in one frame, on every
+         * cold load.
+         *
+         * How many fields a form has is a property of its schema. The two agree
+         * once the value has arrived — `fixOptions` materialises an entry per
+         * declared field — so this only changes the answer during the load, which
+         * is the whole point. */
+        hasMultipleOptions: (0, size_1.default)(options) > 1,
         compactQuery: compactQuery,
         setCompactQuery: setCompactQuery,
         requiredOnly: requiredOnly,
@@ -1776,6 +2209,7 @@ var FormEngineImpl = function (_a) {
         onRevertAll: handleRevertChangesClick,
     }); }, [
         readOnly,
+        onReadOnlyActivate,
         validityData,
         readFirstAttentionCount,
         readFirstCompletion,
@@ -1807,6 +2241,7 @@ var FormEngineImpl = function (_a) {
     // removes it, and then the header carries just the consumer's own actions.
     var compactHeaderActions = (0, react_2.useMemo)(function () { return __spreadArray(__spreadArray([], (compactToolbarParts ? [{ as: CompactToolbar_1.CompactToolbar, responsive: false }] : []), true), ((compactPanelProps === null || compactPanelProps === void 0 ? void 0 : compactPanelProps.actions) || []), true); }, [compactPanelProps === null || compactPanelProps === void 0 ? void 0 : compactPanelProps.actions, compactToolbarParts]);
     var renderCompact = function () {
+        var _a, _b, _c;
         var headerBg = "".concat((0, colors_1.changeDarkness)((0, colors_1.getMainBackgroundColor)(theme), 0.02)).concat((0, colors_1.percentToHexAlpha)(88));
         // Toolbar filters narrow the listed rows; the meter reflects the full set.
         var query = compactQuery.trim().toLowerCase();
@@ -1899,7 +2334,7 @@ var FormEngineImpl = function (_a) {
             var isUnset_1 = function (name) { var _a; return (0, readFirst_1.isOptionValueEmpty)((_a = shownOptions[name]) === null || _a === void 0 ? void 0 : _a.value); };
             var isFieldInvalid_1 = function (name) {
                 var _a, _b, _c;
-                return !isOptionValid(name, getOptionFieldStorageType(name, (_a = shownOptions[name]) === null || _a === void 0 ? void 0 : _a.type, options, operators, (_b = shownOptions[name]) === null || _b === void 0 ? void 0 : _b.op, isRendererOnly), (_c = shownOptions[name]) === null || _c === void 0 ? void 0 : _c.value);
+                return !isOptionValid(name, (0, exports.getOptionFieldStorageType)(name, (_a = shownOptions[name]) === null || _a === void 0 ? void 0 : _a.type, options, operators, (_b = shownOptions[name]) === null || _b === void 0 ? void 0 : _b.op, isRendererOnly), (_c = shownOptions[name]) === null || _c === void 0 ? void 0 : _c.value);
             };
             var comparator_1 = function (a, b) {
                 switch (compactSort) {
@@ -1985,6 +2420,13 @@ var FormEngineImpl = function (_a) {
         var bucketCount = function (b) {
             return bucketGroups[b].reduce(function (n, g) { return n + buckets[b][g].length; }, 0);
         };
+        /* The default is to collapse the Optional box, and an explicit pass is
+           what waives the "never collapse the sole box" escape below. Resolving it
+           here rather than in the parameter list is what makes the two
+           distinguishable — `['optional']` as a default and `['optional']` from a
+           caller mean different things. */
+        var compactCollapsedGroups = compactCollapsedGroupsProp !== null && compactCollapsedGroupsProp !== void 0 ? compactCollapsedGroupsProp : ['optional'];
+        var collapsedGroupsRequested = compactCollapsedGroupsProp !== undefined;
         // "Is the Optional box the whole form?" — when nothing needs attention and
         // nothing is set, collapsing it leaves a card with no visible content at all.
         var onlyOptionalRows = bucketCount('optional') > 0 && bucketCount('attention') === 0 && bucketCount('set') === 0;
@@ -2024,10 +2466,23 @@ var FormEngineImpl = function (_a) {
             return boxKey === 'optional' &&
                 bucketGroups[boxKey].some(function (groupName) { return groupHasPreselectedRow(boxKey, groupName); });
         };
+        /* The pin, and where it lands. A nested sub-form sits inside the parent's
+           card and owns no scroll context, so it never pins. */
+        var stickyBoxHeaders = compactStickyBoxHeaders && !compactNested;
+        var boxStickyOffset = compactStickyOffset + compactToolbarHeight;
         var STATUS_BOXES = [
-            { key: 'attention', label: 'Needs attention', intent: 'warning', icon: 'ErrorWarningLine' },
-            { key: 'set', label: 'Set', intent: 'success', icon: 'CheckLine' },
-            { key: 'optional', label: 'Optional', icon: 'CheckboxBlankCircleLine' },
+            {
+                key: 'attention',
+                label: (_a = compactBoxLabels === null || compactBoxLabels === void 0 ? void 0 : compactBoxLabels.attention) !== null && _a !== void 0 ? _a : 'Needs attention',
+                intent: 'warning',
+                icon: 'ErrorWarningLine',
+            },
+            { key: 'set', label: (_b = compactBoxLabels === null || compactBoxLabels === void 0 ? void 0 : compactBoxLabels.set) !== null && _b !== void 0 ? _b : 'Set', intent: 'success', icon: 'CheckLine' },
+            {
+                key: 'optional',
+                label: (_c = compactBoxLabels === null || compactBoxLabels === void 0 ? void 0 : compactBoxLabels.optional) !== null && _c !== void 0 ? _c : 'Optional',
+                icon: 'CheckboxBlankCircleLine',
+            },
         ];
         // Build the rows for one group: contiguous required-group members are pulled
         // together at the first member's slot and rendered as a connected rail (flat
@@ -2104,17 +2559,59 @@ var FormEngineImpl = function (_a) {
                             }, children: groupConfig.subtitle })
                         : null, renderGroupRows(rows)] }, groupName));
         };
-        return ((0, jsx_runtime_1.jsx)(exports.OptionsContext.Provider, { value: { schema: options, value: availableOptions }, children: (0, jsx_runtime_1.jsx)(compactRowContext_1.CompactRowContext.Provider, { value: compactRowContextValue, children: (0, jsx_runtime_1.jsxs)(reqore_1.ReqoreErrorBoundary, { children: [showHelpForOption && ((0, jsx_runtime_1.jsx)(OptionsHelpDialog_1.OptionsHelpDialog, { onClose: function () { return setShowHelpForOption(undefined); }, option: options[showHelpForOption] })), (0, jsx_runtime_1.jsx)(compactToolbarContext_1.CompactToolbarContext.Provider, { value: compactToolbarContextValue, children: (0, jsx_runtime_1.jsxs)(StyledCompactWrap, { ref: setCompactWrap, className: 'options-readfirst-scroll', "$ownScroll": compactScroll === 'own' && !compactNested, children: [(0, jsx_runtime_1.jsxs)(compactRowStyles_1.StyledCompactPanel
+        return ((0, jsx_runtime_1.jsx)(optionsContext_1.OptionsContext.Provider, { value: { schema: options, value: availableOptions }, children: (0, jsx_runtime_1.jsx)(compactRowContext_1.CompactRowContext.Provider, { value: compactRowContextValue, children: (0, jsx_runtime_1.jsxs)(reqore_1.ReqoreErrorBoundary, { children: [showHelpForOption && ((0, jsx_runtime_1.jsx)(OptionsHelpDialog_1.OptionsHelpDialog, { onClose: function () { return setShowHelpForOption(undefined); }, option: options[showHelpForOption] })), (0, jsx_runtime_1.jsx)(compactToolbarContext_1.CompactToolbarContext.Provider, { value: compactToolbarContextValue, children: (0, jsx_runtime_1.jsxs)(StyledCompactWrap, { ref: setCompactWrap, className: 'options-readfirst-scroll', "$ownScroll": compactScroll === 'own' && !compactNested, children: [(0, jsx_runtime_1.jsxs)(compactRowStyles_1.StyledCompactPanel
                                     // Mirrors the toolbar's own search-row gate: when no search
                                     // row renders, the header is a thin strip and sits tight to
                                     // the first status box (see StyledCompactPanel).
-                                    , __assign({ "$tightHeader": !((compactToolbarParts === null || compactToolbarParts === void 0 ? void 0 : compactToolbarParts.search) && (0, size_1.default)(availableOptions) > 1), "$headerBg": compactNested ? 'transparent' : headerBg, "$nested": compactNested, flat: true, raised: true, minimal: true, 
+                                    , __assign({ "$tightHeader": !((compactToolbarParts === null || compactToolbarParts === void 0 ? void 0 : compactToolbarParts.search) && (0, size_1.default)(options) > 1), "$headerBg": compactNested ? 'transparent' : headerBg, "$nested": compactNested, "$stickyBoxes": compactStickyBoxHeaders && !compactNested, flat: true, raised: true, minimal: true, 
                                         // No panel background: the form sits transparently on whatever
                                         // hosts it (page, drawer, or — for an arg_schema field — the
                                         // parent's edit card) instead of stacking its own dark surface.
                                         // The status boxes keep their own tints; the sticky toolbar keeps
                                         // its blurred header via the $headerBg override.
-                                        stickyHeader: !compactNested }, compactPanelProps, { actions: compactHeaderActions, contentStyle: __assign({ display: 'flex', flexFlow: 'column', gap: '10px' }, compactPanelProps === null || compactPanelProps === void 0 ? void 0 : compactPanelProps.contentStyle), children: [(0, size_1.default)(groupKeys) === 0 || (readOnly && !bucketCount('set')) ?
+                                        // NARROW: the toolbar gives up its pin so the box headers
+                                        // can keep theirs.
+                                        //
+                                        // Measured at 380px, a pinned toolbar is 124px and a pinned
+                                        // box header is 48 — together a third of a phone's readable
+                                        // body, before the form has drawn a line. Only one of them
+                                        // can be afforded there, and the box header is the better
+                                        // buy: the toolbar is chrome you GO to (a search, a field
+                                        // picker, a meter — all of it still one scroll away at the
+                                        // top of the form), while the box header is chrome you READ,
+                                        // and it is the only thing that says which bucket the rows
+                                        // under the pointer are in.
+                                        //
+                                        // Same shape of decision the engine already makes one level
+                                        // down, where `optionActionsCollapse: 'auto'` folds a row's
+                                        // actions into a menu because a narrow row has no width for
+                                        // a button strip.
+                                        //
+                                        // A consumer can still force either way: `compactPanelProps`
+                                        // spreads after this.
+                                        stickyHeader: !compactNested && !(compactNarrow && compactStickyBoxHeaders), 
+                                        // Below the host's own pinned chrome, if it has any — see
+                                        // `compactStickyOffset`.
+                                        stickyHeaderOffset: compactStickyOffset || undefined }, compactPanelProps, { actions: compactHeaderActions, contentStyle: __assign({ display: 'flex', flexFlow: 'column', gap: '10px', 
+                                            /* The panel body must not be a SCROLL CONTAINER.
+                                            
+                                               `StyledPanelContent` ships `overflow: auto` so a
+                                               height-capped panel can scroll its body. This one is never
+                                               capped — in `compactScroll: 'host'` the page scrolls and in
+                                               'own' the wrap above does — so the `auto` never engages and
+                                               reads as inert. It is not: an `overflow: auto` box is a
+                                               scrollport whether or not it scrolls, and every
+                                               `position: sticky` inside resolves against IT. The status
+                                               box headers (and the toolbar, in a nested host) would pin
+                                               to a box that never moves, which looks exactly like sticky
+                                               being ignored.
+                                            
+                                               `overflow-x: clip`, NOT `hidden`, for the reason spelled
+                                               out on `StyledCompactWrap`: CSS coerces an `overflow-y:
+                                               visible` to `auto` unless the other axis is visible or
+                                               clip, which would put the scrollport straight back. `clip`
+                                               keeps the horizontal guard the row ellipsis relies on. */
+                                            overflowY: 'visible', overflowX: 'clip' }, compactPanelProps === null || compactPanelProps === void 0 ? void 0 : compactPanelProps.contentStyle), children: [(0, size_1.default)(groupKeys) === 0 || (readOnly && !bucketCount('set')) ?
                                                 (0, jsx_runtime_1.jsx)(reqore_1.ReqoreMessage, { flat: true, opaque: false, size: 'small', children: readOnly && !query ?
                                                         'Nothing is set.'
                                                         : 'No fields match the current filters.' })
@@ -2130,7 +2627,7 @@ var FormEngineImpl = function (_a) {
                                                     var hasPreselectedRows = boxHasPreselectedRows(box.key);
                                                     var wouldCollapse = compactCollapsedGroups.includes(box.key) &&
                                                         !query &&
-                                                        !(box.key === 'optional' && onlyOptionalRows);
+                                                        !(box.key === 'optional' && onlyOptionalRows && !collapsedGroupsRequested);
                                                     // Only a box that was opened SOLELY to reveal a preselected
                                                     // row splits its body; a box that renders open anyway shows
                                                     // all of its groups as before.
@@ -2174,14 +2671,19 @@ var FormEngineImpl = function (_a) {
                                                     var boxBg = box.key === 'optional' ?
                                                         (0, colors_1.changeDarkness)((0, colors_1.getMainBackgroundColor)(theme), 0.06)
                                                         : undefined;
-                                                    return ((0, jsx_runtime_1.jsx)(compactRowStyles_1.StyledStatusBox, { "$accent": accent, "$bg": boxBg, ref: function (node) {
+                                                    return ((0, jsx_runtime_1.jsx)(compactRowStyles_1.StyledStatusBox, { "$accent": accent, "$bg": boxBg, "$surface": stickyBoxHeaders ? (0, colors_1.getMainBackgroundColor)(theme) : undefined, ref: function (node) {
                                                             statusBoxRefs.current[box.key] = node;
                                                         }, 
                                                         // Opening arms the reveal; collapsing disarms it, so a
                                                         // close never scrolls.
                                                         onCollapseChange: function (collapsed) {
                                                             return setOpenedStatusBox(collapsed ? undefined : box.key);
-                                                        }, flat: true, minimal: true, collapseButtonProps: { flat: true, minimal: true, size: 'small' }, collapsible: true, 
+                                                        }, flat: true, minimal: true, 
+                                                        /* The header stays on screen while its own box is
+                                                           being read — see `compactStickyBoxHeaders`. Sticky
+                                                           is bounded by its containing block, so the header
+                                                           leaves with its box and only one is ever pinned. */
+                                                        stickyHeader: stickyBoxHeaders, stickyHeaderOffset: stickyBoxHeaders ? boxStickyOffset : undefined, collapseButtonProps: { flat: true, minimal: true, size: 'small' }, collapsible: true, 
                                                         // Which boxes start closed is the consumer's call
                                                         // (`compactCollapsedGroups`, default `['optional']`: the
                                                         // Optional box holds every not-yet-added field, so a form
@@ -2231,15 +2733,23 @@ var FormEngineImpl = function (_a) {
                                                             : 'Resolve the invalid fields before saving', onClick: handleCommitClick, children: "Save" }), (0, jsx_runtime_1.jsx)(reqore_1.ReqoreButton, { size: 'small', minimal: true, flat: true, fixed: true, icon: 'HistoryLine', className: 'options-readfirst-discard', onClick: handleRevertChangesClick, children: "Discard" })] }) })
                                         : null] }) })] }) }) }));
     };
-    if (rest.skeleton ||
-        templates.loading ||
-        typesLoading ||
-        optionsLoading ||
-        // Remote-fetch gates, mirroring IDE Options (systemOptions.tsx:1097-1102).
-        loading ||
-        (operatorsUrl && !operators) ||
-        ((url || customUrl) && !options)) {
-        return ((0, jsx_runtime_1.jsxs)(reqore_1.ReqoreControlGroup, { className: 'options-loading-skeleton', vertical: true, fill: true, fluid: true, style: { flexGrow: 1 }, gapSize: 'big', children: [(0, jsx_runtime_1.jsxs)(reqore_1.ReqoreControlGroup, { fixed: true, fill: false, children: [(0, jsx_runtime_1.jsx)(reqore_1.ReqoreSkeleton, {}), (0, jsx_runtime_1.jsx)(reqore_1.ReqoreSkeleton, {}), (0, jsx_runtime_1.jsx)(reqore_1.ReqoreSkeleton, { width: '100%' })] }), (0, jsx_runtime_1.jsxs)(reqore_1.ReqoreControlGroup, { vertical: true, fill: false, children: [(0, jsx_runtime_1.jsx)(reqore_1.ReqoreSkeleton, { width: '100%', height: '150px' }), (0, jsx_runtime_1.jsx)(reqore_1.ReqoreSkeleton, { width: '100%', height: '150px' }), (0, jsx_runtime_1.jsx)(reqore_1.ReqoreSkeleton, { width: '100%', height: '150px' })] })] }));
+    /* Which of the seven waits is holding the form, in the order they are
+       tested. Rendered as `data-wait` on the placeholder so a page can be asked
+       what it is waiting FOR instead of only that it is waiting. */
+    var waitReason = rest.skeleton ? (rest.skeletonReason ? "host:".concat(rest.skeletonReason) : 'host')
+        : templates.loading ? 'templates'
+            : typesLoading ? 'types'
+                : optionsLoading ? 'options'
+                    : loading ? 'fetch'
+                        : operatorsUrl && !operators ? 'operators'
+                            : (url || customUrl) && !options ? 'schema'
+                                : undefined;
+    if (waitReason) {
+        /* The shape of the FORM, not a generic block arrangement. This used to be
+           three bars over three big panels, which resembles nothing this gate is
+           waiting for and shared no vocabulary with the other waits on the same
+           page — see `FormFieldsSkeleton`. */
+        return (0, jsx_runtime_1.jsx)(FormFieldsSkeleton_1.FormFieldsSkeleton, { fill: true, className: 'options-loading-skeleton', reason: waitReason });
     }
     // A loader that rejected (and produced no usable schema) surfaces its error
     // instead of the generic "No options available" empty state.
@@ -2252,7 +2762,7 @@ var FormEngineImpl = function (_a) {
     if (compact) {
         return renderCompact();
     }
-    return ((0, jsx_runtime_1.jsx)(exports.OptionsContext.Provider, { value: { schema: options, value: availableOptions }, children: (0, jsx_runtime_1.jsxs)(reqore_1.ReqoreErrorBoundary, { children: [showHelpForOption && ((0, jsx_runtime_1.jsx)(OptionsHelpDialog_1.OptionsHelpDialog, { onClose: function () { return setShowHelpForOption(undefined); }, option: options[showHelpForOption] })), recordRequiresSearchOptions && !readOnly ?
+    return ((0, jsx_runtime_1.jsx)(optionsContext_1.OptionsContext.Provider, { value: { schema: options, value: availableOptions }, children: (0, jsx_runtime_1.jsxs)(reqore_1.ReqoreErrorBoundary, { children: [showHelpForOption && ((0, jsx_runtime_1.jsx)(OptionsHelpDialog_1.OptionsHelpDialog, { onClose: function () { return setShowHelpForOption(undefined); }, option: options[showHelpForOption] })), recordRequiresSearchOptions && !readOnly ?
                     (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(reqore_1.ReqoreMessage, { intent: 'info', children: "This provider record requires some search options to be set. You can set them below." }), (0, jsx_runtime_1.jsx)(reqore_1.ReqoreVerticalSpacer, { height: 10 })] })
                     : null, (0, jsx_runtime_1.jsx)(reqore_1.ReqoreCollection, __assign({ minColumnWidth: '350px', flat: true, padded: false, minimal: true }, rest, { label: compact ? undefined : rest.label, responsiveTitle: false, inputProps: {
                         disabled: (0, size_1.default)(availableOptions) < 2,
@@ -2314,72 +2824,67 @@ var FormEngineImpl = function (_a) {
                             stretch: STRECHABLE_TYPES.has(options[optionName].type) ||
                                 options[optionName].stretch,
                             size: 'small',
-                            floatingActions: true,
-                            actions: __spreadArray(__spreadArray([], (0, optionActions_1.resolveOptionActions)(optionActions, {
-                                name: optionName,
-                                schema: options[optionName],
-                                value: availableOptions === null || availableOptions === void 0 ? void 0 : availableOptions[optionName],
-                            }), true), [
-                                {
-                                    size: 'tiny',
-                                    icon: 'FullscreenLine',
-                                    className: 'options-item-fullscreen',
-                                    tooltip: 'Focused Editing',
-                                    show: (!readOnly &&
+                            /* No floating bar. It is portalled over whatever sits above the
+                               row — on the first row, the form's own header buttons, which it
+                               made unclickable — and a bar that only appears on a hover is out
+                               of reach on a phone. The row's actions render in its own
+                               header: injected ones as buttons (all of them in the menu on
+                               touch or a narrow viewport), the row's own secondary ones in
+                               its ⋯ menu. */
+                            actions: (0, optionActions_1.optionRowActions)({
+                                injected: (0, optionActions_1.resolveOptionActions)(optionActions, {
+                                    name: optionName,
+                                    schema: options[optionName],
+                                    value: availableOptions === null || availableOptions === void 0 ? void 0 : availableOptions[optionName],
+                                }).filter(function (action) { return action.show !== false; }),
+                                collapse: collapseOptionActions,
+                                menu: [
+                                    !readOnly &&
                                         type !== 'code-editor' &&
                                         (((_m = options[optionName]) === null || _m === void 0 ? void 0 : _m.ui_type) || ((_o = options[optionName]) === null || _o === void 0 ? void 0 : _o.type)) !==
-                                            'code-editor') ?
-                                        'hover'
-                                        : false,
-                                    onClick: function () { return setFocusedEditing(optionName); },
-                                },
-                                {
-                                    size: 'tiny',
-                                    icon: 'CloseLine',
-                                    className: 'options-item-remove',
-                                    tooltip: 'Remove Value',
-                                    show: (!readOnly &&
+                                            'code-editor' && {
+                                        label: 'Focused editing',
+                                        icon: 'FullscreenLine',
+                                        className: 'options-item-fullscreen',
+                                        onClick: function () { return setFocusedEditing(optionName); },
+                                    },
+                                    !readOnly &&
+                                        hasOptionChanged(other.value, optionName) && {
+                                        label: 'Revert changes',
+                                        icon: 'HistoryLine',
+                                        className: 'options-item-revert',
+                                        onClick: function () {
+                                            var _a, _b, _c, _d;
+                                            handleValueChange(optionName, (_b = (_a = originalValue.current) === null || _a === void 0 ? void 0 : _a[optionName]) === null || _b === void 0 ? void 0 : _b.value, (_d = (_c = originalValue.current) === null || _c === void 0 ? void 0 : _c[optionName]) === null || _d === void 0 ? void 0 : _d.type);
+                                        },
+                                    },
+                                    !readOnly &&
                                         other.value &&
                                         !(0, lodash_1.isEqual)(other.value, (0, common_1.getDefaultValue)(options[optionName])) &&
-                                        !(((_p = options[optionName]) === null || _p === void 0 ? void 0 : _p.disabled) || ((_q = options[optionName]) === null || _q === void 0 ? void 0 : _q.readonly))) ?
-                                        'hover'
-                                        : false,
-                                    onClick: function () { return handleValueChange(optionName, undefined); },
-                                },
-                                {
-                                    size: 'tiny',
-                                    icon: 'HistoryLine',
-                                    className: 'options-item-revert',
-                                    tooltip: 'Revert Changes',
-                                    show: !readOnly && hasOptionChanged(other.value, optionName) ?
-                                        'hover'
-                                        : false,
-                                    onClick: function () {
-                                        var _a, _b, _c, _d;
-                                        handleValueChange(optionName, (_b = (_a = originalValue.current) === null || _a === void 0 ? void 0 : _a[optionName]) === null || _b === void 0 ? void 0 : _b.value, (_d = (_c = originalValue.current) === null || _c === void 0 ? void 0 : _c[optionName]) === null || _d === void 0 ? void 0 : _d.type);
+                                        !(((_p = options[optionName]) === null || _p === void 0 ? void 0 : _p.disabled) || ((_q = options[optionName]) === null || _q === void 0 ? void 0 : _q.readonly)) && {
+                                        label: 'Remove value',
+                                        icon: 'CloseLine',
+                                        className: 'options-item-remove',
+                                        onClick: function () { return handleValueChange(optionName, undefined); },
                                     },
-                                },
-                                {
-                                    size: 'tiny',
-                                    icon: 'DeleteBinLine',
-                                    intent: 'danger',
-                                    minimal: true,
-                                    className: 'options-optional-remove',
-                                    show: (!readOnly &&
+                                    !readOnly &&
                                         !((_r = options[optionName]) === null || _r === void 0 ? void 0 : _r.preselected) &&
-                                        !((_s = options[optionName]) === null || _s === void 0 ? void 0 : _s.required)) ?
-                                        'hover'
-                                        : false,
-                                    onClick: function () {
-                                        confirmAction({
-                                            title: 'Remove Selected Option',
-                                            onConfirm: function () {
-                                                removeSelectedOption(optionName);
-                                            },
-                                        });
+                                        !((_s = options[optionName]) === null || _s === void 0 ? void 0 : _s.required) && {
+                                        label: 'Remove option',
+                                        icon: 'DeleteBinLine',
+                                        intent: 'danger',
+                                        className: 'options-optional-remove',
+                                        onClick: function () {
+                                            confirmAction({
+                                                title: 'Remove Selected Option',
+                                                onConfirm: function () {
+                                                    removeSelectedOption(optionName);
+                                                },
+                                            });
+                                        },
                                     },
-                                },
-                            ], false),
+                                ],
+                            }),
                             content: ((0, jsx_runtime_1.jsxs)(FocusedEditing_1.FocusedEditing, { isFullscreen: focusedEditing === optionName, onClose: function () { return setFocusedEditing(undefined); }, description: (_t = options[optionName]) === null || _t === void 0 ? void 0 : _t.display_name, intent: getIntent(optionName, type, other.value, other.op), children: [focusedEditing === optionName ?
                                         (0, jsx_runtime_1.jsx)(Description_1.Description, { longDescription: (_u = options[optionName]) === null || _u === void 0 ? void 0 : _u.desc, shortDescription: (_v = options[optionName]) === null || _v === void 0 ? void 0 : _v.short_desc, longDescriptionShownByDefault: true })
                                         : null, renderOption(optionName, __assign({ type: type }, other))] })),