Adopt Schema component in server handlers

Author: chr-hertel

composer.json

@@ -28,7 +28,8 @@
         "phpunit/phpunit": "^10.5",
         "symfony/console": "^6.4 || ^7.0",
         "psr/cache": "^3.0",
-        "php-cs-fixer/shim": "^3.84"
+        "php-cs-fixer/shim": "^3.84",
+        "nyholm/nsa": "^1.3"
     },
     "suggest": {
         "symfony/console": "To use SymfonyConsoleTransport for STDIO",

examples/cli/index.php

@@ -23,9 +23,8 @@
 
 // Configure the JsonRpcHandler and build the functionality
 $jsonRpcHandler = new Mcp\Server\JsonRpcHandler(
-    new Mcp\Message\Factory(),
-    App\Builder::buildRequestHandlers(),
-    App\Builder::buildNotificationHandlers(),
+    Mcp\Message\Factory::make(),
+    App\Builder::buildMethodHandlers(),
     $logger
 );
 

examples/cli/src/Builder.php

@@ -14,27 +14,19 @@
 use Mcp\Capability\PromptChain;
 use Mcp\Capability\ResourceChain;
 use Mcp\Capability\ToolChain;
-use Mcp\Server\NotificationHandler\InitializedHandler;
-use Mcp\Server\NotificationHandlerInterface;
-use Mcp\Server\RequestHandler\InitializeHandler;
-use Mcp\Server\RequestHandler\PingHandler;
-use Mcp\Server\RequestHandler\PromptGetHandler;
-use Mcp\Server\RequestHandler\PromptListHandler;
-use Mcp\Server\RequestHandler\ResourceListHandler;
-use Mcp\Server\RequestHandler\ResourceReadHandler;
-use Mcp\Server\RequestHandler\ToolCallHandler;
-use Mcp\Server\RequestHandler\ToolListHandler;
-use Mcp\Server\RequestHandlerInterface;
+use Mcp\Server\MethodHandlerInterface;
+use Mcp\Server\NotificationHandler;
+use Mcp\Server\RequestHandler;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
 class Builder
 {
     /**
-     * @return list<RequestHandlerInterface>
+     * @return list<MethodHandlerInterface>
      */
-    public static function buildRequestHandlers(): array
+    public static function buildMethodHandlers(): array
     {
         $promptManager = new PromptChain([
             new ExamplePrompt(),
@@ -49,24 +41,15 @@ public static function buildRequestHandlers(): array
         ]);
 
         return [
-            new InitializeHandler(),
-            new PingHandler(),
-            new PromptListHandler($promptManager),
-            new PromptGetHandler($promptManager),
-            new ResourceListHandler($resourceManager),
-            new ResourceReadHandler($resourceManager),
-            new ToolCallHandler($toolManager),
-            new ToolListHandler($toolManager),
-        ];
-    }
-
-    /**
-     * @return list<NotificationHandlerInterface>
-     */
-    public static function buildNotificationHandlers(): array
-    {
-        return [
-            new InitializedHandler(),
+            new NotificationHandler\InitializedHandler(),
+            new RequestHandler\InitializeHandler(),
+            new RequestHandler\PingHandler(),
+            new RequestHandler\PromptListHandler($promptManager),
+            new RequestHandler\PromptGetHandler($promptManager),
+            new RequestHandler\ResourceListHandler($resourceManager),
+            new RequestHandler\ResourceReadHandler($resourceManager),
+            new RequestHandler\ToolCallHandler($toolManager),
+            new RequestHandler\ToolListHandler($toolManager),
         ];
     }
 }

examples/cli/src/ExampleTool.php

@@ -12,22 +12,24 @@
 namespace App;
 
 use Mcp\Capability\Tool\MetadataInterface;
-use Mcp\Capability\Tool\ToolCall;
-use Mcp\Capability\Tool\ToolCallResult;
 use Mcp\Capability\Tool\ToolExecutorInterface;
+use Mcp\Schema\Content\TextContent;
+use Mcp\Schema\Result\CallToolResult;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
 class ExampleTool implements MetadataInterface, ToolExecutorInterface
 {
-    public function call(ToolCall $input): ToolCallResult
+    public function call(string $name, array $arguments): CallToolResult
     {
-        $format = $input->arguments['format'] ?? 'Y-m-d H:i:s';
+        $format = $arguments['format'] ?? 'Y-m-d H:i:s';
 
-        return new ToolCallResult(
-            (new \DateTime('now', new \DateTimeZone('UTC')))->format($format)
-        );
+        return new CallToolResult([
+            new TextContent(
+                (new \DateTime('now', new \DateTimeZone('UTC')))->format($format),
+            ),
+        ]);
     }
 
     public function getName(): string

phpstan.dist.neon

@@ -7,3 +7,6 @@ parameters:
     excludePaths:
         - examples/cli/vendor/* (?)
     treatPhpDocTypesAsCertain: false
+    ignoreErrors:
+        -
+            message: "#^Method .*::test.*\\(\\) has no return type specified\\.$#"

src/Capability/Tool/ToolCall.php

@@ -13,15 +13,18 @@
 
 use Mcp\Exception\ToolExecutionException;
 use Mcp\Exception\ToolNotFoundException;
+use Mcp\Schema\Result\CallToolResult;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
 interface ToolExecutorInterface
 {
     /**
+     * @param array<string, mixed> $arguments
+     *
      * @throws ToolExecutionException if the tool execution fails
      * @throws ToolNotFoundException  if the tool is not found
      */
-    public function call(ToolCall $input): ToolCallResult;
+    public function call(string $name, array $arguments): CallToolResult;
 }

src/Capability/Tool/ToolCallResult.php

@@ -14,12 +14,11 @@
 use Mcp\Capability\Tool\CollectionInterface;
 use Mcp\Capability\Tool\IdentifierInterface;
 use Mcp\Capability\Tool\MetadataInterface;
-use Mcp\Capability\Tool\ToolCall;
-use Mcp\Capability\Tool\ToolCallResult;
 use Mcp\Capability\Tool\ToolExecutorInterface;
 use Mcp\Exception\InvalidCursorException;
 use Mcp\Exception\ToolExecutionException;
 use Mcp\Exception\ToolNotFoundException;
+use Mcp\Schema\Result\CallToolResult;
 
 /**
  * A collection of tools. All tools need to implement IdentifierInterface.
@@ -60,18 +59,18 @@ public function getMetadata(int $count, ?string $lastIdentifier = null): iterabl
         }
     }
 
-    public function call(ToolCall $input): ToolCallResult
+    public function call(string $name, array $arguments): CallToolResult
     {
         foreach ($this->items as $item) {
-            if ($item instanceof ToolExecutorInterface && $input->name === $item->getName()) {
+            if ($item instanceof ToolExecutorInterface && $name === $item->getName()) {
                 try {
-                    return $item->call($input);
+                    return $item->call($name, $arguments);
                 } catch (\Throwable $e) {
-                    throw new ToolExecutionException($input, $e);
+                    throw new ToolExecutionException($name, $e);
                 }
             }
         }
 
-        throw new ToolNotFoundException($input);
+        throw new ToolNotFoundException($name);
     }
 }

src/Capability/Tool/ToolExecutorInterface.php

@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the official PHP MCP SDK.
+ *
+ * A collaboration between Symfony and the PHP Foundation.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Mcp\Exception;
+
+/**
+ * @author Christopher Hertel <[email protected]>
+ */
+final class LogicException extends \LogicException implements ExceptionInterface
+{
+}