@assistant-ui/react-ai-sdk 1.3.30 → 1.3.32

package/dist/ui/utils/convertMessage.js.map

@@ -1 +1 @@
-{"version":3,"file":"convertMessage.js","names":["unstable_createMessageConverter"],"sources":["../../../src/ui/utils/convertMessage.ts"],"sourcesContent":["import { isToolUIPart, getToolName, type UIMessage } from \"ai\";\nimport {\n  createMessageConverter as unstable_createMessageConverter,\n  type useExternalMessageConverter,\n} from \"@assistant-ui/core/react\";\nimport {\n  isMcpAppUri,\n  type ReasoningMessagePart,\n  type ToolCallMessagePart,\n  type TextMessagePart,\n  type DataMessagePart,\n  type SourceMessagePart,\n  type SourceProviderMetadata,\n  type FileMessagePart,\n  type ThreadMessageLike,\n  type McpAppMetadata,\n} from \"@assistant-ui/core\";\nimport type { ReadonlyJSONObject } from \"assistant-stream/utils\";\nimport { unwrapModelContentEnvelope } from \"../../modelContentEnvelope\";\n\ntype MessageMetadata = ThreadMessageLike[\"metadata\"];\nexport type AISDKMessageConverterMetadata =\n  useExternalMessageConverter.Metadata & {\n    toolArgsKeyOrderCache?: Map<string, Map<string, string[]>>;\n    toolLastInputCache?: Map<string, ReadonlyJSONObject>;\n    mcpAppMetadataCache?: Map<string, McpAppMetadata>;\n  };\n\nfunction stripClosingDelimiters(json: string): string {\n  return json.replace(/[}\\]\"]+$/, \"\");\n}\n\nconst MCP_APP_METADATA_CACHE_MAX = 100;\n\nfunction extractMcpAppMetadata(\n  part: unknown,\n  cache: Map<string, McpAppMetadata> | undefined,\n): McpAppMetadata | undefined {\n  if (!part || typeof part !== \"object\") return undefined;\n  const meta = (part as { callProviderMetadata?: unknown })\n    .callProviderMetadata;\n  const mcp =\n    meta && typeof meta === \"object\"\n      ? (meta as { mcp?: unknown }).mcp\n      : undefined;\n  const app =\n    mcp && typeof mcp === \"object\" ? (mcp as { app?: unknown }).app : undefined;\n  let a: Record<string, unknown>;\n  if (app && typeof app === \"object\") {\n    a = app as Record<string, unknown>;\n  } else {\n    // MCP-UI tools (e.g. xmcp) surface the UI pointer as\n    // result._meta[\"ui/resourceUri\"] rather than in callProviderMetadata.\n    const output = (part as { output?: unknown }).output;\n    const outMeta =\n      output && typeof output === \"object\"\n        ? (output as { _meta?: unknown })._meta\n        : undefined;\n    const uiResourceUri =\n      outMeta && typeof outMeta === \"object\"\n        ? (outMeta as Record<string, unknown>)[\"ui/resourceUri\"]\n        : undefined;\n    if (typeof uiResourceUri !== \"string\") return undefined;\n    a = { resourceUri: uiResourceUri };\n  }\n  if (typeof a[\"resourceUri\"] !== \"string\") return undefined;\n  if (!isMcpAppUri(a[\"resourceUri\"])) return undefined;\n  const cached = cache?.get(a[\"resourceUri\"]);\n  if (cached) {\n    cache!.delete(a[\"resourceUri\"]);\n    cache!.set(a[\"resourceUri\"], cached);\n    return cached;\n  }\n  const out: { -readonly [K in keyof McpAppMetadata]: McpAppMetadata[K] } = {\n    resourceUri: a[\"resourceUri\"],\n  };\n  if (typeof a[\"mimeType\"] === \"string\") out.mimeType = a[\"mimeType\"];\n  if (Array.isArray(a[\"visibility\"])) {\n    out.visibility = a[\"visibility\"].filter(\n      (v): v is \"model\" | \"app\" => v === \"model\" || v === \"app\",\n    );\n  }\n  if (cache) {\n    if (cache.size >= MCP_APP_METADATA_CACHE_MAX) {\n      const oldest = cache.keys().next().value;\n      if (oldest !== undefined) cache.delete(oldest);\n    }\n    cache.set(a[\"resourceUri\"], out);\n  }\n  return out;\n}\n\nconst hasOwn = (value: object, key: string) => Object.hasOwn(value, key);\n\nconst stabilizeToolArgsValue = (\n  value: unknown,\n  path: string,\n  keyOrderByPath: Map<string, string[]>,\n): unknown => {\n  if (Array.isArray(value)) {\n    return value.map((item, idx) =>\n      stabilizeToolArgsValue(item, `${path}[${idx}]`, keyOrderByPath),\n    );\n  }\n\n  if (value && typeof value === \"object\") {\n    const record = value as Record<string, unknown>;\n    const currentKeys = Object.keys(record);\n    const previousOrder = keyOrderByPath.get(path) ?? [];\n    const previousOrderSet = new Set(previousOrder);\n    const nextOrder = [\n      ...previousOrder.filter((key) => hasOwn(record, key)),\n      ...currentKeys.filter((key) => !previousOrderSet.has(key)),\n    ];\n    keyOrderByPath.set(path, nextOrder);\n\n    return Object.fromEntries(\n      nextOrder.map((key) => [\n        key,\n        stabilizeToolArgsValue(record[key], `${path}.${key}`, keyOrderByPath),\n      ]),\n    );\n  }\n\n  return value;\n};\n\nfunction stableStringifyToolArgs(\n  keyOrderCache: Map<string, Map<string, string[]>> | undefined,\n  cacheKey: string,\n  args: ReadonlyJSONObject,\n): string {\n  const keyOrderByPath = keyOrderCache?.get(cacheKey) ?? new Map();\n  keyOrderCache?.set(cacheKey, keyOrderByPath);\n\n  const stableArgs = stabilizeToolArgsValue(\n    args,\n    \"$\",\n    keyOrderByPath,\n  ) as ReadonlyJSONObject;\n  return JSON.stringify(stableArgs);\n}\n\nfunction getToolApprovalAndInterrupt(\n  part: {\n    approval?:\n      | {\n          id: string;\n          approved?: boolean;\n          reason?: string;\n          isAutomatic?: boolean;\n        }\n      | undefined;\n  },\n  toolStatus: { type: string; payload?: unknown } | undefined,\n): {\n  approval?: NonNullable<ToolCallMessagePart[\"approval\"]>;\n  interrupt?: NonNullable<ToolCallMessagePart[\"interrupt\"]>;\n} {\n  if (part.approval && typeof part.approval.id === \"string\") {\n    const { id, approved, reason, isAutomatic } = part.approval;\n    return {\n      approval: {\n        id,\n        ...(typeof approved === \"boolean\" && { approved }),\n        ...(typeof reason === \"string\" && { reason }),\n        ...(isAutomatic === true && { isAutomatic: true }),\n      },\n    };\n  }\n\n  if (toolStatus?.type === \"interrupt\") {\n    return {\n      interrupt: toolStatus.payload as NonNullable<\n        ToolCallMessagePart[\"interrupt\"]\n      >,\n    };\n  }\n\n  return {};\n}\n\ntype MessageContent = Exclude<ThreadMessageLike[\"content\"], string>;\n\nfunction convertParts(\n  message: UIMessage,\n  metadata: AISDKMessageConverterMetadata,\n): MessageContent {\n  if (!message.parts || message.parts.length === 0) {\n    return [];\n  }\n\n  const converted = message.parts\n    .filter(\n      (p) =>\n        p.type !== \"step-start\" &&\n        (message.role !== \"user\" || p.type !== \"file\"),\n    )\n    .map((part) => {\n      if (part.type === \"text\") {\n        return {\n          type: \"text\",\n          text: part.text,\n        } satisfies TextMessagePart;\n      }\n\n      if (part.type === \"reasoning\") {\n        return {\n          type: \"reasoning\",\n          text: part.text,\n        } satisfies ReasoningMessagePart;\n      }\n\n      if (isToolUIPart(part)) {\n        const toolName = getToolName(part);\n        const toolCallId = part.toolCallId;\n        const argsKeyOrderCacheKey = `${message.id}:${toolCallId}`;\n\n        const rawInput = part.input as ReadonlyJSONObject | null | undefined;\n        let args: ReadonlyJSONObject;\n        if (\n          rawInput != null &&\n          typeof rawInput === \"object\" &&\n          !Array.isArray(rawInput)\n        ) {\n          args = rawInput;\n          metadata.toolLastInputCache?.set(argsKeyOrderCacheKey, args);\n        } else {\n          args = metadata.toolLastInputCache?.get(argsKeyOrderCacheKey) ?? {};\n        }\n\n        let result: unknown;\n        let modelContent: ToolCallMessagePart[\"modelContent\"];\n        let isError = false;\n\n        if (part.state === \"output-available\") {\n          const unwrapped = unwrapModelContentEnvelope(part.output);\n          result = unwrapped.result;\n          modelContent = unwrapped.modelContent;\n        } else if (part.state === \"output-error\") {\n          isError = true;\n          result = { error: part.errorText };\n        } else if (part.state === \"output-denied\") {\n          isError = true;\n          result = {\n            error:\n              (part as { approval?: { reason?: string } }).approval?.reason ||\n              \"Tool approval denied\",\n          };\n        }\n\n        let argsText = stableStringifyToolArgs(\n          metadata.toolArgsKeyOrderCache,\n          argsKeyOrderCacheKey,\n          args,\n        );\n        if (part.state === \"input-streaming\") {\n          // strip closing delimiters added by the AI SDK's fix-json\n          argsText = stripClosingDelimiters(argsText);\n        } else {\n          metadata.toolArgsKeyOrderCache?.delete(argsKeyOrderCacheKey);\n          if (\n            part.state === \"output-available\" ||\n            part.state === \"output-error\" ||\n            part.state === \"output-denied\"\n          ) {\n            metadata.toolLastInputCache?.delete(argsKeyOrderCacheKey);\n          }\n        }\n\n        const toolStatus = metadata.toolStatuses?.[toolCallId];\n        const mcpApp = extractMcpAppMetadata(\n          part,\n          metadata.mcpAppMetadataCache,\n        );\n        return {\n          type: \"tool-call\",\n          toolName,\n          toolCallId,\n          argsText,\n          args,\n          result,\n          isError,\n          ...(modelContent !== undefined && { modelContent }),\n          ...(mcpApp && { mcp: { app: mcpApp } }),\n          ...getToolApprovalAndInterrupt(part, toolStatus),\n        } satisfies ToolCallMessagePart;\n      }\n\n      if (part.type === \"source-url\") {\n        return {\n          type: \"source\",\n          sourceType: \"url\",\n          id: part.sourceId,\n          url: part.url,\n          ...(part.title != null ? { title: part.title } : undefined),\n          ...(part.providerMetadata != null\n            ? {\n                providerMetadata:\n                  part.providerMetadata as SourceProviderMetadata,\n              }\n            : undefined),\n        } satisfies SourceMessagePart;\n      }\n\n      if (part.type === \"file\") {\n        return {\n          type: \"file\",\n          data: part.url,\n          mimeType: part.mediaType,\n          ...(part.filename != null && { filename: part.filename }),\n        } satisfies FileMessagePart;\n      }\n\n      if (part.type === \"source-document\") {\n        return {\n          type: \"source\",\n          sourceType: \"document\",\n          id: part.sourceId,\n          title: part.title,\n          mediaType: part.mediaType,\n          ...(part.filename != null ? { filename: part.filename } : undefined),\n          ...(part.providerMetadata != null\n            ? {\n                providerMetadata:\n                  part.providerMetadata as SourceProviderMetadata,\n              }\n            : undefined),\n        } satisfies SourceMessagePart;\n      }\n\n      if (part.type.startsWith(\"data-\")) {\n        return {\n          type: \"data\",\n          name: part.type.substring(5),\n          data: (part as any).data,\n        } satisfies DataMessagePart;\n      }\n\n      console.warn(`Unsupported message part type: ${part.type}`);\n      return null;\n    })\n    .filter(Boolean) as MessageContent[number][];\n\n  const seenToolCallIds = new Set<string>();\n  return converted.filter((part) => {\n    if (part.type === \"tool-call\" && part.toolCallId != null) {\n      if (seenToolCallIds.has(part.toolCallId)) return false;\n      seenToolCallIds.add(part.toolCallId);\n    }\n    return true;\n  });\n}\n\nexport const AISDKMessageConverter = unstable_createMessageConverter(\n  (message: UIMessage, metadata: AISDKMessageConverterMetadata) => {\n    const createdAt = new Date();\n    const content = convertParts(message, metadata);\n\n    switch (message.role) {\n      case \"user\":\n        return {\n          role: \"user\",\n          id: message.id,\n          createdAt,\n          content,\n          attachments: message.parts\n            ?.filter((p) => p.type === \"file\")\n            .map((part, idx) => ({\n              id: idx.toString(),\n              type: part.mediaType.startsWith(\"image/\") ? \"image\" : \"file\",\n              name: part.filename ?? \"file\",\n              content: [\n                part.mediaType.startsWith(\"image/\")\n                  ? {\n                      type: \"image\",\n                      image: part.url,\n                      filename: part.filename!,\n                    }\n                  : {\n                      type: \"file\",\n                      filename: part.filename!,\n                      data: part.url,\n                      mimeType: part.mediaType,\n                    },\n              ],\n              contentType: part.mediaType ?? \"unknown/unknown\",\n              status: { type: \"complete\" as const },\n            })),\n          metadata: message.metadata as MessageMetadata,\n        };\n\n      case \"system\":\n      case \"assistant\": {\n        const timing = metadata.messageTiming?.[message.id];\n        return {\n          role: message.role,\n          id: message.id,\n          createdAt,\n          content,\n          metadata: {\n            ...(message.metadata as MessageMetadata),\n            ...(timing && { timing }),\n          },\n        };\n      }\n\n      default:\n        console.warn(`Unsupported message role: ${message.role}`);\n        return [];\n    }\n  },\n);\n"],"mappings":"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"}
+{"version":3,"file":"convertMessage.js","names":["unstable_createMessageConverter"],"sources":["../../../src/ui/utils/convertMessage.ts"],"sourcesContent":["import { isToolUIPart, getToolName, type UIMessage } from \"ai\";\nimport {\n  createMessageConverter as unstable_createMessageConverter,\n  type useExternalMessageConverter,\n} from \"@assistant-ui/core/react\";\nimport {\n  isMcpAppUri,\n  type ReasoningMessagePart,\n  type ToolCallMessagePart,\n  type TextMessagePart,\n  type DataMessagePart,\n  type SourceMessagePart,\n  type SourceProviderMetadata,\n  type FileMessagePart,\n  type ThreadMessageLike,\n  type McpAppMetadata,\n} from \"@assistant-ui/core\";\nimport type { ReadonlyJSONObject } from \"assistant-stream/utils\";\nimport { unwrapModelContentEnvelope } from \"../../modelContentEnvelope\";\n\ntype MessageMetadata = ThreadMessageLike[\"metadata\"];\nexport type AISDKMessageConverterMetadata =\n  useExternalMessageConverter.Metadata & {\n    toolArgsKeyOrderCache?: Map<string, Map<string, string[]>>;\n    toolLastInputCache?: Map<string, ReadonlyJSONObject>;\n    mcpAppMetadataCache?: Map<string, McpAppMetadata>;\n    /** Id of the currently-streaming message, flagged optimistic (#4037). */\n    optimisticMessageId?: string | undefined;\n  };\n\nfunction stripClosingDelimiters(json: string): string {\n  return json.replace(/[}\\]\"]+$/, \"\");\n}\n\nconst MCP_APP_METADATA_CACHE_MAX = 100;\n\nfunction extractMcpAppMetadata(\n  part: unknown,\n  cache: Map<string, McpAppMetadata> | undefined,\n): McpAppMetadata | undefined {\n  if (!part || typeof part !== \"object\") return undefined;\n  const meta = (part as { callProviderMetadata?: unknown })\n    .callProviderMetadata;\n  const mcp =\n    meta && typeof meta === \"object\"\n      ? (meta as { mcp?: unknown }).mcp\n      : undefined;\n  const app =\n    mcp && typeof mcp === \"object\" ? (mcp as { app?: unknown }).app : undefined;\n  let a: Record<string, unknown>;\n  if (app && typeof app === \"object\") {\n    a = app as Record<string, unknown>;\n  } else {\n    // MCP-UI tools (e.g. xmcp) surface the UI pointer as\n    // result._meta[\"ui/resourceUri\"] rather than in callProviderMetadata.\n    const output = (part as { output?: unknown }).output;\n    const outMeta =\n      output && typeof output === \"object\"\n        ? (output as { _meta?: unknown })._meta\n        : undefined;\n    const uiResourceUri =\n      outMeta && typeof outMeta === \"object\"\n        ? (outMeta as Record<string, unknown>)[\"ui/resourceUri\"]\n        : undefined;\n    if (typeof uiResourceUri !== \"string\") return undefined;\n    a = { resourceUri: uiResourceUri };\n  }\n  if (typeof a[\"resourceUri\"] !== \"string\") return undefined;\n  if (!isMcpAppUri(a[\"resourceUri\"])) return undefined;\n  const cached = cache?.get(a[\"resourceUri\"]);\n  if (cached) {\n    cache!.delete(a[\"resourceUri\"]);\n    cache!.set(a[\"resourceUri\"], cached);\n    return cached;\n  }\n  const out: { -readonly [K in keyof McpAppMetadata]: McpAppMetadata[K] } = {\n    resourceUri: a[\"resourceUri\"],\n  };\n  if (typeof a[\"mimeType\"] === \"string\") out.mimeType = a[\"mimeType\"];\n  if (Array.isArray(a[\"visibility\"])) {\n    out.visibility = a[\"visibility\"].filter(\n      (v): v is \"model\" | \"app\" => v === \"model\" || v === \"app\",\n    );\n  }\n  if (cache) {\n    if (cache.size >= MCP_APP_METADATA_CACHE_MAX) {\n      const oldest = cache.keys().next().value;\n      if (oldest !== undefined) cache.delete(oldest);\n    }\n    cache.set(a[\"resourceUri\"], out);\n  }\n  return out;\n}\n\nconst hasOwn = (value: object, key: string) => Object.hasOwn(value, key);\n\nconst stabilizeToolArgsValue = (\n  value: unknown,\n  path: string,\n  keyOrderByPath: Map<string, string[]>,\n): unknown => {\n  if (Array.isArray(value)) {\n    return value.map((item, idx) =>\n      stabilizeToolArgsValue(item, `${path}[${idx}]`, keyOrderByPath),\n    );\n  }\n\n  if (value && typeof value === \"object\") {\n    const record = value as Record<string, unknown>;\n    const currentKeys = Object.keys(record);\n    const previousOrder = keyOrderByPath.get(path) ?? [];\n    const previousOrderSet = new Set(previousOrder);\n    const nextOrder = [\n      ...previousOrder.filter((key) => hasOwn(record, key)),\n      ...currentKeys.filter((key) => !previousOrderSet.has(key)),\n    ];\n    keyOrderByPath.set(path, nextOrder);\n\n    return Object.fromEntries(\n      nextOrder.map((key) => [\n        key,\n        stabilizeToolArgsValue(record[key], `${path}.${key}`, keyOrderByPath),\n      ]),\n    );\n  }\n\n  return value;\n};\n\nfunction stableStringifyToolArgs(\n  keyOrderCache: Map<string, Map<string, string[]>> | undefined,\n  cacheKey: string,\n  args: ReadonlyJSONObject,\n): string {\n  const keyOrderByPath = keyOrderCache?.get(cacheKey) ?? new Map();\n  keyOrderCache?.set(cacheKey, keyOrderByPath);\n\n  const stableArgs = stabilizeToolArgsValue(\n    args,\n    \"$\",\n    keyOrderByPath,\n  ) as ReadonlyJSONObject;\n  return JSON.stringify(stableArgs);\n}\n\nfunction getToolApprovalAndInterrupt(\n  part: {\n    approval?:\n      | {\n          id: string;\n          approved?: boolean;\n          reason?: string;\n          isAutomatic?: boolean;\n        }\n      | undefined;\n  },\n  toolStatus: { type: string; payload?: unknown } | undefined,\n): {\n  approval?: NonNullable<ToolCallMessagePart[\"approval\"]>;\n  interrupt?: NonNullable<ToolCallMessagePart[\"interrupt\"]>;\n} {\n  if (part.approval && typeof part.approval.id === \"string\") {\n    const { id, approved, reason, isAutomatic } = part.approval;\n    return {\n      approval: {\n        id,\n        ...(typeof approved === \"boolean\" && { approved }),\n        ...(typeof reason === \"string\" && { reason }),\n        ...(isAutomatic === true && { isAutomatic: true }),\n      },\n    };\n  }\n\n  if (toolStatus?.type === \"interrupt\") {\n    return {\n      interrupt: toolStatus.payload as NonNullable<\n        ToolCallMessagePart[\"interrupt\"]\n      >,\n    };\n  }\n\n  return {};\n}\n\ntype MessageContent = Exclude<ThreadMessageLike[\"content\"], string>;\n\nfunction convertParts(\n  message: UIMessage,\n  metadata: AISDKMessageConverterMetadata,\n): MessageContent {\n  if (!message.parts || message.parts.length === 0) {\n    return [];\n  }\n\n  const converted = message.parts\n    .filter(\n      (p) =>\n        p.type !== \"step-start\" &&\n        (message.role !== \"user\" || p.type !== \"file\"),\n    )\n    .map((part) => {\n      if (part.type === \"text\") {\n        return {\n          type: \"text\",\n          text: part.text,\n        } satisfies TextMessagePart;\n      }\n\n      if (part.type === \"reasoning\") {\n        return {\n          type: \"reasoning\",\n          text: part.text,\n        } satisfies ReasoningMessagePart;\n      }\n\n      if (isToolUIPart(part)) {\n        const toolName = getToolName(part);\n        const toolCallId = part.toolCallId;\n        const argsKeyOrderCacheKey = `${message.id}:${toolCallId}`;\n\n        const rawInput = part.input as ReadonlyJSONObject | null | undefined;\n        let args: ReadonlyJSONObject;\n        if (\n          rawInput != null &&\n          typeof rawInput === \"object\" &&\n          !Array.isArray(rawInput)\n        ) {\n          args = rawInput;\n          metadata.toolLastInputCache?.set(argsKeyOrderCacheKey, args);\n        } else {\n          args = metadata.toolLastInputCache?.get(argsKeyOrderCacheKey) ?? {};\n        }\n\n        let result: unknown;\n        let modelContent: ToolCallMessagePart[\"modelContent\"];\n        let isError = false;\n\n        if (part.state === \"output-available\") {\n          const unwrapped = unwrapModelContentEnvelope(part.output);\n          result = unwrapped.result;\n          modelContent = unwrapped.modelContent;\n        } else if (part.state === \"output-error\") {\n          isError = true;\n          result = { error: part.errorText };\n        } else if (part.state === \"output-denied\") {\n          isError = true;\n          result = {\n            error:\n              (part as { approval?: { reason?: string } }).approval?.reason ||\n              \"Tool approval denied\",\n          };\n        }\n\n        let argsText = stableStringifyToolArgs(\n          metadata.toolArgsKeyOrderCache,\n          argsKeyOrderCacheKey,\n          args,\n        );\n        if (part.state === \"input-streaming\") {\n          // strip closing delimiters added by the AI SDK's fix-json\n          argsText = stripClosingDelimiters(argsText);\n        } else {\n          metadata.toolArgsKeyOrderCache?.delete(argsKeyOrderCacheKey);\n          if (\n            part.state === \"output-available\" ||\n            part.state === \"output-error\" ||\n            part.state === \"output-denied\"\n          ) {\n            metadata.toolLastInputCache?.delete(argsKeyOrderCacheKey);\n          }\n        }\n\n        const toolStatus = metadata.toolStatuses?.[toolCallId];\n        const mcpApp = extractMcpAppMetadata(\n          part,\n          metadata.mcpAppMetadataCache,\n        );\n        return {\n          type: \"tool-call\",\n          toolName,\n          toolCallId,\n          argsText,\n          args,\n          result,\n          isError,\n          ...(modelContent !== undefined && { modelContent }),\n          ...(mcpApp && { mcp: { app: mcpApp } }),\n          ...getToolApprovalAndInterrupt(part, toolStatus),\n        } satisfies ToolCallMessagePart;\n      }\n\n      if (part.type === \"source-url\") {\n        return {\n          type: \"source\",\n          sourceType: \"url\",\n          id: part.sourceId,\n          url: part.url,\n          ...(part.title != null ? { title: part.title } : undefined),\n          ...(part.providerMetadata != null\n            ? {\n                providerMetadata:\n                  part.providerMetadata as SourceProviderMetadata,\n              }\n            : undefined),\n        } satisfies SourceMessagePart;\n      }\n\n      if (part.type === \"file\") {\n        return {\n          type: \"file\",\n          data: part.url,\n          mimeType: part.mediaType,\n          ...(part.filename != null && { filename: part.filename }),\n        } satisfies FileMessagePart;\n      }\n\n      if (part.type === \"source-document\") {\n        return {\n          type: \"source\",\n          sourceType: \"document\",\n          id: part.sourceId,\n          title: part.title,\n          mediaType: part.mediaType,\n          ...(part.filename != null ? { filename: part.filename } : undefined),\n          ...(part.providerMetadata != null\n            ? {\n                providerMetadata:\n                  part.providerMetadata as SourceProviderMetadata,\n              }\n            : undefined),\n        } satisfies SourceMessagePart;\n      }\n\n      if (part.type.startsWith(\"data-\")) {\n        return {\n          type: \"data\",\n          name: part.type.substring(5),\n          data: (part as any).data,\n        } satisfies DataMessagePart;\n      }\n\n      console.warn(`Unsupported message part type: ${part.type}`);\n      return null;\n    })\n    .filter(Boolean) as MessageContent[number][];\n\n  const seenToolCallIds = new Set<string>();\n  return converted.filter((part) => {\n    if (part.type === \"tool-call\" && part.toolCallId != null) {\n      if (seenToolCallIds.has(part.toolCallId)) return false;\n      seenToolCallIds.add(part.toolCallId);\n    }\n    return true;\n  });\n}\n\nexport const AISDKMessageConverter = unstable_createMessageConverter(\n  (message: UIMessage, metadata: AISDKMessageConverterMetadata) => {\n    const createdAt = new Date();\n    const content = convertParts(message, metadata);\n\n    switch (message.role) {\n      case \"user\":\n        return {\n          role: \"user\",\n          id: message.id,\n          createdAt,\n          content,\n          attachments: message.parts\n            ?.filter((p) => p.type === \"file\")\n            .map((part, idx) => ({\n              id: idx.toString(),\n              type: part.mediaType.startsWith(\"image/\") ? \"image\" : \"file\",\n              name: part.filename ?? \"file\",\n              content: [\n                part.mediaType.startsWith(\"image/\")\n                  ? {\n                      type: \"image\",\n                      image: part.url,\n                      filename: part.filename!,\n                    }\n                  : {\n                      type: \"file\",\n                      filename: part.filename!,\n                      data: part.url,\n                      mimeType: part.mediaType,\n                    },\n              ],\n              contentType: part.mediaType ?? \"unknown/unknown\",\n              status: { type: \"complete\" as const },\n            })),\n          metadata: message.metadata as MessageMetadata,\n        };\n\n      case \"system\":\n      case \"assistant\": {\n        const timing = metadata.messageTiming?.[message.id];\n        const isOptimistic =\n          message.role === \"assistant\" &&\n          message.id === metadata.optimisticMessageId;\n        return {\n          role: message.role,\n          id: message.id,\n          createdAt,\n          content,\n          metadata: {\n            ...(message.metadata as MessageMetadata),\n            ...(timing && { timing }),\n            ...(isOptimistic && { isOptimistic: true }),\n          },\n        };\n      }\n\n      default:\n        console.warn(`Unsupported message role: ${message.role}`);\n        return [];\n    }\n  },\n);\n"],"mappings":"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"}

package/dist/ui/utils/toCreateMessage.js

@@ -21,6 +21,10 @@ const toCreateMessage = (message) => {
 				mediaType: part.mimeType,
 				...part.filename && { filename: part.filename }
 			};
+			case "data": return {
+				type: `data-${part.name}`,
+				data: part.data
+			};
 			default: throw new Error(`Unsupported part type: ${part.type}`);
 		}
 	});

package/dist/ui/utils/toCreateMessage.js.map

@@ -1 +1 @@
-{"version":3,"file":"toCreateMessage.js","names":[],"sources":["../../../src/ui/utils/toCreateMessage.ts"],"sourcesContent":["import type { AppendMessage } from \"@assistant-ui/core\";\nimport type {\n  CreateUIMessage,\n  UIDataTypes,\n  UIMessage,\n  UIMessagePart,\n  UITools,\n} from \"ai\";\n\nexport const toCreateMessage = <UI_MESSAGE extends UIMessage = UIMessage>(\n  message: AppendMessage,\n): CreateUIMessage<UI_MESSAGE> => {\n  const inputParts = [\n    ...message.content.filter((c) => c.type !== \"file\"),\n    ...(message.attachments?.flatMap((a) =>\n      a.content.map((c) => ({\n        ...c,\n        filename: a.name,\n      })),\n    ) ?? []),\n  ];\n\n  const parts = inputParts.map((part): UIMessagePart<UIDataTypes, UITools> => {\n    switch (part.type) {\n      case \"text\":\n        return {\n          type: \"text\",\n          text: part.text,\n        };\n      case \"image\":\n        return {\n          type: \"file\",\n          url: part.image,\n          ...(part.filename && { filename: part.filename }),\n          mediaType: \"image/png\",\n        };\n      case \"file\":\n        return {\n          type: \"file\",\n          url: part.data,\n          mediaType: part.mimeType,\n          ...(part.filename && { filename: part.filename }),\n        };\n      default:\n        throw new Error(`Unsupported part type: ${part.type}`);\n    }\n  });\n\n  return {\n    role: message.role,\n    parts,\n    metadata: message.metadata,\n  } satisfies CreateUIMessage<UIMessage> as CreateUIMessage<UI_MESSAGE>;\n};\n"],"mappings":";AASA,MAAa,mBACX,YACgC;CAWhC,MAAM,QAAQ,CATZ,GAAG,QAAQ,QAAQ,QAAQ,MAAM,EAAE,SAAS,MAAM,GAClD,GAAI,QAAQ,aAAa,SAAS,MAChC,EAAE,QAAQ,KAAK,OAAO;EACpB,GAAG;EACH,UAAU,EAAE;CACd,EAAE,CACJ,KAAK,CAAC,CAGe,EAAE,KAAK,SAA8C;EAC1E,QAAQ,KAAK,MAAb;GACE,KAAK,QACH,OAAO;IACL,MAAM;IACN,MAAM,KAAK;GACb;GACF,KAAK,SACH,OAAO;IACL,MAAM;IACN,KAAK,KAAK;IACV,GAAI,KAAK,YAAY,EAAE,UAAU,KAAK,SAAS;IAC/C,WAAW;GACb;GACF,KAAK,QACH,OAAO;IACL,MAAM;IACN,KAAK,KAAK;IACV,WAAW,KAAK;IAChB,GAAI,KAAK,YAAY,EAAE,UAAU,KAAK,SAAS;GACjD;GACF,SACE,MAAM,IAAI,MAAM,0BAA0B,KAAK,MAAM;EACzD;CACF,CAAC;CAED,OAAO;EACL,MAAM,QAAQ;EACd;EACA,UAAU,QAAQ;CACpB;AACF"}
+{"version":3,"file":"toCreateMessage.js","names":[],"sources":["../../../src/ui/utils/toCreateMessage.ts"],"sourcesContent":["import type { AppendMessage } from \"@assistant-ui/core\";\nimport type {\n  CreateUIMessage,\n  UIDataTypes,\n  UIMessage,\n  UIMessagePart,\n  UITools,\n} from \"ai\";\n\nexport const toCreateMessage = <UI_MESSAGE extends UIMessage = UIMessage>(\n  message: AppendMessage,\n): CreateUIMessage<UI_MESSAGE> => {\n  const inputParts = [\n    ...message.content.filter((c) => c.type !== \"file\"),\n    ...(message.attachments?.flatMap((a) =>\n      a.content.map((c) => ({\n        ...c,\n        filename: a.name,\n      })),\n    ) ?? []),\n  ];\n\n  const parts = inputParts.map((part): UIMessagePart<UIDataTypes, UITools> => {\n    switch (part.type) {\n      case \"text\":\n        return {\n          type: \"text\",\n          text: part.text,\n        };\n      case \"image\":\n        return {\n          type: \"file\",\n          url: part.image,\n          ...(part.filename && { filename: part.filename }),\n          mediaType: \"image/png\",\n        };\n      case \"file\":\n        return {\n          type: \"file\",\n          url: part.data,\n          mediaType: part.mimeType,\n          ...(part.filename && { filename: part.filename }),\n        };\n      case \"data\":\n        return {\n          type: `data-${part.name}`,\n          data: part.data,\n        };\n      default:\n        throw new Error(`Unsupported part type: ${part.type}`);\n    }\n  });\n\n  return {\n    role: message.role,\n    parts,\n    metadata: message.metadata,\n  } satisfies CreateUIMessage<UIMessage> as CreateUIMessage<UI_MESSAGE>;\n};\n"],"mappings":";AASA,MAAa,mBACX,YACgC;CAWhC,MAAM,QAAQ,CATZ,GAAG,QAAQ,QAAQ,QAAQ,MAAM,EAAE,SAAS,MAAM,GAClD,GAAI,QAAQ,aAAa,SAAS,MAChC,EAAE,QAAQ,KAAK,OAAO;EACpB,GAAG;EACH,UAAU,EAAE;CACd,EAAE,CACJ,KAAK,CAAC,CAGe,EAAE,KAAK,SAA8C;EAC1E,QAAQ,KAAK,MAAb;GACE,KAAK,QACH,OAAO;IACL,MAAM;IACN,MAAM,KAAK;GACb;GACF,KAAK,SACH,OAAO;IACL,MAAM;IACN,KAAK,KAAK;IACV,GAAI,KAAK,YAAY,EAAE,UAAU,KAAK,SAAS;IAC/C,WAAW;GACb;GACF,KAAK,QACH,OAAO;IACL,MAAM;IACN,KAAK,KAAK;IACV,WAAW,KAAK;IAChB,GAAI,KAAK,YAAY,EAAE,UAAU,KAAK,SAAS;GACjD;GACF,KAAK,QACH,OAAO;IACL,MAAM,QAAQ,KAAK;IACnB,MAAM,KAAK;GACb;GACF,SACE,MAAM,IAAI,MAAM,0BAA0B,KAAK,MAAM;EACzD;CACF,CAAC;CAED,OAAO;EACL,MAAM,QAAQ;EACd;EACA,UAAU,QAAQ;CACpB;AACF"}

package/dist/usage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usage.d.ts","names":[],"sources":["../src/usage.ts"],"mappings":";KAGY,gBAAA;EACV,WAAA;EACA,WAAA;EACA,YAAA;EACA,eAAA;EACA,iBAAA;AAAA;AAAA,UAGe,4BAAA;EACf,IAAA;EACA,QAAQ;AAAA;AAAA,iBAoGM,0BAAA,CACd,OAAA,EAAS,4BAAA,eACR,gBAAgB;AAAA,iBAeH,yBAAA,CACd,QAAA,WAAmB,4BAAA,iBAClB,gBAAgB;AAAA,iBAmBH,mBAAA,CAAA,GAAuB,gBAAgB"}
+{"version":3,"file":"usage.d.ts","names":[],"sources":["../src/usage.ts"],"mappings":";KAGY,gBAAA;EACV,WAAA;EACA,WAAA;EACA,YAAA;EACA,eAAA;EACA,iBAAA;AAAA;AAAA,UAGe,4BAAA;EACf,IAAA;EACA,QAAQ;AAAA;AAAA,iBAoGM,0BAAA,CACd,OAAA,EAAS,4BAAA,eACR,gBAAgB;AAAA,iBAeH,yBAAA,CACd,QAAA,WAAmB,4BAAA,iBAClB,gBAAgB;AAAA,iBAmBH,mBAAA,IAAuB,gBAAgB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react-ai-sdk",
-  "version": "1.3.30",
+  "version": "1.3.32",
   "description": "Vercel AI SDK adapter for assistant-ui",
   "keywords": [
     "ai-sdk",
@@ -30,10 +30,11 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@ai-sdk/react": "^3.0.193",
-    "@assistant-ui/core": "^0.2.7",
-    "@assistant-ui/store": "^0.2.12",
-    "ai": "^6.0.191",
+    "@ai-sdk/mcp": "^1.0.45",
+    "@ai-sdk/react": "^3.0.195",
+    "@assistant-ui/core": "^0.2.10",
+    "@assistant-ui/store": "^0.2.13",
+    "ai": "^6.0.193",
     "assistant-cloud": "*"
   },
   "peerDependencies": {
@@ -53,8 +54,8 @@
     "jsdom": "^29.1.1",
     "react": "^19.2.6",
     "vitest": "^4.1.7",
-    "@assistant-ui/x-buildutils": "0.0.9",
-    "assistant-stream": "0.3.17"
+    "assistant-stream": "0.3.20",
+    "@assistant-ui/x-buildutils": "0.0.11"
   },
   "publishConfig": {
     "access": "public",

package/src/frontendTools.test.ts

@@ -125,4 +125,28 @@ describe("frontendTools", () => {
 
     expect(output).toEqual({ type: "text", value: "hello" });
   });
+
+  it("forwards providerOptions verbatim when present", () => {
+    const tools = frontendTools({
+      getWeather: {
+        description: "Get the weather",
+        parameters: { type: "object", properties: {} },
+        providerOptions: { anthropic: { deferLoading: true } },
+      },
+    });
+
+    expect(tools.getWeather?.providerOptions).toEqual({
+      anthropic: { deferLoading: true },
+    });
+  });
+
+  it("omits providerOptions when absent", () => {
+    const tools = frontendTools({
+      getWeather: {
+        parameters: { type: "object", properties: {} },
+      },
+    });
+
+    expect(tools.getWeather).not.toHaveProperty("providerOptions");
+  });
 });

package/src/frontendTools.ts

@@ -1,43 +1,17 @@
 import { jsonSchema, type ToolSet } from "ai";
-import type { JSONSchema7 } from "json-schema";
-import type { ToolModelContentPart } from "assistant-stream";
+import type { ToolJSONSchema } from "assistant-stream";
 import { unwrapModelContentEnvelope } from "./modelContentEnvelope";
+import { toAISDKContent, toAISDKDefaultOutput } from "./toolOutputConversion";
 
-const toAISDKContent = (parts: readonly ToolModelContentPart[]) => ({
-  type: "content" as const,
-  value: parts.map((part) => {
-    if (part.type === "text") {
-      return { type: "text" as const, text: part.text };
-    }
-    const isImage = part.mediaType.startsWith("image/");
-    return isImage
-      ? {
-          type: "image-data" as const,
-          data: part.data,
-          mediaType: part.mediaType,
-        }
-      : {
-          type: "file-data" as const,
-          data: part.data,
-          mediaType: part.mediaType,
-          ...(part.filename !== undefined && { filename: part.filename }),
-        };
-  }),
-});
-
-const defaultToModelOutput = ({ output }: { output: unknown }) => {
-  const { modelContent } = unwrapModelContentEnvelope(output);
+export const defaultToModelOutput = ({ output }: { output: unknown }) => {
+  const { result, modelContent } = unwrapModelContentEnvelope(output);
   if (modelContent !== undefined) {
     return toAISDKContent(modelContent);
   }
-  return typeof output === "string"
-    ? { type: "text" as const, value: output }
-    : { type: "json" as const, value: (output ?? null) as any };
+  return toAISDKDefaultOutput(result);
 };
 
-export const frontendTools = (
-  tools: Record<string, { description?: string; parameters: JSONSchema7 }>,
-): ToolSet =>
+export const frontendTools = (tools: Record<string, ToolJSONSchema>): ToolSet =>
   Object.fromEntries(
     Object.entries(tools).map(([name, t]) => [
       name,
@@ -45,6 +19,7 @@ export const frontendTools = (
         ...(t.description !== undefined && { description: t.description }),
         inputSchema: jsonSchema(t.parameters),
         toModelOutput: defaultToModelOutput,
+        ...(t.providerOptions && { providerOptions: t.providerOptions }),
       },
     ]),
   ) as ToolSet;

package/src/generativeTools.test.ts

@@ -0,0 +1,407 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { AISDKToolkit, generativeTools } from "./generativeTools";
+import { wrapModelContentEnvelope } from "./modelContentEnvelope";
+
+const mocks = vi.hoisted(() => ({
+  close: vi.fn(),
+  tools: vi.fn(),
+  createMCPClient: vi.fn(),
+}));
+
+vi.mock("@ai-sdk/mcp", () => ({
+  createMCPClient: mocks.createMCPClient,
+}));
+
+vi.mock("@ai-sdk/mcp/mcp-stdio", () => ({
+  Experimental_StdioMCPTransport: vi.fn((config) => ({
+    type: "stdio",
+    config,
+  })),
+}));
+
+describe("generativeTools", () => {
+  beforeEach(() => {
+    mocks.close.mockReset();
+    mocks.tools.mockReset();
+    mocks.createMCPClient.mockReset();
+  });
+
+  it("merges frontend tools with toolkit tools", () => {
+    const toolSet = generativeTools({
+      frontendTools: {
+        clientTool: {
+          parameters: { type: "object", properties: {} },
+        },
+      },
+      toolkit: {
+        serverTool: {
+          type: "backend",
+          description: "Server tool",
+          parameters: { type: "object", properties: {} },
+          execute: async () => "ok",
+        } as never,
+      },
+    });
+
+    expect(toolSet.clientTool).toBeDefined();
+    expect(toolSet.serverTool?.description).toBe("Server tool");
+    expect(toolSet.serverTool?.execute).toBeTypeOf("function");
+  });
+
+  it("keeps a flat toolkit tool named tools", () => {
+    const toolSet = generativeTools({
+      toolkit: {
+        tools: {
+          type: "backend",
+          description: "Actually a tool, not config",
+          parameters: { type: "object", properties: {} },
+          execute: async () => "ok",
+        } as never,
+      },
+    });
+
+    expect(toolSet.tools?.description).toBe("Actually a tool, not config");
+    expect(toolSet.tools?.execute).toBeTypeOf("function");
+  });
+
+  it("rejects MCP entries because they require pooled clients", () => {
+    expect(() =>
+      generativeTools({
+        toolkit: {
+          docs: {
+            type: "mcp",
+            server: { type: "http", url: "http://localhost:3001/mcp" },
+          },
+        },
+      }),
+    ).toThrow(/requires AISDKToolkit/);
+  });
+
+  it("converts provider tools without an execute function", () => {
+    const toolSet = generativeTools({
+      toolkit: {
+        web_search: {
+          type: "provider",
+          providerId: "openai.web_search_preview",
+          args: { searchContextSize: "low" },
+        },
+      },
+    });
+
+    expect(toolSet.web_search).toMatchObject({
+      type: "provider",
+      id: "openai.web_search_preview",
+      args: { searchContextSize: "low" },
+    });
+    expect(toolSet.web_search).not.toHaveProperty("inputSchema");
+    expect(toolSet.web_search).not.toHaveProperty("execute");
+  });
+
+  it("forwards provider tool parameters and providerOptions when present", () => {
+    const toolSet = generativeTools({
+      toolkit: {
+        web_search: {
+          type: "provider",
+          providerId: "openai.web_search_preview",
+          args: { searchContextSize: "low" },
+          parameters: {
+            type: "object",
+            properties: {
+              query: { type: "string" },
+            },
+            required: ["query"],
+          },
+          providerOptions: {
+            openai: { rankingOptions: { scoreThreshold: 0.5 } },
+          },
+        },
+      },
+    });
+
+    expect(toolSet.web_search).toMatchObject({
+      type: "provider",
+      id: "openai.web_search_preview",
+      args: { searchContextSize: "low" },
+      providerOptions: {
+        openai: { rankingOptions: { scoreThreshold: 0.5 } },
+      },
+    });
+    expect(toolSet.web_search).toHaveProperty("inputSchema");
+  });
+
+  it("forwards explicit false supportsDeferredResults", () => {
+    const toolSet = generativeTools({
+      toolkit: {
+        web_search: {
+          type: "provider",
+          providerId: "openai.web_search_preview",
+          args: { searchContextSize: "low" },
+          supportsDeferredResults: false,
+        },
+      },
+    });
+
+    expect(toolSet.web_search).toMatchObject({
+      supportsDeferredResults: false,
+    });
+  });
+});
+
+describe("AISDKToolkit", () => {
+  beforeEach(() => {
+    mocks.close.mockReset();
+    mocks.tools.mockReset();
+    mocks.createMCPClient.mockReset();
+  });
+
+  it("loads MCP tools through pooled clients", async () => {
+    mocks.tools.mockResolvedValue({ echo: { inputSchema: {} } });
+    mocks.createMCPClient.mockResolvedValue({
+      tools: mocks.tools,
+      close: mocks.close,
+    });
+
+    const toolkit = new AISDKToolkit({
+      toolkit: {
+        local: {
+          type: "mcp",
+          server: { type: "http", url: "http://localhost:3001/mcp" },
+        },
+      },
+    });
+
+    await expect(toolkit.tools()).resolves.toHaveProperty("echo");
+    await toolkit.tools();
+
+    expect(mocks.createMCPClient).toHaveBeenCalledTimes(1);
+    expect(mocks.createMCPClient).toHaveBeenCalledWith({
+      transport: {
+        type: "http",
+        url: "http://localhost:3001/mcp",
+      },
+    });
+    expect(mocks.tools).toHaveBeenCalledTimes(2);
+  });
+
+  it("closes pooled MCP clients", async () => {
+    mocks.tools.mockResolvedValue({});
+    mocks.createMCPClient.mockResolvedValue({
+      tools: mocks.tools,
+      close: mocks.close,
+    });
+
+    const toolkit = new AISDKToolkit({
+      toolkit: {
+        local: {
+          type: "mcp",
+          server: { type: "sse", url: "http://localhost:3001/sse" },
+        },
+      },
+    });
+
+    await toolkit.tools();
+    await toolkit.close();
+
+    expect(mocks.close).toHaveBeenCalledTimes(1);
+  });
+
+  it("clears pooled MCP clients even when initialization fails", async () => {
+    const error = new Error("connect failed");
+    const closeError = new Error("close failed");
+    const close = vi.fn().mockRejectedValue(closeError);
+    mocks.tools.mockResolvedValue({});
+    mocks.createMCPClient
+      .mockResolvedValueOnce({
+        tools: mocks.tools,
+        close,
+      })
+      .mockRejectedValueOnce(error);
+
+    const toolkit = new AISDKToolkit({
+      toolkit: {
+        first: {
+          type: "mcp",
+          server: { type: "http", url: "http://localhost:3001/mcp" },
+        },
+        second: {
+          type: "mcp",
+          server: { type: "http", url: "http://localhost:3002/mcp" },
+        },
+      },
+    });
+
+    const toolsPromise = toolkit.tools();
+    await expect(toolkit.close()).rejects.toMatchObject({
+      errors: [error, closeError],
+    });
+    await expect(toolsPromise).rejects.toThrow(error);
+    expect(close).toHaveBeenCalledTimes(1);
+
+    await expect(toolkit.close()).resolves.toBeUndefined();
+  });
+
+  it("evicts failed MCP client initialization so later calls can retry", async () => {
+    const error = new Error("connect failed");
+    mocks.createMCPClient.mockRejectedValueOnce(error).mockResolvedValueOnce({
+      tools: vi.fn().mockResolvedValue({ echo: { inputSchema: {} } }),
+      close: mocks.close,
+    });
+
+    const toolkit = new AISDKToolkit({
+      toolkit: {
+        local: {
+          type: "mcp",
+          server: { type: "http", url: "http://localhost:3001/mcp" },
+        },
+      },
+    });
+
+    await expect(toolkit.tools()).rejects.toThrow(error);
+    await expect(toolkit.tools()).resolves.toHaveProperty("echo");
+    expect(mocks.createMCPClient).toHaveBeenCalledTimes(2);
+  });
+
+  it("rejects duplicate MCP tool names", async () => {
+    mocks.createMCPClient
+      .mockResolvedValueOnce({
+        tools: vi.fn().mockResolvedValue({ echo: { inputSchema: {} } }),
+        close: mocks.close,
+      })
+      .mockResolvedValueOnce({
+        tools: vi.fn().mockResolvedValue({ echo: { inputSchema: {} } }),
+        close: mocks.close,
+      });
+
+    const toolkit = new AISDKToolkit({
+      toolkit: {
+        first: {
+          type: "mcp",
+          server: { type: "http", url: "http://localhost:3001/mcp" },
+        },
+        second: {
+          type: "mcp",
+          server: { type: "http", url: "http://localhost:3002/mcp" },
+        },
+      },
+    });
+
+    await expect(toolkit.tools()).rejects.toThrow(
+      /MCP tool name collision: "echo"/,
+    );
+  });
+
+  it("includes provider tools alongside MCP tools", async () => {
+    mocks.tools.mockResolvedValue({ echo: { inputSchema: {} } });
+    mocks.createMCPClient.mockResolvedValue({
+      tools: mocks.tools,
+      close: mocks.close,
+    });
+
+    const toolkit = new AISDKToolkit({
+      toolkit: {
+        local: {
+          type: "mcp",
+          server: { type: "http", url: "http://localhost:3001/mcp" },
+        },
+        web_search: {
+          type: "provider",
+          providerId: "openai.web_search_preview",
+          args: { searchContextSize: "low" },
+          supportsDeferredResults: false,
+        },
+      },
+    });
+
+    await expect(toolkit.tools()).resolves.toMatchObject({
+      echo: { inputSchema: {} },
+      web_search: {
+        type: "provider",
+        id: "openai.web_search_preview",
+        args: { searchContextSize: "low" },
+        supportsDeferredResults: false,
+      },
+    });
+  });
+});
+
+describe("generativeTools toModelOutput", () => {
+  const createWeatherTools = (toModelOutput?: any) =>
+    generativeTools({
+      toolkit: {
+        get_weather: {
+          ...(toModelOutput && { toModelOutput }),
+        },
+      } as any,
+    });
+
+  it("adapts assistant-ui model content parts to the AI SDK tool output shape", async () => {
+    const tools = createWeatherTools(({ output }: any) => [
+      { type: "text", text: `Weather card displayed: ${output.location}` },
+    ]);
+
+    const output = await tools.get_weather!.toModelOutput!({
+      toolCallId: "tc-weather",
+      input: {},
+      output: { location: "San Francisco" },
+    });
+
+    expect(output).toEqual({
+      type: "content",
+      value: [{ type: "text", text: "Weather card displayed: San Francisco" }],
+    });
+  });
+
+  it("uses stored model content envelopes without re-running the custom projector", async () => {
+    let called = false;
+    const tools = createWeatherTools(() => {
+      called = true;
+      return [{ type: "text", text: "recomputed" }];
+    });
+
+    const output = await tools.get_weather!.toModelOutput!({
+      toolCallId: "tc-weather",
+      input: {},
+      output: wrapModelContentEnvelope({ location: "San Francisco" }, [
+        { type: "text", text: "cached weather receipt" },
+      ]),
+    });
+
+    expect(called).toBe(false);
+    expect(output).toEqual({
+      type: "content",
+      value: [{ type: "text", text: "cached weather receipt" }],
+    });
+  });
+
+  it("falls back to default model output when no custom projector is defined", async () => {
+    const tools = createWeatherTools();
+
+    const output = await tools.get_weather!.toModelOutput!({
+      toolCallId: "tc-weather",
+      input: {},
+      output: { location: "San Francisco" },
+    });
+
+    expect(output).toEqual({
+      type: "json",
+      value: { location: "San Francisco" },
+    });
+  });
+
+  it("uses stored model content envelopes when no custom projector is defined", async () => {
+    const tools = createWeatherTools();
+
+    const output = await tools.get_weather!.toModelOutput!({
+      toolCallId: "tc-weather",
+      input: {},
+      output: wrapModelContentEnvelope({ location: "San Francisco" }, [
+        { type: "text", text: "cached weather receipt" },
+      ]),
+    });
+
+    expect(output).toEqual({
+      type: "content",
+      value: [{ type: "text", text: "cached weather receipt" }],
+    });
+  });
+});