Address codex/CodeRabbit review on PR #416

- savants: PricelistAssignmentAgent family None → Some(0x64) (ProductCatalog,
  matches #414); drop dead other_kind::ANALYTIC_MODEL_MATCH const
- hydrators: complete the FIBU re-parent on the runtime side — fibo_be /
  skr03 / skr04 / zugferd inherits_from DOLCE → FIBOFND (FND stays DOLCE);
  update the three hydrator smoke tests' inheritance assertions to match
- cognitive_cycle example: rest message distinguishes FLOW vs round-cap
- scaffold + roster plan: 0x63 → 0x64 ProductCatalog; Induction(XorBundle) → Induction

https://claude.ai/code/session_017GFLBnDy23AWBqvkbHHC41

Author: claude

.claude/odoo/savants/_SCAFFOLD-EVIDENCE-CONTRACT.md

@@ -8,7 +8,7 @@
 
 - **`contract::savants`** — the 25-savant roster as data: each `Savant { id, name, family, kind, inference, semiring, style, lane, decides }`. The dispatch tuple is **fixed**; `query_strategy()` rides `InferenceType::default_strategy()`.
 - **`reasoning::{Reasoner, ReasoningContext, ReasoningKind, EvidenceRef, Budget}`** — the delegation surface (shipped).
-- **#414**: OGIT families `0x63 ProductCatalog` / `0x90 HRFoundation` + Layer-2 alignment axioms (stock.* / analytic.distribution.model / account.account.tag) + StyleCluster wiring.
+- **#414**: OGIT families `0x64 ProductCatalog` / `0x90 HRFoundation` + Layer-2 alignment axioms (stock.* / analytic.distribution.model / account.account.tag) + StyleCluster wiring.
 - FIBU subtree now inherits `fibofnd` (zugferd/fibobe/skr0x).
 
 ## What I need carved out — 4 slots per savant
@@ -45,13 +45,13 @@ impl Reasoner for <Kind>Reasoner {
 | 4 | AnalyticDistributionSuggester | 0x62 | NextBestAction | Induction | L10 | suggested cost-centre distribution for a move line |
 | 15 | TaxExigibilitySuggestor | 0x62 | NextBestAction | Induction | L15 | tax exigibility (on-invoice vs on-payment / cash-basis) |
 
-**Tier 2 — partner / pricing (0x80 / 0x81 / 0x63):**
+**Tier 2 — partner / pricing (0x80 / 0x81 / 0x64):**
 
 | id | savant | family | kind | infer | lane | decides |
 |---|---|---|---|---|---|---|
 | 1 | FiscalPositionResolver | 0x80 | CustomerCategory | Deduction | L9 | which fiscal position (tax mapping) for a partner |
 | 2 | PartnerTrustAdvisor | 0x80 | CustomerCategory | Revision | L9 | partner trust / dunning-risk from payment history |
-| 3 | PricelistAssignmentAgent | 0x63 | Other(PRICELIST_ASSIGNMENT) | Revision | L8 | partner pricelist when no explicit property |
+| 3 | PricelistAssignmentAgent | 0x64 | Other(PRICELIST_ASSIGNMENT) | Revision | L8 | partner pricelist when no explicit property |
 | 23 | PricelistRecommender | 0x81 | NextBestAction | Synthesis | L6 | which pricelist rule when multiple candidates apply |
 | 22 | UpsellActivityTrigger | 0x81 | NextBestAction | Induction | L6 | qty_delivered>ordered ⇒ upsell TODO |
 | 10 | UserCompanyAccessAdvisor | 0x80 | CustomerCategory | Induction | L12 | branch-access subset by user role/context |
@@ -76,7 +76,7 @@ impl Reasoner for <Kind>Reasoner {
 | 12 | ReorderTimingAdvisor | None | NextBestAction | Induction | L13 | reorder timing under demand/supplier uncertainty |
 | 13 | ReplenishmentReportAdvisor | None | NextBestAction | Induction | L13 | real shortfall vs demand noise |
 | 14 | RouteTiebreaker | None | NextBestAction | Abduction | L13 | equal-sequence route tiebreak |
-| 24 | RemovalStrategySelector | None | NextBestAction | Induction(XorBundle) | L7 | quants to bind to a reservation (FIFO/FEFO/LIFO) |
+| 24 | RemovalStrategySelector | None | NextBestAction | Induction | L7 | quants to bind to a reservation (FIFO/FEFO/LIFO) |
 | 25 | MoveAssignmentPrioritizer | None | NextBestAction | Induction | L7 | which confirmed moves to satisfy first |
 | 26 | BackorderJudge | None | NextBestAction | Abduction | L7 | partial fulfilment ⇒ backorder vs cancel |
 

.claude/plans/odoo-savant-roster-v1.md

@@ -18,7 +18,7 @@ This plan is the **lance-graph implementation** of the handover (SAVANTS.md §"l
 |---|---|---|---|
 | **D-ODOO-1** | the 25-savant roster as data + dispatch tuple + lookups | `contract::savants` | ✅ **DONE this PR** (3 tests) |
 | **D-ODOO-2** | `Reasoner` impls per `ReasoningKind` (CustomerCategory / PostingAnomaly / NextBestAction / InvoiceCompleteness / MailIntent + the 6 `Other` codes) — the AXIS-B experts | planner / a new reasoner crate | Queued |
-| **D-ODOO-3** | two new OGIT families **`0x63 ProductCatalog`** + **`0x90 HRFoundation`** in `OgitFamilyTable` + inherited `StyleCluster` per family | `lance-graph-ontology` + `contract::build.rs` | Queued |
+| **D-ODOO-3** | two new OGIT families **`0x64 ProductCatalog`** + **`0x90 HRFoundation`** in `OgitFamilyTable` + inherited `StyleCluster` per family | `lance-graph-ontology` + `contract::build.rs` | Queued |
 | **D-ODOO-4** | Layer-2 alignment axioms for the `None` classes (`stock.*`, `account.analytic.distribution.model`, `account.account.tag`) so the 11 `unaligned()` savants resolve a family | `lance-graph-ontology` `data/ontologies/odoo/alignment/` | Queued |
 | **D-ODOO-5** | delegation call-site conformance: `ReasoningContext` + Arrow `EvidenceRef` schemas per savant; woa-rs↔lance-graph contract test | `contract` + conformance harness | Queued |
 
@@ -28,11 +28,11 @@ This plan is the **lance-graph implementation** of the handover (SAVANTS.md §"l
 - **Deterministic guard stays in woa-rs** (balance==0, residual, sign, prefix-match…); lance-graph only sees the ambiguous core.
 - **BBB-allowed crates only** (`lance-graph-contract`, `-ontology`, `-callcenter`); no brain-crate in the customer binary (Iron Rule 1).
 - The savant **tuple fully determines dispatch**; `SemiringChoice` selects evidence fusion (NarsTruth = NARS revision, the common case).
-- **Business = OGIT-inherited sidecar** (charter D1): odoo classes inherit existing FIBO/SKR family slots (PR #412), they do not get a bespoke CAM family — `0x63`/`0x90` are the only *new* families and must be ratified.
+- **Business = OGIT-inherited sidecar** (charter D1): odoo classes inherit existing FIBO/SKR family slots (PR #412), they do not get a bespoke CAM family — `0x64`/`0x90` are the only *new* families and must be ratified.
 
 ## Open questions
 
-- Ratify families `0x63 ProductCatalog` / `0x90 HRFoundation` (or fold into existing slots?).
+- Ratify families `0x64 ProductCatalog` / `0x90 HRFoundation` (or fold into existing slots?).
 - Where do the `Reasoner` impls live — `lance-graph-planner` (has NARS engine + MUL) or a dedicated reasoner crate? (AriGraph-circular-dep caveat applies; see CLAUDE.md p64 convergence note.)
 - `ReasoningKind::Other(u32)` code registry — `contract::savants::other_kind` holds the 6 codes; promote to a named enum if the set stabilizes.
 

crates/lance-graph-contract/examples/cognitive_cycle.rs

@@ -67,8 +67,12 @@ fn main() {
             gate_state(ctx.sd), ctx.sd, ctx.free_energy, ctx.confidence);
     }
 
-    println!("== rest ==  the shader stopped because gate reached {:?} (SD={:.3} < FLOW {SD_FLOW}).",
-        gate_state(ctx.sd), ctx.sd);
+    if gate_state(ctx.sd) == GateState::Flow {
+        println!("== rest ==  the shader stopped because gate reached Flow (SD={:.3} < FLOW {SD_FLOW}).", ctx.sd);
+    } else {
+        println!("== rest ==  round cap reached ({round} rounds) before FLOW; gate={:?}, SD={:.3}.",
+            gate_state(ctx.sd), ctx.sd);
+    }
     println!("final: conf={:.2}, {} candidate(s) survived pruning, {} beliefs.",
         ctx.confidence, ctx.candidates.len(), ctx.beliefs.len());
     println!("\nKey: Gate-bucket tactics (TCP/CDT/TCF/CUR) skip while in FLOW — the markers,");

crates/lance-graph-contract/src/savants.rs

@@ -22,7 +22,6 @@ use crate::thinking::StyleCluster;
 /// Stable codes for the `ReasoningKind::Other(u32)` savants (SAVANTS.md).
 pub mod other_kind {
     pub const PRICELIST_ASSIGNMENT: u32 = 1;
-    pub const ANALYTIC_MODEL_MATCH: u32 = 2;
     pub const CHART_ACCOUNT_MAPPING: u32 = 3;
     pub const CONSOLIDATION_RATE_POLICY: u32 = 4;
     pub const RECONCILE_MATCH: u32 = 5;
@@ -62,7 +61,7 @@ pub const SAVANTS: [Savant; 25] = [
     // ── L8–L15 gap lanes (15) ──
     Savant { id: 1, name: "FiscalPositionResolver", family: Some(0x80), kind: CustomerCategory, inference: Deduction, semiring: NarsTruth, style: Analytical, lane: "L9", decides: "which fiscal position (tax mapping) applies to a partner" },
     Savant { id: 2, name: "PartnerTrustAdvisor", family: Some(0x80), kind: CustomerCategory, inference: Revision, semiring: NarsTruth, style: Empathic, lane: "L9", decides: "partner trust / dunning-risk from payment history" },
-    Savant { id: 3, name: "PricelistAssignmentAgent", family: None, kind: Other(other_kind::PRICELIST_ASSIGNMENT), inference: Revision, semiring: NarsTruth, style: Analytical, lane: "L8", decides: "partner pricelist when no explicit property (country-group/config fallback)" },
+    Savant { id: 3, name: "PricelistAssignmentAgent", family: Some(0x64), kind: Other(other_kind::PRICELIST_ASSIGNMENT), inference: Revision, semiring: NarsTruth, style: Analytical, lane: "L8", decides: "partner pricelist when no explicit property (country-group/config fallback)" },
     Savant { id: 4, name: "AnalyticDistributionSuggester", family: Some(0x62), kind: NextBestAction, inference: Induction, semiring: NarsTruth, style: Analytical, lane: "L10", decides: "suggested cost-centre distribution for a move line" },
     Savant { id: 5, name: "AnalyticModelScorer", family: None, kind: CustomerCategory, inference: Deduction, semiring: HammingMin, style: Analytical, lane: "L10", decides: "which analytic.distribution.model matches (priority-scored)" },
     Savant { id: 6, name: "SequenceGapAnomalyDetector", family: Some(0x62), kind: PostingAnomaly, inference: Abduction, semiring: NarsTruth, style: Analytical, lane: "L11", decides: "journal sequence gaps ⇒ deleted posted entries (GoBD)" },

crates/lance-graph-ontology/src/hydrators/fibo.rs

@@ -130,7 +130,7 @@ pub fn hydrate_fibo_be_from(
         g: OGIT::FIBOBE_V1.0,
         version: OGIT::FIBOBE_V1.1,
         domain_name: "fibobe".to_string(),
-        inherits_from: Some(OGIT::DOLCE_V1.0),
+        inherits_from: Some(OGIT::FIBOFND_V1.0),
         starting_entity_id: 100,
     };
     hydrator.hydrate_many(&path_refs, registry)?;

crates/lance-graph-ontology/src/hydrators/skr_datev.rs

@@ -46,7 +46,7 @@ pub fn hydrate_skr03_from(
         g: OGIT::SKR03_V1.0,
         version: OGIT::SKR03_V1.1,
         domain_name: "skr03".to_string(),
-        inherits_from: Some(OGIT::DOLCE_V1.0),
+        inherits_from: Some(OGIT::FIBOFND_V1.0),
         starting_entity_id: 100,
         iri_prefix: SKR03_IRI_PREFIX.to_string(),
     };
@@ -92,7 +92,7 @@ pub fn hydrate_skr04_from(
         g: OGIT::SKR04_V1.0,
         version: OGIT::SKR04_V1.1,
         domain_name: "skr04".to_string(),
-        inherits_from: Some(OGIT::DOLCE_V1.0),
+        inherits_from: Some(OGIT::FIBOFND_V1.0),
         starting_entity_id: 100,
         iri_prefix: SKR04_IRI_PREFIX.to_string(),
     };

crates/lance-graph-ontology/src/hydrators/zugferd.rs

@@ -83,7 +83,7 @@ pub fn hydrate_zugferd_from(
         g: OGIT::ZUGFERD_V1.0,
         version: OGIT::ZUGFERD_V1.1,
         domain_name: "zugferd".to_string(),
-        inherits_from: Some(OGIT::DOLCE_V1.0),
+        inherits_from: Some(OGIT::FIBOFND_V1.0),
         starting_entity_id: 100,
     };
     hydrator.hydrate_many(&path_refs, registry)?;

crates/lance-graph-ontology/tests/fibo_be_hydrator_smoke.rs

@@ -21,8 +21,8 @@ fn fibo_be_hydrator_smoke() {
     assert_eq!(bundle.domain_name, "fibobe");
     assert_eq!(
         bundle.inherits_from,
-        Some(OGIT::DOLCE_V1.0),
-        "FIBO-BE inherits_from must be DOLCE"
+        Some(OGIT::FIBOFND_V1.0),
+        "FIBO-BE inherits_from must be FIBOFND (BE → FND → DOLCE, PR #416)"
     );
 
     let entity_count = bundle.entity_count();
@@ -69,13 +69,13 @@ fn fibo_be_canonical_iris_resolve() {
 }
 
 #[test]
-fn fibo_be_inherits_from_dolce() {
-    // BE declares inherits_from: dolce directly today. A future PR may
-    // chain BE → FND → DOLCE once multi-parent inheritance lands.
+fn fibo_be_inherits_from_fibofnd() {
+    // BE now chains BE → FND → DOLCE (FND itself inherits DOLCE); re-parented
+    // from dolce-direct in PR #416 (FIBU subtree under fibofnd).
     let registry = OntologyRegistry::new_in_memory();
     hydrate_fibo_be(&registry).expect("FIBO-BE hydrates");
     let bundle = registry
         .bundle_for(OGIT::FIBOBE_V1.0)
         .expect("bundle registered");
-    assert_eq!(bundle.inherits_from, Some(OGIT::DOLCE_V1.0));
+    assert_eq!(bundle.inherits_from, Some(OGIT::FIBOFND_V1.0));
 }

crates/lance-graph-ontology/tests/skr_hydrator_smoke.rs

@@ -27,7 +27,7 @@ fn skr03_hydrator_smoke() {
         .expect("ContextBundle registered at SKR03_V1");
     assert_eq!(bundle.g, OGIT::SKR03_V1.0);
     assert_eq!(bundle.domain_name, "skr03");
-    assert_eq!(bundle.inherits_from, Some(OGIT::DOLCE_V1.0));
+    assert_eq!(bundle.inherits_from, Some(OGIT::FIBOFND_V1.0));
     assert!(
         bundle.entity_count() >= 1400,
         "expected >= 1400 canonical SKR 03 accounts, got {}",
@@ -46,7 +46,7 @@ fn skr04_hydrator_smoke() {
         .expect("ContextBundle registered at SKR04_V1");
     assert_eq!(bundle.g, OGIT::SKR04_V1.0);
     assert_eq!(bundle.domain_name, "skr04");
-    assert_eq!(bundle.inherits_from, Some(OGIT::DOLCE_V1.0));
+    assert_eq!(bundle.inherits_from, Some(OGIT::FIBOFND_V1.0));
     assert!(
         bundle.entity_count() >= 1200,
         "expected >= 1200 SKR 04 accounts, got {}",

crates/lance-graph-ontology/tests/zugferd_hydrator_smoke.rs

@@ -26,8 +26,8 @@ fn zugferd_hydrator_smoke() {
     assert_eq!(bundle.domain_name, "zugferd");
     assert_eq!(
         bundle.inherits_from,
-        Some(OGIT::DOLCE_V1.0),
-        "ZUGFeRD inherits_from must be DOLCE"
+        Some(OGIT::FIBOFND_V1.0),
+        "ZUGFeRD inherits_from must be FIBOFND (PR #416)"
     );
 
     // EN16931 profile covers 4 XSD files: top-level CrossIndustryInvoice,