diff --git a/internal/agent/tools/list_mcp_resources.go b/internal/agent/tools/list_mcp_resources.go
index 9b0417ed6343bc9680fbf8344f4a87a87bc2e015..25671ffe481a21a82c40167c40614603e907052c 100644
--- a/internal/agent/tools/list_mcp_resources.go
+++ b/internal/agent/tools/list_mcp_resources.go
@@ -1,7 +1,6 @@
 package tools
 
 import (
-	"cmp"
 	"context"
 	_ "embed"
 	"fmt"
@@ -43,7 +42,7 @@ func NewListMCPResourcesTool(cfg *config.Config, permissions permission.Service)
 				return fantasy.ToolResponse{}, fmt.Errorf("session ID is required for listing MCP resources")
 			}
 
-			relPath := filepathext.SmartJoin(cfg.WorkingDir(), cmp.Or(params.MCPName, "mcp-resources"))
+			relPath := filepathext.SmartJoin(cfg.WorkingDir(), params.MCPName)
 			p, err := permissions.Request(ctx,
 				permission.CreatePermissionRequest{
 					SessionID:   sessionID,
diff --git a/internal/ui/model/ui.go b/internal/ui/model/ui.go
index ad2944ab8e255797a4aedc8a3035019c1788bf89..a8719f0fd041e56847bbbbf4d46b8846b5e520a4 100644
--- a/internal/ui/model/ui.go
+++ b/internal/ui/model/ui.go
@@ -97,6 +97,10 @@ type (
 	mcpPromptsLoadedMsg struct {
 		Prompts []commands.MCPPrompt
 	}
+	// mcpStateChangedMsg is sent when there is a change in MCP client states.
+	mcpStateChangedMsg struct {
+		states map[string]mcp.ClientInfo
+	}
 	// sendMessageMsg is sent to send a message.
 	// currently only used for mcp prompts.
 	sendMessageMsg struct {
@@ -429,6 +433,9 @@ func (m *UI) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		if ok {
 			commands.SetCustomCommands(m.customCommands)
 		}
+
+	case mcpStateChangedMsg:
+		m.mcpStates = msg.states
 	case mcpPromptsLoadedMsg:
 		m.mcpPrompts = msg.Prompts
 		dia := m.dialog.Dialog(dialog.CommandsID)
@@ -3149,16 +3156,15 @@ func (m *UI) runMCPPrompt(clientID, promptID string, arguments map[string]string
 }
 
 func (m *UI) handleStateChanged() tea.Cmd {
-	slog.Warn("handleStateChanged")
 	return func() tea.Msg {
 		m.com.App.UpdateAgentModel(context.Background())
-		m.mcpStates = mcp.GetStates()
-		return nil
+		return mcpStateChangedMsg{
+			states: mcp.GetStates(),
+		}
 	}
 }
 
 func handleMCPPromptsEvent(name string) tea.Cmd {
-	slog.Warn("handleMCPPromptsEvent")
 	return func() tea.Msg {
 		mcp.RefreshPrompts(context.Background(), name)
 		return nil
@@ -3166,7 +3172,6 @@ func handleMCPPromptsEvent(name string) tea.Cmd {
 }
 
 func handleMCPToolsEvent(cfg *config.Config, name string) tea.Cmd {
-	slog.Warn("handleMCPToolsEvent")
 	return func() tea.Msg {
 		mcp.RefreshTools(
 			context.Background(),
@@ -3178,7 +3183,6 @@ func handleMCPToolsEvent(cfg *config.Config, name string) tea.Cmd {
 }
 
 func handleMCPResourcesEvent(name string) tea.Cmd {
-	slog.Warn("handleMCPResourcesEvent")
 	return func() tea.Msg {
 		mcp.RefreshResources(context.Background(), name)
 		return nil