Entity-level merge for Pochi parallel agents

[rs545837]

Pochi's parallel agents run in separate git worktrees, which is great for isolation. But when merging those worktree branches back, git's line-level merge creates false conflicts when two agents edit different functions in the same file.

Weave is a semantic merge driver that merges at the level of functions, classes, and methods via tree-sitter. On a 31-scenario benchmark it resolves 100% cleanly vs git's 48%.

It installs as a git merge driver via .gitattributes. If Pochi auto-configures this when creating worktrees, parallel agent merges become entity-aware with zero user friction.

*.ts merge=weave
*.py merge=weave
*.go merge=weave

Supports TypeScript, JavaScript, Python, Go, Rust, Java, C, C++, Ruby, C# and more. brew install ataraxy-labs/tap/weave

Happy to help with integration.