Merge branch 'main' into claude/parser-trailing-comma-148

Author: hyperpolymath

.claude/CLAUDE.md

@@ -83,7 +83,7 @@ Both are FOSS with independent governance (no Big Tech).
 7. **No Kotlin/Swift for mobile** - Use Tauri 2.0+ or Dioxus.
 8. **MPL-1.0 / MPL-1.0-or-later are non-conforming** - Rewrite to MPL-2.0 in SPDX headers and LICENSE files when encountered (Hypatia's `validate_license` flags both).
 
-### TypeScript / JavaScript Exemptions (Approved)
+### TypeScript Exemptions (Approved)
 
 The "no new TypeScript" / "no new JavaScript" rules have approved exemptions in this repo. These paths are *not* policy violations — they are documented carve-outs because the file format or downstream consumer requires the source language. They are honoured by Hypatia's scanner via path-based exemption + the per-repo CLAUDE.md exemption tables.
 

lib/parser.mly

@@ -974,6 +974,18 @@ expr_record_body:
   (* spread-only: { ..var } or { ..expr } *)
   | sp = expr_record_spread
     { ([], Some sp) }
+  (* Rust-style record-update: spread first, then comma-separated fields:
+     `Record #{ ..base, field: x, other: y }`. Required by sustainabot
+     hand-port (gitbot-fleet#148) — `Model #{ ..model, totalProcessed: n }`
+     in Oikos.affine and `Router #{ ..router, routes: rs }` in Router.affine.
+     The leading spread captures the source-of-defaults; subsequent fields
+     override. Mirrors the existing trailing-spread form below (`{ f: v,
+     ..s }`) but in the opposite order. LR(1)-safe: after parsing
+     `expr_record_spread`, the lookahead is either RBRACE (existing
+     spread-only rule already reduces) or COMMA (this rule shifts);
+     the choice is unambiguous on one-token lookahead. Added 2026-05-26. *)
+  | sp = expr_record_spread COMMA field = record_field rest = expr_record_rest
+    { (field :: fst rest, Some sp) }
   (* field possibly followed by more: { f: v, ... } *)
   | field = record_field rest = expr_record_rest
     { (field :: fst rest, snd rest) }