diff --git a/ts/packages/aiclient/src/copilotModels.ts b/ts/packages/aiclient/src/copilotModels.ts index 27d6b0105f..f4ed3699cd 100644 --- a/ts/packages/aiclient/src/copilotModels.ts +++ b/ts/packages/aiclient/src/copilotModels.ts @@ -1357,9 +1357,9 @@ export function createCopilotTransportModel( let piece; try { piece = decoder.push(evt.data); - } catch { - // Ignore non-JSON keep-alive/comment lines. - continue; + } catch (e) { + if (e instanceof SyntaxError) continue; + throw e; } if (piece.text) { fullResponseText += piece.text; diff --git a/ts/packages/aiclient/src/wireApiProvider/chatCompletionsWireApiProvider.ts b/ts/packages/aiclient/src/wireApiProvider/chatCompletionsWireApiProvider.ts index faf92f4636..63c26a8a57 100644 --- a/ts/packages/aiclient/src/wireApiProvider/chatCompletionsWireApiProvider.ts +++ b/ts/packages/aiclient/src/wireApiProvider/chatCompletionsWireApiProvider.ts @@ -64,7 +64,7 @@ type ChatCompletionDelta = { type ChatCompletionChunk = { id: string; - choices: ChatCompletionDelta[]; + choices?: ChatCompletionDelta[]; usage?: ProviderUsage | null; }; @@ -79,7 +79,7 @@ function flattenUsage(usage: ProviderUsage): CompletionUsageStats { } function verifyStreamContentSafety(data: ChatCompletionChunk): void { - data.choices.map((c: ChatCompletionDelta) => { + (data.choices ?? []).map((c: ChatCompletionDelta) => { if (c.finish_reason === "length") { throw new Error(incompleteOutputMessage); } @@ -254,9 +254,12 @@ export class ChatCompletionsWireApiProvider implements ProviderAdapter { const state = { emittedPrefix: "" }; return { push: (raw: string): StreamPiece => { - const data = JSON.parse(raw) as ChatCompletionChunk; - verifyStreamContentSafety(data); + const data = JSON.parse(raw) as ChatCompletionChunk | null; const piece: StreamPiece = {}; + if (typeof data !== "object" || data === null) { + return piece; + } + verifyStreamContentSafety(data); if (data.choices && data.choices.length > 0) { applyStreamChoice( piece, diff --git a/ts/packages/aiclient/src/wireApiProvider/responsesWireApiProvider.ts b/ts/packages/aiclient/src/wireApiProvider/responsesWireApiProvider.ts index 893cfff84b..417ec0eaef 100644 --- a/ts/packages/aiclient/src/wireApiProvider/responsesWireApiProvider.ts +++ b/ts/packages/aiclient/src/wireApiProvider/responsesWireApiProvider.ts @@ -32,8 +32,11 @@ type ResponsesUsage = { input_tokens_details?: { cached_tokens?: number }; }; +type ResponsesError = { message?: string }; + type ResponsesResult = { status?: string; + error?: ResponsesError | null; output_text?: string; output?: ResponsesOutputItem[]; usage?: ResponsesUsage; @@ -102,6 +105,9 @@ export class ResponsesWireApiProvider implements ProviderAdapter { if (res.status === "incomplete") { return error(incompleteOutputMessage); } + if (res.status === "failed" || res.status === "cancelled") { + return error(res.error?.message || `Response ${res.status}`); + } if (typeof res.output_text === "string") { return success(res.output_text); } @@ -131,14 +137,32 @@ export class ResponsesWireApiProvider implements ProviderAdapter { const evt = JSON.parse(raw) as { type?: string; delta?: string; + message?: string; + error?: ResponsesError | null; response?: { + error?: ResponsesError | null; usage?: ResponsesUsage; }; - }; + } | null; const piece: StreamPiece = {}; + if (typeof evt !== "object" || evt === null) { + return piece; + } if (evt.type === "response.incomplete") { throw new Error(incompleteOutputMessage); } + if (evt.type === "error") { + piece.error = new Error( + evt.message || evt.error?.message || "Response error", + ); + return piece; + } + if (evt.type === "response.failed") { + piece.error = new Error( + evt.response?.error?.message || "Response failed", + ); + return piece; + } if ( evt.type === "response.output_text.delta" && typeof evt.delta === "string" diff --git a/ts/packages/aiclient/test/copilotTransport.spec.ts b/ts/packages/aiclient/test/copilotTransport.spec.ts index ca71255f08..f0d9931605 100644 --- a/ts/packages/aiclient/test/copilotTransport.spec.ts +++ b/ts/packages/aiclient/test/copilotTransport.spec.ts @@ -798,6 +798,76 @@ describe("createCopilotTransportModel", () => { expect(body.stream_options).toEqual({ include_usage: true }); }); + test("skips chat completions chunks with no choices or null data", async () => { + (globalThis as any).fetch = async () => + sseResponse([ + deltaChunk("Hello"), + "null", + { + usage: { + prompt_tokens: 3, + completion_tokens: 1, + total_tokens: 4, + }, + }, + "[DONE]", + ]); + const { provider } = makeProvider([makeChatCompletionsEndpoint()]); + const usage: any[] = []; + const model = createCopilotTransportModel( + makeSettings("gpt-5.6-luna"), + {}, + undefined, + undefined, + provider, + ); + + const result = await model.completeStream!("hi", (u) => usage.push(u)); + expect(result.success).toBe(true); + if (!result.success) return; + expect((await drain(result.data)).text).toBe("Hello"); + expect(usage).toEqual([ + { prompt_tokens: 3, completion_tokens: 1, total_tokens: 4 }, + ]); + }); + + test("surfaces a chat completions content filter error", async () => { + (globalThis as any).fetch = async () => + sseResponse([ + deltaChunk("Partial"), + { + choices: [ + { + delta: {}, + finish_reason: "content_filter_error", + content_filter_results: { + code: "filtered", + message: "Blocked", + }, + }, + ], + }, + "[DONE]", + ]); + const { provider } = makeProvider([makeChatCompletionsEndpoint()]); + const model = createCopilotTransportModel( + makeSettings("gpt-5.6-luna"), + {}, + undefined, + undefined, + provider, + ); + + const result = await model.completeStream!("hi"); + expect(result.success).toBe(true); + if (!result.success) return; + const chunks: string[] = []; + await expect(async () => { + for await (const c of result.data) chunks.push(c); + }).rejects.toThrow("content filter error (filtered): Blocked"); + expect(chunks).toEqual(["Partial"]); + }); + test("streams responses API deltas", async () => { (globalThis as any).fetch = async () => sseResponse([ @@ -837,6 +907,38 @@ describe("createCopilotTransportModel", () => { ]); }); + test.each([ + [{ type: "error", code: "server_error", message: "Boom" }, "Boom"], + [{ type: "response.incomplete" }, "Model response is incomplete"], + ])( + "surfaces responses API stream error %j after partial text", + async (event, message) => { + (globalThis as any).fetch = async () => + sseResponse([ + "keep-alive", + { type: "response.output_text.delta", delta: "Partial" }, + event, + ]); + const { provider } = makeProvider([makeLunaEndpoint()]); + const model = createCopilotTransportModel( + makeSettings(), + {}, + undefined, + undefined, + provider, + ); + + const result = await model.completeStream!("what time is it"); + expect(result.success).toBe(true); + if (!result.success) return; + const chunks: string[] = []; + await expect(async () => { + for await (const c of result.data) chunks.push(c); + }).rejects.toThrow(message); + expect(chunks).toEqual(["Partial"]); + }, + ); + test("refreshes the endpoint once when the stream fails to connect", async () => { let call = 0; (globalThis as any).fetch = async () => { diff --git a/ts/packages/aiclient/test/providerAdapter.spec.ts b/ts/packages/aiclient/test/providerAdapter.spec.ts index f22686cb5d..663d00d263 100644 --- a/ts/packages/aiclient/test/providerAdapter.spec.ts +++ b/ts/packages/aiclient/test/providerAdapter.spec.ts @@ -666,6 +666,60 @@ describe("ResponsesWireApiProvider", () => { }); }); + test.each( + [ + { type: "error", code: "server_error", message: "Boom" }, + { type: "error", error: { code: "server_error", message: "Boom" } }, + { + type: "response.failed", + response: { status: "failed", error: { message: "Boom" } }, + }, + ].flatMap((event) => [false, true].map((p) => [event, p] as const)), + )( + "stream reports %j as an error (partial text: %s)", + (event, partialText) => { + const decoder = adapter.createStreamDecoder!(makeRequest()); + if (partialText) { + expect( + decoder.push( + JSON.stringify({ + type: "response.output_text.delta", + delta: "Partial answer", + }), + ).text, + ).toBe("Partial answer"); + } + const piece = decoder.push(JSON.stringify(event)); + expect(piece.error).toBeInstanceOf(Error); + expect(piece.error?.message).toBe("Boom"); + expect(piece.text).toBeUndefined(); + }, + ); + + test.each(["null", "1", '"text"'])("stream skips a %s event", (raw) => { + const decoder = adapter.createStreamDecoder!(makeRequest()); + expect(decoder.push(raw)).toEqual({}); + }); + + test.each(["failed", "cancelled"])( + "parseResponse errors when status is %s", + (status) => { + const r = adapter.parseResponse( + { + status, + error: status === "failed" ? { message: "Boom" } : null, + output_text: "Partial answer", + }, + makeRequest(), + ); + expect(r.success).toBe(false); + if (!r.success) + expect(r.message).toBe( + status === "failed" ? "Boom" : "Response cancelled", + ); + }, + ); + test("streaming decoder emits response.output_text.delta content", () => { const decoder = adapter.createStreamDecoder!(makeRequest()); const piece = decoder.push(