Skip to content

Commit 55a78e0

Browse files
committed
waits on notify instead of display task for initial loading
1 parent f688866 commit 55a78e0

File tree

4 files changed

+213
-213
lines changed

4 files changed

+213
-213
lines changed

crates/chat-cli/src/cli/chat/server_messenger.rs

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@ use crate::mcp_client::{
1414
};
1515

1616
#[allow(dead_code)]
17-
#[derive(Clone, Debug)]
17+
#[derive(Debug)]
1818
pub enum UpdateEventMessage {
1919
ToolsListResult {
2020
server_name: String,
21-
result: ToolsListResult,
21+
result: eyre::Result<ToolsListResult>,
2222
},
2323
PromptsListResult {
2424
server_name: String,
25-
result: PromptsListResult,
25+
result: eyre::Result<PromptsListResult>,
2626
},
2727
ResourcesListResult {
2828
server_name: String,
29-
result: ResourcesListResult,
29+
result: eyre::Result<ResourcesListResult>,
3030
},
3131
ResourceTemplatesListResult {
3232
server_name: String,
33-
result: ResourceTemplatesListResult,
33+
result: eyre::Result<ResourceTemplatesListResult>,
3434
},
3535
InitStart {
3636
server_name: String,
@@ -67,7 +67,7 @@ pub struct ServerMessenger {
6767

6868
#[async_trait::async_trait]
6969
impl Messenger for ServerMessenger {
70-
async fn send_tools_list_result(&self, result: ToolsListResult) -> Result<(), MessengerError> {
70+
async fn send_tools_list_result(&self, result: eyre::Result<ToolsListResult>) -> Result<(), MessengerError> {
7171
Ok(self
7272
.update_event_sender
7373
.send(UpdateEventMessage::ToolsListResult {
@@ -78,7 +78,7 @@ impl Messenger for ServerMessenger {
7878
.map_err(|e| MessengerError::Custom(e.to_string()))?)
7979
}
8080

81-
async fn send_prompts_list_result(&self, result: PromptsListResult) -> Result<(), MessengerError> {
81+
async fn send_prompts_list_result(&self, result: eyre::Result<PromptsListResult>) -> Result<(), MessengerError> {
8282
Ok(self
8383
.update_event_sender
8484
.send(UpdateEventMessage::PromptsListResult {
@@ -89,7 +89,10 @@ impl Messenger for ServerMessenger {
8989
.map_err(|e| MessengerError::Custom(e.to_string()))?)
9090
}
9191

92-
async fn send_resources_list_result(&self, result: ResourcesListResult) -> Result<(), MessengerError> {
92+
async fn send_resources_list_result(
93+
&self,
94+
result: eyre::Result<ResourcesListResult>,
95+
) -> Result<(), MessengerError> {
9396
Ok(self
9497
.update_event_sender
9598
.send(UpdateEventMessage::ResourcesListResult {
@@ -102,7 +105,7 @@ impl Messenger for ServerMessenger {
102105

103106
async fn send_resource_templates_list_result(
104107
&self,
105-
result: ResourceTemplatesListResult,
108+
result: eyre::Result<ResourceTemplatesListResult>,
106109
) -> Result<(), MessengerError> {
107110
Ok(self
108111
.update_event_sender

0 commit comments

Comments
 (0)