Claude/unified authoring architecture ms wwj

.claude-plugin/skills/formspec-specs/references/schemas/core-commands.md

@@ -1,10 +1,10 @@
 # Core Commands Schema Reference Map
 
-> schemas/core-commands.schema.json -- 1196 lines -- Command definitions for programmatic form manipulation
+> schemas/core-commands.schema.json -- 1220 lines -- Command definitions for programmatic form manipulation
 
 ## Overview
 
-The Core Command Catalog is a structured JSON schema that defines every mutation command available through `RawProject.dispatch()` in `formspec-core`. It serves as a machine-readable catalog enabling LLM agents, CLI tools, and visual editors to discover available operations and construct valid command payloads. The schema defines 119 commands organized across 15 handler areas spanning definition manipulation, theme configuration, mapping rules, component tree management, and project-level operations.
+The Core Command Catalog is a structured JSON schema that defines every mutation command available through `RawProject.dispatch()` in `formspec-core`. It serves as a machine-readable catalog enabling LLM agents, CLI tools, and visual editors to discover available operations and construct valid command payloads. The schema defines 120 commands organized across 16 handler areas spanning definition manipulation, theme configuration, page layout, mapping rules, component tree management, and project-level operations.
 
 ## Top-Level Structure
 
@@ -116,7 +116,7 @@ The document is typed as `"object"` with `version` and `commands` as the two dat
 | `definition.deleteFieldMapRule` | Remove a migration field map rule by index. | fromVersion, index | fromVersion, index | -- |
 | `definition.setMigrationDefaults` | Set default values for newly added fields in a migration. | fromVersion, defaults | fromVersion, defaults | -- |
 
-### theme (28 commands)
+### theme (17 commands)
 
 | Command | Description | Parameters | Required Params | Returns |
 |---------|-------------|------------|-----------------|---------|
@@ -132,17 +132,6 @@ The document is typed as `"object"` with `version` and `commands` as the two dat
 | `theme.setItemStyle` | Set a style property on a per-item override. | itemKey, property, value | itemKey, property, value | -- |
 | `theme.setItemWidgetConfig` | Set a widget configuration property on a per-item override. | itemKey, property, value | itemKey, property, value | -- |
 | `theme.setItemAccessibility` | Set an accessibility property on a per-item override. | itemKey, property, value | itemKey, property, value | -- |
-| `theme.addPage` | Add a page layout definition to the theme. | id, title, description, insertIndex | -- | -- |
-| `theme.setPageProperty` | Update a property on a theme page layout. | index, property, value | index, property, value | -- |
-| `theme.deletePage` | Remove a theme page layout by index. | index | index | -- |
-| `theme.reorderPage` | Move a theme page layout one position up or down. | index, direction | index, direction | -- |
-| `theme.addRegion` | Add a grid region to a theme page. | pageId, key, span, start, insertIndex | pageId | -- |
-| `theme.setRegionProperty` | Update a property on a grid region. | pageId, regionIndex, property, value | pageId, regionIndex, property, value | -- |
-| `theme.deleteRegion` | Remove a grid region by index. | pageId, regionIndex | pageId, regionIndex | -- |
-| `theme.reorderRegion` | Move a grid region one position up or down within its page. | pageId, regionIndex, direction | pageId, regionIndex, direction | -- |
-| `theme.renamePage` | Rename a theme page ID. | pageId, newId | pageId, newId | -- |
-| `theme.setRegionKey` | Change a grid region's key. | pageId, regionIndex, newKey | pageId, regionIndex, newKey | -- |
-| `theme.setPages` | Replace the entire pages array. | pages | pages | -- |
 | `theme.setBreakpoint` | Set or remove a named viewport breakpoint. | name, minWidth | name, minWidth | -- |
 | `theme.setStylesheets` | Replace the list of external stylesheet URLs. | urls | urls | -- |
 | `theme.setDocumentProperty` | Set a top-level theme document property. | property, value | property, value | -- |
@@ -170,6 +159,24 @@ The document is typed as `"object"` with `version` and `commands` as the two dat
 | `mapping.reorderInnerRule` | Move a nested inner rule one position up or down. | ruleIndex, innerIndex, direction | ruleIndex, innerIndex, direction | -- |
 | `mapping.preview` | Execute mapping rules against sample data and return the transformed output. Does not mutate state. | sampleData, direction, ruleIndices | sampleData | `output`, `diagnostics`, `appliedRules`, `direction` |
 
+### pages (13 commands)
+
+| Command | Description | Parameters | Required Params | Returns |
+|---------|-------------|------------|-----------------|---------|
+| `pages.addPage` | Add a Page node to the component tree. Promotes pageMode to wizard if currently single or unset. | id, title, description | -- | -- |
+| `pages.deletePage` | Remove a Page node from the component tree by ID. | id | id | -- |
+| `pages.setMode` | Set the form presentation page mode. Ensures the component tree exists. | mode | mode | -- |
+| `pages.reorderPages` | Move a Page node one position up or down among its siblings. | id, direction | id, direction | -- |
+| `pages.movePageToIndex` | Move a Page node to an absolute index position, clamped to bounds. | id, targetIndex | id, targetIndex | -- |
+| `pages.setPageProperty` | Set an arbitrary property on a Page node. | id, property, value | id, property, value | -- |
+| `pages.assignItem` | Assign a bound item to a Page. Moves the node from its current location in the tree. | pageId, key, span | pageId, key | -- |
+| `pages.unassignItem` | Remove a bound item from a Page and move it back to the root level. | pageId, key | pageId, key | -- |
+| `pages.autoGenerate` | Auto-generate Page nodes from definition items using presentation.layout.page hints. Replaces all existing pages. | -- | -- | -- |
+| `pages.setPages` | Replace the entire set of Page nodes in the component tree. | pages | pages | -- |
+| `pages.reorderRegion` | Move a region (bound item) within a Page to a target index. | pageId, key, targetIndex | pageId, key, targetIndex | -- |
+| `pages.renamePage` | Rename a Page node's title. | id, newId | id, newId | -- |
+| `pages.setRegionProperty` | Set a property (span, start, or responsive) on a region within a Page. | pageId, key, property, value | pageId, key, property, value | -- |
+
 ### component-tree (7 commands)
 
 | Command | Description | Parameters | Required Params | Returns |
@@ -182,7 +189,7 @@ The document is typed as `"object"` with `version` and `commands` as the two dat
 | `component.wrapNode` | Wrap a node in a new container node. | node, wrapper | node, wrapper | `nodeRef`: Reference to the new wrapper node. |
 | `component.unwrapNode` | Replace a container node with its children (unwrap one level). | node | node | -- |
 
-### component-properties (18 commands)
+### component-properties (17 commands)
 
 | Command | Description | Parameters | Required Params | Returns |
 |---------|-------------|------------|-----------------|---------|
@@ -193,7 +200,6 @@ The document is typed as `"object"` with `version` and `commands` as the two dat
 | `component.spliceArrayProp` | Splice (insert/remove) items in an array-valued node property. | node, property, index, deleteCount, insert | node, property, index, deleteCount | -- |
 | `component.setFieldWidget` | Set which widget component renders a field. Convenience command that finds the node by field key. | fieldKey, widget | fieldKey, widget | -- |
 | `component.setResponsiveOverride` | Set or remove a responsive breakpoint override on a node. | node, breakpoint, patch | node, breakpoint, patch | -- |
-| `component.setWizardProperty` | Set a wizard-mode property on the component document. | property, value | property, value | -- |
 | `component.setGroupRepeatable` | Toggle a group's repeatable flag in the component tree. | groupKey, repeatable | groupKey, repeatable | -- |
 | `component.setGroupDisplayMode` | Set how a group renders (table, accordion, card, etc.). | groupKey, mode | groupKey, mode | -- |
 | `component.setGroupDataTable` | Configure data table rendering for a repeatable group. | groupKey, config | groupKey, config | -- |
@@ -241,7 +247,7 @@ The document is typed as `"object"` with `version` and `commands` as the two dat
 ### Per-command required payload parameters
 
 Commands where ALL parameters are optional (no required params):
-- `definition.addVariable`, `definition.addInstance`, `theme.addPage`, `mapping.addRule`, `mapping.autoGenerateRules`, `mapping.addInnerRule`, `project.import`
+- `definition.addVariable`, `definition.addInstance`, `pages.addPage`, `pages.autoGenerate`, `mapping.addRule`, `mapping.autoGenerateRules`, `mapping.addInnerRule`, `project.import`
 
 Commands with required params are listed in the Command Definitions tables above.
 
@@ -253,7 +259,7 @@ Handler area grouping for commands:
 "definition-items", "definition-binds", "definition-metadata", "definition-pages",
 "definition-shapes", "definition-variables", "definition-optionsets", "definition-instances",
 "definition-screener", "definition-migrations", "theme", "mapping",
-"component-tree", "component-properties", "project"
+"pages", "component-tree", "component-properties", "project"
 ```
 
 ### CommandEntry.sideEffects
@@ -298,29 +304,34 @@ Item type discriminant:
 "up", "down"
 ```
 
-### theme.reorderPage > direction
+### mapping.reorderRule > direction
 ```
 "up", "down"
 ```
 
-### theme.reorderRegion > direction
+### mapping.reorderInnerRule > direction
 ```
 "up", "down"
 ```
 
-### mapping.reorderRule > direction
+### mapping.preview > direction
 ```
-"up", "down"
+"forward", "reverse"
 ```
 
-### mapping.reorderInnerRule > direction
+### pages.setMode > mode
+```
+"single", "wizard", "tabs"
+```
+
+### pages.reorderPages > direction
 ```
 "up", "down"
 ```
 
-### mapping.preview > direction
+### pages.setRegionProperty > property
 ```
-"forward", "reverse"
+"span", "start", "responsive"
 ```
 
 ### component.reorderNode > direction
@@ -394,9 +405,10 @@ At least one must be provided; the `NodeRef` schema does not enforce this via `o
 | definition-instances | 4 |
 | definition-screener | 8 |
 | definition-migrations | 7 |
-| theme | 28 |
+| theme | 17 |
 | mapping | 16 |
+| pages | 13 |
 | component-tree | 7 |
-| component-properties | 18 |
+| component-properties | 17 |
 | project | 5 |
-| **Total** | **119** |
+| **Total** | **120** |

Cargo.toml

@@ -1,6 +1,7 @@
 [workspace]
 members = [
     "crates/fel-core",
+    "crates/formspec-changeset",
     "crates/formspec-core",
     "crates/formspec-eval",
     "crates/formspec-lint",

crates/fel-core/src/evaluator.rs

@@ -835,6 +835,10 @@ impl<'a> Evaluator<'a> {
             "min" => self.fn_min_max(args, true),
             "max" => self.fn_min_max(args, false),
             "countWhere" => self.fn_count_where(args),
+            "sumWhere" => self.fn_sum_where(args),
+            "avgWhere" => self.fn_avg_where(args),
+            "minWhere" => self.fn_min_where(args),
+            "maxWhere" => self.fn_max_where(args),
 
             // String
             "length" => self.fn_length(args),
@@ -924,6 +928,7 @@ impl<'a> Evaluator<'a> {
             }
             "moneyAdd" => self.fn_money_add(args),
             "moneySum" => self.fn_money_sum(args),
+            "moneySumWhere" => self.fn_money_sum_where(args),
 
             // MIP state queries
             "valid" => self.fn_mip(args, "valid"),
@@ -1068,6 +1073,135 @@ impl<'a> Evaluator<'a> {
         FelValue::Number(dec(count))
     }
 
+    /// Filter array elements by predicate (shared by *Where functions).
+    fn filter_where(&mut self, args: &[Expr], fn_name: &str) -> Option<Vec<FelValue>> {
+        if args.len() < 2 {
+            self.diag(format!("{fn_name}: requires 2 arguments"));
+            return None;
+        }
+        let arr_val = self.eval(&args[0]);
+        let arr = self.get_array(&arr_val, fn_name)?;
+        let mut matched = Vec::new();
+        for elem in &arr {
+            self.let_scopes
+                .push(HashMap::from([("$".to_string(), elem.clone())]));
+            let pred = self.eval(&args[1]);
+            self.let_scopes.pop();
+            if pred.is_truthy() {
+                matched.push(elem.clone());
+            }
+        }
+        Some(matched)
+    }
+
+    fn fn_sum_where(&mut self, args: &[Expr]) -> FelValue {
+        let Some(matched) = self.filter_where(args, "sumWhere") else {
+            return FelValue::Null;
+        };
+        let nums: Vec<Decimal> = matched.iter().filter_map(|v| v.as_number()).collect();
+        FelValue::Number(nums.iter().copied().sum())
+    }
+
+    fn fn_avg_where(&mut self, args: &[Expr]) -> FelValue {
+        let Some(matched) = self.filter_where(args, "avgWhere") else {
+            return FelValue::Null;
+        };
+        let nums: Vec<Decimal> = matched.iter().filter_map(|v| v.as_number()).collect();
+        if nums.is_empty() {
+            return FelValue::Null;
+        }
+        FelValue::Number(nums.iter().copied().sum::<Decimal>() / Decimal::from(nums.len() as i64))
+    }
+
+    fn fn_min_where(&mut self, args: &[Expr]) -> FelValue {
+        let Some(matched) = self.filter_where(args, "minWhere") else {
+            return FelValue::Null;
+        };
+        let non_null: Vec<&FelValue> = matched.iter().filter(|v| !v.is_null()).collect();
+        if non_null.is_empty() {
+            return FelValue::Null;
+        }
+        let mut best = non_null[0].clone();
+        for elem in &non_null[1..] {
+            let cmp = match (&best, *elem) {
+                (FelValue::Number(a), FelValue::Number(b)) => Some(a.cmp(b)),
+                (FelValue::String(a), FelValue::String(b)) => Some(a.cmp(b)),
+                (FelValue::Date(a), FelValue::Date(b)) => Some(a.ordinal().cmp(&b.ordinal())),
+                _ => {
+                    self.diag("minWhere: mixed types".to_string());
+                    return FelValue::Null;
+                }
+            };
+            if let Some(ord) = cmp
+                && ord.is_gt()
+            {
+                best = (*elem).clone();
+            }
+        }
+        best
+    }
+
+    fn fn_max_where(&mut self, args: &[Expr]) -> FelValue {
+        let Some(matched) = self.filter_where(args, "maxWhere") else {
+            return FelValue::Null;
+        };
+        let non_null: Vec<&FelValue> = matched.iter().filter(|v| !v.is_null()).collect();
+        if non_null.is_empty() {
+            return FelValue::Null;
+        }
+        let mut best = non_null[0].clone();
+        for elem in &non_null[1..] {
+            let cmp = match (&best, *elem) {
+                (FelValue::Number(a), FelValue::Number(b)) => Some(a.cmp(b)),
+                (FelValue::String(a), FelValue::String(b)) => Some(a.cmp(b)),
+                (FelValue::Date(a), FelValue::Date(b)) => Some(a.ordinal().cmp(&b.ordinal())),
+                _ => {
+                    self.diag("maxWhere: mixed types".to_string());
+                    return FelValue::Null;
+                }
+            };
+            if let Some(ord) = cmp
+                && ord.is_lt()
+            {
+                best = (*elem).clone();
+            }
+        }
+        best
+    }
+
+    fn fn_money_sum_where(&mut self, args: &[Expr]) -> FelValue {
+        let Some(matched) = self.filter_where(args, "moneySumWhere") else {
+            return FelValue::Null;
+        };
+        let mut total: Option<FelMoney> = None;
+        for elem in &matched {
+            match elem {
+                FelValue::Money(m) => match &total {
+                    None => total = Some(m.clone()),
+                    Some(t) => {
+                        if t.currency != m.currency {
+                            self.diag("moneySumWhere: mixed currencies");
+                            return FelValue::Null;
+                        }
+                        total = Some(FelMoney {
+                            amount: t.amount + m.amount,
+                            currency: t.currency.clone(),
+                        });
+                    }
+                },
+                FelValue::Null => {}
+                _ => {
+                    self.diag("moneySumWhere: non-money element");
+                    return FelValue::Null;
+                }
+            }
+        }
+        match total {
+            Some(t) => FelValue::Money(t),
+            None => FelValue::Null,
+        }
+    }
+
     // ── String helpers ──────────────────────────────────────────
 
     fn fn_str1(&mut self, args: &[Expr], f: fn(&str) -> FelValue) -> FelValue {

crates/fel-core/src/extensions.rs

@@ -84,6 +84,36 @@ const BUILTIN_FUNCTIONS: &[BuiltinFunctionCatalogEntry] = &[
         signature: "countWhere(array<any>, predicate) -> number",
         description: "Counts elements whose predicate evaluates to true.",
     },
+    BuiltinFunctionCatalogEntry {
+        name: "sumWhere",
+        category: "aggregate",
+        signature: "sumWhere(array<number>, predicate) -> number",
+        description: "Sums numeric elements whose predicate evaluates to true.",
+    },
+    BuiltinFunctionCatalogEntry {
+        name: "avgWhere",
+        category: "aggregate",
+        signature: "avgWhere(array<number>, predicate) -> number",
+        description: "Returns the mean of numeric elements whose predicate evaluates to true.",
+    },
+    BuiltinFunctionCatalogEntry {
+        name: "minWhere",
+        category: "aggregate",
+        signature: "minWhere(array<any>, predicate) -> any",
+        description: "Returns the smallest element whose predicate evaluates to true.",
+    },
+    BuiltinFunctionCatalogEntry {
+        name: "maxWhere",
+        category: "aggregate",
+        signature: "maxWhere(array<any>, predicate) -> any",
+        description: "Returns the largest element whose predicate evaluates to true.",
+    },
+    BuiltinFunctionCatalogEntry {
+        name: "moneySumWhere",
+        category: "money",
+        signature: "moneySumWhere(array<money>, predicate) -> money",
+        description: "Sums money elements whose predicate evaluates to true.",
+    },
     BuiltinFunctionCatalogEntry {
         name: "length",
         category: "string",