refactor: rename ToolExecutor references to ToolCaller

Author: butschster

src/Capability/Tool/ToolCaller.php

@@ -25,7 +25,7 @@
 use Psr\Log\NullLogger;
 
 /**
- * Default implementation of ToolExecutorInterface that uses ReferenceProvider
+ * Default implementation of ToolCallerInterface that uses ReferenceProvider
  * and ReferenceHandlerInterface to execute tools.
  *
  * @author Pavel Buchnev <[email protected]>

src/JsonRpc/Handler.php

@@ -59,7 +59,7 @@ public static function make(
         ReferenceRegistryInterface $registry,
         ReferenceProviderInterface $referenceProvider,
         Implementation $implementation,
-        ToolCallerInterface $toolExecutor,
+        ToolCallerInterface $toolCaller,
         ResourceReaderInterface $resourceReader,
         PromptGetterInterface $promptGetter,
         LoggerInterface $logger = new NullLogger(),
@@ -74,7 +74,7 @@ public static function make(
                 new RequestHandler\GetPromptHandler($promptGetter),
                 new RequestHandler\ListResourcesHandler($referenceProvider),
                 new RequestHandler\ReadResourceHandler($resourceReader),
-                new RequestHandler\CallToolHandler($toolExecutor, $logger),
+                new RequestHandler\CallToolHandler($toolCaller, $logger),
                 new RequestHandler\ListToolsHandler($referenceProvider),
             ],
             logger: $logger,

src/Server/RequestHandler/CallToolHandler.php

@@ -28,7 +28,7 @@
 final class CallToolHandler implements MethodHandlerInterface
 {
     public function __construct(
-        private readonly ToolCallerInterface $toolExecutor,
+        private readonly ToolCallerInterface $toolCaller,
         private readonly LoggerInterface $logger = new NullLogger(),
     ) {
     }
@@ -43,7 +43,7 @@ public function handle(CallToolRequest|HasMethodInterface $message): Response|Er
         \assert($message instanceof CallToolRequest);
 
         try {
-            $content = $this->toolExecutor->call($message);
+            $content = $this->toolCaller->call($message);
         } catch (ExceptionInterface $exception) {
             $this->logger->error(
                 \sprintf('Error while executing tool "%s": "%s".', $message->name, $exception->getMessage()),

src/Server/ServerBuilder.php

@@ -55,7 +55,7 @@ final class ServerBuilder
 
     private ?CacheInterface $cache = null;
 
-    private ?ToolCallerInterface $toolExecutor = null;
+    private ?ToolCallerInterface $toolCaller = null;
 
     private ?ResourceReaderInterface $resourceReader = null;
 
@@ -161,9 +161,9 @@ public function withEventDispatcher(EventDispatcherInterface $eventDispatcher):
         return $this;
     }
 
-    public function withToolExecutor(ToolCallerInterface $toolExecutor): self
+    public function withToolCaller(ToolCallerInterface $toolCaller): self
     {
-        $this->toolExecutor = $toolExecutor;
+        $this->toolCaller = $toolCaller;
 
         return $this;
     }
@@ -281,7 +281,7 @@ public function build(): Server
         $registry = new Registry($this->eventDispatcher, $logger);
 
         $referenceHandler = new ReferenceHandler($container);
-        $toolExecutor = $this->toolExecutor ??= new ToolCaller($registry, $referenceHandler, $logger);
+        $toolCaller = $this->toolCaller ??= new ToolCaller($registry, $referenceHandler, $logger);
         $resourceReader = $this->resourceReader ??= new ResourceReader($registry, $referenceHandler, $logger);
         $promptGetter = $this->promptGetter ??= new PromptGetter($registry, $referenceHandler, $logger);
 
@@ -297,7 +297,7 @@ public function build(): Server
                 registry: $registry,
                 referenceProvider: $registry,
                 implementation: $this->serverInfo,
-                toolExecutor: $toolExecutor,
+                toolCaller: $toolCaller,
                 resourceReader: $resourceReader,
                 promptGetter: $promptGetter,
                 logger: $logger,