Help us improve
Share bugs, ideas, or general feedback.
From interlock
Use when a file edit is blocked because another agent holds a reservation — guides recovery from check status through escalation
npx claudepluginhub mistakeknot/interagency-marketplace --plugin interlockHow this skill is triggered — by the user, by Claude, or both
Slash command
/interlock:conflict-recoveryThe summary Claude sees in its skill listing — used to decide when to auto-load this skill
When you try to reserve or edit a file held by another agent, you hit a conflict. The PreToolUse:Edit hook warns you; the git pre-commit hook blocks commits. This skill teaches the escalation ladder for resolving conflicts without losing work.
Guides technical evaluation of code review feedback: read fully, restate for understanding, verify against codebase, respond with reasoning or pushback before implementing.
Share bugs, ideas, or general feedback.
When you try to reserve or edit a file held by another agent, you hit a conflict. The PreToolUse:Edit hook warns you; the git pre-commit hook blocks commits. This skill teaches the escalation ladder for resolving conflicts without losing work.
reserve_files returns a conflict (409)git commit is rejected by the pre-commit hook due to reserved files/interlock:status that files you need are heldCall check_conflicts to see bead-aware collision cards:
active_bead_id, bead_id, thread_id)coordinate_same_bead, negotiate_release, clarify_bead_before_negotiation, etc.)Run /interlock:status for a broader coordination snapshot; it may not include every collision-card field.
If other unreserved files need attention, work on those first. The reservation may expire or be released while you work. Call my_reservations to see what you already hold.
Call negotiate_release with the holding agent's name/ID, file pattern, and reason. Use urgency='urgent' only when truly blocking critical work. For blocking-wait mode, set wait_seconds (for example wait_seconds=120) so the call polls the negotiation thread before returning.
Check the expires_at timestamp from Step 1. If expiry is <5 minutes away, wait it out. Stale reservations are auto-cleaned by intermute every 60 seconds.
If the reservation holder is unresponsive and the work is urgent:
/interlock:status and decidegit commit --no-verify (last resort)| Tool | When to Use |
|---|---|
check_conflicts | Step 1: see who holds the file |
list_agents | Identify the holding agent |
negotiate_release | Step 3: ask them to release (optionally wait with wait_seconds) |
fetch_inbox | Check if they responded |
git commit --no-verify without user approval — bypasses safety, risks overwriting another agent's work