Skip to content

Commit 4505752

Browse files
committed
Add merge benchmark suite, nested entity filter, and updated docs
New `weave bench` command runs 7 merge scenarios comparing weave (entity-level) vs git (line-level via diffy). Results: weave 7/7 clean (100%) vs git 6/7 (86%). Weave resolves import conflicts via commutative set merge and class method conflicts via inner entity decomposition. Fixed false conflicts from nested entities: sem-core extracts local variables inside class methods (e.g. `const user`) as top-level entities. When two agents' methods both declared the same variable name, this produced a false BothAdded conflict. Added filter_nested_entities() to strip entities whose line range is fully contained within another entity. Updated changelog with 12 new commit entries, added benchmark results table to index page, documented 4 new MCP tools (validate_merge, get_dependencies, get_dependents, impact_analysis), and added bench CLI command to docs.
1 parent 10e2e7e commit 4505752

10 files changed

Lines changed: 942 additions & 5 deletions

File tree

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/weave-cli/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ weave-crdt = { path = "../weave-crdt" }
99
sem-core = { git = "https://github.com/Ataraxy-Labs/sem", version = "0.2" }
1010
clap = { version = "4", features = ["derive"] }
1111
colored = "2"
12+
diffy = "0.4"

0 commit comments

Comments
 (0)