Weave

Install

brew install weave

Or build from source (requires Rust). Two binaries, both required: weave (the CLI you run: setup/explain/check/...) and weave-driver (the one git itself invokes on every merge; weave setup fails without it on PATH):

git clone https://github.com/Ataraxy-Labs/weave
cd weave
cargo install --path crates/weave-cli      # the `weave` binary
cargo install --path crates/weave-driver   # the `weave-driver` binary git calls

Upgrading an existing source install? cargo install refuses to overwrite a binary it didn't put there itself, so add --force to either command above.

Setup

In any Git repo:

weave setup

This configures Git to use weave for all supported file types. Then use git merge as normal.

To revert back to normal git merging:

weave unsetup

To set up for just yourself (without modifying .gitattributes), write the same supported file type rules to .git/info/attributes instead:

weave setup --local

Quickstart

```bash weave setup # this repo now merges through weave; git merge/rebase/cherry-pick unchanged git merge <branch> # real conflicts land as markers with a refused_by: line stating why weave explain <file> # per-hunk detail for one conflicted file, read off the actual git stages

then add `*.ts merge=weave` (etc.) to ~/.config/git/attributes

```

Any MCP client, via stdio (~/.config/claude/claude_desktop_config.json etc.)

{ "mcpServers": { "weave": { "command": "weave-mcp" } } } ```

The server discovers the repo from the first tool call's file path, the WEAVE_REPO env var, or its working directory. It exposes 22 tools in two independent groups (each tool's own description states when to call it and what an empty result means):

- Merge analysis reads git refs or the working tree directly, no setup needed: weave_findings, weave_check, weave_preview_merge, weave_diff, weave_merge_audit, weave_validate_merge, weave_merge_summary. - Entity and dependency inspection reads a file's or the repo's structure: weave_extract_entities, weave_get_dependencies, weave_get_dependents, weave_impact_analysis. - Live coordination tracks edits in the shared CRDT (.weave/state.automerge) for agents editing the same repo at the same time, starting with weave_agent_register: weave_agent_register, weave_agent_heartbeat, weave_claim_entity, weave_release_entity, weave_status, weave_who_is_editing, weave_potential_conflicts, weave_update_entity_content, weave_get_entity_content, weave_merge_file, weave_resolve_conflict.

Start with weave_findings after (or before) a merge between two branches, or weave_check for the cross-file binding risk a per-file git merge driver can't see: a rename in a.py whose surviving caller lives in b.py merges both files cleanly on its own, and the break is only visible repo-wide.

CLI Commands

Beyond setup/explain/check/preview above, the weave binary has commands for the CRDT coordination layer and for typed entity patches. Run weave --help or weave <command> --help for the full flag list; the table below is what each one is for.

claim/release/status/apply all operate on the same .weave/state.automerge CRDT document as the MCP tools below: the CLI and MCP server are two front ends onto one coordination state. That document lives in the repo's working tree but is never repo content: the first time weave writes it, it adds .weave/ to the repo's local .git/info/exclude (never your own .gitignore), so it never shows up in git status or gets swept into git add -A.

Weave vs Git Merge

The key difference: Git produces false conflicts on independent changes because they happen to be in the same file. Weave only conflicts on actual semantic collisions when two branches change the same entity incompatibly.

Weave vs Mergiraf

31 hand-crafted merge scenarios across 7 languages, comparable to mergiraf's own test corpus. Run weave bench to reproduce:

Mergiraf fails on both-add-at-end-of-file, insert-between-existing, and decorator conflict scenarios. Weave resolves all of these because it operates at entity granularity (functions, classes, methods) rather than AST node level. Full breakdown at ataraxy-labs.github.io/weave.