Adopt Schema component in server handlers

Author: chr-hertel

examples/cli/src/ExampleTool.php

@@ -12,22 +12,25 @@
 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\Request\CallToolRequest;
+use Mcp\Schema\Result\CallToolResult;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
 class ExampleTool implements MetadataInterface, ToolExecutorInterface
 {
-    public function call(ToolCall $input): ToolCallResult
+    public function call(CallToolRequest $request): CallToolResult
     {
         $format = $input->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

src/Capability/Tool/ToolCall.php

@@ -13,6 +13,8 @@
 
 use Mcp\Exception\ToolExecutionException;
 use Mcp\Exception\ToolNotFoundException;
+use Mcp\Schema\Request\CallToolRequest;
+use Mcp\Schema\Result\CallToolResult;
 
 /**
  * @author Tobias Nyholm <[email protected]>
@@ -23,5 +25,5 @@ interface ToolExecutorInterface
      * @throws ToolExecutionException if the tool execution fails
      * @throws ToolNotFoundException  if the tool is not found
      */
-    public function call(ToolCall $input): ToolCallResult;
+    public function call(CallToolRequest $request): CallToolResult;
 }

src/Capability/Tool/ToolCallResult.php

@@ -14,12 +14,14 @@
 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\Request\CallToolRequest;
+use Mcp\Schema\Request\ToolCallRequest;
+use Mcp\Schema\Result\CallToolResult;
+use Mcp\Schema\Result\ToolCallResult;
 
 /**
  * A collection of tools. All tools need to implement IdentifierInterface.
@@ -60,18 +62,18 @@ public function getMetadata(int $count, ?string $lastIdentifier = null): iterabl
         }
     }
 
-    public function call(ToolCall $input): ToolCallResult
+    public function call(CallToolRequest $request): CallToolResult
     {
         foreach ($this->items as $item) {
-            if ($item instanceof ToolExecutorInterface && $input->name === $item->getName()) {
+            if ($item instanceof ToolExecutorInterface && $request->name === $item->getName()) {
                 try {
-                    return $item->call($input);
+                    return $item->call($request);
                 } catch (\Throwable $e) {
-                    throw new ToolExecutionException($input, $e);
+                    throw new ToolExecutionException($request, $e);
                 }
             }
         }
 
-        throw new ToolNotFoundException($input);
+        throw new ToolNotFoundException($request);
     }
 }

src/Capability/Tool/ToolExecutorInterface.php

@@ -11,17 +11,17 @@
 
 namespace Mcp\Exception;
 
-use Mcp\Capability\Tool\ToolCall;
+use Mcp\Schema\Request\CallToolRequest;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
 final class ToolExecutionException extends \RuntimeException implements ExceptionInterface
 {
     public function __construct(
-        public readonly ToolCall $toolCall,
+        public readonly CallToolRequest $callToolRequest,
         ?\Throwable $previous = null,
     ) {
-        parent::__construct(\sprintf('Execution of tool "%s" failed with error: %s', $toolCall->name, $previous?->getMessage() ?? ''), previous: $previous);
+        parent::__construct(\sprintf('Execution of tool "%s" failed with error: "%s".', $callToolRequest->name, $previous?->getMessage() ?? ''), previous: $previous);
     }
 }

src/Capability/ToolChain.php

@@ -11,16 +11,16 @@
 
 namespace Mcp\Exception;
 
-use Mcp\Capability\Tool\ToolCall;
+use Mcp\Schema\Request\CallToolRequest;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
 final class ToolNotFoundException extends \RuntimeException implements NotFoundExceptionInterface
 {
     public function __construct(
-        public readonly ToolCall $toolCall,
+        public readonly CallToolRequest $callToolRequest,
     ) {
-        parent::__construct(\sprintf('Tool not found for call: "%s"', $toolCall->name));
+        parent::__construct(\sprintf('Tool not found for call: "%s".', $callToolRequest->name));
     }
 }

src/Exception/ToolExecutionException.php

@@ -12,6 +12,8 @@
 namespace Mcp\Message;
 
 use Mcp\Exception\InvalidInputMessageException;
+use Mcp\Schema\JsonRpc\Notification;
+use Mcp\Schema\JsonRpc\Request;
 
 /**
  * @author Christopher Hertel <[email protected]>
@@ -35,9 +37,9 @@ public function create(string $input): iterable
             if (!isset($message['method'])) {
                 yield new InvalidInputMessageException('Invalid JSON-RPC request, missing "method".');
             } elseif (str_starts_with((string) $message['method'], 'notifications/')) {
-                yield Notification::from($message);
+                yield Notification::fromArray($message);
             } else {
-                yield Request::from($message);
+                yield Request::fromArray($message);
             }
         }
     }