Skip to content

refactor(store): move conflict publication domains into modules - #116

Merged
freezscholte merged 1 commit into
mainfrom
codex/ner-376-store-conflict-publication-domain
Jul 4, 2026
Merged

freezscholte merged 1 commit into
mainfrom
codex/ner-376-store-conflict-publication-domain

Conversation

@freezscholte

@freezscholte freezscholte commented Jul 4, 2026 •

Copy link
Copy Markdown
Collaborator

Summary

  • move conflict-set recording, stale-base failed-operation conflict data, merge-conflict recording, conflict preflight/resolve/list/show, and suggestion helpers into crates/forge-store/src/conflict.rs
  • move publication trailers, exportable proposal metadata, publication row recording/checks, and publication lookup helpers into crates/forge-store/src/publication.rs
  • preserve the existing store public API through lib.rs re-exports, including crate-private sync/review helpers
  • leave clean merge success and integrity recomputation in lib.rs for later proposal/snapshot/evidence slices because those are not conflict-set ownership boundaries
  • lower the store lib.rs line-count cap from 9,600 to 7,982 and update ADR-0001 with the NER-376 audit note

Verification

  • rtk cargo check -p forge-store
  • scripts/check-rust-line-count.sh
  • rtk cargo test -p forge-cli --test forge_conflict_set
  • rtk cargo test -p forge-cli --test forge_native_merge
  • rtk cargo test -p forge-cli --test forge_accept_export
  • rtk cargo test -p forge-cli --test forge_sync
  • rtk cargo fmt --all --check
  • rtk cargo test --workspace — 603 passed across 61 suites
  • rtk cargo clippy --workspace --all-targets -- -D warnings
  • rtk bash scripts/ci.sh — PASS=95 FAIL=0

Fixes NER-376.
Related NER-371.


View with Codesmith Autofix with Codesmith
Need help on this PR? Tag /codesmith with what you need. Autofix is disabled.

@freezscholte
freezscholte merged commit 89b9b20 into main Jul 4, 2026
1 check passed
@freezscholte
freezscholte deleted the codex/ner-376-store-conflict-publication-domain branch July 4, 2026 23:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant