fix: address PR review feedback

- Re-add --no-worktree/--no-wt flag to skip auto-creation per-session
- TUI: only enable worktree checkbox when path is a git repo, set
  branchAutoSet so branch auto-tracks name edits
- Move duplicate detection after worktree creation so it uses the final
  session path instead of the pre-worktree path
- Fork: add branch-exists check when createNewBranch is true to prevent
  silently reusing an existing branch

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

Author: naps62

cmd/agent-deck/launch_cmd.go

@@ -39,7 +39,8 @@ func handleLaunch(profile string, args []string) {
 	newBranch := fs.Bool("b", false, "Create new branch (use with --worktree)")
 	newBranchLong := fs.Bool("new-branch", false, "Create new branch")
 	worktreeLocation := fs.String("location", "", "Worktree location: sibling, subdirectory, or custom path")
-
+	noWorktree := fs.Bool("no-worktree", false, "Skip automatic worktree creation")
+	noWorktreeShort := fs.Bool("no-wt", false, "Skip automatic worktree creation (short)")
 
 	// MCP flag
 	var mcpFlags []string
@@ -171,27 +172,19 @@ func handleLaunch(profile string, args []string) {
 		}
 	}
 
-	// Resolve title before worktree creation (auto-create needs title for branch name)
+	// Generate title before worktree creation (auto-create needs title for branch name).
+	// Duplicate detection runs after worktree creation so it uses the final session path.
 	if sessionTitle == "" {
 		sessionTitle = filepath.Base(path)
 	}
 
-	// Check for duplicate and generate unique title
 	userProvidedTitle := (mergeFlags(*title, *titleShort) != "")
 	if !userProvidedTitle {
 		sessionTitle = generateUniqueTitle(instances, sessionTitle, path)
-	} else {
-		if isDupe, existingInst := isDuplicateSession(instances, sessionTitle, path); isDupe {
-			out.Error(
-				fmt.Sprintf("session already exists: %s (%s)", existingInst.Title, existingInst.ID),
-				ErrCodeAlreadyExists,
-			)
-			os.Exit(1)
-		}
 	}
 
-	// Auto-create worktree if configured or requested via CLI flag
-	if wtBranch == "" {
+	// Auto-create worktree if configured and not explicitly skipped
+	if wtBranch == "" && !*noWorktree && !*noWorktreeShort {
 		wtSettings := session.GetWorktreeSettings()
 		if wtSettings.AutoCreate && git.IsGitRepo(path) {
 			wtBranch = wtSettings.Prefix() + git.SanitizeBranchName(sessionTitle)
@@ -263,6 +256,17 @@ func handleLaunch(profile string, args []string) {
 		path = worktreePath
 	}
 
+	// Check for duplicate sessions using the final path (after worktree resolution)
+	if userProvidedTitle {
+		if isDupe, existingInst := isDuplicateSession(instances, sessionTitle, path); isDupe {
+			out.Error(
+				fmt.Sprintf("session already exists: %s (%s)", existingInst.Title, existingInst.ID),
+				ErrCodeAlreadyExists,
+			)
+			os.Exit(1)
+		}
+	}
+
 	// Create new instance
 	var newInstance *session.Instance
 	if sessionGroup != "" {

cmd/agent-deck/main.go

@@ -818,7 +818,8 @@ func handleAdd(profile string, args []string) {
 	newBranch := fs.Bool("b", false, "Create new branch (use with --worktree)")
 	newBranchLong := fs.Bool("new-branch", false, "Create new branch")
 	worktreeLocation := fs.String("location", "", "Worktree location: sibling, subdirectory, or custom path")
-
+	noWorktree := fs.Bool("no-worktree", false, "Skip automatic worktree creation")
+	noWorktreeShort := fs.Bool("no-wt", false, "Skip automatic worktree creation (short)")
 
 	// MCP flag - can be specified multiple times
 	var mcpFlags []string
@@ -1014,31 +1015,23 @@ func handleAdd(profile string, args []string) {
 		}
 	}
 
-	// Resolve title before worktree creation (auto-create needs title for branch name)
+	// Generate title before worktree creation (auto-create needs title for branch name).
+	// Duplicate detection runs after worktree creation so it uses the final session path.
 	if sessionTitle == "" {
 		sessionTitle = filepath.Base(path)
 	}
 
-	// Track if user provided explicit title or we auto-generated from folder name
 	userProvidedTitle := (mergeFlags(*title, *titleShort) != "")
 	isQuick := *quickCreate || *quickCreateShort
 
 	if isQuick && !userProvidedTitle {
-		// Quick mode: use auto-generated adjective-noun name
 		sessionTitle = session.GenerateUniqueSessionName(instances, sessionGroup)
 	} else if !userProvidedTitle {
-		// User didn't provide title - auto-generate unique title for this path
 		sessionTitle = generateUniqueTitle(instances, sessionTitle, path)
-	} else {
-		// User provided explicit title - check for exact duplicate (same title AND path)
-		if isDupe, existingInst := isDuplicateSession(instances, sessionTitle, path); isDupe {
-			fmt.Printf("Session already exists with same title and path: %s (%s)\n", existingInst.Title, existingInst.ID)
-			os.Exit(0)
-		}
 	}
 
-	// Auto-create worktree if configured or requested via CLI flag
-	if wtBranch == "" {
+	// Auto-create worktree if configured and not explicitly skipped
+	if wtBranch == "" && !*noWorktree && !*noWorktreeShort {
 		wtSettings := session.GetWorktreeSettings()
 		if wtSettings.AutoCreate && git.IsGitRepo(path) {
 			wtBranch = wtSettings.Prefix() + git.SanitizeBranchName(sessionTitle)
@@ -1125,6 +1118,14 @@ func handleAdd(profile string, args []string) {
 		path = worktreePath
 	}
 
+	// Check for duplicate sessions using the final path (after worktree resolution)
+	if userProvidedTitle {
+		if isDupe, existingInst := isDuplicateSession(instances, sessionTitle, path); isDupe {
+			fmt.Printf("Session already exists with same title and path: %s (%s)\n", existingInst.Title, existingInst.ID)
+			os.Exit(0)
+		}
+	}
+
 	// Create new instance (without starting tmux)
 	var newInstance *session.Instance
 	if sessionGroup != "" {

cmd/agent-deck/session_cmd.go

@@ -385,6 +385,8 @@ func handleSessionFork(profile string, args []string) {
 	worktreeBranchLong := fs.String("worktree", "", "Create fork in git worktree for branch")
 	newBranch := fs.Bool("b", false, "Create new branch (use with --worktree)")
 	newBranchLong := fs.Bool("new-branch", false, "Create new branch")
+	noWorktree := fs.Bool("no-worktree", false, "Skip automatic worktree creation")
+	noWorktreeShort := fs.Bool("no-wt", false, "Skip automatic worktree creation (short)")
 
 	sandbox := fs.Bool("sandbox", false, "Run forked session in Docker sandbox")
 	sandboxImage := fs.String("sandbox-image", "", "Docker image for sandbox (overrides config default)")
@@ -475,8 +477,8 @@ func handleSessionFork(profile string, args []string) {
 	}
 	createNewBranch := *newBranch || *newBranchLong
 
-	// Auto-create worktree if configured or requested via CLI flag
-	if wtBranch == "" {
+	// Auto-create worktree if configured and not explicitly skipped
+	if wtBranch == "" && !*noWorktree && !*noWorktreeShort {
 		wtSettings := session.GetWorktreeSettings()
 		if wtSettings.AutoCreate && git.IsGitRepo(inst.ProjectPath) {
 			wtBranch = wtSettings.Prefix() + git.SanitizeBranchName(forkTitle)
@@ -497,10 +499,15 @@ func handleSessionFork(profile string, args []string) {
 			os.Exit(1)
 		}
 
-		if !createNewBranch && !git.BranchExists(repoRoot, wtBranch) {
+		branchExists := git.BranchExists(repoRoot, wtBranch)
+		if !createNewBranch && !branchExists {
 			out.Error(fmt.Sprintf("branch '%s' does not exist (use -b to create)", wtBranch), ErrCodeInvalidOperation)
 			os.Exit(1)
 		}
+		if createNewBranch && branchExists {
+			out.Error(fmt.Sprintf("branch '%s' already exists (remove -b flag to use existing branch)", wtBranch), ErrCodeInvalidOperation)
+			os.Exit(1)
+		}
 
 		wtSettings := session.GetWorktreeSettings()
 		worktreePath := git.WorktreePath(git.WorktreePathOptions{

internal/ui/newdialog.go

@@ -250,7 +250,12 @@ func (d *NewDialog) ShowInGroup(groupPath, groupName, defaultPath string) {
 		d.inheritedSettings = buildInheritedSettings(userConfig.Docker)
 		d.branchPrefix = userConfig.Worktree.Prefix()
 		if userConfig.Worktree.AutoCreate {
-			d.worktreeEnabled = true
+			// Only auto-enable worktree if the resolved path is a git repo
+			pathValue := d.pathInput.Value()
+			if pathValue != "" && git.IsGitRepo(pathValue) {
+				d.worktreeEnabled = true
+				d.branchAutoSet = true
+			}
 		}
 	}
 	d.branchInput.Placeholder = d.branchPrefix + "branch-name"