fix: Change 'c' key to skip cleanup instead of advance to cleanup

In merge workflow, pressing 'c' during waiting-for-merge step now
cancels and keeps the worktree in place instead of skipping ahead
to cleanup.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: marcus

internal/plugins/worktree/plugin.go

@@ -1332,10 +1332,10 @@ func (p *Plugin) handleMergeKeys(msg tea.KeyMsg) tea.Cmd {
 		}
 
 	case "c":
-		// Skip to cleanup (if PR is merged or user wants to force cleanup)
+		// Skip cleanup - close modal and leave worktree in place
 		if p.mergeState.Step == MergeStepWaitingMerge {
-			p.mergeState.StepStatus[MergeStepWaitingMerge] = "done"
-			return p.advanceMergeStep()
+			p.cancelMergeWorkflow()
+			return nil
 		}
 
 	case "s":
@@ -1742,7 +1742,7 @@ func (p *Plugin) Commands() []plugin.Command {
 				cmds = append(cmds, plugin.Command{ID: "continue", Name: "Push", Description: "Push branch", Context: "worktree-merge", Priority: 2})
 			case MergeStepWaitingMerge:
 				cmds = append(cmds, plugin.Command{ID: "continue", Name: "Check", Description: "Check merge status", Context: "worktree-merge", Priority: 2})
-				cmds = append(cmds, plugin.Command{ID: "cleanup", Name: "Cleanup", Description: "Skip to cleanup", Context: "worktree-merge", Priority: 3})
+				cmds = append(cmds, plugin.Command{ID: "skip-cleanup", Name: "Skip", Description: "Skip cleanup, keep worktree", Context: "worktree-merge", Priority: 3})
 			case MergeStepDone:
 				cmds = append(cmds, plugin.Command{ID: "continue", Name: "Done", Description: "Close modal", Context: "worktree-merge", Priority: 2})
 			}

internal/plugins/worktree/view.go

@@ -1357,7 +1357,7 @@ func (p *Plugin) renderMergeModal(width, height int) string {
 		sb.WriteString("\n")
 		sb.WriteString(dimText("Checking status every 30 seconds"))
 		sb.WriteString("\n\n")
-		sb.WriteString(dimText("Press Enter to check now, 'c' to skip to cleanup"))
+		sb.WriteString(dimText("Press Enter to check now, 'c' to skip cleanup"))
 
 	case MergeStepCleanup:
 		sb.WriteString("Cleaning up worktree and branch...")