feature #737 [Platform] Make ToolCall properties private with getters (OskarStark)

OskarStark · OskarStark · commit 7e666ea9e6ed · 2025-10-06T22:25:18.000+02:00
This PR was squashed before being merged into the main branch. Discussion ---------- [Platform] Make `ToolCall` properties private with getters | Q | A | ------------- | --- | Bug fix? | no | New feature? | yes | Docs? | no | Issues | -- | License | MIT Commits ------- 620d62a [Platform] Make `ToolCall` properties private with getters
diff --git a/examples/toolbox/weather-event.php b/examples/toolbox/weather-event.php
@@ -33,7 +33,7 @@
 // Add tool call result listener to enforce chain exits direct with structured response for weather tools
 $eventDispatcher->addListener(ToolCallsExecuted::class, function (ToolCallsExecuted $event): void {
     foreach ($event->toolResults as $toolCallResult) {
-        if (str_starts_with($toolCallResult->toolCall->name, 'weather_')) {
+        if (str_starts_with($toolCallResult->toolCall->getName(), 'weather_')) {
             $event->result = new ObjectResult($toolCallResult->result);
         }
     }
diff --git a/src/agent/src/Toolbox/Exception/ToolExecutionException.php b/src/agent/src/Toolbox/Exception/ToolExecutionException.php
@@ -22,14 +22,14 @@ final class ToolExecutionException extends \RuntimeException implements ToolExec
 
     public static function executionFailed(ToolCall $toolCall, \Throwable $previous): self
     {
-        $exception = new self(\sprintf('Execution of tool "%s" failed with error: %s', $toolCall->name, $previous->getMessage()), previous: $previous);
+        $exception = new self(\sprintf('Execution of tool "%s" failed with error: %s', $toolCall->getName(), $previous->getMessage()), previous: $previous);
         $exception->toolCall = $toolCall;
 
         return $exception;
     }
 
     public function getToolCallResult(): string
     {
-        return \sprintf('An error occurred while executing tool "%s".', $this->toolCall->name);
+        return \sprintf('An error occurred while executing tool "%s".', $this->toolCall->getName());
     }
 }
diff --git a/src/agent/src/Toolbox/Exception/ToolNotFoundException.php b/src/agent/src/Toolbox/Exception/ToolNotFoundException.php
@@ -23,7 +23,7 @@ final class ToolNotFoundException extends \RuntimeException implements Exception
 
     public static function notFoundForToolCall(ToolCall $toolCall): self
     {
-        $exception = new self(\sprintf('Tool not found for call: %s.', $toolCall->name));
+        $exception = new self(\sprintf('Tool not found for call: %s.', $toolCall->getName()));
         $exception->toolCall = $toolCall;
 
         return $exception;
diff --git a/src/agent/src/Toolbox/FaultTolerantToolbox.php b/src/agent/src/Toolbox/FaultTolerantToolbox.php
@@ -42,7 +42,7 @@ public function execute(ToolCall $toolCall): mixed
         } catch (ToolNotFoundException) {
             $names = array_map(fn (Tool $metadata) => $metadata->name, $this->getTools());
 
-            return \sprintf('Tool "%s" was not found, please use one of these: %s', $toolCall->name, implode(', ', $names));
+            return \sprintf('Tool "%s" was not found, please use one of these: %s', $toolCall->getName(), implode(', ', $names));
         }
     }
 }
diff --git a/src/agent/src/Toolbox/ToolCallArgumentResolver.php b/src/agent/src/Toolbox/ToolCallArgumentResolver.php
@@ -50,14 +50,14 @@ public function resolveArguments(Tool $metadata, ToolCall $toolCall): array
         $arguments = [];
 
         foreach ($parameters as $name => $reflectionParameter) {
-            if (!\array_key_exists($name, $toolCall->arguments)) {
+            if (!\array_key_exists($name, $toolCall->getArguments())) {
                 if (!$reflectionParameter->isOptional()) {
-                    throw new ToolException(\sprintf('Parameter "%s" is mandatory for tool "%s".', $name, $toolCall->name));
+                    throw new ToolException(\sprintf('Parameter "%s" is mandatory for tool "%s".', $name, $toolCall->getName()));
                 }
                 continue;
             }
 
-            $value = $toolCall->arguments[$name];
+            $value = $toolCall->getArguments()[$name];
             $parameterType = $this->typeResolver->resolve($reflectionParameter);
             $dimensions = '';
             while ($parameterType instanceof CollectionType) {
diff --git a/src/agent/src/Toolbox/Toolbox.php b/src/agent/src/Toolbox/Toolbox.php
@@ -78,7 +78,7 @@ public function execute(ToolCall $toolCall): mixed
         $tool = $this->getExecutable($metadata);
 
         try {
-            $this->logger->debug(\sprintf('Executing tool "%s".', $toolCall->name), $toolCall->arguments);
+            $this->logger->debug(\sprintf('Executing tool "%s".', $toolCall->getName()), $toolCall->getArguments());
 
             $arguments = $this->argumentResolver->resolveArguments($metadata, $toolCall);
             $this->eventDispatcher?->dispatch(new ToolCallArgumentsResolved($tool, $metadata, $arguments));
@@ -88,7 +88,7 @@ public function execute(ToolCall $toolCall): mixed
             $this->eventDispatcher?->dispatch(new ToolCallFailed($tool, $metadata, $arguments ?? [], $e));
             throw $e;
         } catch (\Throwable $e) {
-            $this->logger->warning(\sprintf('Failed to execute tool "%s".', $toolCall->name), ['exception' => $e]);
+            $this->logger->warning(\sprintf('Failed to execute tool "%s".', $toolCall->getName()), ['exception' => $e]);
             $this->eventDispatcher?->dispatch(new ToolCallFailed($tool, $metadata, $arguments ?? [], $e));
             throw ToolExecutionException::executionFailed($toolCall, $e);
         }
@@ -99,7 +99,7 @@ public function execute(ToolCall $toolCall): mixed
     private function getMetadata(ToolCall $toolCall): Tool
     {
         foreach ($this->getTools() as $metadata) {
-            if ($metadata->name === $toolCall->name) {
+            if ($metadata->name === $toolCall->getName()) {
                 return $metadata;
             }
         }
diff --git a/src/platform/src/Bridge/Anthropic/Contract/AssistantMessageNormalizer.php b/src/platform/src/Bridge/Anthropic/Contract/AssistantMessageNormalizer.php
@@ -46,9 +46,9 @@ public function normalize(mixed $data, ?string $format = null, array $context =
             'content' => $data->hasToolCalls() ? array_map(static function (ToolCall $toolCall) {
                 return [
                     'type' => 'tool_use',
-                    'id' => $toolCall->id,
-                    'name' => $toolCall->name,
-                    'input' => [] !== $toolCall->arguments ? $toolCall->arguments : new \stdClass(),
+                    'id' => $toolCall->getId(),
+                    'name' => $toolCall->getName(),
+                    'input' => [] !== $toolCall->getArguments() ? $toolCall->getArguments() : new \stdClass(),
                 ];
             }, $data->toolCalls) : $data->content,
         ];
diff --git a/src/platform/src/Bridge/Anthropic/Contract/ToolCallMessageNormalizer.php b/src/platform/src/Bridge/Anthropic/Contract/ToolCallMessageNormalizer.php
@@ -44,7 +44,7 @@ public function normalize(mixed $data, ?string $format = null, array $context =
             'content' => [
                 [
                     'type' => 'tool_result',
-                    'tool_use_id' => $data->toolCall->id,
+                    'tool_use_id' => $data->toolCall->getId(),
                     'content' => $data->content,
                 ],
             ],
diff --git a/src/platform/src/Bridge/Bedrock/Nova/Contract/AssistantMessageNormalizer.php b/src/platform/src/Bridge/Bedrock/Nova/Contract/AssistantMessageNormalizer.php
@@ -45,9 +45,9 @@ public function normalize(mixed $data, ?string $format = null, array $context =
                 'content' => array_map(static function (ToolCall $toolCall) {
                     return [
                         'toolUse' => [
-                            'toolUseId' => $toolCall->id,
-                            'name' => $toolCall->name,
-                            'input' => [] !== $toolCall->arguments ? $toolCall->arguments : new \stdClass(),
+                            'toolUseId' => $toolCall->getId(),
+                            'name' => $toolCall->getName(),
+                            'input' => [] !== $toolCall->getArguments() ? $toolCall->getArguments() : new \stdClass(),
                         ],
                     ];
                 }, $data->toolCalls),
diff --git a/src/platform/src/Bridge/Bedrock/Nova/Contract/ToolCallMessageNormalizer.php b/src/platform/src/Bridge/Bedrock/Nova/Contract/ToolCallMessageNormalizer.php
@@ -45,7 +45,7 @@ public function normalize(mixed $data, ?string $format = null, array $context =
             'content' => [
                 [
                     'toolResult' => [
-                        'toolUseId' => $data->toolCall->id,
+                        'toolUseId' => $data->toolCall->getId(),
                         'content' => [['json' => $data->content]],
                     ],
                 ],
diff --git a/src/platform/src/Bridge/Gemini/Contract/AssistantMessageNormalizer.php b/src/platform/src/Bridge/Gemini/Contract/AssistantMessageNormalizer.php
@@ -36,12 +36,12 @@ public function normalize(mixed $data, ?string $format = null, array $context =
 
         if (isset($data->toolCalls[0])) {
             $normalized['functionCall'] = [
-                'id' => $data->toolCalls[0]->id,
-                'name' => $data->toolCalls[0]->name,
+                'id' => $data->toolCalls[0]->getId(),
+                'name' => $data->toolCalls[0]->getName(),
             ];
 
-            if ($data->toolCalls[0]->arguments) {
-                $normalized['functionCall']['args'] = $data->toolCalls[0]->arguments;
+            if ($data->toolCalls[0]->getArguments()) {
+                $normalized['functionCall']['args'] = $data->toolCalls[0]->getArguments();
             }
         }
 
diff --git a/src/platform/src/Bridge/Gemini/Contract/ToolCallMessageNormalizer.php b/src/platform/src/Bridge/Gemini/Contract/ToolCallMessageNormalizer.php
@@ -38,8 +38,8 @@ public function normalize(mixed $data, ?string $format = null, array $context =
 
         return [[
             'functionResponse' => array_filter([
-                'id' => $data->toolCall->id,
-                'name' => $data->toolCall->name,
+                'id' => $data->toolCall->getId(),
+                'name' => $data->toolCall->getName(),
                 'response' => \is_array($resultContent) ? $resultContent : [
                     'rawResponse' => $resultContent, // Gemini expects the response to be an object, but not everyone uses objects as their responses.
                 ],
diff --git a/src/platform/src/Bridge/Ollama/Contract/AssistantMessageNormalizer.php b/src/platform/src/Bridge/Ollama/Contract/AssistantMessageNormalizer.php
@@ -51,9 +51,9 @@ public function normalize(mixed $data, ?string $format = null, array $context =
                 return [
                     'type' => 'function',
                     'function' => [
-                        'name' => $message->name,
+                        'name' => $message->getName(),
                         // stdClass forces empty object
-                        'arguments' => [] === $message->arguments ? new \stdClass() : $message->arguments,
+                        'arguments' => [] === $message->getArguments() ? new \stdClass() : $message->getArguments(),
                     ],
                 ];
             }, $data->toolCalls ?? [])),
diff --git a/src/platform/src/Bridge/VertexAi/Contract/AssistantMessageNormalizer.php b/src/platform/src/Bridge/VertexAi/Contract/AssistantMessageNormalizer.php
@@ -44,11 +44,11 @@ public function normalize(mixed $data, ?string $format = null, array $context =
 
         if (isset($data->toolCalls[0])) {
             $normalized['functionCall'] = [
-                'name' => $data->toolCalls[0]->name,
+                'name' => $data->toolCalls[0]->getName(),
             ];
 
-            if ($data->toolCalls[0]->arguments) {
-                $normalized['functionCall']['args'] = $data->toolCalls[0]->arguments;
+            if ($data->toolCalls[0]->getArguments()) {
+                $normalized['functionCall']['args'] = $data->toolCalls[0]->getArguments();
             }
         }
 
diff --git a/src/platform/src/Bridge/VertexAi/Contract/ToolCallMessageNormalizer.php b/src/platform/src/Bridge/VertexAi/Contract/ToolCallMessageNormalizer.php
@@ -39,7 +39,7 @@ public function normalize(mixed $data, ?string $format = null, array $context =
 
         return [[
             'functionResponse' => array_filter([
-                'name' => $data->toolCall->name,
+                'name' => $data->toolCall->getName(),
                 'response' => \is_array($resultContent) ? $resultContent : [
                     'rawResponse' => $resultContent,
                 ],
diff --git a/src/platform/src/Contract/Normalizer/Message/ToolCallMessageNormalizer.php b/src/platform/src/Contract/Normalizer/Message/ToolCallMessageNormalizer.php
@@ -47,7 +47,7 @@ public function normalize(mixed $data, ?string $format = null, array $context =
         return [
             'role' => $data->getRole()->value,
             'content' => $this->normalizer->normalize($data->content, $format, $context),
-            'tool_call_id' => $data->toolCall->id,
+            'tool_call_id' => $data->toolCall->getId(),
         ];
     }
 }
diff --git a/src/platform/src/Contract/Normalizer/Result/ToolCallNormalizer.php b/src/platform/src/Contract/Normalizer/Result/ToolCallNormalizer.php
@@ -46,11 +46,11 @@ public function getSupportedTypes(?string $format): array
     public function normalize(mixed $data, ?string $format = null, array $context = []): array
     {
         return [
-            'id' => $data->id,
+            'id' => $data->getId(),
             'type' => 'function',
             'function' => [
-                'name' => $data->name,
-                'arguments' => json_encode($data->arguments),
+                'name' => $data->getName(),
+                'arguments' => json_encode($data->getArguments()),
             ],
         ];
     }
diff --git a/src/platform/src/Result/ToolCall.php b/src/platform/src/Result/ToolCall.php
@@ -20,12 +20,30 @@
      * @param array<string, mixed> $arguments
      */
     public function __construct(
-        public string $id,
-        public string $name,
-        public array $arguments = [],
+        private string $id,
+        private string $name,
+        private array $arguments = [],
     ) {
     }
 
+    public function getId(): string
+    {
+        return $this->id;
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function getArguments(): array
+    {
+        return $this->arguments;
+    }
+
     /**
      * @return array{
      *     id: string,
diff --git a/src/platform/tests/Bridge/Anthropic/ResultConverterTest.php b/src/platform/tests/Bridge/Anthropic/ResultConverterTest.php
@@ -38,8 +38,8 @@ public function testConvertThrowsExceptionWhenContentIsToolUseAndLacksText()
         $result = $handler->convert(new RawHttpResult($httpResponse));
         $this->assertInstanceOf(ToolCallResult::class, $result);
         $this->assertCount(1, $result->getContent());
-        $this->assertSame('toolu_01UM4PcTjC1UDiorSXVHSVFM', $result->getContent()[0]->id);
-        $this->assertSame('xxx_tool', $result->getContent()[0]->name);
-        $this->assertSame(['action' => 'get_data'], $result->getContent()[0]->arguments);
+        $this->assertSame('toolu_01UM4PcTjC1UDiorSXVHSVFM', $result->getContent()[0]->getId());
+        $this->assertSame('xxx_tool', $result->getContent()[0]->getName());
+        $this->assertSame(['action' => 'get_data'], $result->getContent()[0]->getArguments());
     }
 }
diff --git a/src/platform/tests/Bridge/Bedrock/Anthropic/ClaudeResultConverterTest.php b/src/platform/tests/Bridge/Bedrock/Anthropic/ClaudeResultConverterTest.php
@@ -81,9 +81,9 @@ public function testConvertToolCallResult()
         $this->assertInstanceOf(ToolCallResult::class, $result);
         $toolCalls = $result->getContent();
         $this->assertCount(1, $toolCalls);
-        $this->assertSame('toolu_01UM4PcTjC1UDiorSXVHSVFM', $toolCalls[0]->id);
-        $this->assertSame('get_weather', $toolCalls[0]->name);
-        $this->assertSame(['location' => 'Paris'], $toolCalls[0]->arguments);
+        $this->assertSame('toolu_01UM4PcTjC1UDiorSXVHSVFM', $toolCalls[0]->getId());
+        $this->assertSame('get_weather', $toolCalls[0]->getName());
+        $this->assertSame(['location' => 'Paris'], $toolCalls[0]->getArguments());
     }
 
     #[TestDox('Converts response with multiple tool calls to ToolCallResult')]
@@ -116,13 +116,13 @@ public function testConvertMultipleToolCalls()
         $toolCalls = $result->getContent();
         $this->assertCount(2, $toolCalls);
 
-        $this->assertSame('toolu_01', $toolCalls[0]->id);
-        $this->assertSame('get_weather', $toolCalls[0]->name);
-        $this->assertSame(['location' => 'Paris'], $toolCalls[0]->arguments);
+        $this->assertSame('toolu_01', $toolCalls[0]->getId());
+        $this->assertSame('get_weather', $toolCalls[0]->getName());
+        $this->assertSame(['location' => 'Paris'], $toolCalls[0]->getArguments());
 
-        $this->assertSame('toolu_02', $toolCalls[1]->id);
-        $this->assertSame('get_time', $toolCalls[1]->name);
-        $this->assertSame(['timezone' => 'UTC'], $toolCalls[1]->arguments);
+        $this->assertSame('toolu_02', $toolCalls[1]->getId());
+        $this->assertSame('get_time', $toolCalls[1]->getName());
+        $this->assertSame(['timezone' => 'UTC'], $toolCalls[1]->getArguments());
     }
 
     #[TestDox('Prioritizes tool calls over text in mixed content')]
@@ -153,7 +153,7 @@ public function testConvertMixedContentWithToolUse()
         $this->assertInstanceOf(ToolCallResult::class, $result);
         $toolCalls = $result->getContent();
         $this->assertCount(1, $toolCalls);
-        $this->assertSame('toolu_01', $toolCalls[0]->id);
+        $this->assertSame('toolu_01', $toolCalls[0]->getId());
     }
 
     #[TestDox('Throws RuntimeException when response has no content')]
diff --git a/src/platform/tests/Bridge/Bedrock/Nova/NovaResultConverterTest.php b/src/platform/tests/Bridge/Bedrock/Nova/NovaResultConverterTest.php
@@ -90,9 +90,9 @@ public function testConvertToolCallResult()
         $this->assertInstanceOf(ToolCallResult::class, $result);
         $toolCalls = $result->getContent();
         $this->assertCount(1, $toolCalls);
-        $this->assertSame('nova-tool-123', $toolCalls[0]->id);
-        $this->assertSame('calculate', $toolCalls[0]->name);
-        $this->assertSame(['expression' => '2+2'], $toolCalls[0]->arguments);
+        $this->assertSame('nova-tool-123', $toolCalls[0]->getId());
+        $this->assertSame('calculate', $toolCalls[0]->getName());
+        $this->assertSame(['expression' => '2+2'], $toolCalls[0]->getArguments());
     }
 
     #[TestDox('Converts response with multiple tool calls to ToolCallResult')]
@@ -134,13 +134,13 @@ public function testConvertMultipleToolCalls()
         $toolCalls = $result->getContent();
         $this->assertCount(2, $toolCalls);
 
-        $this->assertSame('nova-tool-1', $toolCalls[0]->id);
-        $this->assertSame('get_weather', $toolCalls[0]->name);
-        $this->assertSame(['location' => 'New York'], $toolCalls[0]->arguments);
+        $this->assertSame('nova-tool-1', $toolCalls[0]->getId());
+        $this->assertSame('get_weather', $toolCalls[0]->getName());
+        $this->assertSame(['location' => 'New York'], $toolCalls[0]->getArguments());
 
-        $this->assertSame('nova-tool-2', $toolCalls[1]->id);
-        $this->assertSame('get_time', $toolCalls[1]->name);
-        $this->assertSame(['timezone' => 'EST'], $toolCalls[1]->arguments);
+        $this->assertSame('nova-tool-2', $toolCalls[1]->getId());
+        $this->assertSame('get_time', $toolCalls[1]->getName());
+        $this->assertSame(['timezone' => 'EST'], $toolCalls[1]->getArguments());
     }
 
     #[TestDox('Prioritizes tool calls over text in mixed content')]
@@ -175,7 +175,7 @@ public function testConvertMixedContentWithToolUse()
         $this->assertInstanceOf(ToolCallResult::class, $result);
         $toolCalls = $result->getContent();
         $this->assertCount(1, $toolCalls);
-        $this->assertSame('nova-tool-123', $toolCalls[0]->id);
+        $this->assertSame('nova-tool-123', $toolCalls[0]->getId());
     }
 
     #[TestDox('Throws RuntimeException when response has no output')]
diff --git a/src/platform/tests/Bridge/Gemini/Gemini/ResultConverterTest.php b/src/platform/tests/Bridge/Gemini/Gemini/ResultConverterTest.php
@@ -75,7 +75,7 @@ public function testReturnsToolCallEvenIfMultipleContentPartsAreGiven()
         $this->assertCount(1, $result->getContent());
         $toolCall = $result->getContent()[0];
         $this->assertInstanceOf(ToolCall::class, $toolCall);
-        $this->assertSame('1234', $toolCall->id);
+        $this->assertSame('1234', $toolCall->getId());
     }
 
     public function testConvertsInlineDataToBinaryResult()
diff --git a/src/platform/tests/Bridge/Ollama/OllamaResultConverterTest.php b/src/platform/tests/Bridge/Ollama/OllamaResultConverterTest.php
@@ -69,9 +69,9 @@ public function testConvertToolCallResponse()
         $this->assertInstanceOf(ToolCallResult::class, $result);
         $toolCalls = $result->getContent();
         $this->assertCount(1, $toolCalls);
-        $this->assertSame('0', $toolCalls[0]->id); // ID is the array index as a string
-        $this->assertSame('test_function', $toolCalls[0]->name);
-        $this->assertSame(['arg1' => 'value1'], $toolCalls[0]->arguments);
+        $this->assertSame('0', $toolCalls[0]->getId()); // ID is the array index as a string
+        $this->assertSame('test_function', $toolCalls[0]->getName());
+        $this->assertSame(['arg1' => 'value1'], $toolCalls[0]->getArguments());
     }
 
     public function testConvertMultipleToolCallsResponse()
@@ -103,13 +103,13 @@ public function testConvertMultipleToolCallsResponse()
         $toolCalls = $result->getContent();
         $this->assertCount(2, $toolCalls);
 
-        $this->assertSame('0', $toolCalls[0]->id);
-        $this->assertSame('function1', $toolCalls[0]->name);
-        $this->assertSame(['param1' => 'value1'], $toolCalls[0]->arguments);
+        $this->assertSame('0', $toolCalls[0]->getId());
+        $this->assertSame('function1', $toolCalls[0]->getName());
+        $this->assertSame(['param1' => 'value1'], $toolCalls[0]->getArguments());
 
-        $this->assertSame('1', $toolCalls[1]->id);
-        $this->assertSame('function2', $toolCalls[1]->name);
-        $this->assertSame(['param2' => 'value2'], $toolCalls[1]->arguments);
+        $this->assertSame('1', $toolCalls[1]->getId());
+        $this->assertSame('function2', $toolCalls[1]->getName());
+        $this->assertSame(['param2' => 'value2'], $toolCalls[1]->getArguments());
     }
 
     public function testThrowsExceptionWhenNoMessage()
diff --git a/src/platform/tests/Bridge/OpenAi/Gpt/ResultConverterTest.php b/src/platform/tests/Bridge/OpenAi/Gpt/ResultConverterTest.php
diff --git a/src/platform/tests/Bridge/Scaleway/Llm/ResultConverterTest.php b/src/platform/tests/Bridge/Scaleway/Llm/ResultConverterTest.php
diff --git a/src/platform/tests/Bridge/VertexAi/Gemini/ResultConverterTest.php b/src/platform/tests/Bridge/VertexAi/Gemini/ResultConverterTest.php
diff --git a/src/platform/tests/Result/ToolCallTest.php b/src/platform/tests/Result/ToolCallTest.php

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`// Add tool call result listener to enforce chain exits direct with structured response for weather tools`
`34`	`34`	`$eventDispatcher->addListener(ToolCallsExecuted::class, function (ToolCallsExecuted $event): void {`
`35`	`35`	`foreach ($event->toolResults as $toolCallResult) {`
`36`		`- if (str_starts_with($toolCallResult->toolCall->name, 'weather_')) {`
	`36`	`+ if (str_starts_with($toolCallResult->toolCall->getName(), 'weather_')) {`
`37`	`37`	`$event->result = new ObjectResult($toolCallResult->result);`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,14 +22,14 @@ final class ToolExecutionException extends \RuntimeException implements ToolExec`
`22`	`22`
`23`	`23`	`public static function executionFailed(ToolCall $toolCall, \Throwable $previous): self`
`24`	`24`	`{`
`25`		`- $exception = new self(\sprintf('Execution of tool "%s" failed with error: %s', $toolCall->name, $previous->getMessage()), previous: $previous);`
	`25`	`+ $exception = new self(\sprintf('Execution of tool "%s" failed with error: %s', $toolCall->getName(), $previous->getMessage()), previous: $previous);`
`26`	`26`	`$exception->toolCall = $toolCall;`
`27`	`27`
`28`	`28`	`return $exception;`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public function getToolCallResult(): string`
`32`	`32`	`{`
`33`		`- return \sprintf('An error occurred while executing tool "%s".', $this->toolCall->name);`
	`33`	`+ return \sprintf('An error occurred while executing tool "%s".', $this->toolCall->getName());`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ final class ToolNotFoundException extends \RuntimeException implements Exception`
`23`	`23`
`24`	`24`	`public static function notFoundForToolCall(ToolCall $toolCall): self`
`25`	`25`	`{`
`26`		`- $exception = new self(\sprintf('Tool not found for call: %s.', $toolCall->name));`
	`26`	`+ $exception = new self(\sprintf('Tool not found for call: %s.', $toolCall->getName()));`
`27`	`27`	`$exception->toolCall = $toolCall;`
`28`	`28`
`29`	`29`	`return $exception;`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function execute(ToolCall $toolCall): mixed`
`42`	`42`	`} catch (ToolNotFoundException) {`
`43`	`43`	`$names = array_map(fn (Tool $metadata) => $metadata->name, $this->getTools());`
`44`	`44`
`45`		`- return \sprintf('Tool "%s" was not found, please use one of these: %s', $toolCall->name, implode(', ', $names));`
	`45`	`+ return \sprintf('Tool "%s" was not found, please use one of these: %s', $toolCall->getName(), implode(', ', $names));`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function execute(ToolCall $toolCall): mixed`
`78`	`78`	`$tool = $this->getExecutable($metadata);`
`79`	`79`
`80`	`80`	`try {`
`81`		`- $this->logger->debug(\sprintf('Executing tool "%s".', $toolCall->name), $toolCall->arguments);`
	`81`	`+ $this->logger->debug(\sprintf('Executing tool "%s".', $toolCall->getName()), $toolCall->getArguments());`
`82`	`82`
`83`	`83`	`$arguments = $this->argumentResolver->resolveArguments($metadata, $toolCall);`
`84`	`84`	`$this->eventDispatcher?->dispatch(new ToolCallArgumentsResolved($tool, $metadata, $arguments));`
`@@ -88,7 +88,7 @@ public function execute(ToolCall $toolCall): mixed`
`88`	`88`	`$this->eventDispatcher?->dispatch(new ToolCallFailed($tool, $metadata, $arguments ?? [], $e));`
`89`	`89`	`throw $e;`
`90`	`90`	`} catch (\Throwable $e) {`
`91`		`- $this->logger->warning(\sprintf('Failed to execute tool "%s".', $toolCall->name), ['exception' => $e]);`
	`91`	`+ $this->logger->warning(\sprintf('Failed to execute tool "%s".', $toolCall->getName()), ['exception' => $e]);`
`92`	`92`	`$this->eventDispatcher?->dispatch(new ToolCallFailed($tool, $metadata, $arguments ?? [], $e));`
`93`	`93`	`throw ToolExecutionException::executionFailed($toolCall, $e);`
`94`	`94`	`}`
`@@ -99,7 +99,7 @@ public function execute(ToolCall $toolCall): mixed`
`99`	`99`	`private function getMetadata(ToolCall $toolCall): Tool`
`100`	`100`	`{`
`101`	`101`	`foreach ($this->getTools() as $metadata) {`
`102`		`- if ($metadata->name === $toolCall->name) {`
	`102`	`+ if ($metadata->name === $toolCall->getName()) {`
`103`	`103`	`return $metadata;`
`104`	`104`	`}`
`105`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function normalize(mixed $data, ?string $format = null, array $context =`
`44`	`44`	`'content' => [`
`45`	`45`	`[`
`46`	`46`	`'type' => 'tool_result',`
`47`		`- 'tool_use_id' => $data->toolCall->id,`
	`47`	`+ 'tool_use_id' => $data->toolCall->getId(),`
`48`	`48`	`'content' => $data->content,`
`49`	`49`	`],`
`50`	`50`	`],`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function normalize(mixed $data, ?string $format = null, array $context =`
`45`	`45`	`'content' => [`
`46`	`46`	`[`
`47`	`47`	`'toolResult' => [`
`48`		`- 'toolUseId' => $data->toolCall->id,`
	`48`	`+ 'toolUseId' => $data->toolCall->getId(),`
`49`	`49`	`'content' => [['json' => $data->content]],`
`50`	`50`	`],`
`51`	`51`	`],`