feat: view multiple access points per SSID

cli.go

@@ -27,7 +27,7 @@ func runTUI(b wifi.Backend) error {
 func formatConnection(c wifi.Connection) string {
 	var parts []string
 	if c.IsVisible {
-		parts = append(parts, fmt.Sprintf("%d%%", c.Strength))
+		parts = append(parts, fmt.Sprintf("%d%%", c.Strength()))
 		parts = append(parts, "visible")
 	}
 	if c.IsSecure {
@@ -99,7 +99,7 @@ func runShow(w io.Writer, jsonOut bool, ssid string, b wifi.Backend) error {
 			fmt.Fprintf(w, "Secure: %t\n", c.IsSecure)
 			fmt.Fprintf(w, "Visible: %t\n", c.IsVisible)
 			fmt.Fprintf(w, "Hidden: %t\n", c.IsHidden)
-			fmt.Fprintf(w, "Strength: %d%%\n", c.Strength)
+			fmt.Fprintf(w, "Strength: %d%%\n", c.Strength())
 			if c.LastConnected != nil {
 				fmt.Fprintf(w, "Last Connected: %s\n", helpers.FormatDuration(*c.LastConnected))
 			}

internal/tui/component.go

@@ -46,8 +46,8 @@ type connectionItem struct {
 
 func (i connectionItem) Title() string { return i.SSID }
 func (i connectionItem) Description() string {
-	if i.Strength > 0 {
-		return fmt.Sprintf("%d%%", i.Strength)
+	if i.Strength() > 0 {
+		return fmt.Sprintf("%d%%", i.Strength())
 	}
 	if !i.IsVisible && i.LastConnected != nil {
 		return helpers.FormatDuration(*i.LastConnected)

internal/tui/edit.go

@@ -287,12 +287,24 @@ func (m *EditModel) View() string {
 			}
 		}
 		details.WriteString(fmt.Sprintf("Security: %s\n", security))
-		if m.selectedItem.Strength > 0 {
-			details.WriteString(fmt.Sprintf("Signal: %d%%\n", m.selectedItem.Strength))
+		if m.selectedItem.Strength() > 0 {
+			details.WriteString(fmt.Sprintf("Signal: %d%%\n", m.selectedItem.Strength()))
 		}
 		if m.selectedItem.IsKnown && m.selectedItem.LastConnected != nil {
 			details.WriteString(fmt.Sprintf("Last connected: \n  %s (%s)\n", m.selectedItem.LastConnected.Format(time.DateTime), helpers.FormatDuration(*m.selectedItem.LastConnected)))
 		}
+
+		if len(m.selectedItem.AccessPoints) > 0 {
+			details.WriteString("\nAccess Points:\n")
+			for _, ap := range m.selectedItem.AccessPoints {
+				bssid := ap.BSSID
+				if bssid == "" {
+					bssid = "(unknown)"
+				}
+				details.WriteString(fmt.Sprintf("  %s %d%% %dMHz\n", bssid, ap.Strength, ap.Frequency))
+			}
+		}
+
 		s.WriteString(lipgloss.NewStyle().Border(lipgloss.RoundedBorder()).Padding(1, 2).Width(50).Render(details.String()))
 		s.WriteString("\n\n")
 	}

internal/tui/list.go

@@ -77,12 +77,24 @@ func (d itemDelegate) Render(w io.Writer, m list.Model, index int, listItem list
 		connectedPart = " (Connected)"
 	}
 
+	countPart := ""
+	if len(i.AccessPoints) > 1 {
+		countPart = fmt.Sprintf(" (%d APs)", len(i.AccessPoints))
+	}
+
 	var desc string
-	if i.Strength > 0 {
-		desc = CurrentTheme.FormatSignalStrength(i.Strength) + connectedPart
+	var sb strings.Builder
+	if i.Strength() > 0 {
+		sb.WriteString(CurrentTheme.FormatSignalStrength(i.Strength()))
+		sb.WriteString(countPart)
+		sb.WriteString(connectedPart)
+		desc = sb.String()
 	} else {
 		// Networks that are not visible have Strength=0, show their time ago instead
-		desc = lipgloss.NewStyle().Foreground(CurrentTheme.Subtle).Render(strengthPart + connectedPart)
+		sb.WriteString(strengthPart)
+		sb.WriteString(countPart)
+		sb.WriteString(connectedPart)
+		desc = lipgloss.NewStyle().Foreground(CurrentTheme.Subtle).Render(sb.String())
 	}
 
 	// Now combine and render the full line

internal/tui/reproduce_test.go

@@ -7,76 +7,74 @@ import (
 	"github.com/shazow/wifitui/wifi/mock"
 )
 
-func TestDuplicateEntriesInList(t *testing.T) {
-	// 1. Setup Backend with duplicates
+func TestMultipleAccessPointsDisplay(t *testing.T) {
+	// Create a mock backend with aggregated APs
 	b, err := mock.New()
 	if err != nil {
 		t.Fatalf("failed to create mock backend: %v", err)
 	}
 	mb := b.(*mock.MockBackend)
-	// Configure specific duplicates
-	ssid := "DupNet"
+
+	// Configure specific connections
 	mb.VisibleConnections = []wifi.Connection{
-		{SSID: ssid, Strength: 50, IsActive: true},
-		{SSID: ssid, Strength: 80, IsActive: true},
+		{
+			SSID:      "MeshNetwork",
+			IsVisible: true,
+			AccessPoints: []wifi.AccessPoint{
+				{Strength: 80},
+				{Strength: 50},
+				{Strength: 90},
+			},
+		},
+		{
+			SSID:      "SingleAP",
+			IsVisible: true,
+			AccessPoints: []wifi.AccessPoint{
+				{Strength: 40},
+			},
+		},
 	}
-	// Ensure no delay for tests
+	mb.KnownConnections = nil // Reset known connections to avoid interference
 	mb.ActionSleep = 0
-	// Disable signal strength randomization to ensure deterministic bug reproduction
 	mb.DisableRandomization = true
 
-	// 2. Init Model
-	m, err := NewModel(mb)
-	if err != nil {
-		t.Fatalf("NewModel failed: %v", err)
-	}
+	// Initialize the list model
+	model := NewListModel()
 
-	// 3. Trigger Scan (Initial)
-	conns, err := mb.BuildNetworkList(true)
-	if err != nil {
-		t.Fatalf("BuildNetworkList failed: %v", err)
+	// Simulate loading connections
+	conns, _ := mb.BuildNetworkList(true)
+	msg := connectionsLoadedMsg(conns)
+	model.Update(msg)
+
+	items := model.list.Items()
+	// We expect 2 items: MeshNetwork and SingleAP
+	if len(items) != 2 {
+		t.Fatalf("Expected 2 items, got %d", len(items))
 	}
-	msg := scanFinishedMsg(conns)
-	_, _ = m.Update(msg)
 
-	// Helper function to check for duplicates
-	checkForDuplicates := func(label string) {
-		top := m.stack.Top()
-		lm, ok := top.(*ListModel)
-		if !ok {
-			t.Fatalf("[%s] Top component is not ListModel, got %T", label, top)
-		}
-		items := lm.list.Items()
-		count := 0
+	// Helper function to check item description
+	checkDescription := func(ssid string) {
+		found := false
 		for _, item := range items {
-			ci, ok := item.(connectionItem)
-			if !ok {
-				continue
-			}
-			if ci.SSID == ssid {
-				count++
+			c := item.(connectionItem)
+			if c.SSID == ssid {
+				found = true
+
+				// Let's verify the underlying data structure is correct
+				if len(c.AccessPoints) == 3 && ssid == "MeshNetwork" {
+					return // Good
+				}
+				if len(c.AccessPoints) == 1 && ssid == "SingleAP" {
+					return // Good
+				}
+				t.Errorf("Incorrect AP count for %s: got %d", ssid, len(c.AccessPoints))
 			}
 		}
-		if count < 2 {
-			t.Errorf("[%s] Expected at least 2 connections for SSID %q, got %d", label, ssid, count)
-		} else {
-			t.Logf("[%s] Found %d duplicates for SSID %q", label, count, ssid)
+		if !found {
+			t.Errorf("SSID %s not found", ssid)
 		}
 	}
 
-	// Verify duplicates after first scan
-	checkForDuplicates("First Scan")
-
-	// 4. Trigger Rescan
-	// In the real app, this happens via a timer or keypress. Here we simulate the result.
-	// Since we disabled randomization, the strengths should remain 50 and 80.
-	conns2, err := mb.BuildNetworkList(true)
-	if err != nil {
-		t.Fatalf("BuildNetworkList (Rescan) failed: %v", err)
-	}
-	msg2 := scanFinishedMsg(conns2)
-	_, _ = m.Update(msg2)
-
-	// Verify duplicates persist after rescan
-	checkForDuplicates("Rescan")
+	checkDescription("MeshNetwork")
+	checkDescription("SingleAP")
 }

wifi/backend.go

@@ -12,6 +12,14 @@ const (
 	SecurityWPA
 )
 
+// AccessPoint represents a single access point for a network.
+type AccessPoint struct {
+	SSID      string
+	BSSID     string
+	Strength  uint8 // 0-100
+	Frequency uint  // MHz
+}
+
 // Connection represents a single network, visible or known.
 type Connection struct {
 	SSID          string
@@ -20,12 +28,58 @@ type Connection struct {
 	IsSecure      bool
 	IsVisible     bool
 	IsHidden      bool
-	Strength      uint8 // 0-100
+	AccessPoints  []AccessPoint
 	Security      SecurityType
 	LastConnected *time.Time
 	AutoConnect   bool
 }
 
+// Strength returns the strength of the strongest access point, or 0 if none.
+func (c Connection) Strength() uint8 {
+	if len(c.AccessPoints) == 0 {
+		return 0
+	}
+	// Sort access points by strength descending to ensure the first one is the strongest.
+	// Note: We return the strength of the first AP, assuming the list is sorted or we sort it here.
+	// Since AccessPoints might be unsorted, let's find the max.
+	maxStrength := uint8(0)
+	for _, ap := range c.AccessPoints {
+		if ap.Strength > maxStrength {
+			maxStrength = ap.Strength
+		}
+	}
+	return maxStrength
+}
+
+// AddAccessPoint adds the access points from 'other' to this connection.
+// It returns ErrSecurityMismatch if the security or SSID do not match.
+// It also merges other metadata (Active, Visible, Known, etc.) if applicable.
+func (c *Connection) AddAccessPoint(other Connection) error {
+	if c.SSID != other.SSID {
+		return ErrSecurityMismatch // Technically SSID mismatch, but keeping error simple as per request or should I make a new one? Request said "ErrSecurityMismatch if the security does not match". I'll assume strict equality for merge.
+	}
+	if c.Security != other.Security {
+		return ErrSecurityMismatch
+	}
+
+	c.AccessPoints = append(c.AccessPoints, other.AccessPoints...)
+
+	if other.IsActive {
+		c.IsActive = true
+	}
+	if other.IsVisible {
+		c.IsVisible = true
+	}
+	if other.IsKnown {
+		c.IsKnown = true
+		c.AutoConnect = other.AutoConnect
+		if other.LastConnected != nil {
+			c.LastConnected = other.LastConnected
+		}
+	}
+	return nil
+}
+
 // UpdateOptions specifies the properties to update for a connection.
 // A nil value for a field means that the property should not be changed.
 type UpdateOptions struct {

wifi/darwin/darwin.go

@@ -102,28 +102,44 @@ func (b *Backend) BuildNetworkList(shouldScan bool) ([]wifi.Connection, error) {
 
 	scannedNetworks := parseSystemProfilerOutput(string(out))
 
-	var conns []wifi.Connection
-	processedSSIDs := make(map[string]bool)
+	// Aggregate networks by SSID
+	aggregatedConns := make(map[string]wifi.Connection)
 
 	for _, net := range scannedNetworks {
-		processedSSIDs[net.ssid] = true
 		isKnown := knownSSIDs[net.ssid]
 		isActive := net.isActive || net.ssid == currentSSID
-		conns = append(conns, wifi.Connection{
-			SSID:        net.ssid,
-			IsActive:    isActive,
-			IsKnown:     isKnown,
-			IsVisible:   true,
-			Strength:    rssiToStrength(net.rssi),
-			IsSecure:    net.security != wifi.SecurityOpen,
-			Security:    net.security,
-			AutoConnect: isKnown,
-		})
+
+		ap := wifi.AccessPoint{Strength: rssiToStrength(net.rssi)}
+
+		if conn, exists := aggregatedConns[net.ssid]; exists {
+			conn.AccessPoints = append(conn.AccessPoints, ap)
+			// Merge flags if necessary (e.g. if one BSSID is active, the whole SSID is active)
+			if isActive {
+				conn.IsActive = true
+			}
+			aggregatedConns[net.ssid] = conn
+		} else {
+			aggregatedConns[net.ssid] = wifi.Connection{
+				SSID:        net.ssid,
+				IsActive:    isActive,
+				IsKnown:     isKnown,
+				IsVisible:   true,
+				AccessPoints: []wifi.AccessPoint{ap},
+				IsSecure:    net.security != wifi.SecurityOpen,
+				Security:    net.security,
+				AutoConnect: isKnown,
+			}
+		}
+	}
+
+	var conns []wifi.Connection
+	for _, conn := range aggregatedConns {
+		conns = append(conns, conn)
 	}
 
 	// Add known networks that are not visible
 	for ssid := range knownSSIDs {
-		if !processedSSIDs[ssid] {
+		if _, exists := aggregatedConns[ssid]; !exists {
 			conns = append(conns, wifi.Connection{
 				SSID:        ssid,
 				IsKnown:     true,

wifi/errors.go

@@ -20,3 +20,6 @@ var ErrOperationFailed = errors.New("operation failed")
 
 // ErrNotSupported is returned when a feature is not supported.
 var ErrNotSupported = errors.New("not supported")
+
+// ErrSecurityMismatch is returned when trying to merge connections with different security.
+var ErrSecurityMismatch = errors.New("security mismatch")

wifi/iwd/iwd.go

@@ -114,25 +114,22 @@ func (b *Backend) BuildNetworkList(shouldScan bool) ([]wifi.Connection, error) {
 			connectedVar, _ := networkObj.GetProperty(iwdNetworkIface + ".Connected")
 			isActive := connectedVar.Value().(bool)
 
+			ap := wifi.AccessPoint{Strength: strength}
+
 			if existing, exists := visibleNetworks[ssid]; exists {
-				if strength > existing.Strength {
-					visibleNetworks[ssid] = wifi.Connection{
-						SSID:      ssid,
-						IsActive:  isActive,
-						IsSecure:  security != wifi.SecurityOpen,
-						Security:  security,
-						IsVisible: true,
-						Strength:  strength,
-					}
+				existing.AccessPoints = append(existing.AccessPoints, ap)
+				if isActive {
+					existing.IsActive = true
 				}
+				visibleNetworks[ssid] = existing
 			} else {
 				visibleNetworks[ssid] = wifi.Connection{
 					SSID:        ssid,
 					IsActive:    isActive,
 					IsSecure:    security != wifi.SecurityOpen,
 					Security:    security,
 					IsVisible:   true,
-					Strength:    strength,
+					AccessPoints: []wifi.AccessPoint{ap},
 					AutoConnect: false, // Cannot autoconnect to unknown network
 				}
 			}