@nocobase/plugin-flow-engine 2.1.0-beta.35 → 2.1.0-beta.37

package/dist/server/flow-surfaces/service.js

@@ -146,10 +146,24 @@ const CANONICAL_BLOCK_HEADER_USES = /* @__PURE__ */ new Set([
   "ChartBlockModel",
   "ActionPanelBlockModel",
   "MapBlockModel",
-  "CommentsBlockModel"
+  "CommentsBlockModel",
+  "RecordHistoryBlockModel"
 ]);
+const COMMENTS_PAGE_SIZE_VALUES = /* @__PURE__ */ new Set([5, 10, 20, 50, 100, 200]);
+const RECORD_HISTORY_INTERNAL_COLLECTIONS = /* @__PURE__ */ new Set(["recordHistories", "recordFieldHistories"]);
 const CARD_FIELD_COMPOSE_BLOCK_TYPES = /* @__PURE__ */ new Set(["list", "gridCard", "kanban"]);
-const RECORD_ACTION_COMPOSE_BLOCK_TYPES = /* @__PURE__ */ new Set(["list", "gridCard"]);
+const RECORD_ACTION_COMPOSE_BLOCK_TYPES = /* @__PURE__ */ new Set(["list", "gridCard", "comments"]);
+const COMMENT_ACTION_SINGLETON_USES = /* @__PURE__ */ new Set([
+  "EditCommentActionModel",
+  "DeleteCommentActionModel",
+  "QuoteReplyActionModel"
+]);
+const RECORD_HISTORY_ACTION_SINGLETON_USES = /* @__PURE__ */ new Set([
+  "FilterActionModel",
+  "RefreshActionModel",
+  "RecordHistoryExpandActionModel",
+  "RecordHistoryCollapseActionModel"
+]);
 const GRID_SETTINGS_FLOW_KEY = "gridSettings";
 const GRID_SETTINGS_LAYOUT_STEP_KEY = "grid";
 const OPEN_VIEW_MODE_ALIASES = {
@@ -167,7 +181,8 @@ const FILTER_TARGET_BLOCK_USES = /* @__PURE__ */ new Set([
   "GridCardBlockModel",
   "ChartBlockModel",
   "MapBlockModel",
-  "CommentsBlockModel"
+  "CommentsBlockModel",
+  "RecordHistoryBlockModel"
 ]);
 const TREE_CONNECT_TARGET_BLOCK_USES = new Set(FILTER_TARGET_BLOCK_USES);
 const EDITABLE_FIELD_WRAPPER_USES = /* @__PURE__ */ new Set(["FormItemModel", "FilterFormItemModel", "PatternFormItemModel"]);
@@ -315,6 +330,7 @@ const POPUP_COLLECTION_BLOCK_SCENES = {
   ProcessFormModel: ["one"],
   ApprovalDetailsModel: ["one"],
   CommentsBlockModel: ["one", "many"],
+  RecordHistoryBlockModel: ["one", "many"],
   TableBlockModel: ["many"],
   CalendarBlockModel: ["many"],
   TreeBlockModel: ["filter"],
@@ -441,6 +457,25 @@ const UPDATE_SETTINGS_STEP_PARAM_MIRRORS_BY_USE = {
   DividerItemModel: DIVIDER_ITEM_STEP_PARAM_MIRRORS
 };
 const FLOW_SURFACE_MENU_BINDABLE_OPTION_KEY = "flowSurfaceMenuBindable";
+const AI_EMPLOYEE_ACTION_USE = "AIEmployeeButtonModel";
+const AI_EMPLOYEE_OWNER_PLUGIN = "@nocobase/plugin-ai";
+const AI_EMPLOYEE_PUBLIC_SETTING_KEYS = ["username", "auto", "workContext", "tasks", "style"];
+const AI_EMPLOYEE_INTERNAL_PROP_KEYS = ["aiEmployee", "context", "auto", "tasks", "style"];
+const AI_EMPLOYEE_TASK_STEP_PARAMS_PATH = ["shortcutSettings", "editTasks", "tasks"];
+const AI_EMPLOYEE_WORK_CONTEXT_PUBLIC_KEYS = ["type", "uid", "target"];
+const AI_EMPLOYEE_TASK_PUBLIC_SETTING_KEYS = ["title", "message", "autoSend", "skillSettings", "model", "webSearch"];
+const AI_EMPLOYEE_TASK_MESSAGE_PUBLIC_KEYS = ["system", "user", "workContext"];
+const AI_EMPLOYEE_TASK_MODEL_PUBLIC_KEYS = ["llmService", "model"];
+const AI_EMPLOYEE_SKILL_SETTINGS_PUBLIC_KEYS = ["skills", "tools", "skillsVersion", "toolsVersion"];
+const AI_EMPLOYEE_STYLE_PUBLIC_KEYS = ["size", "mask"];
+const AI_EMPLOYEE_PROMPT_CONTEXT_MAX_DEPTH = 8;
+const AI_EMPLOYEE_PROMPT_VARIABLE_INVALID = "FLOW_SURFACE_AI_EMPLOYEE_PROMPT_VARIABLE_INVALID";
+const AI_EMPLOYEE_CURRENT_RECORD_PROMPT_VARIABLE = "{{ ctx.record }}";
+const AI_EMPLOYEE_CURRENT_RECORD_PROMPT_VARIABLE_RE = /\{\{\s*ctx\.record\s*\}\}/;
+const AI_EMPLOYEE_DEFAULT_STYLE = {
+  size: 40,
+  mask: false
+};
 function normalizeCalendarFieldCapabilityValues(source, defaults) {
   const rawValues = Array.isArray(source) ? source : source instanceof Set ? Array.from(source) : typeof source === "string" ? [source] : source && typeof source === "object" ? Object.keys(source) : [];
   const values = rawValues.map((item) => String(item || "").trim()).filter(Boolean);
@@ -680,10 +715,16 @@ class FlowSurfacesService {
     );
   }
   async loadEnabledPluginPackages(transaction) {
-    if (!this.db.getCollection("applicationPlugins")) {
+    var _a;
+    const db = this.db;
+    if (!((_a = db == null ? void 0 : db.getCollection) == null ? void 0 : _a.call(db, "applicationPlugins")) || !(db == null ? void 0 : db.getRepository)) {
+      return /* @__PURE__ */ new Set();
+    }
+    const repository = db.getRepository("applicationPlugins");
+    if (!(repository == null ? void 0 : repository.find)) {
       return /* @__PURE__ */ new Set();
     }
-    const plugins = await this.db.getRepository("applicationPlugins").find({
+    const plugins = await repository.find({
       fields: ["packageName"],
       filter: {
         enabled: true
@@ -691,8 +732,8 @@ class FlowSurfacesService {
       transaction
     });
     const packageNames = plugins.map((plugin) => {
-      var _a;
-      return ((_a = plugin == null ? void 0 : plugin.get) == null ? void 0 : _a.call(plugin, "packageName")) || (plugin == null ? void 0 : plugin.packageName);
+      var _a2;
+      return ((_a2 = plugin == null ? void 0 : plugin.get) == null ? void 0 : _a2.call(plugin, "packageName")) || (plugin == null ? void 0 : plugin.packageName);
     }).filter((packageName) => typeof packageName === "string" && !!packageName.trim()).map((packageName) => packageName.trim());
     return new Set(packageNames);
   }
@@ -1456,12 +1497,26 @@ class FlowSurfacesService {
     if (this.isPopupCollectionBlockSceneUnsupported(popupProfile.scene)) {
       return [];
     }
+    const associationFields = this.listPopupAssociatedRecordFields(popupProfile, blockUse);
+    if (blockUse === "CommentsBlockModel") {
+      if (!popupProfile.currentCollection || !popupProfile.hasCurrentRecord || !associationFields.length) {
+        return [];
+      }
+      return [
+        {
+          key: "associatedRecords",
+          label: "Associated records",
+          description: "Bind comments to a comment-template association of the popup current record.",
+          requires: ["associationField"],
+          associationFields
+        }
+      ];
+    }
     const bindings = [];
     const currentCollectionName = popupProfile.currentCollection ? popupProfile.collectionName || (0, import_service_helpers.getCollectionTitle)(popupProfile.currentCollection) : void 0;
     const blockScenes = this.getPopupCollectionBlockScenes(blockUse);
     const supportsCurrentCollection = blockScenes.includes("new") || !popupProfile.hasCurrentRecord && blockScenes.includes("many");
-    const supportsCurrentRecord = blockScenes.includes("one");
-    const associationFields = this.listPopupAssociatedRecordFields(popupProfile, blockUse);
+    const supportsCurrentRecord = blockScenes.includes("one") && (blockUse !== "RecordHistoryBlockModel" || popupProfile.scene === "one");
     if (!popupProfile.currentCollection) {
       bindings.push({
         key: "otherRecords",
@@ -1521,7 +1576,11 @@ class FlowSurfacesService {
           popupProfile.dataSourceKey || "main",
           (dataSourceKey, collectionName) => this.getCollection(dataSourceKey, collectionName)
         );
-        if (!(targetCollection == null ? void 0 : targetCollection.filterTargetKey)) {
+        if (blockUse === "CommentsBlockModel") {
+          if (!this.isCommentsAssociationField(field, targetCollection)) {
+            return null;
+          }
+        } else if (!(targetCollection == null ? void 0 : targetCollection.filterTargetKey)) {
           return null;
         }
         const associationName = (0, import_service_helpers.resolveAssociationNameFromField)(field, popupProfile.currentCollection);
@@ -1601,7 +1660,10 @@ class FlowSurfacesService {
       hostDataSourceKey: popupProfile.dataSourceKey,
       hostCollectionName: popupProfile.collectionName,
       currentDataSourceKey: popupProfile.dataSourceKey,
-      currentCollectionName: popupProfile.collectionName
+      currentCollectionName: popupProfile.collectionName,
+      isPopupSurface: popupProfile.isPopupSurface,
+      popupScene: popupProfile.scene,
+      popupHasCurrentRecord: popupProfile.hasCurrentRecord
     });
   }
   async buildTargetAuthoringContext(input) {
@@ -1660,6 +1722,9 @@ class FlowSurfacesService {
           popupProfile.dataSourceKey || "main",
           (dataSourceKey, collectionName) => this.getCollection(dataSourceKey, collectionName)
         );
+        if (blockUse === "CommentsBlockModel") {
+          return this.isCommentsAssociationField(field, targetCollection);
+        }
         return !!(targetCollection == null ? void 0 : targetCollection.filterTargetKey);
       } catch (error) {
         return false;
@@ -2630,6 +2695,7 @@ class FlowSurfacesService {
   async dispatchPlanOnlyAction(action, payload, transaction, options = {}) {
     const actionOptions = {
       transaction,
+      currentRoles: options.currentRoles,
       popupTemplateAliasSession: options.popupTemplateAliasSession,
       popupTemplateTreeCache: options.popupTemplateTreeCache,
       skipGeneratedLayoutSingleColumnErrors: options.skipGeneratedLayoutSingleColumnErrors === true
@@ -2788,6 +2854,22 @@ class FlowSurfacesService {
       getCollection: (dataSourceKey, collectionName) => this.getCollection(dataSourceKey || "main", collectionName || "")
     });
   }
+  async prevalidateApplyBlueprintChartAssets(document, transaction) {
+    var _a;
+    const chartAssets = import_lodash.default.isPlainObject((_a = document.assets) == null ? void 0 : _a.charts) ? document.assets.charts : {};
+    for (const [chartKey, chartAsset] of Object.entries(chartAssets)) {
+      if (!import_lodash.default.isPlainObject(chartAsset)) {
+        continue;
+      }
+      (0, import_service_utils.assertSupportedSimpleChanges)("chart", chartAsset, (0, import_configure_options.getConfigureOptionKeysForUse)("ChartBlockModel"));
+      const nextConfigure = (0, import_chart_config.buildChartConfigureFromSemanticChanges)(void 0, chartAsset);
+      await this.validateChartConfigureForRuntime(
+        `applyBlueprint assets.charts.${chartKey}`,
+        nextConfigure,
+        transaction
+      );
+    }
+  }
   getApplyBlueprintKanbanBlockResourceObject(block) {
     return import_lodash.default.isPlainObject(block == null ? void 0 : block.resource) ? block.resource : {};
   }
@@ -3176,25 +3258,48 @@ class FlowSurfacesService {
     }
     if (!options.transaction) {
       const createdKanbanSortFields = [];
-      try {
-        return await this.transaction(
-          (transaction) => this.applyBlueprintWithTransaction(
-            values,
-            {
-              ...options,
-              transaction
-            },
-            createdKanbanSortFields
-          )
+      const mutationResult = await this.applyBlueprintMutationWithoutExternalTransaction(
+        values,
+        options,
+        createdKanbanSortFields
+      );
+      const surface = await this.get(mutationResult.pageLocator, { currentRoles: options.currentRoles });
+      return this.buildApplyBlueprintResponse(mutationResult.mode, mutationResult.pageLocator, surface);
+    }
+  }
+  async applyBlueprintMutationWithoutExternalTransaction(values, options = {}, createdKanbanSortFields) {
+    try {
+      await this.assertApplyBlueprintAuthoringPayload(values, options);
+      const document = (0, import_blueprint.prepareFlowSurfaceApplyBlueprintDocument)(values);
+      await this.prevalidateApplyBlueprintChartAssets(document);
+      if (document.mode === "create") {
+        return await this.applyBlueprintWithTransaction(
+          values,
+          { ...options, skipAuthoringValidation: true },
+          createdKanbanSortFields,
+          {
+            readSurface: false
+          }
         );
-      } catch (error) {
-        await this.cleanupApplyBlueprintKanbanSortFields(createdKanbanSortFields);
-        throw error;
       }
+      return await this.transaction(
+        (transaction) => this.applyBlueprintWithTransaction(
+          values,
+          {
+            ...options,
+            transaction,
+            skipAuthoringValidation: true
+          },
+          createdKanbanSortFields,
+          { readSurface: false }
+        )
+      );
+    } catch (error) {
+      await this.cleanupApplyBlueprintKanbanSortFields(createdKanbanSortFields);
+      throw error;
     }
   }
-  async applyBlueprintWithTransaction(values, options = {}, createdKanbanSortFields) {
-    var _a;
+  async assertApplyBlueprintAuthoringPayload(values, options = {}) {
     const enabledPackages = await this.resolveEnabledPluginPackages(options);
     await (0, import_authoring_validation.assertFlowSurfaceAuthoringPayload)("applyBlueprint", values, {
       transaction: options.transaction,
@@ -3202,6 +3307,11 @@ class FlowSurfacesService {
       findMenuGroupRoutesByTitle: (title, transaction) => this.findMenuGroupRoutesByTitle(title, transaction),
       getCollection: (dataSourceKey, collectionName) => this.getCollection(dataSourceKey || "main", collectionName || "")
     });
+  }
+  async applyBlueprintWithTransaction(values, options = {}, createdKanbanSortFields, resultOptions = {}) {
+    if (options.skipAuthoringValidation !== true) {
+      await this.assertApplyBlueprintAuthoringPayload(values, options);
+    }
     const prepared = await this.prepareApplyBlueprintRequest(values, options.transaction, createdKanbanSortFields);
     const popupTemplateAliasSession = this.createPopupTemplateAliasSession();
     const popupTemplateTreeCache = /* @__PURE__ */ new Map();
@@ -3214,6 +3324,7 @@ class FlowSurfacesService {
         }
       },
       this.buildPlanningRuntimeDeps({
+        currentRoles: options.currentRoles,
         popupTemplateAliasSession,
         popupTemplateTreeCache,
         skipGeneratedLayoutSingleColumnErrors: true
@@ -3221,10 +3332,21 @@ class FlowSurfacesService {
       options
     );
     const pageLocator = (0, import_blueprint.resolveApplyBlueprintPageLocator)(prepared, result);
+    if (resultOptions.readSurface === false) {
+      return {
+        version: "1",
+        mode: prepared.document.mode,
+        pageLocator
+      };
+    }
     const surface = await this.get(pageLocator, options);
+    return this.buildApplyBlueprintResponse(prepared.document.mode, pageLocator, surface);
+  }
+  buildApplyBlueprintResponse(mode, pageLocator, surface) {
+    var _a;
     return {
       version: "1",
-      mode: prepared.document.mode,
+      mode,
       target: (0, import_service_utils.buildDefinedPayload)({
         pageSchemaUid: pageLocator.pageSchemaUid,
         pageUid: (_a = surface == null ? void 0 : surface.target) == null ? void 0 : _a.uid
@@ -4925,6 +5047,7 @@ class FlowSurfacesService {
         await this.applyInlineNodeSettings(actionName, targetUid, settings, runtimeOptions);
       },
       resolveBlockSettings: (settings, state, block) => this.resolveComposeBlockSettings(settings, state.keyMap, block),
+      resolveActionSettings: (settings, state, block, action, actionName) => this.resolveComposeActionSettings(settings, state.keyMap, block, action, actionName),
       createField: async (payload) => this.addField(payload, {
         ...runtimeOptions,
         popupTemplateAliasSession
@@ -5021,11 +5144,16 @@ class FlowSurfacesService {
     const inheritedResourceInit = (currentResourceInit == null ? void 0 : currentResourceInit.collectionName) ? currentResourceInit : (_a = await this.locator.resolveCollectionContext(current == null ? void 0 : current.uid, options.transaction).catch(() => null)) == null ? void 0 : _a.resourceInit;
     const enabledPackages = await this.resolveEnabledPluginPackages(options);
     const popupDefaultsMetadata = options.skipConfigureGeneratedDefaultPopup ? void 0 : this.buildPopupDefaultsMetadata(values == null ? void 0 : values.defaults);
+    const popupProfile = await this.resolvePopupBlockProfile(target.uid, resolved, current, options.transaction).catch(
+      () => null
+    );
+    const popupAuthoringContext = import_lodash.default.isPlainObject(changes == null ? void 0 : changes.resource) && Object.prototype.hasOwnProperty.call(changes.resource, "binding") ? this.buildAuthoringContextFromPopupProfile(popupProfile) : {};
     await (0, import_authoring_validation.assertFlowSurfaceAuthoringPayload)("configure", values, {
       transaction: options.transaction,
       hostBlockType: current == null ? void 0 : current.use,
       hostDataSourceKey: inheritedResourceInit == null ? void 0 : inheritedResourceInit.dataSourceKey,
       hostCollectionName: inheritedResourceInit == null ? void 0 : inheritedResourceInit.collectionName,
+      ...popupAuthoringContext,
       enabledPackages,
       getCollection: (dataSourceKey, collectionName) => this.getCollection(dataSourceKey || "main", collectionName || ""),
       currentNode: current,
@@ -5098,6 +5226,9 @@ class FlowSurfacesService {
     if ((current == null ? void 0 : current.use) === "CommentsBlockModel") {
       return this.configureCommentsBlock(target, changes, options);
     }
+    if ((current == null ? void 0 : current.use) === "RecordHistoryBlockModel") {
+      return this.configureRecordHistoryBlock(target, current, changes, options);
+    }
     if ((current == null ? void 0 : current.use) === "TableActionsColumnModel") {
       return this.configureActionColumn(target, changes, options);
     }
@@ -5676,21 +5807,24 @@ class FlowSurfacesService {
     return nextGrid;
   }
   buildBlockCreateResult(tree, parentUid, subKey, popupSurface) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const gridNode = (0, import_service_utils.getSingleNodeSubModel)((_a = tree == null ? void 0 : tree.subModels) == null ? void 0 : _a.grid);
     const itemNode = (0, import_service_utils.getSingleNodeSubModel)((_b = tree == null ? void 0 : tree.subModels) == null ? void 0 : _b.item);
-    const itemGridNode = (0, import_service_utils.getSingleNodeSubModel)((_c = itemNode == null ? void 0 : itemNode.subModels) == null ? void 0 : _c.grid);
-    const columnNodes = (0, import_service_utils.getNodeSubModelList)((_d = tree == null ? void 0 : tree.subModels) == null ? void 0 : _d.columns);
+    const commentItemNode = (0, import_service_utils.getNodeSubModelList)((_c = tree == null ? void 0 : tree.subModels) == null ? void 0 : _c.items).find(
+      (item) => (item == null ? void 0 : item.use) === "CommentItemModel"
+    );
+    const itemGridNode = (0, import_service_utils.getSingleNodeSubModel)((_d = itemNode == null ? void 0 : itemNode.subModels) == null ? void 0 : _d.grid);
+    const columnNodes = (0, import_service_utils.getNodeSubModelList)((_e = tree == null ? void 0 : tree.subModels) == null ? void 0 : _e.columns);
     const blockGridUid = (gridNode == null ? void 0 : gridNode.uid) || (itemGridNode == null ? void 0 : itemGridNode.uid);
     const popupGridUid = popupSurface == null ? void 0 : popupSurface.gridUid;
-    const actionsColumnUid = (_e = columnNodes.find((item) => item.use === "TableActionsColumnModel")) == null ? void 0 : _e.uid;
+    const actionsColumnUid = (_f = columnNodes.find((item) => item.use === "TableActionsColumnModel")) == null ? void 0 : _f.uid;
     return {
       uid: tree.uid,
       parentUid,
       subKey,
       ...blockGridUid || popupGridUid ? { gridUid: blockGridUid || popupGridUid } : {},
       ...blockGridUid ? { blockGridUid } : {},
-      ...(itemNode == null ? void 0 : itemNode.uid) ? { itemUid: itemNode.uid } : {},
+      ...(itemNode == null ? void 0 : itemNode.uid) || (commentItemNode == null ? void 0 : commentItemNode.uid) ? { itemUid: (itemNode == null ? void 0 : itemNode.uid) || commentItemNode.uid } : {},
       ...(itemGridNode == null ? void 0 : itemGridNode.uid) ? { itemGridUid: itemGridNode.uid } : {},
       ...actionsColumnUid ? { actionsColumnUid } : {},
       ...popupSurface ? {
@@ -6131,7 +6265,7 @@ class FlowSurfacesService {
     };
   }
   async addBlock(values, options = {}) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
     const enabledPackages = await this.resolveEnabledPluginPackages(options);
     const templateRef = import_lodash.default.isUndefined(values == null ? void 0 : values.template) || !(0, import_template_reference.hasFlowSurfaceTemplateReference)(values == null ? void 0 : values.template) ? void 0 : this.normalizeFlowTemplateReference("addBlock", values.template, {
       allowUsage: true,
@@ -6241,10 +6375,22 @@ class FlowSurfacesService {
       resourceInit: resolvedResourceInit,
       resourceField: rawResourceInit ? "resourceInit" : (semanticResource == null ? void 0 : semanticResource.kind) === "raw" ? "resource" : void 0
     });
-    const effectiveResourceInit = (catalogItem.use === "CalendarBlockModel" || catalogItem.use === "KanbanBlockModel") && resolvedResourceInit.collectionName && !resolvedResourceInit.dataSourceKey ? {
+    let effectiveResourceInit = (catalogItem.use === "CalendarBlockModel" || catalogItem.use === "KanbanBlockModel") && resolvedResourceInit.collectionName && !resolvedResourceInit.dataSourceKey ? {
       ...resolvedResourceInit,
       dataSourceKey: "main"
     } : resolvedResourceInit;
+    if (catalogItem.use === "RecordHistoryBlockModel") {
+      const normalizedRecordHistoryCreate = this.normalizeRecordHistoryBlockCreateState({
+        actionName: "addBlock",
+        resourceInit: effectiveResourceInit,
+        popupProfile,
+        stepParams: values.stepParams
+      });
+      effectiveResourceInit = normalizedRecordHistoryCreate.resourceInit;
+      values.stepParams = normalizedRecordHistoryCreate.stepParams;
+    }
+    this.assertInitialBlockResourceCompatible("addBlock", catalogItem.use, effectiveResourceInit, popupProfile);
+    this.assertInitialBlockSettingsCompatible("addBlock", catalogItem.use, inlineSettings);
     const inlineFields = hasInlineFields ? this.normalizeComposeBlock(
       {
         key: String((values == null ? void 0 : values.key) || catalogItem.key || (values == null ? void 0 : values.type) || (values == null ? void 0 : values.use) || "addBlock_inline").trim() || "addBlock_inline",
@@ -6349,18 +6495,21 @@ class FlowSurfacesService {
     );
     const gridNode = (0, import_service_utils.getSingleNodeSubModel)((_b = tree.subModels) == null ? void 0 : _b.grid);
     const itemNode = (0, import_service_utils.getSingleNodeSubModel)((_c = tree.subModels) == null ? void 0 : _c.item);
-    const itemGridNode = (0, import_service_utils.getSingleNodeSubModel)((_d = itemNode == null ? void 0 : itemNode.subModels) == null ? void 0 : _d.grid);
-    const columnNodes = (0, import_service_utils.getNodeSubModelList)((_e = tree.subModels) == null ? void 0 : _e.columns);
+    const commentItemNode = (0, import_service_utils.getNodeSubModelList)((_d = tree.subModels) == null ? void 0 : _d.items).find(
+      (item) => (item == null ? void 0 : item.use) === "CommentItemModel"
+    );
+    const itemGridNode = (0, import_service_utils.getSingleNodeSubModel)((_e = itemNode == null ? void 0 : itemNode.subModels) == null ? void 0 : _e.grid);
+    const columnNodes = (0, import_service_utils.getNodeSubModelList)((_f = tree.subModels) == null ? void 0 : _f.columns);
     const blockGridUid = (gridNode == null ? void 0 : gridNode.uid) || (itemGridNode == null ? void 0 : itemGridNode.uid);
     const popupGridUid = popupSurface == null ? void 0 : popupSurface.gridUid;
-    const actionsColumnUid = catalogItem.use === "TableBlockModel" ? await this.ensureTableActionsColumn(created, options.transaction) : (_f = columnNodes.find((item) => item.use === "TableActionsColumnModel")) == null ? void 0 : _f.uid;
+    const actionsColumnUid = catalogItem.use === "TableBlockModel" ? await this.ensureTableActionsColumn(created, options.transaction) : (_g = columnNodes.find((item) => item.use === "TableActionsColumnModel")) == null ? void 0 : _g.uid;
     const result = {
       uid: created,
       parentUid,
       subKey,
       ...blockGridUid || popupGridUid ? { gridUid: blockGridUid || popupGridUid } : {},
       ...blockGridUid ? { blockGridUid } : {},
-      ...(itemNode == null ? void 0 : itemNode.uid) ? { itemUid: itemNode.uid } : {},
+      ...(itemNode == null ? void 0 : itemNode.uid) || (commentItemNode == null ? void 0 : commentItemNode.uid) ? { itemUid: (itemNode == null ? void 0 : itemNode.uid) || commentItemNode.uid } : {},
       ...(itemGridNode == null ? void 0 : itemGridNode.uid) ? { itemGridUid: itemGridNode.uid } : {},
       ...actionsColumnUid ? { actionsColumnUid } : {},
       ...popupSurface ? {
@@ -6420,7 +6569,7 @@ class FlowSurfacesService {
     ) : catalogItem.use === "KanbanBlockModel" ? this.omitHiddenPopupSettingsForConfigure(inlineSettings, "kanban") : inlineSettings;
     await this.applyInlineNodeSettings("addBlock", created, inlineSettingsForConfigure, options);
     await ensureInitialBlockPopupHosts();
-    if ((_g = inlineFields == null ? void 0 : inlineFields.fields) == null ? void 0 : _g.length) {
+    if ((_h = inlineFields == null ? void 0 : inlineFields.fields) == null ? void 0 : _h.length) {
       const fieldTargetUid = this.resolveComposeFieldContainerUid(inlineFields, result);
       const createdByKey = {};
       for (const fieldSpec of inlineFields.fields) {
@@ -6470,7 +6619,7 @@ class FlowSurfacesService {
           includeAsyncNode: true
         });
         const layoutItems = import_lodash.default.castArray(
-          ((_j = (_i = (_h = layoutHost == null ? void 0 : layoutHost.subModels) == null ? void 0 : _h.grid) == null ? void 0 : _i.subModels) == null ? void 0 : _j.items) || ((_k = layoutHost == null ? void 0 : layoutHost.subModels) == null ? void 0 : _k.items) || []
+          ((_k = (_j = (_i = layoutHost == null ? void 0 : layoutHost.subModels) == null ? void 0 : _i.grid) == null ? void 0 : _j.subModels) == null ? void 0 : _k.items) || ((_l = layoutHost == null ? void 0 : layoutHost.subModels) == null ? void 0 : _l.items) || []
         );
         const layoutPayload = this.buildComposeLayoutPayload({
           layout: inlineFields.fieldsLayout,
@@ -6958,13 +7107,36 @@ class FlowSurfacesService {
       return result2;
     }
     const resourceContext = container.ownerUid ? await this.locator.resolveCollectionContext(container.ownerUid, options.transaction).catch(() => null) : null;
+    const aiEmployeeSettingsPayload = this.isAIEmployeeActionUse(actionCatalogItem.use) ? await this.normalizeAIEmployeeActionPublicSettings("addAction", inlineSettings || {}, {
+      transaction: options.transaction,
+      enabledPackages,
+      requireUsername: true,
+      currentRoles: options.currentRoles,
+      selfUid: container.ownerUid,
+      promptContext: {
+        kind: "container",
+        ownerUid: container.ownerUid,
+        scope: resolvedScope
+      }
+    }) : void 0;
+    const actionSettingsPayload = {
+      props: values.props,
+      stepParams: values.stepParams
+    };
+    if (aiEmployeeSettingsPayload) {
+      this.mergeAIEmployeeActionSettingsPayload(
+        { use: actionCatalogItem.use },
+        actionSettingsPayload,
+        aiEmployeeSettingsPayload
+      );
+    }
     const action = (0, import_builder.buildActionTree)({
       use: actionCatalogItem.use,
       containerUse: container.ownerUse,
       resourceInit: values.resourceInit || (resourceContext == null ? void 0 : resourceContext.resourceInit),
-      props: values.props,
+      props: actionSettingsPayload.props,
       decoratorProps: values.decoratorProps,
-      stepParams: values.stepParams,
+      stepParams: actionSettingsPayload.stepParams,
       flowRegistry: values.flowRegistry
     });
     this.contractGuard.validateNodeTreeAgainstContract(action);
@@ -6977,7 +7149,9 @@ class FlowSurfacesService {
       },
       { transaction: options.transaction }
     );
-    await this.applyInlineNodeSettings("addAction", created, inlineSettings, options);
+    if (!this.isAIEmployeeActionUse(actionCatalogItem.use)) {
+      await this.applyInlineNodeSettings("addAction", created, inlineSettings, options);
+    }
     await this.applyInlineActionPopup("addAction", created, inlinePopup, {
       ...options,
       enabledPackages,
@@ -7029,15 +7203,56 @@ class FlowSurfacesService {
       context: "addRecordAction"
     });
     const materializedContainer = await this.materializeRecordActionContainer(container, options.transaction);
+    const reusableAction = await this.resolveReusableSingletonAction({
+      parentUid: materializedContainer.parentUid,
+      ownerUse: container.ownerUse,
+      actionUse: actionCatalogItem.use,
+      transaction: options.transaction
+    });
+    if (reusableAction == null ? void 0 : reusableAction.uid) {
+      await this.applyInlineNodeSettings("addRecordAction", reusableAction.uid, inlineSettings, options);
+      const result2 = {
+        uid: reusableAction.uid,
+        parentUid: materializedContainer.parentUid,
+        subKey: materializedContainer.subKey,
+        scope: actionCatalogItem.scope,
+        ...await this.collectComposeActionKeys(reusableAction.uid, options.transaction)
+      };
+      await this.persistCreatedKeysForAction("addRecordAction", values, result2, options.transaction);
+      return result2;
+    }
     const resourceContext = container.ownerUid ? await this.locator.resolveCollectionContext(container.ownerUid, options.transaction).catch(() => null) : null;
     const resourceInit = this.isAddChildCatalogItem(actionCatalogItem) ? await this.resolveAddChildResourceInitForOwnerNode(container.ownerNode, options.transaction) : values.resourceInit || (resourceContext == null ? void 0 : resourceContext.resourceInit);
+    const aiEmployeeSettingsPayload = this.isAIEmployeeActionUse(actionCatalogItem.use) ? await this.normalizeAIEmployeeActionPublicSettings("addRecordAction", inlineSettings || {}, {
+      transaction: options.transaction,
+      enabledPackages,
+      requireUsername: true,
+      currentRoles: options.currentRoles,
+      selfUid: container.ownerUid,
+      promptContext: {
+        kind: "container",
+        ownerUid: container.ownerUid,
+        scope: resolvedScope
+      }
+    }) : void 0;
+    const actionSettingsPayload = {
+      props: values.props,
+      stepParams: values.stepParams
+    };
+    if (aiEmployeeSettingsPayload) {
+      this.mergeAIEmployeeActionSettingsPayload(
+        { use: actionCatalogItem.use },
+        actionSettingsPayload,
+        aiEmployeeSettingsPayload
+      );
+    }
     const action = (0, import_builder.buildActionTree)({
       use: actionCatalogItem.use,
       containerUse: container.containerUse,
       resourceInit,
-      props: values.props,
+      props: actionSettingsPayload.props,
       decoratorProps: values.decoratorProps,
-      stepParams: values.stepParams,
+      stepParams: actionSettingsPayload.stepParams,
       flowRegistry: values.flowRegistry
     });
     this.contractGuard.validateNodeTreeAgainstContract(action);
@@ -7050,7 +7265,9 @@ class FlowSurfacesService {
       },
       { transaction: options.transaction }
     );
-    await this.applyInlineNodeSettings("addRecordAction", created, inlineSettings, options);
+    if (!this.isAIEmployeeActionUse(actionCatalogItem.use)) {
+      await this.applyInlineNodeSettings("addRecordAction", created, inlineSettings, options);
+    }
     await this.applyInlineActionPopup("addRecordAction", created, inlinePopup, {
       ...options,
       enabledPackages,
@@ -7120,22 +7337,24 @@ class FlowSurfacesService {
       invoke: (itemValues, options) => this.addField(itemValues, options)
     });
   }
-  async addActions(values) {
+  async addActions(values, options = {}) {
     return this.runBatchCreate({
       actionName: "addActions",
       values,
       itemField: "actions",
       resultField: "actions",
-      invoke: (itemValues, options) => this.addAction(itemValues, options)
+      currentRoles: options.currentRoles,
+      invoke: (itemValues, options2) => this.addAction(itemValues, options2)
     });
   }
-  async addRecordActions(values) {
+  async addRecordActions(values, options = {}) {
     return this.runBatchCreate({
       actionName: "addRecordActions",
       values,
       itemField: "recordActions",
       resultField: "recordActions",
-      invoke: (itemValues, options) => this.addRecordAction(itemValues, options)
+      currentRoles: options.currentRoles,
+      invoke: (itemValues, options2) => this.addRecordAction(itemValues, options2)
     });
   }
   createPopupTemplateAliasSession() {
@@ -8943,6 +9162,16 @@ class FlowSurfacesService {
     };
     return resolvedSettings;
   }
+  resolveComposeActionSettings(settings, keyMap, block, action, actionName) {
+    var _a;
+    if ((action == null ? void 0 : action.type) !== "aiEmployee") {
+      return settings;
+    }
+    return this.normalizeAIEmployeeActionSettingsReferences(actionName, settings, {
+      selfUid: (_a = block == null ? void 0 : block.result) == null ? void 0 : _a.uid,
+      keyMap
+    });
+  }
   async applyInlineFieldPopup(actionName, result, popup, options) {
     popup = this.prepareInlinePopupTemplateAliases(actionName, popup, options.popupTemplateAliasSession);
     const fieldHostUid = result.fieldUid || result.uid;
@@ -10505,11 +10734,39 @@ class FlowSurfacesService {
     const target = await this.locator.resolve(writeTarget, options);
     const current = await this.loadResolvedNode(target, options.transaction);
     const normalizedValues = import_lodash.default.cloneDeep(values || {});
+    if (this.isAIEmployeeActionUse(current == null ? void 0 : current.use) && !options.allowAIEmployeeInternalProps) {
+      this.assertNoAIEmployeeInternalPropSettings("updateSettings", normalizedValues);
+    }
+    if (this.isAIEmployeeActionUse(current == null ? void 0 : current.use) && this.hasAIEmployeePublicSettings(normalizedValues)) {
+      const enabledPackages = await this.resolveEnabledPluginPackages(options);
+      const aiEmployeeSettingsPayload = await this.normalizeAIEmployeeActionPublicSettings(
+        "updateSettings",
+        import_lodash.default.pick(normalizedValues, AI_EMPLOYEE_PUBLIC_SETTING_KEYS),
+        {
+          transaction: options.transaction,
+          enabledPackages,
+          current,
+          currentRoles: options.currentRoles,
+          selfUid: await this.resolveAIEmployeeActionSelfUid(current, options.transaction),
+          promptContext: {
+            kind: "target",
+            targetUid: (current == null ? void 0 : current.uid) || writeTarget.uid
+          }
+        }
+      );
+      AI_EMPLOYEE_PUBLIC_SETTING_KEYS.forEach((key) => {
+        delete normalizedValues[key];
+      });
+      this.mergeAIEmployeeActionSettingsPayload(current, normalizedValues, aiEmployeeSettingsPayload);
+    }
     assertNoFlowSurfaceIdTitleFieldSettings(normalizedValues, {
       action: "updateSettings",
       titleFieldErrorOptions: this.resolveRelationTitleFieldErrorOptionsForNode(current)
     });
     this.normalizeCanonicalBlockHeaderWriteForUpdateSettings(current, normalizedValues);
+    if ((current == null ? void 0 : current.use) === "RecordHistoryBlockModel") {
+      await this.assertRecordHistoryRecordIdWriteAllowed(current, normalizedValues, options.transaction);
+    }
     const contract = (0, import_catalog.getNodeContract)(current.use);
     const nextPayload = { uid: current.uid };
     const shouldStripLegacyBlockHeader = import_lodash.default.has(normalizedValues, ["stepParams", "cardSettings", "titleDescription"]);
@@ -10542,6 +10799,20 @@ class FlowSurfacesService {
       nextPayload,
       options.replacePopupStepParamSubtrees === true
     );
+    this.replaceRecordHistorySettingsForUpdateSettings(
+      current,
+      normalizedValues,
+      nextPayload,
+      options.replaceRecordHistorySettings === true
+    );
+    this.syncAIEmployeeTaskStepParamsForUpdateSettings(current, nextPayload);
+    await this.normalizeAIEmployeeStepParamTasksForUpdateSettings(current, nextPayload, writeTarget, options);
+    await this.assertAIEmployeeStepParamTaskPromptVariablesAllowedForUpdateSettings(
+      current,
+      nextPayload,
+      writeTarget,
+      options
+    );
     this.syncCalendarPopupPropsForUpdateSettings(current, normalizedValues, nextPayload);
     this.syncKanbanPopupPropsForUpdateSettings(current, normalizedValues, nextPayload);
     this.syncDefaultSortingForUpdateSettings(current, normalizedValues, nextPayload);
@@ -10572,6 +10843,7 @@ class FlowSurfacesService {
         popupTemplateTreeCache: options.popupTemplateTreeCache
       }
     );
+    this.validateBuilderChartFieldsForUpdateSettings(current, nextPayload);
     this.syncChartConfigureForUpdateSettings(current, nextPayload);
     await this.validateChartConfigureForUpdateSettings(current, nextPayload, options.transaction);
     this.syncCanonicalBlockHeaderForUpdateSettings(current, nextPayload);
@@ -10598,7 +10870,12 @@ class FlowSurfacesService {
     this.validateKanbanBlockState("updateSettings", effectiveNode);
     if (shouldValidateFlowRegistry && import_lodash.default.isPlainObject(effectiveNode.flowRegistry) && Object.keys(effectiveNode.flowRegistry).length) {
       this.contractGuard.validateFlowRegistry(effectiveNode, effectiveNode.flowRegistry);
-      this.assertFlowRegistryRunJsAuthoringPayload(effectiveNode.flowRegistry);
+      await this.assertFlowRegistryRunJsAuthoringPayload(effectiveNode.flowRegistry, {
+        current: effectiveNode,
+        resolved: target,
+        target: writeTarget,
+        transaction: options.transaction
+      });
     }
     if (Object.keys(nextPayload).length === 1) {
       return { uid: current.uid };
@@ -10683,6 +10960,27 @@ class FlowSurfacesService {
       import_lodash.default.set(stepParams, [groupKey, "dataScope", "filter"], import_lodash.default.cloneDeep(value.filter));
     });
   }
+  async assertRecordHistoryRecordIdWriteAllowed(current, normalizedValues, transaction) {
+    const recordIdPath = ["stepParams", "recordHistorySettings", "recordId", "recordId"];
+    if ((current == null ? void 0 : current.use) !== "RecordHistoryBlockModel" || !import_lodash.default.has(normalizedValues, recordIdPath)) {
+      return;
+    }
+    const recordId = import_lodash.default.get(normalizedValues, recordIdPath);
+    if (import_lodash.default.isNil(recordId) || String(recordId).trim() === "") {
+      return;
+    }
+    if (this.normalizeFlowContextTemplateValue(recordId) !== "{{ctx.view.inputArgs.filterByTk}}") {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces updateSettings recordHistory recordId.recordId only supports the popup current record`
+      );
+    }
+    const popupProfile = await this.resolvePopupBlockProfile(current.uid, void 0, void 0, transaction);
+    if (!(popupProfile == null ? void 0 : popupProfile.isPopupSurface) || !popupProfile.hasCurrentRecord || popupProfile.scene !== "one") {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces updateSettings recordHistory current-record history is only supported in one-record popup/details scenes`
+      );
+    }
+  }
   syncCalendarPopupPropsForUpdateSettings(current, normalizedValues, nextPayload) {
     if ((current == null ? void 0 : current.use) !== "CalendarBlockModel" || !import_lodash.default.isPlainObject(normalizedValues == null ? void 0 : normalizedValues.props)) {
       return;
@@ -10739,6 +11037,14 @@ class FlowSurfacesService {
       nextPayload.stepParams = nextStepParams;
     }
   }
+  replaceRecordHistorySettingsForUpdateSettings(current, normalizedValues, nextPayload, replaceRecordHistorySettings = false) {
+    if (!replaceRecordHistorySettings || (current == null ? void 0 : current.use) !== "RecordHistoryBlockModel" || !import_lodash.default.has(normalizedValues, ["stepParams", "recordHistorySettings"])) {
+      return;
+    }
+    const nextStepParams = import_lodash.default.cloneDeep(nextPayload.stepParams ?? (current == null ? void 0 : current.stepParams) ?? {});
+    nextStepParams.recordHistorySettings = import_lodash.default.cloneDeep(normalizedValues.stepParams.recordHistorySettings || {});
+    nextPayload.stepParams = nextStepParams;
+  }
   normalizePopupStepParamReplacementForUpdateSettings(current, path, value, currentValue, replacePopupStepParamSubtrees = false) {
     if (!import_lodash.default.isPlainObject(value)) {
       return {};
@@ -11365,6 +11671,16 @@ class FlowSurfacesService {
     }
     import_lodash.default.set(nextPayload, ["stepParams", "chartSettings", "configure"], (0, import_chart_config.canonicalizeChartConfigure)(nextConfigure));
   }
+  validateBuilderChartFieldsForUpdateSettings(current, nextPayload) {
+    if ((current == null ? void 0 : current.use) !== "ChartBlockModel") {
+      return;
+    }
+    const configure = import_lodash.default.get(nextPayload, ["stepParams", "chartSettings", "configure"]);
+    if (!import_lodash.default.isPlainObject(configure)) {
+      return;
+    }
+    this.validateBuilderChartFieldsForRuntime("updateSettings", configure);
+  }
   async validateChartConfigureForUpdateSettings(current, nextPayload, transaction) {
     var _a, _b, _c;
     if ((current == null ? void 0 : current.use) !== "ChartBlockModel") {
@@ -11398,6 +11714,111 @@ class FlowSurfacesService {
       }
     }
   }
+  normalizeChartSelectionFieldPath(input) {
+    if (Array.isArray(input)) {
+      return input.map((item) => String(item || "").trim()).filter(Boolean).join(".");
+    }
+    return String(input || "").trim();
+  }
+  validateBuilderChartFieldsForRuntime(actionName, configure) {
+    var _a, _b;
+    const resourceInit = (0, import_chart_config.getChartBuilderResourceInit)(configure);
+    if (!(resourceInit == null ? void 0 : resourceInit.collectionName)) {
+      return;
+    }
+    const dataSourceKey = resourceInit.dataSourceKey || "main";
+    const collectionName = resourceInit.collectionName;
+    const collection = this.getCollection(dataSourceKey, collectionName);
+    if (!collection) {
+      return;
+    }
+    const state = (0, import_chart_config.deriveChartSemanticState)(configure);
+    if (((_a = state.query) == null ? void 0 : _a.mode) !== "builder") {
+      return;
+    }
+    const selections = [
+      ...import_lodash.default.castArray(state.query.measures || []).map((selection, index) => ({
+        selection,
+        path: `chart query.measures[${index}].field`
+      })),
+      ...import_lodash.default.castArray(state.query.dimensions || []).map((selection, index) => ({
+        selection,
+        path: `chart query.dimensions[${index}].field`
+      }))
+    ];
+    for (const item of selections) {
+      const fieldPath = this.normalizeChartSelectionFieldPath((_b = item.selection) == null ? void 0 : _b.field);
+      if (!fieldPath) {
+        continue;
+      }
+      const parsed = this.parseFieldPath(collection, fieldPath, void 0, dataSourceKey, collectionName);
+      const field = (0, import_service_helpers.resolveFieldFromCollection)(parsed.leafCollection, parsed.leafFieldPath);
+      if (!field) {
+        if (this.collectionHasConcreteField(parsed.leafCollection, parsed.leafFieldPath)) {
+          continue;
+        }
+        (0, import_errors.throwBadRequest)(
+          `flowSurfaces ${actionName} ${item.path} '${fieldPath}' does not exist on collection '${dataSourceKey}.${collectionName}'`
+        );
+      }
+      if (!fieldPath.includes(".") && (0, import_service_helpers.isAssociationField)(field)) {
+        const suggestion = this.resolveBuilderChartAssociationSubfieldSuggestion(fieldPath, field, dataSourceKey);
+        (0, import_errors.throwBadRequest)(
+          `flowSurfaces ${actionName} ${item.path} '${fieldPath}' references an association field directly; use scalar subfield '${suggestion.suggestedFieldPath}' for builder charts`
+        );
+      }
+    }
+  }
+  resolveBuilderChartAssociationSubfieldSuggestion(fieldPath, field, dataSourceKey) {
+    try {
+      const resolved = (0, import_association_title_field.resolveAssociationSafeTitleField)(
+        field,
+        dataSourceKey,
+        (targetDataSourceKey, targetCollectionName) => this.getCollection(targetDataSourceKey, targetCollectionName),
+        { fieldPath }
+      );
+      const titleField = String((resolved == null ? void 0 : resolved.fieldName) || "").trim();
+      if (titleField) {
+        return {
+          suggestedFieldPath: `${fieldPath}.${titleField}`
+        };
+      }
+    } catch {
+    }
+    return {
+      suggestedFieldPath: `${fieldPath}.<field>`
+    };
+  }
+  async validateChartConfigureForRuntime(actionName, configure, transaction) {
+    var _a, _b, _c;
+    if (!import_lodash.default.isPlainObject(configure)) {
+      return;
+    }
+    this.validateBuilderChartFieldsForRuntime(actionName, configure);
+    const state = (0, import_chart_config.deriveChartSemanticState)(configure);
+    if (((_a = state.query) == null ? void 0 : _a.mode) !== "sql") {
+      return;
+    }
+    const sqlPreview = await this.resolveSqlChartPreview(state.query, transaction);
+    if (((_b = state.visual) == null ? void 0 : _b.mode) !== "basic") {
+      return;
+    }
+    if (!((_c = sqlPreview.queryOutputs) == null ? void 0 : _c.length)) {
+      (0, import_errors.throwBadRequest)(
+        "chart visual.mode='basic' requires previewable SQL query outputs; write query first, then read flowSurfaces:context(path='chart'), or use visual.mode='custom' after browser verification"
+      );
+    }
+    const supportedOutputs = new Set(
+      sqlPreview.queryOutputs.map((output) => String((output == null ? void 0 : output.alias) || "").trim()).filter(Boolean)
+    );
+    for (const mappingField of (0, import_chart_config.getChartVisualMappingAliases)(state.visual)) {
+      if (!supportedOutputs.has(mappingField)) {
+        (0, import_errors.throwBadRequest)(
+          `chart visual mappings only support SQL query output fields: ${Array.from(supportedOutputs).join(", ")}`
+        );
+      }
+    }
+  }
   stripChartSqlForInspection(sql) {
     return sql.replace(/\/\*[\s\S]*?\*\//g, " ").replace(/--[^\r\n]*/g, " ").replace(/'(?:''|[^'])*'/g, "''").replace(/"(?:[""]|[^"])*"/g, '""');
   }
@@ -11797,7 +12218,12 @@ class FlowSurfacesService {
   async persistEventFlowRegistry(actionName, target, current, flowRegistry, options = {}) {
     this.assertNoTreeConnectFieldsFlowRegistry(current, flowRegistry, actionName);
     this.contractGuard.validateFlowRegistry(current, flowRegistry);
-    this.assertFlowRegistryRunJsAuthoringPayload(flowRegistry);
+    await this.assertFlowRegistryRunJsAuthoringPayload(flowRegistry, {
+      current,
+      resolved: target,
+      target,
+      transaction: options.transaction
+    });
     if (target.kind === "tab" && target.tabRoute) {
       await this.routeSync.persistTabSettings(
         target,
@@ -11827,8 +12253,33 @@ class FlowSurfacesService {
       fingerprint: this.buildEventFlowFingerprint(flowRegistry)
     };
   }
-  assertFlowRegistryRunJsAuthoringPayload(flowRegistry) {
-    const errors = (0, import_runjs_authoring.collectFlowRegistryRunJsAuthoringErrors)(flowRegistry);
+  async buildFlowRegistryRunJsAuthoringContext(input) {
+    var _a, _b, _c, _d;
+    const currentResourceInit = this.getDataBlockResourceInit(input.current);
+    const inheritedResourceInit = (currentResourceInit == null ? void 0 : currentResourceInit.collectionName) ? currentResourceInit : ((_a = input.current) == null ? void 0 : _a.uid) ? (_b = await this.locator.resolveCollectionContext(input.current.uid, input.transaction).catch(() => null)) == null ? void 0 : _b.resourceInit : null;
+    const resourceDataSourceKey = (inheritedResourceInit == null ? void 0 : inheritedResourceInit.dataSourceKey) || ((inheritedResourceInit == null ? void 0 : inheritedResourceInit.collectionName) ? "main" : void 0);
+    const popupProfile = ((_c = input.target) == null ? void 0 : _c.uid) ? await this.resolvePopupBlockProfile(
+      input.target.uid,
+      input.resolved || input.target,
+      input.current,
+      input.transaction
+    ).catch(() => null) : null;
+    return (0, import_service_utils.buildDefinedPayload)({
+      hostBlockType: (_d = input.current) == null ? void 0 : _d.use,
+      hostDataSourceKey: resourceDataSourceKey,
+      hostCollectionName: inheritedResourceInit == null ? void 0 : inheritedResourceInit.collectionName,
+      currentDataSourceKey: resourceDataSourceKey,
+      currentCollectionName: inheritedResourceInit == null ? void 0 : inheritedResourceInit.collectionName,
+      ...this.buildAuthoringContextFromPopupProfile(popupProfile),
+      currentNode: input.current
+    });
+  }
+  async assertFlowRegistryRunJsAuthoringPayload(flowRegistry, context = {}) {
+    const authoringContext = await this.buildFlowRegistryRunJsAuthoringContext(context);
+    const errors = (0, import_runjs_authoring.collectFlowRegistryRunJsAuthoringErrors)(flowRegistry, "$.flowRegistry", {
+      ...authoringContext,
+      getCollection: (dataSourceKey, collectionName) => this.getCollection(dataSourceKey, collectionName)
+    });
     if (errors.length) {
       (0, import_errors.throwAggregateBadRequest)(errors);
     }
@@ -12024,6 +12475,7 @@ class FlowSurfacesService {
   async dispatchOp(op, resolvedValues, ctx, runtimeOptions = {}) {
     const options = {
       transaction: ctx.transaction,
+      currentRoles: runtimeOptions.currentRoles,
       popupTemplateAliasSession: runtimeOptions.popupTemplateAliasSession,
       popupTemplateTreeCache: runtimeOptions.popupTemplateTreeCache
     };
@@ -12582,7 +13034,7 @@ class FlowSurfacesService {
     const recordContainerUse = (0, import_service_utils.getCatalogRecordActionContainerUse)(blockUse);
     if (!recordContainerUse) {
       (0, import_errors.throwBadRequest)(
-        `flowSurfaces compose recordActions only support 'table', 'details', 'list' or 'gridCard' blocks`
+        `flowSurfaces compose recordActions only support 'table', 'details', 'list', 'gridCard' or 'comments' blocks`
       );
     }
     const item = this.tryResolveActionCatalogItem(
@@ -13168,7 +13620,7 @@ class FlowSurfacesService {
     return filteredItems.filter((item) => !this.isAddChildCatalogItem(item));
   }
   async inspectRecordActionContainer(target, transaction) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const resolved = await this.locator.resolve(target, { transaction });
     const node = resolved.node || await this.repository.findModelById(resolved.uid, { transaction, includeAsyncNode: true });
     const use = node == null ? void 0 : node.use;
@@ -13211,19 +13663,37 @@ class FlowSurfacesService {
         subType: "array"
       };
     }
-    if (use === "KanbanBlockModel") {
-      (0, import_errors.throwBadRequest)(
-        `flowSurfaces addRecordAction target '${use}' is not supported; kanban record actions are not exposed in the public API v1`
-      );
-    }
-    if (use === "TableActionsColumnModel") {
-      (0, import_errors.throwBadRequest)(
-        `flowSurfaces addRecordAction target '${use}' is an internal record action container; pass the owning table block uid instead`
-      );
+    if (use === "CommentsBlockModel") {
+      const itemUid = (_d = import_lodash.default.castArray(((_c = node.subModels) == null ? void 0 : _c.items) || [])[0]) == null ? void 0 : _d.uid;
+      if (!itemUid) {
+        (0, import_errors.throwConflict)(
+          `flowSurfaces addRecordAction target '${use}' is missing its comment item subtree`,
+          "FLOW_SURFACE_RECORD_ACTION_ITEM_SUBTREE_MISSING"
+        );
+      }
+      return {
+        ownerNode: node,
+        ownerUid: node.uid,
+        ownerUse: use,
+        containerUse: "CommentItemModel",
+        parentUid: itemUid,
+        subKey: "actions",
+        subType: "array"
+      };
+    }
+    if (use === "KanbanBlockModel") {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces addRecordAction target '${use}' is not supported; kanban record actions are not exposed in the public API v1`
+      );
+    }
+    if (use === "TableActionsColumnModel") {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces addRecordAction target '${use}' is an internal record action container; pass the owning table block uid instead`
+      );
     }
-    if (use === "ListItemModel" || use === "GridCardItemModel") {
+    if (use === "ListItemModel" || use === "GridCardItemModel" || use === "CommentItemModel") {
       (0, import_errors.throwBadRequest)(
-        `flowSurfaces addRecordAction target '${use}' is an internal record action container; pass the owning ${use === "ListItemModel" ? "list" : "gridCard"} block uid instead`
+        `flowSurfaces addRecordAction target '${use}' is an internal record action container; pass the owning ${use === "ListItemModel" ? "list" : use === "GridCardItemModel" ? "gridCard" : "comments"} block uid instead`
       );
     }
     (0, import_errors.throwBadRequest)(
@@ -13277,6 +13747,7 @@ class FlowSurfacesService {
         result.result = await this.transaction(
           (transaction) => options.invoke(itemValues, {
             transaction,
+            currentRoles: options.currentRoles,
             enabledPackages
           })
         );
@@ -13497,17 +13968,35 @@ class FlowSurfacesService {
     }
   }
   async resolveReusableSingletonAction(input) {
-    var _a;
-    if (!AUTO_SUBMIT_FORM_BLOCK_USES.has(input.ownerUse || "") || input.actionUse !== "FormSubmitActionModel") {
-      return null;
+    var _a, _b, _c;
+    if (AUTO_SUBMIT_FORM_BLOCK_USES.has(input.ownerUse || "") && input.actionUse === "FormSubmitActionModel") {
+      const parentNode = await this.repository.findModelById(input.parentUid, {
+        transaction: input.transaction,
+        includeAsyncNode: true
+      });
+      return import_lodash.default.castArray(((_a = parentNode == null ? void 0 : parentNode.subModels) == null ? void 0 : _a.actions) || []).find(
+        (action) => (action == null ? void 0 : action.use) === "FormSubmitActionModel" && (action == null ? void 0 : action.uid)
+      ) || null;
     }
-    const parentNode = await this.repository.findModelById(input.parentUid, {
-      transaction: input.transaction,
-      includeAsyncNode: true
-    });
-    return import_lodash.default.castArray(((_a = parentNode == null ? void 0 : parentNode.subModels) == null ? void 0 : _a.actions) || []).find(
-      (action) => (action == null ? void 0 : action.use) === "FormSubmitActionModel" && (action == null ? void 0 : action.uid)
-    ) || null;
+    if (input.ownerUse === "CommentsBlockModel" && COMMENT_ACTION_SINGLETON_USES.has(input.actionUse || "")) {
+      const parentNode = await this.repository.findModelById(input.parentUid, {
+        transaction: input.transaction,
+        includeAsyncNode: true
+      });
+      return import_lodash.default.castArray(((_b = parentNode == null ? void 0 : parentNode.subModels) == null ? void 0 : _b.actions) || []).find(
+        (action) => (action == null ? void 0 : action.use) === input.actionUse && (action == null ? void 0 : action.uid)
+      ) || null;
+    }
+    if (input.ownerUse === "RecordHistoryBlockModel" && RECORD_HISTORY_ACTION_SINGLETON_USES.has(input.actionUse || "")) {
+      const parentNode = await this.repository.findModelById(input.parentUid, {
+        transaction: input.transaction,
+        includeAsyncNode: true
+      });
+      return import_lodash.default.castArray(((_c = parentNode == null ? void 0 : parentNode.subModels) == null ? void 0 : _c.actions) || []).find(
+        (action) => (action == null ? void 0 : action.use) === input.actionUse && (action == null ? void 0 : action.uid)
+      ) || null;
+    }
+    return null;
   }
   normalizeComposeBlock(input, index, enabledPackages, preserveSingleScopeDataBlockTitle = false, popupDefaultsMetadata, resourceFallback) {
     if (!import_lodash.default.isPlainObject(input)) {
@@ -13729,6 +14218,7 @@ class FlowSurfacesService {
     return blockResult.uid;
   }
   async resolveComposeRecordActionContainerUid(blockSpec, blockResult, transaction) {
+    var _a, _b, _c;
     if (blockSpec.type === "table") {
       return this.ensureTableActionsColumn(blockResult.uid, transaction);
     }
@@ -13737,9 +14227,19 @@ class FlowSurfacesService {
     }
     if (!RECORD_ACTION_COMPOSE_BLOCK_TYPES.has(blockSpec.type)) {
       (0, import_errors.throwBadRequest)(
-        `flowSurfaces compose recordActions only support 'table', 'details', 'list' or 'gridCard' blocks`
+        `flowSurfaces compose recordActions only support 'table', 'details', 'list', 'gridCard' or 'comments' blocks`
       );
     }
+    if (blockSpec.type === "comments") {
+      const itemUid = ((_c = import_lodash.default.castArray(((_b = (_a = blockResult == null ? void 0 : blockResult.tree) == null ? void 0 : _a.subModels) == null ? void 0 : _b.items) || [])[0]) == null ? void 0 : _c.uid) || blockResult.itemUid;
+      if (!itemUid) {
+        (0, import_errors.throwConflict)(
+          `flowSurfaces compose block '${blockSpec.key}' is missing its comment item subtree`,
+          "FLOW_SURFACE_COMPOSE_ITEM_SUBTREE_MISSING"
+        );
+      }
+      return itemUid;
+    }
     if (!blockResult.itemUid) {
       (0, import_errors.throwConflict)(
         `flowSurfaces compose block '${blockSpec.key}' is missing its item subtree`,
@@ -13752,7 +14252,7 @@ class FlowSurfacesService {
     const recordContainerUse = (0, import_service_utils.getCatalogRecordActionContainerUse)(blockUse);
     if (recordActions.length && !recordContainerUse) {
       (0, import_errors.throwBadRequest)(
-        `flowSurfaces compose recordActions only support 'table', 'details', 'list' or 'gridCard' blocks`
+        `flowSurfaces compose recordActions only support 'table', 'details', 'list', 'gridCard' or 'comments' blocks`
       );
     }
     actions.forEach((action) => {
@@ -15117,10 +15617,212 @@ class FlowSurfacesService {
       options
     );
   }
+  normalizeBlockResourceForValidation(resourceInit) {
+    const init = (0, import_service_utils.normalizeSimpleResourceInit)(resourceInit || {}) || {};
+    if (init.collectionName && !init.dataSourceKey) {
+      init.dataSourceKey = "main";
+    }
+    return init;
+  }
+  isCommentTemplateCollection(collection) {
+    var _a;
+    return (collection == null ? void 0 : collection.template) === "comment" || ((_a = collection == null ? void 0 : collection.options) == null ? void 0 : _a.template) === "comment";
+  }
+  isCommentsAssociationField(field, targetCollection) {
+    const fieldType = String((0, import_service_helpers.getFieldType)(field) || "").trim().toLowerCase();
+    return (fieldType === "hasmany" || fieldType === "belongstomany") && this.isCommentTemplateCollection(targetCollection);
+  }
+  getRecordHistoryDeclaredFilterTargetKey(collection) {
+    var _a, _b;
+    const raw = Array.isArray(collection == null ? void 0 : collection.filterTargetKey) ? collection.filterTargetKey[0] : !import_lodash.default.isUndefined(collection == null ? void 0 : collection.filterTargetKey) ? collection.filterTargetKey : Array.isArray((_a = collection == null ? void 0 : collection.options) == null ? void 0 : _a.filterTargetKey) ? collection.options.filterTargetKey[0] : (_b = collection == null ? void 0 : collection.options) == null ? void 0 : _b.filterTargetKey;
+    return String(raw || "").trim();
+  }
+  collectionHasConcreteField(collection, fieldName) {
+    var _a, _b, _c, _d, _e, _f;
+    const normalized = String(fieldName || "").trim();
+    if (!normalized) {
+      return false;
+    }
+    const modelAttributes = (typeof ((_a = collection == null ? void 0 : collection.model) == null ? void 0 : _a.getAttributes) === "function" ? collection.model.getAttributes() : null) || ((_b = collection == null ? void 0 : collection.model) == null ? void 0 : _b.rawAttributes) || ((_c = collection == null ? void 0 : collection.model) == null ? void 0 : _c.attributes) || {};
+    const primaryKeyAttributes = import_lodash.default.castArray(
+      ((_d = collection == null ? void 0 : collection.model) == null ? void 0 : _d.primaryKeyAttributes) || ((_e = collection == null ? void 0 : collection.model) == null ? void 0 : _e.primaryKeyAttribute) || []
+    );
+    const modelAttribute = modelAttributes == null ? void 0 : modelAttributes[normalized];
+    const isModelPrimaryKey = primaryKeyAttributes.includes(normalized) || !!(modelAttribute == null ? void 0 : modelAttribute.primaryKey);
+    return !!((0, import_service_helpers.resolveFieldFromCollection)(collection, normalized) || ((_f = collection == null ? void 0 : collection.getField) == null ? void 0 : _f.call(collection, normalized)) || (0, import_service_helpers.getCollectionFields)(collection).some((field) => (0, import_service_helpers.getFieldName)(field) === normalized) || isModelPrimaryKey);
+  }
+  assertInitialBlockResourceCompatible(actionName, blockUse, resourceInit, popupProfile) {
+    if (blockUse === "CommentsBlockModel") {
+      this.assertCommentsBlockResourceCompatible(actionName, resourceInit, popupProfile);
+    }
+    if (blockUse === "RecordHistoryBlockModel") {
+      this.assertRecordHistoryBlockResourceCompatible(actionName, resourceInit, popupProfile);
+    }
+  }
+  assertInitialBlockSettingsCompatible(actionName, blockUse, settings) {
+    if (blockUse === "CommentsBlockModel") {
+      this.assertCommentsSettingValues(actionName, settings);
+    }
+    if (blockUse === "RecordHistoryBlockModel") {
+      this.assertRecordHistorySettingValues(actionName, settings);
+    }
+  }
+  assertCommentsBlockResourceCompatible(actionName, resourceInit, popupProfile) {
+    const init = this.normalizeBlockResourceForValidation(resourceInit);
+    const collectionName = String(init.collectionName || "").trim();
+    const dataSourceKey = String(init.dataSourceKey || "main").trim() || "main";
+    if (!collectionName) {
+      return;
+    }
+    const collection = this.getCollection(dataSourceKey, collectionName);
+    if (!collection || !this.isCommentTemplateCollection(collection)) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${actionName} comments block requires a comment template collection; '${dataSourceKey}.${collectionName}' is not a comment template collection`
+      );
+    }
+    const hasAssociationResource = (0, import_service_helpers.hasConfiguredFlowContextValue)(init.associationName) || (0, import_service_helpers.hasConfiguredFlowContextValue)(init.sourceId);
+    if (popupProfile == null ? void 0 : popupProfile.isPopupSurface) {
+      if (!hasAssociationResource || (0, import_service_helpers.hasConfiguredFlowContextValue)(init.filterByTk)) {
+        (0, import_errors.throwBadRequest)(
+          `flowSurfaces ${actionName} comments block in popups only supports resource.binding='associatedRecords'`
+        );
+      }
+      return;
+    }
+    if (hasAssociationResource || (0, import_service_helpers.hasConfiguredFlowContextValue)(init.associationPathName) || (0, import_service_helpers.hasConfiguredFlowContextValue)(init.filterByTk)) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${actionName} comments block outside popups only supports a direct comment template collection resource`
+      );
+    }
+  }
+  assertRecordHistoryBlockResourceCompatible(actionName, resourceInit, popupProfile) {
+    const init = this.normalizeBlockResourceForValidation(resourceInit);
+    const collectionName = String(init.collectionName || "").trim();
+    const dataSourceKey = String(init.dataSourceKey || "main").trim() || "main";
+    if (!collectionName) {
+      return;
+    }
+    if (RECORD_HISTORY_INTERNAL_COLLECTIONS.has(collectionName)) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${actionName} recordHistory block does not support internal collection '${collectionName}'`
+      );
+    }
+    if ((0, import_service_helpers.hasConfiguredFlowContextValue)(init.associationName) || (0, import_service_helpers.hasConfiguredFlowContextValue)(init.associationPathName) || (0, import_service_helpers.hasConfiguredFlowContextValue)(init.sourceId)) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${actionName} recordHistory block does not support association resources; use a collection resource or resource.binding='currentRecord' in a one-record popup`
+      );
+    }
+    if ((0, import_service_helpers.hasConfiguredFlowContextValue)(init.filterByTk)) {
+      if (!(popupProfile == null ? void 0 : popupProfile.isPopupSurface) || !popupProfile.hasCurrentRecord || popupProfile.scene !== "one") {
+        (0, import_errors.throwBadRequest)(
+          `flowSurfaces ${actionName} recordHistory current-record history is only supported in one-record popup/details scenes`
+        );
+      }
+    }
+    const collection = this.getCollection(dataSourceKey, collectionName);
+    if (!collection) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${actionName} recordHistory collection '${dataSourceKey}.${collectionName}' not found`
+      );
+    }
+    const filterTargetKey = this.getRecordHistoryDeclaredFilterTargetKey(collection);
+    if (!filterTargetKey || !this.collectionHasConcreteField(collection, filterTargetKey)) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${actionName} recordHistory block requires a real filterTargetKey on collection '${dataSourceKey}.${collectionName}'`
+      );
+    }
+  }
+  normalizeRecordHistoryBlockCreateState(input) {
+    var _a;
+    const init = this.normalizeBlockResourceForValidation(input.resourceInit);
+    if (!(0, import_service_helpers.hasConfiguredFlowContextValue)(init.filterByTk)) {
+      return {
+        resourceInit: init,
+        stepParams: input.stepParams
+      };
+    }
+    if (!((_a = input.popupProfile) == null ? void 0 : _a.isPopupSurface) || !input.popupProfile.hasCurrentRecord || input.popupProfile.scene !== "one") {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${input.actionName} recordHistory current-record history is only supported in one-record popup/details scenes`
+      );
+    }
+    const nextResourceInit = import_lodash.default.omit(init, ["filterByTk", "associationName", "associationPathName", "sourceId"]);
+    const nextStepParams = import_lodash.default.merge({}, import_lodash.default.cloneDeep(input.stepParams || {}), {
+      recordHistorySettings: {
+        recordId: {
+          recordId: "{{ctx.view.inputArgs.filterByTk}}"
+        }
+      }
+    });
+    return {
+      resourceInit: nextResourceInit,
+      stepParams: nextStepParams
+    };
+  }
+  async normalizeConfigureCollectionBlockResource(input) {
+    const popupProfile = await this.resolvePopupBlockProfile(input.target.uid, void 0, void 0, input.transaction);
+    const normalizedResource = this.normalizeResourceInput(input.resource);
+    const resourceInit = await this.resolvePopupCollectionBlockResourceInit({
+      actionName: input.actionName,
+      blockUse: input.blockUse,
+      popupProfile,
+      semanticResource: (normalizedResource == null ? void 0 : normalizedResource.kind) === "semantic" ? normalizedResource.value : void 0,
+      resourceInit: (normalizedResource == null ? void 0 : normalizedResource.kind) === "raw" ? normalizedResource.value : void 0
+    });
+    return {
+      popupProfile,
+      resourceInit
+    };
+  }
+  assertCommentsSettingValues(actionName, settings) {
+    if (!import_lodash.default.isPlainObject(settings) || !(0, import_service_utils.hasOwnDefined)(settings, "pageSize")) {
+      return;
+    }
+    if (!COMMENTS_PAGE_SIZE_VALUES.has(Number(settings.pageSize))) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${actionName} comments pageSize must be one of ${Array.from(COMMENTS_PAGE_SIZE_VALUES).join(
+          ", "
+        )}`
+      );
+    }
+  }
+  assertRecordHistorySettingValues(actionName, settings) {
+    var _a;
+    if (!import_lodash.default.isPlainObject(settings)) {
+      return;
+    }
+    if ((0, import_service_utils.hasOwnDefined)(settings, "sortOrder")) {
+      const order = String(((_a = settings.sortOrder) == null ? void 0 : _a.order) || "").trim();
+      if (!import_lodash.default.isPlainObject(settings.sortOrder) || order !== "asc" && order !== "desc") {
+        (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} recordHistory sortOrder.order must be 'asc' or 'desc'`);
+      }
+    }
+    if ((0, import_service_utils.hasOwnDefined)(settings, "expand")) {
+      if (!import_lodash.default.isPlainObject(settings.expand) || typeof settings.expand.expand !== "boolean") {
+        (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} recordHistory expand.expand must be a boolean`);
+      }
+    }
+    if ((0, import_service_utils.hasOwnDefined)(settings, "template")) {
+      if (!import_lodash.default.isPlainObject(settings.template) || settings.template.apply !== "current") {
+        (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} recordHistory template only supports apply='current'`);
+      }
+    }
+  }
   async configureCommentsBlock(target, changes, options) {
     const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)("CommentsBlockModel");
     const cardSettings = (0, import_service_utils.buildBlockTitleDescriptionFromSemanticChanges)(changes);
     (0, import_service_utils.assertSupportedSimpleChanges)("comments", changes, allowedKeys);
+    this.assertCommentsSettingValues("configure", changes);
+    const resourceChange = changes.resource ? await this.normalizeConfigureCollectionBlockResource({
+      actionName: "configure",
+      blockUse: "CommentsBlockModel",
+      target,
+      resource: changes.resource,
+      transaction: options.transaction
+    }) : void 0;
+    if (resourceChange) {
+      this.assertCommentsBlockResourceCompatible("configure", resourceChange.resourceInit, resourceChange.popupProfile);
+    }
     return this.updateSettings(
       {
         target,
@@ -15128,7 +15830,7 @@ class FlowSurfacesService {
           ...cardSettings ? { cardSettings } : {},
           ...changes.resource ? {
             resourceSettings: {
-              init: (0, import_service_utils.normalizeSimpleResourceInit)(changes.resource)
+              init: resourceChange == null ? void 0 : resourceChange.resourceInit
             }
           } : {},
           ...(0, import_service_utils.hasDefinedValue)(changes, ["pageSize", "dataScope"]) ? {
@@ -15142,6 +15844,67 @@ class FlowSurfacesService {
       options
     );
   }
+  async configureRecordHistoryBlock(target, current, changes, options) {
+    var _a, _b, _c;
+    const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)("RecordHistoryBlockModel");
+    const cardSettings = (0, import_service_utils.buildBlockTitleDescriptionFromSemanticChanges)(changes);
+    (0, import_service_utils.assertSupportedSimpleChanges)("recordHistory", changes, allowedKeys);
+    this.assertRecordHistorySettingValues("configure", changes);
+    const resourceChange = changes.resource ? await this.normalizeConfigureCollectionBlockResource({
+      actionName: "configure",
+      blockUse: "RecordHistoryBlockModel",
+      target,
+      resource: changes.resource,
+      transaction: options.transaction
+    }) : void 0;
+    const normalizedRecordHistoryResourceChange = resourceChange ? this.normalizeRecordHistoryBlockCreateState({
+      actionName: "configure",
+      resourceInit: resourceChange.resourceInit,
+      popupProfile: resourceChange.popupProfile
+    }) : void 0;
+    if (resourceChange) {
+      this.assertRecordHistoryBlockResourceCompatible(
+        "configure",
+        normalizedRecordHistoryResourceChange == null ? void 0 : normalizedRecordHistoryResourceChange.resourceInit,
+        resourceChange.popupProfile
+      );
+    }
+    const recordHistorySettingChanges = (0, import_service_utils.buildDefinedPayload)({
+      ...(0, import_service_utils.hasOwnDefined)(changes, "sortOrder") ? { sortOrder: { order: changes.sortOrder.order } } : {},
+      ...(0, import_service_utils.hasOwnDefined)(changes, "dataScope") ? { dataScope: { filter: changes.dataScope } } : {},
+      ...(0, import_service_utils.hasOwnDefined)(changes, "expand") ? { expand: { expand: changes.expand.expand } } : {},
+      ...(0, import_service_utils.hasOwnDefined)(changes, "template") ? { template: { apply: "current" } } : {}
+    });
+    const recordHistorySettings = resourceChange ? import_lodash.default.merge(
+      {},
+      import_lodash.default.cloneDeep(((_a = current == null ? void 0 : current.stepParams) == null ? void 0 : _a.recordHistorySettings) || {}),
+      ((_b = normalizedRecordHistoryResourceChange == null ? void 0 : normalizedRecordHistoryResourceChange.stepParams) == null ? void 0 : _b.recordHistorySettings) || {},
+      recordHistorySettingChanges
+    ) : Object.keys(recordHistorySettingChanges).length ? recordHistorySettingChanges : void 0;
+    if (resourceChange && !((_c = normalizedRecordHistoryResourceChange == null ? void 0 : normalizedRecordHistoryResourceChange.stepParams) == null ? void 0 : _c.recordHistorySettings)) {
+      import_lodash.default.unset(recordHistorySettings, ["recordId"]);
+    }
+    return this.updateSettings(
+      {
+        target,
+        stepParams: (0, import_service_utils.buildDefinedPayload)({
+          ...cardSettings ? { cardSettings } : {},
+          ...changes.resource ? {
+            resourceSettings: {
+              init: normalizedRecordHistoryResourceChange == null ? void 0 : normalizedRecordHistoryResourceChange.resourceInit
+            }
+          } : {},
+          ...recordHistorySettings ? {
+            recordHistorySettings
+          } : {}
+        })
+      },
+      {
+        ...options,
+        replaceRecordHistorySettings: !!resourceChange
+      }
+    );
+  }
   async configureJSBlock(target, changes, options) {
     const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)("JSBlockModel");
     (0, import_service_utils.assertSupportedSimpleChanges)("jsBlock", changes, allowedKeys);
@@ -15720,57 +16483,921 @@ class FlowSurfacesService {
       });
     });
   }
-  async configureActionNode(target, use, changes, options) {
-    const currentNode = options.current || (target.uid ? await this.repository.findModelById(target.uid, {
-      transaction: options.transaction,
-      includeAsyncNode: true
-    }) : null);
-    changes = await this.normalizeActionPanelActionChanges(changes, options);
-    const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)(use);
-    (0, import_service_utils.assertSupportedSimpleChanges)("action", changes, allowedKeys);
-    const normalizedDefaultFilter = (0, import_service_utils.hasOwnDefined)(changes, "defaultFilter") ? this.normalizeFilterActionDefaultFilterValue(changes.defaultFilter) : void 0;
+  isAIEmployeeActionUse(use) {
+    return String(use || "").trim() === AI_EMPLOYEE_ACTION_USE;
+  }
+  hasAIEmployeePublicSettings(settings) {
+    return import_lodash.default.isPlainObject(settings) && AI_EMPLOYEE_PUBLIC_SETTING_KEYS.some((key) => Object.prototype.hasOwnProperty.call(settings, key));
+  }
+  assertOnlyAIEmployeePublicSettings(actionName, settings) {
+    const unsupportedKeys = Object.keys(settings || {}).filter((key) => !AI_EMPLOYEE_PUBLIC_SETTING_KEYS.includes(key));
+    if (unsupportedKeys.length) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${actionName} AI employee settings do not support keys: ${unsupportedKeys.join(", ")}`
+      );
+    }
+  }
+  assertOnlyAIEmployeeNestedPublicSettings(actionName, path, value, allowedKeys) {
+    const unsupportedKeys = Object.keys(value || {}).filter((key) => !allowedKeys.includes(key));
+    if (!unsupportedKeys.length) {
+      return;
+    }
+    (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} ${path} does not support key '${unsupportedKeys[0]}'`);
+  }
+  assertNoAIEmployeeInternalPropSettings(actionName, values) {
+    const props = values == null ? void 0 : values.props;
+    if (!import_lodash.default.isPlainObject(props)) {
+      return;
+    }
+    const unsupportedKeys = AI_EMPLOYEE_INTERNAL_PROP_KEYS.filter(
+      (key) => Object.prototype.hasOwnProperty.call(props, key)
+    );
+    if (!unsupportedKeys.length) {
+      return;
+    }
+    (0, import_errors.throwBadRequest)(
+      `flowSurfaces ${actionName} AI employee action does not accept raw props.${unsupportedKeys.join(
+        ", props."
+      )}; use top-level username, auto, workContext, tasks or style instead`
+    );
+  }
+  readAIEmployeePersistedTasks(current) {
+    var _a;
+    const stepTasks = import_lodash.default.get(current, ["stepParams", ...AI_EMPLOYEE_TASK_STEP_PARAMS_PATH]);
+    if (Array.isArray(stepTasks)) {
+      return stepTasks;
+    }
+    const legacyPropsTasks = (_a = current == null ? void 0 : current.props) == null ? void 0 : _a.tasks;
+    return Array.isArray(legacyPropsTasks) ? legacyPropsTasks : [];
+  }
+  buildAIEmployeeTaskStepParams(tasks) {
     const stepParams = {};
-    if ((0, import_service_utils.hasDefinedValue)(changes, ["title", "tooltip", "icon", "type", "danger", "color", "linkageRules"])) {
-      stepParams.buttonSettings = {
-        ...(0, import_service_utils.hasDefinedValue)(changes, ["title", "tooltip", "icon", "type", "danger", "color"]) ? {
-          general: (0, import_service_utils.buildDefinedPayload)({
-            title: changes.title,
-            tooltip: changes.tooltip,
-            icon: changes.icon,
-            type: changes.type,
-            danger: changes.danger,
-            color: changes.color
-          })
-        } : {},
-        ...(0, import_service_utils.hasOwnDefined)(changes, "linkageRules") ? { linkageRules: { value: changes.linkageRules } } : {}
-      };
+    import_lodash.default.set(stepParams, AI_EMPLOYEE_TASK_STEP_PARAMS_PATH, import_lodash.default.cloneDeep(tasks));
+    return stepParams;
+  }
+  mergeAIEmployeeActionSettingsPayload(current, values, payload) {
+    if (Object.keys(payload.props).length) {
+      values.props = import_lodash.default.merge({}, values.props || {}, payload.props);
     }
-    if ((0, import_service_utils.hasOwnDefined)(changes, "filterableFieldNames") || (0, import_service_utils.hasOwnDefined)(changes, "defaultFilter")) {
-      if (use !== "FilterActionModel") {
-        (0, import_errors.throwBadRequest)(`flowSurfaces configure action '${use}' does not support filterableFieldNames/defaultFilter`);
-      }
-      stepParams.filterSettings = (0, import_service_utils.buildDefinedPayload)({
-        ...(0, import_service_utils.hasOwnDefined)(changes, "filterableFieldNames") ? {
-          filterableFieldNames: {
-            filterableFieldNames: import_lodash.default.cloneDeep(changes.filterableFieldNames)
-          }
-        } : {},
-        ...(0, import_service_utils.hasOwnDefined)(changes, "defaultFilter") ? {
-          defaultFilter: {
-            defaultFilter: normalizedDefaultFilter
-          }
-        } : {}
+    if (Object.keys(payload.stepParams).length) {
+      values.stepParams = import_lodash.default.mergeWith({}, values.stepParams || {}, payload.stepParams, (_currentValue, nextValue) => {
+        if (Array.isArray(nextValue)) {
+          return import_lodash.default.cloneDeep(nextValue);
+        }
+        return void 0;
       });
     }
-    if ((0, import_service_utils.hasOwnDefined)(changes, "approvalReturn")) {
-      if (use !== "ProcessFormReturnModel") {
-        (0, import_errors.throwBadRequest)(`flowSurfaces configure action '${use}' does not support approvalReturn`);
+    if (import_lodash.default.has(payload.stepParams, AI_EMPLOYEE_TASK_STEP_PARAMS_PATH) && this.isAIEmployeeActionUse(current == null ? void 0 : current.use)) {
+      if (import_lodash.default.isPlainObject(values.props)) {
+        delete values.props.tasks;
       }
-      import_lodash.default.set(
-        stepParams,
-        ["clickSettings", "saveResource", "approvalReturnNodeSettings"],
-        import_lodash.default.cloneDeep(changes.approvalReturn || {})
-      );
+    }
+  }
+  syncAIEmployeeTaskStepParamsForUpdateSettings(current, nextPayload) {
+    var _a;
+    if (!this.isAIEmployeeActionUse(current == null ? void 0 : current.use)) {
+      return;
+    }
+    const legacyPropsTasks = (_a = current == null ? void 0 : current.props) == null ? void 0 : _a.tasks;
+    const hasLegacyPropsTasks = Array.isArray(legacyPropsTasks);
+    const hasNextStepTasks = import_lodash.default.has(nextPayload, ["stepParams", ...AI_EMPLOYEE_TASK_STEP_PARAMS_PATH]);
+    const currentStepTasks = import_lodash.default.get(current, ["stepParams", ...AI_EMPLOYEE_TASK_STEP_PARAMS_PATH]);
+    if (!hasNextStepTasks && hasLegacyPropsTasks && !Array.isArray(currentStepTasks)) {
+      nextPayload.stepParams = import_lodash.default.mergeWith(
+        {},
+        (current == null ? void 0 : current.stepParams) || {},
+        this.buildAIEmployeeTaskStepParams(legacyPropsTasks),
+        (_currentValue, nextValue) => {
+          if (Array.isArray(nextValue)) {
+            return import_lodash.default.cloneDeep(nextValue);
+          }
+          return void 0;
+        }
+      );
+    }
+    if (!hasLegacyPropsTasks && !import_lodash.default.has(nextPayload, ["props", "tasks"])) {
+      return;
+    }
+    const nextProps = import_lodash.default.cloneDeep(nextPayload.props ?? (current == null ? void 0 : current.props) ?? {});
+    delete nextProps.tasks;
+    nextPayload.props = nextProps;
+  }
+  assertAIEmployeePluginEnabled(actionName, enabledPackages) {
+    if (!enabledPackages.has(AI_EMPLOYEE_OWNER_PLUGIN)) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${actionName} action 'aiEmployee' is not available in the current app instance because plugin '${AI_EMPLOYEE_OWNER_PLUGIN}' is not enabled`
+      );
+    }
+  }
+  readRecordPlainObject(record) {
+    if (!record) {
+      return null;
+    }
+    if (typeof record.toJSON === "function") {
+      return record.toJSON();
+    }
+    if (typeof record.get === "function") {
+      try {
+        return record.get({ plain: true });
+      } catch (error) {
+        return record.get();
+      }
+    }
+    return record;
+  }
+  readRecordField(record, field) {
+    var _a;
+    return ((_a = record == null ? void 0 : record.get) == null ? void 0 : _a.call(record, field)) ?? (record == null ? void 0 : record[field]);
+  }
+  normalizeFlowSurfaceRequestRoles(currentRoles) {
+    return import_lodash.default.castArray(currentRoles || []).map((role) => String(role || "").trim()).filter(Boolean);
+  }
+  async assertRequestRolesCanUseAIEmployeeUsername(actionName, username, options) {
+    const currentRoles = this.normalizeFlowSurfaceRequestRoles(options.currentRoles);
+    if (!currentRoles.length || currentRoles.includes("root")) {
+      return;
+    }
+    if (!this.db.getCollection("rolesAiEmployees")) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${actionName} action 'aiEmployee' cannot validate role visibility because collection 'rolesAiEmployees' is unavailable; enable plugin '${AI_EMPLOYEE_OWNER_PLUGIN}' first`
+      );
+    }
+    const grants = await this.db.getRepository("rolesAiEmployees").find({
+      filter: {
+        roleName: currentRoles,
+        aiEmployee: username
+      },
+      transaction: options.transaction
+    });
+    if (!import_lodash.default.castArray(grants).length) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} AI employee username '${username}' is not visible to current roles`);
+    }
+  }
+  async assertVisibleAIEmployeeUsername(actionName, username, options = {}) {
+    if (!this.db.getCollection("aiEmployees")) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${actionName} action 'aiEmployee' cannot validate username because collection 'aiEmployees' is unavailable; enable plugin '${AI_EMPLOYEE_OWNER_PLUGIN}' first`
+      );
+    }
+    const record = await this.db.getRepository("aiEmployees").findOne({
+      filter: {
+        username
+      },
+      transaction: options.transaction
+    });
+    if (!record) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} AI employee username '${username}' does not exist`);
+    }
+    const plain = this.readRecordPlainObject(record) || {};
+    const enabled = this.readRecordField(record, "enabled") ?? plain.enabled;
+    const deprecated = this.readRecordField(record, "deprecated") ?? plain.deprecated;
+    const category = this.readRecordField(record, "category") ?? plain.category;
+    if (enabled === false || deprecated === true || category === "developer") {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} AI employee username '${username}' is not visible`);
+    }
+    await this.assertRequestRolesCanUseAIEmployeeUsername(actionName, username, options);
+  }
+  normalizeAIEmployeeUsername(actionName, value) {
+    const username = typeof value === "string" ? value.trim() : "";
+    if (!username) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} AI employee settings.username must be a non-empty string`);
+    }
+    return username;
+  }
+  assertAIEmployeeWorkContextType(actionName, itemPath, item) {
+    if (String(item.type || "").trim() !== "flow-model") {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} ${itemPath}.type must be 'flow-model'`);
+    }
+  }
+  normalizeAIEmployeeWorkContext(actionName, value, options) {
+    if (import_lodash.default.isUndefined(value) || value === null) {
+      return [];
+    }
+    if (!Array.isArray(value)) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} ${options.path} must be an array`);
+    }
+    return value.map((item, index) => {
+      const itemPath = `${options.path}[${index}]`;
+      if (!import_lodash.default.isPlainObject(item)) {
+        (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} ${itemPath} must be an object`);
+      }
+      this.assertOnlyAIEmployeeNestedPublicSettings(
+        actionName,
+        itemPath,
+        item,
+        AI_EMPLOYEE_WORK_CONTEXT_PUBLIC_KEYS
+      );
+      this.assertAIEmployeeWorkContextType(actionName, itemPath, item);
+      if (Object.prototype.hasOwnProperty.call(item, "target") && typeof item.target !== "string") {
+        (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} ${itemPath}.target must be 'self' or a string block key`);
+      }
+      const hasTarget = Object.prototype.hasOwnProperty.call(item, "target");
+      const target = hasTarget ? item.target.trim() : "";
+      if (hasTarget && !target) {
+        (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} ${itemPath}.target must be 'self' or a string block key`);
+      }
+      const uidValue = typeof item.uid === "string" ? item.uid.trim() : "";
+      if (!target) {
+        if (!uidValue) {
+          (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} ${itemPath} requires uid or target`);
+        }
+        return {
+          type: "flow-model",
+          uid: uidValue
+        };
+      }
+      let uidValueFromTarget;
+      if (target === "self") {
+        uidValueFromTarget = options.selfUid;
+      } else if (options.keyMap) {
+        uidValueFromTarget = (0, import_compose_compiler.resolveComposeTargetKey)(target, options.keyMap, "AI employee workContext");
+      } else {
+        (0, import_errors.throwBadRequest)(
+          `flowSurfaces ${actionName} ${itemPath}.target only supports 'self' in localized writes; pass uid for existing Flow Model context`
+        );
+      }
+      if (!uidValueFromTarget) {
+        (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} ${itemPath}.target could not resolve a Flow Model uid`);
+      }
+      return {
+        type: "flow-model",
+        uid: uidValueFromTarget
+      };
+    });
+  }
+  normalizeAIEmployeeTaskModel(actionName, path, value) {
+    if (import_lodash.default.isUndefined(value) || value === null) {
+      return value;
+    }
+    if (!import_lodash.default.isPlainObject(value)) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} ${path} must be an object or null`);
+    }
+    this.assertOnlyAIEmployeeNestedPublicSettings(
+      actionName,
+      path,
+      value,
+      AI_EMPLOYEE_TASK_MODEL_PUBLIC_KEYS
+    );
+    const llmService = typeof value.llmService === "string" ? value.llmService.trim() : "";
+    const model = typeof value.model === "string" ? value.model.trim() : "";
+    if (!llmService || !model) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} ${path} requires non-empty llmService and model`);
+    }
+    return {
+      ...import_lodash.default.cloneDeep(value),
+      llmService,
+      model
+    };
+  }
+  normalizeAIEmployeeSkillSettings(actionName, path, value) {
+    if (import_lodash.default.isUndefined(value) || value === null) {
+      return value;
+    }
+    if (!import_lodash.default.isPlainObject(value)) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} ${path} must be an object or null`);
+    }
+    this.assertOnlyAIEmployeeNestedPublicSettings(
+      actionName,
+      path,
+      value,
+      AI_EMPLOYEE_SKILL_SETTINGS_PUBLIC_KEYS
+    );
+    const next = import_lodash.default.cloneDeep(value);
+    if (Object.prototype.hasOwnProperty.call(next, "skills") && !Array.isArray(next.skills)) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} ${path}.skills must be an array`);
+    }
+    if (Object.prototype.hasOwnProperty.call(next, "tools") && !Array.isArray(next.tools)) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} ${path}.tools must be an array`);
+    }
+    if (Object.prototype.hasOwnProperty.call(next, "skillsVersion") && typeof next.skillsVersion !== "number") {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} ${path}.skillsVersion must be a number`);
+    }
+    if (Object.prototype.hasOwnProperty.call(next, "toolsVersion") && typeof next.toolsVersion !== "number") {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} ${path}.toolsVersion must be a number`);
+    }
+    const hasSkills = Object.prototype.hasOwnProperty.call(next, "skills");
+    const hasTools = Object.prototype.hasOwnProperty.call(next, "tools");
+    const hasSkillsVersion = Object.prototype.hasOwnProperty.call(next, "skillsVersion");
+    const hasToolsVersion = Object.prototype.hasOwnProperty.call(next, "toolsVersion");
+    if (hasSkills && hasTools && !hasSkillsVersion && !hasToolsVersion && Array.isArray(next.skills) && Array.isArray(next.tools) && next.skills.length === 0 && next.tools.length === 0) {
+      return null;
+    }
+    if (hasSkills && !hasSkillsVersion) {
+      next.skillsVersion = 2;
+    }
+    if (hasTools && !hasToolsVersion) {
+      next.toolsVersion = 2;
+    }
+    return next;
+  }
+  collectAIEmployeePromptVariables(value) {
+    if (!value.includes("{{")) {
+      return [];
+    }
+    return [...value.matchAll(/\{\{\s*([\s\S]+?)\s*\}\}/g)].map(([raw, inner]) => ({
+      raw,
+      inner: String(inner || "").trim()
+    }));
+  }
+  hasAIEmployeePromptVariables(tasks) {
+    return import_lodash.default.castArray(tasks || []).some((task) => {
+      const message = task == null ? void 0 : task.message;
+      return typeof (message == null ? void 0 : message.system) === "string" && this.collectAIEmployeePromptVariables(message.system).length > 0 || typeof (message == null ? void 0 : message.user) === "string" && this.collectAIEmployeePromptVariables(message.user).length > 0;
+    });
+  }
+  collectAIEmployeeContextPathEntries(context) {
+    const result = /* @__PURE__ */ new Map();
+    const visit = (prefix, info) => {
+      if (!prefix || !info) {
+        return;
+      }
+      result.set(prefix, info);
+      if (info.dynamicProperties) {
+        result.set(`${prefix}.*`, info.dynamicProperties);
+      }
+      for (const [childKey, childInfo] of Object.entries(info.properties || {})) {
+        visit(`${prefix}.${childKey}`, childInfo);
+      }
+    };
+    for (const [key, info] of Object.entries((context == null ? void 0 : context.vars) || {})) {
+      visit(key, info);
+    }
+    return result;
+  }
+  isAIEmployeeContextInfoPathAllowed(info, segments) {
+    var _a;
+    if (!info) {
+      return false;
+    }
+    if (!segments.length) {
+      return true;
+    }
+    const [segment, ...rest] = segments;
+    const staticChild = (_a = info.properties) == null ? void 0 : _a[segment];
+    if (staticChild) {
+      return this.isAIEmployeeContextInfoPathAllowed(staticChild, rest);
+    }
+    if (info.dynamicProperties) {
+      return this.isAIEmployeeContextInfoPathAllowed(info.dynamicProperties, rest);
+    }
+    return false;
+  }
+  canResolveAIEmployeeContextPath(path, semantic) {
+    var _a;
+    return !!((_a = (0, import_context.buildFlowSurfaceContextResponse)({
+      semantic,
+      path,
+      maxDepth: 1
+    }).vars) == null ? void 0 : _a[path]);
+  }
+  isAIEmployeeContextPathAllowed(path, validation) {
+    if (validation.contextPaths.has(path)) {
+      return true;
+    }
+    for (const [allowedPath, info] of validation.contextPaths) {
+      if (!allowedPath.endsWith(".*")) {
+        continue;
+      }
+      const prefix = allowedPath.slice(0, -2);
+      if (!path.startsWith(`${prefix}.`)) {
+        continue;
+      }
+      const dynamicSegments = path.slice(prefix.length + 1).split(".").filter(Boolean);
+      if (dynamicSegments.length && this.isAIEmployeeContextInfoPathAllowed(info, dynamicSegments.slice(1))) {
+        return true;
+      }
+    }
+    return this.canResolveAIEmployeeContextPath(path, validation.semantic);
+  }
+  extractAIEmployeePromptContextPath(expression) {
+    const normalized = String(expression || "").trim();
+    if (normalized === "ctx") {
+      return "";
+    }
+    if (!normalized.startsWith("ctx.")) {
+      return null;
+    }
+    const path = normalized.slice(4).trim();
+    return (0, import_context.isBareFlowContextPath)(path) ? path : null;
+  }
+  buildAIEmployeePromptVariableHint(targetUid) {
+    return `Call flowSurfaces:context${targetUid ? ` with target.uid "${targetUid}"` : ""} to inspect available ctx paths before writing prompt variables.`;
+  }
+  throwAIEmployeePromptVariableInvalid(input) {
+    (0, import_errors.throwBadRequest)(
+      `flowSurfaces ${input.actionName} ${input.fieldPath} variable "${input.variable}" is not allowed: ${input.reason}. Use a concrete ctx path such as "{{ ctx.record.id }}" only when that path is available. ${this.buildAIEmployeePromptVariableHint(
+        input.targetUid
+      )}`,
+      AI_EMPLOYEE_PROMPT_VARIABLE_INVALID,
+      {
+        path: input.fieldPath,
+        details: (0, import_service_utils.buildDefinedPayload)({
+          variable: input.variable,
+          contextPath: input.path,
+          targetUid: input.targetUid
+        })
+      }
+    );
+  }
+  assertAIEmployeePromptVariablesAllowed(actionName, fieldPath, value, validation) {
+    for (const variable of this.collectAIEmployeePromptVariables(value)) {
+      const path = this.extractAIEmployeePromptContextPath(variable.inner);
+      if (path === "") {
+        this.throwAIEmployeePromptVariableInvalid({
+          actionName,
+          fieldPath,
+          variable: variable.raw,
+          targetUid: validation.targetUid,
+          reason: "the whole ctx object is not a valid prompt variable; use a concrete ctx path"
+        });
+      }
+      if (!path) {
+        this.throwAIEmployeePromptVariableInvalid({
+          actionName,
+          fieldPath,
+          variable: variable.raw,
+          targetUid: validation.targetUid,
+          reason: 'only simple ctx dot paths like "{{ ctx.record.id }}" are supported'
+        });
+      }
+      if (!this.isAIEmployeeContextPathAllowed(path, validation)) {
+        this.throwAIEmployeePromptVariableInvalid({
+          actionName,
+          fieldPath,
+          variable: variable.raw,
+          targetUid: validation.targetUid,
+          path,
+          reason: `path "${path}" is not available in the current Flow Surface context`
+        });
+      }
+    }
+  }
+  assertAIEmployeeTaskPromptVariablesAllowed(actionName, tasks, validation, path = "settings.tasks") {
+    if (!validation) {
+      return;
+    }
+    tasks.forEach((task, index) => {
+      const message = task == null ? void 0 : task.message;
+      if (typeof (message == null ? void 0 : message.system) === "string") {
+        this.assertAIEmployeePromptVariablesAllowed(
+          actionName,
+          `${path}[${index}].message.system`,
+          message.system,
+          validation
+        );
+      }
+      if (typeof (message == null ? void 0 : message.user) === "string") {
+        this.assertAIEmployeePromptVariablesAllowed(
+          actionName,
+          `${path}[${index}].message.user`,
+          message.user,
+          validation
+        );
+      }
+    });
+  }
+  appendAIEmployeeCurrentRecordPromptVariable(value) {
+    if (AI_EMPLOYEE_CURRENT_RECORD_PROMPT_VARIABLE_RE.test(value)) {
+      return value;
+    }
+    return value ? `${value}
+${AI_EMPLOYEE_CURRENT_RECORD_PROMPT_VARIABLE}` : AI_EMPLOYEE_CURRENT_RECORD_PROMPT_VARIABLE;
+  }
+  async resolveAIEmployeePromptActionTargetUid(context, transaction) {
+    if (!context) {
+      return void 0;
+    }
+    if (context.kind === "target") {
+      return String(context.targetUid || "").trim() || void 0;
+    }
+    return String(context.ownerUid || "").trim() || void 0;
+  }
+  async buildAIEmployeePromptValidationContext(actionName, tasks, options) {
+    var _a, _b;
+    if (!this.hasAIEmployeePromptVariables(tasks)) {
+      return void 0;
+    }
+    const targetUid = await this.resolveAIEmployeePromptActionTargetUid(options.promptContext, options.transaction);
+    if (!targetUid) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${actionName} AI employee prompt variables require a resolvable Flow Surface context. ${this.buildAIEmployeePromptVariableHint()}`,
+        AI_EMPLOYEE_PROMPT_VARIABLE_INVALID
+      );
+    }
+    const target = { uid: targetUid };
+    const resolved = await this.locator.resolve(target, { transaction: options.transaction });
+    let semantic = await this.resolveContextSemantic(((_a = resolved == null ? void 0 : resolved.node) == null ? void 0 : _a.uid) || target.uid, resolved, options.transaction);
+    if (((_b = options.promptContext) == null ? void 0 : _b.kind) === "container" && options.promptContext.scope === "record") {
+      semantic = {
+        ...semantic,
+        recordCollection: semantic.recordCollection || semantic.collection || await this.resolveContextOwnerCollection(targetUid, options.transaction).catch(() => null)
+      };
+    }
+    const context = (0, import_context.buildFlowSurfaceContextResponse)({
+      semantic,
+      maxDepth: AI_EMPLOYEE_PROMPT_CONTEXT_MAX_DEPTH
+    });
+    return {
+      targetUid,
+      semantic,
+      contextPaths: this.collectAIEmployeeContextPathEntries(context)
+    };
+  }
+  appendAIEmployeeCurrentRecordPromptVariableToTasks(tasks, validation) {
+    if (!tasks.length || !validation || !this.isAIEmployeeContextPathAllowed("record", validation)) {
+      return tasks;
+    }
+    return tasks.map((task) => {
+      var _a;
+      if (typeof ((_a = task == null ? void 0 : task.message) == null ? void 0 : _a.user) !== "string") {
+        return task;
+      }
+      const next = import_lodash.default.cloneDeep(task);
+      next.message.user = this.appendAIEmployeeCurrentRecordPromptVariable(next.message.user);
+      return next;
+    });
+  }
+  async assertAIEmployeeStepParamTaskPromptVariablesAllowedForUpdateSettings(current, nextPayload, writeTarget, options) {
+    if (!this.isAIEmployeeActionUse(current == null ? void 0 : current.use) || !import_lodash.default.has(nextPayload, ["stepParams", ...AI_EMPLOYEE_TASK_STEP_PARAMS_PATH])) {
+      return;
+    }
+    const tasks = import_lodash.default.get(nextPayload, ["stepParams", ...AI_EMPLOYEE_TASK_STEP_PARAMS_PATH]);
+    if (!Array.isArray(tasks)) {
+      return;
+    }
+    const actionName = options.openViewActionName || "updateSettings";
+    this.assertAIEmployeeTaskPromptVariablesAllowed(
+      actionName,
+      tasks,
+      await this.buildAIEmployeePromptValidationContext(actionName, tasks, {
+        transaction: options.transaction,
+        promptContext: {
+          kind: "target",
+          targetUid: (current == null ? void 0 : current.uid) || writeTarget.uid
+        }
+      }),
+      "stepParams.shortcutSettings.editTasks.tasks"
+    );
+  }
+  async normalizeAIEmployeeStepParamTasksForUpdateSettings(current, nextPayload, writeTarget, options) {
+    if (!this.isAIEmployeeActionUse(current == null ? void 0 : current.use) || !import_lodash.default.has(nextPayload, ["stepParams", ...AI_EMPLOYEE_TASK_STEP_PARAMS_PATH])) {
+      return;
+    }
+    const tasks = import_lodash.default.get(nextPayload, ["stepParams", ...AI_EMPLOYEE_TASK_STEP_PARAMS_PATH]);
+    if (!Array.isArray(tasks)) {
+      return;
+    }
+    const actionName = options.openViewActionName || "updateSettings";
+    const normalizedTasks = this.normalizeAIEmployeeTasks(
+      actionName,
+      tasks,
+      this.readAIEmployeePersistedTasks(current),
+      {
+        selfUid: await this.resolveAIEmployeeActionSelfUid(current || { uid: writeTarget.uid }, options.transaction),
+        path: "stepParams.shortcutSettings.editTasks.tasks"
+      }
+    );
+    import_lodash.default.set(nextPayload, ["stepParams", ...AI_EMPLOYEE_TASK_STEP_PARAMS_PATH], normalizedTasks);
+  }
+  normalizeAIEmployeeTaskMessage(actionName, path, value, existing, options) {
+    if (!import_lodash.default.isPlainObject(value)) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} ${path} must be an object`);
+    }
+    this.assertOnlyAIEmployeeNestedPublicSettings(
+      actionName,
+      path,
+      value,
+      AI_EMPLOYEE_TASK_MESSAGE_PUBLIC_KEYS
+    );
+    const nextMessage = import_lodash.default.pick(
+      import_lodash.default.isPlainObject(existing) ? import_lodash.default.cloneDeep(existing) : {},
+      AI_EMPLOYEE_TASK_MESSAGE_PUBLIC_KEYS
+    );
+    if (Object.prototype.hasOwnProperty.call(value, "system")) {
+      nextMessage.system = value.system;
+    }
+    if (Object.prototype.hasOwnProperty.call(value, "user")) {
+      nextMessage.user = value.user;
+    }
+    if (Object.prototype.hasOwnProperty.call(nextMessage, "system") && typeof nextMessage.system !== "string") {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} ${path}.system must be a string`);
+    }
+    if (Object.prototype.hasOwnProperty.call(nextMessage, "user") && typeof nextMessage.user !== "string") {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} ${path}.user must be a string`);
+    }
+    if (Object.prototype.hasOwnProperty.call(value, "workContext")) {
+      nextMessage.workContext = this.normalizeAIEmployeeWorkContext(actionName, value.workContext, {
+        selfUid: options.selfUid,
+        keyMap: options.keyMap,
+        path: `${path}.workContext`
+      });
+    }
+    return nextMessage;
+  }
+  normalizeAIEmployeeTaskPatch(actionName, patch, existing, options) {
+    if (!import_lodash.default.isPlainObject(patch)) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} ${options.path} must be an object`);
+    }
+    const next = import_lodash.default.pick(import_lodash.default.isPlainObject(existing) ? import_lodash.default.cloneDeep(existing) : {}, AI_EMPLOYEE_TASK_PUBLIC_SETTING_KEYS);
+    Object.entries(patch).forEach(([key, value]) => {
+      if (!AI_EMPLOYEE_TASK_PUBLIC_SETTING_KEYS.includes(key)) {
+        (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} ${options.path} does not support key '${key}'`);
+      }
+      if (key === "message") {
+        next.message = this.normalizeAIEmployeeTaskMessage(actionName, `${options.path}.message`, value, next.message, {
+          selfUid: options.selfUid,
+          keyMap: options.keyMap
+        });
+        return;
+      }
+      if (key === "title") {
+        if (typeof value !== "string") {
+          (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} ${options.path}.title must be a string`);
+        }
+        next.title = value;
+        return;
+      }
+      if (key === "autoSend" || key === "webSearch") {
+        if (typeof value !== "boolean") {
+          (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} ${options.path}.${key} must be a boolean`);
+        }
+        next[key] = value;
+        return;
+      }
+      if (key === "model") {
+        next.model = this.normalizeAIEmployeeTaskModel(actionName, `${options.path}.model`, value);
+        return;
+      }
+      if (key === "skillSettings") {
+        const normalizedSkillSettings = this.normalizeAIEmployeeSkillSettings(
+          actionName,
+          `${options.path}.skillSettings`,
+          value
+        );
+        next.skillSettings = normalizedSkillSettings && import_lodash.default.isPlainObject(normalizedSkillSettings) ? {
+          ...import_lodash.default.isPlainObject(next.skillSettings) ? import_lodash.default.cloneDeep(next.skillSettings) : {},
+          ...normalizedSkillSettings
+        } : normalizedSkillSettings;
+        return;
+      }
+    });
+    if (!import_lodash.default.isPlainObject(next.message)) {
+      next.message = {};
+    }
+    if (import_lodash.default.isPlainObject(next.skillSettings)) {
+      if (Array.isArray(next.skillSettings.skills) && !Object.prototype.hasOwnProperty.call(next.skillSettings, "skillsVersion")) {
+        next.skillSettings.skillsVersion = 2;
+      }
+      if (Array.isArray(next.skillSettings.tools) && !Object.prototype.hasOwnProperty.call(next.skillSettings, "toolsVersion")) {
+        next.skillSettings.toolsVersion = 2;
+      }
+    }
+    return next;
+  }
+  normalizeAIEmployeeTasks(actionName, value, currentTasks, options) {
+    if (import_lodash.default.isUndefined(value) || value === null) {
+      return [];
+    }
+    if (!Array.isArray(value)) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} ${options.path} must be an array`);
+    }
+    if (!value.length) {
+      return [];
+    }
+    const existingTasks = Array.isArray(currentTasks) ? import_lodash.default.cloneDeep(currentTasks) : [];
+    const nextTasks = [...existingTasks];
+    value.forEach((task, index) => {
+      nextTasks[index] = this.normalizeAIEmployeeTaskPatch(actionName, task, existingTasks[index], {
+        selfUid: options.selfUid,
+        keyMap: options.keyMap,
+        path: `${options.path}[${index}]`
+      });
+    });
+    return nextTasks;
+  }
+  normalizeAIEmployeeActionSettingsReferences(actionName, settings, options) {
+    if (!this.hasAIEmployeePublicSettings(settings)) {
+      return settings;
+    }
+    const nextSettings = import_lodash.default.cloneDeep(settings || {});
+    if (Object.prototype.hasOwnProperty.call(nextSettings, "workContext")) {
+      nextSettings.workContext = this.normalizeAIEmployeeWorkContext(actionName, nextSettings.workContext, {
+        ...options,
+        path: "settings.workContext"
+      });
+    }
+    if (Object.prototype.hasOwnProperty.call(nextSettings, "tasks")) {
+      nextSettings.tasks = this.normalizeAIEmployeeTasks(actionName, nextSettings.tasks, [], {
+        ...options,
+        path: "settings.tasks"
+      });
+    }
+    return nextSettings;
+  }
+  async normalizeAIEmployeeActionPublicSettings(actionName, settings, options) {
+    var _a, _b;
+    this.assertAIEmployeePluginEnabled(actionName, options.enabledPackages);
+    if (!import_lodash.default.isPlainObject(settings)) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} AI employee settings must be an object`);
+    }
+    this.assertOnlyAIEmployeePublicSettings(actionName, settings);
+    const currentProps = import_lodash.default.isPlainObject((_a = options.current) == null ? void 0 : _a.props) ? options.current.props : {};
+    const hasUsername = Object.prototype.hasOwnProperty.call(settings, "username");
+    const effectiveUsername = hasUsername ? this.normalizeAIEmployeeUsername(actionName, settings.username) : String(((_b = currentProps == null ? void 0 : currentProps.aiEmployee) == null ? void 0 : _b.username) || "").trim();
+    if (!effectiveUsername && (options.requireUsername || this.hasAIEmployeePublicSettings(settings))) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} AI employee settings.username is required`);
+    }
+    if (effectiveUsername) {
+      await this.assertVisibleAIEmployeeUsername(actionName, effectiveUsername, {
+        currentRoles: options.currentRoles,
+        transaction: options.transaction
+      });
+    }
+    const props = {};
+    const stepParams = {};
+    if (effectiveUsername && (hasUsername || options.requireUsername)) {
+      props.aiEmployee = {
+        ...import_lodash.default.isPlainObject(currentProps.aiEmployee) ? import_lodash.default.cloneDeep(currentProps.aiEmployee) : {},
+        username: effectiveUsername
+      };
+    }
+    if (Object.prototype.hasOwnProperty.call(settings, "auto") || options.requireUsername) {
+      const auto = Object.prototype.hasOwnProperty.call(settings, "auto") ? settings.auto : typeof currentProps.auto === "boolean" ? currentProps.auto : false;
+      if (typeof auto !== "boolean") {
+        (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} AI employee settings.auto must be a boolean`);
+      }
+      props.auto = auto;
+    }
+    if (Object.prototype.hasOwnProperty.call(settings, "workContext") || options.requireUsername) {
+      const rawWorkContext = Object.prototype.hasOwnProperty.call(settings, "workContext") ? settings.workContext : [{ type: "flow-model", target: "self" }];
+      props.context = {
+        ...import_lodash.default.isPlainObject(currentProps.context) ? import_lodash.default.cloneDeep(currentProps.context) : {},
+        workContext: this.normalizeAIEmployeeWorkContext(actionName, rawWorkContext, {
+          selfUid: options.selfUid,
+          keyMap: options.keyMap,
+          path: "settings.workContext"
+        })
+      };
+    }
+    if (Object.prototype.hasOwnProperty.call(settings, "tasks")) {
+      const normalizedTasks = this.normalizeAIEmployeeTasks(
+        actionName,
+        settings.tasks,
+        this.readAIEmployeePersistedTasks(options.current),
+        {
+          selfUid: options.selfUid,
+          keyMap: options.keyMap,
+          path: "settings.tasks"
+        }
+      );
+      const validation = options.promptContext && normalizedTasks.length ? await this.buildAIEmployeePromptValidationContext(
+        actionName,
+        [
+          {
+            message: {
+              user: AI_EMPLOYEE_CURRENT_RECORD_PROMPT_VARIABLE
+            }
+          }
+        ],
+        {
+          transaction: options.transaction,
+          promptContext: options.promptContext
+        }
+      ) : await this.buildAIEmployeePromptValidationContext(actionName, normalizedTasks, {
+        transaction: options.transaction,
+        promptContext: options.promptContext
+      });
+      const tasks = this.appendAIEmployeeCurrentRecordPromptVariableToTasks(normalizedTasks, validation);
+      this.assertAIEmployeeTaskPromptVariablesAllowed(actionName, tasks, validation);
+      import_lodash.default.merge(stepParams, this.buildAIEmployeeTaskStepParams(tasks));
+    }
+    if (Object.prototype.hasOwnProperty.call(settings, "style") || options.requireUsername) {
+      const style = Object.prototype.hasOwnProperty.call(settings, "style") ? settings.style : {};
+      if (!import_lodash.default.isUndefined(style) && style !== null && !import_lodash.default.isPlainObject(style)) {
+        (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} AI employee settings.style must be an object`);
+      }
+      if (import_lodash.default.isPlainObject(style)) {
+        this.assertOnlyAIEmployeeNestedPublicSettings(
+          actionName,
+          "settings.style",
+          style,
+          AI_EMPLOYEE_STYLE_PUBLIC_KEYS
+        );
+        if (Object.prototype.hasOwnProperty.call(style, "size") && typeof style.size !== "number") {
+          (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} AI employee settings.style.size must be a number`);
+        }
+        if (Object.prototype.hasOwnProperty.call(style, "mask") && typeof style.mask !== "boolean") {
+          (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} AI employee settings.style.mask must be a boolean`);
+        }
+      }
+      props.style = import_lodash.default.merge(
+        {},
+        import_lodash.default.cloneDeep(AI_EMPLOYEE_DEFAULT_STYLE),
+        import_lodash.default.isPlainObject(currentProps.style) ? import_lodash.default.pick(import_lodash.default.cloneDeep(currentProps.style), AI_EMPLOYEE_STYLE_PUBLIC_KEYS) : {},
+        import_lodash.default.isPlainObject(style) ? import_lodash.default.pick(import_lodash.default.cloneDeep(style), AI_EMPLOYEE_STYLE_PUBLIC_KEYS) : {}
+      );
+    }
+    return {
+      props,
+      stepParams
+    };
+  }
+  async resolveAIEmployeeActionSelfUid(actionNode, transaction) {
+    const parentUid = String((actionNode == null ? void 0 : actionNode.parentId) || "").trim() || ((actionNode == null ? void 0 : actionNode.uid) ? await this.locator.findParentUid(actionNode.uid, transaction).catch(() => "") : "");
+    if (!parentUid) {
+      return actionNode == null ? void 0 : actionNode.uid;
+    }
+    const parentNode = await this.repository.findModelById(parentUid, {
+      transaction,
+      includeAsyncNode: true
+    });
+    if (["TableActionsColumnModel", "ListItemModel", "GridCardItemModel"].includes(String((parentNode == null ? void 0 : parentNode.use) || ""))) {
+      const ownerUid = String((parentNode == null ? void 0 : parentNode.parentId) || "").trim() || ((parentNode == null ? void 0 : parentNode.uid) ? await this.locator.findParentUid(parentNode.uid, transaction).catch(() => "") : "");
+      return ownerUid || parentUid;
+    }
+    return parentUid;
+  }
+  async configureActionNode(target, use, changes, options) {
+    const currentNode = options.current || (target.uid ? await this.repository.findModelById(target.uid, {
+      transaction: options.transaction,
+      includeAsyncNode: true
+    }) : null);
+    changes = await this.normalizeActionPanelActionChanges(changes, options);
+    const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)(use);
+    (0, import_service_utils.assertSupportedSimpleChanges)("action", changes, allowedKeys);
+    if (this.isAIEmployeeActionUse(use)) {
+      const aiEmployeeSettingsPayload = await this.normalizeAIEmployeeActionPublicSettings(
+        "configure action",
+        changes,
+        {
+          transaction: options.transaction,
+          enabledPackages: options.enabledPackages || await this.resolveEnabledPluginPackages(options),
+          current: currentNode,
+          currentRoles: options.currentRoles,
+          selfUid: await this.resolveAIEmployeeActionSelfUid(currentNode, options.transaction),
+          promptContext: {
+            kind: "target",
+            targetUid: (currentNode == null ? void 0 : currentNode.uid) || target.uid
+          }
+        }
+      );
+      const settingsValues = { target };
+      if (Object.keys(aiEmployeeSettingsPayload.props).length) {
+        settingsValues.props = aiEmployeeSettingsPayload.props;
+      }
+      if (Object.keys(aiEmployeeSettingsPayload.stepParams).length) {
+        settingsValues.stepParams = aiEmployeeSettingsPayload.stepParams;
+      }
+      return this.updateSettings(settingsValues, {
+        ...options,
+        openViewActionName: options.openViewActionName || "configure action",
+        popupTemplateHostUid: target.uid,
+        allowAIEmployeeInternalProps: true
+      });
+    }
+    const normalizedDefaultFilter = (0, import_service_utils.hasOwnDefined)(changes, "defaultFilter") ? this.normalizeFilterActionDefaultFilterValue(changes.defaultFilter) : void 0;
+    const stepParams = {};
+    if ((0, import_service_utils.hasDefinedValue)(changes, ["title", "tooltip", "icon", "type", "danger", "color", "linkageRules"])) {
+      stepParams.buttonSettings = {
+        ...(0, import_service_utils.hasDefinedValue)(changes, ["title", "tooltip", "icon", "type", "danger", "color"]) ? {
+          general: (0, import_service_utils.buildDefinedPayload)({
+            title: changes.title,
+            tooltip: changes.tooltip,
+            icon: changes.icon,
+            type: changes.type,
+            danger: changes.danger,
+            color: changes.color
+          })
+        } : {},
+        ...(0, import_service_utils.hasOwnDefined)(changes, "linkageRules") ? { linkageRules: { value: changes.linkageRules } } : {}
+      };
+    }
+    if ((0, import_service_utils.hasOwnDefined)(changes, "filterableFieldNames") || (0, import_service_utils.hasOwnDefined)(changes, "defaultFilter")) {
+      if (use !== "FilterActionModel") {
+        (0, import_errors.throwBadRequest)(`flowSurfaces configure action '${use}' does not support filterableFieldNames/defaultFilter`);
+      }
+      stepParams.filterSettings = (0, import_service_utils.buildDefinedPayload)({
+        ...(0, import_service_utils.hasOwnDefined)(changes, "filterableFieldNames") ? {
+          filterableFieldNames: {
+            filterableFieldNames: import_lodash.default.cloneDeep(changes.filterableFieldNames)
+          }
+        } : {},
+        ...(0, import_service_utils.hasOwnDefined)(changes, "defaultFilter") ? {
+          defaultFilter: {
+            defaultFilter: normalizedDefaultFilter
+          }
+        } : {}
+      });
+    }
+    if ((0, import_service_utils.hasOwnDefined)(changes, "approvalReturn")) {
+      if (use !== "ProcessFormReturnModel") {
+        (0, import_errors.throwBadRequest)(`flowSurfaces configure action '${use}' does not support approvalReturn`);
+      }
+      import_lodash.default.set(
+        stepParams,
+        ["clickSettings", "saveResource", "approvalReturnNodeSettings"],
+        import_lodash.default.cloneDeep(changes.approvalReturn || {})
+      );
     }
     if ((0, import_service_utils.hasOwnDefined)(changes, "assigneesScope")) {
       if (!APPROVAL_REASSIGN_ACTION_USES.has(use)) {
@@ -17019,7 +18646,8 @@ class FlowSurfacesService {
   }
   resolveRecordActionContextOwner(ancestors) {
     const currentNode = ancestors[0];
-    if (!String((currentNode == null ? void 0 : currentNode.use) || "").endsWith("ActionModel")) {
+    const currentUse = String((currentNode == null ? void 0 : currentNode.use) || "").trim();
+    if (!currentUse.endsWith("ActionModel") && !import_node_use_sets.ACTION_BUTTON_USES.has(currentUse)) {
       return null;
     }
     return ancestors.slice(1).find((node) => (0, import_action_scope.getActionContainerScope)(node == null ? void 0 : node.use) === "record") || null;
@@ -17270,11 +18898,12 @@ class FlowSurfacesService {
     };
   }
   getCollection(dataSourceKey, collectionName) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const normalizedDataSourceKey = dataSourceKey || "main";
-    const dataSourceManager = this.plugin.app.dataSourceManager;
-    const dataSource = (_a = dataSourceManager == null ? void 0 : dataSourceManager.get) == null ? void 0 : _a.call(dataSourceManager, normalizedDataSourceKey);
-    return ((_c = (_b = dataSource == null ? void 0 : dataSource.collectionManager) == null ? void 0 : _b.getCollection) == null ? void 0 : _c.call(_b, collectionName)) || ((_e = (_d = this.plugin.app.db) == null ? void 0 : _d.getCollection) == null ? void 0 : _e.call(_d, collectionName));
+    const app = (_a = this.plugin) == null ? void 0 : _a.app;
+    const dataSourceManager = app == null ? void 0 : app.dataSourceManager;
+    const dataSource = (_b = dataSourceManager == null ? void 0 : dataSourceManager.get) == null ? void 0 : _b.call(dataSourceManager, normalizedDataSourceKey);
+    return ((_d = (_c = dataSource == null ? void 0 : dataSource.collectionManager) == null ? void 0 : _c.getCollection) == null ? void 0 : _d.call(_c, collectionName)) || ((_f = (_e = app == null ? void 0 : app.db) == null ? void 0 : _e.getCollection) == null ? void 0 : _f.call(_e, collectionName)) || ((_h = (_g = this.db) == null ? void 0 : _g.getCollection) == null ? void 0 : _h.call(_g, collectionName));
   }
   normalizeKanbanFieldNameInput(value, context, options = {}) {
     if (import_lodash.default.isUndefined(value)) {