openai 0.79.0 → 0.80.0

data/lib/openai/providers/bedrock.rb

@@ -4,8 +4,8 @@ module OpenAI
   module Providers
     # @api private
     module Bedrock
-      SERVICE = "bedrock-mantle"
-      CANONICAL_HOST = /\Abedrock-mantle\.([a-z0-9-]+)\.api\.aws\z/i
+      SERVICES = {mantle: "bedrock-mantle", runtime: "bedrock"}.freeze
+      AWS_REGION_PATTERN = /\A[a-z]{2,8}(?:-[a-z0-9]+)+-\d+\z/
       AUTH_HEADERS = %w[authorization].freeze
       SIGNING_HEADERS = %w[authorization x-amz-content-sha256 x-amz-date x-amz-security-token].freeze
       BEARER_AUTH_MARKER = :openai_bedrock_bearer
@@ -39,6 +39,7 @@ module OpenAI
         attr_reader :name
 
         def initialize(
+          endpoint:,
           region:,
           base_url:,
           bearer_provider:,
@@ -50,6 +51,7 @@ module OpenAI
           default_chain:
         )
           @name = "bedrock"
+          @endpoint = endpoint
           @region = region&.freeze
           @base_url = base_url&.freeze
           @bearer_provider = bearer_provider
@@ -63,14 +65,17 @@ module OpenAI
 
         def configure
           if @bearer_provider
-            base_url = Bedrock.resolve_base_url(@base_url, @region)
+            base_url = Bedrock.resolve_base_url(@base_url, @region, endpoint: @endpoint)
+            Bedrock.validate_canonical_endpoint!(base_url, @endpoint, @region)
             auth = BearerAuth.new(token_provider: @bearer_provider, base_url: base_url)
           else
             Bedrock.load_aws!
             region = @region || Bedrock.profile_region(@profile)
             raise ArgumentError, MISSING_REGION_MESSAGE if region.nil?
+            Bedrock.validate_region!(region)
 
-            base_url = Bedrock.resolve_base_url(@base_url, region)
+            base_url = Bedrock.resolve_base_url(@base_url, region, endpoint: @endpoint)
+            Bedrock.validate_canonical_endpoint!(base_url, @endpoint, region)
             credentials =
               if @access_key_id
                 Aws::Credentials.new(@access_key_id, @secret_access_key, @session_token)
@@ -82,6 +87,7 @@ module OpenAI
                 DefaultCredentialsProvider.new
               end
             auth = SigV4Auth.new(
+              endpoint: @endpoint,
               region: region,
               base_url: base_url,
               credentials_provider: credentials,
@@ -130,12 +136,13 @@ module OpenAI
       end
 
       class SigV4Auth
-        def initialize(region:, base_url:, credentials_provider:, default_chain:)
+        def initialize(endpoint:, region:, base_url:, credentials_provider:, default_chain:)
+          @endpoint = endpoint
           @region = region
           @base_url = URI(base_url)
           @default_chain = default_chain
           @signer = Aws::Sigv4::Signer.new(
-            service: SERVICE,
+            service: SERVICES.fetch(endpoint),
             region: region,
             credentials_provider: credentials_provider
           )
@@ -144,7 +151,7 @@ module OpenAI
         def prepare_request(request)
           url = request.fetch(:url)
           Bedrock.validate_origin!(url, @base_url, action: "sign")
-          Bedrock.validate_endpoint_region!(url, @region)
+          Bedrock.validate_endpoint_region!(url, @region, endpoint: @endpoint)
           body = request[:body]
           unless body.nil? || body.is_a?(String)
             raise OpenAI::Errors::Error, NON_REPLAYABLE_BODY_MESSAGE
@@ -263,10 +270,86 @@ module OpenAI
           raise OpenAI::Errors::Error.new(MISSING_DEPENDENCY_MESSAGE), cause: e
         end
 
-        def resolve_base_url(base_url, region)
+        def resolve_base_url(base_url, region, endpoint:)
           return base_url if base_url
           raise ArgumentError, MISSING_REGION_MESSAGE if region.nil?
-          "https://bedrock-mantle.#{region}.api.aws/v1"
+
+          if endpoint == :runtime
+            suffix, = runtime_dns_suffixes(region)
+            "https://bedrock-runtime.#{region}.#{suffix}/openai/v1"
+          else
+            "https://bedrock-mantle.#{region}.api.aws/v1"
+          end
+        end
+
+        def runtime_dns_suffixes(region)
+          case region
+          when /\Acn-/
+            ["amazonaws.com.cn", "api.amazonwebservices.com.cn"]
+          when /\Aeusc-/
+            ["amazonaws.eu", "api.amazonwebservices.eu"]
+          when /\Aus-iso-/
+            ["c2s.ic.gov", "api.aws.ic.gov"]
+          when /\Aus-isob-/
+            ["sc2s.sgov.gov", "api.aws.scloud"]
+          when /\Aeu-isoe-/
+            ["cloud.adc-e.uk", "api.cloud-aws.adc-e.uk"]
+          when /\Aus-isof-/
+            ["csp.hci.ic.gov", "api.aws.hci.ic.gov"]
+          else
+            ["amazonaws.com", "api.aws"]
+          end
+        end
+
+        def parse_endpoint_hostname(hostname)
+          service, region, *suffix_parts = hostname.delete_suffix(".").downcase.split(".")
+          suffix = suffix_parts.join(".")
+
+          if service == "bedrock-mantle" && region&.match?(/\A[a-z0-9-]+\z/) && suffix == "api.aws"
+            return {endpoint: :mantle, region: region}
+          end
+
+          if %w[bedrock-runtime bedrock-runtime-fips].include?(service) && region &&
+             runtime_dns_suffixes(region).include?(suffix)
+            return {endpoint: :runtime, region: region}
+          end
+
+          nil
+        end
+
+        def validate_canonical_endpoint!(base_url, endpoint, region)
+          uri = URI(base_url)
+          canonical = parse_endpoint_hostname(uri.host)
+          return unless canonical
+
+          unless uri.is_a?(URI::HTTPS)
+            raise ArgumentError, "Canonical Amazon Bedrock endpoints require HTTPS."
+          end
+          if canonical.fetch(:endpoint) != endpoint
+            raise ArgumentError,
+                  "The Bedrock #{canonical.fetch(:endpoint)} hostname does not match the " \
+                  "selected `#{endpoint}` endpoint."
+          end
+          return if region.nil? || canonical.fetch(:region) == region
+
+          raise ArgumentError,
+                "The Bedrock endpoint region `#{canonical.fetch(:region)}` does not match the " \
+                "configured AWS region `#{region}`."
+        end
+
+        def validate_region!(region)
+          return if AWS_REGION_PATTERN.match?(region)
+
+          raise ArgumentError,
+                "The Bedrock AWS `region` is invalid. Use a standard AWS region such as `us-east-1`."
+        end
+
+        def normalize_endpoint(endpoint)
+          return nil if endpoint.nil?
+          return endpoint.to_sym if endpoint == "mantle" || endpoint == "runtime"
+          return endpoint if endpoint == :mantle || endpoint == :runtime
+
+          raise ArgumentError, "The Bedrock `endpoint` must be either `mantle` or `runtime`."
         end
 
         def normalize_base_url(base_url)
@@ -310,9 +393,18 @@ module OpenAI
                 message
         end
 
-        def validate_endpoint_region!(url, region)
-          endpoint_region = CANONICAL_HOST.match(url.host)&.[](1)
-          return if endpoint_region.nil? || endpoint_region == region
+        def validate_endpoint_region!(url, region, endpoint:)
+          canonical = parse_endpoint_hostname(url.host)
+          return unless canonical
+
+          if canonical.fetch(:endpoint) != endpoint
+            raise OpenAI::Errors::Error,
+                  "The Bedrock #{canonical.fetch(:endpoint)} hostname does not match the " \
+                  "selected `#{endpoint}` endpoint."
+          end
+
+          endpoint_region = canonical.fetch(:region)
+          return if endpoint_region == region
           message =
             "The Bedrock endpoint region `#{endpoint_region}` does not match the SigV4 " \
             "region `#{region}`."
@@ -342,16 +434,19 @@ module OpenAI
     end
 
     class << self
-      # Configure the standard OpenAI client for Amazon Bedrock Mantle.
+      # Configure the standard OpenAI client for Amazon Bedrock Mantle or Runtime.
       #
       # Authentication precedence is an explicit bearer or AWS mode, then
       # AWS_BEARER_TOKEN_BEDROCK, then the standard AWS credential chain.
       #
+      # @param endpoint [String, Symbol, nil] Bedrock endpoint family. Defaults to
+      #   Mantle unless a canonical Runtime `base_url` is supplied.
+      #
       # @param region [String, nil] AWS signing region. Defaults to `AWS_REGION`,
       #   `AWS_DEFAULT_REGION`, or the selected profile's configured region.
       #
       # @param base_url [String, nil] Bedrock API root. Defaults to
-      #   `AWS_BEDROCK_BASE_URL` or the regional Bedrock Mantle endpoint.
+      #   `AWS_BEDROCK_BASE_URL` or the selected regional Bedrock endpoint.
       #
       # @param api_key [String, nil] Explicit Bedrock bearer credential. Passing
       #   `nil` explicitly skips the `AWS_BEARER_TOKEN_BEDROCK` fallback.
@@ -374,6 +469,7 @@ module OpenAI
       #
       # @return [OpenAI::Provider]
       def bedrock(
+        endpoint: nil,
         region: nil,
         base_url: OpenAI::Internal::OMIT,
         api_key: OpenAI::Internal::OMIT,
@@ -384,12 +480,12 @@ module OpenAI
         profile: nil,
         credentials_provider: nil
       )
+        normalized_endpoint = Bedrock.normalize_endpoint(endpoint)
         normalized_region = Bedrock.normalize_optional_string(region)
         if !region.nil? && normalized_region.nil?
           raise ArgumentError, "The Bedrock AWS `region` must not be empty."
         end
-        normalized_region ||= Bedrock.normalize_optional_string(ENV["AWS_REGION"]) ||
-                              Bedrock.normalize_optional_string(ENV["AWS_DEFAULT_REGION"])
+        Bedrock.validate_region!(normalized_region) if normalized_region
 
         normalized_profile = Bedrock.normalize_optional_string(profile)
         if !profile.nil? && normalized_profile.nil?
@@ -407,6 +503,10 @@ module OpenAI
             normalized
           end
         configured_base_url = Bedrock.normalize_base_url(configured_base_url) if configured_base_url
+        canonical_endpoint = if configured_base_url
+          Bedrock.parse_endpoint_hostname(URI(configured_base_url).host)
+        end
+        resolved_endpoint = normalized_endpoint || canonical_endpoint&.fetch(:endpoint) || :mantle
 
         has_access_key = !access_key_id.nil?
         has_secret_key = !secret_access_key.nil?
@@ -469,11 +569,22 @@ module OpenAI
             end
           end
 
+        if normalized_region.nil? && (bearer_provider.nil? || configured_base_url.nil?)
+          normalized_region = Bedrock.normalize_optional_string(ENV["AWS_REGION"]) ||
+                              Bedrock.normalize_optional_string(ENV["AWS_DEFAULT_REGION"])
+          Bedrock.validate_region!(normalized_region) if normalized_region
+        end
+
+        if configured_base_url
+          Bedrock.validate_canonical_endpoint!(configured_base_url, resolved_endpoint, normalized_region)
+        end
+
         if bearer_provider && configured_base_url.nil? && normalized_region.nil?
           raise ArgumentError, Bedrock::MISSING_REGION_MESSAGE
         end
 
         definition = Bedrock::Definition.new(
+          endpoint: resolved_endpoint,
           region: normalized_region,
           base_url: configured_base_url,
           bearer_provider: bearer_provider,

data/lib/openai/resources/files.rb

@@ -142,7 +142,7 @@ module OpenAI
         )
       end
 
-      # Returns the contents of the specified file.
+      # Returns a response containing the contents of the specified file.
       #
       # @overload content(file_id, request_options: {})
       #

data/lib/openai/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OpenAI
-  VERSION = "0.79.0"
+  VERSION = "0.80.0"
 end

data/lib/openai.rb

@@ -121,7 +121,6 @@ require_relative "openai/models/beta/beta_response_function_call_arguments_delta
 require_relative "openai/models/beta/beta_response_file_search_call_searching_event"
 require_relative "openai/models/beta/beta_response_file_search_call_in_progress_event"
 require_relative "openai/models/beta/beta_response_file_search_call_completed_event"
-require_relative "openai/models/beta/beta_response_error_event"
 require_relative "openai/models/beta/beta_response_created_event"
 require_relative "openai/models/beta/beta_response_content_part_done_event"
 require_relative "openai/models/beta/beta_response_content_part_added_event"
@@ -189,7 +188,6 @@ require_relative "openai/models/responses/response_function_call_arguments_delta
 require_relative "openai/models/responses/response_file_search_call_searching_event"
 require_relative "openai/models/responses/response_file_search_call_in_progress_event"
 require_relative "openai/models/responses/response_file_search_call_completed_event"
-require_relative "openai/models/responses/response_error_event"
 require_relative "openai/models/responses/response_created_event"
 require_relative "openai/models/responses/response_content_part_done_event"
 require_relative "openai/models/responses/response_content_part_added_event"
@@ -464,6 +462,7 @@ require_relative "openai/models/beta/beta_inline_skill"
 require_relative "openai/models/beta/beta_inline_skill_source"
 require_relative "openai/models/beta/beta_local_environment"
 require_relative "openai/models/beta/beta_local_skill"
+require_relative "openai/models/beta/beta_mcp_tool_call_error"
 require_relative "openai/models/beta/beta_namespace_tool"
 require_relative "openai/models/beta/beta_response"
 require_relative "openai/models/beta/beta_response_apply_patch_tool_call"
@@ -480,6 +479,7 @@ require_relative "openai/models/beta/beta_response_conversation_param"
 require_relative "openai/models/beta/beta_response_custom_tool_call_item"
 require_relative "openai/models/beta/beta_response_custom_tool_call_output_item"
 require_relative "openai/models/beta/beta_response_error"
+require_relative "openai/models/beta/beta_response_error_event"
 require_relative "openai/models/beta/beta_response_file_search_tool_call"
 require_relative "openai/models/beta/beta_response_format_text_config"
 require_relative "openai/models/beta/beta_response_format_text_json_schema_config"
@@ -1007,6 +1007,7 @@ require_relative "openai/models/responses/input_token_count_params"
 require_relative "openai/models/responses/input_token_count_response"
 require_relative "openai/models/responses/local_environment"
 require_relative "openai/models/responses/local_skill"
+require_relative "openai/models/responses/mcp_tool_call_error"
 require_relative "openai/models/responses/namespace_tool"
 require_relative "openai/models/responses/response"
 require_relative "openai/models/responses/response_apply_patch_tool_call"
@@ -1027,6 +1028,7 @@ require_relative "openai/models/responses/response_custom_tool_call_item"
 require_relative "openai/models/responses/response_custom_tool_call_output_item"
 require_relative "openai/models/responses/response_delete_params"
 require_relative "openai/models/responses/response_error"
+require_relative "openai/models/responses/response_error_event"
 require_relative "openai/models/responses/response_file_search_tool_call"
 require_relative "openai/models/responses/response_format_text_config"
 require_relative "openai/models/responses/response_format_text_json_schema_config"

data/rbi/openai/models/all_models.rbi

@@ -65,6 +65,16 @@ module OpenAI
             :"computer-use-preview-2025-03-11",
             OpenAI::AllModels::ResponsesOnlyModel::TaggedSymbol
           )
+        GPT_5_5_PRO =
+          T.let(
+            :"gpt-5.5-pro",
+            OpenAI::AllModels::ResponsesOnlyModel::TaggedSymbol
+          )
+        GPT_5_5_PRO_2026_04_23 =
+          T.let(
+            :"gpt-5.5-pro-2026-04-23",
+            OpenAI::AllModels::ResponsesOnlyModel::TaggedSymbol
+          )
         GPT_5_CODEX =
           T.let(
             :"gpt-5-codex",

data/rbi/openai/models/beta/beta_mcp_tool_call_error.rbi

@@ -0,0 +1,122 @@
+# typed: strong
+
+module OpenAI
+  module Models
+    BetaMcpToolCallError = Beta::BetaMcpToolCallError
+
+    module Beta
+      module BetaMcpToolCallError
+        extend OpenAI::Internal::Type::Union
+
+        Variants =
+          T.type_alias do
+            T.any(
+              OpenAI::Beta::BetaMcpToolCallError::McpProtocolError,
+              OpenAI::Beta::BetaMcpToolCallError::McpToolExecutionError,
+              OpenAI::Beta::BetaMcpToolCallError::HTTPError
+            )
+          end
+
+        class McpProtocolError < OpenAI::Internal::Type::BaseModel
+          OrHash =
+            T.type_alias do
+              T.any(
+                OpenAI::Beta::BetaMcpToolCallError::McpProtocolError,
+                OpenAI::Internal::AnyHash
+              )
+            end
+
+          sig { returns(Integer) }
+          attr_accessor :code
+
+          sig { returns(String) }
+          attr_accessor :message
+
+          sig { returns(Symbol) }
+          attr_accessor :type
+
+          sig do
+            params(code: Integer, message: String, type: Symbol).returns(
+              T.attached_class
+            )
+          end
+          def self.new(code:, message:, type: :mcp_protocol_error)
+          end
+
+          sig do
+            override.returns({ code: Integer, message: String, type: Symbol })
+          end
+          def to_hash
+          end
+        end
+
+        class McpToolExecutionError < OpenAI::Internal::Type::BaseModel
+          OrHash =
+            T.type_alias do
+              T.any(
+                OpenAI::Beta::BetaMcpToolCallError::McpToolExecutionError,
+                OpenAI::Internal::AnyHash
+              )
+            end
+
+          sig { returns(T.anything) }
+          attr_accessor :content
+
+          sig { returns(Symbol) }
+          attr_accessor :type
+
+          sig do
+            params(content: T.anything, type: Symbol).returns(T.attached_class)
+          end
+          def self.new(content:, type: :mcp_tool_execution_error)
+          end
+
+          sig { override.returns({ content: T.anything, type: Symbol }) }
+          def to_hash
+          end
+        end
+
+        class HTTPError < OpenAI::Internal::Type::BaseModel
+          OrHash =
+            T.type_alias do
+              T.any(
+                OpenAI::Beta::BetaMcpToolCallError::HTTPError,
+                OpenAI::Internal::AnyHash
+              )
+            end
+
+          sig { returns(Integer) }
+          attr_accessor :code
+
+          sig { returns(String) }
+          attr_accessor :message
+
+          sig { returns(Symbol) }
+          attr_accessor :type
+
+          sig do
+            params(code: Integer, message: String, type: Symbol).returns(
+              T.attached_class
+            )
+          end
+          def self.new(code:, message:, type: :http_error)
+          end
+
+          sig do
+            override.returns({ code: Integer, message: String, type: Symbol })
+          end
+          def to_hash
+          end
+        end
+
+        sig do
+          override.returns(
+            T::Array[OpenAI::Beta::BetaMcpToolCallError::Variants]
+          )
+        end
+        def self.variants
+        end
+      end
+    end
+  end
+end

data/rbi/openai/models/beta/beta_response.rbi

@@ -284,6 +284,10 @@ module OpenAI
         #   Responses or Chat Completions. The response will show `service_tier=priority`
         #   regardless of if you specify `service_tier=fast` or `priority` in your
         #   request.
+        # - If set to 'ultrafast', then the request will be processed with the
+        #   access-controlled Ultrafast Processing service tier. This tier is currently
+        #   available for `gpt-5.6-sol`; a response served through it will show
+        #   `service_tier=ultrafast`.
         # - When not set, the default behavior is 'auto'.
         #
         # When the `service_tier` parameter is set, the response body will include the
@@ -624,6 +628,10 @@ module OpenAI
           #   Responses or Chat Completions. The response will show `service_tier=priority`
           #   regardless of if you specify `service_tier=fast` or `priority` in your
           #   request.
+          # - If set to 'ultrafast', then the request will be processed with the
+          #   access-controlled Ultrafast Processing service tier. This tier is currently
+          #   available for `gpt-5.6-sol`; a response served through it will show
+          #   `service_tier=ultrafast`.
           # - When not set, the default behavior is 'auto'.
           #
           # When the `service_tier` parameter is set, the response body will include the
@@ -881,6 +889,11 @@ module OpenAI
             )
           GPT_5_5 =
             T.let(:"gpt-5.5", OpenAI::Beta::BetaResponse::Model::TaggedSymbol)
+          GPT_5_5_2026_04_23 =
+            T.let(
+              :"gpt-5.5-2026-04-23",
+              OpenAI::Beta::BetaResponse::Model::TaggedSymbol
+            )
           GPT_5_4 =
             T.let(:"gpt-5.4", OpenAI::Beta::BetaResponse::Model::TaggedSymbol)
           GPT_5_4_MINI =
@@ -1274,6 +1287,16 @@ module OpenAI
               :"computer-use-preview-2025-03-11",
               OpenAI::Beta::BetaResponse::Model::TaggedSymbol
             )
+          GPT_5_5_PRO =
+            T.let(
+              :"gpt-5.5-pro",
+              OpenAI::Beta::BetaResponse::Model::TaggedSymbol
+            )
+          GPT_5_5_PRO_2026_04_23 =
+            T.let(
+              :"gpt-5.5-pro-2026-04-23",
+              OpenAI::Beta::BetaResponse::Model::TaggedSymbol
+            )
           GPT_5_CODEX =
             T.let(
               :"gpt-5-codex",
@@ -2448,6 +2471,10 @@ module OpenAI
         #   Responses or Chat Completions. The response will show `service_tier=priority`
         #   regardless of if you specify `service_tier=fast` or `priority` in your
         #   request.
+        # - If set to 'ultrafast', then the request will be processed with the
+        #   access-controlled Ultrafast Processing service tier. This tier is currently
+        #   available for `gpt-5.6-sol`; a response served through it will show
+        #   `service_tier=ultrafast`.
         # - When not set, the default behavior is 'auto'.
         #
         # When the `service_tier` parameter is set, the response body will include the
@@ -2481,6 +2508,11 @@ module OpenAI
             )
           FAST =
             T.let(:fast, OpenAI::Beta::BetaResponse::ServiceTier::TaggedSymbol)
+          ULTRAFAST =
+            T.let(
+              :ultrafast,
+              OpenAI::Beta::BetaResponse::ServiceTier::TaggedSymbol
+            )
 
           sig do
             override.returns(

data/rbi/openai/models/beta/beta_response_input_item.rbi

@@ -4811,7 +4811,17 @@ module OpenAI
           attr_accessor :approval_request_id
 
           # The error from the tool call, if any.
-          sig { returns(T.nilable(String)) }
+          sig do
+            returns(
+              T.nilable(
+                T.any(
+                  OpenAI::Beta::BetaMcpToolCallError::McpProtocolError,
+                  OpenAI::Beta::BetaMcpToolCallError::McpToolExecutionError,
+                  OpenAI::Beta::BetaMcpToolCallError::HTTPError
+                )
+              )
+            )
+          end
           attr_accessor :error
 
           # The output from the tool call.
@@ -4849,7 +4859,14 @@ module OpenAI
                   OpenAI::Beta::BetaResponseInputItem::McpCall::Agent::OrHash
                 ),
               approval_request_id: T.nilable(String),
-              error: T.nilable(String),
+              error:
+                T.nilable(
+                  T.any(
+                    OpenAI::Beta::BetaMcpToolCallError::McpProtocolError::OrHash,
+                    OpenAI::Beta::BetaMcpToolCallError::McpToolExecutionError::OrHash,
+                    OpenAI::Beta::BetaMcpToolCallError::HTTPError::OrHash
+                  )
+                ),
               output: T.nilable(String),
               status:
                 OpenAI::Beta::BetaResponseInputItem::McpCall::Status::OrSymbol,
@@ -4896,7 +4913,14 @@ module OpenAI
                     OpenAI::Beta::BetaResponseInputItem::McpCall::Agent
                   ),
                 approval_request_id: T.nilable(String),
-                error: T.nilable(String),
+                error:
+                  T.nilable(
+                    T.any(
+                      OpenAI::Beta::BetaMcpToolCallError::McpProtocolError,
+                      OpenAI::Beta::BetaMcpToolCallError::McpToolExecutionError,
+                      OpenAI::Beta::BetaMcpToolCallError::HTTPError
+                    )
+                  ),
                 output: T.nilable(String),
                 status:
                   OpenAI::Beta::BetaResponseInputItem::McpCall::Status::OrSymbol

data/rbi/openai/models/beta/beta_response_item.rbi

@@ -2415,7 +2415,17 @@ module OpenAI
           attr_accessor :approval_request_id
 
           # The error from the tool call, if any.
-          sig { returns(T.nilable(String)) }
+          sig do
+            returns(
+              T.nilable(
+                T.any(
+                  OpenAI::Beta::BetaMcpToolCallError::McpProtocolError,
+                  OpenAI::Beta::BetaMcpToolCallError::McpToolExecutionError,
+                  OpenAI::Beta::BetaMcpToolCallError::HTTPError
+                )
+              )
+            )
+          end
           attr_accessor :error
 
           # The output from the tool call.
@@ -2452,7 +2462,14 @@ module OpenAI
                   OpenAI::Beta::BetaResponseItem::McpCall::Agent::OrHash
                 ),
               approval_request_id: T.nilable(String),
-              error: T.nilable(String),
+              error:
+                T.nilable(
+                  T.any(
+                    OpenAI::Beta::BetaMcpToolCallError::McpProtocolError::OrHash,
+                    OpenAI::Beta::BetaMcpToolCallError::McpToolExecutionError::OrHash,
+                    OpenAI::Beta::BetaMcpToolCallError::HTTPError::OrHash
+                  )
+                ),
               output: T.nilable(String),
               status: OpenAI::Beta::BetaResponseItem::McpCall::Status::OrSymbol,
               type: Symbol
@@ -2496,7 +2513,14 @@ module OpenAI
                 agent:
                   T.nilable(OpenAI::Beta::BetaResponseItem::McpCall::Agent),
                 approval_request_id: T.nilable(String),
-                error: T.nilable(String),
+                error:
+                  T.nilable(
+                    T.any(
+                      OpenAI::Beta::BetaMcpToolCallError::McpProtocolError,
+                      OpenAI::Beta::BetaMcpToolCallError::McpToolExecutionError,
+                      OpenAI::Beta::BetaMcpToolCallError::HTTPError
+                    )
+                  ),
                 output: T.nilable(String),
                 status:
                   OpenAI::Beta::BetaResponseItem::McpCall::Status::TaggedSymbol