fix(cli): progress agent_message émis en live + anti-doublon running/done par progressId — #187 (QA verte)
- Codex: les items agent_message sont désormais tapés en live comme progress (Message/Delta) dès item.completed, au lieu d'être bufferisés dans pending_final jusqu'à l'événement tool/MCP suivant. - Corrélation stable progressId (codex:item:<id>) ajoutée sur ReplyProgress, propagée jusqu'au DTO (ReplyProgressDto.progressId) et au frontend ; le ProgressSettler et la vue procèdent par upsert running -> done au lieu d'empiler des lignes dupliquées. - Tests: chat_bridge (settler par progressId), dto_chat, session codex, CustomAgentChatView (upsert par progressId).
This commit is contained in:
@ -70,6 +70,28 @@ fn progress_chunk(
|
||||
) -> ReplyChunk {
|
||||
ReplyChunk::Progress {
|
||||
progress: ReplyProgressDto {
|
||||
progress_id: None,
|
||||
source: ReplyProgressSourceDto::ProviderNative,
|
||||
kind,
|
||||
stage,
|
||||
label: label.to_owned(),
|
||||
text: None,
|
||||
provider: None,
|
||||
native_event: None,
|
||||
tool_name: Some(label.to_owned()),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
fn progress_chunk_with_id(
|
||||
kind: ReplyProgressKindDto,
|
||||
stage: ReplyProgressStageDto,
|
||||
label: &str,
|
||||
progress_id: &str,
|
||||
) -> ReplyChunk {
|
||||
ReplyChunk::Progress {
|
||||
progress: ReplyProgressDto {
|
||||
progress_id: Some(progress_id.to_owned()),
|
||||
source: ReplyProgressSourceDto::ProviderNative,
|
||||
kind,
|
||||
stage,
|
||||
@ -824,6 +846,32 @@ fn progress_settler_finish_completes_active_progress_at_stream_end() {
|
||||
assert!(settler.finish().is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn progress_settler_matches_running_and_done_by_progress_id_before_label() {
|
||||
let bridge = ChatBridge::new();
|
||||
let session = sid();
|
||||
let sink = Arc::new(Mutex::new(Vec::new()));
|
||||
bridge.register(session, capturing_channel(Arc::clone(&sink)));
|
||||
let mut settler = ProgressSettler::default();
|
||||
let started = progress_chunk_with_id(
|
||||
ReplyProgressKindDto::Message,
|
||||
ReplyProgressStageDto::Delta,
|
||||
"message intermédiaire",
|
||||
"codex:item:msg-1",
|
||||
);
|
||||
let completed = progress_chunk_with_id(
|
||||
ReplyProgressKindDto::Message,
|
||||
ReplyProgressStageDto::Completed,
|
||||
"message terminé",
|
||||
"codex:item:msg-1",
|
||||
);
|
||||
|
||||
assert!(bridge.send_output_settled(&session, &mut settler, started.clone()));
|
||||
assert!(bridge.send_output_settled(&session, &mut settler, completed.clone()));
|
||||
assert!(settler.finish().is_none());
|
||||
assert_eq!(sink.lock().unwrap().clone(), vec![started, completed]);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Registry basics, mirrored from pty_bridge.rs for parity
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
@ -72,6 +72,7 @@ fn reply_chunk_tool_activity_serialises_exact_camel_case() {
|
||||
fn reply_chunk_progress_serialises_exact_camel_case() {
|
||||
let v = serde_json::to_value(ReplyChunk::Progress {
|
||||
progress: ReplyProgressDto {
|
||||
progress_id: Some("codex:item:tool0".into()),
|
||||
source: ReplyProgressSourceDto::IdeaLocal,
|
||||
kind: ReplyProgressKindDto::Mcp,
|
||||
stage: ReplyProgressStageDto::Started,
|
||||
@ -90,6 +91,7 @@ fn reply_chunk_progress_serialises_exact_camel_case() {
|
||||
"progress": {
|
||||
"source": "ideaLocal",
|
||||
"kind": "mcp",
|
||||
"progressId": "codex:item:tool0",
|
||||
"stage": "started",
|
||||
"label": "idea_ask_agent",
|
||||
"text": "vers QA",
|
||||
@ -133,6 +135,7 @@ fn reply_chunk_round_trips_through_json_for_every_variant() {
|
||||
},
|
||||
ReplyChunk::Progress {
|
||||
progress: ReplyProgressDto {
|
||||
progress_id: None,
|
||||
source: ReplyProgressSourceDto::ProviderNative,
|
||||
kind: ReplyProgressKindDto::Turn,
|
||||
stage: ReplyProgressStageDto::Started,
|
||||
|
||||
Reference in New Issue
Block a user