From b991ba894d8e24ac238374f68620841139cbbca7 Mon Sep 17 00:00:00 2001 From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> Date: Tue, 20 Oct 2026 22:51:12 -0500 Subject: [PATCH] refactor(ai): remove redundant runtime type checks on schema-decoded values (#57605) --- packages/ai/src/llm.ts | 6 ++--- .../ai/src/protocols/anthropic-messages.ts | 22 +++++++++---------- packages/ai/src/protocols/bedrock-converse.ts | 4 ++-- packages/ai/src/protocols/gemini.ts | 4 +--- .../ai/src/protocols/google-interactions.ts | 4 +--- packages/ai/src/protocols/mistral-chat.ts | 5 +---- packages/ai/src/protocols/open-responses.ts | 6 ++--- 7 files changed, 20 insertions(+), 31 deletions(-) diff --git a/packages/ai/src/llm.ts b/packages/ai/src/llm.ts index 8c57165a9bf..7a7059e1f78 100644 --- a/packages/ai/src/llm.ts +++ b/packages/ai/src/llm.ts @@ -128,10 +128,8 @@ const runGenerateObject = Effect.fn("LLM.generateObject")(function* ( toolChoice: ToolChoice.named(GENERATE_OBJECT_TOOL_NAME), }) const response = yield* LLMClient.generate(generateRequest) - const call = response.toolCalls.find( - (event) => LLMEvent.is.toolCall(event) && event.name === GENERATE_OBJECT_TOOL_NAME, - ) - if (!call || !LLMEvent.is.toolCall(call)) + const call = response.toolCalls.find((event) => event.name === GENERATE_OBJECT_TOOL_NAME) + if (!call) return yield* new AIError({ reason: new InvalidProviderOutputError({ message: `generateObject: model did not call the forced \`${GENERATE_OBJECT_TOOL_NAME}\` tool`, diff --git a/packages/ai/src/protocols/anthropic-messages.ts b/packages/ai/src/protocols/anthropic-messages.ts index 60282befbc1..1e8aeb84f03 100644 --- a/packages/ai/src/protocols/anthropic-messages.ts +++ b/packages/ai/src/protocols/anthropic-messages.ts @@ -535,13 +535,13 @@ const providerMetadata = (key: string, metadata: Record): Provi const signatureFromMetadata = (metadata: ProviderMetadata | undefined, key: string): string | undefined => { const provider = metadata?.[key] - if (!ProviderShared.isRecord(provider)) return undefined + if (!provider) return undefined return typeof provider.signature === "string" ? provider.signature : undefined } const redactedDataFromMetadata = (metadata: ProviderMetadata | undefined, key: string): string | undefined => { const provider = metadata?.[key] - if (!ProviderShared.isRecord(provider)) return undefined + if (!provider) return undefined return typeof provider.redactedData === "string" ? provider.redactedData : undefined } @@ -617,7 +617,7 @@ const lowerServerToolResult = Effect.fnUntraced(function* (part: ToolResultPart, }) const fileIdFromMetadata = (metadata: MediaPart["metadata"]): string | undefined => { - if (!ProviderShared.isRecord(metadata)) return undefined + if (!metadata) return undefined const anthropic = metadata.anthropic if (ProviderShared.isRecord(anthropic)) { if (typeof anthropic.file_id === "string") return anthropic.file_id @@ -631,7 +631,7 @@ const fileIdFromMetadata = (metadata: MediaPart["metadata"]): string | undefined const transformationsFromMetadata = ( metadata: MediaPart["metadata"], ): AnthropicImageBlock["transformations"] | undefined => { - if (!ProviderShared.isRecord(metadata)) return undefined + if (!metadata) return undefined const anthropic = ProviderShared.isRecord(metadata.anthropic) ? metadata.anthropic : undefined const raw = anthropic?.transformations ?? metadata.transformations if (ProviderShared.isRecord(raw)) { @@ -644,17 +644,17 @@ const transformationsFromMetadata = ( } const documentTitleFromPart = (part: MediaPart): string | undefined => { - if (ProviderShared.isRecord(part.metadata)) { + if (part.metadata !== undefined) { const anthropic = part.metadata.anthropic if (ProviderShared.isRecord(anthropic) && typeof anthropic.title === "string") return anthropic.title if (typeof part.metadata.title === "string") return part.metadata.title } - if (typeof part.filename === "string" && part.filename.length > 0) return part.filename + if (part.filename && part.filename.length > 0) return part.filename return undefined } const documentContextFromMetadata = (metadata: MediaPart["metadata"]): string | undefined => { - if (!ProviderShared.isRecord(metadata)) return undefined + if (!metadata) return undefined const anthropic = ProviderShared.isRecord(metadata.anthropic) ? metadata.anthropic : undefined if (anthropic && typeof anthropic.context === "string") return anthropic.context if (typeof metadata.context === "string") return metadata.context @@ -662,7 +662,7 @@ const documentContextFromMetadata = (metadata: MediaPart["metadata"]): string | } const citationsFromMetadata = (metadata: MediaPart["metadata"]): AnthropicDocumentBlock["citations"] | undefined => { - if (!ProviderShared.isRecord(metadata)) return undefined + if (!metadata) return undefined const raw = ProviderShared.isRecord(metadata.anthropic) ? (metadata.anthropic.citations ?? metadata.citations) : metadata.citations @@ -940,7 +940,7 @@ const lowerMessages = Effect.fnUntraced(function* (request: LLMRequest, breakpoi content.push({ type: "redacted_thinking", data: redactedData }) continue } - if (typeof signature !== "string" || signature.trim().length === 0) { + if (!signature || signature.trim().length === 0) { if (part.text.trim().length === 0) continue if (!requireThinkingSignature(request)) { content.push({ type: "thinking", thinking: part.text, signature: "" }) @@ -1199,9 +1199,7 @@ const isServerToolResultType = (type: string): type is AnthropicServerToolResult const serverToolResultEvent = (block: AnthropicStreamBlock, providerMetadataKey: string): LLMEvent | undefined => { if (!block.type || !isServerToolResultType(block.type)) return undefined const errorPayload = - typeof block.content === "object" && block.content !== null && "type" in block.content - ? String((block.content as Record).type) - : "" + ProviderShared.isRecord(block.content) && "type" in block.content ? String(block.content.type) : "" const isError = errorPayload.endsWith("_tool_result_error") return LLMEvent.toolResult({ id: block.tool_use_id ?? "", diff --git a/packages/ai/src/protocols/bedrock-converse.ts b/packages/ai/src/protocols/bedrock-converse.ts index 2954615a00a..dc9deb8759d 100644 --- a/packages/ai/src/protocols/bedrock-converse.ts +++ b/packages/ai/src/protocols/bedrock-converse.ts @@ -261,12 +261,12 @@ const providerMetadata = (key: string, metadata: Record): Provi const reasoningSignature = (part: ReasoningPart, providerMetadataKey: string) => { const metadata = part.providerMetadata?.[providerMetadataKey] if (part.encrypted !== undefined) return part.encrypted - if (ProviderShared.isRecord(metadata) && typeof metadata.signature === "string") return metadata.signature + if (typeof metadata?.signature === "string") return metadata.signature } const reasoningRedactedData = (part: ReasoningPart, providerMetadataKey: string) => { const metadata = part.providerMetadata?.[providerMetadataKey] - if (ProviderShared.isRecord(metadata) && typeof metadata.redactedData === "string") return metadata.redactedData + if (typeof metadata?.redactedData === "string") return metadata.redactedData } const removeEmptyToolInputKeys = (input: unknown): unknown => { diff --git a/packages/ai/src/protocols/gemini.ts b/packages/ai/src/protocols/gemini.ts index c4af8a3b048..5bcf833a396 100644 --- a/packages/ai/src/protocols/gemini.ts +++ b/packages/ai/src/protocols/gemini.ts @@ -311,9 +311,7 @@ const providerMetadata = (key: string, metadata: Record): Provi const thoughtSignature = (metadata: ProviderMetadata | undefined, key: string) => { const value = metadata?.[key] - return ProviderShared.isRecord(value) && typeof value.thoughtSignature === "string" - ? value.thoughtSignature - : undefined + return typeof value?.thoughtSignature === "string" ? value.thoughtSignature : undefined } const lowerToolCall = (part: ToolCallPart, omitIds: boolean, metadataKey: string) => ({ diff --git a/packages/ai/src/protocols/google-interactions.ts b/packages/ai/src/protocols/google-interactions.ts index c6148646704..dd74422c06d 100644 --- a/packages/ai/src/protocols/google-interactions.ts +++ b/packages/ai/src/protocols/google-interactions.ts @@ -231,9 +231,7 @@ const mediaContent = Effect.fnUntraced(function* (asset: Media.Asset) { const signature = (metadata: ProviderMetadata | undefined, key: string) => { const value = metadata?.[key] - return ProviderShared.isRecord(value) && typeof value.interactionSignature === "string" - ? value.interactionSignature - : undefined + return typeof value?.interactionSignature === "string" ? value.interactionSignature : undefined } const lowerMessages = Effect.fnUntraced(function* (request: LLMRequest) { diff --git a/packages/ai/src/protocols/mistral-chat.ts b/packages/ai/src/protocols/mistral-chat.ts index 12cdfc91f8f..fe573bb7e5e 100644 --- a/packages/ai/src/protocols/mistral-chat.ts +++ b/packages/ai/src/protocols/mistral-chat.ts @@ -388,9 +388,6 @@ export const fromRequest = Effect.fn("MistralChat.fromRequest")(function* (reque const options = yield* ProviderShared.validateWith(Schema.decodeUnknownEffect(MistralOptions))( request.providerOptions ?? {}, ) - const selected = request.toolChoice?.type === "tool" ? request.toolChoice.name : undefined - if (request.toolChoice?.type === "tool" && !selected) - return yield* ProviderShared.invalidRequest("Mistral Chat tool choice requires a tool name") if (options.reasoningEffort !== undefined && options.promptMode !== undefined) return yield* ProviderShared.invalidRequest( "Mistral Chat reasoningEffort and promptMode provider options are mutually exclusive", @@ -505,7 +502,7 @@ const thinkingUnits = (value: unknown): ReadonlyArray => { } const thinkingText = (thinking: ReadonlyArray) => - thinking.flatMap((unit) => (typeof unit.text === "string" ? [unit.text] : [])).join("") + thinking.flatMap((unit) => (unit.text !== undefined ? [unit.text] : [])).join("") const thinkingMetadata = (thinking: MistralThinkingContent) => ({ mistral: { thinking } }) diff --git a/packages/ai/src/protocols/open-responses.ts b/packages/ai/src/protocols/open-responses.ts index 5074d9c3541..ca5be36690a 100644 --- a/packages/ai/src/protocols/open-responses.ts +++ b/packages/ai/src/protocols/open-responses.ts @@ -476,7 +476,7 @@ export const lowerToolChoice = (protocolName: string, toolChoice: NonNullable { const metadata = providerMetadata?.[providerMetadataKey] - if (!ProviderShared.isRecord(metadata) || typeof metadata.itemId !== "string") return undefined + if (!metadata || typeof metadata.itemId !== "string") return undefined const separator = metadata.itemId.indexOf("_") return separator > 0 && separator < metadata.itemId.length - 1 ? metadata.itemId : undefined } @@ -495,7 +495,7 @@ const lowerToolCall = (part: ToolCallPart, providerMetadataKey: string): OpenRes const lowerReasoning = (part: ReasoningPart, providerMetadataKey: string): OpenResponsesReasoningInput | undefined => { const metadata = part.providerMetadata?.[providerMetadataKey] - if (!ProviderShared.isRecord(metadata)) return undefined + if (!metadata) return undefined const id = itemID(part.providerMetadata, providerMetadataKey) const encryptedContent = typeof metadata.reasoningEncryptedContent === "string" || metadata.reasoningEncryptedContent === null @@ -1021,7 +1021,7 @@ export const onReasoningDelta = (state: ParserState, event: Event, itemID: strin // as a single delta unless that summary index already streamed one. export const onReasoningDone = (state: ParserState, event: Event, itemID: string): StepResult => { const item = state.reasoningItems[itemID] - if (!item || typeof event.text !== "string") return [state, NO_EVENTS] + if (!item || event.text === undefined) return [state, NO_EVENTS] const index = event.summary_index ?? 0 if (item.deltaIndexes.has(index)) return [state, NO_EVENTS] return onReasoningDelta(state, { ...event, delta: event.text }, itemID)