@sharpee/parser-en-us 3.0.0 → 3.3.0

package/grammar.js

@@ -4,16 +4,19 @@
  * @description Standard grammar patterns for English interactive fiction
  *
  * Rule Priority Guidelines:
- * - 100+: Semantic rules with trait constraints (e.g., .hasTrait(TraitType.ENTERABLE))
+ * - 100+: Specific/phrasal patterns that must outrank broader ones
  * - 100: Standard patterns
  * - 95: Synonyms/alternatives
  * - 90: Abbreviations
  *
- * Semantic rules should come first to match before fallback patterns.
+ * Parse-time gating: `.where()` scope constraints are the one parse-time
+ * gating mechanism. Trait-based refusal ("that's not something you can
+ * enter/climb/open") lives in each action's validate(), never in grammar —
+ * the former rule-level `.hasTrait()` API was a parse-time no-op and was
+ * deleted (ADR-231 D2a, 2026-07-17).
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defineGrammar = defineGrammar;
-const world_model_1 = require("@sharpee/world-model");
 /**
  * Define English grammar rules
  * @param grammar The grammar builder to use
@@ -28,7 +31,7 @@ function defineGrammar(grammar) {
     // Scope handled by action validation - tries see/feel/hear/smell cascade
     grammar
         .forAction('if.action.examining')
-        .verbs(['examine', 'x', 'inspect'])
+        .verbs(['examine', 'x', 'inspect', 'check', 'view', 'observe']) // +check/view/observe (ADR-230 D4)
         .pattern(':target')
         .build();
     // "look at" is a phrasal pattern - different structure
@@ -37,10 +40,11 @@ function defineGrammar(grammar) {
         .mapsTo('if.action.examining')
         .withPriority(95)
         .build();
-    // Looking with optional adverbs
+    // Looking with optional adverbs (ADR-230 D3a: the adverb form is just
+    // examining — if.action.examining_carefully had no action behind it)
     grammar
         .define('look [carefully] at :target')
-        .mapsTo('if.action.examining_carefully')
+        .mapsTo('if.action.examining')
         .withPriority(96)
         .build(); // Slightly higher priority, but confidence penalty for skipped optionals
     grammar
@@ -78,7 +82,7 @@ function defineGrammar(grammar) {
     // Scope handled by action validation; SceneryTrait blocks non-portable items
     grammar
         .forAction('if.action.taking')
-        .verbs(['take', 'get', 'grab'])
+        .verbs(['take', 'get', 'grab', 'acquire', 'collect']) // +acquire/collect (ADR-230 D4; bare `pick` deliberately absent — it would outmatch the `pick up :item` compound)
         .pattern(':item')
         .build();
     // "pick up" is a phrasal verb - different pattern structure
@@ -90,7 +94,7 @@ function defineGrammar(grammar) {
     // Scope (carried) handled by action validation
     grammar
         .forAction('if.action.dropping')
-        .verbs(['drop', 'discard'])
+        .verbs(['drop', 'discard', 'release']) // +release (ADR-230 D4 patterns reconciliation)
         .pattern(':item')
         .build();
     // "put down" is a phrasal verb - different pattern structure
@@ -133,13 +137,13 @@ function defineGrammar(grammar) {
     // Eating (ADR-087: using forAction)
     grammar
         .forAction('if.action.eating')
-        .verbs(['eat', 'consume', 'devour'])
+        .verbs(['eat', 'consume', 'devour', 'munch', 'nibble']) // +munch/nibble (ADR-230 D4 patterns reconciliation)
         .pattern(':item')
         .build();
     // Drinking (ADR-087: using forAction)
     grammar
         .forAction('if.action.drinking')
-        .verbs(['drink', 'sip', 'quaff'])
+        .verbs(['drink', 'sip', 'quaff', 'swallow', 'imbibe']) // +swallow/imbibe (ADR-230 D4)
         .pattern(':item')
         .build();
     // ADR-080 Phase 2: Multi-object commands
@@ -149,23 +153,20 @@ function defineGrammar(grammar) {
     // - "take knife and lamp" matches "take :item", parser creates list
     // - "take all but sword" matches "take :item", parser detects exclusion
     // Container operations
-    // Scope handled by action validation; traits declare semantic constraints only
+    // Scope and trait-based refusal handled by action validation
     grammar
         .define('put :item in|into|inside :container')
-        .hasTrait('container', world_model_1.TraitType.CONTAINER)
         .mapsTo('if.action.inserting')
         .withPriority(100)
         .build();
     grammar
         .define('insert :item in|into :container')
-        .hasTrait('container', world_model_1.TraitType.CONTAINER)
         .mapsTo('if.action.inserting')
         .withPriority(100)
         .build();
     // Supporter operations (including hanging!)
     grammar
         .define('put :item on|onto :supporter')
-        .hasTrait('supporter', world_model_1.TraitType.SUPPORTER)
         .mapsTo('if.action.putting')
         .withPriority(100)
         .build();
@@ -185,13 +186,11 @@ function defineGrammar(grammar) {
         .forAction('if.action.inventory')
         .verbs(['inventory', 'inv', 'i'])
         .build();
-    // Movement (ADR-087: using forAction with directions)
-    grammar
-        .define('go :direction')
-        .where('direction', { type: 'direction' })
-        .mapsTo('if.action.going')
-        .withPriority(100)
-        .build();
+    // Movement (ADR-087). The old `go :direction` define was DELETED in
+    // ADR-230 Phase 6: a `:direction` slot with a `{ type: 'direction' }`
+    // constraint always failed at runtime ("PropertyConstraint in slot
+    // constraints not yet supported"), so `go north` never worked — the
+    // verb+direction literals in the D4 block below replace it.
     // Bare direction commands (ADR-087: consolidated with forAction)
     grammar
         .forAction('if.action.going')
@@ -211,16 +210,14 @@ function defineGrammar(grammar) {
     })
         .build();
     // Opening and closing
-    // Scope handled by action validation; traits declare semantic constraints only
+    // Scope and trait-based refusal handled by action validation
     grammar
         .define('open :door')
-        .hasTrait('door', world_model_1.TraitType.OPENABLE)
         .mapsTo('if.action.opening')
         .withPriority(100)
         .build();
     grammar
         .define('close :door')
-        .hasTrait('door', world_model_1.TraitType.OPENABLE)
         .mapsTo('if.action.closing')
         .withPriority(100)
         .build();
@@ -229,23 +226,19 @@ function defineGrammar(grammar) {
         .forAction('if.action.switching_on')
         .verbs(['turn', 'switch', 'flip'])
         .pattern('on :device')
-        .hasTrait('device', world_model_1.TraitType.SWITCHABLE)
         .build();
     grammar
         .forAction('if.action.switching_off')
         .verbs(['turn', 'switch', 'flip'])
         .pattern('off :device')
-        .hasTrait('device', world_model_1.TraitType.SWITCHABLE)
         .build();
     // Alternative phrasal verb order: "turn lamp on" / "turn lamp off"
     grammar
         .define('turn :device on')
-        .hasTrait('device', world_model_1.TraitType.SWITCHABLE)
         .mapsTo('if.action.switching_on')
         .build();
     grammar
         .define('turn :device off')
-        .hasTrait('device', world_model_1.TraitType.SWITCHABLE)
         .mapsTo('if.action.switching_off')
         .build();
     // Pushing and pulling (ADR-087: using forAction)
@@ -257,7 +250,7 @@ function defineGrammar(grammar) {
         .build();
     grammar
         .forAction('if.action.pulling')
-        .verbs(['pull', 'drag', 'yank'])
+        .verbs(['pull', 'drag', 'yank', 'tug']) // +tug (ADR-230 D4)
         .pattern(':target')
         .build();
     // Lowering and raising (ADR-090: capability dispatch)
@@ -292,6 +285,11 @@ function defineGrammar(grammar) {
         .mapsTo('if.action.restarting')
         .withPriority(100)
         .build();
+    // Sleeping (ADR-230 D2; +nap/doze/rest/slumber D4)
+    grammar
+        .forAction('if.action.sleeping')
+        .verbs(['sleep', 'nap', 'doze', 'rest', 'slumber'])
+        .build();
     // Quitting (ADR-087: using forAction)
     grammar
         .forAction('if.action.quitting')
@@ -393,36 +391,31 @@ function defineGrammar(grammar) {
         .withPriority(100)
         .build();
     // VERB_NOUN_NOUN patterns (Phase 2)
-    // Scope handled by action validation; traits declare semantic constraints only
+    // Scope and trait-based refusal handled by action validation
     // Giving
     grammar
         .define('give :item to :recipient')
-        .hasTrait('recipient', world_model_1.TraitType.ACTOR)
         .mapsTo('if.action.giving')
         .withPriority(100)
         .build();
     grammar
         .define('give :recipient :item')
-        .hasTrait('recipient', world_model_1.TraitType.ACTOR)
         .mapsTo('if.action.giving')
         .withPriority(95)
         .build(); // Slightly lower priority than explicit "to"
     grammar
         .define('offer :item to :recipient')
-        .hasTrait('recipient', world_model_1.TraitType.ACTOR)
         .mapsTo('if.action.giving')
         .withPriority(100)
         .build();
     // Showing
     grammar
         .define('show :item to :recipient')
-        .hasTrait('recipient', world_model_1.TraitType.ACTOR)
         .mapsTo('if.action.showing')
         .withPriority(100)
         .build();
     grammar
         .define('show :recipient :item')
-        .hasTrait('recipient', world_model_1.TraitType.ACTOR)
         .mapsTo('if.action.showing')
         .withPriority(95)
         .build();
@@ -432,6 +425,24 @@ function defineGrammar(grammar) {
         .mapsTo('if.action.throwing')
         .withPriority(100)
         .build();
+    // Bare general throw (no target) — reaches the action's general-throw
+    // branch; `throw away :item` (dropping) still wins via D2b literal
+    // specificity, and the at/to forms via their extra literal.
+    grammar
+        .define('throw :item')
+        .mapsTo('if.action.throwing')
+        .withPriority(95)
+        .build();
+    grammar
+        .define('toss :item')
+        .mapsTo('if.action.throwing')
+        .withPriority(95)
+        .build();
+    grammar
+        .define('hurl :item')
+        .mapsTo('if.action.throwing')
+        .withPriority(95)
+        .build();
     grammar
         .define('throw :item to :recipient')
         .mapsTo('if.action.throwing')
@@ -439,11 +450,21 @@ function defineGrammar(grammar) {
         .build();
     // Multiple preposition patterns (Phase 2.1)
     // Scope handled by action validation; state checks (locked, open) in action validate()
-    // Taking from container with tool
+    // Taking from container with tool (ADR-230 Phase 6: remapped from the
+    // orphan if.action.taking_with onto removing — the tool rides the
+    // instrument slot and is interceptor-consultable)
     grammar
         .define('take :item from :container with|using :tool')
         .instrument('tool')
-        .mapsTo('if.action.taking_with')
+        .mapsTo('if.action.removing')
+        .withPriority(110)
+        .build();
+    // Removing from a container (ADR-230 D2). Priority 110 like the other
+    // multi-preposition patterns here, so the from-form outranks taking_off's
+    // bare `remove :target` when the command names a source.
+    grammar
+        .define('remove :item from :container')
+        .mapsTo('if.action.removing')
         .withPriority(110)
         .build();
     // Unlocking with key
@@ -453,12 +474,32 @@ function defineGrammar(grammar) {
         .mapsTo('if.action.unlocking')
         .withPriority(110)
         .build();
-    // Opening with tool
+    // Locking and keyless unlocking (ADR-230 D2). No trait constraint,
+    // mirroring the keyed unlock pattern: the action's validate owns
+    // not-lockable/no-key messaging (validateKeyRequirements refuses with
+    // no_key when the lockable requires a key).
+    grammar
+        .forAction('if.action.locking')
+        .verbs(['lock'])
+        .pattern(':target')
+        .build();
+    grammar
+        .define('lock :target with|using :key')
+        .instrument('key')
+        .mapsTo('if.action.locking')
+        .withPriority(110)
+        .build();
+    grammar
+        .forAction('if.action.unlocking')
+        .verbs(['unlock'])
+        .pattern(':target')
+        .build();
+    // Opening with tool (ADR-230 D3b: a tool slot on the standard opening
+    // action, not a separate id — if.action.opening_with had no action)
     grammar
         .define('open :container with|using :tool')
         .instrument('tool')
-        .hasTrait('container', world_model_1.TraitType.OPENABLE)
-        .mapsTo('if.action.opening_with')
+        .mapsTo('if.action.opening')
         .withPriority(110)
         .build();
     // Cutting with tool
@@ -468,10 +509,18 @@ function defineGrammar(grammar) {
         .mapsTo('if.action.cutting')
         .withPriority(110)
         .build();
+    // Cutting — bare form (2026-07-17, chord go-live G1 shortlist): an
+    // untooled cuttable was unreachable for TS and Chord alike; the tooled
+    // form above keeps priority 110 so it wins when a tool is named.
+    grammar
+        .forAction('if.action.cutting')
+        .verbs(['cut', 'slice', 'chop'])
+        .pattern(':target')
+        .build();
     // Attacking - simple patterns (ADR-087: using forAction)
     grammar
         .forAction('if.action.attacking')
-        .verbs(['attack', 'kill', 'fight', 'slay', 'murder', 'hit', 'strike'])
+        .verbs(['attack', 'kill', 'fight', 'slay', 'murder', 'hit', 'strike', 'break', 'smash', 'destroy']) // +break/smash/destroy (ADR-230 D4)
         .pattern(':target')
         .build();
     // Attacking with weapon (higher priority than simple attack)
@@ -506,52 +555,196 @@ function defineGrammar(grammar) {
         .mapsTo('if.action.digging')
         .withPriority(110)
         .build();
-    // Communication patterns with quoted strings
-    // Scope handled by action validation; traits declare semantic constraints only
-    grammar
-        .define('say :message')
-        .mapsTo('if.action.saying')
-        .withPriority(100)
-        .build();
+    // Digging — bare form (2026-07-17, chord go-live G1 shortlist): same
+    // bare-grammar hole as cutting.
     grammar
-        .define('say :message to :recipient')
-        .hasTrait('recipient', world_model_1.TraitType.ACTOR)
-        .mapsTo('if.action.saying_to')
-        .withPriority(105)
+        .forAction('if.action.digging')
+        .verbs(['dig'])
+        .pattern(':target')
         .build();
+    // Communication patterns (saying/saying_to/writing/writing_on/shouting/
+    // whispering) DELETED in ADR-230 Phase 6 (sketch ruling 4/5): the ids had
+    // no actions — they parsed and runtime-failed in every story. Grammar
+    // returns with the conversation/writing systems; stories (e.g. dungeo's
+    // SAY) keep their own story-grammar verbs meanwhile.
+    // ADR-231 D4: `:topic` is a TOPIC slot — free text captured verbatim by
+    // the TextSlotConsumer, never a positional entity slot. The validator's
+    // entity-first attempt resolves an in-scope entity quietly; a topic is
+    // never scope-rejected.
     grammar
-        .define('write :message')
-        .mapsTo('if.action.writing')
+        .define('tell :recipient about :topic')
+        .topic('topic')
+        .mapsTo('if.action.telling')
         .withPriority(100)
         .build();
     grammar
-        .define('write :message on :surface')
-        .mapsTo('if.action.writing_on')
-        .withPriority(105)
-        .build();
-    grammar
-        .define('shout :message')
-        .mapsTo('if.action.shouting')
+        .define('ask :recipient about :topic')
+        .topic('topic')
+        .mapsTo('if.action.asking')
         .withPriority(100)
         .build();
+    // asking/telling aliases (ADR-230 Phase 6 — actions revived as minimal
+    // interceptable stubs)
     grammar
-        .define('whisper :message to :recipient')
-        .hasTrait('recipient', world_model_1.TraitType.ACTOR)
-        .mapsTo('if.action.whispering')
+        .define('question :recipient about :topic')
+        .topic('topic')
+        .mapsTo('if.action.asking')
         .withPriority(100)
         .build();
     grammar
-        .define('tell :recipient about :topic')
-        .hasTrait('recipient', world_model_1.TraitType.ACTOR)
-        .mapsTo('if.action.telling')
+        .define('inquire of :recipient about :topic')
+        .topic('topic')
+        .mapsTo('if.action.asking')
         .withPriority(100)
         .build();
     grammar
-        .define('ask :recipient about :topic')
-        .hasTrait('recipient', world_model_1.TraitType.ACTOR)
-        .mapsTo('if.action.asking')
+        .define('inform :recipient about :topic')
+        .topic('topic')
+        .mapsTo('if.action.telling')
         .withPriority(100)
         .build();
+    // Talking (ADR-229 R3): the core route to if.action.talking — the action
+    // was wired for interceptors (ADR-228 Phase 5) but previously reachable
+    // only via story grammar. No parse-time actor gate (the pattern all
+    // trait-gated verbs now follow, ADR-231 D2a): talking's validate owns
+    // not_actor/too_far, so those refusals flow through blocked() →
+    // onBlocked (interceptor-visible) instead of dying as a parse failure.
+    // Story grammar outranks these on priority as usual.
+    grammar
+        .define('talk to|with :target')
+        .mapsTo('if.action.talking')
+        .withPriority(100)
+        .build();
+    grammar
+        .define('speak to|with :target')
+        .mapsTo('if.action.talking')
+        .withPriority(100)
+        .build();
+    grammar
+        .define('chat with :target')
+        .mapsTo('if.action.talking')
+        .withPriority(100)
+        .build();
+    grammar
+        .define('converse with :target')
+        .mapsTo('if.action.talking')
+        .withPriority(100)
+        .build();
+    // ==========================================================================
+    // D4 SYNONYM PROMOTION (ADR-230): every verbs.ts synonym parses.
+    // Mechanical aliases of existing actions; phrasal/complex forms use
+    // .define() per the ADR-087 convention.
+    // ==========================================================================
+    // going aliases (verbs.ts: walk/run/head/travel; `move` LEFT the going
+    // list — Phase 1 ruling, move is manipulation-only).
+    // Literal expansion per direction alias, exactly like the bare-direction
+    // block below: a `:direction` slot inside .define() does NOT match
+    // direction words (the `go :direction` rule above yields
+    // "PropertyConstraint not yet supported" — pre-existing; bare directions
+    // are what players actually use). These literals also make `go north`
+    // work for the first time.
+    {
+        const directionAliases = {
+            north: ['north', 'n'],
+            south: ['south', 's'],
+            east: ['east', 'e'],
+            west: ['west', 'w'],
+            northeast: ['northeast', 'ne'],
+            northwest: ['northwest', 'nw'],
+            southeast: ['southeast', 'se'],
+            southwest: ['southwest', 'sw'],
+            up: ['up', 'u'],
+            down: ['down', 'd'],
+            in: ['in', 'inside'],
+            out: ['out', 'outside'],
+        };
+        for (const verb of ['go', 'walk', 'run', 'head', 'travel']) {
+            for (const [canonical, aliases] of Object.entries(directionAliases)) {
+                for (const alias of aliases) {
+                    grammar
+                        .define(`${verb} ${alias}`)
+                        .mapsTo('if.action.going')
+                        .withPriority(alias.length === 1 ? 90 : 100)
+                        .withDefaultSemantics({ direction: canonical })
+                        .build();
+                }
+            }
+        }
+        // `move :target <direction>` → pushing (Phase 1 move ruling), same
+        // literal expansion.
+        for (const aliases of Object.values(directionAliases)) {
+            for (const alias of aliases) {
+                grammar
+                    .define(`move :target ${alias}`)
+                    .mapsTo('if.action.pushing')
+                    .withPriority(105)
+                    .build();
+            }
+        }
+    }
+    // exiting alias
+    grammar.define('go out').mapsTo('if.action.exiting').withPriority(105).build(); // ADR-231 D2b: phrasal form above bare verb-plus-slot
+    // listening alias (hear)
+    grammar.define('hear').mapsTo('if.action.listening').withPriority(100).build();
+    grammar.define('hear :target').mapsTo('if.action.listening').withPriority(100).build();
+    // taking/dropping phrasal aliases
+    grammar.define('take up :item').mapsTo('if.action.taking').withPriority(100).build();
+    grammar.define('throw away :item').mapsTo('if.action.dropping').withPriority(100).build();
+    // putting aliases (place; move-to per the Phase 1 move ruling — putting
+    // resolves in/on by destination type when the preposition is `to`)
+    grammar.define('place :item in|into|inside :container').mapsTo('if.action.putting').withPriority(100).build();
+    grammar.define('place :item on|onto :supporter').mapsTo('if.action.putting').withPriority(100).build();
+    // 110 so the to-form outranks pushing's bare `move :target`
+    grammar.define('move :item to :destination').mapsTo('if.action.putting').withPriority(110).build();
+    // opening/closing aliases
+    grammar.define('unwrap :door').mapsTo('if.action.opening').withPriority(100).build();
+    grammar.define('uncover :door').mapsTo('if.action.opening').withPriority(100).build();
+    grammar.define('shut :door').mapsTo('if.action.closing').withPriority(100).build();
+    grammar.define('cover :door').mapsTo('if.action.closing').withPriority(100).build();
+    // turning (ADR-230 Phase 6 sketch ruling 1: capability dispatch like
+    // lowering/raising). Priority 95 so the switching phrasal forms
+    // (`turn :device on`, `turn on :device`) always win.
+    grammar.define('turn :target').mapsTo('if.action.turning').withPriority(95).build();
+    grammar.define('rotate :target').mapsTo('if.action.turning').withPriority(95).build();
+    grammar.define('twist :target').mapsTo('if.action.turning').withPriority(95).build();
+    // locking/unlocking aliases
+    grammar.define('secure :target').mapsTo('if.action.locking').withPriority(100).build();
+    grammar.define('unsecure :target').mapsTo('if.action.unlocking').withPriority(100).build();
+    // switching aliases (bare transitive forms — activate/start/deactivate/stop)
+    grammar.define('activate :device').mapsTo('if.action.switching_on').withPriority(100).build();
+    grammar.define('start :device').mapsTo('if.action.switching_on').withPriority(100).build();
+    grammar.define('deactivate :device').mapsTo('if.action.switching_off').withPriority(100).build();
+    grammar.define('stop :device').mapsTo('if.action.switching_off').withPriority(100).build();
+    // giving/showing aliases
+    grammar.define('hand :item to :recipient').mapsTo('if.action.giving').withPriority(100).build();
+    grammar.define('hand :recipient :item').mapsTo('if.action.giving').withPriority(100).build();
+    grammar.define('display :item to :recipient').mapsTo('if.action.showing').withPriority(100).build();
+    grammar.define('present :item to :recipient').mapsTo('if.action.showing').withPriority(100).build();
+    // throwing aliases
+    grammar.define('toss :item at :target').mapsTo('if.action.throwing').withPriority(100).build();
+    grammar.define('toss :item to :recipient').mapsTo('if.action.throwing').withPriority(100).build();
+    grammar.define('hurl :item at :target').mapsTo('if.action.throwing').withPriority(100).build();
+    grammar.define('hurl :item to :recipient').mapsTo('if.action.throwing').withPriority(100).build();
+    // patterns-array reconciliation promotions (PIN 4b): phrasal forms the
+    // lang help surface advertises
+    grammar.define('munch on :item').mapsTo('if.action.eating').withPriority(100).build();
+    grammar.define('nibble on :item').mapsTo('if.action.eating').withPriority(100).build();
+    grammar.define('drink from :target').mapsTo('if.action.drinking').withPriority(100).build();
+    grammar.define('sip from :target').mapsTo('if.action.drinking').withPriority(100).build();
+    grammar.define('let go of :item').mapsTo('if.action.dropping').withPriority(100).build();
+    grammar.define('open up :door').mapsTo('if.action.opening').withPriority(100).build();
+    grammar.define('power on :device').mapsTo('if.action.switching_on').withPriority(100).build();
+    grammar.define('power off :device').mapsTo('if.action.switching_off').withPriority(100).build();
+    grammar.define('extract :item from :container').mapsTo('if.action.removing').withPriority(110).build();
+    // meta aliases
+    grammar.define('save game').mapsTo('if.action.saving').withPriority(100).build();
+    grammar.define('load').mapsTo('if.action.restoring').withPriority(100).build();
+    grammar.define('load game').mapsTo('if.action.restoring').withPriority(100).build();
+    grammar.define('restore game').mapsTo('if.action.restoring').withPriority(100).build();
+    grammar.define('exit game').mapsTo('if.action.quitting').withPriority(105).build(); // outranks `exit :container`
+    grammar.define('?').mapsTo('if.action.help').withPriority(100).build();
+    grammar.define('commands').mapsTo('if.action.help').withPriority(100).build();
+    grammar.define('points').mapsTo('if.action.scoring').withPriority(100).build();
     // Touching/sensory actions (ADR-087: using forAction)
     // Scope handled by action validation
     grammar
@@ -559,52 +752,108 @@ function defineGrammar(grammar) {
         .verbs(['touch', 'rub', 'feel', 'pat', 'stroke', 'poke', 'prod'])
         .pattern(':target')
         .build();
+    // Listening and smelling (ADR-230 D2) — bare and targeted forms; both
+    // actions support the bare shape (ambient sound / room smell).
+    grammar
+        .define('listen')
+        .mapsTo('if.action.listening')
+        .withPriority(100)
+        .build();
+    grammar
+        .define('listen to :target')
+        .mapsTo('if.action.listening')
+        .withPriority(100)
+        .build();
+    grammar
+        .forAction('if.action.smelling')
+        .verbs(['smell', 'sniff'])
+        .build();
+    grammar
+        .forAction('if.action.smelling')
+        .verbs(['smell', 'sniff'])
+        .pattern(':target')
+        .build();
     // ============================================================================
     // ENTERING AND EXITING
-    // Scope handled by action validation; traits declare semantic constraints only
+    // Scope and trait-based refusal handled by action validation
     // ============================================================================
     // Semantic: enter specific enterable thing (priority 100)
     grammar
         .define('enter :portal')
-        .hasTrait('portal', world_model_1.TraitType.ENTERABLE)
         .mapsTo('if.action.entering')
         .withPriority(100)
         .build();
+    // Prepositional/phrasal entering forms sit at 105 (ADR-231 D2b): the file's
+    // guideline puts semantic/phrasal forms above bare verb-plus-slot forms, and
+    // these previously tied taking's `get :item` / climbing's `climb :target` at
+    // 100 (`exit game` at 105 is the precedent). The literal-before-slot
+    // specificity tiebreak also resolves this class structurally.
     grammar
         .define('get in :portal')
-        .hasTrait('portal', world_model_1.TraitType.ENTERABLE)
         .mapsTo('if.action.entering')
-        .withPriority(100)
+        .withPriority(105)
         .build();
     grammar
         .define('get into :portal')
-        .hasTrait('portal', world_model_1.TraitType.ENTERABLE)
         .mapsTo('if.action.entering')
-        .withPriority(100)
+        .withPriority(105)
         .build();
     grammar
         .define('climb in :portal')
-        .hasTrait('portal', world_model_1.TraitType.ENTERABLE)
         .mapsTo('if.action.entering')
-        .withPriority(100)
+        .withPriority(105)
         .build();
     grammar
         .define('climb into :portal')
-        .hasTrait('portal', world_model_1.TraitType.ENTERABLE)
         .mapsTo('if.action.entering')
+        .withPriority(105)
+        .build();
+    // Climb a climbable object (priority 100) — ADR-218 §1a (ratchet F2).
+    // Routes `climb <thing>` and its synonyms to the climbing action's object-climb
+    // path. [2026-07-17, ADR-231 D2a] This block originally claimed parse-time
+    // CLIMBABLE gating via .hasTrait(); that call was a no-op and has been
+    // deleted — climbing's validate() owns the not_climbable refusal.
+    // The prepositional `climb in/into :portal` (entering) and `climb out` (exiting)
+    // forms are unaffected — they carry a preposition token these bare forms do not.
+    grammar
+        .define('climb :target')
+        .mapsTo('if.action.climbing')
+        .withPriority(100)
+        .build();
+    grammar
+        .define('climb up :target')
+        .mapsTo('if.action.climbing')
+        .withPriority(100)
+        .build();
+    grammar
+        .define('climb down :target')
+        .mapsTo('if.action.climbing')
+        .withPriority(100)
+        .build();
+    grammar
+        .define('scale :target')
+        .mapsTo('if.action.climbing')
+        .withPriority(100)
+        .build();
+    grammar
+        .define('ascend :target')
+        .mapsTo('if.action.climbing')
+        .withPriority(100)
+        .build();
+    grammar
+        .define('descend :target')
+        .mapsTo('if.action.climbing')
         .withPriority(100)
         .build();
     grammar
         .define('go in :portal')
-        .hasTrait('portal', world_model_1.TraitType.ENTERABLE)
         .mapsTo('if.action.entering')
-        .withPriority(100)
+        .withPriority(105) // ADR-231 D2b: phrasal form above bare verb-plus-slot
         .build();
     grammar
         .define('go into :portal')
-        .hasTrait('portal', world_model_1.TraitType.ENTERABLE)
         .mapsTo('if.action.entering')
-        .withPriority(100)
+        .withPriority(105) // ADR-231 D2b: phrasal form above bare verb-plus-slot
         .build();
     // Exiting (bare command, no target - exits current container/location)
     grammar
@@ -615,7 +864,7 @@ function defineGrammar(grammar) {
     grammar
         .define('get out')
         .mapsTo('if.action.exiting')
-        .withPriority(100)
+        .withPriority(105) // ADR-231 D2b: outranks taking's `get :item` ("out" is not an item)
         .build();
     grammar
         .define('leave')
@@ -625,28 +874,35 @@ function defineGrammar(grammar) {
     grammar
         .define('climb out')
         .mapsTo('if.action.exiting')
-        .withPriority(100)
+        .withPriority(105) // ADR-231 D2b: outranks climbing's `climb :target`
         .build();
     // Vehicle-specific synonyms (map to entering/exiting actions)
     grammar
         .define('board :vehicle')
-        .hasTrait('vehicle', world_model_1.TraitType.ENTERABLE)
         .mapsTo('if.action.entering')
         .withPriority(100)
         .build();
     grammar
         .define('get on :vehicle')
-        .hasTrait('vehicle', world_model_1.TraitType.ENTERABLE)
         .mapsTo('if.action.entering')
-        .withPriority(100)
+        .withPriority(105) // ADR-231 D2b: phrasal form above taking's `get :item`
         .build();
     // Exiting with a target (exit specific container/vehicle)
     grammar
         .define('exit :container')
-        .hasTrait('container', world_model_1.TraitType.ENTERABLE)
         .mapsTo('if.action.exiting')
         .withPriority(100)
         .build();
+    grammar
+        .define('get out of :container')
+        .mapsTo('if.action.exiting')
+        .withPriority(105) // ADR-231 D2b: phrasal form above taking's `get :item`
+        .build();
+    grammar
+        .define('climb out of :container')
+        .mapsTo('if.action.exiting')
+        .withPriority(105) // ADR-231 D2b: phrasal form above climbing's `climb :target`
+        .build();
     grammar
         .define('disembark')
         .mapsTo('if.action.exiting')
@@ -654,15 +910,13 @@ function defineGrammar(grammar) {
         .build();
     grammar
         .define('disembark :vehicle')
-        .hasTrait('vehicle', world_model_1.TraitType.ENTERABLE)
         .mapsTo('if.action.exiting')
         .withPriority(100)
         .build();
     grammar
         .define('get off :vehicle')
-        .hasTrait('vehicle', world_model_1.TraitType.ENTERABLE)
         .mapsTo('if.action.exiting')
-        .withPriority(100)
+        .withPriority(105) // ADR-231 D2b: phrasal form above taking's `get :item`
         .build();
     grammar
         .define('alight')