Now liveThe Skillselion MCP - thousands of ranked skills, loaded into your agent mid-task. No install.Get it →
iknite avatar

Worktree Context

  • Updated December 20, 2025
  • iknite/claude-code-marketplace

Worktree-context is a project bootstrapper that establishes clean separation between AI agent configurations and source code repositories. developers use it when starting a new AI project to avoid architectural debt early. It matters because mixing config and code creates brittle systems where changing prompts or model parameters accidentally breaks application logic, while separated concerns let teams iterate faster on either layer independently.

Key points

  • Separate AI config from source code
  • Enable independent versioning and deployment
  • Reduce coupling between agent logic and configuration

Worktree Context by the numbers

  • Data as of Jul 7, 2026 (Skillselion catalog sync)
/plugin marketplace add iknite/claude-code-marketplace
/plugin install worktree-context@iknite-cc-marketplace

Add your badge

Show developers this skill is listed on Skillselion. Paste this into your README.

Listed on Skillselion
Last updatedDecember 20, 2025
Repositoryiknite/claude-code-marketplace

What it does

Organize AI agent configurations and source code separately so they can be configured independently and versioned together.

README.md

Worktree Context Plugin for Claude Code

A Claude Code plugin that bootstraps projects with separation of concerns between AI configuration and source code using git worktrees.

Installation

Project-Level (Recommended)

Install the plugin into your project's context branch so it's stored alongside your AI configuration:

# Add the marketplace
/plugin marketplace add iknite/claude-code-marketplace

# Install to project (stored in .claude/, version controlled)
/plugin install worktree-context@iknite-cc-marketplace --scope project

This installs the plugin into your context branch's .claude/ directory, keeping AI tooling separate from your project code.

Local-Only (Not Shared)

# Install locally (gitignored, not shared with team)
/plugin install worktree-context@iknite-cc-marketplace --scope local

Global Installation

# Install globally (available in all projects)
/plugin install worktree-context@iknite-cc-marketplace --scope user

Verify Installation

/worktree-context:wt-list
/worktree-context:wt-status

Usage

Bootstrap a new project

/worktree-context:context-init /path/to/your/repo

This sets up the complete worktree structure automatically.

Daily workflow

# Check status of all worktrees
/worktree-context:wt-status

# Create a new feature branch
/worktree-context:wt-new feature/my-feature

# Work on your feature in worktree/feature/my-feature
# ... make changes with Claude Code ...

# Create a PR when ready
/worktree-context:wt-pr feature/my-feature

# Clean up after merge
/worktree-context:wt-remove feature/my-feature --delete-branch

Commands

Command Description
/worktree-context:context-init [path] Bootstrap a repo with the context branch methodology
/worktree-context:wt-new <branch> [base] Create a new worktree (auto-detects main/master)
/worktree-context:wt-list List all worktrees
/worktree-context:wt-status Show status: uncommitted changes, unpushed commits, sync state
/worktree-context:wt-pr <branch> [base] Create GitHub PR from a worktree branch
/worktree-context:wt-remove <branch> [-d] Remove worktree, optionally delete branch

The Methodology

This plugin creates a clean separation using two independent git histories:

bare-repo/
└── root/
    ├── context/              # AI configuration (CLAUDE.md, .claude/)
    │   ├── .gitignore        # Ignores worktree/**/
    │   └── worktree/         # All feature worktrees live here
    │       └── feature/
    │           └── my-feature/
    └── main/                 # Default branch (read-only reference)

Why?

  • AI config (CLAUDE.md, .claude/) stays in context branch
  • Project code stays in main/master lineage
  • Feature branches are nested inside context but ignored by it
  • Clean project history without AI config noise
  • Each project can have different plugins/configurations in its own context branch

Installation Scopes

Scope Location Shared Use Case
project .claude/ Yes (version controlled) Team shares same AI config
local .claude/ No (gitignored) Personal tweaks
user ~/.claude/ No Available everywhere

Recommendation: Use --scope project to keep the plugin in your context branch, maintaining the separation of concerns methodology.

Components

Component Purpose
Commands (.claude/commands/) Slash commands for worktree operations
Hooks (.claude/settings.json) Guardrails blocking direct edits to root/main/
Agent (.claude/agents/) worktree-manager for complex operations
Skill (.claude/skills/) Knowledge base Claude discovers automatically

Plugin Management

# Update the plugin
/plugin update worktree-context

# Disable temporarily
/plugin disable worktree-context@iknite-cc-marketplace

# Uninstall
/plugin uninstall worktree-context@iknite-cc-marketplace

Troubleshooting

Commands not showing up?

  • Run /plugin to check installation status
  • Try /plugin update worktree-context

Need complex worktree operations? Ask Claude: "Use the worktree-manager agent to help me..."


with <3 @iknite

Related skills

AI & Agent Buildingagentsautomationllm

This week in AI coding

Five minutes, every Monday - the tools, releases and tactics for developers.

unsubscribe anytime.