fix: 实时上报 agentMessage
This commit is contained in:
+35
-24
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user