From 3e394cd697a4deac19ea976d527dfe1e646a5867 Mon Sep 17 00:00:00 2001
From: Aiden Cline <aidenpcline@gmail.com>
Date: Thu, 2 Jul 2026 00:12:33 -0500
Subject: [PATCH] fix(core): avoid blocking command list on mcp startup

---
 packages/core/src/mcp/index.ts    | 1 -
 packages/tui/src/context/data.tsx | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/core/src/mcp/index.ts b/packages/core/src/mcp/index.ts
index 2a2238db55..b89a3fc4c0 100644
--- a/packages/core/src/mcp/index.ts
+++ b/packages/core/src/mcp/index.ts
@@ -528,7 +528,6 @@ export const layer = Layer.effect(
           .toSorted((a, b) => a.server.localeCompare(b.server))
       }),
       prompts: Effect.fn("MCP.prompts")(function* () {
-        yield* whenAllReady
         return Array.from(runtime.values())
           .flatMap((entry) => entry.prompts ?? [])
           .toSorted((a, b) => a.server.localeCompare(b.server) || a.name.localeCompare(b.name))
diff --git a/packages/tui/src/context/data.tsx b/packages/tui/src/context/data.tsx
index 88e3649e63..9956fa4a96 100644
--- a/packages/tui/src/context/data.tsx
+++ b/packages/tui/src/context/data.tsx
@@ -618,7 +618,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
         // so the mcp list refreshes here rather than off integration.updated.
         case "mcp.status.changed":
           if (bootstrapping) break
-          void result.location.mcp.refresh(event.location)
+          void Promise.all([result.location.mcp.refresh(event.location), result.location.command.refresh(event.location)])
           break
       }
     }