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:
2026-08-13 12:45:32 +02:00
parent 1d393ffd4f
commit a3ee2814d6
10 changed files with 250 additions and 15 deletions

View File

@ -196,6 +196,7 @@ fn item_progress(
stage: ReplyProgressStage,
native_event: impl Into<String>,
) -> ReplyProgress {
let progress_id = item_progress_id(item);
let progress = if label.starts_with("idea_") {
ReplyProgress::new(
ReplyProgressSource::IdeaLocal,
@ -214,6 +215,11 @@ fn item_progress(
)
.with_tool_name(label.to_owned())
};
let progress = if let Some(progress_id) = progress_id {
progress.with_progress_id(progress_id)
} else {
progress
};
if let Some(preview) = item_preview(item) {
progress.with_text(preview)
} else {
@ -221,6 +227,29 @@ fn item_progress(
}
}
fn agent_message_progress(item: &Value, native_event: &str) -> Option<ReplyEvent> {
let content = item_text(item)?;
let mut progress = ReplyProgress::new(
ReplyProgressSource::ProviderNative,
ReplyProgressKind::Message,
ReplyProgressStage::Delta,
"message intermédiaire",
)
.with_provider_event("codex", native_event)
.with_text(content);
if let Some(progress_id) = item_progress_id(item) {
progress = progress.with_progress_id(progress_id);
}
Some(ReplyEvent::Progress { progress })
}
fn item_progress_id(item: &Value) -> Option<String> {
non_blank_string(item.get("id"))
.or_else(|| non_blank_string(item.get("item_id")))
.or_else(|| non_blank_string(item.get("call_id")))
.map(|id| format!("codex:item:{id}"))
}
fn append_item_progress(
events: &mut Vec<ReplyEvent>,
item: &Value,
@ -580,20 +609,18 @@ impl CodexExecSession {
let parser = std::thread::spawn(move || {
let mut pending_final: Option<String> = None;
for line in line_rx {
if let Ok(Some(progress)) = agent_message_progress_from_line(&line) {
let _ = event_tap.send(progress);
}
if let Ok(parsed) = parse_event(&line) {
for event in parsed.events {
match event {
ReplyEvent::Final { content } => {
if let Some(text) = pending_final.replace(content) {
let _ = event_tap.send(ReplyEvent::Announcement { text });
}
let _ = pending_final.replace(content);
}
other => {
if event_supersedes_pending_final(&other) {
if let Some(text) = pending_final.take() {
let _ =
event_tap.send(ReplyEvent::Announcement { text });
}
let _ = pending_final.take();
}
let _ = event_tap.send(other);
}
@ -684,3 +711,30 @@ fn event_supersedes_pending_final(event: &ReplyEvent) -> bool {
}
)
}
fn agent_message_progress_from_line(line: &str) -> Result<Option<ReplyEvent>, AgentSessionError> {
let trimmed = line.trim();
if trimmed.is_empty() {
return Ok(None);
}
let value: Value = serde_json::from_str(trimmed)
.map_err(|e| AgentSessionError::Decode(format!("ligne JSON illisible: {e}")))?;
let Some("item.completed" | "conversation.item.done" | "response.output_item.done") =
value.get("type").and_then(Value::as_str)
else {
return Ok(None);
};
let Some(item) = value.get("item") else {
return Ok(None);
};
if item_type(item).as_deref() != Some("agent_message") {
return Ok(None);
}
Ok(agent_message_progress(
item,
value
.get("type")
.and_then(Value::as_str)
.unwrap_or("item.completed"),
))
}