colregs 0.3.2 → 0.3.3

package/README.md

@@ -56,7 +56,10 @@ lights and shapes, Part D sound and light signals, and Annex I geometry.
 [`docs/requirements.md`](docs/requirements.md) is the numbered contract for
 all of it. One case the Convention cannot state, a vessel made fast to a
 mooring buoy, lives only under `us/inland`
-([ADR 0008](docs/adr/0008-mooring-buoy-modifier.md)).
+([ADR 0008](docs/adr/0008-mooring-buoy-modifier.md)); two the Inland Rules
+deliberately lack, Rule 28 and 23(d)(ii), are tombstoned there
+([ADR 0018](docs/adr/0018-jurisdiction-delta-is-a-merge-patch.md)). That is
+the whole of `us/inland` today: four records, not a model of the Inland Rules.
 
 ## The layers
 
@@ -104,7 +107,12 @@ same thing.
 
 **Jurisdiction is a dimension, not a fork.** Every record carries a
 `jurisdiction`: `intl`, or `<country-or-body>/<waters>` as a delta on it.
-Entries a jurisdiction doesn't override are inherited, not restated.
+Entries a jurisdiction doesn't override are inherited, not restated. The
+delta is an [RFC 7396](https://www.rfc-editor.org/rfc/rfc7396) merge patch
+over `intl` keyed by entry id: the jurisdiction's own entries are its keys,
+its `suppressions` are the keys set to `null`, and silence inherits
+([ADR 0018](docs/adr/0018-jurisdiction-delta-is-a-merge-patch.md)). Any
+conformant merge-patch library reproduces the resolved rule set.
 
 **Predicates, not enumerations.** Gates are `fact:length_m < 7`, never a
 pre-built list of configurations. Enumerated tables are where prior art
@@ -136,12 +144,12 @@ paragraphs prevails is a relation.
 
 | relation | meaning |
 |---|---|
-| `rel:includes` | import the referenced entry's **lights only**, never its predicate |
-| `rel:conditional_includes` | import lights when the stated `when` holds; `one_of` is a set of legal alternatives |
-| `rel:in_lieu_of` | this entry's lights replace the referenced entries' lights |
-| `rel:excludes` | must not be shown together: a pick-one between alternatives, never one obligation vetoing another |
-| `rel:exempts` | the referenced requirement does not apply (30(e)) |
-| `rel:overrides` | this paragraph's requirement prevails over the referenced one's when both apply (Rule 18; Rule 26(a) over Rule 30's anchor lights) |
+| `rel:includes` | import the referenced entry's lights, their modality and its scalar gates — never its axes (ADR 0019) |
+| `rel:conditional_includes` | import lights when the stated `when` holds; `one_of` is a set of legal alternatives, exactly one per display, or none under a `may` carrier |
+| `rel:in_lieu_of` | this entry's lights replace the referenced entries' lights; two entries replacing overlapping sets are alternatives to each other |
+| `rel:excludes` | must not be shown together: a pick-one between alternatives, never one obligation vetoing another; a constraint on one display, never a removal |
+| `rel:exempts` | the referenced requirement does not apply (30(e)); reaches an entry in force, never an import |
+| `rel:overrides` | this paragraph's requirement prevails over the referenced one's when both apply (Rule 18; Rule 26(a) over Rule 30's anchor lights); reaches an entry in force, never an import |
 
 Modality is `modality:shall`, `modality:may`, `modality:shall-if-practicable`, `modality:shall-not`,
 `modality:shall-not-impede`, or `modality:conditional` with a `modality_by` table when it turns

package/data/applicability.json

@@ -1,12 +1,12 @@
 {
  "conditions": "night (Rule 20(b): sunset to sunrise), and by 20(c) in restricted visibility by day. Day shapes are not in this release.",
  "relations": {
-  "rel:includes": "import another entry's lights only, never its predicate",
-  "rel:conditional_includes": "import lights when the stated `when` holds; `one_of` is a set of legal alternatives among which the vessel picks one",
-  "rel:in_lieu_of": "this entry's lights replace the referenced entries' lights",
-  "rel:excludes": "the referenced entries must not be shown at the same time",
-  "rel:exempts": "the referenced entries are not required",
-  "rel:overrides": "the superiority relation: the referencing norm's obligation displaces the referenced norm's when both apply"
+  "rel:includes": "import another entry's lights, their modality and its scalar gates, never its axes (ADR 0019)",
+  "rel:conditional_includes": "import lights when the stated `when` holds; `one_of` is a set of legal alternatives among which the vessel picks exactly one, or none under a `may` carrier (ADR 0019)",
+  "rel:in_lieu_of": "this entry's lights replace the referenced entries' lights; two entries whose targets intersect are alternatives to each other (ADR 0019)",
+  "rel:excludes": "the referenced entries must not be shown at the same time; a constraint on one display, never a removal (ADR 0019)",
+  "rel:exempts": "the referenced entries are not required; reaches an entry in force, never an import (ADR 0019)",
+  "rel:overrides": "the superiority relation: the referencing norm's obligation displaces the referenced norm's when both apply; reaches an entry in force, never an import (ADR 0019)"
  },
  "modalities": {
   "modality:shall": "mandatory",
@@ -110,6 +110,11 @@
    "cite": "14(a)",
    "what": "When two power-driven vessels are meeting on reciprocal or nearly reciprocal courses so as to involve risk of collision each shall alter her course to starboard so that each shall pass on the port side of the other.",
    "why": "`category:conduct`, not `category:classification`: the paragraph states the situation in words and prescribes the action, and 14(b) is the paragraph that deems the situation to exist -- entry rule:14b cites it. The action is monitored over a trace rather than evaluated at a point (ADR 0005 sec. 1), and no conduct entry shape exists yet. Q-45."
+  },
+  {
+   "cite": "28",
+   "what": "Under us/inland a record carrying activity:cbd selects nothing: rule:28 is suppressed and the Rule 23(a) entries it imported read activity:none.",
+   "why": "'Constrained by her draft' is not an Inland status, so the record is out of vocabulary there and the package does not pick a reading for it; a consumer that decodes SignalK for inland waters maps it to activity:none (ADR 0018)."
   }
  ],
  "represented_paragraphs": [
@@ -2176,5 +2181,19 @@
    "modality": "modality:may",
    "note": "The under-50 m alternative, on the same 33 CFR 90.5 deeming that brings rule:30a:mooring_buoy in. It is a separate entry because widening rule:30b's predicate would edit an intl entry to carry a national delta, which REQ-SCOPE-4 forbids."
   }
+ ],
+ "suppressions": [
+  {
+   "jurisdiction": "us/inland",
+   "suppresses": "rule:28",
+   "cite": "28",
+   "why": "33 CFR 83.28 is [Reserved]: 'constrained by her draft' is not an Inland Rules status, so the Rule 28 signal is deliberately absent under us/inland rather than untranscribed (Q-11, ADR 0018)."
+  },
+  {
+   "jurisdiction": "us/inland",
+   "suppresses": "rule:23d_ii",
+   "cite": "23(d)(ii)",
+   "why": "33 CFR 83.23(d) is a single paragraph with no counterpart to the under-7 m, 7 kn exception of 23(d)(ii); the exception is deliberately absent under us/inland (Q-11, ADR 0018)."
+  }
  ]
 }

package/data/i18n/en.json

@@ -7,21 +7,87 @@
     "reviewed_by": [
       "mark-brannan"
     ],
-    "review_date": "2026-09-13"
+    "review_date": "2026-09-16"
   },
   "strings": {
-    "light": {
+    "lights": {
       "light:masthead": "Masthead light",
+      "light:sidelights": "Sidelights",
       "light:sidelight_starboard": "Starboard sidelight",
       "light:sidelight_port": "Port sidelight",
       "light:sternlight": "Sternlight",
       "light:towing": "Towing light",
-      "light:all_round": "All-round light"
+      "light:all_round": "All-round light",
+      "light:flashing": "Flashing light",
+      "light:torch": "Electric torch or lighted lantern",
+      "light:deck_lights": "Working or equivalent lights"
     },
-    "modality": {
+    "modalities": {
       "modality:shall": "Required",
       "modality:may": "Permitted",
-      "modality:shall-if-practicable": "Required if practicable"
+      "modality:shall-if-practicable": "Required if practicable",
+      "modality:conditional": "Conditional",
+      "modality:exempt": "Exempt",
+      "modality:shall-not": "Prohibited",
+      "modality:shall-not-impede": "Must not impede"
+    },
+    "roles": {
+      "role:give-way": "Give way",
+      "role:stand-on": "Stand on",
+      "role:shall-not-impede": "Must not impede",
+      "role:keep-clear": "Keep clear",
+      "role:none": "No role"
+    },
+    "encounters": {
+      "encounter:head-on": "Head-on",
+      "encounter:crossing": "Crossing",
+      "encounter:overtaking": "Overtaking",
+      "encounter:none": "No encounter"
+    },
+    "jurisdictions": {
+      "intl": "International",
+      "us/inland": "US Inland"
+    },
+    "facts": {
+      "propulsion:power": "Power-driven",
+      "propulsion:sail": "Sailing",
+      "propulsion:oars": "Oars",
+      "activity:none": "None",
+      "activity:fishing": "Fishing",
+      "activity:trawling": "Trawling",
+      "activity:towing": "Towing",
+      "activity:pushing": "Pushing",
+      "activity:being_towed": "Being towed",
+      "activity:nuc": "Not under command",
+      "activity:ram": "Restricted in her ability to manoeuvre",
+      "activity:ram_underwater": "Restricted in her ability to manoeuvre, engaged in underwater operations",
+      "activity:cbd": "Constrained by her draught",
+      "activity:mine": "Engaged in minesweeping",
+      "activity:pilot": "Engaged on pilotage duty",
+      "activity:diving": "Engaged in diving operations",
+      "position:underway": "Underway",
+      "position:anchored": "At anchor",
+      "position:aground": "Aground",
+      "position:moored": "Moored",
+      "rule18_class:nuc": "Not under command",
+      "rule18_class:ram": "Restricted in ability to manoeuvre",
+      "rule18_class:fishing": "Fishing",
+      "rule18_class:wig": "Wing-in-ground craft",
+      "rule18_class:cbd": "Constrained by draught",
+      "rule18_class:sail": "Sailing vessel",
+      "rule18_class:power": "Power-driven vessel",
+      "dynamics:tanker": "Tanker",
+      "dynamics:cargo": "Cargo ship",
+      "dynamics:ferry": "Ferry",
+      "dynamics:fishing": "Fishing vessel",
+      "dynamics:yacht": "Yacht",
+      "dynamics:rib": "RIB",
+      "dynamics:unknown": "Unknown",
+      "obstruction_side:port": "Port",
+      "obstruction_side:starboard": "Starboard",
+      "wind_side:port": "Port",
+      "wind_side:starboard": "Starboard",
+      "wind_side:unknown": "Unknown"
     }
   }
 }

package/data/i18n/fi.json

@@ -8,7 +8,7 @@
     "review_date": "2026-09-15"
   },
   "strings": {
-    "light": {
+    "lights": {
       "light:masthead": "Mastovalo",
       "light:sidelight_starboard": "Oikea sivuvalo",
       "light:sidelight_port": "Vasen sivuvalo",
@@ -16,7 +16,7 @@
       "light:towing": "Hinausvalo",
       "light:all_round": "Ympäri näköpiirin näkyvä valo"
     },
-    "modality": {
+    "modalities": {
       "modality:shall": "Pakollinen",
       "modality:may": "Sallittu",
       "modality:shall-if-practicable": "Pakollinen, jos mahdollista"

package/data/lights.json

@@ -8,8 +8,7 @@
  },
  "lights": {
   "light:masthead": {
-   "name": "masthead light",
-   "colregs_term": "masthead light",
+   "term": "masthead light",
    "cite": "21(a)",
    "color": "white",
    "character": "steady",
@@ -22,8 +21,7 @@
    "rule21": true
   },
   "light:sidelights": {
-   "name": "sidelights",
-   "colregs_term": "sidelights",
+   "term": "sidelights",
    "cite": "21(b)",
    "character": "steady",
    "composite": true,
@@ -36,8 +34,7 @@
    "rule21": true
   },
   "light:sidelight_starboard": {
-   "name": "starboard sidelight",
-   "colregs_term": "sidelight",
+   "term": "sidelight",
    "cite": "21(b)",
    "color": "green",
    "character": "steady",
@@ -50,8 +47,7 @@
    "rule21": true
   },
   "light:sidelight_port": {
-   "name": "port sidelight",
-   "colregs_term": "sidelight",
+   "term": "sidelight",
    "cite": "21(b)",
    "color": "red",
    "character": "steady",
@@ -64,8 +60,7 @@
    "rule21": true
   },
   "light:sternlight": {
-   "name": "sternlight",
-   "colregs_term": "sternlight",
+   "term": "sternlight",
    "cite": "21(c)",
    "color": "white",
    "character": "steady",
@@ -78,8 +73,7 @@
    "rule21": true
   },
   "light:towing": {
-   "name": "towing light",
-   "colregs_term": "towing light",
+   "term": "towing light",
    "cite": "21(d)",
    "color": "yellow",
    "character": "steady",
@@ -92,8 +86,7 @@
    "rule21": true
   },
   "light:all_round": {
-   "name": "all-round light",
-   "colregs_term": "all-round light",
+   "term": "all-round light",
    "cite": "21(e)",
    "color": null,
    "color_note": "colour is fixed by the citing paragraph, not by Rule 21",
@@ -106,8 +99,7 @@
    "rule21": true
   },
   "light:flashing": {
-   "name": "flashing light",
-   "colregs_term": "flashing light",
+   "term": "flashing light",
    "cite": "21(f)",
    "color": null,
    "color_note": "colour is fixed by the citing paragraph",
@@ -122,8 +114,7 @@
    "rule21": true
   },
   "light:torch": {
-   "name": "electric torch or lighted lantern",
-   "colregs_term": "electric torch or lighted lantern",
+   "term": "electric torch or lighted lantern",
    "cite": "25(d)(i)",
    "color": "white",
    "character": "shown in sufficient time to prevent collision",
@@ -133,8 +124,7 @@
    "note": "Not a fixed navigation light: it is held ready at hand and shown on approach. It has no prescribed arc, range or position."
   },
   "light:deck_lights": {
-   "name": "working or equivalent lights",
-   "colregs_term": "working or equivalent lights",
+   "term": "working or equivalent lights",
    "cite": "30(c)",
    "color": null,
    "character": "steady",

package/data/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.3.2"
+  "version": "0.3.3"
 }

package/docs/adr/0010-text-withheld-jurisdictions.md

@@ -102,6 +102,8 @@ data one.
   international law where a national body deliberately has none. That is
   about deltas, not licences; it survives this ADR untouched and is the live
   blocker on CEVNI. Read the two together or the wrong one gets blamed.
+  *(ADR 0018 has since supplied that mechanism; the bar is now "land with
+  your tombstones", not "wait".)*
 - `schema/rules.schema.json` carries the conditional: `text` required unless
   `text_status` is `withheld`, in which case it is forbidden and
   `withheld_reason` is required. Only `withheld_reason` is refused on a

package/docs/adr/0018-jurisdiction-delta-is-a-merge-patch.md

@@ -0,0 +1,102 @@
+# ADR 0018 — A jurisdiction delta is an RFC 7396 merge patch, and a tombstone is its `null`
+
+Date: 2026-09-16
+Status: proposed — merging this PR is the ruling; a revert undoes it
+
+## Context
+
+REQ-SCOPE-3 says a jurisdiction is a delta over `intl`: entries it does not
+mention are inherited. Q-11 found that unsafe as stated. 33 CFR 83 leaves
+Rule 28 "[Reserved]" and has no counterpart to 23(d)(ii), so a `us/inland`
+delta that was merely silent there would inherit `rule:28` and assert an
+international obligation the Inland Rules deliberately do not carry. Both
+absences are verified against the primary source (Cornell LII's copy of
+33 CFR 83: "§ 83.28 [Reserved] (Rule 28)"; 83.23(d) is a single paragraph
+with no subparagraphs). Q-11 asked for tombstones — "this entry deliberately
+does not exist here", distinguishable from "not yet transcribed" — and held
+every non-`intl` jurisdiction until the mechanism existed. Issue #45 asked,
+separately, which standard encoding the delta should follow.
+
+Both questions have been waiting on a second jurisdiction to force them.
+Issue #137 records that nothing was proposing one. `us/inland` already exists
+with two add-only entries under ADR 0008's carve-out, and the two absences
+above are the counterexample that carve-out was left open for: a delta that
+must suppress, not only add.
+
+## Decision
+
+1. **The delta semantics are RFC 7396, JSON Merge Patch.** A jurisdiction's
+   delta over `intl` is, in meaning, a merge-patch document keyed by entry
+   id: present keys are that jurisdiction's own entries, `null` keys are its
+   tombstones, and every key the patch does not mention is inherited. Any
+   conformant merge-patch implementation applied to the `intl` entries by
+   id reproduces the jurisdiction's resolved rule set. RFC 6902 is not
+   adopted: an operation script with JSON Pointer paths would duplicate the
+   id addressing `docs/identifiers.md` already provides.
+
+2. **Storage stays columnar; the patch is derived.** Entries keep their
+   `jurisdiction` field in the one `entries[]` table, as ADR 0008 laid them
+   down. Tombstones are a second top-level table, `suppressions[]`, one
+   record per (jurisdiction, entry): `jurisdiction`, `suppresses` (the
+   `intl` entry id), `cite` (the paragraph that has no counterpart) and
+   `why` (one sentence and the source). `test/data.test.mjs` builds the
+   merge patch from those two tables, applies it with a literal RFC 7396
+   implementation, and asserts the result equals the evaluator's
+   jurisdiction filter. That test is the statement that storage and
+   semantics agree; if they ever diverge, the test names which.
+
+3. **Replace is suppress plus add.** A jurisdiction that reads a paragraph
+   differently tombstones the `intl` entry and adds its own, under its own
+   id (ADR 0015 — the ids are distinct because the norms are). There is no
+   third operation and no in-place edit of an `intl` entry: REQ-SCOPE-4
+   holds.
+
+4. **The array caveat is accepted and irrelevant here.** Merge Patch
+   replaces an array wholesale. The patch is keyed at entry granularity, so
+   the only arrays it ever touches are inside a whole entry being added, and
+   an entry is small. A jurisdiction never patches one element of an
+   inherited entry's `lights`; it replaces the entry (point 3).
+
+5. **Only an inherited entry can be tombstoned.** A tombstone naming a
+   jurisdiction's own entry, or another jurisdiction's, is rejected by test:
+   the first is a deletion, the second was never in force.
+
+6. **A tombstone is verified the way an entry is.** Each needs one fixture
+   under its jurisdiction whose facts match the suppressed entry's predicate
+   and whose expectation omits it, and one `intl` fixture showing the entry
+   in force at the base (REQ-VERIFY-3, both sides).
+
+7. **Two tombstones land with this ADR**, both verified: `us/inland`
+   suppresses `rule:28` (Rule 28 "[Reserved]") and `rule:23d_ii` (no
+   counterpart to the under-7 m, 7 kn exception). They are enough to
+   exercise inherit and delete; no verified replace case exists in Part C
+   yet, so that branch of point 3 is stated, schema-ready and unexercised.
+
+## Consequences
+
+- **Q-11 is answered and its hold is lifted.** REQ-SCOPE-3's "no non-`intl`
+  jurisdiction lands before an explicit suppression mechanism exists" is
+  discharged by this mechanism; a jurisdiction lands with its tombstones or
+  it does not land. ADR 0008's add-only carve-out survives as the trivial
+  case: a delta with no tombstones is a merge patch with no `null`s.
+- **Issue #45 is closed by this ADR.** README names the RFC beside the
+  jurisdiction paragraph so a consumer knows which library semantics
+  reproduce the inheritance.
+- **A suppressed entry can leave a record out of vocabulary.** Under
+  `us/inland` a record carrying `activity:cbd` now selects nothing:
+  `rule:28` is gone and the Rule 23(a) entries it imported read
+  `activity:none`. That is the honest answer — "constrained by her draft" is
+  not an Inland status — and the package does not pick a reading. It is
+  recorded in `known_omissions` and pinned by a fixture. Whether the fact
+  vocabulary should carry per-jurisdiction membership so a consumer's
+  decode can be checked is a new question, not decided here.
+- **`rule:23d_i` cites a path Inland does not spell.** 33 CFR 83.23(d) has
+  no `(i)`; the content sits at bare `83.23(d)`. The entry is inherited
+  correctly — the norm is the same — and the citation-spelling question is
+  GATE-1's, untouched here.
+- **GATE-1, Q-10 and Q-8 are not taken.** Q-11 named a "second-jurisdiction
+  bundle"; this ADR takes only the item that gated data. The others stay
+  open on their own triggers.
+- **Cost to reverse.** Delete `suppressions[]` from data, schema and the
+  three tests; the two fixtures fail and are deleted with them. No consumer
+  reads the table yet. Pre-1.0, a revert.

package/docs/adr/0019-relation-reach-and-import-reads.md

@@ -0,0 +1,106 @@
+# ADR 0019 — What a relation reaches, and what an import reads
+
+Date: 2026-09-16
+Status: proposed — merging this PR is the ruling; a revert undoes it
+
+## Context
+
+REQ-MODEL-7 and the README define the six relation verbs by meaning and
+leave composition to the consumer (REQ-CONS-3). colregs-engine#33 checked
+the seven composition decisions its evaluator makes where the data is
+silent. ADR 0007 settled the largest, direction: a directed "this one
+prevails" is `rel:overrides`, and `rel:excludes` is pick-one between
+alternatives. Three readings of the verbs remain stated only in
+colregs-engine's `docs/engine-notes.md` (items 2, 3 and 5) and pinned only
+by its tests: how far a relation reaches, what a `one_of` yields, and which
+part of a referenced entry's predicate an import consults. Each is a
+reading of the Rules, and the package that carries the Rules should say it.
+
+## Decision
+
+1. **Displacing relations reach entries in force; composing relations
+   reach what is exhibited.** An entry is *in force* when its own predicate
+   holds. `rel:overrides` and `rel:exempts` act on entries in force and on
+   nothing else: an import is not in force, it is a light set its carrier
+   exhibits, and the carrier is what a displacing relation must name.
+   `rel:in_lieu_of`, `rel:excludes`, `rel:includes` and
+   `rel:conditional_includes` act on what one display may contain, imports
+   included, and remove nothing from the set of entries in force. Direction
+   is carried by the verb, never by modality: an override fires from a
+   forceful entry (ADR 0007), an exemption from a `modality:exempt` one,
+   and `rel:excludes` fires from nowhere — it is symmetric and already
+   barred to forceful entries by CI (`test/data.test.mjs`, "rel:excludes is
+   reciprocated"). A consumer that infers a veto from an excluder's modality
+   is reading a relation the data does not carry.
+
+2. **A `one_of` yields exactly one option per display, or none when the
+   carrier is `modality:may`.** Under a `may` carrier the chosen option is
+   exhibited in lieu of the carrier's own lights, and the none choice
+   exhibits them (25(d)(ii): the sailing lights, or failing them the torch).
+   An option already in force by its own predicate discharges the set: the
+   carrier imports nothing, and the option composes as the entry it is. A
+   vessel restricted in her ability to manoeuvre at anchor shows 30(a) or
+   30(b) because 30(a) and 30(b) apply to her, not because 27(b)(iv)
+   redirects her to them. Every choice is returned (REQ-MODEL-8).
+
+3. **An import reads the referenced entry's lights, their modality, and
+   its scalar gates — never its axes.** An import is a `rel:includes`, the
+   `rel:includes` of a `rel:conditional_includes` branch, or a `one_of`
+   option. `facts.json`'s `axes` and `modifiers` are the field: a key
+   declared there is the vessel's situation, and the carrier's redirect has
+   already placed her in it — 30(d) sends a vessel aground to "the lights
+   prescribed in paragraph (a) or (b)", and that she is not at anchor is the
+   premise of the redirect, not a gate on it. A key not declared there is a
+   fact the redirect does not alter, and the referenced entry's condition
+   on it binds: 30(b)'s "less than 50 metres" binds a vessel aground as it
+   binds one at anchor, and 25(b)'s "less than 20 metres" binds a vessel
+   under oars. Modality is the referenced entry's, resolved against the
+   vessel (Rule 28's three reds are `may`; the Rule 23 lights it imports
+   stay `shall`). A gate the carrier needs that the source does not carry is
+   written on the carrier's branch `when`, as 27(f) and 29(a) do; nothing
+   is inferred from a source's axes in either direction. REQ-MODEL-7's
+   "lights only, never its predicate" is amended to say this.
+
+4. **Two entries in force whose `rel:in_lieu_of` targets intersect are
+   alternatives to each other** and never share a display. This is an
+   invariant of the verb, not a declared pair list. The two pairs the data
+   can hold in force together read that way in the text: 23(d)(ii)'s
+   display is 23(d)(i)'s with the sidelights made practicable-only, and
+   25(d)(i)'s torch is what a vessel shows *if she does not* exhibit (a) or
+   (b). The Rule 24 entries that share targets — 24(a)(i) below and above
+   200 m, and 24(c) — are disjoint on their own predicates and never meet.
+   A future pair that lawfully combines is the evidence to reopen this
+   point; until one exists, the target sets are the declaration.
+
+Three shapes were considered and not adopted. Restating each option's
+scalar gate on the carrier's branch (30(d) split at 50 m) keeps "lights
+only" literal at the cost of transcribing 30(b)'s condition into 27(b)(iv),
+27(f), 29(a) and 30(d), and 25(b)'s into 25(d)(ii), plus a CI check to
+police the copies; the text redirects, it does not restate, and REQ-MODEL-5
+puts a gate where its fact lives. Declaring the point-4 pairs as a relation
+duplicates what the target sets say. A per-verb "reaches imports" flag
+would be set the same way on every entry, and a field nothing varies is
+decoration.
+
+## Consequences
+
+- **No data changes.** The README relation table, REQ-MODEL-7 and the
+  `relations` notes in `data/applicability.json` say the four points in
+  this PR. `docs/identifiers.md` and the schema are untouched.
+- **colregs-engine implements this in one issue, three deletions.** Its
+  modality-inferred exclusion path goes: `rel:excludes` is a co-occurrence
+  check on a display and nothing more. Its `includeApplies` goes: it
+  consulted one axis by name on `rel:includes` imports, the inverse of
+  point 3, and no import in the data reaches it on a coherent record —
+  every carrier either shares the source's position gate (23(b), 23(c),
+  25(c), 28), gates its branch on it (24, 27(f), 29(a)), or reads
+  `fact:making_way`, which refines `position:underway` (26(b)(iii),
+  26(c)(iii), 27(a)(iii), 27(b)(iii)). The availability test it already
+  applies to `one_of` options becomes the one rule for every import. Its
+  `docs/engine-notes.md` items 2–5 become pointers here. colregs-engine#33
+  items 1, 6 and 7 stay the engine's: presentation and output shape.
+- **A `one_of` option's scalar gate is a normative read of the source
+  entry.** Editing 30(b)'s length gate changes what a vessel aground may
+  show. That is the intended coupling: one paragraph, one gate.
+- **Cost to reverse.** Delete this file and restore two sentences; the
+  engine's deleted paths come back by revert. Pre-1.0, a revert.

package/docs/budgets.json

@@ -23,6 +23,8 @@
     "docs/adr/0015-rule-ids-are-paragraph-keys.md": 210,
     "docs/adr/0016-encounter-roles-are-pooled-across-frames.md": 90,
     "docs/adr/0017-closed-vocabularies-are-prefixed-identifiers.md": 120,
+    "docs/adr/0018-jurisdiction-delta-is-a-merge-patch.md": 120,
+    "docs/adr/0019-relation-reach-and-import-reads.md": 110,
     "docs/timeline.md": 130,
     "docs/maritime-sources.md": 130,
     "docs/decisions.md": 40

package/docs/decisions.md

@@ -3,4 +3,6 @@
 Rulings from `/sequence` sessions and other closed judgment calls. One line
 each: date, short name, the answer, a link to the argument.
 
+- 2026-09-16 — docs ownership: colregs-engine's docs are sited wrong; colregs owns docs going forward, no new doc lands in colregs-engine. `normative-language.md` was already migrated the same day (commit fe0f8c2, #125); migration of the remaining three (`formal-methods-glossary.md`, `formal-methods-reading-list.md`, `engine-notes.md`) is not yet scheduled. Argued on kanban; no public writeup to link.
 - 2026-09-16 — own vs self: rename the subject segment `own` to `self` across the situation record (fact keys, precedence effect keys, facts.json, fixtures, docs/identifiers.md). Work spawned as [colregs#138](https://github.com/mark-brannan/colregs/issues/138).
+- 2026-09-16 — Q-54, Rule 17's phases are monotone: once 17(a)(ii) permission or the 17(b) duty has arisen for the stand-on vessel, it does not fall back on belated give-way compliance. Argued in [colregs#72](https://github.com/mark-brannan/colregs/issues/72); recorded in `docs/requirements.md`.

package/docs/identifiers.md

@@ -181,7 +181,7 @@ is an enumerated fact, so its values follow the bare-fact-name rule above:
 Rule 13(d) is the reason history is a class and not a note. Once a vessel is
 overtaking, a subsequent alteration of the bearing does not make her a
 crossing vessel; the instantaneous geometry, read alone, says otherwise and
-hands the duty to the wrong vessel. So the latch is a fact:
+hands the duty to the wrong vessel. So overtaking history is a fact:
 
 - `self:hist:was_overtaking` — this subject was, earlier in this encounter,
   an overtaking vessel with respect to the other.
@@ -433,6 +433,9 @@ implemented in the reference evaluator and asserted by the fixtures.
   words. It is deliberately not a light reference and does not resolve to
   one.
 
+Not being an identifier says nothing about whether a vocabulary gets a
+catalog label; see REQ-LANG-6.
+
 ## This does not reverse GATE-5
 
 GATE-5 declined a CI-enforced terminology glossary, permanently, for the

package/docs/part-b-invariants.md

@@ -67,7 +67,7 @@ is Rules 11–18, III is Rule 19; which governs a pair is `INV-19a-scope`.
 # Rule 13 — Overtaking
 
 13(a) assigns a role, 13(b) deems the encounter, 13(c) resolves doubt, 13(d)
-latches the result against the geometry that follows.
+persists the result against the geometry that follows.
 
 ### INV-13b — the overtaking deeming test
 
@@ -122,7 +122,7 @@ well as Rules 14 and 15.
   Settled by P4.2's role assignment: the override is or is not needed to keep
   "never both give-way" true.
 
-### INV-13d — the latch: the classification survives the geometry
+### INV-13d — overtaking history: the classification survives the geometry
 
 `13(d)` · classification · temporal, a state to every later state of the
 encounter · `✎`
@@ -140,10 +140,11 @@ until self is finally past and clear, the encounter type of the pair is
   forbids: an overtaking drawn out on the bow reads *crossing*, and hands
   give-way to the wrong vessel.
 - **Undetermined term.** "Finally past and clear" has no fact and no threshold;
-  the data's latch is consumer-cleared and never self-clears (`Q-47`), a trace
-  model's is its segmentation, and no bearing or range is invented here.
-- **Readings in doubt.** Two: what arms the latch, `Q-51`; what it forbids,
-  `Q-52`.
+  the data's overtaking history is consumer-cleared and never self-clears
+  (`Q-47`), a trace model's is its segmentation, and no bearing or range is
+  invented here.
+- **Readings in doubt.** Two: what arms the overtaking history, `Q-51`; what it
+  forbids, `Q-52`.
 - Entries: `rule:13d`, reading `self`/`other:hist:was_overtaking` and no geometry; the
   `was_overtaking: false` gates on `rule:14b`, `rule:15a:crossing`, `rule:15a:keep_out_of_the_way`
   implement `Q-52`'s *broad* reading. Settled by `Q-51`, `Q-52`, then TLC on a
@@ -162,8 +163,8 @@ type alone cannot distinguish `Q-52`'s readings.
 
 - **State remembered.** As `INV-13d`.
 - Entries: `rule:13a`'s `any_of` second limb, `self:hist:was_overtaking: true` — role
-  asserted from the latch directly, keeping the limbs separable. Settled by
-  `Q-52`.
+  asserted from the overtaking history directly, keeping the limbs separable.
+  Settled by `Q-52`.
 
 ---
 
@@ -174,10 +175,10 @@ type alone cannot distinguish `Q-52`'s readings.
 `14(b)` reading 14(a)'s conditions · classification · single-state · `✎`
 
 **Invariant.** At any state at which two power-driven vessels are in sight,
-both underway, with risk of collision, and neither latched under `INV-13d`, a
-head-on situation is deemed to exist exactly when each sees the other ahead or
-nearly ahead: `self:geo:rel_bearing_deg` and `other:geo:rel_bearing_deg` each
-in [0°, 11.25°] ∪ [348.75°, 360°).
+both underway, with risk of collision, and neither carrying overtaking history
+under `INV-13d`, a head-on situation is deemed to exist exactly when each sees
+the other ahead or nearly ahead: `self:geo:rel_bearing_deg` and
+`other:geo:rel_bearing_deg` each in [0°, 11.25°] ∪ [348.75°, 360°).
 
 - **Both bearings, not one.** 14(b)'s lights limb is a statement about the
   *other* vessel's aspect; one bearing alone swallows part of the crossing
@@ -219,9 +220,9 @@ way; both are directed to act, and the duty is symmetric.
 `15(a)` · classification · single-state · `✎`
 
 **Invariant.** At any state at which two power-driven vessels are in sight,
-both underway, with risk of collision, and neither latched under `INV-13d`, the
-encounter type is `crossing` exactly when it is neither `overtaking` under
-`INV-13b` nor `head-on` under `INV-14b`.
+both underway, with risk of collision, and neither carrying overtaking history
+under `INV-13d`, the encounter type is `crossing` exactly when it is neither
+`overtaking` under `INV-13b` nor `head-on` under `INV-14b`.
 
 - **Derived, not enumerated.** Enumerating the sector gives two statements of
   one boundary, and the partition's only failure mode is editing one;
@@ -462,11 +463,12 @@ is at each state in exactly one of three phases:
 
 Phase 3 dominates phase 2: an obligation is not qualified by a permission.
 
-- **Reading in doubt.** Monotone or not: `Q-54`.
-- **State remembered.** If monotone, one three-valued latch per stand-on vessel
-  per encounter; if not, no latch but `INV-17c` still needs the phase of each
-  action. TLC distinguishes them: under monotone a late-complying give-way
-  vessel still leaves stand-on action permitted; under reversible it does not.
+- **Reading ruled.** Monotone (`Q-54`): once phase 2 or 3 is reached for the
+  stand-on vessel in an encounter, it does not fall back on belated give-way
+  compliance.
+- **State remembered.** One three-valued marker per stand-on vessel per
+  encounter, monotone: a late-complying give-way vessel still leaves stand-on
+  action permitted.
 
 ---
 
@@ -601,7 +603,7 @@ not jointly exhaustive (`INV-19a-third-state`); Rule 19 supplements Section I
 
 - **Temporal note.** The switch is a function of the current state; a pair may
   cross it and back inside one encounter, and no paragraph says what becomes of
-  a 13(d) latch or a Rule 17 phase: `Q-55`.
+  a 13(d) overtaking history or a Rule 17 phase: `Q-55`.
 - **Undetermined term.** "In or near an area of restricted visibility" has no
   fact (3(l)'s atmospheric condition is nowhere in `data/facts.json`), so `rule:19a`
   selects Section III for any pair not in sight — wider — and records a gap.

package/docs/requirements.md

@@ -72,15 +72,16 @@ Neither consumer lives in this repo.
 - **REQ-SCOPE-3** — A jurisdiction MUST be expressible as a *delta*: entries
   absent from a jurisdiction's data inherit from `intl`. A jurisdiction MUST
   NOT require restating the whole body of rules. Inheritance is "unless
-  suppressed", not unconditional — see Q-11: verified Inland structure
-  (Rule 28 "[Reserved]") means silence-means-inherit would apply
-  international law where the national body deliberately has none, so no
-  non-`intl` jurisdiction lands before an explicit suppression mechanism
-  exists. That bar is about suppression, not licensing: it is independent of
-  REQ-PROV-2 and ADR 0010, and it binds whether a jurisdiction's text ships or
-  is withheld. A delta that only *adds* entries is exempt: it suppresses nothing,
-  so the Q-11 hazard cannot arise from it (ADR 0008, `rule:30a:mooring_buoy`/`rule:30b:mooring_buoy`).
-  A delta that suppresses or replaces an `intl` entry still waits.
+  suppressed", not unconditional: verified Inland structure (Rule 28
+  "[Reserved]") means silence-means-inherit would apply international law
+  where the national body deliberately has none, so a jurisdiction MUST
+  tombstone each inherited entry it deliberately lacks in `suppressions[]`
+  (ADR 0018; Q-11). The delta is an RFC 7396 merge patch over `intl` by
+  entry id — own entries present, tombstones `null`, silence inherits — and
+  a test proves the stored tables equal to that patch applied. This binds
+  whether a jurisdiction's text ships or is withheld (REQ-PROV-2, ADR 0010
+  are separate). A delta that only *adds* entries has no tombstones (ADR
+  0008); one that replaces an `intl` entry tombstones it and adds its own.
 - **REQ-SCOPE-4** — Adding a jurisdiction MUST be additive. It MUST NOT require
   a schema change or edits to existing `intl` entries.
 - **REQ-SCOPE-5** — Geography that gates a rule (Great Lakes, Western Rivers,
@@ -164,14 +165,14 @@ Four layers, each independently addressable.
 - **REQ-MODEL-6** — Entries MUST compose. Multiple entries applying to one fact
   record is the normal case, not an error (Rule 28 is "in addition to" Rule 23).
 - **REQ-MODEL-7** — Five relations MUST be supported:
-  - `rel:includes` — import another entry's **lights only**, never its predicate;
-  - `rel:in_lieu_of` — legal alternatives for the same fact record;
+  - `rel:includes` — import another entry's lights, modality and scalar gates, never its axes (ADR 0019);
+  - `rel:in_lieu_of` — legal alternatives for the same fact record; overlapping targets are alternatives to each other (ADR 0019);
   - `rel:excludes` — mutual exclusion, including across rules; symmetric
     (A excludes B implies B excludes A), and no participating entry MAY be
     forceful (`modality:shall`/`modality:shall-if-practicable`) — a directed "this one
-    prevails" is `rel:overrides` (ADR 0007), not `rel:excludes`;
-  - `rel:exempts` — one entry lifting another's obligation;
-  - `rel:conditional_includes` — import or alternatives, gated on a predicate.
+    prevails" is `rel:overrides` (ADR 0007), not `rel:excludes`; a constraint on one display, never a removal (ADR 0019);
+  - `rel:exempts` — one entry lifting another's obligation; reaches an entry in force, never an import (ADR 0019);
+  - `rel:conditional_includes` — import or alternatives, gated on a predicate; a `one_of` yields exactly one per display, or none under a `may` carrier (ADR 0019).
   The five are not interchangeable; README.md holds the working semantics.
 - **REQ-MODEL-13** — Where a condition goes is not a style choice. A
   condition on whether a paragraph *applies to this vessel at all* MUST be in
@@ -474,24 +475,21 @@ See ADR 0003.
   resolve to a known paragraph path, and on a corpus filename that disagrees
   with the file's internal metadata. Silence MUST NOT imply coverage (the
   language mirror of REQ-SCOPE-6).
-- **REQ-LANG-6** **(unimplemented — no display catalogs exist)** — Display
-  strings for the identifier vocabularies (light names, fact-value labels,
-  modality labels, image captions) MUST be addressable via stable string keys
-  with per-language catalogs, separate from legal corpora. Catalog entries are
-  static strings: no interpolation, plural or gender grammar — message
-  composition belongs to the consumer's i18n system, and this package MUST NOT
-  grow one. Each catalog MUST carry lightweight provenance: contributors,
-  reviewers, review date, licence. Maintainer notes inside structural files
-  are working documentation, not display strings, not part of the localization
-  surface, and stay untranslated.
-- **REQ-LANG-7** **(unimplemented in part — no fallback policy is encoded, but
-  the mixed-corpus statement is missing from the package documentation)** — The
-  package MUST NOT encode a language fallback policy, and MUST NOT silently
-  substitute one corpus for another. Text is only addressable inside a corpus,
-  so every textual unit a consumer retrieves is attributable to its corpus;
-  package documentation MUST state that a mixed-corpus rendering is never a
-  single authoritative edition. Choice and fallback beyond that are the
-  consumer's (the language mirror of REQ-CONS-3).
+- **REQ-LANG-6** — Display strings for the closed vocabularies the package
+  emits (light, modality, role, encounter, jurisdiction, fact values, and
+  image captions **(unimplemented — no catalog yet)**) MUST be addressable
+  via stable string keys with per-language catalogs, separate from legal
+  corpora; not being an identifier does not exclude a vocabulary. Catalog
+  entries are static strings — no interpolation, plural or gender grammar —
+  and MUST carry provenance (contributors, reviewers, review date, licence);
+  definitions stay untranslated in structural files, not catalogued.
+- **REQ-LANG-7** — The package MUST NOT encode a language fallback policy,
+  and MUST NOT silently substitute one corpus for another. Text is only
+  addressable inside a corpus, so every textual unit a consumer retrieves
+  is attributable to its corpus; package documentation MUST state that a
+  mixed-corpus rendering is never a single authoritative edition. Choice
+  and fallback beyond that are the consumer's (the language mirror of
+  REQ-CONS-3).
 - **REQ-LANG-8** — A `community`-tier corpus MUST record who produced and
   who reviewed it. Machine translation without named human review MUST NOT
   be accepted.
@@ -507,6 +505,9 @@ See ADR 0003.
   reflects. The two MAY differ — a corpus transcribed from an older
   consolidation is legitimate — but the difference MUST be machine-visible,
   never silent.
+- **REQ-LANG-11** — Exactly one language MUST be declared reference-complete;
+  CI MUST fail if its catalog omits an emitted value. Other catalogs MAY be
+  partial, gated only by the existing key-resolution check.
 
 ---
 
@@ -930,14 +931,13 @@ Tracked here until resolved; each becomes an ADR.
   Rule 28 "[Reserved]" and has no counterpart for `23(d)(ii)`/`(iii)`
   ([verification](verification/2026-08-30-q6-q8.md), Claim 1), so a
   `us/inland` delta that is merely silent there would inherit the `intl`
-  entries and assert international obligations on inland waters. A delta
-  needs explicit suppression records (tombstones) alongside overrides —
-  "this path/entry deliberately does not exist here", distinguishable from
-  "not yet transcribed". Decide the mechanism in the second-jurisdiction
-  bundle (GATE-1 re-take, GATE-2, Q-10); until then no non-`intl`
-  jurisdiction lands. This is the live blocker on CEVNI, and it is *not* the
-  licence one: ADR 0010 removed the licence block by permitting structure with
-  the text withheld, and left this one standing.
+  entries and assert international obligations on inland waters.
+  **Resolved 2026-09-16, ADR 0018.** Tombstones: `suppressions[]` in
+  `data/applicability.json`, one record per (jurisdiction, `intl` entry),
+  and the whole delta is an RFC 7396 merge patch by entry id, proven by
+  test; the two verified Inland absences are the first tombstones. The hold
+  on non-`intl` jurisdictions is lifted (CEVNI: structure unblocked on both
+  counts, this and ADR 0010). GATE-1, Q-10, Q-8 stay open on their triggers.
   Also from the same verification pass, tracked on the global board rather
   than here: four transcription defects in `data/rules.json` itself
   (`21(a)`, `21(b)`, `23(b)`, `29(b)`) — a data fix, not a design
@@ -1153,7 +1153,7 @@ named that gap before the class existed.
   first-cut table, but it is the one paragraph of Rule 13 that assigns a role
   and a `category:classification` entry has nowhere to put one. Entry `rule:13a` is
   `category:precedence` here, with 13(b)'s sector test left for the `category:classification`
-  entry that would set the `hist:was_overtaking` latch. Settled with the rest
+  entry that would set the `hist:was_overtaking` overtaking-history fact. Settled with the rest
   of `Q-14`, paragraph by paragraph.
 
   **Closed in pencil 2026-09-04 (PR #26).** 13(b) is now written, as *two*
@@ -1161,7 +1161,7 @@ named that gap before the class existed.
   encounter type belongs to the pair and reading aspect alone classified the
   overtaken vessel's side of the same encounter as a crossing. 13(a) stays `category:precedence`, and its predicate now carries both
   halves of "any vessel overtaking any other": the 13(b) sector and the 13(d)
-  latch, as an `any_of`, which closes the gap the entry recorded. 13(d) is a
+  overtaking history, as an `any_of`, which closes the gap the entry recorded. 13(d) is a
   third `category:classification` entry, reading history and no geometry at all. The
   split confirms the thing ADR 0005 §1 was really defending — one category per
   paragraph. **Reversed in part, 2026-09-16:** ADR 0015 as rewritten makes
@@ -1242,7 +1242,7 @@ written up in `docs/identifiers.md` §"Effects"; what it could not is here.
   again: on those unordered pairs Rule 15 lays a give-way duty on a vessel
   that may be unable to discharge it, which is Rule 2's region and is
   recorded, not gated. `rule:13a` needs no override against `rule:15a:keep_out_of_the_way` — the
-  entry excludes every overtaking by the `hist:was_overtaking` latch and by
+  entry excludes every overtaking by the `hist:was_overtaking` overtaking history and by
   13(b)'s sector — and a test pins that absence so it stays a reason rather
   than an oversight. The hand-list of six is asserted complete by a derived
   check: every Rule 18 entry that assigns a helm role and does not gate a
@@ -1284,7 +1284,7 @@ written up in `docs/identifiers.md` §"Effects"; what it could not is here.
 - **Q-43** — **The partition needs history to be present, and says nothing when
   it is absent.** `rule:14b` and `rule:15a:crossing` are gated on `hist:was_overtaking`
   being `false` on both subjects, which is 13(d)'s requirement and the only way
-  the three encounter types stay disjoint once the latch is set. Because absent
+  the three encounter types stay disjoint once the overtaking history is set. Because absent
   is absent, a situation that omits the fact is classified as *no encounter at
   all* rather than as a head-on or a crossing. That is conservative in the
   right direction and completely silent, which is the wrong way to be
@@ -1344,7 +1344,7 @@ written up in `docs/identifiers.md` §"Effects"; what it could not is here.
   in seamanship and is one here. Settled by deciding whether the language gains
   fact-to-fact comparison — a bigger change than `not` and `any_of` were, and
   not one to make for a single paragraph.
-- **Q-47** — **13(d)'s latch never clears.** The paragraph runs "until she is
+- **Q-47** — **13(d)'s overtaking history never clears.** The paragraph runs "until she is
   finally past and clear", nothing in the fact vocabulary carries that, and so
   in this model `hist:was_overtaking` is set by a consumer and cleared by a
   consumer while entry `rule:13d` classifies an overtaking for as long as it stands.
@@ -1354,14 +1354,14 @@ written up in `docs/identifiers.md` §"Effects"; what it could not is here.
   `category:conduct` monitors, which are the things that watch a duty end rather than
   begin.
 
-  **Ruled 2026-09-08:** while one vessel holds the latch, 13(a)'s sector
-  test is suppressed on the other, newly-gaining vessel — once overtaking,
-  always overtaking, per 13(d)'s own text, so a geometry test that would
-  newly name a second give-way vessel must not fire while the first still
-  holds the role by history alone. `rule:13a`'s sector branch now also reads
-  `other:hist:was_overtaking: false`; the closing fixture in
+  **Ruled 2026-09-08:** while one vessel's overtaking history stands, 13(a)'s
+  sector test is suppressed on the other, newly-gaining vessel — once
+  overtaking, always overtaking, per 13(d)'s own text, so a geometry test
+  that would newly name a second give-way vessel must not fire while the
+  first still holds the role by history alone. `rule:13a`'s sector branch now
+  also reads `other:hist:was_overtaking: false`; the closing fixture in
   `fixtures/situation-fixtures.json` is the case this closes — a vessel
-  drops back onto the latch-holder's own stern, and only the latch-holder
+  drops back onto the history-holder's own stern, and only the history-holder
   gives way.
 - **Q-48** — **Nothing checks that a situation is geometrically possible.**
   `self:geo:rel_bearing_deg`, `other:geo:rel_bearing_deg`, the two
@@ -1392,7 +1392,7 @@ written up in `docs/identifiers.md` §"Effects"; what it could not is here.
   bearing-rate values were placeholders. They were re-derived from the headings
   and speeds. Two cases could not keep their story: the R1 head-on had both
   vessels with the other to starboard, which no speeds make a steady bearing,
-  and is recast as one; the 13(d) latch case is 400 m abeam with the CPA
+  and is recast as one; the 13(d) overtaking-history case is 400 m abeam with the CPA
   already past, and lost `rule:7d_i`. The partition sweep now constructs positions
   and headings for every bearing pair and is consistent at every point. The
   "never both give-way" property is asserted over a sweep of steady-bearing
@@ -1430,18 +1430,18 @@ nothing is blocked while open.
   give-way and Rule 16 binds her. *Narrow:* Section II's duties attach only with
   risk of collision; 14 and 15 are emphasis. Default **wide**: `rule:13a`, `rule:13b`,
   `rule:13d` and every Rule 18 entry read `in_sight` only. No recommendation.
-- **Q-51** — **What arms 13(d)'s latch?** *A:* 13(b)'s deeming, at the first
+- **Q-51** — **What arms 13(d)'s overtaking history?** *A:* 13(b)'s deeming, at the first
   state the geometry holds. *B:* 13(a)'s duty actually attaching. They differ
   where the geometry holds but a condition on 13(a) does not — `Q-50`'s
-  surface. Pencilled **B** ✎ (Solace, 2026-09-14): the latch arms when the
+  surface. Pencilled **B** ✎ (Solace, 2026-09-14): the overtaking history arms when the
   duty attaches. KIVELI [2025] EWHC 1185 (Admlty) holds the analogous Rule 14
-  latch arms on risk of collision and then persists; no authority was found on
+  history arms on risk of collision and then persists; no authority was found on
   overtaking geometry with no risk of collision. Free to reverse: four entries
   (`rule:13a`, `rule:13b`, `rule:13d`) and their fixtures, and nothing consumes the one
   state this changes the answer for. Settled by: a decision on Rule 13 itself,
   or Cockcroft & Lameijer on whether overtaking status needs risk of
   collision.
-- **Q-52** — **What does 13(d)'s latch forbid?** *Narrow:* reclassification to
+- **Q-52** — **What does 13(d)'s overtaking history forbid?** *Narrow:* reclassification to
   *crossing* only, as the paragraph says, leaving head-on to Rule 14 on the
   geometry of the moment. *Broad:* the encounter stays an overtaking and no
   other Section II classification attaches. Both preserve the duty; they differ
@@ -1459,16 +1459,16 @@ nothing is blocked while open.
   flags any other alteration. No default (Rule 17 has no entry). Recommend
   **exception**: 17(a)(ii) describes an action, not a proviso, and leaves a
   monitor something to check — a drafting argument, not a source.
-- **Q-54** — **Are Rule 17's phases monotone?** *Latching:* one three-valued
-  monotone latch per stand-on vessel per encounter; late compliance does not
-  take the permission away. *Re-evaluating:* each phase is a predicate on the
-  current state and the vessel may fall back — and must she then hold her *new*
-  course and speed? TLC distinguishes them on a four-state trace, so settle
-  before P4.2. No default. Recommend **latching**: one late alteration does not
-  restore reliance — an argument from purpose, not a source.
+- **Q-54** — **Are Rule 17's phases monotone?** *Monotone:* one three-valued
+  marker per stand-on vessel per encounter; late compliance does not take the
+  permission away. *Re-evaluating:* each phase is a predicate on the current
+  state and the vessel may fall back — must she then hold her *new* course
+  and speed? TLC distinguishes them on a four-state trace. **Ruled
+  2026-09-16:** monotone — permission or duty, once arisen, survives belated
+  compliance; a fall-back needs a baseline the Rules lack (`Q-57`). No holding on point (colregs#72); *Ever Smart* [2021] UKSC 6 para 61 has the obligation cease at 17(a)(ii)/17(b) with no revival — consistent with monotone, not a ruling on it.
 - **Q-55** — **What does a visibility transition do to Section II state?**
   Rule 11 and 19(a) switch on the current state; no paragraph says what
-  becomes of a 13(d) latch or a Rule 17 phase. *Persisting:* they belong to the
+  becomes of a 13(d) overtaking history or a Rule 17 phase. *Persisting:* they belong to the
   encounter and survive the fog. *Resetting:* Section II starts afresh on the
   geometry when sight is regained — the reclassification 13(d) forbids, via
   visibility. No default (nothing is temporal). Recommend **persisting**, which

package/fixtures/applicability-fixtures.json

@@ -923,6 +923,48 @@
     "fact:length_m": 11.6
    },
    "expect": []
+  },
+  {
+   "name": "constrained by draft, US Inland: Rule 28 is [Reserved], the record is out of vocabulary and selects nothing",
+   "jurisdiction": "us/inland",
+   "facts": {
+    "fact:propulsion": "propulsion:power",
+    "fact:activity": "activity:cbd",
+    "fact:position": "position:underway",
+    "fact:length_m": 200
+   },
+   "expect": []
+  },
+  {
+   "name": "6 m outboard, max speed 6 kn, US Inland: 23(d)(ii) has no Inland counterpart, 23(d)(i) and 23(a) are inherited",
+   "jurisdiction": "us/inland",
+   "facts": {
+    "fact:propulsion": "propulsion:power",
+    "fact:activity": "activity:none",
+    "fact:position": "position:underway",
+    "fact:length_m": 6,
+    "fact:max_speed_kn": 6
+   },
+   "expect": [
+    "rule:23a_i",
+    "rule:23a_ii",
+    "rule:23a_iii_iv",
+    "rule:23d_i"
+   ]
+  },
+  {
+   "name": "constrained by draft, at anchor, US Inland: Rule 30 is inherited untouched",
+   "jurisdiction": "us/inland",
+   "facts": {
+    "fact:propulsion": "propulsion:power",
+    "fact:activity": "activity:cbd",
+    "fact:position": "position:anchored",
+    "fact:length_m": 200
+   },
+   "expect": [
+    "rule:30a",
+    "rule:30c"
+   ]
   }
  ]
 }

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "colregs",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "COLREGS 72 and its national amalgamations as language-neutral JSON — rule text, light definitions, and applicability predicates — with cross-implementation fixtures",
   "license": "Apache-2.0",
+  "colregs": {
+    "referenceLanguage": "en"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/mark-brannan/colregs.git"

package/schema/applicability.schema.json

@@ -306,6 +306,21 @@
         "classification_shape": { "type": "string" }
       }
     },
+    "suppressions": {
+      "$comment": "Tombstones (REQ-SCOPE-3, ADR 0018): a jurisdiction deliberately lacks an inherited intl entry, as distinct from not-yet-transcribed. With the jurisdiction's own entries these form its RFC 7396 merge patch over intl; suppresses is the key that patch sets to null.",
+      "type": "array",
+      "items": {
+        "type": "object",
+        "additionalProperties": false,
+        "required": ["jurisdiction", "suppresses", "cite", "why"],
+        "properties": {
+          "jurisdiction": { "type": "string", "pattern": "^[a-z]+(/[a-z]+)+$" },
+          "suppresses": { "$ref": "#/$defs/ruleId" },
+          "cite": { "type": "string", "minLength": 1 },
+          "why": { "type": "string", "minLength": 1 }
+        }
+      }
+    },
     "known_omissions": {
       "type": "array",
       "items": {

package/schema/i18n-catalog.schema.json

@@ -2,7 +2,7 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://github.com/mark-brannan/colregs/schema/i18n-catalog.schema.json",
   "title": "data/i18n/*.json",
-  "description": "Display catalog for one BCP 47 language: UI strings for identifier vocabularies (light names, fact-axis labels, modality labels, image captions), not legal text -- see docs/adr/0003-language-as-a-dimension.md 'Display catalogs'.",
+  "description": "Display catalog for one BCP 47 language: UI strings for the closed vocabularies the package emits (lights, modalities, roles, encounters, jurisdictions, closed-list fact values), not legal text -- see docs/adr/0003-language-as-a-dimension.md 'Display catalogs' and REQ-LANG-6.",
   "type": "object",
   "additionalProperties": false,
   "required": ["language", "provenance", "strings"],
@@ -25,18 +25,39 @@
     },
     "strings": {
       "type": "object",
-      "description": "One section per vocabulary. Every section is keyed by the identifier itself, as documented in docs/identifiers.md -- light identifiers (light:) and closed-vocabulary identifiers (modality:, and any of role:/encounter:/category: that gain a catalog section) alike, as stored in data/applicability.json. Values are static strings: no interpolation, no plurals -- the consumer's i18n system owns composition.",
+      "description": "One section per vocabulary (REQ-LANG-6, REQ-LANG-9's ruling docs/adr/0017). Every section is keyed by the identifier itself, as documented in docs/identifiers.md -- light, modality, role and encounter identifiers carry a type prefix; jurisdiction and closed-list fact values are keyed by their own bare or fact-prefixed form. Values are static strings: no interpolation, no plurals -- the consumer's i18n system owns composition.",
       "additionalProperties": false,
       "properties": {
-        "light": {
+        "lights": {
           "type": "object",
           "propertyNames": { "pattern": "^light:[a-z_]+$" },
           "additionalProperties": { "$ref": "#/$defs/label" }
         },
-        "modality": {
+        "modalities": {
           "type": "object",
           "propertyNames": { "pattern": "^modality:[a-z]+(-[a-z]+)*$" },
           "additionalProperties": { "$ref": "#/$defs/label" }
+        },
+        "roles": {
+          "type": "object",
+          "propertyNames": { "pattern": "^role:[a-z]+(-[a-z]+)*$" },
+          "additionalProperties": { "$ref": "#/$defs/label" }
+        },
+        "encounters": {
+          "type": "object",
+          "propertyNames": { "pattern": "^encounter:[a-z]+(-[a-z]+)*$" },
+          "additionalProperties": { "$ref": "#/$defs/label" }
+        },
+        "jurisdictions": {
+          "type": "object",
+          "propertyNames": { "pattern": "^[a-z]+(/[a-z]+)*$" },
+          "additionalProperties": { "$ref": "#/$defs/label" }
+        },
+        "facts": {
+          "type": "object",
+          "description": "Closed-list fact-value labels only (Tier A): propulsion, activity, position, rule18_class, dynamics, obstruction_side, wind_side. Field names (fact:length_m, geo:tcpa_s, ...) have no closed list behind them and are never catalogued here -- form-label text and unit/number formatting are the consumer's.",
+          "propertyNames": { "pattern": "^[a-z][a-z0-9_]*:[a-z][a-z0-9_]*$" },
+          "additionalProperties": { "$ref": "#/$defs/label" }
         }
       }
     }

package/schema/lights.schema.json

@@ -53,10 +53,9 @@
         "^light:[a-z_]+$": {
           "type": "object",
           "additionalProperties": false,
-          "required": ["name", "colregs_term", "cite", "character", "rule21"],
+          "required": ["term", "cite", "character", "rule21"],
           "properties": {
-            "name": { "type": "string", "minLength": 1 },
-            "colregs_term": { "type": "string", "minLength": 1 },
+            "term": { "type": "string", "minLength": 1 },
             "cite": { "type": "string", "minLength": 1 },
             "color": { "type": ["string", "null"] },
             "color_note": { "type": "string" },