diff --git a/packages/ai/src/protocols/bedrock-converse.ts b/packages/ai/src/protocols/bedrock-converse.ts index fb72a62ce6a..2517b722bf6 100644 --- a/packages/ai/src/protocols/bedrock-converse.ts +++ b/packages/ai/src/protocols/bedrock-converse.ts @@ -510,9 +510,10 @@ interface ParserState { readonly tools: ToolStream.State readonly finishedTools: ReadonlySet // Bedrock splits the finish into `messageStop` (carries `stopReason`) and - // `metadata` (carries usage). Hold the terminal event in state so `onHalt` - // can emit exactly one finish after both chunks have had a chance to arrive. - readonly pendingFinish: { readonly reason: FinishReasonDetails; readonly usage?: Usage } | undefined + // `metadata` (carries usage). Hold both in state so `onHalt` can emit exactly + // one finish after both chunks have had a chance to arrive. + readonly finishReason: FinishReasonDetails | undefined + readonly usage: Usage | undefined readonly hasToolCalls: boolean readonly lifecycle: Lifecycle.State readonly reasoningSignatures: Readonly> @@ -692,12 +693,9 @@ const step = (state: ParserState, event: BedrockEvent) => return [ { ...state, - pendingFinish: { - reason: { - normalized: mapFinishReason(event.messageStop.stopReason), - raw: event.messageStop.stopReason, - }, - usage: state.pendingFinish?.usage, + finishReason: { + normalized: mapFinishReason(event.messageStop.stopReason), + raw: event.messageStop.stopReason, }, }, [], @@ -705,14 +703,11 @@ const step = (state: ParserState, event: BedrockEvent) => } if (event.metadata) { - const usage = mapUsage(event.metadata.usage, state.providerMetadataKey) ?? state.pendingFinish?.usage + const usage = mapUsage(event.metadata.usage, state.providerMetadataKey) ?? state.usage return [ { ...state, - pendingFinish: { - reason: state.pendingFinish?.reason ?? { normalized: "stop" }, - usage, - }, + usage, }, [], ] as const @@ -736,18 +731,18 @@ const step = (state: ParserState, event: BedrockEvent) => const framing = BedrockEventStream.framing(ADAPTER) const onHalt = (state: ParserState): ReadonlyArray => { - if (!state.pendingFinish) return [] + if (!state.finishReason) return [] const normalized = (() => { - if (state.pendingFinish.reason.normalized === "stop" && state.hasToolCalls) return "tool-calls" - return state.pendingFinish.reason.normalized + if (state.finishReason.normalized === "stop" && state.hasToolCalls) return "tool-calls" + return state.finishReason.normalized })() const events: LLMEvent[] = [] Lifecycle.finish(state.lifecycle, events, { reason: { - ...state.pendingFinish.reason, + ...state.finishReason, normalized, }, - usage: state.pendingFinish.usage, + usage: state.usage, }) return events } @@ -771,7 +766,8 @@ export const protocol = Protocol.make({ providerMetadataKey: request.model.route.providerMetadataKey ?? String(request.model.provider), tools: ToolStream.empty(), finishedTools: new Set(), - pendingFinish: undefined, + finishReason: undefined, + usage: undefined, hasToolCalls: false, lifecycle: Lifecycle.initial(), reasoningSignatures: {}, diff --git a/packages/ai/test/provider/bedrock-converse.test.ts b/packages/ai/test/provider/bedrock-converse.test.ts index 39b195289d5..e200c96d6f3 100644 --- a/packages/ai/test/provider/bedrock-converse.test.ts +++ b/packages/ai/test/provider/bedrock-converse.test.ts @@ -631,10 +631,45 @@ describe("Bedrock Converse route", () => { ) const response = yield* LLMClient.generate(baseRequest).pipe(Effect.provide(fixedBytes(body))) + expect(response.events.filter((event) => event.type === "finish")).toHaveLength(1) expect(response.usage).toMatchObject({ inputTokens: 5, outputTokens: 2, totalTokens: 7 }) }), ) + it.effect("retains metadata usage that arrives before messageStop", () => + Effect.gen(function* () { + const body = eventStreamBody( + ["metadata", { usage: { inputTokens: 5, outputTokens: 2, totalTokens: 7 } }], + ["messageStop", { stopReason: "end_turn" }], + ) + const response = yield* LLMClient.generate(baseRequest).pipe(Effect.provide(fixedBytes(body))) + + expect(response.events.filter((event) => event.type === "finish")).toHaveLength(1) + expect(response.finishReason).toEqual({ normalized: "stop", raw: "end_turn" }) + expect(response.usage).toMatchObject({ inputTokens: 5, outputTokens: 2, totalTokens: 7 }) + }), + ) + + it.effect("rejects metadata-only streams as incomplete with HTTP context", () => + Effect.gen(function* () { + const error = yield* LLMClient.generate(baseRequest).pipe( + Effect.provide( + fixedBytes(eventStreamBody(["metadata", { usage: { inputTokens: 5, outputTokens: 2, totalTokens: 7 } }])), + ), + Effect.flip, + ) + + expect(error.reason).toMatchObject({ + _tag: "InvalidProviderOutput", + classification: "incomplete-stream", + http: { + status: 200, + headers: { "content-type": "application/vnd.amazon.eventstream" }, + }, + }) + }), + ) + it.effect("assembles streamed tool call input", () => Effect.gen(function* () { const body = eventStreamBody(