From d8c2f16e56235471843fc14970d923e739697af2 Mon Sep 17 00:00:00 2001 From: Claude Date: Sun, 5 Jul 2026 05:12:41 +0000 Subject: [PATCH] lance-graph-ogar: revert OGAR pin to branch=main (one golden-image source) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Follow-up to the codex P2 on #648. The temp-pin to OGAR rev 58a64d4 only bound lance-graph-ogar's transitive OGAR source; symbiont and cognitive-stack (root-workspace members that directly dep ogar-vocab/ontology/adapter at branch=main) still resolved a SECOND OGAR copy, so the golden image linked two OGAR versions. OGAR #152 (+#153/#154/#155) is now on main (class_ids::ALL = 79), so main == the temp-pinned superset. Reverting the four ogar-* deps to branch=main collapses every golden-image root onto ONE OGAR source: the root Cargo.lock now resolves ogar-{vocab,class-view,ontology,adapter-surrealql} at branch=main#76dcb27 (79), matching the contract mirror (79) via COUNT_FUSE. Verified: lance-graph-ogar builds (COUNT_FUSE 79==79 against OGAR main) + parity test green. (lance-graph-ogar keeps its own excluded-workspace Cargo.lock, untracked — it regenerates against branch=main on any clone.) Co-Authored-By: Claude Opus 4.8 Claude-Session: https://claude.ai/code/session_01EYvNjD8M8LMNYbRy3gq2FP --- Cargo.lock | 10 +++++----- crates/lance-graph-ogar/Cargo.toml | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1a89f02e..896b9086 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4932,7 +4932,7 @@ dependencies = [ [[package]] name = "lance-graph-contract" version = "0.1.0" -source = "git+https://github.com/AdaWorldAPI/lance-graph?branch=main#b74378c7853a9b03b48adb29537e45af6524728c" +source = "git+https://github.com/AdaWorldAPI/lance-graph?branch=main#7b48abd973f53bbc172b6b0b5dd4dae5d7d6d84b" dependencies = [ "glob", "serde", @@ -6043,7 +6043,7 @@ dependencies = [ [[package]] name = "ogar-adapter-surrealql" version = "0.1.0" -source = "git+https://github.com/AdaWorldAPI/OGAR?rev=58a64d4701eaf70ff67fe53a5e2087d5d0c48c0d#58a64d4701eaf70ff67fe53a5e2087d5d0c48c0d" +source = "git+https://github.com/AdaWorldAPI/OGAR?branch=main#76dcb27fec14aa5416c26ea48814f43394b7f053" dependencies = [ "ogar-vocab", ] @@ -6051,7 +6051,7 @@ dependencies = [ [[package]] name = "ogar-class-view" version = "0.1.0" -source = "git+https://github.com/AdaWorldAPI/OGAR?rev=58a64d4701eaf70ff67fe53a5e2087d5d0c48c0d#58a64d4701eaf70ff67fe53a5e2087d5d0c48c0d" +source = "git+https://github.com/AdaWorldAPI/OGAR?branch=main#76dcb27fec14aa5416c26ea48814f43394b7f053" dependencies = [ "lance-graph-contract 0.1.0 (git+https://github.com/AdaWorldAPI/lance-graph?branch=main)", "ogar-vocab", @@ -6060,12 +6060,12 @@ dependencies = [ [[package]] name = "ogar-ontology" version = "0.1.0" -source = "git+https://github.com/AdaWorldAPI/OGAR?rev=58a64d4701eaf70ff67fe53a5e2087d5d0c48c0d#58a64d4701eaf70ff67fe53a5e2087d5d0c48c0d" +source = "git+https://github.com/AdaWorldAPI/OGAR?branch=main#76dcb27fec14aa5416c26ea48814f43394b7f053" [[package]] name = "ogar-vocab" version = "0.1.0" -source = "git+https://github.com/AdaWorldAPI/OGAR?rev=58a64d4701eaf70ff67fe53a5e2087d5d0c48c0d#58a64d4701eaf70ff67fe53a5e2087d5d0c48c0d" +source = "git+https://github.com/AdaWorldAPI/OGAR?branch=main#76dcb27fec14aa5416c26ea48814f43394b7f053" [[package]] name = "once_cell" diff --git a/crates/lance-graph-ogar/Cargo.toml b/crates/lance-graph-ogar/Cargo.toml index 82cba2ea..87502988 100644 --- a/crates/lance-graph-ogar/Cargo.toml +++ b/crates/lance-graph-ogar/Cargo.toml @@ -78,21 +78,21 @@ lance-graph-contract = { path = "../lance-graph-contract" } # against live in lance-graph-ontology (OGIT). OGIT does NOT depend on OGAR. lance-graph-ontology = { path = "../lance-graph-ontology" } -# ── OGAR Active-Record forks: git deps (the canonical superset; matches -# symbiont's pins so they resolve to ONE source in the golden image) ── +# ── OGAR Active-Record forks: git deps @ main (the canonical superset; matches +# symbiont's + cognitive-stack's pins so ALL golden-image roots resolve to +# ONE OGAR source) ── # -# TEMP-PIN to OGAR #152 rev (Geo/OSM + network_layer codebook mint: -# class_ids::ALL 68→79). The mirror in lance-graph-contract carries the same -# concepts, so COUNT_FUSE (mirror::CODEBOOK.len() == ogar_vocab::class_ids::ALL -# .len()) requires BOTH sides at 79. OGAR main is still 68 until #152 merges — -# pinning to the pushed rev keeps the lockstep green now. REVERT the four deps -# to branch = "main" once OGAR #152 lands on main (one source in the golden image). -ogar-vocab = { git = "https://github.com/AdaWorldAPI/OGAR", rev = "58a64d4701eaf70ff67fe53a5e2087d5d0c48c0d" } -ogar-class-view = { git = "https://github.com/AdaWorldAPI/OGAR", rev = "58a64d4701eaf70ff67fe53a5e2087d5d0c48c0d" } -ogar-ontology = { git = "https://github.com/AdaWorldAPI/OGAR", rev = "58a64d4701eaf70ff67fe53a5e2087d5d0c48c0d" } +# Back to branch = "main" now that OGAR #152 (Geo/OSM + network_layer, ALL=79) +# has merged: main == the temp-pinned rev, so the contract mirror (79) and +# ogar_vocab::class_ids::ALL (79) agree via COUNT_FUSE, and symbiont / +# cognitive-stack (which also `branch = "main"` these crates) resolve the SAME +# single OGAR copy instead of a second one at a rev (codex P2 on #648). +ogar-vocab = { git = "https://github.com/AdaWorldAPI/OGAR", branch = "main" } +ogar-class-view = { git = "https://github.com/AdaWorldAPI/OGAR", branch = "main" } +ogar-ontology = { git = "https://github.com/AdaWorldAPI/OGAR", branch = "main" } # default features only = the light emit() DDL formatter (no surrealdb tree); # the parser half is opt-in via this crate's `surrealql-parser` feature. -ogar-adapter-surrealql = { git = "https://github.com/AdaWorldAPI/OGAR", rev = "58a64d4701eaf70ff67fe53a5e2087d5d0c48c0d" } +ogar-adapter-surrealql = { git = "https://github.com/AdaWorldAPI/OGAR", branch = "main" } # Fold ogar-class-view's transitive `lance-graph-contract` (git # AdaWorldAPI/lance-graph#main) onto the SAME path copy this crate uses, so there