Simplify worktree support to delegate to Claude CLI

The Claude CLI already handles worktree creation and cleanup via its
--worktree flag. Remove the Emacs-side worktree management code and
pass --worktree [name] as a command-line switch instead.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: cvdub

claude-code.el

@@ -110,16 +110,6 @@ This must be set to the path of your Claude sandbox binary before use."
   :type '(choice (const :tag "Not configured" nil) string)
   :group 'claude-code)
 
-(defcustom claude-code-worktree-directory ".claude/worktrees/"
-  "Subdirectory under git root where worktrees are created."
-  :type 'string
-  :group 'claude-code)
-
-(defcustom claude-code-worktree-confirm-cleanup t
-  "Whether to prompt before removing the worktree on buffer kill."
-  :type 'boolean
-  :group 'claude-code)
-
 (defcustom claude-code-newline-keybinding-style 'newline-on-shift-return
   "Key binding style for entering newlines and sending messages.
 
@@ -957,56 +947,6 @@ If not in a project and no buffer file return `default-directory'."
      ;; Case 3: No project and no buffer file
      (t default-directory))))
 
-(defvar-local claude-code--worktree-path nil
-  "Path to the git worktree for this Claude buffer.
-
-Set by `claude-code-worktree' so that the worktree can be cleaned up
-when the buffer is killed.")
-
-(defun claude-code--git-root ()
-  "Return the git repository root for the current directory.
-
-Return nil if not in a git repository."
-  (condition-case nil
-      (car (process-lines "git" "rev-parse" "--show-toplevel"))
-    (error nil)))
-
-(defun claude-code--create-worktree (git-root &optional name)
-  "Create a git worktree under GIT-ROOT.
-
-NAME is the worktree name; if nil a timestamp-based name is generated.
-Return the worktree path on success, signal an error on failure."
-  (let* ((wt-name (or name (format-time-string "wt-%Y%m%d-%H%M%S")))
-         (wt-path (expand-file-name
-                   (concat claude-code-worktree-directory wt-name)
-                   git-root))
-         (branch (concat "claude-worktree-" wt-name))
-         (exit-code (call-process "git" nil nil nil
-                                  "worktree" "add" wt-path "-b" branch)))
-    (unless (zerop exit-code)
-      (error "Failed to create git worktree at %s" wt-path))
-    wt-path))
-
-(defun claude-code--remove-worktree (worktree-path)
-  "Remove the git worktree at WORKTREE-PATH.
-
-Errors are reported as messages rather than signaled."
-  (let ((exit-code (call-process "git" nil nil nil
-                                 "worktree" "remove" worktree-path)))
-    (if (zerop exit-code)
-        (message "Removed git worktree at %s" worktree-path)
-      (message "Failed to remove git worktree at %s" worktree-path))))
-
-(defun claude-code--maybe-cleanup-worktree ()
-  "Remove the git worktree associated with this buffer if confirmed.
-
-Called from `kill-buffer-hook' in worktree Claude buffers."
-  (when claude-code--worktree-path
-    (when (or (not claude-code-worktree-confirm-cleanup)
-              (y-or-n-p (format "Remove git worktree at %s? "
-                                claude-code--worktree-path)))
-      (claude-code--remove-worktree claude-code--worktree-path))))
-
 (defun claude-code--find-all-claude-buffers ()
   "Find all active Claude buffers across all directories.
 
@@ -1458,29 +1398,19 @@ for the project directory."
 (defun claude-code-worktree (&optional arg)
   "Start Claude in a new git worktree for isolated editing.
 
-Creates a git worktree under the directory specified by
-`claude-code-worktree-directory' and starts Claude there.  When the
-Claude buffer is killed, the worktree is optionally cleaned up
-\(controlled by `claude-code-worktree-confirm-cleanup').
+Passes --worktree to the Claude CLI, which handles worktree creation
+and cleanup.  Prompts for an optional worktree name.
 
-With prefix ARG (\\[universal-argument]), switch to buffer after creating."
+With prefix ARG (\\[universal-argument]), switch to buffer after creating.
+
+With double prefix ARG (\\[universal-argument] \\[universal-argument]),
+prompt for the project directory."
   (interactive "P")
-  (let* ((git-root (claude-code--git-root))
-         (_ (unless git-root (error "Not in a git repository")))
-         (name (read-string "Worktree name: "
-                            (format-time-string "wt-%Y%m%d-%H%M%S")))
-         (worktree-path (claude-code--create-worktree git-root name))
-         buf-name)
-    (cl-letf (((symbol-function 'claude-code--directory)
-               (lambda () worktree-path)))
-      (claude-code--start (when arg '(4)) nil)
-      (setq buf-name (claude-code--buffer-name "default")))
-    (let ((buf (get-buffer buf-name)))
-      (when buf
-        (with-current-buffer buf
-          (setq claude-code--worktree-path worktree-path)
-          (add-hook 'kill-buffer-hook
-                    #'claude-code--maybe-cleanup-worktree nil t))))))
+  (let* ((name (read-string "Worktree name (empty for auto): "))
+         (extra-switches (if (string-empty-p name)
+                             '("--worktree")
+                           (list "--worktree" name))))
+    (claude-code--start arg extra-switches)))
 
 ;;;###autoload
 (defun claude-code-sandbox (&optional arg)