[fix] Protect worktree operands with separator (#256)

fix(git): protect worktree operands with separator

Pass AddWorktree and MoveWorktree positional operands after -- so dash-leading sources or paths stay data instead of being parsed as git options.

Keep MoveWorktree force flags before the separator, and cover the exact argv shape with focused mock runner tests.

Co-authored-by: lugassawan

Author: loopassembly

internal/git/mock_runner_test.go

@@ -325,7 +325,7 @@ func TestRemoveWorktreeForce(t *testing.T) {
 	}
 }
 
-func TestMoveWorktreeNoForce(t *testing.T) {
+func TestMoveWorktreeInsertsDashDash(t *testing.T) {
 	var captured []string
 	r := &mockRunner{
 		run: func(args ...string) (string, error) {
@@ -337,8 +337,10 @@ func TestMoveWorktreeNoForce(t *testing.T) {
 	if err := MoveWorktree(r, "/old/path", "/new/path", false); err != nil {
 		t.Fatalf("MoveWorktree: %v", err)
 	}
-	if slices.Contains(captured, flagForce) {
-		t.Error("--force should not be present when force=false")
+
+	want := []string{cmdWorktree, "move", "--", "/old/path", "/new/path"}
+	if !slices.Equal(captured, want) {
+		t.Errorf("args = %v, want %v", captured, want)
 	}
 }
 
@@ -355,14 +357,9 @@ func TestMoveWorktreeForce(t *testing.T) {
 		t.Fatalf("MoveWorktree: %v", err)
 	}
 	// git worktree move requires --force twice to move locked worktrees
-	forceCount := 0
-	for _, a := range captured {
-		if a == flagForce {
-			forceCount++
-		}
-	}
-	if forceCount != 2 {
-		t.Errorf("expected 2 %s flags, got %d in args %v", flagForce, forceCount, captured)
+	want := []string{cmdWorktree, "move", flagForce, flagForce, "--", "/old/path", "/new/path"}
+	if !slices.Equal(captured, want) {
+		t.Errorf("args = %v, want %v", captured, want)
 	}
 }
 

internal/git/worktree.go

@@ -52,10 +52,11 @@ func RemoveWorktree(ctx context.Context, r Runner, path string, force bool) erro
 // When force is true, --force is passed twice so that even locked worktrees can be moved.
 // Intentionally non-cancellable: rollback moves must complete to avoid stranded worktrees.
 func MoveWorktree(r Runner, oldPath, newPath string, force bool) error {
-	args := []string{cmdWorktree, "move", oldPath, newPath}
+	args := []string{cmdWorktree, "move"}
 	if force {
 		args = append(args, flagForce, flagForce)
 	}
+	args = append(args, "--", oldPath, newPath)
 	_, err := r.Run(context.Background(), args...)
 	return err
 }