fix(responses): carry the streamed output items in response.completed (#4307)
This commit is contained in:
@@ -223,15 +223,19 @@ function closeReasoning(state, emit) {
|
||||
part: { type: RESPONSES_ITEM.SUMMARY_TEXT, text: state.reasoningBuf }
|
||||
});
|
||||
|
||||
const item = {
|
||||
id: state.reasoningId,
|
||||
type: RESPONSES_ITEM.REASONING,
|
||||
summary: [{ type: RESPONSES_ITEM.SUMMARY_TEXT, text: state.reasoningBuf }]
|
||||
};
|
||||
|
||||
emit("response.output_item.done", {
|
||||
type: "response.output_item.done",
|
||||
output_index: state.reasoningIndex,
|
||||
item: {
|
||||
id: state.reasoningId,
|
||||
type: RESPONSES_ITEM.REASONING,
|
||||
summary: [{ type: RESPONSES_ITEM.SUMMARY_TEXT, text: state.reasoningBuf }]
|
||||
}
|
||||
item
|
||||
});
|
||||
|
||||
recordCompletedOutputItem(state, state.reasoningIndex, item);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -295,16 +299,20 @@ function closeMessage(state, emit, idx) {
|
||||
part: { type: RESPONSES_ITEM.OUTPUT_TEXT, annotations: [], logprobs: [], text: fullText }
|
||||
});
|
||||
|
||||
const item = {
|
||||
id: msgId,
|
||||
type: RESPONSES_ITEM.MESSAGE,
|
||||
content: [{ type: RESPONSES_ITEM.OUTPUT_TEXT, annotations: [], logprobs: [], text: fullText }],
|
||||
role: ROLE.ASSISTANT
|
||||
};
|
||||
|
||||
emit("response.output_item.done", {
|
||||
type: "response.output_item.done",
|
||||
output_index: parseInt(idx),
|
||||
item: {
|
||||
id: msgId,
|
||||
type: RESPONSES_ITEM.MESSAGE,
|
||||
content: [{ type: RESPONSES_ITEM.OUTPUT_TEXT, annotations: [], logprobs: [], text: fullText }],
|
||||
role: ROLE.ASSISTANT
|
||||
}
|
||||
item
|
||||
});
|
||||
|
||||
recordCompletedOutputItem(state, parseInt(idx), item);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -398,23 +406,51 @@ function closeToolCall(state, emit, idx) {
|
||||
});
|
||||
}
|
||||
|
||||
const item = {
|
||||
id: `${custom ? "ctc" : "fc"}_${callId}`,
|
||||
type: custom ? RESPONSES_ITEM.CUSTOM_TOOL_CALL : RESPONSES_ITEM.FUNCTION_CALL,
|
||||
...(custom ? { input: extractCustomToolInput(args) } : { arguments: args }),
|
||||
call_id: callId,
|
||||
name: state.funcNames[idx] || ""
|
||||
};
|
||||
|
||||
emit("response.output_item.done", {
|
||||
type: "response.output_item.done",
|
||||
output_index: parseInt(idx),
|
||||
item: {
|
||||
id: `${custom ? "ctc" : "fc"}_${callId}`,
|
||||
type: custom ? RESPONSES_ITEM.CUSTOM_TOOL_CALL : RESPONSES_ITEM.FUNCTION_CALL,
|
||||
...(custom ? { input: extractCustomToolInput(args) } : { arguments: args }),
|
||||
call_id: callId,
|
||||
name: state.funcNames[idx] || ""
|
||||
}
|
||||
item
|
||||
});
|
||||
|
||||
recordCompletedOutputItem(state, parseInt(idx), item);
|
||||
|
||||
state.funcItemDone[idx] = true;
|
||||
state.funcArgsDone[idx] = true;
|
||||
}
|
||||
}
|
||||
|
||||
// response.completed carries the finished Response object, so response.output has
|
||||
// to repeat the items already delivered in response.output_item.done. Clients that
|
||||
// build their final result from the terminal event (GitHub Copilot CLI, the OpenAI
|
||||
// SDK "final response" helpers) otherwise treat the turn as empty even though the
|
||||
// text was streamed - see issue #4307.
|
||||
//
|
||||
// Keyed by output_index so a repeated close overwrites rather than duplicating the
|
||||
// item, and ordered by output_index so response.output matches the order the items
|
||||
// were emitted in. Lazily created because stream.js can hand us a state it built
|
||||
// itself rather than one from initState().
|
||||
function recordCompletedOutputItem(state, outputIndex, item) {
|
||||
state.completedOutputItems ??= new Map();
|
||||
const index = Number.isInteger(outputIndex) ? outputIndex : Number.parseInt(outputIndex, 10) || 0;
|
||||
state.completedOutputItems.set(index, item);
|
||||
}
|
||||
|
||||
function collectCompletedOutputItems(state) {
|
||||
const recorded = state.completedOutputItems;
|
||||
if (!(recorded instanceof Map) || recorded.size === 0) return [];
|
||||
return [...recorded.entries()]
|
||||
.sort((left, right) => left[0] - right[0])
|
||||
.map(([, item]) => item);
|
||||
}
|
||||
|
||||
function sendCompleted(state, emit) {
|
||||
if (!state.completedSent) {
|
||||
state.completedSent = true;
|
||||
@@ -427,6 +463,7 @@ function sendCompleted(state, emit) {
|
||||
status: "completed",
|
||||
background: false,
|
||||
error: null,
|
||||
output: collectCompletedOutputItems(state),
|
||||
...(state.responsesUsage ? { usage: state.responsesUsage } : {})
|
||||
}
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user