anthropic 1.61.0 → 1.63.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70039e0b3caf6cf562834b86cb64726a92d6b39b6c51bf25e076d901f1a336bf
-  data.tar.gz: 26532ca157534b56a16276bcc6a9b2dc85c4817bbf2cb83feb05269882be7d03
+  metadata.gz: e9a5ec69ebe4f2fe1d743013098cb879401a601825c244fdb587b36c055ebfc5
+  data.tar.gz: de874bbfc686b83f328bccdc1a95f8a4e5211ad6f73895d4f117ffd9e6faf260
 SHA512:
-  metadata.gz: 0a061ad34ba81ad33b17e46e95c26d57c68660a2323c8f890541f12d13bf657a935ad0de3ceea801d31fb200f7a9f5d92b53f99d31d56cfb7904169bdba37e29
-  data.tar.gz: '08cccc073d696911273fc044c063e0cc9b65391e75f5893fed0593773667ec8449165f143c488c967a9c6507805561177a4354917c4f473ef8cd80f21d87d41a'
+  metadata.gz: 79022be4b042788f7586f77a3ab32f3036bd82733505afbe387aae2f709e3db1de135ab2de906f561915a417aa73c19576c8564c7ba1632e746b620ec358b8e4
+  data.tar.gz: cd8af8f0f3577f4558b8126607b2de05bd994584fe549792af7434eb7b791f25eda4ead4ea583b233b3bf73c2f07ed4f03ebf21338dd55af1a33bee77dd150e5

data/CHANGELOG.md

@@ -1,5 +1,55 @@
 # Changelog
 
+## 1.63.0 (2026-08-18)
+
+Full Changelog: [v1.62.0...v1.63.0](https://github.com/anthropics/anthropic-sdk-ruby/compare/v1.62.0...v1.63.0)
+
+### Features
+
+* **api:** additions to files and memory stores ([f4baf57](https://github.com/anthropics/anthropic-sdk-ruby/commit/f4baf57eaf96b098ec63c895c84c701294583240))
+* **api:** updates to skill, files, and user profiles ([ba0844b](https://github.com/anthropics/anthropic-sdk-ruby/commit/ba0844b290a2036cba7c0a79e500497d48096c5f))
+* **tools:** add `tool_options` to `BaseTool` (strict, cache_control, …) ([#161](https://github.com/anthropics/anthropic-sdk-ruby/issues/161)) ([df278f9](https://github.com/anthropics/anthropic-sdk-ruby/commit/df278f9170ce5ff130433602b18470248dcfa3f4))
+
+
+### Bug Fixes
+
+* **api:** remove unsupported mid_conv_system content block ([687a6da](https://github.com/anthropics/anthropic-sdk-ruby/commit/687a6da56fe9cb85753f6a819d7978580bed61c9))
+* **aws,google_cloud:** adopt the default-credentials hook in the AWS and Google Cloud clients ([#170](https://github.com/anthropics/anthropic-sdk-ruby/issues/170)) ([169fea9](https://github.com/anthropics/anthropic-sdk-ruby/commit/169fea9f5ef8d0798bc0e795e0579eae367939e2))
+* **client:** never fall back to the first-party base URL when default credentials are disabled ([#193](https://github.com/anthropics/anthropic-sdk-ruby/issues/193)) ([b6e9f56](https://github.com/anthropics/anthropic-sdk-ruby/commit/b6e9f562c2872dc5f3ca3a4d6c4025e0e75397d1))
+* **tool-runner:** forward the server-assigned container on follow-up requests ([#189](https://github.com/anthropics/anthropic-sdk-ruby/issues/189)) ([891ac9b](https://github.com/anthropics/anthropic-sdk-ruby/commit/891ac9b8f12234bfe6938086937505e27175df46))
+* **tool-runner:** replay unknown tool_use input verbatim ([#173](https://github.com/anthropics/anthropic-sdk-ruby/issues/173)) ([566a881](https://github.com/anthropics/anthropic-sdk-ruby/commit/566a8817fbe8aad5a25b4111021e39d20451ef03))
+* **tool-runner:** stop on refusal instead of executing tools ([#174](https://github.com/anthropics/anthropic-sdk-ruby/issues/174)) ([4b8d2e4](https://github.com/anthropics/anthropic-sdk-ruby/commit/4b8d2e43265d31b55eb9a6f0d3241b62fa510b2d))
+
+
+### Chores
+
+* **internal:** remove leftover prism references ([5a416d3](https://github.com/anthropics/anthropic-sdk-ruby/commit/5a416d3f2c784d697a8f9fbc99f5620102ea0c84))
+
+## 1.62.0 (2026-08-13)
+
+Full Changelog: [v1.61.0...v1.62.0](https://github.com/anthropics/anthropic-sdk-ruby/compare/v1.61.0...v1.62.0)
+
+### Features
+
+* **api:** add output_behavior to dream creation (create a new memory store or update the input store in place) ([836125f](https://github.com/anthropics/anthropic-sdk-ruby/commit/836125f10cee42677d814fa7bb85f693914c6af9))
+
+
+### Bug Fixes
+
+* **bedrock:** adopt the default-credentials hook in place of the direct base-client bind ([#145](https://github.com/anthropics/anthropic-sdk-ruby/issues/145)) ([e082f28](https://github.com/anthropics/anthropic-sdk-ruby/commit/e082f280846cd00bda4f89b9fb6ad50b4a4a5feb))
+* **client:** accumulate streamed input for server tool use blocks ([#162](https://github.com/anthropics/anthropic-sdk-ruby/issues/162)) ([75382d8](https://github.com/anthropics/anthropic-sdk-ruby/commit/75382d81ebb6b3bedad92749f26e4625d8203097))
+* **client:** add models ([055b440](https://github.com/anthropics/anthropic-sdk-ruby/commit/055b440aa315cf644b08ede51a19f448fab00cbf))
+* **internal:** don't resolve lazy field types when hashing a model class ([#155](https://github.com/anthropics/anthropic-sdk-ruby/issues/155)) ([0a2c06f](https://github.com/anthropics/anthropic-sdk-ruby/commit/0a2c06fcbdb345d751ae0850cac70177cb232d53))
+* **streaming:** apply all message_delta fields when accumulating streamed messages ([#160](https://github.com/anthropics/anthropic-sdk-ruby/issues/160)) ([e537ae2](https://github.com/anthropics/anthropic-sdk-ruby/commit/e537ae23ac5c5701b47812e9062db9c3bd9f29da))
+* **vertex:** don't resolve the shared config store during client init ([#142](https://github.com/anthropics/anthropic-sdk-ruby/issues/142)) ([4108bd4](https://github.com/anthropics/anthropic-sdk-ruby/commit/4108bd4aa3fd3517b51971fdd25f15351bd8f5be))
+
+
+### Documentation
+
+* **api:** clarify that user profile name is optional for resold profiles ([e68fd57](https://github.com/anthropics/anthropic-sdk-ruby/commit/e68fd57357fed4964666d84d011b38873abff02d))
+* **client:** move truncated-docs note below the description in YARD doc blocks ([3db8b94](https://github.com/anthropics/anthropic-sdk-ruby/commit/3db8b9489cd2adb207edbb0165ea11fbacc19db4))
+* fix Symbol typo in RDoc comments ([#163](https://github.com/anthropics/anthropic-sdk-ruby/issues/163)) ([1102732](https://github.com/anthropics/anthropic-sdk-ruby/commit/1102732847ffc02eef9d2c69e233f5e6f56787d8))
+
 ## 1.61.0 (2026-08-07)
 
 Full Changelog: [v1.60.0...v1.61.0](https://github.com/anthropics/anthropic-sdk-ruby/compare/v1.60.0...v1.61.0)

data/README.md

@@ -15,7 +15,7 @@ Add to your application's Gemfile:
 <!-- x-release-please-start-version -->
 
 ```ruby
-gem "anthropic", "~> 1.61.0"
+gem "anthropic", "~> 1.63.0"
 ```
 
 <!-- x-release-please-end -->

data/lib/anthropic/client.rb

@@ -197,7 +197,7 @@ module Anthropic
 
       has_explicit_credential = api_key || auth_token || credentials || config
 
-      unless has_explicit_credential
+      if !has_explicit_credential && resolve_default_credentials?
         api_key = ENV["ANTHROPIC_API_KEY"]
         auth_token = ENV["ANTHROPIC_AUTH_TOKEN"]
       end
@@ -208,7 +208,7 @@ module Anthropic
       @token_cache = nil
 
       base_url_is_explicit = base_url && !base_url.empty?
-      base_url ||= ENV["ANTHROPIC_BASE_URL"]
+      base_url ||= ENV["ANTHROPIC_BASE_URL"] if resolve_default_credentials?
 
       credential_headers = {}
 
@@ -223,7 +223,7 @@ module Anthropic
         @credentials = credentials
       end
 
-      if @credentials.nil? && @api_key.nil? && @auth_token.nil?
+      if @credentials.nil? && @api_key.nil? && @auth_token.nil? && resolve_default_credentials?
         default_base_url = base_url || "https://api.anthropic.com"
         result = Anthropic::Credentials.default_credentials(base_url: default_base_url)
         if result
@@ -234,13 +234,20 @@ module Anthropic
       end
 
       warn_explicit_shadow(api_key: api_key, auth_token: auth_token, credentials: credentials || config)
-      warn_env_shadow(api_key: api_key, auth_token: auth_token)
+      warn_env_shadow(api_key: api_key, auth_token: auth_token) if resolve_default_credentials?
 
       if @credentials
         @token_cache = Anthropic::Credentials::TokenCache.new(@credentials)
       end
 
-      base_url ||= "https://api.anthropic.com"
+      if resolve_default_credentials?
+        base_url ||= "https://api.anthropic.com"
+      elsif base_url.to_s.empty?
+        raise ArgumentError.new(
+          "No base_url was resolved for #{self.class.name}; " \
+          "platform clients must supply their own endpoint."
+        )
+      end
 
       if @credentials.respond_to?(:bind_base_url)
         @credentials.bind_base_url(base_url)
@@ -295,6 +302,23 @@ module Anthropic
 
     private
 
+    # @api private
+    #
+    # Whether to resolve credentials from the default chain (the static
+    # +ANTHROPIC_API_KEY+ / +ANTHROPIC_AUTH_TOKEN+ env vars and the shared
+    # config store / federation auto-discovery, precedence steps 2–5 above)
+    # when no explicit credential argument is passed. Called once from
+    # {#initialize}, so overrides must not depend on subclass instance state.
+    # Subclasses that bring their own auth scheme override this to +false+ so
+    # ambient first-party credentials are never resolved or folded into
+    # requests bound for another platform's endpoint. Returning +false+ also
+    # withholds the +ANTHROPIC_BASE_URL+ / +https://api.anthropic.com+
+    # base-URL fallback, so such a subclass must pass its own +base_url+ or
+    # {#initialize} raises +ArgumentError+.
+    #
+    # @return [Boolean]
+    def resolve_default_credentials? = true
+
     def warn_explicit_shadow(api_key:, auth_token:, credentials:)
       return if credentials.nil?
 

data/lib/anthropic/errors.rb

@@ -60,6 +60,12 @@ module Anthropic
       # @return [Object, nil]
       attr_accessor :body
 
+      # @return [String, nil]
+      def request_id = headers&.[]("request-id")
+
+      # @return [String, nil]
+      def workspace_id = headers&.[]("anthropic-workspace-id")
+
       # @api private
       #
       # @param url [URI::Generic]

data/lib/anthropic/helpers/aws/client.rb

@@ -53,7 +53,7 @@ module Anthropic
         #
         # @param max_retry_delay [Float]
         #
-        def initialize( # rubocop:disable Lint/MissingSuper
+        def initialize(
           api_key: nil,
           aws_access_key: nil,
           aws_secret_access_key: nil,
@@ -84,27 +84,19 @@ module Anthropic
             derive_base_url: ->(region) { "https://aws-external-anthropic.#{region}.api.aws" }
           )
 
-          @api_key = effective_api_key
-          @auth_token = nil
-          @credentials = nil
-          @token_cache = nil
-
-          # Skip Anthropic::Client#initialize and bind BaseClient#initialize directly:
-          # the parent's initializer runs OIDC/credential-provider resolution that does
-          # not apply here.
-          Anthropic::Internal::Transport::BaseClient.instance_method(:initialize).bind(self).call(
+          # In API-key mode the gateway key rides the base client's `api_key`
+          # slot; {#resolve_default_credentials?} keeps first-party credential
+          # auto-discovery out of the picture when it is absent. The gateway
+          # serves the full first-party API, so every resource the parent wires
+          # up stays available.
+          super(
+            api_key: effective_api_key,
             base_url: resolved_base_url,
             timeout: timeout,
             max_retries: max_retries,
             initial_retry_delay: initial_retry_delay,
-            max_retry_delay: max_retry_delay,
-            headers: {"anthropic-version" => "2023-06-01"}
+            max_retry_delay: max_retry_delay
           )
-
-          @completions = Anthropic::Resources::Completions.new(client: self)
-          @messages = Anthropic::Resources::Messages.new(client: self)
-          @models = Anthropic::Resources::Models.new(client: self)
-          @beta = Anthropic::Resources::Beta.new(client: self)
         end
 
         # @api private

data/lib/anthropic/helpers/aws_auth.rb

@@ -44,6 +44,7 @@ module Anthropic
         use_bearer_auth: false
       )
         @use_bearer_auth = use_bearer_auth
+        base_url = nil if base_url.to_s.empty?
         begin
           require("aws-sdk-core")
         rescue LoadError
@@ -119,12 +120,12 @@ module Anthropic
           end
         end
 
-        if base_url.nil? && !aws_region.to_s.empty?
+        if !base_url && !aws_region.to_s.empty?
           @aws_region ||= aws_region
           base_url = derive_base_url.call(aws_region)
         end
 
-        if base_url.nil?
+        unless base_url
           # rubocop:disable Layout/LineLength
           raise ArgumentError.new("No base_url was given and no aws_region is available to derive one. Set the `base_url` argument or provide an `aws_region`.")
           # rubocop:enable Layout/LineLength
@@ -147,6 +148,16 @@ module Anthropic
         super
       end
 
+      # @api private
+      #
+      # AWS-authenticated clients never resolve ambient first-party
+      # credentials, which would fold the shared config store's headers and
+      # bearer into requests bound for a third-party endpoint.
+      #
+      # @return [Boolean]
+      # @see Anthropic::Client#resolve_default_credentials?
+      private def resolve_default_credentials? = false
+
       # The AWS provider middleware entry: applies the workspace-id header and
       # SigV4 signing per attempt. Return from the including class's
       # `provider_middleware`. Pure — requests are reused across retry

data/lib/anthropic/helpers/bedrock/client.rb

@@ -60,7 +60,7 @@ module Anthropic
         #   the Bedrock URL rewrite and SigV4 signing happen inside the continuation, per
         #   attempt.
         #
-        def initialize( # rubocop:disable Lint/MissingSuper
+        def initialize(
           aws_region: nil,
           base_url: nil,
           max_retries: self.class::DEFAULT_MAX_RETRIES,
@@ -121,36 +121,38 @@ module Anthropic
             @aws_region = aws_region
           end
 
-          base_url ||= ENV.fetch(
-            "ANTHROPIC_BEDROCK_BASE_URL",
-            "https://bedrock-runtime.#{@aws_region}.amazonaws.com"
-          )
+          base_url = ENV["ANTHROPIC_BEDROCK_BASE_URL"] if base_url.to_s.empty?
+          base_url = "https://bedrock-runtime.#{@aws_region}.amazonaws.com" if base_url.to_s.empty?
 
-          @api_key = nil
-          @auth_token = @signer ? nil : api_key
-          @credentials = nil
-          @token_cache = nil
           # For AWSAuth#auth_headers: suppress key headers in SigV4 mode; in
           # API-key mode fall through to the base bearer-token handling.
           @use_sig_v4 = !@signer.nil?
           @use_bearer_auth = false
 
-          # Skip Anthropic::Client#initialize and bind BaseClient#initialize directly:
-          # the parent's initializer runs OIDC/credential-provider resolution that does
-          # not apply here.
-          Anthropic::Internal::Transport::BaseClient.instance_method(:initialize).bind(self).call(
+          # The Bedrock bearer rides the base client's `auth_token` slot;
+          # {#resolve_default_credentials?} keeps first-party credential
+          # auto-discovery out of the picture when it is absent.
+          super(
+            auth_token: @signer ? nil : api_key,
             base_url: base_url,
             timeout: timeout,
             max_retries: max_retries,
             initial_retry_delay: initial_retry_delay,
             max_retry_delay: max_retry_delay,
-            headers: {"anthropic-version" => "2023-06-01"},
             middleware: middleware
           )
+        end
 
-          @messages = Anthropic::Resources::Messages.new(client: self)
-          @completions = Anthropic::Resources::Completions.new(client: self)
-          @beta = Anthropic::Resources::Beta.new(client: self)
+        # The Models API is not available on Bedrock, so the resource the
+        # parent wires up would target routes the Bedrock host does not serve
+        # — keep it unavailable, matching the SDK's other Bedrock clients.
+        #
+        # @raise [NotImplementedError]
+        def models
+          # rubocop:disable Layout/LineLength
+          message = "Please instead use https://docs.anthropic.com/en/api/claude-on-amazon-bedrock#list-available-models to list available models on Bedrock."
+          # rubocop:enable Layout/LineLength
+          raise NotImplementedError.new(message)
         end
 
         # @api private

data/lib/anthropic/helpers/google_cloud/client.rb

@@ -31,15 +31,6 @@ module Anthropic
         # @return [String, nil]
         attr_reader :workspace_id
 
-        # @return [Anthropic::Resources::Messages]
-        attr_reader :messages
-
-        # @return [Anthropic::Resources::Models]
-        attr_reader :models
-
-        # @return [Anthropic::Resources::Beta]
-        attr_reader :beta
-
         # Creates a new client for the Anthropic API on the Google Cloud gateway.
         #
         # Authentication uses Google credentials by precedence (unless
@@ -95,7 +86,7 @@ module Anthropic
         #   is applied per attempt, after user middleware.
         #
         # @raise [ArgumentError]
-        def initialize( # rubocop:disable Lint/MissingSuper
+        def initialize(
           project: ENV["ANTHROPIC_GOOGLE_CLOUD_PROJECT"] || ENV["GOOGLE_CLOUD_PROJECT"],
           location: ENV["ANTHROPIC_GOOGLE_CLOUD_LOCATION"] || "global",
           workspace_id: ENV["ANTHROPIC_GOOGLE_CLOUD_WORKSPACE_ID"],
@@ -144,33 +135,31 @@ module Anthropic
           end
           @workspace_id = workspace_id
 
-          base_url = derive_base_url if base_url.nil?
-
-          # Never inherit first-party Anthropic credentials from the
-          # environment: clear the ivars `Anthropic::Client#auth_headers` reads,
-          # and bind `BaseClient#initialize` directly so the parent's
-          # credential-provider / `ANTHROPIC_BASE_URL` resolution is skipped
-          # entirely.
-          @api_key = nil
-          @auth_token = nil
-          @credentials = nil
-          @token_cache = nil
+          base_url = nil if base_url.to_s.empty?
+          base_url ||= derive_base_url
 
-          Anthropic::Internal::Transport::BaseClient.instance_method(:initialize).bind(self).call(
+          # No first-party credential is ever passed up, and
+          # {#resolve_default_credentials?} keeps the parent from discovering
+          # one; `base_url` is always resolved by this point, so the parent's
+          # `ANTHROPIC_BASE_URL` fallback never applies. The parent wires up
+          # every resource; {#completions} withholds the one the gateway does
+          # not serve.
+          super(
             base_url: base_url,
             timeout: timeout,
             max_retries: max_retries,
             initial_retry_delay: initial_retry_delay,
             max_retry_delay: max_retry_delay,
-            headers: {"anthropic-version" => "2023-06-01"},
             middleware: middleware
           )
-
-          @messages = Anthropic::Resources::Messages.new(client: self)
-          @models = Anthropic::Resources::Models.new(client: self)
-          @beta = Anthropic::Resources::Beta.new(client: self)
         end
 
+        # @api private
+        #
+        # @return [Boolean]
+        # @see Anthropic::Client#resolve_default_credentials?
+        private def resolve_default_credentials? = false
+
         # The deprecated text Completions endpoint is not supported on the
         # Google Cloud gateway.
         #

data/lib/anthropic/helpers/messages.rb

@@ -9,7 +9,7 @@ module Anthropic
         # Extract tool models from the request and convert them to JSON Schema
         # Returns a hash mapping tool name to Ruby model.
         #
-        # @param data [Hash{Sybmol=>Object}]
+        # @param data [Hash{Symbol=>Object}]
         #
         # @param strict [Boolean, nil]
         #
@@ -38,26 +38,27 @@ module Anthropic
             # rubocop:disable Metrics/BlockLength
             mapped = tool_array.map do |tool|
               case tool
-              # BaseTool whose class declares an explicit `tool_name` (e.g. MCP-built tools):
-              in Anthropic::Helpers::Tools::BaseTool if tool.class.tool_name
+              # Runnable tool instance (an `Anthropic::BaseTool` subclass, hand-written or helper-built):
+              in Anthropic::Helpers::Tools::BaseTool
                 name = tool_api_name(tool)
+                # Helper-built tools (e.g. MCP) declare an explicit `tool_name` and only send the
+                # description they were given; hand-written tools fall back to their name.
                 description = tool.class.doc_string
+                description ||= name unless tool.class.tool_name
                 tools.store(name, tool)
                 input_schema = Anthropic::Helpers::InputSchema::JsonSchemaConverter.to_json_schema(tool)
-                extras = tool.class.tool_extra_props || {}
-                result = {name:, input_schema:, **extras}
-                result[:description] = description if description
-                result[:strict] = strict if strict
-                result
-              # Direct tool class:
+                # On a clash the derived keys win, so nothing in `tool_options` can shadow them.
+                definition =
+                  {name:, description:, input_schema:}
+                  .merge(tool.class.tool_options) { |_key, derived, _option| derived }
+                  .compact
+                definition.tap { _1.update(strict:) if strict }
+              # Input schema class used directly as a tool:
               in Anthropic::Helpers::InputSchema::JsonSchemaConverter
-                name =
-                  tool.is_a?(Anthropic::Helpers::Tools::BaseTool) ? tool_api_name(tool) : model_name(tool.name)
+                name = model_name(tool.name)
 
                 description =
                   case tool
-                  in Anthropic::Helpers::Tools::BaseTool
-                    tool.class.doc_string || name
                   in Class if tool <= Anthropic::Helpers::InputSchema::BaseModel
                     tool.doc_string || name
                   else
@@ -82,6 +83,11 @@ module Anthropic
             end
             # rubocop:enable Metrics/BlockLength
             tool_array.replace(mapped)
+          else
+          end
+
+          # Matched separately from `tools:` so a request can carry both tools and a structured output format.
+          case data
           # GA: output_config with BaseModel class as format
           in {output_config: {format: Anthropic::Helpers::InputSchema::JsonSchemaConverter => model} => output_config}
             name = model_name(model.name)
@@ -128,13 +134,13 @@ module Anthropic
 
         # @api private
         #
-        # @param raw [Hash{Sybmol=>Object}]
+        # @param raw [Hash{Symbol=>Object}]
         #
         # @param tools [Hash{String=>Class}]
         #
         # @param models [Hash{String=>Class}]
         #
-        # @return [Hash{Sybmol=>Object}]
+        # @return [Hash{Symbol=>Object}]
         def parse_input_schemas!(raw, tools:, models:)
           raw[:content]&.each do |content|
             case content

data/lib/anthropic/helpers/streaming/message_stream.rb

@@ -123,12 +123,14 @@ module Anthropic
             case (delta = event.delta)
             in Anthropic::Models::TextDelta | Anthropic::Models::BetaTextDelta if content.type == :text
               content.text += delta.text
-            in Anthropic::Models::InputJSONDelta | Anthropic::Models::BetaInputJSONDelta if content.type == :tool_use
-              json_buf = content._json_buf.to_s
+            in Anthropic::Models::InputJSONDelta | Anthropic::Models::BetaInputJSONDelta if tracks_tool_input?(content)
+              # `input` itself is the partial-JSON buffer mid-stream: it starts as the
+              # `{}` placeholder from content_block_start and holds the raw String once
+              # the first delta lands (server/MCP tool blocks have no `_json_buf`).
+              json_buf = content.input.is_a?(String) ? content.input : ""
               json_buf += delta.partial_json
 
               content.input = json_buf
-              content._json_buf = json_buf
             in Anthropic::Models::CitationsDelta | Anthropic::Models::BetaCitationsDelta if content.type == :text
               content.citations ||= []
               content.citations << delta.citation
@@ -147,7 +149,7 @@ module Anthropic
             # finished block must carry the decoded object, as in the non-streaming
             # message and the other SDKs' accumulators.
             case current_snapshot.content[event.index]
-            in {type: :tool_use, input: String => raw} => content
+            in {input: String => raw} => content if tracks_tool_input?(content)
               begin
                 content.input = decode_tool_use_input(raw)
               rescue JSON::ParserError
@@ -156,9 +158,15 @@ module Anthropic
             else
             end
           in Anthropic::Models::RawMessageDeltaEvent | Anthropic::Models::BetaRawMessageDeltaEvent
-            current_snapshot.stop_reason = event.delta.stop_reason
-            current_snapshot.stop_sequence = event.delta.stop_sequence
+            # message_start already seeds the null placeholders for these, and the
+            # generated setters cannot take a nil, so skip the ones the event omits.
+            current_snapshot.stop_reason = event.delta.stop_reason unless event.delta.stop_reason.nil?
+            current_snapshot.stop_sequence = event.delta.stop_sequence unless event.delta.stop_sequence.nil?
             current_snapshot.stop_details = event.delta.stop_details unless event.delta.stop_details.nil?
+
+            # Only reported once a container actually ran, and never on message_start.
+            current_snapshot.container = event.delta.container unless event.delta.container.nil?
+
             current_snapshot.usage.output_tokens = event.usage.output_tokens
 
             # The message_delta usage is authoritative for the final counts; carry every
@@ -176,6 +184,9 @@ module Anthropic
             unless event.usage.server_tool_use.nil?
               current_snapshot.usage.server_tool_use = event.usage.server_tool_use
             end
+            unless event.usage.output_tokens_details.nil?
+              current_snapshot.usage.output_tokens_details = event.usage.output_tokens_details
+            end
 
             if event.is_a?(Anthropic::Models::BetaRawMessageDeltaEvent)
               unless event.usage.iterations.nil?
@@ -184,6 +195,10 @@ module Anthropic
               unless event.usage.fallback_credit.nil?
                 current_snapshot.usage.fallback_credit = event.usage.fallback_credit
               end
+              # Applied context-management edits ride on the event, not on `delta`.
+              unless event.context_management.nil?
+                current_snapshot.context_management = event.context_management
+              end
             end
           else
           end
@@ -222,7 +237,7 @@ module Anthropic
                 text: delta.text,
                 snapshot: content_block.text
               )
-            in Anthropic::Models::InputJSONDelta | Anthropic::Models::BetaInputJSONDelta if content_block.type == :tool_use
+            in Anthropic::Models::InputJSONDelta | Anthropic::Models::BetaInputJSONDelta if tracks_tool_input?(content_block)
               events_to_yield << Anthropic::Streaming::InputJsonEvent.new(
                 type: :input_json,
                 partial_json: delta.partial_json,
@@ -269,7 +284,21 @@ module Anthropic
 
         # @api private
         #
-        # Decodes a tool_use block's buffered partial-JSON input. An empty buffer
+        # Content block types whose `input` streams in as input_json_delta events.
+        TOOL_INPUT_BLOCK_TYPES = [:tool_use, :server_tool_use, :mcp_tool_use].freeze
+
+        # @api private
+        #
+        # @param content_block [Object]
+        #
+        # @return [Boolean]
+        private def tracks_tool_input?(content_block)
+          TOOL_INPUT_BLOCK_TYPES.include?(content_block.type)
+        end
+
+        # @api private
+        #
+        # Decodes a tool-use block's buffered partial-JSON input. An empty buffer
         # means a no-argument tool call, which the wire encodes as an empty object.
         #
         # @param raw [String]

data/lib/anthropic/helpers/tools/base_tool.rb

@@ -25,15 +25,6 @@ module Anthropic
           # @return [String, nil]
           attr_accessor :tool_name
 
-          # @api private
-          #
-          # Extra tool-definition properties merged into the API payload (e.g.
-          # `cache_control`, `defer_loading`, `allowed_callers`, `eager_input_streaming`,
-          # `input_examples`, `strict`).
-          #
-          # @return [Hash{Symbol=>Object}, nil]
-          attr_accessor :tool_extra_props
-
           # @api public
           #
           # @param description [String]
@@ -46,10 +37,78 @@ module Anthropic
           # @model [Class<Anthropic::Helpers::InputSchema::BaseModel>]
           def input_schema(model) = (@model = model)
 
+          # @api public
+          #
+          # Declares additional properties for this tool's API definition, sent alongside the
+          # `name`, `description` and `input_schema` — e.g. `strict`, `cache_control`,
+          # `defer_loading`, `allowed_callers`, `eager_input_streaming` or `input_examples`.
+          #
+          # Options accumulate: each call merges into what was already declared, and a subclass
+          # starts from its superclass's options. Called without an argument, returns the declared
+          # options as a frozen hash.
+          #
+          # @example
+          #   class GetWeather < Anthropic::BaseTool
+          #     doc "Get the current weather in a given location"
+          #     input_schema GetWeatherInput
+          #     tool_options strict: true, cache_control: {type: :ephemeral}
+          #   end
+          #
+          # @param options [Hash{Symbol=>Object}, nil]
+          #
+          # @return [Hash{Symbol=>Object}]
+          def tool_options(options = nil)
+            if options.nil?
+              return @tool_options if @tool_options
+
+              # Nothing declared on this class: read through to the superclass (`BaseTool` has none).
+              return superclass.respond_to?(:tool_options) ? superclass.tool_options : {}.freeze
+            end
+
+            options = Anthropic::Internal::Util.coerce_hash!(options).to_h.transform_keys(&:to_sym)
+            # These either have their own declaration or are derived from the class; letting them
+            # through would desync the definition sent to the API from how responses are parsed.
+            reserved = options.keys & [:name, :description, :input_schema]
+            unless reserved.empty?
+              message =
+                "#{reserved.map { "`#{_1}`" }.join(', ')} cannot be set through `tool_options`; " \
+                "use `doc` and `input_schema` instead (the tool name is derived from the class name)."
+              raise ArgumentError.new(message)
+            end
+
+            # Frozen so the stored declaration can't drift from what was validated above.
+            @tool_options = Anthropic::Internal::Util.deep_frozen_copy(tool_options.merge(options))
+          end
+
+          # @api private
+          #
+          # @deprecated Use {.tool_options}.
+          #
+          # @return [Hash{Symbol=>Object}]
+          def tool_extra_props = tool_options
+
+          # @api private
+          #
+          # @deprecated Use {.tool_options}.
+          #
+          # @param props [Hash{Symbol=>Object}, nil]
+          def tool_extra_props=(props)
+            warn(
+              "[DEPRECATION] `tool_extra_props=` is deprecated. Use `tool_options` instead.",
+              category: :deprecated
+            )
+            tool_options(props.to_h)
+          end
+
           # @api private
           #
           # @param depth [Integer]
-          def inspect(depth: 0) = "#{name}[#{model.inspect(depth:)}]"
+          def inspect(depth: 0)
+            # Only hand-written tools carry an input schema class here; helper-built tools (e.g. MCP)
+            # hold a plain class and an undeclared schema is nil, neither of which takes `depth:`.
+            schema = model.is_a?(Anthropic::Internal::Type::Converter) ? model.inspect(depth:) : model.inspect
+            "#{name || tool_name}[#{schema}]"
+          end
         end
 
         # @api private