Rolled back to single CallToolResult instead of decorator for structuredContent

Author: ineersa

src/Schema/Result/CallToolResult.php

@@ -17,6 +17,7 @@
 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.
@@ -32,17 +33,19 @@
  *
  * @author Kyrian Obikwelu <[email protected]>
  */
-class CallToolResult implements CallToolResultInterface
+class CallToolResult implements ResultInterface
 {
     /**
      * Create a new CallToolResult.
      *
-     * @param Content[] $content The content of the tool result
-     * @param bool      $isError Whether the tool execution resulted in an error.  If not set, this is assumed to be false (the call was successful).
+     * @param Content[] $content           The content of the tool result
+     * @param bool      $isError           Whether the tool execution resulted in an error.  If not set, this is assumed to be false (the call was successful).
+     * @param mixed[]   $structuredContent JSON content for `structuredContent`
      */
     public function __construct(
         public readonly array $content,
         public readonly bool $isError = false,
+        public readonly ?array $structuredContent = null,
     ) {
         foreach ($this->content as $item) {
             if (!$item instanceof Content) {

src/Schema/Result/CallToolResultInterface.php

@@ -21,7 +21,6 @@
 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;
@@ -61,7 +60,7 @@ public function handle(Request $request, SessionInterface $session): Response|Er
 
             $result = $this->referenceHandler->handle($reference, $arguments);
 
-            if (!$result instanceof CallToolResultInterface) {
+            if (!$result instanceof CallToolResult) {
                 $result = new CallToolResult($reference->formatResult($result));
             }
 

src/Schema/Result/CallToolStructuredContentResult.php

@@ -21,7 +21,6 @@
 use Mcp\Schema\JsonRpc\Response;
 use Mcp\Schema\Request\CallToolRequest;
 use Mcp\Schema\Result\CallToolResult;
-use Mcp\Schema\Result\CallToolStructuredContentResult;
 use Mcp\Server\Handler\Request\CallToolHandler;
 use Mcp\Server\Session\SessionInterface;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -347,8 +346,7 @@ public function testHandleReturnsStructuredContentResult(): void
     {
         $request = $this->createCallToolRequest('structured_tool', ['query' => 'php']);
         $toolReference = $this->createMock(ToolReference::class);
-        $innerResult = new CallToolResult([new TextContent('Rendered results')]);
-        $structuredResult = new CallToolStructuredContentResult(['result' => 'Rendered results'], $innerResult);
+        $structuredResult = new CallToolResult([new TextContent('Rendered results')], false, ['result' => 'Rendered results']);
 
         $this->referenceProvider
             ->expects($this->once())
@@ -376,7 +374,7 @@ public function testHandleReturnsCallToolResult(): void
     {
         $request = $this->createCallToolRequest('result_tool', ['query' => 'php']);
         $toolReference = $this->createMock(ToolReference::class);
-        $callToolResult = new CallToolResult([new TextContent('Rendered results')]);
+        $callToolResult = new CallToolResult([new TextContent('Error result')], true);
 
         $this->referenceProvider
             ->expects($this->once())