🔧 restore(trios-chat): revert rings to W32 state + drop monolithic duplicates - #941
Merged
Conversation
…plicates Anchor: φ² + φ⁻² = 3 · TRINITY · CHAT · ZERO-METADATA The four commits on 2026-05-20 (86abdcb, 9ba3ba8, f838290, 9a08493) introduced a parallel monolithic architecture in `crates/trios-chat/src/` that overwrote `lib.rs` of every `rings/CR-CHAT-NN/` ring back to a W3+W4-era state, silently dropping the wiring of all W5..W32 lane modules. The lane source files (.rs) remained on disk but were not pulled into the crate by `pub mod` — they no longer compiled or tested. Audit findings on `origin/main` (HEAD 8df251e) vs W32 (46171b3): - 7× `rings/CR-CHAT-0N/src/lib.rs` shrunk to W3+W4 stubs - `Trinity_Chat.v`: 4979 → 513 lines (−4466 Coq lines) - `prompt_injection.jsonl`: 3100 → 500 lines (−2600 corpus prompts) - `injection.rs` (CR-CHAT-06): 5515 → 503 lines (−5012 deny patterns) - `falsifier_runner.rs`: 212 → 107 lines (−105 threshold lines) - 9 new monolithic files in `src/` that re-implemented strict subsets of types already canonically defined in the rings (Identity, Sealed, Chain, MessageKey, Group, CapabilityToken, etc.). Side-by-side LOC: identity: mono=298 vs ring=435 sealed: mono=172 vs ring=292 ratchet: mono=309 vs ring=815 capability: mono=221 vs ring=238 injection: mono=166 vs ring=5515 padding: mono=88 vs ring=347 group: mono=235 vs ring=1188 persist: mono=233 vs ring=410 r_chat: mono=60 vs ring=77 All 9 monolithic types/fns are strict subsets of canonical ring exports — no unique API or behaviour was carried in the monolithic layer. This commit restores from 46171b3 (Wave-32 merge commit): - 7× ring lib.rs (CR-CHAT-01..07) with full W5..W32 wiring - 5× ring Cargo.toml (CR-CHAT-01..05) - CR-CHAT-01/src/identity.rs (canonical 435-line version) - crates/trios-chat/Cargo.toml (re-export shim manifest) - crates/trios-chat/src/lib.rs (29-line shim over trios-chat-br-output) - crates/trios-chat/src/bin/e2e_chat_25.rs - crates/trios-chat/src/bin/falsifier_runner.rs - crates/trios-chat/proofs/chat/Trinity_Chat.v - crates/trios-chat/corpus/prompt_injection.jsonl - crates/trios-chat/rings/CR-CHAT-06/src/injection.rs And deletes the 9 monolithic duplicates from crates/trios-chat/src/: capability.rs, group.rs, identity.rs, injection.rs, padding.rs, persist.rs, r_chat.rs, ratchet.rs, sealed.rs After this commit the canonical state is W32: - 32 waves of threat-model lanes wired through ring lib.rs - ~548 tests / 0 failures (expected) - 25/25 e2e - 3100/3100 falsifier blocked across 62 categories - 299 Coq Qed / 0 Admitted / 5 axioms - 0 unsafe, single SSOT for every type, no monolithic divergence Stats: +14218 / −1886. Closes: regression introduced 2026-05-20. Co-Authored-By: Trinity Grandmaster <admin@t27.ai>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Что и зачем
Четыре коммита 20 мая 2026 (
86abdcb,9ba3ba8,f838290,9a08493) внесли параллельную monolithic-архитектуру вcrates/trios-chat/src/и молча откатилиlib.rsкаждого кольцаrings/CR-CHAT-NN/к состоянию W3+W4, потеряв подключение всех lane-модулей W5..W32. Lane-файлы остались на диске, ноpub modдля них исчез — крейт перестал их собирать.Что было сломано на main (HEAD 8df251e) vs W32 (46171b3)
rings/CR-CHAT-01/src/lib.rsrings/CR-CHAT-02/src/lib.rsrings/CR-CHAT-03/src/lib.rsrings/CR-CHAT-04/src/lib.rsrings/CR-CHAT-05/src/lib.rsrings/CR-CHAT-06/src/lib.rsrings/CR-CHAT-07/src/lib.rsproofs/chat/Trinity_Chat.vcorpus/prompt_injection.jsonlrings/CR-CHAT-06/src/injection.rssrc/bin/falsifier_runner.rsПочему monolithic-файлы можно безболезненно удалить
Все 9 файлов в
crates/trios-chat/src/— строгие подмножества канонических колец:CR-CHAT-01/src/identity.rsCR-CHAT-01/src/sealed.rsCR-CHAT-02/src/lib.rsCR-CHAT-06/src/capability.rsCR-CHAT-06/src/injection.rsCR-CHAT-04/src/lib.rsCR-CHAT-03/src/lib.rsBR-IO-CHAT-05/src/*CR-CHAT-LAWS/src/lib.rsВсе 7 типов из
group.rs(GroupId,Epoch,LeafIndex,Welcome,Commit,Op,Group) уже вCR-CHAT-03/lib.rsс 13..146 ссылок каждый. Уникального API в monolithic нет — это были упрощённые дубликаты.Что делает этот PR
lib.rsвсех 7 ринговCR-CHAT-01..07из коммита46171b3Trinity_Chat.v,prompt_injection.jsonl,injection.rs,falsifier_runner.rs,Cargo.toml-ы,identity.rs,e2e_chat_25.rssrc/lib.rsк 29-строчному re-export shim надtrios-chat-br-outputcrates/trios-chat/src/Финальный статус после merge = состояние W32
После merge
Можно делать W33 в кольцевом стиле — 2 новых lane'ы по канон-паттерну W32 (lane-файл +
pub modв lib.rs + 10 unit-тестов + Coq invariant + 50 falsifier prompts).Stats: +14218 / −1886 в 29 файлах.