From 749a966f306f81cfa34ed7e56f6f0c4501674711 Mon Sep 17 00:00:00 2001
From: Ayman Bagabas <ayman.bagabas@gmail.com>
Date: Wed, 17 Dec 2025 10:50:33 -0500
Subject: [PATCH] fix(ui): ensure MCPs are displayed in configured order

---
 internal/ui/model/mcp.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/internal/ui/model/mcp.go b/internal/ui/model/mcp.go
index 2a58e15ac10175f29d6180aa7e98d954a644b34b..4100907d2c58f4238eb080356a069cf9bd0a2da6 100644
--- a/internal/ui/model/mcp.go
+++ b/internal/ui/model/mcp.go
@@ -16,8 +16,10 @@ func (m *UI) mcpInfo(width, maxItems int, isSection bool) string {
 	var mcps []mcp.ClientInfo
 	t := m.com.Styles
 
-	for _, state := range m.mcpStates {
-		mcps = append(mcps, state)
+	for _, mcp := range m.com.Config().MCP.Sorted() {
+		if state, ok := m.mcpStates[mcp.Name]; ok {
+			mcps = append(mcps, state)
+		}
 	}
 
 	title := t.Subtle.Render("MCPs")