Move with other handlers

Signed-off-by: David Gageot <david.gageot@docker.com>

Author: dgageot

pkg/tui/handlers.go

@@ -198,7 +198,18 @@ func (a *appModel) handleCycleAgent() (tea.Model, tea.Cmd) {
 
 	// Cycle to the next agent (wrap around to 0 if at the end)
 	nextIndex := (currentIndex + 1) % len(availableAgents)
-	return a.switchToAgentByIndex(nextIndex)
+	return a.handleSwitchToAgentByIndex(nextIndex)
+}
+
+func (a *appModel) handleSwitchToAgentByIndex(index int) (tea.Model, tea.Cmd) {
+	availableAgents := a.sessionState.AvailableAgents()
+	if index >= 0 && index < len(availableAgents) {
+		agentName := availableAgents[index].Name
+		if agentName != a.sessionState.CurrentAgentName() {
+			return a, core.CmdHandler(messages.SwitchAgentMsg{AgentName: agentName})
+		}
+	}
+	return a, nil
 }
 
 // Toggles

pkg/tui/tui.go

@@ -478,8 +478,9 @@ func (a *appModel) handleKeyPressMsg(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) {
 	default:
 		// Handle ctrl+1 through ctrl+9 for quick agent switching
 		if index := parseCtrlNumberKey(msg); index >= 0 {
-			return a.switchToAgentByIndex(index)
+			return a.handleSwitchToAgentByIndex(index)
 		}
+
 		updated, cmd := a.chatPage.Update(msg)
 		a.chatPage = updated.(chat.Page)
 		return a, cmd
@@ -495,18 +496,6 @@ func parseCtrlNumberKey(msg tea.KeyPressMsg) int {
 	return -1
 }
 
-// switchToAgentByIndex switches to the agent at the given index
-func (a *appModel) switchToAgentByIndex(index int) (tea.Model, tea.Cmd) {
-	availableAgents := a.sessionState.AvailableAgents()
-	if index >= 0 && index < len(availableAgents) {
-		agentName := availableAgents[index].Name
-		if agentName != a.sessionState.CurrentAgentName() {
-			return a, core.CmdHandler(messages.SwitchAgentMsg{AgentName: agentName})
-		}
-	}
-	return a, nil
-}
-
 // View renders the complete application interface
 func (a *appModel) View() tea.View {
 	windowTitle := a.windowTitle()