Refactoring according to suggestions

Author: ineersa

src/Schema/Result/CallToolResult.php

@@ -17,7 +17,6 @@
 use Mcp\Schema\Content\EmbeddedResource;
 use Mcp\Schema\Content\ImageContent;
 use Mcp\Schema\Content\TextContent;
-use Mcp\Schema\JsonRpc\ResultInterface;
 
 /**
  * The server's response to a tool call.
@@ -33,7 +32,7 @@
  *
  * @author Kyrian Obikwelu <[email protected]>
  */
-class CallToolResult implements ResultInterface
+class CallToolResult implements CallToolResultInterface
 {
     /**
      * Create a new CallToolResult.

src/Schema/Result/CallToolResultInterface.php

@@ -0,0 +1,18 @@
+<?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\Schema\Result;
+
+use Mcp\Schema\JsonRpc\ResultInterface;
+
+interface CallToolResultInterface extends ResultInterface
+{
+}

src/Schema/Result/CallToolStructuredContentResult.php

@@ -0,0 +1,34 @@
+<?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\Schema\Result;
+
+class CallToolStructuredContentResult implements CallToolResultInterface
+{
+    /**
+     * Creates a new CallToolResult with structured content.
+     *
+     * @see https://modelcontextprotocol.io/specification/2025-06-18/server/tools#structured-content
+     *
+     * @param mixed[]                 $structuredContent JSON content for `structuredContent`
+     * @param CallToolResultInterface $callToolResult    Traditional result
+     */
+    public function __construct(
+        public readonly array $structuredContent,
+        public readonly CallToolResultInterface $callToolResult,
+    ) {
+    }
+
+    public function jsonSerialize(): mixed
+    {
+        return ['structuredContent' => $this->structuredContent] + $this->callToolResult->jsonSerialize();
+    }
+}

src/Server/Handler/Request/CallToolHandler.php

@@ -21,6 +21,7 @@
 use Mcp\Schema\JsonRpc\Response;
 use Mcp\Schema\Request\CallToolRequest;
 use Mcp\Schema\Result\CallToolResult;
+use Mcp\Schema\Result\CallToolResultInterface;
 use Mcp\Server\Session\SessionInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
@@ -59,14 +60,17 @@ public function handle(Request $request, SessionInterface $session): Response|Er
             }
 
             $result = $this->referenceHandler->handle($reference, $arguments);
-            $formatted = $reference->formatResult($result);
+
+            if (!$result instanceof CallToolResultInterface) {
+                $result = new CallToolResult($reference->formatResult($result));
+            }
 
             $this->logger->debug('Tool executed successfully', [
                 'name' => $toolName,
                 'result_type' => \gettype($result),
             ]);
 
-            return new Response($request->getId(), new CallToolResult($formatted));
+            return new Response($request->getId(), $result);
         } catch (ToolNotFoundException $e) {
             $this->logger->error('Tool not found', ['name' => $toolName]);