Which task types trigger a new worktree by default?

Features, bugs, and spikes are created in new worktrees by default, while chores and documentation updates are typically performed in-place.

How does this skill handle dependencies?

The skill automatically detects repository lockfiles and triggers a dependency installation whenever a new worktree is created.

Where are the worktrees stored?

All worktrees are created within a specific `.worktrees/` directory, which is automatically ignored by Git to prevent workspace pollution.

What happens when a task is completed?

Users can choose from several cleanup strategies: merging changes directly to main, creating a Pull Request, keeping the worktree for further use, or discarding it.

Git Worktree Manager

Name: Git Worktree Manager
Author: srstomp

bysrstomp

•

Developer Tools

Manages isolated Git worktrees for autonomous task development, ensuring clean branch states and automated dependency handling.

The Worktrees skill for pokayokay enables Claude to manage parallel development tasks by isolating them within Git worktrees. It automatically determines whether a task—such as a feature, bug, or spike—requires a separate worktree or an in-place change, ensuring that the main working directory remains clean and stable. By leveraging story-based reuse and automated dependency installation based on detected lockfiles, it streamlines the context-switching process and provides structured completion options including merging, creating Pull Requests, or discarding temporary environments.

Key Features

01Automatic dependency installation upon worktree initialization

02Isolated directory structure within .worktrees/ to prevent repository clutter

03Automated worktree creation for features, bugs, and spikes

04Story-based reuse of worktrees for related developmental tasks

05Clean task completion with merge, PR, and discard options

062 GitHub stars

Use Cases

01Working on multiple features simultaneously without the overhead of stashing or branch switching

02Running isolated spikes or bug fixes in a clean environment with dedicated dependencies

03Automating the transition from local AI-driven development to formal Pull Requests

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add srstomp/pokayokay worktrees

For use in Claude.ai and ChatGPT

Download Skill