What happens if a Claude instance crashes while holding a lock?

The skill includes a heartbeat mechanism; if an instance doesn't report for 5 minutes, it is marked as stale and its locks can be cleared using the /worktree-status --clean command or automated cleanup hooks.

Do I need this if I use Claude Code Agent Teams?

If you have Agent Teams enabled (v2.1.33+), native coordination is built-in. Use this skill specifically for independent worktree scenarios where sessions aren't part of a shared team.

How does Worktree Coordination prevent file conflicts?

It uses a PreToolUse hook to check a shared coordination registry before any write or edit operation, automatically blocking the action if another instance has already locked that file.

Can I manually lock a file before starting work?

Yes, you can use the /worktree-claim command to explicitly reserve a file, ensuring other instances don't attempt to modify it while you are planning your changes.

Worktree Coordination

Name: Worktree Coordination
Author: yonatangross

byyonatangross

•

開発者ツール

Coordinates multiple parallel Claude Code instances across Git worktrees to prevent file conflicts and synchronize architectural decisions.

This skill enables developers to run multiple Claude Code sessions simultaneously across different Git worktrees without the risk of overlapping work or merge conflicts. It provides a robust file-locking mechanism, real-time status tracking of all active instances, and a centralized registry for architectural decisions. While native Agent Teams now provides similar functionality for some users, this skill remains essential for independent multi-instance workflows, ensuring that parallel development remains organized, conflict-free, and contextually aligned through automated heartbeats and shared coordination logs.

主な機能

01Real-time file locking to prevent simultaneous edits across multiple worktrees

02Conflict detection tool using merge-tree to preview potential overlaps

03Shared architectural decision log to synchronize choices across parallel streams

0469 GitHub stars

05Automated heartbeat and stale instance cleanup for reliable lock management

06Centralized coordination registry to track active instances and their current tasks

ユースケース

01Managing complex refactors where multiple Claude instances work on related but separate feature branches

02Maintaining a shared source of truth for architectural decisions during high-velocity parallel coding

03Preventing accidental merge conflicts when running background agents alongside active development sessions

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add yonatangross/orchestkit worktree-coordination

For use in Claude.ai and ChatGPT

Download Skill