Worktrunk worktrunk
Guidance for Worktrunk (the `wt` CLI) — git worktree management, hooks, and config. Load when editing .config/wt.toml or ~/.config/worktrunk/config.toml; adding, modifying, or debugging hooks (post-merge, post-start, pre-commit, pre-merge, post-switch, etc.); configuring commit message generation or command aliases; or troubleshooting wt behavior. Also answers general worktrunk/wt questions.
git clone https://github.com/max-sixty/worktrunk
T=$(mktemp -d) && git clone --depth=1 https://github.com/max-sixty/worktrunk "$T" && mkdir -p ~/.claude/skills && cp -r "$T/skills/worktrunk" ~/.claude/skills/max-sixty-worktrunk-worktrunk && rm -rf "$T"
skills/worktrunk/SKILL.mdWorktrunk
Help users work with Worktrunk, a CLI tool for managing git worktrees.
Available Documentation
Reference files are synced from worktrunk.dev documentation:
- reference/config.md: User and project configuration (LLM, hooks, command defaults)
- reference/hook.md: Hook types, timing, and execution order
- reference/switch.md, merge.md, list.md, etc.: Command documentation
- reference/llm-commits.md: LLM commit message generation
- reference/tips-patterns.md: Language-specific tips and patterns
- reference/shell-integration.md: Shell integration debugging
- reference/troubleshooting.md: Troubleshooting for LLM and hooks (Claude-specific)
For command-specific options, run
wt <command> --help. For configuration, follow the workflows below.
Two Types of Configuration
Worktrunk uses two separate config files with different scopes and behaviors:
User Config (~/.config/worktrunk/config.toml
)
~/.config/worktrunk/config.toml- Scope: Personal preferences for the individual developer
- Location:
(never checked into git)~/.config/worktrunk/config.toml - Contains: LLM integration, worktree path templates, command settings, user hooks, approved commands
- Permission model: Always propose changes and get consent before editing
- See:
for detailed guidancereference/config.md
Project Config (.config/wt.toml
)
.config/wt.toml- Scope: Team-wide automation shared by all developers
- Location:
(checked into git)<repo>/.config/wt.toml - Contains: Hooks for worktree lifecycle (pre-start, pre-merge, etc.)
- Permission model: Proactive (create directly, changes are reversible via git)
- See:
for detailed guidancereference/hook.md
Determining Which Config to Use
When a user asks for configuration help, determine which type based on:
User config indicators:
- "set up LLM" or "configure commit generation"
- "change where worktrees are created"
- "customize commit message templates"
- Affects only their environment
Project config indicators:
- "set up hooks for this project"
- "automate npm install"
- "run tests before merge"
- Affects the entire team
Both configs may be needed: For example, setting up commit message generation requires user config, but automating quality checks requires project config.
Core Workflows
Setting Up Commit Message Generation (User Config)
Most common request. See
reference/llm-commits.md for supported tools and exact command syntax.
-
Detect available tools
which claude codex llm aichat 2>/dev/null -
If none installed, recommend Claude Code (already available in Claude Code sessions)
-
Propose config change — Get the exact command from
reference/llm-commits.md[commit.generation] command = "..." # see reference/llm-commits.md for tool-specific commandsAsk: "Should I add this to your config?"
-
After approval, apply
- Check if config exists:
wt config show - If not, guide through
wt config create - Read, modify, write preserving structure
- Check if config exists:
-
Suggest testing
wt step commit --show-prompt | head # verify prompt builds wt merge # in a repo with uncommitted changes
Setting Up Project Hooks (Project Config)
Common request for workflow automation. Follow discovery process:
-
Detect project type
ls package.json Cargo.toml pyproject.toml -
Identify available commands
- For npm: Read
scriptspackage.json - For Rust: Common cargo commands
- For Python: Check pyproject.toml
- For npm: Read
-
Design appropriate hooks (7 hook types available)
- Dependencies (fast, must complete) →
pre-start - Tests/linting (must pass) →
orpre-commitpre-merge - Long builds, dev servers →
post-start - Terminal/IDE updates →
post-switch - Deployment →
post-merge - Cleanup tasks →
pre-remove
- Dependencies (fast, must complete) →
-
Validate commands work
npm run lint # verify exists which cargo # verify tool exists -
Create
.config/wt.toml# Install dependencies when creating worktrees pre-start = "npm install" # Validate code quality before committing [pre-commit] lint = "npm run lint" typecheck = "npm run typecheck" # Run tests before merging pre-merge = "npm test" -
Add comments explaining choices
-
Suggest testing
wt switch --create test-hooks
See
for complete details.reference/hook.md
Adding Hooks to Existing Config
When users want to add automation to an existing project:
-
Read existing config:
cat .config/wt.toml -
Determine hook type - When should this run?
- Creating worktree (blocking) →
pre-start - Creating worktree (background) →
post-start - Every switch →
post-switch - Before committing →
pre-commit - Before merging →
pre-merge - After merging →
post-merge - Before removal →
pre-remove
- Creating worktree (blocking) →
-
Handle format conversion if needed
Single command to named table:
# Before pre-start = "npm install" # After (adding db:migrate) [pre-start] install = "npm install" migrate = "npm run db:migrate" -
Preserve existing structure and comments
Validation Before Adding Commands
Before adding hooks, validate:
# Verify command exists which npm which cargo # For npm, verify script exists npm run lint --dry-run # For shell commands, check syntax bash -n -c "if [ true ]; then echo ok; fi"
Dangerous patterns — Warn users before creating hooks with:
- Destructive commands:
,rm -rfDROP TABLE - External dependencies:
curl http://... - Privilege escalation:
sudo
Permission Models
User Config: Conservative
- Never edit without consent - Always show proposed change and wait for approval
- Never install tools - Provide commands for users to run themselves
- Preserve structure - Keep existing comments and organization
- Validate first - Ensure TOML is valid before writing
Project Config: Proactive
- Create directly - Changes are versioned, easily reversible
- Validate commands - Check commands exist before adding
- Explain choices - Add comments documenting why hooks exist
- Warn on danger - Flag destructive operations before adding
Common Tasks Reference
User Config Tasks
- Set up commit message generation →
reference/llm-commits.md - Customize worktree paths →
reference/config.md#worktree-path-template - Custom commit templates →
reference/llm-commits.md#templates - Configure command defaults →
reference/config.md#command-settings - Set up personal hooks →
reference/config.md#user-hooks
Project Config Tasks
- Set up hooks for new project →
reference/hook.md - Add hook to existing config →
reference/hook.md#configuration - Use template variables →
reference/hook.md#template-variables - Add dev server URL to list →
reference/config.md#dev-server-url
Key Commands
# View all configuration wt config show # Create initial user config wt config create # LLM setup guide wt config --help
Loading Additional Documentation
Load reference files for detailed configuration, hook specifications, and troubleshooting.
Find specific sections with grep:
grep -A 20 "## Setup" reference/llm-commits.md grep -A 30 "### pre-start" reference/hook.md grep -A 20 "## Warning Messages" reference/shell-integration.md
Hook Approvals in Non-Interactive Sessions
Project hooks and project aliases prompt for approval on first run, so an untrusted
.config/wt.toml can't silently execute arbitrary commands. Agents running wt merge, wt switch, or other commands that trigger hooks will hit an error like:
▲ cargo-difftest needs approval to execute 1 command: ○ post-merge install: cargo install --path . ✗ Cannot prompt for approval in non-interactive environment ↳ To skip prompts in CI/CD, add --yes; to pre-approve commands, run wt config approvals add
Two resolutions exist — pick based on who the agent is running for:
— interactive prompt that stores approvals towt config approvals add
. Run once per project; persists across invocations until the command template changes or the project moves. This is the right choice when the human owns the trust decision.~/.config/worktrunk/approvals.toml
/--yes
— bypasses approval for a single invocation. Appropriate for CI/CD where hook contents are controlled by the pipeline itself.-y
When invoked as an agent, stop and escalate to the user — pre-approval is a security decision about whether this project's hooks should be trusted to run arbitrary commands on their machine. Tell the user to run
wt config approvals add (or review and re-run with --yes if they accept the CI-style one-shot bypass). Don't reach for --yes on the user's behalf just to unblock the command.
Advanced: Agent Handoffs
When the user requests spawning a worktree with an agent in a background session ("spawn a worktree for...", "hand off to another agent"), use the appropriate pattern for their terminal multiplexer. Substitute
<agent-cli> with the CLI you are running as: claude for Claude Code, 'opencode run' for OpenCode.
tmux (check
$TMUX env var):
tmux new-session -d -s <branch-name> "wt switch --create <branch-name> -x <agent-cli> -- '<task description>'"
Zellij (check
$ZELLIJ env var):
zellij run -- wt switch --create <branch-name> -x <agent-cli> -- '<task description>'
Requirements (all must be true):
- User explicitly requests spawning/handoff
- User is in a supported multiplexer (tmux or Zellij)
- The user's project instructions (
orCLAUDE.md
) or an explicit prompt authorize this patternAGENTS.md
Do not use this pattern for normal worktree operations.
Example (tmux, Claude Code):
tmux new-session -d -s fix-auth-bug "wt switch --create fix-auth-bug -x claude -- \ 'The login session expires after 5 minutes. Find the session timeout config and extend it to 24 hours.'"
Example (Zellij, OpenCode):
zellij run -- wt switch --create fix-auth-bug -x 'opencode run' -- \ 'The login session expires after 5 minutes. Find the session timeout config and extend it to 24 hours.'