feat(cli): add memory conflicts and resolve-conflict operator commands#145
Merged
Conversation
Ports the team-memory conflict inspection and resolution operations from PR #142 onto the coven-code memory operator surface that landed in #144: - coven-code memory conflicts [--dir <team-memory-path>] [--json] lists unresolved pull conflicts (key, kind, reason) - coven-code memory resolve-conflict <key> [--dir <path>] removes the persisted conflict record after validating the key against traversal closes #142 Co-authored-by: romgenie <5861166+romgenie@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
There was a problem hiding this comment.
Pull request overview
Adds operator-facing team-memory conflict inspection/resolution to the existing coven-code memory admin surface, completing the conflict workflow that wasn’t covered by the earlier lifecycle-controls landing.
Changes:
- Adds
memory conflictsandmemory resolve-conflictsubcommands (plus usage text) to the CLI memory admin module. - Adds CLI tests covering conflict listing, resolution behavior, and traversal-key rejection.
- Updates operator controls documentation (markdown + docs site content) to include the new commands.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| src-rust/crates/cli/src/memory_admin.rs | Adds conflicts/resolve-conflict handlers, help text, and new tests for conflict workflows. |
| docs/src/content/configuration.js | Updates docs-site “Memory Retention” section to list the new operator commands. |
| docs/configuration.md | Updates the operator-controls table with conflict inspection/resolution commands and descriptions. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+206
to
+214
| let conflicts = claurst_core::team_memory_sync::pending_conflicts(&team_dir); | ||
| if json { | ||
| println!("{}", serde_json::to_string_pretty(&conflicts)?); | ||
| return Ok(()); | ||
| } | ||
| if conflicts.is_empty() { | ||
| println!("no pending team-memory conflicts in {}", team_dir.display()); | ||
| return Ok(()); | ||
| } |
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
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.
Summary
coven-code memory conflictsandcoven-code memory resolve-conflict— the team-memory conflict operations from @romgenie's PR [codex] Add memory lifecycle controls #142, re-landed on the operator surface that merged in feat(memory): add lifecycle controls #144.Context
crates/cli/src/memory_admin.rs), superseding most of it. The conflict inspection/resolution ops were the piece feat(memory): add lifecycle controls #144 lacked.memoryadmin surface, tests, docs.Changes
crates/cli/src/memory_admin.rs:conflicts [--dir <team-memory-path>] [--json]lists unresolved pull conflicts viateam_memory_sync::pending_conflicts;resolve-conflict <key> [--dir <path>]validates the key withvalidate_memory_paththen callsresolve_conflict. Default team dir isteam_memory_path(auto_memory_path(cwd)). Usage text updated. Four new tests.docs/configuration.md,docs/src/content/configuration.js: operator-controls table/summary updated.Validation
cargo check --workspace— cleancargo fmt --all— cleancargo clippy --workspace --all-targets -- -D warnings— cleancargo test --package claurst --bin coven-code -- memory_admin— 8 passed, 0 failedgit diff --check— cleancargo test --workspace— change is confined to the CLI admin module covered above.PR Readiness
Co-authored-by: romgenie <5861166+romgenie@users.noreply.github.com>.