feat(gateway): 补发运行中子智能体任务的TaskStarted事件
- 在加载话题历史消息时增加调用task_repository参数 - 查询该话题下所有运行中的子智能体任务 - 对每个运行中的任务补发TaskStarted事件 - 解决页面刷新后navigateToTaskId丢失的问题 - 增加错误处理及日志警告与信息输出 - 优化消息发送流程,避免子智能体消息混入
This commit is contained in:
parent
82eab7ad8d
commit
18ad891a51
@ -27,6 +27,8 @@ use crate::command::handlers::switch_topic::SwitchTopicCommandHandler;
|
|||||||
use crate::gateway::agent_prompt_provider::AgentPromptProvider;
|
use crate::gateway::agent_prompt_provider::AgentPromptProvider;
|
||||||
use crate::protocol::{WsInbound, WsOutbound, MediaSummary, parse_inbound, serialize_outbound};
|
use crate::protocol::{WsInbound, WsOutbound, MediaSummary, parse_inbound, serialize_outbound};
|
||||||
use crate::skills::SkillPromptProvider;
|
use crate::skills::SkillPromptProvider;
|
||||||
|
use crate::tools::task::repository::TaskRepository;
|
||||||
|
use crate::tools::task::types::TaskSessionState;
|
||||||
use axum::extract::State;
|
use axum::extract::State;
|
||||||
use axum::extract::ws::{Message as WsMessage, WebSocket, WebSocketUpgrade};
|
use axum::extract::ws::{Message as WsMessage, WebSocket, WebSocketUpgrade};
|
||||||
use axum::response::Response;
|
use axum::response::Response;
|
||||||
@ -482,7 +484,7 @@ async fn handle_inbound(
|
|||||||
*current_topic_id = Some(topic_id.clone());
|
*current_topic_id = Some(topic_id.clone());
|
||||||
|
|
||||||
// 加载并发送该话题的历史消息
|
// 加载并发送该话题的历史消息
|
||||||
if let Err(e) = send_topic_history(&store, current_session_id, topic_id, sender).await {
|
if let Err(e) = send_topic_history(&store, current_session_id, topic_id, sender, &state.task_repository).await {
|
||||||
tracing::warn!(error = %e, topic_id = %topic_id, "Failed to send topic history");
|
tracing::warn!(error = %e, topic_id = %topic_id, "Failed to send topic history");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -586,7 +588,7 @@ async fn handle_inbound(
|
|||||||
if let Some(first_topic) = topics.first() {
|
if let Some(first_topic) = topics.first() {
|
||||||
let topic_id = first_topic.topic_id.clone();
|
let topic_id = first_topic.topic_id.clone();
|
||||||
*current_topic_id = Some(topic_id.clone());
|
*current_topic_id = Some(topic_id.clone());
|
||||||
if let Err(e) = send_topic_history(&store, current_session_id, &topic_id, sender).await {
|
if let Err(e) = send_topic_history(&store, current_session_id, &topic_id, sender, &state.task_repository).await {
|
||||||
tracing::warn!(error = %e, topic_id = %topic_id, "Failed to send initial topic history");
|
tracing::warn!(error = %e, topic_id = %topic_id, "Failed to send initial topic history");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -641,6 +643,7 @@ async fn send_topic_history(
|
|||||||
session_id: &str,
|
session_id: &str,
|
||||||
topic_id: &str,
|
topic_id: &str,
|
||||||
sender: &mpsc::Sender<WsOutbound>,
|
sender: &mpsc::Sender<WsOutbound>,
|
||||||
|
task_repository: &Arc<dyn TaskRepository>,
|
||||||
) -> Result<(), Box<dyn std::error::Error>> {
|
) -> Result<(), Box<dyn std::error::Error>> {
|
||||||
// 加载话题消息,按 session_id 过滤,避免混入子智能体消息
|
// 加载话题消息,按 session_id 过滤,避免混入子智能体消息
|
||||||
let messages = store.load_messages_for_topic(topic_id, Some(session_id))?;
|
let messages = store.load_messages_for_topic(topic_id, Some(session_id))?;
|
||||||
@ -654,6 +657,35 @@ async fn send_topic_history(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 查询该话题下所有运行中的子智能体任务,补发 TaskStarted 事件
|
||||||
|
// 解决页面刷新后 navigateToTaskId 丢失的问题
|
||||||
|
let running_tasks = match task_repository.list_tasks_for_topic(topic_id).await {
|
||||||
|
Ok(tasks) => tasks,
|
||||||
|
Err(e) => {
|
||||||
|
tracing::warn!(error = %e, topic_id = %topic_id, "Failed to list tasks for topic");
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
for task in running_tasks {
|
||||||
|
if task.state == TaskSessionState::Running {
|
||||||
|
tracing::info!(
|
||||||
|
task_id = %task.id,
|
||||||
|
description = %task.description,
|
||||||
|
"Re-sending TaskStarted for running task after topic history load"
|
||||||
|
);
|
||||||
|
let _ = sender
|
||||||
|
.send(WsOutbound::TaskStarted {
|
||||||
|
task_id: task.id.clone(),
|
||||||
|
description: task.description.clone(),
|
||||||
|
subagent_type: task.subagent_type.clone(),
|
||||||
|
topic_id: Some(topic_id.to_string()),
|
||||||
|
parent_task_id: None,
|
||||||
|
})
|
||||||
|
.await;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user