feat: add ResourceReadResult

Author: Nyholm

examples/cli/src/Builder.php

@@ -2,6 +2,9 @@
 
 namespace App;
 
+use App\Manager\PromptManager;
+use App\Manager\ResourceManager;
+use App\Manager\ToolManager;
 use PhpLlm\McpSdk\Server\NotificationHandler\InitializedHandler;
 use PhpLlm\McpSdk\Server\RequestHandler\InitializeHandler;
 use PhpLlm\McpSdk\Server\RequestHandler\PingHandler;

examples/cli/src/PromptManager.php renamed to examples/cli/src/Manager/PromptManager.php

@@ -1,7 +1,8 @@
 <?php
 
-namespace App;
+namespace App\Manager;
 
+use App\ExamplePrompt;
 use PhpLlm\McpSdk\Capability\Prompt\CollectionInterface;
 use PhpLlm\McpSdk\Capability\Prompt\PromptGet;
 use PhpLlm\McpSdk\Capability\Prompt\PromptGetterInterface;

examples/cli/src/ResourceManager.php renamed to examples/cli/src/Manager/ResourceManager.php

@@ -1,10 +1,12 @@
 <?php
 
-namespace App;
+namespace App\Manager;
 
+use App\ExampleResource;
 use PhpLlm\McpSdk\Capability\Resource\CollectionInterface;
 use PhpLlm\McpSdk\Capability\Resource\ResourceRead;
 use PhpLlm\McpSdk\Capability\Resource\ResourceReaderInterface;
+use PhpLlm\McpSdk\Capability\Resource\ResourceReadResult;
 use PhpLlm\McpSdk\Exception\ResourceNotFoundException;
 
 class ResourceManager implements CollectionInterface, ResourceReaderInterface
@@ -23,13 +25,17 @@ public function getMetadata(): array
         return $this->items;
     }
 
-    public function read(ResourceRead $request): mixed
+    public function read(ResourceRead $request): ResourceReadResult
     {
         foreach ($this->items as $resource) {
             if ($request->uri === $resource->getUri()) {
                 // In a real implementation, you would read the resource from its URI.
                 // Here we just return a dummy string for demonstration purposes.
-                return 'Content of '.$resource->getName();
+                return new ResourceReadResult(
+                    $request->id,
+                    'Content of '.$resource->getName(),
+                    $resource->getUri(),
+                );
             }
         }
 

examples/cli/src/ToolManager.php renamed to examples/cli/src/Manager/ToolManager.php

@@ -1,7 +1,8 @@
 <?php
 
-namespace App;
+namespace App\Manager;
 
+use App\ExampleTool;
 use PhpLlm\McpSdk\Capability\Tool\CollectionInterface;
 use PhpLlm\McpSdk\Capability\Tool\ToolCall;
 use PhpLlm\McpSdk\Capability\Tool\ToolExecutorInterface;

src/Capability/Resource/ResourceReadResult.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpLlm\McpSdk\Capability\Resource;
+
+final readonly class ResourceReadResult
+{
+    public function __construct(
+        public string $id,
+        public string $result,
+        public string $uri,
+
+        /**
+         * @var "text"|"blob"
+         */
+        public string $type = 'text',
+        public string $mimeType = 'text/plain',
+    ) {
+    }
+}

src/Capability/Resource/ResourceReaderInterface.php

@@ -11,5 +11,5 @@ interface ResourceReaderInterface
      * @throws ResourceReadException     if the resource execution fails
      * @throws ResourceNotFoundException if the resource is not found
      */
-    public function read(ResourceRead $request): mixed;
+    public function read(ResourceRead $request): ResourceReadResult;
 }

src/Server/RequestHandler/ResourceReadHandler.php

@@ -28,13 +28,12 @@ public function createResponse(Request $message): Response|Error
             return Error::internalError($message->id, 'Error while reading resource');
         }
 
-        // TODO get uri and mimeType from a result. (Change to "blob" if binary)
         return new Response($message->id, [
             'contents' => [
                 [
-                    'uri' => 'text',
-                    'mimeType' => 'text',
-                    'text' => $result,
+                    'uri' => $result->uri,
+                    'mimeType' => $result->mimeType,
+                    $result->type => $result->result,
                 ],
             ],
         ]);