Added basic StructuredContent

Author: ineersa

src/Capability/Tool/ToolCaller.php

@@ -18,6 +18,7 @@
 use Mcp\Schema\Content\AudioContent;
 use Mcp\Schema\Content\EmbeddedResource;
 use Mcp\Schema\Content\ImageContent;
+use Mcp\Schema\Content\StructuredContent;
 use Mcp\Schema\Content\TextContent;
 use Mcp\Schema\Request\CallToolRequest;
 use Mcp\Schema\Result\CallToolResult;
@@ -59,7 +60,16 @@ public function call(CallToolRequest $request): CallToolResult
 
         try {
             $result = $this->referenceHandler->handle($toolReference, $arguments);
-            /** @var TextContent[]|ImageContent[]|EmbeddedResource[]|AudioContent[] $formattedResult */
+
+            if ($result instanceof CallToolResult) {
+                $this->logger->debug('Tool executed successfully', [
+                    'name' => $toolName,
+                    'result_type' => \gettype($result),
+                ]);
+
+                return $result;
+            }
+            /** @var array<int, TextContent|ImageContent|EmbeddedResource|AudioContent|StructuredContent> $formattedResult */
             $formattedResult = $toolReference->formatResult($result);
 
             $this->logger->debug('Tool executed successfully', [

src/Schema/Content/StructuredContent.php

@@ -0,0 +1,26 @@
+<?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\Content;
+
+class StructuredContent extends Content
+{
+    public function __construct(
+        private array $data = [],
+    ) {
+        parent::__construct('structured');
+    }
+
+    public function jsonSerialize(): mixed
+    {
+        return json_encode($this->data);
+    }
+}

src/Schema/Result/CallToolResult.php

@@ -16,6 +16,7 @@
 use Mcp\Schema\Content\Content;
 use Mcp\Schema\Content\EmbeddedResource;
 use Mcp\Schema\Content\ImageContent;
+use Mcp\Schema\Content\StructuredContent;
 use Mcp\Schema\Content\TextContent;
 use Mcp\Schema\JsonRpc\Response;
 use Mcp\Schema\JsonRpc\ResultInterface;
@@ -44,7 +45,7 @@ class CallToolResult implements ResultInterface
     /**
      * Create a new CallToolResult.
      *
-     * @param array<TextContent|ImageContent|AudioContent|EmbeddedResource> $content The content of the tool result
+     * @param array<TextContent|ImageContent|AudioContent|EmbeddedResource|StructuredContent> $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).
      */
     public function __construct(
@@ -107,7 +108,7 @@ public static function fromArray(array $data): self
 
     /**
      * @return array{
-     *     content: array<TextContent|ImageContent|AudioContent|EmbeddedResource>,
+     *     content: array<TextContent|ImageContent|AudioContent|EmbeddedResource|StructuredContent>,
      *     isError: bool,
      * }
      */