worksession

Create isolated git worktrees for each Claude Code session.

1|1|Updated Mar 12, 2026
One-click install
npx skills add https://github.com/bettercallzaal/ZAOOS --skill worksession
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: worksession
Source: https://github.com/bettercallzaal/ZAOOS/tree/main/.claude/skills/worksession
Command: npx skills add https://github.com/bettercallzaal/ZAOOS --skill worksession

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Isolated git worktrees for parallel Claude Code terminals. One worktree per session, PR at the end.

Core Features & Use Cases

  • Isolated worktree per session to prevent conflicts when running multiple Claude Code terminals concurrently.
  • Guided workflow to create sessions from main, assign unique ws/<description> branches, and prepare for PR submission.
  • Enforce branch hygiene and cleanup routines to keep repository state healthy after merges.

Quick Start

Start a new Claude Code session and the system will create a fresh worktree in the neighboring worktrees directory.

Frequently Asked Questions about worksession

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I isolate git worktrees for parallel Claude Code sessions?

To isolate git worktrees for parallel Claude Code sessions, this Skill automates the creation of a dedicated worktree per session. It assigns unique ws/<description> branches to prevent cross-session conflicts when running multiple terminals concurrently.

What is the best way to manage git branch isolation when running multiple AI coding terminals?

Managing git branch isolation across multiple AI coding terminals is handled by creating separate worktrees from your local main branch. This ensures each session operates independently, maintaining strict branch hygiene and preventing state conflicts.

Do I need a local main branch to start a new git worktree session?

Yes, you need a functioning Git repository with a synchronized local main branch to start a new git worktree session. This base branch is required to safely generate the isolated worktree and prepare for PR submission.

Can I integrate git worktree creation seamlessly with a Claude shell alias?

Yes, you can integrate git worktree creation with a Claude shell alias for seamless session initialization. This optional setup allows you to instantly trigger the worktree generation process directly when opening a new Claude Code terminal.

How does git worktree cleanup work after a session merge?

Git worktree cleanup after a session merge is enforced through guided routines that keep the repository state healthy. The workflow prepares the isolated branch for PR submission and ensures the worktree is safely removed post-merge.

When should I not use per-session git worktrees for development?

You should not use per-session git worktrees if your repository lacks a functioning Git setup or local main branch synchronization. This approach specifically targets preventing cross-session conflicts for parallel terminals, not single-session workflows.