From 3a8a3b404d40e27bd70cef3ddf5d1a4b44b722a7 Mon Sep 17 00:00:00 2001 From: Codex Date: Tue, 2 Jun 2026 08:03:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=9E=E6=97=B6=E4=B8=8A=E6=8A=A5=20a?= =?UTF-8?q?gentMessage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/codex-stdio.ts | 59 +++++++++++++++++----------- src/mgr/result.ts | 6 +++ src/selftest/cases/30-codex-stdio.ts | 8 +++- 3 files changed, 48 insertions(+), 25 deletions(-) diff --git a/src/backend/codex-stdio.ts b/src/backend/codex-stdio.ts index 60f855e..706434c 100644 --- a/src/backend/codex-stdio.ts +++ b/src/backend/codex-stdio.ts @@ -408,9 +408,12 @@ async function runCodexStdioTurnWithSession(options: CodexStdioTurnOptions, sess const normalized = normalizeCodexNotification(message); if (normalized.threadId) threadId = normalized.threadId; if (normalized.turnId) turnId = normalized.turnId; - if (normalized.assistantDelta) assistantText += normalized.assistantDelta; - if (normalized.completedAssistantMessage) completedAssistantMessages.push(normalized.completedAssistantMessage); emitEvents(normalized.events); + if (normalized.assistantDelta) assistantText += normalized.assistantDelta; + if (normalized.completedAssistantMessage) { + completedAssistantMessages.push(normalized.completedAssistantMessage); + emitEvent(assistantMessageEventForCompleted(normalized.completedAssistantMessage, completedAssistantMessages.length)); + } if (normalized.terminal && !terminal) { terminal = normalized.terminal; terminalResolve(); @@ -476,7 +479,7 @@ async function runCodexStdioTurnWithSession(options: CodexStdioTurnOptions, sess } if (!terminal) terminal = { status: "failed", failureKind: "backend-response-invalid", message: "codex app-server finished without terminal status" }; if (terminal.status !== "completed") emitEvents(await session.close()); - emitEvents(assistantMessageEventsForTurn(completedAssistantMessages, assistantText, terminal.status === "completed")); + if (completedAssistantMessages.length === 0) emitEvents(assistantMessageEventsForTurn(assistantText, terminal.status === "completed")); emitEvent({ type: "terminal_status", payload: { terminalStatus: terminal.status, failureKind: terminal.failureKind, message: terminal.message } }); await liveEventWrite; return { terminalStatus: terminal.status, failureKind: terminal.failureKind, failureMessage: terminal.message, events: events.map((event) => ({ ...event, payload: redactJson(event.payload) })), ...(threadId ? { threadId } : {}), ...(turnId ? { turnId } : {}) }; @@ -585,27 +588,35 @@ function normalizeCodexNotification(message: JsonRecord): { events: BackendEvent return { events: [{ type: "backend_status", payload: { phase: method } }] }; } -function assistantMessageEventsForTurn(completedMessages: CompletedAssistantMessage[], assistantDeltaText: string, completed: boolean): BackendEvent[] { - const messages = completedMessages.length > 0 - ? completedMessages.map((message) => ({ ...message, source: "completed-agent-message" })) - : assistantDeltaText.trim().length > 0 - ? [{ itemId: null, text: assistantDeltaText, source: "agent-message-delta-fallback" }] - : []; - return messages.map((message, index) => { - const replyAuthority = completed && index === messages.length - 1; - return { - type: "assistant_message", - payload: { - text: message.text, - itemId: message.itemId, - source: message.source, - messageIndex: index + 1, - messageCount: messages.length, - replyAuthority, - final: replyAuthority, - }, - }; - }); +function assistantMessageEventForCompleted(message: CompletedAssistantMessage, messageIndex: number): BackendEvent { + return { + type: "assistant_message", + payload: { + text: message.text, + itemId: message.itemId, + source: "completed-agent-message", + messageIndex, + messageCount: null, + replyAuthority: false, + final: false, + }, + }; +} + +function assistantMessageEventsForTurn(assistantDeltaText: string, completed: boolean): BackendEvent[] { + if (assistantDeltaText.trim().length === 0) return []; + return [{ + type: "assistant_message", + payload: { + text: assistantDeltaText, + itemId: null, + source: "agent-message-delta-fallback", + messageIndex: 1, + messageCount: 1, + replyAuthority: completed, + final: completed, + }, + }]; } function terminalStatusFromValue(value: unknown): TerminalStatus { diff --git a/src/mgr/result.ts b/src/mgr/result.ts index e1d61a0..0ed831a 100644 --- a/src/mgr/result.ts +++ b/src/mgr/result.ts @@ -97,6 +97,12 @@ function assistantReply(events: RunEvent[]): string { .filter((text) => text.length > 0); const latestAuthoritative = authoritative.at(-1); if (latestAuthoritative) return latestAuthoritative; + const completedAgentMessages = assistantEvents + .filter((event) => event.payload.source === "completed-agent-message") + .map((event) => textPayload(event.payload)) + .filter((text) => text.length > 0); + const latestCompletedAgentMessage = completedAgentMessages.at(-1); + if (latestCompletedAgentMessage) return latestCompletedAgentMessage; return assistantEvents.map((event) => textPayload(event.payload)).filter((text) => text.length > 0).join(""); } diff --git a/src/selftest/cases/30-codex-stdio.ts b/src/selftest/cases/30-codex-stdio.ts index 495dcb9..4965323 100644 --- a/src/selftest/cases/30-codex-stdio.ts +++ b/src/selftest/cases/30-codex-stdio.ts @@ -85,7 +85,13 @@ const selfTest: SelfTestCase = async (context) => { assert.equal(eventPayload(assistantEvents[0] ?? { payload: {} }).replyAuthority, false); assert.equal(eventPayload(assistantEvents[1] ?? { payload: {} }).text, "Final answer only."); assert.equal(eventPayload(assistantEvents[1] ?? { payload: {} }).itemId, "msg_final"); - assert.equal(eventPayload(assistantEvents[1] ?? { payload: {} }).replyAuthority, true); + assert.equal(eventPayload(assistantEvents[1] ?? { payload: {} }).replyAuthority, false); + const finalMessageItems = finalMessageEvents.items ?? []; + const progressMessageIndex = finalMessageItems.findIndex((event) => event.type === "assistant_message" && eventPayload(event).itemId === "msg_progress"); + const finalMessageIndex = finalMessageItems.findIndex((event) => event.type === "assistant_message" && eventPayload(event).itemId === "msg_final"); + const turnCompletedIndex = finalMessageItems.findIndex((event) => event.type === "backend_status" && eventPayload(event).phase === "turn/completed"); + assert.ok(progressMessageIndex >= 0 && progressMessageIndex < turnCompletedIndex, "progress agentMessage should be emitted before turn/completed instead of being delayed to final response"); + assert.ok(finalMessageIndex >= 0 && finalMessageIndex < turnCompletedIndex, "final agentMessage should be emitted before turn/completed instead of being delayed to final response"); const staleResume = await createStaleThreadRun(client, context); const staleResumeResult = await runOnce({