Commit 4505752
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
- crates
- weave-cli
- src
- commands
- weave-core
- src
- tests
- docs
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
| 12 | + | |
0 commit comments