@@ -159,15 +159,22 @@ export function completedResponseFromSsePayload(payload: string): { id?: unknown
159159 if ( payload === "[DONE]" ) return null ;
160160 try {
161161 const json = JSON . parse ( payload ) as { type ?: unknown ; response ?: unknown } ;
162- if ( json . type !== "response.completed" ) return null ;
163- const response = json . response ;
164- if ( ! response || typeof response !== "object" || Array . isArray ( response ) ) return null ;
165- return response as { id ?: unknown ; output ?: unknown ; status ?: unknown } ;
162+ return completedResponseFromParsedEvent ( json ) ;
166163 } catch {
167164 return null ;
168165 }
169166}
170167
168+ /** Extract the response object from an already-parsed `response.completed` event, or null. */
169+ function completedResponseFromParsedEvent (
170+ json : { type ?: unknown ; response ?: unknown } | null ,
171+ ) : { id ?: unknown ; output ?: unknown ; status ?: unknown } | null {
172+ if ( ! json || json . type !== "response.completed" ) return null ;
173+ const response = json . response ;
174+ if ( ! response || typeof response !== "object" || Array . isArray ( response ) ) return null ;
175+ return response as { id ?: unknown ; output ?: unknown ; status ?: unknown } ;
176+ }
177+
171178export function trackSseForRequestLog (
172179 body : ReadableStream < Uint8Array > ,
173180 onTerminal : ( status : ResponsesTerminalStatus ) => void ,
@@ -459,26 +466,26 @@ export function createSseInspector(handlers: {
459466 }
460467 }
461468 if ( handlers . onCompletedResponse ) {
469+ type ParsedSseEvent = { type ?: unknown ; output_index ?: unknown ; item ?: unknown ; response ?: unknown } ;
470+ let parsedEvent : ParsedSseEvent | null = null ;
462471 try {
463- const event = JSON . parse ( payload ) as {
464- type ?: unknown ;
465- output_index ?: unknown ;
466- item ?: unknown ;
467- } ;
468- if ( event . type === "response.output_item.done"
469- && Number . isInteger ( event . output_index )
470- && ( event . output_index as number ) >= 0
471- && typeof event . item === "object"
472- && event . item !== null
473- && ! Array . isArray ( event . item )
474- && typeof ( event . item as { type ?: unknown } ) . type === "string" ) {
475- completedItemsByOutputIndex ! . set ( event . output_index as number , event . item ) ;
476- }
472+ if ( payload !== "[DONE]" ) parsedEvent = JSON . parse ( payload ) as ParsedSseEvent ;
477473 } catch {
478474 /* malformed SSE payloads remain best-effort/no-throw */
479475 }
476+ const doneItem = parsedEvent ?. type === "response.output_item.done" ? parsedEvent . item : undefined ;
477+ if ( parsedEvent
478+ && doneItem !== undefined
479+ && Number . isInteger ( parsedEvent . output_index )
480+ && ( parsedEvent . output_index as number ) >= 0
481+ && typeof doneItem === "object"
482+ && doneItem !== null
483+ && ! Array . isArray ( doneItem )
484+ && typeof ( doneItem as { type ?: unknown } ) . type === "string" ) {
485+ completedItemsByOutputIndex ! . set ( parsedEvent . output_index as number , doneItem ) ;
486+ }
480487
481- let response = completedResponseFromSsePayload ( payload ) ;
488+ let response = completedResponseFromParsedEvent ( parsedEvent ) ;
482489 if ( response
483490 && ( ! Array . isArray ( response . output ) || response . output . length === 0 )
484491 && completedItemsByOutputIndex ! . size > 0 ) {
0 commit comments