colregs 0.2.4 → 0.3.1

package/data/text/intl/2016/es.boe.json

@@ -0,0 +1,23 @@
+{
+ "id": "intl@2016.es.boe",
+ "edition": "intl@2016",
+ "edition_status": "claimed",
+ "language": "es",
+ "source_id": "boe",
+ "tier": "national",
+ "normalization": "NFC",
+ "source": {
+  "publisher": "Agencia Estatal Boletín Oficial del Estado",
+  "title": "Instrumento de Adhesión de España al Convenio sobre el Reglamento internacional para prevenir los abordajes, 1972",
+  "url": "https://www.boe.es/",
+  "retrieved": null
+ },
+ "rights": {
+  "source_text": "BOE aviso legal: reuse permitted, commercial and non-commercial; consolidated texts must not be represented as official",
+  "redistribution_basis": "BOE aviso legal, with attribution",
+  "attribution": "Fuente de los datos: Agencia Estatal Boletín Oficial del Estado",
+  "package_licence": "Apache-2.0"
+ },
+ "note": "Stub: the BOE instrument id is not yet located; resolve it and the retrieval date before any text lands -- Q-7.",
+ "paragraphs": {}
+}

package/data/text/intl/2016/fi.finlex.json

@@ -0,0 +1,22 @@
+{
+ "id": "intl@2016.fi.finlex",
+ "edition": "intl@2016",
+ "edition_status": "claimed",
+ "language": "fi",
+ "source_id": "finlex",
+ "tier": "national",
+ "normalization": "NFC",
+ "source": {
+  "publisher": "Finlex (Oikeusministeriö), Suomen säädöskokoelman sopimussarja",
+  "title": "Asetus kansainvälisistä säännöistä yhteentörmäämisen ehkäisemiseksi merellä vuonna 1972 tehdyn yleissopimuksen voimaansaattamisesta, SopS 30/1977",
+  "url": "https://www.finlex.fi/fi/sopimukset/sopsteksti/1977/19770030",
+  "retrieved": "2026-09-12"
+ },
+ "rights": {
+  "source_text": "Tekijänoikeuslaki 404/1961 §9: no copyright in treaties and their official translations",
+  "redistribution_basis": "Finlex FAQ: published materials carry no usage restriction; open data CC BY 4.0",
+  "package_licence": "Apache-2.0"
+ },
+ "note": "Stub: identity and provenance only; the Finnish text is not transcribed yet. GATE-2 is adopted in docs/gates.json, settled by ADR 0013, so nothing structural blocks it.",
+ "paragraphs": {}
+}

package/data/text/us/inland/2014/en-US.ecfr.json

@@ -0,0 +1,22 @@
+{
+ "id": "us/inland@2014.en-US.ecfr",
+ "edition": "us/inland@2014",
+ "edition_status": "claimed",
+ "language": "en-US",
+ "source_id": "ecfr",
+ "tier": "national",
+ "normalization": "NFC",
+ "source": {
+  "publisher": "Office of the Federal Register, eCFR",
+  "title": "33 CFR Part 83, Navigation Rules (Inland)",
+  "url": "https://www.ecfr.gov/current/title-33/chapter-I/subchapter-E/part-83",
+  "retrieved": null
+ },
+ "rights": {
+  "source_text": "Work of the United States Government, not subject to copyright in the United States (17 U.S.C. 105)",
+  "redistribution_basis": "17 U.S.C. 105",
+  "package_licence": "Apache-2.0"
+ },
+ "note": "Stub: a second jurisdiction, so the key shape is exercised on both axes; the delta itself waits on Q-11 -- REQ-SCOPE-3.",
+ "paragraphs": {}
+}

package/data/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.2.4"
+  "version": "0.3.1"
 }

package/docs/adr/0001-name-and-jurisdiction-model.md

@@ -1,8 +1,9 @@
 # ADR 0001 — Package name, and jurisdiction as a dimension
 
 Date: 2026-08-29
-Status: accepted; amended 2026-09-05 and 2026-09-09 (licence terms verified,
-see Amendments). CEVNI's text stays blocked; ADR 0010 unblocks modelling it.
+Status: accepted; amended 2026-09-05, 2026-09-09 and 2026-09-12 (licence
+terms verified, see Amendments). CEVNI's text stays blocked; ADR 0010
+unblocks modelling it.
 
 ## Context
 
@@ -225,3 +226,42 @@ corpus candidates, previously unchecked. Q-6 (authenticity) verified
 `es` clears REQ-PROV-2; `fi` and `en`/`fr` via UNTS stay open. Updating
 `docs/requirements.md` Q-7 for this is left as a follow-up (concurrent
 edits to that file are in flight elsewhere).
+
+### 2026-09-12 — UNTS and Finlex resolved (issue #81, Q-7)
+
+Re-ran both 2026-09-09 checks with a fetch that renders what looked like a
+JS-only shell. Finlex turned out not to need a browser: its Next.js page
+ships the article text inline in a React Server Components payload that a
+plain fetch already receives, just not as visible HTML.
+
+**Finlex (`fi`) — resolved clean.** §9, Tekijänoikeuslaki 404/1961: no
+copyright in laws and decrees; in other documents enacted via the Statutes
+Collection and in treaties and similar instruments containing international
+obligations; in the decisions and statements of an authority or other public
+body; or in official translations of the above. Finlex's own FAQ
+(`finlex.fi/fi/ukk`, Ministry of Justice) states published materials carry
+no usage restrictions, and machine-readable open data is licensed CC BY 4.0.
+EFFI's contested claim concerns the compiled database, not the statute text
+§9 already excludes; Finlex's current primary statement outranks that
+secondary source.
+
+**UNTS (`en`/`fr`) — resolved, and it does not clear.** Checked the UNTS
+intro and FAQ pages on treaties.un.org and the copyright and terms-of-use
+pages on un.org directly; none needed a browser. No UNTS-specific rights
+page exists anywhere in that set — every path leads to the same general UN
+terms already found blocking CEVNI: personal, non-commercial use, with no
+right to resell, redistribute or create derivative works. Confirmed
+blocked, not merely ambiguous.
+
+Per Q-7's per-language routing, `es` (BOE, cleared 2026-09-09) is the
+corpus that unblocks the first non-`intl` text; `fi` is now open alongside
+it. UNTS stays closed pending written UN permission or a national
+republication of the authentic `en`/`fr` text.
+
+Sources: `fi` —
+<https://www.finlex.fi/fi/laki/ajantasa/1961/19610404> (§9);
+<https://www.finlex.fi/fi/ukk> (usage terms, CC BY 4.0). UNTS —
+<https://treaties.un.org/Pages/Content.aspx?path=DB/UNTS/pageIntro_en.xml>;
+<https://treaties.un.org/Pages/Overview.aspx?path=overview/faq/page1_en.xml>;
+<https://www.un.org/en/about-us/copyright>;
+<https://www.un.org/en/about-us/terms-of-use>.

package/docs/adr/0003-language-as-a-dimension.md

@@ -79,8 +79,10 @@ with BCP 47 codes, structured as three layers:
    consolidated state*: the skeleton declares, as data, the amendment state
    it consolidates, and every corpus declares the amendment state its
    source reflects (REQ-LANG-10). A mismatch is legitimate but
-   machine-visible — declared staleness, never silence. Historical states
-   are prior package versions, not an in-data version dimension. A
+   machine-visible — declared staleness, never silence. (GATE-2 adopted in
+   ADR 0013: `data/editions.json` now registers editions in force
+   *concurrently*, so "historical states are prior package versions" holds
+   only for a fully superseded edition, not one still in transition.) A
    renumbering amendment is a major version under REQ-PKG-4 — but it is
    resolved by *issuing new paragraph paths and deprecating the old ones*
    (REQ-MODEL-10/11), never by repointing an existing path at different
@@ -204,11 +206,10 @@ check. What was declined, and why — recorded so it isn't re-argued:
   renumbering lands — or when Q-8's check of the first national
   amalgamation shows paragraph paths do not survive it.
 - **A full temporal/legal-version model** (instrument → edition → corpus as
-  first-class layers; GATE-2). The package models current consolidated law;
-  history lives in package versions. The cheap 80% — declared amendment
-  state on skeleton and corpus, machine-visible mismatch — is adopted
-  instead. If a jurisdiction ever requires multiple concurrent editions,
-  that is a new ADR.
+  first-class layers; GATE-2). Declined *here*; the cheap 80% (declared
+  amendment state, machine-visible mismatch) was adopted instead. **Re-taken
+  and adopted in ADR 0013**, on the trigger this bullet named: a
+  jurisdiction requiring multiple concurrent editions.
 - **`dir: ltr|rtl` metadata per language.** Derivable from the language
   tag via CLDR by any consumer that needs it; storing it invites drift.
 

package/docs/adr/0006-json-schema-and-identifier-diff.md

@@ -1,5 +1,7 @@
 # ADR 0006 — JSON Schema for structural validation, identifier diff for version discipline
 
+The identifier-diff half is removed pre-1.0 by ADR 0015 (Solace, 2026-09-16); it returns, if at all, with the 1.0.0 tag.
+
 Date: 2026-09-04
 Status: accepted
 

package/docs/adr/0011-api-shape.md

@@ -167,7 +167,7 @@ resolution, and validation of the situation record.
 | `own` required, `other`/`Subject.fact` per colregs 0.2.0's fixture schema | ✎ | revised 2026-09-07 from "own/other both required"; Mark to confirm before ink |
 | `appliedEncounterEntries` as the fixture-replay companion | ✎ | the situation-fixture replay being written |
 | Field names snake_case with unit suffixes across both ADRs; `EntryId`/`ParagraphCite` alias `string` for ids and cites | ✎ | the rename's alias window closing; a consumer arguing the compiler should enforce the two apart |
-| `EncounterEvaluation` field set (§4) | ✎ | building it; Q-35, Q-36, Q-43 in colregs |
+| `EncounterEvaluation` field set (§4); `categories` and `provenance` added 2026-09-16 beyond the block above, as `DisplayEvaluation` carries them — colregs-engine 0.1.5 built them and ADR 0014's `encounter-evaluation.schema.json` is now the shape | ✎ | building it; Q-35, Q-36, Q-43 in colregs |
 | `encounter` absent vs the ADR 0005 §5 status alphabet | ✎ | Q-43 |
 | `conduct` is a separate package, not a third verb | ✎ | superseded by ADR 0012: a third and fourth verb, in this package |
 | Geometry-consistency validation (REQ-VERIFY-8) in the engine's validator | ? | deciding whether it is data-suite-only |

package/docs/adr/0012-trace-and-rule2-departure-api.md

@@ -183,9 +183,8 @@ trace becomes a fixture; a certified grid, a `Rule2DepartureModel`.
   2. `Trace`, `appliedConductEntries` against those fixtures — phase 3
      starts here.
   3. `evaluateConduct` with verdicts and phases; the constants above.
-  4. `evaluateRule2Departure` once a grid exists. Until then the name is
-     reserved and nothing exported: a stub answering `inconclusive-in-model`
-     is a stub wearing a status.
+  4. `evaluateRule2Departure` once a grid exists. ~~Until then the name is reserved and nothing exported: a stub answering `inconclusive-in-model` is a stub wearing a status.~~
+     **Struck. Reserving the name was never the policy here: a name gets an export the day it is written down, throwing or answering `inconclusive-in-model`. Withholding an export to look careful is the failure mode, not the stub. — Solace, 2026-09-13**
 
 ## Register
 
@@ -200,4 +199,4 @@ trace becomes a fixture; a certified grid, a `Rule2DepartureModel`.
 | Vague-quantity constants live in colregs; `SolverParameters` on the model and echoed on the finding, `colregs_version` naming the release solved against; nothing else on the model is API | ✎ | the first constant a conduct entry reads; Q-19's sensitivity matrix |
 | `Rule2DepartureFinding` field set — `rules`, `Rule2DepartureAdvisory[]`, no banner cite (it is a function of `status`); the status alphabet is colregs' (ADR 0005 §5), not this package's to rename | ✎ | proposal v4 §4's sensitivity matrix; Q-19, Q-20 |
 | No *situation* input names a departure; the grid does, and is named in every finding | ✎ | — |
-| Nothing exported until a fixture backs it; exports then carry TSDoc's `@beta` release tag | ✎ | — |
+| A name is exported the day it is written down, throwing or answering `inconclusive-in-model`; exports carry TSDoc's `@beta` release tag until a fixture backs them | ✎ | — |

package/docs/adr/0013-corpus-files-with-editions.md

@@ -0,0 +1,70 @@
+# ADR 0013 — Rule text as corpus files under an edition registry (GATE-2 adopted)
+
+Date: 2026-09-12
+Status: accepted (2026-09-13)
+
+## Context
+
+ADR 0003 made language a dimension and sketched its layout, but nothing
+landed, and its GATE-2 (an edition layer between instrument and corpus) is
+due for re-take *before* the first non-English corpus. Finlex (`fi`) and BOE
+(`es`) are both licence-clear (ADR 0001, 2026-09-12), so the next text to
+land forces the key shape. This ADR fixes the keys and leaves the words for
+issue #98. A sibling proposal (branch `multi-jurisdiction-schema`, option A)
+confirms GATE-2 declined instead; the two are meant to be read side by side.
+
+## Decision
+
+1. **`data/rules.json` is the skeleton.** Per paragraph: `path`, `rule`,
+   `jurisdiction`, `images`. No `text`, no `rule_title`, no source, and no
+   amendment state of its own. It gains `24(g)(i)`: the Convention has the
+   path; the USCG page lacks the words, which is the corpus's gap.
+2. **`data/editions.json` is the registry: jurisdiction → instrument →
+   editions.** An edition id is `<jurisdiction>@<tag>` (`intl@2016`,
+   `us/inland@2014`), carrying `amended_through`, `in_force` and optionally
+   `superseded_by`. **The tag is the `in_force` year, nothing else** — the
+   amending instrument (an IMO resolution, a Federal Register cite) belongs
+   in `amended_through`, never in the tag. Each jurisdiction names the
+   edition the skeleton consolidates. Two editions of
+   one jurisdiction may be registered at once, which is GATE-2's trigger
+   case expressed as data rather than as a diff between strings.
+3. **One file per corpus**,
+   `data/text/<jurisdiction>/<tag>/<language>.<source_id>.json`, identity
+   `<edition>.<language>.<source_id>`. A corpus names its `edition` and
+   nothing about jurisdiction or amendment state: both are the edition's.
+   CI checks the edition is registered and the filename agrees.
+4. **A corpus paragraph is `rule_title` + `text`** (or ADR 0010's withheld
+   fields). Corpus metadata otherwise as in option A: `tier`,
+   `normalization`, `source` (REQ-PROV-6), `rights` (three statements),
+   `gaps`, optional `translation_of`.
+5. **`data/corpora.json` indexes the files**, derived and drift-checked.
+6. **GATE-2 is re-taken and adopted.** The cost is one registry file and
+   one extra path segment; the gain is that "which consolidated state" is an
+   identifier compared by equality, not free text compared by eye, and a
+   stub must name an edition before it names anything else.
+
+## What the stubs show
+
+Four corpora ship: `intl@2016.en-US.uscg` (today's text, moved verbatim),
+`intl@2016.fi.finlex`, `intl@2016.es.boe` and `us/inland@2014.en-US.ecfr`,
+the last three empty. The edition layer forces a claim option A lets a stub
+defer: the Finnish and Spanish stubs assert they reflect `intl@2016` before
+anyone has checked, and the `us/inland@2014` edition is recalled, not
+verified, and says so. That is the honest cost of this option and the reason
+to look at both.
+
+## Consequences
+
+- Breaking file layout (REQ-PKG-4): `data/rules.json` no longer carries
+  text. colregs-engine's conformance research reads only `paragraphs` keys
+  and is unaffected; anything reading `.text` moves to the en-US corpus.
+- ADR 0010's withheld mechanics move to the corpus paragraph, where the
+  text is; the skeleton has nothing to withhold.
+- A new IMO amendment is a new registered edition, a new skeleton pointer,
+  and new corpus files under a new directory; the old ones may stay until
+  the last consumer moves, marked `superseded_by`. Under option A the same
+  event is an in-place edit of every corpus's `amendment_state`.
+- REQ-LANG-1, -3, -5, -9, -10 and REQ-PROV-6 move from unimplemented to
+  implemented for the data on file; catalogs (REQ-LANG-6) are untouched.
+- Landing Finnish or Spanish words is an edit to one file and one number in
+  the index, and still waits on this ADR being accepted (REQ-GATE-2).

package/docs/adr/0014-engine-interface-owned-by-colregs.md

@@ -0,0 +1,103 @@
+# ADR 0014 — The engine interface is colregs' to own: an operations manifest and result schemas
+
+Date: 2026-09-16
+Status: proposed. Solace ordered options 2 and 3 built on 2026-09-16; the
+register marks what settles each row.
+
+## Context
+
+ADR 0011 and ADR 0012 fix the engine's verbs and result envelopes, in prose
+and TypeScript blocks, in this repository. The only machine-readable copy
+lives in colregs-engine's `src/types.ts`, so the interface is de facto
+colregs-owned and de jure the engine's: a second engine, in any language,
+would transcribe the ADRs by hand and drift the way the engine's own
+generator was written to stop.
+
+colregs already owns *shapes* in production: the engine compiles every
+`schema/*.schema.json` into generated types and derives `FactRecord` and
+`Situation` from `data/facts.json`. What it does not own is the *operations*
+— which verb reads which input and answers which envelope — and the fixture
+files bind to verbs only by convention.
+
+Ten routes were surveyed on 2026-09-16 for making the interface a colregs
+artefact, the Java sense of interface against implementation:
+
+| # | route | what it gives, what it costs |
+|---|---|---|
+| 1 | result schemas only, verbs stay prose | shapes checkable, operations still hand-read |
+| 2 | **operations manifest**: verb → inputs → result → companion, in JSON | language-neutral; any engine derives its own binding |
+| 3 | **fixtures bound to verbs** in the manifest | the conformance replay becomes the behavioural contract |
+| 4 | hand-written `.d.ts` in colregs | TypeScript-only; the transcription the engine's generator exists to avoid |
+| 5 | `x-operation` keywords inside the existing schemas | option 2 spread over eleven files |
+| 6 | OpenAPI / AsyncAPI | a projection generable *from* 2, not a source |
+| 7 | Protobuf / Smithy | model operations natively; a toolchain a data-only package does not have |
+| 8 | TypeSpec | one source projecting JSON Schema and OpenAPI; same toolchain cost |
+| 9 | a separate `colregs-api` package | a third release train for two files |
+| 10 | status quo | the drift above |
+
+## Decision
+
+1. **`data/operations.json` is the interface.** One operation per verb ADR
+   0011 and ADR 0012 name, each with positional `inputs` (name and schema),
+   an `output` schema, the entry-id `companion` verb where one exists, and
+   the `fixtures` that exercise it. `schema/operations.schema.json` checks
+   its shape; `test/data.test.mjs` checks that every reference resolves.
+2. **Result envelopes are schemas under `schema/`:** `display-evaluation`,
+   `encounter-evaluation`, `conduct-evaluation`, `rule2-departure-finding`,
+   transcribed from the engine's `src/types.ts` at colregs-engine 0.1.5.
+   JSON-Schema-expressible only: `Record<EntryId, Modality>` becomes
+   `patternProperties`, the `EntryId` and `ParagraphCite` aliases become
+   `$defs`, the two deprecated camelCase aliases are marked `deprecated` and
+   optional. From here the schema is the normative statement of each
+   envelope; the TypeScript blocks in ADR 0011 §4 and ADR 0012 §2–4 are
+   illustrations of record, and an envelope changes here first, the engine
+   second.
+3. **Inputs get schemas too:** `fact-record`, `situation`, `trace`,
+   `rule2-departure-model`. The two fixture schemas `$ref` the first two
+   for a case's `facts` and `situation` instead of carrying a copy; a fixture
+   case is the verb's input, and the tests validate every bound case against
+   it.
+4. **Schema files compose by `$ref`,** relative to their `$id`
+   (`applicability.schema.json#/$defs/ruleId`). ADR 0006's "no cross-file
+   references" is about data references — cite to `rules.json` — which stay in
+   the tests; a `$ref` between two schema files is one shape reused, not a
+   data reference. The suite registers every schema by `$id` before compiling.
+   What every envelope shares — the `colregs` stamp, `provenance`, the
+   `ruleId` and `paragraphCite` vocabularies — is `schema/evaluation.schema.json`,
+   `$defs` only, so moving one later is never a two-repository change.
+5. **A fixture file is bound to a verb** by `fixtures[].file` and
+   `case_inputs`, one case key per positional input, with the answer under
+   `expect`: the companion's entry ids unless the binding names another
+   schema. A case's `status` and `jurisdiction` are the fixture file's own.
+   Every file under `fixtures/` must be bound; `evaluateConduct` and
+   `evaluateRule2Departure` bind nothing yet, and say so with an empty list.
+6. **Not in the manifest:** trailing options a binding accepts (`opts.data`),
+   which verbs are built, and what a verb throws. Build status is ADR 0011's
+   and ADR 0012's tables; errors are the binding's.
+
+## Consequences
+
+- Ten new files under `schema/`. The engine's `generate-schema-types.ts`
+  throws on any schema its `ROOT_NAMES` does not list, so the next colregs
+  bump fails its build until colregs-engine#86 lands: emit
+  `interface ColregsEngine` from `operations.json`, `satisfies ColregsEngine`
+  at the engine's root, settle the `fact-record.ts` / `situation.ts`
+  collision with the types it derives from `facts.json` today, and validate
+  real output against these schemas for every fixture case.
+- A YAML rendering of the manifest is lossless; XML is a generated view (JSON
+  Schema to XSD). Authoring the interface in TypeScript first is the one route
+  that forecloses both.
+- The 2026-09-16 hand-off named the finding's schema `rule2-departure`; it
+  lands as `rule2-departure-finding` beside `rule2-departure-model`, since
+  the verb has two shapes to name.
+
+## Register
+
+| item | level | what would settle it |
+|---|---|---|
+| Options 2 and 3, not 1 or 4–10 | ✎ | this ADR accepted |
+| Manifest shape: positional `inputs`, `output`, `companion`, `fixtures[].case_inputs` and `expect` | ✎ | the engine generator consuming it; the first conduct or Rule 2 fixture |
+| Envelope schemas transcribed from `types.ts`, envelope changes land here first | ✎ | the first envelope change after the follow-up |
+| Cross-file `$ref` between schema files | ✎ | a consumer whose validator cannot register a schema set |
+| Deprecated aliases optional in the schema, required in the engine | ✎ | the engine dropping them |
+| `opts` and thrown errors stay out of the manifest | ✎ | a second binding needing either |

package/docs/adr/0015-rule-ids-are-paragraph-keys.md

@@ -0,0 +1,191 @@
+# ADR 0015 — Rule ids are paragraph keys in the `rule:` namespace
+
+Date: 2026-09-16
+Status: accepted — Solace's ruling, 2026-09-16
+
+## Context
+
+Issue #121 asked what an applicability entry should be called, and ruling C
+was read as *names, not citations*. The first draft of this ADR wrote that
+reading out: every id became a coined name in an `entry:` namespace —
+`entry:anchored`, `entry:towing_mastheads_long_tow`, `entry:being_overtaken`.
+It never landed and never shipped. Solace superseded that reading on
+2026-09-16 and this file is the replacement.
+
+What the rename was buying was insulation: `cite` is a data field, revised
+whenever the package reads the Rules better, and `14a` had already become
+`14b` when the reading of *which paragraph deems a head-on* moved. An
+identifier containing a data field gets renamed every time the field is.
+
+What it cost is the vocabulary. An entry is a norm out of the Convention,
+and the people who read these ids — and the consumers that store them
+alongside a `cite` anyway — already have a name for every norm in the
+package: the Rule. `rule:13b` is *Rule 13(b)* in the mariner's mouth. A
+coined name is a second vocabulary beside that one, invented here,
+unguessable from the Rules, and needing a lookup in this file to be read
+back as the paragraph it came from. The insulation is worth one rename in
+a pre-1.0 package; the second vocabulary is permanent. Ruled by Solace,
+2026-09-16.
+
+## Decision
+
+1. **The namespace noun is `rule:`.** It replaces `entry:` everywhere. The
+   overload with the Convention's Rules is the point, not an accident to
+   be designed around.
+2. **An id is `rule:<paragraph-slug>`.** The slug is the cite with its
+   punctuation dropped: rule number, paragraph letter attached, each roman
+   subparagraph joined by `_`. `27(a)(i)` → `27a_i`; `13(b)` → `13b`;
+   `11` → `11`; `23(a)(iii)-(iv)` → `23a_iii_iv`.
+3. **A bare id is the paragraph's principal norm.** Where the text yields
+   a further norm from the same paragraph, it takes a third segment after
+   a colon, named in the text's own words: `rule:24a_i` is 24(a)(i)'s two
+   masthead lights and `rule:24a_i:exceeds_200m` its three, the threshold
+   being the Convention's own, which is when a number may appear in a name.
+4. **Where one sentence fuses a deeming test and a duty, both norms are
+   named.** 15(a) gives `rule:15a:crossing` — the classification, effect
+   `encounter: crossing` — and `rule:15a:keep_out_of_the_way` — the
+   precedence, own give-way. `avoid_crossing_ahead` is reserved for 15(a)'s
+   second duty when the `conduct` shape exists; it is not in use.
+5. **A Convention subparagraph keeps its own cite.** 30(d)'s chapeau is
+   `rule:30d`, citing `30(d)`, importing the 30(a)/(b) anchor lights,
+   modality `shall`; the two all-round red lights are `rule:30d_i`, citing
+   `30(d)(i)`, modality `shall-if-practicable` because the paragraph says
+   "if practicable". `30(d)(i)` joins `rules.json` as a skeleton path with
+   this change. `rule:30d_ii` is reserved for the three balls, and lands
+   when day shapes do.
+6. **A jurisdiction override is named by its difference**, and jurisdiction
+   stays a field: `rule:30a:mooring_buoy` and `rule:30b:mooring_buoy`, both
+   `us/inland`. The name says what 33 CFR 90.5 adds, not who adds it.
+7. **13(b) is one symmetric entry.** The two entries that preceded it were
+   identical but for which subject's `geo:rel_bearing_deg` fell in
+   (112.5, 247.5), and both produced `encounter: overtaking`. `rule:13b`
+   reads the same sector object on either subject under `any_of` — the
+   pattern 13(d) already used over `hist:was_overtaking` — because the
+   encounter type belongs to the pair. One paragraph, one norm, one id.
+8. **Every other entry with a unique cite takes the bare slug of it.**
+9. **`represented_paragraphs` ids take the prefix too** — `2a` becomes
+   `rule:2a` — and keep their own list. They no longer need a schema
+   definition of their own: the id pattern is the same one.
+10. **The schema pattern is**
+    `^rule:[0-9]+[a-z]?(_[ivx]+)*(:[a-z][a-z0-9_]*)?$`.
+    **An id is opaque to a consumer.** It looks like a citation and is not
+    one: a consumer that wants the paragraph reads `cite`, and never splits
+    the id to find it. The resemblance is for the human reading a trace;
+    the `cite` field is the machine-readable link to the Convention, and it
+    is the field that moves when the package's reading of a paragraph moves.
+11. **The identifier-diff mechanism is removed, not left dormant.**
+    `retired_entry_ids`, `data/deprecated-identifiers.json`, its schema, the
+    dormant diff test and the retired-id half of the REQ-MODEL-10 collision
+    test all go. Nothing pre-1.0 is immutable, so there was nothing for the
+    registry to hold and no diff for the test to run; a mechanism that
+    cannot fire is a mechanism nobody maintains. It returns, if at all, with
+    the 1.0.0 tag that REQ-MODEL-10's baseline names. Ruled by Solace,
+    2026-09-16.
+
+## The names
+
+`was` is the `entry:` name from the superseded draft of this ADR, which
+shipped in no release. The citation-derived ids that preceded *it* —
+`24a-m2`, `23a1`, `30d-red` — were never names either and are not carried
+forward.
+
+| was | is | cite |
+|---|---|---|
+| `entry:power_forward_masthead` | `rule:23a_i` | 23(a)(i) |
+| `entry:power_second_masthead` | `rule:23a_ii` | 23(a)(ii) |
+| `entry:power_sidelights_sternlight` | `rule:23a_iii_iv` | 23(a)(iii)-(iv) |
+| `entry:air_cushion_non_displacement` | `rule:23b` | 23(b) |
+| `entry:wig_near_surface` | `rule:23c` | 23(c) |
+| `entry:power_under_12m` | `rule:23d_i` | 23(d)(i) |
+| `entry:power_under_7m_slow` | `rule:23d_ii` | 23(d)(ii) |
+| `entry:towing_mastheads` | `rule:24a_i` | 24(a)(i) |
+| `entry:towing_mastheads_long_tow` | `rule:24a_i:exceeds_200m` | 24(a)(i) |
+| `entry:towing_light` | `rule:24a_ii_iv` | 24(a)(ii)-(iv) |
+| `entry:pushing_composite_unit` | `rule:24b` | 24(b) |
+| `entry:pushing_ahead_or_alongside` | `rule:24c` | 24(c) |
+| `entry:being_towed` | `rule:24e` | 24(e) |
+| `entry:sail_sidelights_sternlight` | `rule:25a` | 25(a) |
+| `entry:sail_combined_lantern` | `rule:25b` | 25(b) |
+| `entry:sail_red_over_green` | `rule:25c` | 25(c) |
+| `entry:sail_under_7m` | `rule:25d_i` | 25(d)(i) |
+| `entry:under_oars` | `rule:25d_ii` | 25(d)(ii) |
+| `entry:trawling_green_over_white` | `rule:26b_i` | 26(b)(i) |
+| `entry:trawling_masthead` | `rule:26b_ii` | 26(b)(ii) |
+| `entry:trawling_making_way` | `rule:26b_iii` | 26(b)(iii) |
+| `entry:fishing_red_over_white` | `rule:26c_i` | 26(c)(i) |
+| `entry:fishing_outlying_gear` | `rule:26c_ii` | 26(c)(ii) |
+| `entry:fishing_making_way` | `rule:26c_iii` | 26(c)(iii) |
+| `entry:nuc_red_over_red` | `rule:27a_i` | 27(a)(i) |
+| `entry:nuc_making_way` | `rule:27a_iii` | 27(a)(iii) |
+| `entry:ram_red_white_red` | `rule:27b_i` | 27(b)(i) |
+| `entry:ram_making_way` | `rule:27b_iii` | 27(b)(iii) |
+| `entry:ram_anchored` | `rule:27b_iv` | 27(b)(iv) |
+| `entry:ram_underwater_obstruction` | `rule:27d` | 27(d) |
+| `entry:diving` | `rule:27e_i` | 27(e)(i) |
+| `entry:mine_clearance` | `rule:27f` | 27(f) |
+| `entry:cbd` | `rule:28` | 28 |
+| `entry:pilot` | `rule:29a` | 29(a) |
+| `entry:anchored` | `rule:30a` | 30(a) |
+| `entry:anchored_under_50m` | `rule:30b` | 30(b) |
+| `entry:anchored_deck_lights` | `rule:30c` | 30(c) |
+| `entry:aground_anchor_lights` | `rule:30d` | 30(d) |
+| `entry:aground_red_over_red` | `rule:30d_i` | 30(d)(i) |
+| `entry:anchored_under_7m_not_near_channel` | `rule:30e` | 30(e) |
+| `entry:any_visibility` | `rule:4` | 4 |
+| `entry:in_sight` | `rule:11` | 11 |
+| `entry:restricted_visibility` | `rule:19a` | 19(a) |
+| `entry:power_gives_way_to_nuc` | `rule:18a_i` | 18(a)(i) |
+| `entry:power_gives_way_to_ram` | `rule:18a_ii` | 18(a)(ii) |
+| `entry:power_gives_way_to_fishing` | `rule:18a_iii` | 18(a)(iii) |
+| `entry:power_gives_way_to_sail` | `rule:18a_iv` | 18(a)(iv) |
+| `entry:sail_gives_way_to_nuc` | `rule:18b_i` | 18(b)(i) |
+| `entry:sail_gives_way_to_ram` | `rule:18b_ii` | 18(b)(ii) |
+| `entry:sail_gives_way_to_fishing` | `rule:18b_iii` | 18(b)(iii) |
+| `entry:fishing_gives_way_to_nuc` | `rule:18c_i` | 18(c)(i) |
+| `entry:fishing_gives_way_to_ram` | `rule:18c_ii` | 18(c)(ii) |
+| `entry:avoid_impeding_cbd` | `rule:18d_i` | 18(d)(i) |
+| `entry:wig_keeps_well_clear` | `rule:18f_i` | 18(f)(i) |
+| `entry:not_impeded_remains_obliged` | `rule:8f_iii` | 8(f)(iii) |
+| `entry:overtaking_gives_way` | `rule:13a` | 13(a) |
+| `entry:narrow_channel_small_or_sail` | `rule:9b` | 9(b) |
+| `entry:narrow_channel_fishing` | `rule:9c` | 9(c) |
+| `entry:traffic_lane_fishing` | `rule:10i` | 10(i) |
+| `entry:traffic_lane_small_or_sail` | `rule:10j` | 10(j) |
+| `entry:steady_bearing` | `rule:7d_i` | 7(d)(i) |
+| `entry:sail_port_tack_gives_way` | `rule:12a_i` | 12(a)(i) |
+| `entry:sail_windward_gives_way` | `rule:12a_ii` | 12(a)(ii) |
+| `entry:sail_port_tack_uncertain_gives_way` | `rule:12a_iii` | 12(a)(iii) |
+| `entry:overtaking` | `rule:13b` | 13(b) |
+| `entry:being_overtaken` | `rule:13b` | 13(b) |
+| `entry:overtaking_until_past_and_clear` | `rule:13d` | 13(d) |
+| `entry:head_on` | `rule:14b` | 14(b) |
+| `entry:crossing` | `rule:15a:crossing` | 15(a) |
+| `entry:crossing_gives_way` | `rule:15a:keep_out_of_the_way` | 15(a) |
+| `entry:mooring_buoy` | `rule:30a:mooring_buoy` | 30(a) |
+| `entry:mooring_buoy_under_50m` | `rule:30b:mooring_buoy` | 30(b) |
+
+## Consequences
+
+- One pass, one commit: `data/applicability.json`, both fixture files,
+  `data/geometry.json`, `data/images.json`, `data/facts.json`,
+  `data/rules.json`, the schemas, the suite and the living docs. The
+  schema `$defs` that named the type follow the noun: `entryId` is
+  `ruleId`, `entryIdList` is `ruleIdList`.
+- Two entries may still share a cite — `rule:24a_i` and
+  `rule:24a_i:exceeds_200m`, the two halves of 15(a), the two mooring-buoy
+  deltas. What they never share is an id, and the third segment says which
+  norm out of the paragraph the entry carries.
+- Earlier ADRs and closed questions cite entries by the superseded names;
+  the table above is the map and stays in this file permanently. ADR 0006
+  carries a dated note that its identifier-diff half is gone.
+- `represented_paragraphs` is now a second list of records that look like
+  entries, differing only in carrying no `when`. Folding it into `entries`
+  with a `care`/`meta` category is the obvious follow-up and is not done
+  here.
+- Open, and not ruled: whether `fact:rule18_class` should be renamed. It
+  carries a rule number inside a fact name, which is the shape this ADR
+  moved *entry* ids towards and says nothing about for facts. Left visibly
+  open.
+- An encounter with more than two vessels is issue #135; nothing in this
+  scheme is aimed at it, and a third subject would need a segment none of
+  these ids have.