[BUG] Make Claude Desktop's auto-worktree behavior optional

Resolved 💬 3 comments Opened May 9, 2026 by dt-enora Closed Jun 13, 2026

Preflight Checklist

  • [x] I have searched existing issues and this hasn't been reported yet
  • [x] This is a single bug report (please file separate reports for different bugs)
  • [x] I am using the latest version of Claude Code

What's Wrong?

Claude Desktop creates a git worktree under .claude/worktrees/<name>/ for every new session, with no way to disable it. The official worktrees doc confirms this is "by design and not configurable." For workflows where the user already gets isolation from a feature-branch + PR flow (the standard case for a single-developer or small-team repo), the worktree is pure ceremony — it adds a nested directory, splits the working tree across two locations, and forces extra steps to get the work into the user's main checkout.

Request: a settings.json toggle to disable auto-worktree, or a per-session opt-out in the new-session UI. The CLI's claude command already runs in the main checkout by default — Desktop should be capable of the same.

Workflow this hurts: branch-and-PR development, where the user wants to review my work as a PR on GitHub and merge it. The branch alone provides isolation; the worktree is duplicative.

What Should Happen?

it should be configuration you can turn off so the code is not duplicated inside the local repository folder, and i can use git to manage changes, which is the simpler way.

Error Messages/Logs

Steps to Reproduce

use claude code desktop tool to make changes to a project. now deal with the messiness of the worktrees.

Claude Model

Opus

Is this a regression?

Yes, this worked in a previous version

Last Working Version

_No response_

Claude Code Version

2.1.121

Platform

Anthropic API

Operating System

macOS

Terminal/Shell

Terminal.app (macOS)

Additional Information

_No response_

View original on GitHub ↗

This issue has 3 comments on GitHub. Read the full discussion on GitHub ↗