blomios/IdeA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(cli): z-order Cancel #151 + projection live événements avant Final #167 (+ alignement fixture plugin #165/#166) — QA verte

Browse Source
This commit is contained in:
Blomios
2026-08-06 19:09:07 +02:00
parent 3d4ea6859e
commit b45deabe6d
4 changed files with 133 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crates/infrastructure/src/session/codex.rs
View File

@ -421,7 +421,7 @@ impl AgentSession for CodexExecSession {
}
async fn send(&self, prompt: &str) -> Result<ReplyStream, AgentSessionError> {
self.send_inner(prompt, None, true).await
self.send_inner(prompt, None).await
}
async fn send_with_tap(
@ -429,7 +429,7 @@ impl AgentSession for CodexExecSession {
prompt: &str,
tap: std::sync::mpsc::Sender<ReplyEvent>,
) -> Result<ReplyStream, AgentSessionError> {
self.send_inner(prompt, Some(tap), false).await
self.send_inner(prompt, Some(tap)).await
}
async fn shutdown(&self) -> Result<(), AgentSessionError> {
@ -443,17 +443,17 @@ impl CodexExecSession {
&self,
prompt: &str,
tap: Option<std::sync::mpsc::Sender<ReplyEvent>>,
include_stream_announcements: bool,
) -> Result<ReplyStream, AgentSessionError> {
let spec = self.build_spawn_line(prompt);
let has_tap = tap.is_some();
let (line_tap, parser_thread) = tap.map_or((None, None), |event_tap| {
let (line_tx, line_rx) = std::sync::mpsc::channel::<String>();
let parser = std::thread::spawn(move || {
for line in line_rx {
if let Ok(parsed) = parse_event(&line) {
for event in parsed.events {
if let ReplyEvent::Final { content } = event {
let _ = event_tap.send(ReplyEvent::Announcement { text: content });
if !matches!(event, ReplyEvent::Final { .. }) {
let _ = event_tap.send(event);
}
}
}
@ -488,7 +488,7 @@ impl CodexExecSession {
// Un `agent_message` précédemment retenu est supersédé : il devient
// une annonce non terminale, on garde le plus récent en conclusion.
if last_final.is_some() {
if include_stream_announcements {
if !has_tap {
events.push(ReplyEvent::Announcement {
text: last_final.take().expect("présent"),
});
@ -496,7 +496,11 @@ impl CodexExecSession {
}
last_final = Some(content);
}
other => events.push(other),
other => {
if !has_tap {
events.push(other);
}
}
}
}
}

37
crates/infrastructure/src/session/mod.rs
View File

@ -1216,10 +1216,12 @@ mod tests {
}
#[tokio::test]
async fn codex_send_with_tap_emits_each_agent_message_live_as_announcement() {
async fn codex_send_with_tap_emits_provider_events_live_before_final_without_replay() {
let fake = FakeCli::printing(&[
r#"{"type":"thread.started","thread_id":"c"}"#,
r#"{"type":"item.completed","item":{"id":"i0","type":"agent_message","text":"je regarde"}}"#,
r#"{"type":"turn.started"}"#,
r#"{"type":"item.completed","item":{"id":"tool0","type":"command","text":"cargo test"}}"#,
r#"{"type":"turn.completed"}"#,
r#"{"type":"item.completed","item":{"id":"i1","type":"agent_message","text":"résultat"}}"#,
]);
let s = CodexExecSession::new(
@ -1237,24 +1239,31 @@ mod tests {
let events: Vec<_> = s.send_with_tap("x", tx).await.expect("send").collect();
let live: Vec<_> = rx.into_iter().collect();
assert_eq!(
live,
vec![
ReplyEvent::Announcement {
text: "je regarde".into()
},
ReplyEvent::Announcement {
text: "résultat".into()
},
],
"le tap live publie chaque agent_message, y compris celui qui deviendra Final"
assert!(
matches!(live.first(), Some(ReplyEvent::Progress { progress }) if progress.native_event.as_deref() == Some("turn.started")),
"le démarrage du tour provider doit être tapé live en premier"
);
assert!(
live.iter().any(
|event| matches!(event, ReplyEvent::ToolActivity { label } if label == "command")
),
"l'activité outil provider doit être tapée live"
);
assert!(
live.iter().any(|event| matches!(event, ReplyEvent::Progress { progress } if progress.native_event.as_deref() == Some("turn.completed"))),
"la fin de tour provider doit être tapée live avant le Final"
);
assert!(
live.iter()
.all(|event| !matches!(event, ReplyEvent::Final { .. })),
"le Final reste réservé au flux autoritaire"
);
assert_eq!(
without_progress(events.clone()),
vec![ReplyEvent::Final {
content: "résultat".into()
}],
"le flux final du chemin tap garde seulement le dernier Final pour le demandeur"
"le flux final du chemin tap ne rejoue pas les événements déjà projetés live"
);
}

90
frontend/src/features/agents/CustomAgentChatView.test.tsx
View File

@ -37,7 +37,17 @@ function addPluginCommand(
pluginId,
displayName: "Acme Plugin",
contributes: {
commands: [{ id: commandId, title: "Explain", shortDescription: "Explain selection" }],
menus: [],
menuItems: [],
slashCommands: [
{
name: "/explain",
shortDescription: "Explain selection",
command: commandId,
},
],
layouts: [],
mcpServers: [],
},
commands,
layouts: new PluginLayoutRegistry(pluginId, new Set()),
@ -408,6 +418,83 @@ describe("CustomAgentChatView", () => {
expect(screen.getByText("Progress").parentElement?.textContent).toContain("done");
});
it("does not append late progress chunks after the final answer", async () => {
let emitChunk: ((chunk: unknown) => void) | null = null;
const agent = {
launchAgentChat: vi.fn(),
reattachAgentChat: vi.fn(async (sessionId: string) => ({
sessionId,
scrollback: [],
})),
sendAgentChat: vi.fn(
(_sessionId: string, _prompt: string, onChunk: (chunk: unknown) => void) =>
new Promise<void>((resolve) => {
emitChunk = (chunk: unknown) => {
onChunk(chunk);
if ((chunk as { kind?: string }).kind === "final") resolve();
};
}),
),
cancelAgentChat: vi.fn(async () => {}),
closeAgentChat: vi.fn(async () => {}),
};
render(
<DIProvider
gateways={{
agent,
system: { pickFile: vi.fn(async () => null) },
} as unknown as Gateways}
>
<CustomAgentChatView
projectId="project-1"
agentId="agent-1"
agentName="Worker"
profile={profile}
cwd="/repo"
nodeId="node-1"
sessionId="chat-session-1"
conversationId="conversation-1"
onSessionId={vi.fn()}
onConversationId={vi.fn()}
/>
</DIProvider>,
);
await waitFor(() =>
expect(agent.reattachAgentChat).toHaveBeenCalledWith(
"chat-session-1",
expect.any(Function),
),
);
fireEvent.change(screen.getByLabelText(/message CLI custom/), {
target: { value: "ship ordered stream" },
});
fireEvent.click(screen.getByRole("button", { name: "Envoyer" }));
await waitFor(() => expect(emitChunk).not.toBeNull());
act(() => {
emitChunk?.({ kind: "final", content: "done" });
});
await screen.findByText("done");
act(() => {
emitChunk?.({
kind: "progress",
progress: {
source: "ideaLocal",
kind: "mcp",
stage: "started",
label: "idea_ticket_read",
toolName: "idea_ticket_read",
},
});
});
expect(screen.queryByText("idea_ticket_read")).toBeNull();
});
it("shows slash-command suggestions from the gateway, filters by prefix, and inserts the selected command", async () => {
const agent = {
launchAgentChat: vi.fn(),
@ -1040,6 +1127,7 @@ describe("CustomAgentChatView", () => {
expect(shell.className).toContain("overflow-hidden");
expect(toolbar.className).toContain("overflow-hidden");
expect(cancel.className).toContain("shrink-0");
expect(cancel.className).toContain("z-30");
expect(scroll.className).toContain("flex-1");
expect(scroll.className).toContain("basis-0");
expect(scroll.className).toContain("overflow-y-auto");

12
frontend/src/features/agents/CustomAgentChatView.tsx
View File

@ -299,6 +299,14 @@ function foldChunk(turns: ChatTurn[], raw: unknown): ChatTurn[] {
if (!isReplyRecord(raw)) {
return [...turns, { role: "unknown", text: unknownChunkLabel(raw) }];
}
const last = turns[turns.length - 1];
if (
(last?.role === "final" || last?.role === "error") &&
raw.kind !== "userPrompt" &&
raw.kind !== "UserPrompt"
) {
return turns;
}
switch (raw.kind) {
case "textDelta":
return appendAgentDelta(turns, String(raw.text ?? ""));
@ -946,7 +954,7 @@ export function CustomAgentChatView({
<div
role="toolbar"
aria-label="custom agent chat actions"
className="flex shrink-0 items-center gap-2 overflow-hidden border-b border-border px-3 py-2"
className="relative z-20 flex shrink-0 items-center gap-2 overflow-hidden border-b border-border px-3 py-2"
>
<div className="min-w-0 flex-1 overflow-hidden">
<div className="truncate text-sm font-medium">{agentName}</div>
@ -959,7 +967,7 @@ export function CustomAgentChatView({
<Button
size="sm"
variant="danger"
className="shrink-0 whitespace-nowrap"
className="relative z-30 shrink-0 whitespace-nowrap shadow-sm"
onClick={() => void cancel()}
>
Cancel