メニュー
Entity-level merge with weave. Use when setting up weave, previewing merges, reducing false Git conflicts, or validating merge-driver behavior.
Codex または Claude でインストール この Prompt をコピーして Codex、Claude、または他のアシスタントに貼り付けると、Skill ページを確認してインストールできます。
SOC 職業分類に基づく
| name | weave |
| description | Entity-level merge with weave. Use when setting up weave, previewing merges, reducing false Git conflicts, or validating merge-driver behavior. |
| license | MIT |
| metadata | {"version":"0.1.0"} |
Use weave when Git line-conflicts are noisy but edits are logically independent.
# Configure current repo
weave setup
# Preview merge quality before merging
weave preview <branch>
# Execute merge (after setup, git uses weave driver)
git merge <branch>
# Optional: inspect CRDT state if using claims
weave status
# 1) binaries present
command -v weave weave-driver weave-mcp
# 2) repo config present
git config --local --get-regexp '^merge\.weave\.'
# 3) attributes include merge=weave
grep -n 'merge=weave' .gitattributes
Expected config:
merge.weave.name Entity-level semantic merge
merge.weave.driver weave-driver %O %A %B %L %P
tmpdir=$(mktemp -d) && cd "$tmpdir"
git init -q
git config user.name test && git config user.email test@example.com
cat > lib.ts <<'EOF'
export function a(x:number){ return x*2 }
export function b(s:string){ return s.length>0 }
EOF
git add lib.ts && git commit -qm base
weave setup >/dev/null
git checkout -qb left
perl -0pi -e 's/x\*2/x*3+1/' lib.ts
git commit -am left -q
git checkout -q @{-1}
git checkout -qb right
perl -0pi -e 's/s\.length>0/s.trim().length>0/' lib.ts
git commit -am right -q
git checkout -q left
git merge --no-ff right
Pass condition: merge completes and git ls-files -u is empty.
weave setup updates .gitattributes and local git merge-driver config.weave-driver ... (PATH-resolved) to avoid stale nix-store paths.weave-mcp is available; wire into your MCP client as needed.references/troubleshooting.mdFork one isolated Codex worktree thread per Beads issue and start each with a dependency-aware completion contract. Use when the user asks to start, fork, split, parallelize, or create separate chats for beads, tickets, issues, or a backlog with the goal of fixing them all.
This skill should be used when the user asks to "bump a package", "update an upstream revision", "refresh a Nix source hash", "rebase local patches", "carry fork changes as patches", "hack on upstream software in this repo", or fix a package whose patches no longer apply.
Jujutsu version control through jut, a human and agentic framework around jj. Use for: check status, view changes, commit work, create branches, push, pull, create PRs, squash commits, reword messages, absorb changes, undo operations, view history. Complements jj — use jut for opinionated workflows, drop into raw jj for everything else.
Create, manage, and verify healthchecks.io monitors via the REST API. Use when adding monitoring to a new cron job or service, auditing existing checks, wiring ping URLs into configs, or verifying a check fired correctly.
Control live Herdr workspaces, tabs, panes, agents, worktrees, layouts, plugins, and waits. Use when running inside Herdr (`HERDR_ENV=1`) to inspect sibling agents, delegate work—including dedicated Pi workspaces—run services, debug agent detection, or coordinate terminal state.
Structural code search, refactoring, and repository lint-rule setup with ast-grep. Use when searching by syntax shape, writing or testing ast-grep rules, configuring sgconfig.yml, enforcing coding standards, selecting rule severity, or adding ast-grep to project checks and CI.