Merge pull request #32 from ai-ecoverse/feature/claude-builtin-worktree

Delegate worktree creation to claude's built-in --worktree

Author: trieloff

executable_yolo

@@ -81,6 +81,8 @@ Usage: yolo [OPTIONS] [command] [args...]
 
 Options:
   -w, --worktree    Create a git worktree in .yolo/ before running command
+                    (exception: 'claude' delegates to its built-in --worktree,
+                    which manages worktrees under .claude/worktrees/)
   -c, --clean       Automatically clean up worktree after command completes
   -nc, --no-clean   Preserve worktree after command completes (no prompt)
   -e, --editor      Launch \$EDITOR to compose prompt (works in all modes)
@@ -132,21 +134,26 @@ Examples:
   yolo -e -a                       # Compose prompt in editor, run all agents
   yolo -e claude                   # Compose prompt in editor, run claude
   yolo claude                      # Run claude with --dangerously-skip-permissions
-  yolo -w claude "fix the bug"     # Create worktree, then run claude (prompt for cleanup)
-  yolo -w -c claude "experiment"   # Create worktree, auto-cleanup after
-  yolo -w -nc claude "keep this"   # Create worktree, preserve it after
+  yolo -w claude "fix the bug"     # Use claude's built-in --worktree (claude manages it)
+  yolo -w -c claude "experiment"   # Use claude's built-in --worktree (claude manages it)
+  yolo -w -nc claude "keep this"   # Use claude's built-in --worktree (claude manages it)
   yolo -e codex,claude,gemini      # Compose prompt in editor, run 3 agents in parallel
   yolo copilot chat                # Run copilot chat with safety flags disabled
   yolo aider "add auth"            # Run aider with auto-approval
   yolo -w aider "implement feature" # Create worktree, run aider with prompt
 
 Worktree Mode:
-  When using -w/--worktree flag:
+  When using -w/--worktree flag (for all commands except 'claude'):
   - Creates .yolo/ directory in repository root
   - Creates branch: <command>-N (where N is the lowest available number)
   - Creates worktree: .yolo/<command>-N
   - Changes to worktree directory before running command
 
+  When using -w/--worktree flag with 'claude':
+  - Delegates worktree management to claude's built-in --worktree flag
+  - Claude creates worktrees under .claude/worktrees/ with its own naming
+  - Claude handles worktree cleanup; yolo's -c/-nc flags do not apply
+
 Cleanup Mode:
   When using -m/--mop flag:
   - Removes all .yolo/ worktrees
@@ -1557,12 +1564,25 @@ main() {
         print_info "Will attempt to run it anyway..."
     fi
 
-    # Create worktree if requested
+    # Track whether yolo is managing the worktree itself
+    # claude has built-in --worktree support, so we delegate to it rather than
+    # creating our own worktree
+    local yolo_managed_worktree=false
     if [[ "$use_worktree" == "true" ]]; then
-        if ! create_worktree "$command_name"; then
-            exit 1
+        if [[ "$command_name" == "claude" ]]; then
+            print_info "Delegating worktree management to claude's built-in --worktree support"
+            # Claude handles its own worktree lifecycle, so yolo's -c/-nc
+            # cleanup flags do not apply in this mode.
+            if [[ -n "$auto_clean" ]]; then
+                print_warning "-c/--clean and -nc/--no-clean are ignored with 'claude -w' (claude manages cleanup)"
+            fi
+        else
+            if ! create_worktree "$command_name"; then
+                exit 1
+            fi
+            # create_worktree sets YOLO_BRANCH_NAME, YOLO_WORKTREE_PATH, YOLO_REPO_ROOT
+            yolo_managed_worktree=true
         fi
-        # create_worktree sets YOLO_BRANCH_NAME, YOLO_WORKTREE_PATH, YOLO_REPO_ROOT
     fi
 
     # Build the final command (single-agent mode) with agent-specific argument semantics
@@ -1720,6 +1740,27 @@ main() {
                 full_command+=("--print" "$prompt_joined")
             fi
             ;;
+        claude)
+            # claude has native --worktree support; when -w is requested we
+            # delegate worktree creation/cleanup to claude itself rather than
+            # creating one with yolo's own logic.
+            if [[ -n "$flags" ]]; then
+                # shellcheck disable=SC2206
+                local flag_array=($flags)
+                full_command+=("${flag_array[@]}")
+            fi
+            if [[ "$use_worktree" == "true" ]]; then
+                full_command+=("--worktree")
+                # --worktree takes an optional [name]; use -- to stop option
+                # parsing so the first prompt arg isn't consumed as the name.
+                if (( ${#command_args[@]} )); then
+                    full_command+=("--")
+                fi
+            fi
+            if (( ${#command_args[@]} )); then
+                full_command+=("${command_args[@]}")
+            fi
+            ;;
         *)
             if [[ -n "$flags" ]]; then
                 # shellcheck disable=SC2206
@@ -1748,8 +1789,9 @@ main() {
     "${full_command[@]}"
     local exit_code=$?
 
-    # Handle cleanup if worktree was created
-    if [[ "$use_worktree" == "true" && -n "$YOLO_BRANCH_NAME" ]]; then
+    # Handle cleanup if yolo created the worktree
+    # (claude's built-in --worktree manages its own cleanup)
+    if [[ "$yolo_managed_worktree" == "true" && -n "$YOLO_BRANCH_NAME" ]]; then
         if [[ "$auto_clean" == "yes" ]]; then
             # Automatic cleanup
             cleanup_worktree "$YOLO_BRANCH_NAME" "$YOLO_WORKTREE_PATH" "$YOLO_REPO_ROOT"

test.sh

@@ -442,6 +442,89 @@ EOF
     rm -f "$test_cmd"
 }
 
+# Test 9: Test yolo -w claude delegates to claude's built-in --worktree
+test_claude_builtin_worktree() {
+    print_test_header "Test 9: Claude Built-in Worktree Delegation"
+
+    # Create a temporary git repository for testing
+    local test_repo="/tmp/yolo_test_claude_$$"
+    mkdir -p "$test_repo"
+    cd "$test_repo"
+
+    # Initialize git repo
+    git init -q
+    git config user.email "test@example.com"
+    git config user.name "Test User"
+    echo "test" > README.md
+    git add README.md
+    git commit -q -m "Initial commit"
+
+    # Create a dummy claude command that echoes args (so we can assert pass-through)
+    local claude_cmd="/tmp/claude"
+    cat > "$claude_cmd" << 'EOF'
+#!/bin/bash
+echo "Running in: $PWD"
+echo "Args: $@"
+EOF
+    chmod +x "$claude_cmd"
+
+    # Assertion 1: --worktree is passed through when -w is set
+    run_test
+    local output
+    if output=$(PATH="/tmp:$PATH" run_with_timeout "$YOLO_TEST_TIMEOUT" "$YOLO_CMD" -w claude "fix the bug" 2>&1); then
+        if echo "$output" | grep -F -q -- "--worktree"; then
+            print_pass "yolo -w claude passes through --worktree flag"
+        else
+            print_fail "yolo -w claude should pass --worktree (got: $output)"
+        fi
+    else
+        print_fail "yolo -w claude failed to run"
+    fi
+
+    # Assertion 2: -- separator precedes the prompt so commander does not eat it
+    run_test
+    if echo "$output" | grep -F -q -- "--worktree -- fix the bug"; then
+        print_pass "yolo -w claude inserts -- before prompt to preserve it"
+    else
+        print_fail "yolo -w claude should insert -- before prompt (got: $output)"
+    fi
+
+    # Assertion 3: yolo did NOT create a .yolo/ directory
+    run_test
+    if [[ ! -d "$test_repo/.yolo" ]]; then
+        print_pass "yolo -w claude does not create .yolo/ worktree directory"
+    else
+        print_fail "yolo -w claude should not create .yolo/ directory"
+    fi
+
+    # Assertion 4: yolo did NOT create a git worktree
+    run_test
+    local wt_count
+    wt_count=$(git worktree list | wc -l | tr -d ' ')
+    if [[ "$wt_count" == "1" ]]; then
+        print_pass "yolo -w claude does not invoke git worktree add"
+    else
+        print_fail "yolo -w claude should not create a git worktree (found $wt_count)"
+    fi
+
+    # Assertion 5: yolo claude (without -w) does NOT pass --worktree
+    run_test
+    if output=$(PATH="/tmp:$PATH" run_with_timeout "$YOLO_TEST_TIMEOUT" "$YOLO_CMD" claude "hello" 2>&1); then
+        if ! echo "$output" | grep -F -q -- "--worktree"; then
+            print_pass "yolo claude (no -w) does not pass --worktree"
+        else
+            print_fail "yolo claude should not pass --worktree without -w (got: $output)"
+        fi
+    else
+        print_fail "yolo claude failed to run"
+    fi
+
+    # Cleanup
+    cd /tmp
+    rm -rf "$test_repo"
+    rm -f "$claude_cmd"
+}
+
 # Print summary
 print_summary() {
     echo ""
@@ -483,6 +566,7 @@ main() {
     test_worktree_creation
     test_worktree_no_git_error
     test_argument_preservation
+    test_claude_builtin_worktree
 
     print_summary
 }