ogar-vocab: mint network_layer (0x0804); render_osm review fixes (#152)

Reconcile the OCR 0x08XX domain to what the lance-graph contract mirror
already declares, and address the Bugbot/codex review on #152.

network_layer (0x0804) mint — the OGAR-authoritative counterpart of the
concept the lance-graph mirror wire-declared first (`class_ids::ALL`
68→…→79 with the 10 OSM/Geo concepts). The KIND "a Tesseract recognizer
network layer"; the concrete subclass is the classid custom-low half (a
`NetworkType` ordinal), one slot not 27 — the layer graph sinks onto
FacetCascade tenants. Added to all four codebook places (CODEBOOK,
class_ids::{NETWORK_LAYER, ALL}, all_promoted_classes, constructor) +
ogar-class-view all_canonical_classes; OCR domain-set + ALL.len() pins
3→4 / 78→79. 96 ogar-vocab + 12 ogar-class-view tests green.

render_osm review fixes:
- DO-arm no longer drops colliding rail tiles. The (part_of:is_a) tile is
  the CANONICAL castable address by design, so multiple source controllers
  (`Api::NodesController#show` + `NodesController#show` → `node:show`) are
  ONE action — but provenance was silently lost. Now every source is
  accumulated and cited in the doc comment (Bugbot High / codex P2).
- extract_action_rail resolves the repo ROOT (not the app/models fallback
  dir) so controllers resolve for a models-only `src` (Bugbot Medium).
- manifest writes warn instead of silently skipping when the out-dir isn't
  ≥5 levels under a harvest tree (Bugbot Medium).

Deferred (noted on the PR): vocab/ogar.ttl + ogar.surql are stale across
OCR/HR/Genetics/Geo (regenerate wholesale, not osm-only patch, codex P1);
moving render_osm's private ground() into a shared lift so harvest_osm +
library callers get grounded Geo IR (codex P2).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01EYvNjD8M8LMNYbRy3gq2FP

Author: claude

crates/ogar-class-view/src/lib.rs

@@ -97,6 +97,7 @@ use ogar_vocab::{
     mars_resource,
     mars_software,
     medication,
+    network_layer,
     osm_changeset,
     osm_element_tag,
     osm_gpx_trace,
@@ -198,6 +199,7 @@ fn all_canonical_classes() -> Vec<(&'static str, Class)> {
         ("unicharset", unicharset()),
         ("recoder", recoder()),
         ("charset", charset()),
+        ("network_layer", network_layer()),
         // ── 0x09XX — health (OGIT Healthcare) ──
         ("patient", patient()),
         ("diagnosis", diagnosis()),

crates/ogar-render-askama/examples/render_osm.rs

@@ -184,10 +184,27 @@ fn main() {
         let hp = root.join("harvest");
         fs::create_dir_all(&hp).ok();
         fs::write(hp.join("osm_graph.spo"), &spo).unwrap();
+    } else {
+        eprintln!(
+            "warning: out-dir {} is not ≥5 levels under a harvest tree — \
+             skipping osm_graph.spo (codex #152: no longer silent)",
+            out.display()
+        );
     }
 
     // ── Action rail: (part_of : is_a) — the castable V3 action shape ──
-    let rail = ogar_from_rails::extract_action_rail(src_path, "osm");
+    // `extract_action_rail` joins `app/controllers` internally, so it needs the
+    // REPO ROOT — not the `app/models` dir the struct-extraction fallback may use.
+    // Resolve the root so controllers resolve even when `src` was the models dir
+    // (Bugbot/codex #152: the rail was silently empty for a models-only `src`).
+    let rail_root: &Path = if src_path.join("app/controllers").is_dir() {
+        src_path
+    } else if src_path.ends_with("app/models") {
+        src_path.parent().and_then(|p| p.parent()).unwrap_or(src_path)
+    } else {
+        src_path
+    };
+    let rail = ogar_from_rails::extract_action_rail(rail_root, "osm");
     let mut rt = String::from(
         "# OSM action rail — (part_of : is_a), the V3 castable action shape\n\
          # a u8:u8 HHTL tile per action; cast = fix one axis, walk the other\n\
@@ -222,18 +239,33 @@ fn main() {
     rt.push('\n');
     if let Some(root) = out.ancestors().nth(4) {
         fs::write(root.join("harvest/osm_actions.rail"), &rt).unwrap();
+    } else {
+        eprintln!(
+            "warning: out-dir {} is not ≥5 levels under a harvest tree — \
+             skipping osm_actions.rail (codex #152: no longer silent)",
+            out.display()
+        );
     }
 
     // ── DO-arm module tree: osm::<part_of>::<is_a>(input) → generated/actions.rs.
     // part_of = container module, is_a = action fn — standalone free functions,
     // never methods on the data struct. e.g. `osm::map::render(input)`. ──
-    let mut tree: std::collections::BTreeMap<String, std::collections::BTreeMap<String, (String, String)>> =
-        std::collections::BTreeMap::new();
+    // The (part_of : is_a) tile is the CANONICAL rail address, so multiple
+    // source controllers that map to the same tile (e.g. `Api::NodesController#show`
+    // and `NodesController#show` → `node:show`) are ONE castable action by design
+    // — the api-vs-web surface is the classid's custom-low half, not a new tile.
+    // Accumulate ALL sources per tile so provenance is never dropped from the docs
+    // (Bugbot/codex #152 review: the earlier `or_insert` silently lost the 2nd+).
+    let mut tree: std::collections::BTreeMap<
+        String,
+        std::collections::BTreeMap<String, Vec<(String, String)>>,
+    > = std::collections::BTreeMap::new();
     for r in &rail {
         tree.entry(r.part_of.clone())
             .or_default()
             .entry(r.is_a.clone())
-            .or_insert((r.controller.clone(), r.action.clone()));
+            .or_default()
+            .push((r.controller.clone(), r.action.clone()));
     }
     let mut acts = String::from(
         "//! @generated DO-arm — OSM controller actions as `osm::<part_of>::<is_a>(input)`.\n\
@@ -253,15 +285,29 @@ fn main() {
             rustify(part_of)
         ));
         let mut seen = std::collections::HashSet::new();
-        for (is_a, (controller, action)) in isas {
+        for (is_a, sources) in isas {
             let fname = rustify(is_a);
             if !seen.insert(fname.clone()) {
                 continue;
             }
+            // All source controllers that collapse onto this canonical tile,
+            // deduped + sorted, cited so no route is lost from the docs.
+            let mut srcs: Vec<String> = sources
+                .iter()
+                .map(|(c, a)| format!("{c}#{a}"))
+                .collect();
+            srcs.sort();
+            srcs.dedup();
+            let primary = &srcs[0];
+            let source_line = if srcs.len() == 1 {
+                format!("Source: `{primary}`.")
+            } else {
+                format!("Sources (canonical tile): `{}`.", srcs.join("`, `"))
+            };
             acts.push_str(&format!(
-                "    /// `{part_of}:{is_a}` — DO arm. Source: `{controller}#{action}`.\n    \
+                "    /// `{part_of}:{is_a}` — DO arm. {source_line}\n    \
                  pub fn {fname}(input: Input) -> Output {{\n        \
-                 let _ = input;\n        todo!(\"port {controller}#{action}\")\n    }}\n"
+                 let _ = input;\n        todo!(\"port {primary}\")\n    }}\n"
             ));
             fn_count += 1;
         }

crates/ogar-vocab/src/lib.rs

@@ -1146,6 +1146,7 @@ const CODEBOOK: &[(&str, u16)] = &[
     ("unicharset", 0x0801),
     ("recoder", 0x0802),
     ("charset", 0x0803),
+    ("network_layer", 0x0804),
     // ── 0x09XX — Health domain (clinical / patient / care) ──
     // medcare-rs Healthcare-namespace promotion (Northstar T9). The 7
     // entities the OGIT `NTO/Healthcare/entities/` TTL ships, projected
@@ -1614,6 +1615,13 @@ pub mod class_ids {
     /// document or model asserts (distinct from the trained `unicharset`
     /// inventory).
     pub const CHARSET: u16 = 0x0803;
+    /// `network_layer` (`0x0804`) — the KIND "a Tesseract recognizer network
+    /// layer" (Series / LSTM / Convolve / …). ONE container slot: the specific
+    /// subclass is the classid's custom-low half (the `NetworkType` ordinal),
+    /// not 27 slots — the layer graph sinks onto `FacetCascade` tenants (the
+    /// ruff→OGAR network harvest lands here). Wire-declared first in the
+    /// lance-graph contract mirror; this is the authoritative OGAR counterpart.
+    pub const NETWORK_LAYER: u16 = 0x0804;
 
     // ── 0x09XX — health domain (medcare-rs Healthcare namespace) ──
 
@@ -1813,6 +1821,7 @@ pub mod class_ids {
         ("unicharset", UNICHARSET),
         ("recoder", RECODER),
         ("charset", CHARSET),
+        ("network_layer", NETWORK_LAYER),
         // 0x09XX — health
         ("patient", PATIENT),
         ("diagnosis", DIAGNOSIS),
@@ -1921,7 +1930,7 @@ pub mod class_ids {
             // lance-graph mirror is rebuilt against it.
             assert_eq!(
                 ALL.len(),
-                78,
+                79,
                 "class_ids::ALL count changed — update this pin AND the \
                  lance-graph mirror COUNT_FUSE (crates/lance-graph-ogar/src/lib.rs) \
                  in the same PR",
@@ -2743,10 +2752,11 @@ pub fn all_promoted_classes() -> Vec<Class> {
         // `osint_system` / `osint_person` mints); no calls follow — OGAR
         // vocabulary carries no OSINT concept names, see the CODEBOOK
         // 0x07XX section note.
-        // 0x08XX — OCR arm (3 container kinds), in class_ids::ALL order.
+        // 0x08XX — OCR arm (4 container kinds), in class_ids::ALL order.
         unicharset(),
         recoder(),
         charset(),
+        network_layer(),
         // 0x09XX — health arm (7 OGIT Healthcare concepts), in
         // class_ids::ALL order.
         patient(),
@@ -3745,6 +3755,23 @@ pub fn charset() -> Class {
     c
 }
 
+/// NetworkLayer (`0x0804`) — the KIND "a Tesseract recognizer network layer"
+/// (Series / LSTM / Convolve / …). ONE container slot: the concrete subclass is
+/// the classid's custom-low half (the `NetworkType` ordinal), never a per-type
+/// slot — the layer graph sinks onto `FacetCascade` value tenants (the ruff→OGAR
+/// network harvest lands here). Minimal AR shape; a `network_type` ordinal
+/// attribute names the subclass.
+#[must_use]
+pub fn network_layer() -> Class {
+    let mut c = Class::new("NetworkLayer");
+    c.language = Language::Unknown;
+    c.canonical_concept = Some("network_layer".to_string());
+    let mut network_type = Attribute::new("network_type");
+    network_type.type_name = Some("u8".to_string());
+    c.attributes = vec![network_type];
+    c
+}
+
 // ─────────────────────────────────────────────────────────────────────
 // 0x09XX — Health domain (OGIT Healthcare). The reusable Active-Record
 // shape for the clinical concepts. `diagnosis` (0x0902) is the worked
@@ -5178,16 +5205,17 @@ mod tests {
         }
         // Counts line up with the codebook blocks.
         assert_eq!(concepts_in_domain(ConceptDomain::Health).count(), 7);
-        // 0x08XX OCR: the three container KINDS (unicharset/recoder/charset).
-        // Content (the 112 unichars, code tables) never becomes concepts —
-        // see the CODEBOOK 0x08XX section note (Osint zero-rows precedent).
-        assert_eq!(concepts_in_domain(ConceptDomain::Ocr).count(), 3);
+        // 0x08XX OCR: the four container KINDS (unicharset/recoder/charset/
+        // network_layer). Content (the 112 unichars, code tables) never becomes
+        // concepts — see the CODEBOOK 0x08XX section note (Osint zero-rows
+        // precedent).
+        assert_eq!(concepts_in_domain(ConceptDomain::Ocr).count(), 4);
         let ocr: Vec<&str> = concepts_in_domain(ConceptDomain::Ocr)
             .map(|(name, _)| name)
             .collect();
         assert_eq!(
             ocr,
-            ["unicharset", "recoder", "charset"],
+            ["unicharset", "recoder", "charset", "network_layer"],
             "OCR domain set drift — re-sync the consumer coverage gate",
         );
         assert_eq!(concepts_in_domain(ConceptDomain::HR).count(), 4);