@almadar/std 16.204.0 → 16.206.0

package/behaviors/lolo/ml/organisms/std-escalating-decision.lolo

@@ -264,9 +264,9 @@ orbital EscalatingDecisionOrbital {
     listens {
       FROM_EXACT { key : scalar! }
       FROM_LOOKUP { entry : scalar! }
-      FROM_SIMILARITY { index : int!  score : float! }
-      FROM_INFER { output : [float]!  confidence : float! }
-      FROM_CLASSIFY { category : string!  confidence : float!  reasoning : string! }
+      FROM_SIMILARITY { index : int!  score : number! }
+      FROM_INFER { output : [float]!  confidence : number! }
+      FROM_CLASSIFY { category : string!  confidence : number!  reasoning : string! }
       FROM_CLASSIFY_FAILURE { error : string! }
 
       ExactRung.EXACT_MATCHED -> FROM_EXACT

package/behaviors/lolo/ui/core/atoms/std-modal-editor.lolo

@@ -1,5 +1,5 @@
 app std-modal-editor "0.1.0"
-"UI substrate: modal keyboard editing over any editable CodeBlock. The topology is fixed (NORMAL / INSERT / VISUAL / OPERATOR_PENDING / COMMAND) and every binding is config: mode-entry keys, motions, operators, ex-commands, the digit table that accumulates a repeat count, and the per-mode captured-key table the host's keyboard router reads. Vim ships as the default flavor; a Kakoune/Helix binding is the same topology with different config, never a fork. Emits are the mechanical vocabulary an editable CodeBlock listens to (SET_MODE / MOTION / OPERATE / INSERT_TEXT) plus one neutral EX_COMMAND for a buffered ':' line — std names no host command; a realization maps EX_COMMAND.name onto its own host vocabulary."
+"UI substrate: modal keyboard editing over any editable CodeBlock. The topology is fixed (NORMAL / INSERT / VISUAL / OPERATOR_PENDING / COMMAND) and every binding is config: mode-entry keys, motions, operators, ex-commands, the digit table that accumulates a repeat count, and the per-mode captured-key table the host's keyboard router reads. Vim ships as the default flavor; a Kakoune/Helix binding is the same topology with different config, never a fork. Emits are the mechanical vocabulary an editable CodeBlock listens to (SET_MODE / MOTION / OPERATE / INSERT_TEXT) plus one neutral EX_COMMAND for a buffered ':' line — std names no host command; a realization maps EX_COMMAND.name onto its own host vocabulary. A bare EDITOR_FOCUS listen lets every state re-announce its SET_MODE (block caret in NORMAL/VISUAL/OPERATOR_PENDING/COMMAND, bar in INSERT) when the host focuses a different editor surface."
 orbital ModalEditorOrbital {
   entity EditorMode [runtime] {
     id : string!
@@ -8,6 +8,9 @@ orbital ModalEditorOrbital {
     operator : string = ""
     operatorKey : string = ""
     cmdline : string = ""
+    lastOperator : string = ""
+    lastMotion : string = ""
+    lastCount : number = 0
   }
 
   trait Modes -> @rebindable EditorMode [lifecycle, instance] {
@@ -32,7 +35,29 @@ orbital ModalEditorOrbital {
         (set @entity.editorId ?editorId)
         (set @entity.count 0)
         (emit MOTION { editorId: ?editorId, motion: "line-end", count: 1 })
+        (emit MOTION { editorId: ?editorId, motion: "right", count: 1 })
+        (emit INSERT_TEXT { editorId: ?editorId, text: "\n" })
+        (emit SET_MODE { editorId: ?editorId, mode: "INSERT", caret: "bar" })
+
+      KEY -> INSERT when ["=", ?key, @config.openLineAboveKey]
+        (set @entity.editorId ?editorId)
+        (set @entity.count 0)
+        (emit MOTION { editorId: ?editorId, motion: "line-start", count: 1 })
         (emit INSERT_TEXT { editorId: ?editorId, text: "\n" })
+        (emit MOTION { editorId: ?editorId, motion: "up", count: 1 })
+        (emit SET_MODE { editorId: ?editorId, mode: "INSERT", caret: "bar" })
+
+      KEY -> INSERT when ["=", ?key, @config.appendLineKey]
+        (set @entity.editorId ?editorId)
+        (set @entity.count 0)
+        (emit MOTION { editorId: ?editorId, motion: "line-end", count: 1 })
+        (emit MOTION { editorId: ?editorId, motion: "right", count: 1 })
+        (emit SET_MODE { editorId: ?editorId, mode: "INSERT", caret: "bar" })
+
+      KEY -> INSERT when ["=", ?key, @config.insertLineKey]
+        (set @entity.editorId ?editorId)
+        (set @entity.count 0)
+        (emit MOTION { editorId: ?editorId, motion: "first-nonblank", count: 1 })
         (emit SET_MODE { editorId: ?editorId, mode: "INSERT", caret: "bar" })
 
       KEY -> VISUAL when ["=", ?key, @config.visualKey]
@@ -49,6 +74,60 @@ orbital ModalEditorOrbital {
         (set @entity.operator (object/get @config.operators ?key))
         (set @entity.operatorKey ?key)
 
+      KEY -> OPERATOR_PENDING when ["=", ?key, @config.gotoPrefixKey]
+        (set @entity.editorId ?editorId)
+        (set @entity.operator "goto")
+        (set @entity.operatorKey ?key)
+
+      KEY -> OPERATOR_PENDING when (and ["=", ?key, @config.replaceKey] (not ?ctrl))
+        (set @entity.editorId ?editorId)
+        (set @entity.operator "replace")
+        (set @entity.operatorKey ?key)
+
+      KEY -> NORMAL when (and ["=", ?key, @config.redoKey] ?ctrl)
+        (set @entity.editorId ?editorId)
+        (emit OPERATE { editorId: ?editorId, operator: "redo", motion: "right", count: (if [">", @entity.count, 0] @entity.count 1) })
+        (set @entity.count 0)
+
+      KEY -> NORMAL when ["=", ?key, @config.undoKey]
+        (set @entity.editorId ?editorId)
+        (emit OPERATE { editorId: ?editorId, operator: "undo", motion: "right", count: (if [">", @entity.count, 0] @entity.count 1) })
+        (set @entity.count 0)
+
+      KEY -> NORMAL when ["=", ?key, @config.deleteCharKey]
+        (set @entity.editorId ?editorId)
+        (emit OPERATE { editorId: ?editorId, operator: "delete", motion: "right", count: (if [">", @entity.count, 0] @entity.count 1) })
+        (set @entity.count 0)
+
+      KEY -> NORMAL when ["=", ?key, @config.deleteCharBackKey]
+        (set @entity.editorId ?editorId)
+        (emit OPERATE { editorId: ?editorId, operator: "delete", motion: "left", count: (if [">", @entity.count, 0] @entity.count 1) })
+        (set @entity.count 0)
+
+      KEY -> NORMAL when ["=", ?key, @config.putKey]
+        (set @entity.editorId ?editorId)
+        (emit OPERATE { editorId: ?editorId, operator: "put", motion: "right", count: (if [">", @entity.count, 0] @entity.count 1) })
+        (set @entity.count 0)
+
+      KEY -> NORMAL when ["=", ?key, @config.putBeforeKey]
+        (set @entity.editorId ?editorId)
+        (emit OPERATE { editorId: ?editorId, operator: "put-before", motion: "right", count: (if [">", @entity.count, 0] @entity.count 1) })
+        (set @entity.count 0)
+
+      KEY -> NORMAL when ["=", ?key, @config.toggleCaseKey]
+        (set @entity.editorId ?editorId)
+        (emit OPERATE { editorId: ?editorId, operator: "toggle-case", motion: "right", count: (if [">", @entity.count, 0] @entity.count 1) })
+        (set @entity.count 0)
+
+      KEY -> NORMAL when ["=", ?key, @config.joinKey]
+        (set @entity.editorId ?editorId)
+        (emit OPERATE { editorId: ?editorId, operator: "join", motion: "line", count: (if [">", @entity.count, 1] @entity.count 2) })
+        (set @entity.count 0)
+
+      KEY -> NORMAL when (and ["=", ?key, @config.repeatKey] ["!=", @entity.lastOperator, ""])
+        (emit OPERATE { editorId: ?editorId, operator: @entity.lastOperator, motion: @entity.lastMotion, count: @entity.lastCount })
+        (set @entity.count 0)
+
       KEY -> NORMAL when (and (object/has @config.digits ?key) (or ["!=", ?key, "0"] [">", @entity.count, 0]))
         (set @entity.count (+ (* @entity.count 10) (object/get @config.digits ?key)))
 
@@ -61,11 +140,20 @@ orbital ModalEditorOrbital {
         (set @entity.count 0)
         (set @entity.operator "")
         (set @entity.operatorKey "")
+
+      EDITOR_FOCUS -> NORMAL
+        (set @entity.editorId ?editorId)
+        (emit SET_MODE { editorId: ?editorId, mode: "NORMAL", caret: "block" })
     }
 
     state INSERT {
       KEY -> NORMAL when ["=", ?key, "Escape"]
+        (emit MOTION { editorId: ?editorId, motion: "left", count: 1 })
         (emit SET_MODE { editorId: ?editorId, mode: "NORMAL", caret: "block" })
+
+      EDITOR_FOCUS -> INSERT
+        (set @entity.editorId ?editorId)
+        (emit SET_MODE { editorId: ?editorId, mode: "INSERT", caret: "bar" })
     }
 
     state VISUAL {
@@ -73,25 +161,102 @@ orbital ModalEditorOrbital {
         (set @entity.count 0)
         (emit SET_MODE { editorId: ?editorId, mode: "NORMAL", caret: "block" })
 
-      KEY -> NORMAL when (object/has @config.operators ?key)
+      KEY -> INSERT when (and (object/has @config.operators ?key) ["=", (object/get @config.operators ?key), "change"])
+        (set @entity.count 0)
+        (emit OPERATE { editorId: ?editorId, operator: (object/get @config.operators ?key), motion: "selection", count: 1 })
+        (set @entity.lastOperator (object/get @config.operators ?key))
+        (set @entity.lastMotion "selection")
+        (set @entity.lastCount 1)
+        (emit SET_MODE { editorId: ?editorId, mode: "INSERT", caret: "bar" })
+
+      KEY -> NORMAL when (and (object/has @config.operators ?key) ["!=", (object/get @config.operators ?key), "change"])
         (set @entity.count 0)
         (emit OPERATE { editorId: ?editorId, operator: (object/get @config.operators ?key), motion: "selection", count: 1 })
+        (set @entity.lastOperator (object/get @config.operators ?key))
+        (set @entity.lastMotion "selection")
+        (set @entity.lastCount 1)
+        (emit SET_MODE { editorId: ?editorId, mode: "NORMAL", caret: "block" })
+
+      KEY -> NORMAL when ["=", ?key, @config.toggleCaseKey]
+        (set @entity.count 0)
+        (emit OPERATE { editorId: ?editorId, operator: "toggle-case", motion: "selection", count: 1 })
+        (set @entity.lastOperator "toggle-case")
+        (set @entity.lastMotion "selection")
+        (set @entity.lastCount 1)
+        (emit SET_MODE { editorId: ?editorId, mode: "NORMAL", caret: "block" })
+
+      KEY -> NORMAL when ["=", ?key, @config.joinKey]
+        (set @entity.count 0)
+        (emit OPERATE { editorId: ?editorId, operator: "join", motion: "selection", count: 1 })
+        (set @entity.lastOperator "join")
+        (set @entity.lastMotion "selection")
+        (set @entity.lastCount 1)
         (emit SET_MODE { editorId: ?editorId, mode: "NORMAL", caret: "block" })
 
       KEY -> VISUAL when (object/has @config.motions ?key)
         (emit MOTION { editorId: ?editorId, motion: (object/get @config.motions ?key), count: (if [">", @entity.count, 0] @entity.count 1) })
         (set @entity.count 0)
+
+      EDITOR_FOCUS -> VISUAL
+        (set @entity.editorId ?editorId)
+        (emit SET_MODE { editorId: ?editorId, mode: "VISUAL", caret: "block" })
     }
 
     state OPERATOR_PENDING {
-      KEY -> NORMAL when ["=", ?key, @entity.operatorKey]
+      KEY -> NORMAL when (and ["=", ?key, @entity.operatorKey] ["=", @entity.operator, "goto"])
+        (emit MOTION { editorId: ?editorId, motion: "doc-start", count: 1 })
+        (set @entity.operator "")
+        (set @entity.operatorKey "")
+        (set @entity.count 0)
+
+      KEY -> INSERT when (and ["=", ?key, @entity.operatorKey] ["=", @entity.operator, "change"])
         (emit OPERATE { editorId: ?editorId, operator: @entity.operator, motion: "line", count: (if [">", @entity.count, 0] @entity.count 1) })
+        (set @entity.lastOperator @entity.operator)
+        (set @entity.lastMotion "line")
+        (set @entity.lastCount (if [">", @entity.count, 0] @entity.count 1))
         (set @entity.operator "")
         (set @entity.operatorKey "")
         (set @entity.count 0)
+        (emit SET_MODE { editorId: ?editorId, mode: "INSERT", caret: "bar" })
 
-      KEY -> NORMAL when (object/has @config.motions ?key)
+      KEY -> NORMAL when (and ["=", ?key, @entity.operatorKey] ["!=", @entity.operator, "change"] ["!=", @entity.operator, "goto"] ["!=", @entity.operator, "replace"])
+        (emit OPERATE { editorId: ?editorId, operator: @entity.operator, motion: "line", count: (if [">", @entity.count, 0] @entity.count 1) })
+        (set @entity.lastOperator @entity.operator)
+        (set @entity.lastMotion "line")
+        (set @entity.lastCount (if [">", @entity.count, 0] @entity.count 1))
+        (set @entity.operator "")
+        (set @entity.operatorKey "")
+        (set @entity.count 0)
+
+      KEY -> INSERT when (and (object/has @config.motions ?key) ["=", @entity.operator, "change"])
+        (emit OPERATE { editorId: ?editorId, operator: @entity.operator, motion: (object/get @config.motions ?key), count: (if [">", @entity.count, 0] @entity.count 1) })
+        (set @entity.lastOperator @entity.operator)
+        (set @entity.lastMotion (object/get @config.motions ?key))
+        (set @entity.lastCount (if [">", @entity.count, 0] @entity.count 1))
+        (set @entity.operator "")
+        (set @entity.operatorKey "")
+        (set @entity.count 0)
+        (emit SET_MODE { editorId: ?editorId, mode: "INSERT", caret: "bar" })
+
+      KEY -> NORMAL when (and (object/has @config.motions ?key) ["!=", @entity.operator, "change"] ["!=", @entity.operator, "goto"] ["!=", @entity.operator, "replace"])
         (emit OPERATE { editorId: ?editorId, operator: @entity.operator, motion: (object/get @config.motions ?key), count: (if [">", @entity.count, 0] @entity.count 1) })
+        (set @entity.lastOperator @entity.operator)
+        (set @entity.lastMotion (object/get @config.motions ?key))
+        (set @entity.lastCount (if [">", @entity.count, 0] @entity.count 1))
+        (set @entity.operator "")
+        (set @entity.operatorKey "")
+        (set @entity.count 0)
+
+      KEY -> OPERATOR_PENDING when (and (object/has @config.digits ?key) (or ["!=", ?key, "0"] [">", @entity.count, 0]) ["!=", @entity.operator, "goto"] ["!=", @entity.operator, "replace"])
+        (set @entity.count (+ (* @entity.count 10) (object/get @config.digits ?key)))
+
+      KEY -> NORMAL when (and ["=", @entity.operator, "replace"] ["!=", ?key, "Escape"])
+        (emit OPERATE { editorId: ?editorId, operator: "delete", motion: "right", count: 1 })
+        (emit INSERT_TEXT { editorId: ?editorId, text: ?key })
+        (emit MOTION { editorId: ?editorId, motion: "left", count: 1 })
+        (set @entity.lastOperator "delete")
+        (set @entity.lastMotion "right")
+        (set @entity.lastCount 1)
         (set @entity.operator "")
         (set @entity.operatorKey "")
         (set @entity.count 0)
@@ -100,6 +265,15 @@ orbital ModalEditorOrbital {
         (set @entity.operator "")
         (set @entity.operatorKey "")
         (set @entity.count 0)
+
+      KEY -> NORMAL when (and ["=", @entity.operator, "goto"] ["!=", ?key, "Escape"] ["!=", ?key, @entity.operatorKey])
+        (set @entity.operator "")
+        (set @entity.operatorKey "")
+        (set @entity.count 0)
+
+      EDITOR_FOCUS -> OPERATOR_PENDING
+        (set @entity.editorId ?editorId)
+        (emit SET_MODE { editorId: ?editorId, mode: "OPERATOR_PENDING", caret: "block" })
     }
 
     state COMMAND {
@@ -121,6 +295,10 @@ orbital ModalEditorOrbital {
 
       KEY -> COMMAND when (and ["!=", ?key, "Enter"] ["!=", ?key, "Escape"] ["!=", ?key, "Backspace"])
         (set @entity.cmdline (str/concat @entity.cmdline ?key))
+
+      EDITOR_FOCUS -> COMMAND
+        (set @entity.editorId ?editorId)
+        (emit SET_MODE { editorId: ?editorId, mode: "COMMAND", caret: "block" })
     }
 
     listens {
@@ -135,6 +313,10 @@ orbital ModalEditorOrbital {
         repeat : boolean
       }
         @description "One physical keydown, delivered by the host's keyboard router. The host decides preventDefault from config.keymap; this trait only reads key + editorId."
+      EDITOR_FOCUS {
+        editorId : string
+      }
+        @description "The host focused a different editor surface. Every state re-emits its own SET_MODE so the newly focused editor's mode indicator and caret style start correct."
     }
 
     emits {
@@ -158,13 +340,13 @@ orbital ModalEditorOrbital {
         motion : string
         count : number
       }
-        @description "Apply a config-declared operator (delete | yank | change) over the range a motion describes; `line` for doubled operators, `selection` in VISUAL."
+        @description "Apply a config-declared operator (delete | yank | change | put | put-before | undo | redo | join | toggle-case | indent | dedent | replace) over the range a motion describes; `line` for doubled operators, `selection` in VISUAL, and a fixed `right` placeholder for the point operators (put | put-before | undo | redo) which the editor ignores."
         @tier "primary"
       INSERT_TEXT -> external {
         editorId : string
         text : string
       }
-        @description "Insert literal text at the caret (e.g. the newline `o` opens before entering INSERT)."
+        @description "Insert literal text at the caret (e.g. the newline `o`/`O` insert before entering INSERT, or the replacement char `r` inserts)."
         @tier "secondary"
       EX_COMMAND -> external {
         editorId : string
@@ -187,9 +369,24 @@ orbital ModalEditorOrbital {
         @tier "presentation"
       openLineKey : string = "o"
         @label "Open a line below and insert"
-        @description "Key that moves to line end, inserts a newline, then switches to INSERT."
+        @description "Key that moves to line end (past the last char), inserts a newline, then switches to INSERT — vim's `o`."
         @synonyms "open line, new line below"
         @tier "presentation"
+      openLineAboveKey : string = "O"
+        @label "Open a line above and insert"
+        @description "Key that moves to line start, inserts a newline, then moves up and switches to INSERT — vim's `O`."
+        @synonyms "open line above, new line above"
+        @tier "presentation"
+      appendLineKey : string = "A"
+        @label "Enter INSERT at end of line"
+        @description "Key that moves to line end and past it, then switches to INSERT — vim's `A`."
+        @synonyms "append at end of line"
+        @tier "presentation"
+      insertLineKey : string = "I"
+        @label "Enter INSERT at first non-blank"
+        @description "Key that moves to the line's first non-blank column, then switches to INSERT — vim's `I`."
+        @synonyms "insert at line start"
+        @tier "presentation"
       visualKey : string = "v"
         @label "Enter VISUAL"
         @description "Key that switches NORMAL to VISUAL; motions then extend the selection and an operator acts on it."
@@ -200,26 +397,81 @@ orbital ModalEditorOrbital {
         @description "Key that switches NORMAL to COMMAND and starts buffering an ex-command line."
         @synonyms "ex mode, command line, colon"
         @tier "presentation"
-      operators : Map string string = { d: "delete", y: "yank", c: "change" }
+      deleteCharKey : string = "x"
+        @label "Delete char under caret"
+        @description "Key that deletes the character(s) to the right of the caret, count times."
+        @synonyms "delete char, x"
+        @tier "presentation"
+      deleteCharBackKey : string = "X"
+        @label "Delete char before caret"
+        @description "Key that deletes the character(s) to the left of the caret, count times."
+        @synonyms "delete char back"
+        @tier "presentation"
+      putKey : string = "p"
+        @label "Put after caret"
+        @description "Key that pastes the last yank/delete after the caret. `motion` on OPERATE is a fixed `right` placeholder — this is a point operator and the editor ignores it."
+        @synonyms "paste, put"
+        @tier "presentation"
+      putBeforeKey : string = "P"
+        @label "Put before caret"
+        @description "Key that pastes the last yank/delete before the caret. `motion` on OPERATE is a fixed `right` placeholder — this is a point operator and the editor ignores it."
+        @synonyms "paste before, put before"
+        @tier "presentation"
+      undoKey : string = "u"
+        @label "Undo"
+        @description "Key that undoes the last change. `motion` on OPERATE is a fixed `right` placeholder — this is a point operator and the editor ignores it."
+        @synonyms "undo"
+        @tier "presentation"
+      redoKey : string = "r"
+        @label "Redo (with Ctrl)"
+        @description "Held with Ctrl, redoes the last undone change. `motion` on OPERATE is a fixed `right` placeholder — this is a point operator and the editor ignores it. Shares its default key with replaceKey; the ctrl modifier disambiguates."
+        @synonyms "redo, ctrl-r"
+        @tier "presentation"
+      replaceKey : string = "r"
+        @label "Replace char"
+        @description "Without Ctrl, arms a one-key replace: the next non-Escape key overwrites the character under the caret. Shares its default key with redoKey; the ctrl modifier disambiguates."
+        @synonyms "replace char"
+        @tier "presentation"
+      toggleCaseKey : string = "~"
+        @label "Toggle case"
+        @description "Key that flips the case of the character under the caret, count times."
+        @synonyms "toggle case, tilde"
+        @tier "presentation"
+      joinKey : string = "J"
+        @label "Join lines"
+        @description "Key that joins the current line with the line(s) below; a count above 1 joins that many lines."
+        @synonyms "join lines"
+        @tier "presentation"
+      repeatKey : string = "."
+        @label "Repeat last change"
+        @description "Key that re-applies the last OPERATE (operator, motion, count) recorded from OPERATOR_PENDING or VISUAL. No-op until a change has been recorded."
+        @synonyms "repeat, dot repeat"
+        @tier "presentation"
+      gotoPrefixKey : string = "g"
+        @label "Goto prefix"
+        @description "Arms OPERATOR_PENDING with the `goto` pseudo-operator; pressed again (`gg`) moves to the document start. Any other key cancels back to NORMAL."
+        @synonyms "goto, gg, doc start"
+        @tier "presentation"
+      operators : Map string string = { d: "delete", y: "yank", c: "change", ">": "indent", "<": "dedent" }
         @label "Operator keys"
         @description "Keys that arm OPERATOR_PENDING, mapped to the operator name carried on OPERATE. Pressing the same key again operates on the whole line."
-        @synonyms "operators, delete, yank, change"
+        @synonyms "operators, delete, yank, change, indent, dedent"
         @tier "domain"
-      motions : Map string string = { h: "left", j: "down", k: "up", l: "right", w: "word-forward", b: "word-back", e: "word-end", "0": "line-start", "$": "line-end", "^": "first-nonblank", G: "doc-end", "{": "paragraph-back", "}": "paragraph-forward" }
+      motions : Map string string = { h: "left", j: "down", k: "up", l: "right", w: "word-forward", b: "word-back", e: "word-end", "0": "line-start", "$": "line-end", "^": "first-nonblank", G: "doc-end", "{": "paragraph-back", "}": "paragraph-forward", "%": "match-bracket" }
         @label "Motion keys"
         @description "Keys recognized in NORMAL, VISUAL and OPERATOR_PENDING, mapped to the closed motion vocabulary the editor surface understands."
         @synonyms "motions, movement, hjkl, word motion"
         @tier "domain"
       digits : Map string number = { "0": 0, "1": 1, "2": 2, "3": 3, "4": 4, "5": 5, "6": 6, "7": 7, "8": 8, "9": 9 }
         @label "Count digits"
-        @description "Digit keys accumulated into a repeat count before a motion or operator fires; each digit's integer value is a lookup because the language has no string-to-int operator."
+        @description "Digit keys accumulated into a repeat count before a motion or operator fires (also inside OPERATOR_PENDING, e.g. `d3w`); each digit's integer value is a lookup because the language has no string-to-int operator."
         @tier "internal"
-      exCommands : Map string string = { w: "save", q: "close-tab", wq: "save-close-tab" }
+      exCommands : Map string string = { w: "save", q: "close-tab", wq: "save-close-tab", "q!": "close-tab-discard", x: "save-close-tab" }
         @label "Ex-commands"
         @description "Buffered COMMAND-mode lines (typed after ':') mapped to a neutral command name carried on EX_COMMAND."
         @synonyms "ex commands, colon commands"
         @tier "domain"
-      keymap : Map string [string] = { NORMAL: ["i", "a", "o", "v", ":", "d", "y", "c", "h", "j", "k", "l", "w", "b", "e", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "$", "^", "G", "{", "}", "Escape"], INSERT: ["Escape"], VISUAL: ["Escape", "d", "y", "c", "h", "j", "k", "l", "w", "b", "e", "0", "$", "^", "G", "{", "}"], OPERATOR_PENDING: ["Escape", "d", "y", "c", "h", "j", "k", "l", "w", "b", "e", "0", "$", "^", "G", "{", "}"], COMMAND: ["Escape", "Enter", "Backspace", "w", "q"] }
+      keymap : Map string [string] = { NORMAL: ["i", "a", "o", "O", "A", "I", "v", ":", "d", "y", "c", "h", "j", "k", "l", "w", "b", "e", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "$", "^", "G", "{", "}", "%", ">", "<", "x", "X", "p", "P", "u", "r", "~", "J", ".", "g", "Escape"], INSERT: ["Escape"], VISUAL: ["Escape", "d", "y", "c", "h", "j", "k", "l", "w", "b", "e", "0", "$", "^", "G", "{", "}", "%", "~", ">", "<", "J"], OPERATOR_PENDING: ["Escape", "d", "y", "c", "h", "j", "k", "l", "w", "b", "e", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "$", "^", "G", "{", "}", "%", ">", "<", "g"], COMMAND: ["Escape", "Enter", "Backspace", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "!", "%", " "] }
         @label "Captured keys per mode"
         @description "The declared key set the host's keyboard router reads synchronously to decide preventDefault, keyed by this trait's current state name. A key not listed reaches the underlying textarea untouched. Keep in sync with the other knobs."
         @tier "internal"

package/behaviors/lolo/ui/core/molecules/ui-code-block.lolo

@@ -339,13 +339,13 @@ orbital CodeBlockOrbital {
     listens {
       MOTION {
         editorId : string!
-        motion : "left" | "right" | "up" | "down" | "word-forward" | "word-back" | "word-end" | "line-start" | "line-end" | "first-nonblank" | "doc-start" | "doc-end" | "paragraph-forward" | "paragraph-back" | "line" | "selection"!
+        motion : "left" | "right" | "up" | "down" | "word-forward" | "word-back" | "word-end" | "line-start" | "line-end" | "first-nonblank" | "doc-start" | "doc-end" | "paragraph-forward" | "paragraph-back" | "line" | "selection" | "match-bracket"!
         count : number!
       }
       OPERATE {
         editorId : string!
-        operator : "delete" | "yank" | "change"!
-        motion : "left" | "right" | "up" | "down" | "word-forward" | "word-back" | "word-end" | "line-start" | "line-end" | "first-nonblank" | "doc-start" | "doc-end" | "paragraph-forward" | "paragraph-back" | "line" | "selection"!
+        operator : "delete" | "yank" | "change" | "put" | "put-before" | "undo" | "redo" | "join" | "toggle-case" | "indent" | "dedent" | "replace"!
+        motion : "left" | "right" | "up" | "down" | "word-forward" | "word-back" | "word-end" | "line-start" | "line-end" | "first-nonblank" | "doc-start" | "doc-end" | "paragraph-forward" | "paragraph-back" | "line" | "selection" | "match-bracket"!
         count : number!
       }
       INSERT_TEXT {
@@ -481,11 +481,11 @@ orbital CodeBlockOrbital {
         @label "On Set Mode"
         @description "Declarative bus listen: switch editor mode and caret style."
         @tier "presentation"
-      motions : ["left" | "right" | "up" | "down" | "word-forward" | "word-back" | "word-end" | "line-start" | "line-end" | "first-nonblank" | "doc-start" | "doc-end" | "paragraph-forward" | "paragraph-back" | "line" | "selection"] = ["left", "right", "up", "down", "word-forward", "word-back", "word-end", "line-start", "line-end", "first-nonblank", "doc-start", "doc-end", "paragraph-forward", "paragraph-back", "line", "selection"]
+      motions : ["left" | "right" | "up" | "down" | "word-forward" | "word-back" | "word-end" | "line-start" | "line-end" | "first-nonblank" | "doc-start" | "doc-end" | "paragraph-forward" | "paragraph-back" | "line" | "selection" | "match-bracket"] = ["left", "right", "up", "down", "word-forward", "word-back", "word-end", "line-start", "line-end", "first-nonblank", "doc-start", "doc-end", "paragraph-forward", "paragraph-back", "line", "selection", "match-bracket"]
         @label "Motions"
         @description "Motion vocabulary this editor accepts. Default: the full `EditorMotion` set."
         @tier "presentation"
-      operators : ["delete" | "yank" | "change"] = ["delete", "yank", "change"]
+      operators : ["delete" | "yank" | "change" | "put" | "put-before" | "undo" | "redo" | "join" | "toggle-case" | "indent" | "dedent" | "replace"] = ["delete", "yank", "change", "put", "put-before", "undo", "redo", "join", "toggle-case", "indent", "dedent", "replace"]
         @label "Operators"
         @description "Operator vocabulary this editor accepts. Default: the full `EditorOperator` set."
         @tier "presentation"

package/behaviors/lolo/ui/core/molecules/ui-floating-toolbar.lolo

@@ -36,7 +36,7 @@ orbital FloatingToolbarOrbital {
         @label "Items"
         @description "Tool items rendered as icon buttons"
         @tier "presentation"
-      position : "bottom-center" | "bottom-left" | "bottom-right" = "bottom-center"
+      position : "bottom-center" | "bottom-left" | "bottom-right" | "top-center" | "top-left" | "top-right" = "bottom-center"
         @label "Position"
         @description "Strip position within the app frame."
         @tier "presentation"

package/behaviors/lolo/ui/core/molecules/ui-menu.lolo

@@ -7,6 +7,7 @@ orbital MenuOrbital {
     icon : icon
     badge : string
     disabled : boolean
+    title : string
     event : event
     url : string
     variant : "default" | "danger"
@@ -38,7 +39,7 @@ orbital MenuOrbital {
         @label "Trigger"
         @description "Menu trigger element"
         @tier "presentation"
-      items : [MenuItemsItem] = [{ id: "Id", label: "Label", icon: "circle", badge: "Badge", disabled: false, url: "Url", variant: default, subMenu: [] }, { id: "Id 2", label: "Label 2", icon: "circle", badge: "Badge 2", disabled: true, url: "Url 2", variant: danger, subMenu: [] }]
+      items : [MenuItemsItem] = [{ id: "Id", label: "Label", icon: "circle", badge: "Badge", disabled: false, title: "Title", url: "Url", variant: default, subMenu: [] }, { id: "Id 2", label: "Label 2", icon: "circle", badge: "Badge 2", disabled: true, title: "Title 2", url: "Url 2", variant: danger, subMenu: [] }]
         @label "Items"
         @description "Menu items"
         @tier "presentation"

package/behaviors/lolo/ui/game/atoms/std-area-fill.lolo

@@ -1,5 +1,5 @@
 app std-area-fill "1.0.0"
-"Headless area-fill mechanic: the player paints area under a curve by moving through a fill region. Listens BODY_MOVED and, per fill, accumulates height(x) × |dx| while the player is inside the fill's x-range (the per-tick step is clamped to 0.5 world units — the physical per-tick maximum — so teleports and respawns paint nothing) — height is linear interpolation of the config curve samples above the fill's baseline (the platformer body's leftSamp/rightSamp idiom). rateMode picks the rate: \"area\" (height × |dx|, default — fills fastest where the curve is tallest), \"speed\" (|dx| only, flat rate), or \"ride\" (|dx| only while the move reports skating — walking the same distance paints nothing). When a fill's filled reaches its target it flips reported and emits AREA_FILLED once (the shared entity carries the rest); each fill also stamps a frontier (x0 + span × min(1, filled/target)) so boards can shade the painted region left-to-right as the gauge grows. RESTART resets every fill. Renders nothing; boards shade the painted region and read filled/frontier from the shared entity (the render authority)."
+"Headless area-fill mechanic: the player paints area under a curve by moving through a fill region. Listens BODY_MOVED and, per fill, accumulates height(x) × |dx| while the player is inside the fill's x-range (the per-tick step is clamped to 0.5 world units — the physical per-tick maximum — so teleports and respawns paint nothing) — height is linear interpolation of the config curve samples above the fill's baseline (the platformer body's leftSamp/rightSamp idiom). rateMode picks the rate: \"area\" (height × |dx|, default — fills fastest where the curve is tallest), \"speed\" (|dx| only, flat rate), or \"ride\" (|dx| only while the move reports skating — walking the same distance paints nothing). When a fill's filled reaches its target it flips reported and emits AREA_FILLED once (the shared entity carries the rest); each fill also stamps a frontier (x0 + span × min(1, filled/target)) so boards can shade the painted region left-to-right as the gauge grows. RESTART resets every live fill (re-arming the live entity set, so SET_FILLS-injected fills survive respawns). SET_FILLS replaces the fill set at runtime for boards that import their fills. Renders nothing; boards shade the painted region and read filled/frontier from the shared entity (the render authority)."
 orbital AreaFillOrbital {
   type AreaFillSample = {
     x : number!
@@ -57,8 +57,12 @@ orbital AreaFillOrbital {
             (emit AREA_FILLED { id: (object/get (array/first @newly) id), x: @payload.x, y: @payload.y }))
           null))
 
+      SET_FILLS -> active
+        (set @entity.fills (array/map @payload.fills (fn f (object/merge @f { filled: 0, frontier: (object/get @f x0), reported: false }))))
+        (set @entity.lastX 0)
+
       RESTART -> active
-        (set @entity.fills (array/map @config.fills (fn f (object/merge @f { filled: 0, frontier: (object/get @f x0), reported: false }))))
+        (set @entity.fills (array/map @entity.fills (fn f (object/merge @f { filled: 0, frontier: (object/get @f x0), reported: false }))))
         (set @entity.lastX 0)
     }
 
@@ -74,6 +78,7 @@ orbital AreaFillOrbital {
 
     listens {
       BODY_MOVED { x : number!, y : number!, vx : number!, vy : number!, grounded : boolean!, skating : boolean!, speed : number! }
+      SET_FILLS { fills : [AreaFill]! }
       RESTART { id : string }
     }
 
@@ -84,7 +89,7 @@ orbital AreaFillOrbital {
         @tier "domain"
       fills : [AreaFill] = []
         @label "Fills"
-        @description "One row per fill region: id, x-range (x0..x1 in world units), baseline the height is measured from, target area, rateMode (area | speed | ride — default area), optional hint, and the curve samples to interpolate. filled/frontier/reported are stamped at runtime."
+        @description "One row per fill region: id, x-range (x0..x1 in world units), baseline the height is measured from, target area, rateMode (area | speed | ride — default area), optional hint, and the curve samples to interpolate. filled/frontier/reported are stamped at runtime. Seeded onto the entity on INIT; the live set is entity.fills — SET_FILLS replaces it at runtime (boards that import fills), and RESTART re-arms the live set rather than re-reading config, so injected fills survive respawns."
         @tier "domain"
     }
   }

package/behaviors/lolo/ui/game/atoms/std-choice-gate.lolo

@@ -1,5 +1,5 @@
 app std-choice-gate "1.0.0"
-"Headless choice-gate mechanic for side-view boards: a gate of N labeled option platforms where progress stops until the player commits to an answer. Listens BODY_MOVED and judges a gate when the player stands grounded on one of its option platforms (|dx| <= reachX of the option center, |dy| <= reachY of the gate's option plane — the pad-lock touch pattern): the correct option stamps the gate solved + chosen on the shared entity and emits CHOICE_CORRECT once (a solved gate never judges again, so the path stays open); a wrong option emits CHOICE_WRONG carrying the gate id, the chosen optionId, and the option's world position, so the board can bounce the player back and float the gate's hint (the board owns the bounce — the atom only reports). RESTART unsolves every gate. Renders nothing; boards draw the option platforms and labels from the shared entity (the render authority). Corresponds to the design-sheet field(s): challenge, agency."
+"Headless choice-gate mechanic for side-view boards: a gate of N labeled option platforms where progress stops until the player commits to an answer. Listens BODY_MOVED and judges a gate when the player stands grounded on one of its option platforms (|dx| <= reachX of the option center, |dy| <= reachY of the gate's option plane — the pad-lock touch pattern): the correct option stamps the gate solved + chosen on the shared entity and emits CHOICE_CORRECT once (a solved gate never judges again, so the path stays open); a wrong option emits CHOICE_WRONG carrying the gate id, the chosen optionId, and the option's world position, so the board can bounce the player back and float the gate's hint (the board owns the bounce — the atom only reports). RESTART unsolves every live gate (re-arming the live entity set, so SET_GATES-injected gates survive respawns). SET_GATES replaces the gate set at runtime for boards that import their gates. Renders nothing; boards draw the option platforms and labels from the shared entity (the render authority). Corresponds to the design-sheet field(s): challenge, agency."
 orbital ChoiceGateOrbital {
   type ChoiceOption = {
     id : string!
@@ -49,8 +49,11 @@ orbital ChoiceGateOrbital {
             (emit CHOICE_WRONG { id: (object/get @g id), optionId: (object/get @o id), x: (+ (object/get @g x) (object/get @o dx)), y: (object/get @g y) }))))
           null))
 
+      SET_GATES -> active
+        (set @entity.choices (array/map @payload.gates (fn g (object/merge @g { solved: false, chosen: "" }))))
+
       RESTART -> active
-        (set @entity.choices (array/map @config.gates (fn g (object/merge @g { solved: false, chosen: "" }))))
+        (set @entity.choices (array/map @entity.choices (fn g (object/merge @g { solved: false, chosen: "" }))))
     }
 
     emits {
@@ -73,6 +76,7 @@ orbital ChoiceGateOrbital {
 
     listens {
       BODY_MOVED { x : number!, y : number!, vx : number!, vy : number!, grounded : boolean!, skating : boolean!, speed : number! }
+      SET_GATES { gates : [ChoiceGate]! }
       RESTART { id : string }
     }
 
@@ -83,7 +87,7 @@ orbital ChoiceGateOrbital {
         @tier "domain"
       gates : [ChoiceGate] = []
         @label "Choice Gates"
-        @description "One row per gate: id, gate center (x, y — y is the option-platform surface the judge tests against), the hint floated on a wrong answer, and the options: id, dx offset from the gate center, the label drawn above the platform, and correct. solved/chosen are stamped at runtime."
+        @description "One row per gate: id, gate center (x, y — y is the option-platform surface the judge tests against), the hint floated on a wrong answer, and the options: id, dx offset from the gate center, the label drawn above the platform, and correct. solved/chosen are stamped at runtime. Seeded onto the entity on INIT; the live set is entity.choices — SET_GATES replaces it at runtime (boards that import gates), and RESTART re-arms the live set rather than re-reading config, so injected gates survive respawns."
         @tier "domain"
       reachX : number = 0.7
         @label "Reach X"

package/behaviors/lolo/ui/game/atoms/std-coef-pad.lolo

@@ -1,5 +1,5 @@
 app std-coef-pad "1.0.0"
-"Headless coefficient-pad mechanic for graph-riding boards: floor pads that reshape the road the player is riding (y = a·f(x−h) + k). Listens BODY_MOVED and, when the player stands grounded on an unapplied pad (|dx| <= reachX, |dy| <= reachY of the pad center — the pad-lock touch pattern), stamps the pad applied on the shared entity and emits COEF_PAD_APPLIED carrying the pad position AND its mod (x0, x1, a, h, k), so the board can append the mod to the body authority's curveMods (std-platformer-body with curveModsEnabled) and hop the player onto the reshaped surface. When every pad is applied it emits COEF_PAD_SET_COMPLETED once. RESTART un-applies every pad (the board clears curveMods alongside — the pad reports, the board owns the road). Renders nothing; boards draw the pads and read applied from the shared entity (the render authority)."
+"Headless coefficient-pad mechanic for graph-riding boards: floor pads that reshape the road the player is riding (y = a·f(x−h) + k). Listens BODY_MOVED and, when the player stands grounded on an unapplied pad (|dx| <= reachX, |dy| <= reachY of the pad center — the pad-lock touch pattern), stamps the pad applied on the shared entity and emits COEF_PAD_APPLIED carrying the pad position AND its mod (x0, x1, a, h, k), so the board can append the mod to the body authority's curveMods (std-platformer-body with curveModsEnabled) and hop the player onto the reshaped surface. When every pad is applied it emits COEF_PAD_SET_COMPLETED once. RESTART un-applies every live pad (re-arming the live entity set, so SET_PADS-injected pads survive respawns; the board clears curveMods alongside — the pad reports, the board owns the road). SET_PADS replaces the pad set at runtime for boards that import their pads. Renders nothing; boards draw the pads and read applied from the shared entity (the render authority)."
 orbital CoefPadOrbital {
   type CoefMod = {
     x0 : number!
@@ -59,8 +59,12 @@ orbital CoefPadOrbital {
               null)))))
           null))
 
+      SET_PADS -> active
+        (set @entity.coefPads (array/map @payload.pads (fn p (object/merge @p { applied: false }))))
+        (set @entity.coefCompleted false)
+
       RESTART -> active
-        (set @entity.coefPads (array/map @config.coefPads (fn p (object/merge @p { applied: false }))))
+        (set @entity.coefPads (array/map @entity.coefPads (fn p (object/merge @p { applied: false }))))
         (set @entity.coefCompleted false)
     }
 
@@ -89,6 +93,7 @@ orbital CoefPadOrbital {
 
     listens {
       BODY_MOVED { x : number!, y : number!, vx : number!, vy : number!, grounded : boolean!, skating : boolean!, speed : number! }
+      SET_PADS { pads : [CoefPad]! }
       RESTART { id : string }
     }
 
@@ -99,7 +104,7 @@ orbital CoefPadOrbital {
         @tier "domain"
       coefPads : [CoefPad] = []
         @label "Coefficient Pads"
-        @description "One row per pad: id, center (x, y in world units), the mod applied to the road while inside x0..x1 (a scales slope+height, b compresses/stretch period, h shifts horizontally, k lifts), and the hint floated on apply, and hop (true = the board teleports the player onto the reshaped surface — use when the mod steps the road far from the pad; false = the skate snap carries the player, preserving speed). applied is stamped at runtime."
+        @description "One row per pad: id, center (x, y in world units), the mod applied to the road while inside x0..x1 (a scales slope+height, b compresses/stretch period, h shifts horizontally, k lifts), and the hint floated on apply, and hop (true = the board teleports the player onto the reshaped surface — use when the mod steps the road far from the pad; false = the skate snap carries the player, preserving speed). applied is stamped at runtime. Seeded onto the entity on INIT; the live set is entity.coefPads — SET_PADS replaces it at runtime (boards that import pads), and RESTART re-arms the live set rather than re-reading config, so injected pads survive respawns."
         @tier "domain"
       reachX : number = 0.7
         @label "Reach X"