claude-code - 💡(How to fix) Fix EnterWorktree tool creates worktrees inside .claude/ directory, breaking slash command and skill discovery [2 comments, 3 participants]

TL;DR

Update the EnterWorktree tool to create new worktrees at .worktrees/<name> instead of .claude/worktrees/<name> to fix the command autocomplete and skill loading issues.

Guidance

• Verify the current worktree creation path by checking the EnterWorktree tool's configuration or implementation to understand why it defaults to .claude/worktrees/<name>.
• Consider modifying the EnterWorktree tool to respect the project's existing worktree directory convention, which is .worktrees/<name>.
• As a temporary workaround, use the manual git worktree add .worktrees/<name> -b <branch> command to create worktrees outside of the .claude/ directory.
• Investigate how the command/skill discovery mechanism in Claude Code's desktop app can be updated to handle worktrees created inside .claude/ without breaking functionality.

Example

No code snippet is provided as the issue does not imply a specific code change, but rather a configuration or tooling adjustment.

Notes

The provided workaround using git worktree add suggests that the issue is specific to the EnterWorktree tool's behavior and not a fundamental limitation of the Claude Code app or Git.

Recommendation

Apply the workaround of manually creating worktrees using git worktree add .worktrees/<name> -b <branch> until the EnterWorktree tool is updated to create worktrees at the correct location. This approach ensures that command autocomplete and skills load correctly in new worktree sessions.