Bugfixes nov2025 pt2 (#5)

* UI bugfixes.
* Fix open port check during new fwd setup wizard

internal/ui/wizard_commands.go

@@ -144,8 +144,25 @@ func validateSelectorCmd(discovery *k8s.Discovery, contextName, namespace, selec
 }
 
 // checkPortCmd checks if a local port is available
-func checkPortCmd(port int) tea.Cmd {
+func checkPortCmd(port int, configPath string) tea.Cmd {
 	return func() tea.Msg {
+		// First check if port is already in the configuration
+		cfg, err := config.LoadConfig(configPath)
+		if err == nil {
+			// Check all forwards in config for this port
+			allForwards := cfg.GetAllForwards()
+			for _, fwd := range allForwards {
+				if fwd.LocalPort == port {
+					return PortCheckedMsg{
+						port:      port,
+						available: false,
+						message:   fmt.Sprintf("✗ Port %d already assigned to %s", port, fwd.ID()),
+					}
+				}
+			}
+		}
+
+		// Then check if port is available at OS level
 		available, processInfo, err := k8s.CheckPortAvailability(port)
 
 		msg := ""

internal/ui/wizard_handlers.go

@@ -374,6 +374,11 @@ func (m model) handleAddWizardKeys(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 func (m model) handleAddWizardEnter() (tea.Model, tea.Cmd) {
 	wizard := m.ui.addWizard
 
+	// Don't process Enter if we're currently loading
+	if wizard.loading {
+		return m, nil
+	}
+
 	switch wizard.step {
 	case StepSelectContext:
 		filteredContexts := wizard.getFilteredContexts()
@@ -452,12 +457,14 @@ func (m model) handleAddWizardEnter() (tea.Model, tea.Cmd) {
 			filteredServices := wizard.getFilteredServices()
 			if wizard.cursor >= 0 && wizard.cursor < len(filteredServices) {
 				wizard.resourceValue = filteredServices[wizard.cursor].Name
+
+				// Get ports from selected service (must do this BEFORE clearing search filter)
+				wizard.detectedPorts = filteredServices[wizard.cursor].Ports
+
 				wizard.step = StepEnterRemotePort
 				wizard.clearTextInput()
 				wizard.clearSearchFilter()
 
-				// Get ports from selected service
-				wizard.detectedPorts = filteredServices[wizard.cursor].Ports
 				if len(wizard.detectedPorts) > 0 {
 					wizard.inputMode = InputModeList
 					wizard.cursor = 0
@@ -500,14 +507,11 @@ func (m model) handleAddWizardEnter() (tea.Model, tea.Cmd) {
 		if err != nil || port < 1 || port > 65535 {
 			wizard.error = fmt.Errorf("invalid port number")
 		} else {
+			// Check port availability before proceeding
 			wizard.localPort = port
-			wizard.step = StepConfirmation
-			wizard.clearTextInput()
-			wizard.cursor = 0
-			wizard.inputMode = InputModeList
-			wizard.error = nil
 			wizard.loading = true
-			return m, checkPortCmd(port)
+			wizard.error = nil
+			return m, checkPortCmd(port, m.ui.configPath)
 		}
 
 	case StepConfirmation:
@@ -520,6 +524,12 @@ func (m model) handleAddWizardEnter() (tea.Model, tea.Cmd) {
 
 		// Handle button selection
 		if wizard.cursor == 0 {
+			// Check if port is available before saving
+			if !wizard.portAvailable {
+				wizard.error = fmt.Errorf("port %d is not available. Please choose a different port", wizard.localPort)
+				return m, nil
+			}
+
 			// Confirmed - save the forward
 			wizard.alias = wizard.textInput
 
@@ -771,6 +781,17 @@ func (m model) handlePortChecked(msg PortCheckedMsg) (tea.Model, tea.Cmd) {
 		m.ui.addWizard.loading = false
 		m.ui.addWizard.portAvailable = msg.available
 		m.ui.addWizard.portCheckMsg = msg.message
+
+		// Only proceed to confirmation if port is available
+		if msg.available {
+			m.ui.addWizard.step = StepConfirmation
+			m.ui.addWizard.clearTextInput()
+			m.ui.addWizard.cursor = 0
+			m.ui.addWizard.inputMode = InputModeList
+		} else {
+			// Port is not available - show error and stay on local port step
+			m.ui.addWizard.error = fmt.Errorf("port %d is in use, please choose another port", msg.port)
+		}
 	}
 
 	return m, nil

internal/ui/wizard_views.go

@@ -373,7 +373,7 @@ func (m model) renderEnterRemotePort() string {
 				prefix = "▸ "
 				b.WriteString(selectedStyle.Render(prefix + manualOption))
 			} else {
-				b.WriteString(mutedStyle.Render(prefix + manualOption))
+				b.WriteString(prefix + mutedStyle.Render(manualOption))
 			}
 			b.WriteString("\n")
 		}
@@ -443,7 +443,7 @@ func (m model) renderEnterLocalPort() string {
 		} else {
 			b.WriteString(errorStyle.Render(wizard.portCheckMsg))
 		}
-	} else if wizard.textInput != "" && wizard.localPort > 0 {
+	} else if wizard.textInput != "" {
 		b.WriteString(mutedStyle.Render("Press Enter to check availability"))
 	}