diff --git a/.castiron.stats.yml b/.castiron.stats.yml
index 944ef561cc..dd2bfde9ac 100644
--- a/.castiron.stats.yml
+++ b/.castiron.stats.yml
@@ -1,8 +1,8 @@
 schema_version: 1
-generation_id: feaf88e6-0c6a-4d57-95a5-0bcc23d7105c
-openapi_spec_hash: ce912f79d7f8cb19a7a515513c214b8a
-openapi_transformed_spec_hash: 352b5a7a028f990b6475b6593e381eee
-config_hash: dde98d9c41cd6f4163320f92c70f83e6
-codegen_sha: 799a1f4d5f6b415088641ca4d3bbb804443ec30e
+generation_id: ee9a257e-a4d5-4c9a-bf6a-f9df17b53e41
+openapi_spec_hash: 5c26285174e711e586fae95a3c1ed44f
+openapi_transformed_spec_hash: 7d604cff905e5ee4218b494eb1061d68
+config_hash: 2e863561988451a51170e448529869da
+codegen_sha: 06c06212122c9dbc32c74d04adbcc321809dacce
 codegen_hash: 7d4da50897149f4eab2fa63ac3dbc972694c6dfeb79a01531da408010bff5dcd
-public_codegen_sha: 4b121f228fc198913ea2a56404f38d8f18ca0e86
+public_codegen_sha: dae207230871f9087a3a2eb584a7c2ce65010475
diff --git a/api_reference/openapi.transformed.yml b/api_reference/openapi.transformed.yml
index 30f3e65810..3e67b9565c 100644
--- a/api_reference/openapi.transformed.yml
+++ b/api_reference/openapi.transformed.yml
@@ -41923,6 +41923,10 @@ components:
     FunctionAndCustomToolCallOutput:
       discriminator:
         propertyName: type
+        mapping:
+          input_text: '#/components/schemas/InputTextContent'
+          input_image: '#/components/schemas/InputImageContent'
+          input_file: '#/components/schemas/InputFileContent'
       anyOf:
       - $ref: '#/components/schemas/InputTextContent'
       - $ref: '#/components/schemas/InputImageContent'
@@ -62793,6 +62797,8 @@ components:
         A tool that can be used to generate a response.
       discriminator:
         propertyName: type
+        mapping:
+          apply_patch: '#/components/schemas/ApplyPatchToolParam'
       anyOf:
       - $ref: '#/components/schemas/FunctionTool'
       - $ref: '#/components/schemas/FileSearchTool'
@@ -62800,10 +62806,30 @@ components:
       - $ref: '#/components/schemas/ComputerUsePreviewTool'
       - $ref: '#/components/schemas/WebSearchTool'
       - $ref: '#/components/schemas/MCPTool'
+        x-stainless-variantName: mcp
+        x-stainless-naming:
+          python:
+            type_name: Mcp
       - $ref: '#/components/schemas/CodeInterpreterTool'
+        x-stainless-variantName: code_interpreter
+        x-stainless-naming:
+          python:
+            type_name: CodeInterpreter
       - $ref: '#/components/schemas/ProgrammaticToolCallingParam'
+        x-stainless-variantName: programmatic_tool_calling
+        x-stainless-naming:
+          python:
+            type_name: ProgrammaticToolCalling
       - $ref: '#/components/schemas/ImageGenTool'
+        x-stainless-variantName: image_generation
+        x-stainless-naming:
+          python:
+            type_name: ImageGeneration
       - $ref: '#/components/schemas/LocalShellToolParam'
+        x-stainless-variantName: local_shell
+        x-stainless-naming:
+          python:
+            type_name: LocalShell
       - $ref: '#/components/schemas/FunctionShellToolParam'
       - $ref: '#/components/schemas/CustomToolParam'
       - $ref: '#/components/schemas/NamespaceToolParam'
@@ -84377,6 +84403,8 @@ components:
         A tool that can be used to generate a response.
       discriminator:
         propertyName: type
+        mapping:
+          apply_patch: '#/components/schemas/BetaApplyPatchToolParam'
       anyOf:
       - $ref: '#/components/schemas/BetaFunctionTool'
       - $ref: '#/components/schemas/BetaFileSearchTool'
@@ -84384,10 +84412,30 @@ components:
       - $ref: '#/components/schemas/BetaComputerUsePreviewTool'
       - $ref: '#/components/schemas/BetaWebSearchTool'
       - $ref: '#/components/schemas/BetaMCPTool'
+        x-stainless-variantName: mcp
+        x-stainless-naming:
+          python:
+            type_name: Mcp
       - $ref: '#/components/schemas/BetaCodeInterpreterTool'
+        x-stainless-variantName: code_interpreter
+        x-stainless-naming:
+          python:
+            type_name: CodeInterpreter
       - $ref: '#/components/schemas/BetaProgrammaticToolCallingParam'
+        x-stainless-variantName: programmatic_tool_calling
+        x-stainless-naming:
+          python:
+            type_name: ProgrammaticToolCalling
       - $ref: '#/components/schemas/BetaImageGenTool'
+        x-stainless-variantName: image_generation
+        x-stainless-naming:
+          python:
+            type_name: ImageGeneration
       - $ref: '#/components/schemas/BetaLocalShellToolParam'
+        x-stainless-variantName: local_shell
+        x-stainless-naming:
+          python:
+            type_name: LocalShell
       - $ref: '#/components/schemas/BetaFunctionShellToolParam'
       - $ref: '#/components/schemas/BetaCustomToolParam'
       - $ref: '#/components/schemas/BetaNamespaceToolParam'
@@ -86012,6 +86060,10 @@ components:
     BetaFunctionAndCustomToolCallOutput:
       discriminator:
         propertyName: type
+        mapping:
+          input_text: '#/components/schemas/BetaInputTextContent'
+          input_image: '#/components/schemas/BetaInputImageContent'
+          input_file: '#/components/schemas/BetaInputFileContent'
       anyOf:
       - $ref: '#/components/schemas/BetaInputTextContent'
       - $ref: '#/components/schemas/BetaInputImageContent'