feat: add result classes

Author: Nyholm

examples/cli/src/Manager/PromptManager.php

@@ -37,6 +37,6 @@ public function get(PromptGet $request): mixed
             }
         }
 
-        throw PromptNotFoundException::create($request);
+        throw new PromptNotFoundException($request);
     }
 }

examples/cli/src/Manager/ResourceManager.php

@@ -32,13 +32,12 @@ public function read(ResourceRead $request): ResourceReadResult
                 // In a real implementation, you would read the resource from its URI.
                 // Here we just return a dummy string for demonstration purposes.
                 return new ResourceReadResult(
-                    $request->id,
                     'Content of '.$resource->getName(),
                     $resource->getUri(),
                 );
             }
         }
 
-        throw new ResourceNotFoundException();
+        throw new ResourceNotFoundException($request);
     }
 }

examples/cli/src/Manager/ToolManager.php

@@ -37,6 +37,6 @@ public function execute(ToolCall $toolCall): mixed
             }
         }
 
-        throw ToolNotFoundException::create($toolCall);
+        throw new ToolNotFoundException($toolCall);
     }
 }

src/Capability/Prompt/PromptGetResult.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpLlm\McpSdk\Capability\Prompt;
+
+final readonly class PromptGetResult
+{
+    /**
+     * @param list<PromptGetResultMessages> $messages
+     */
+    public function __construct(
+        public string $description,
+        public array $messages = [],
+    ) {
+    }
+}

src/Capability/Prompt/PromptGetResultMessages.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpLlm\McpSdk\Capability\Prompt;
+
+final readonly class PromptGetResultMessages
+{
+    public function __construct(
+        public string $role,
+        public string $result,
+        public string $mimeType,
+        /**
+         * @var "text"|"image"|"audio"|"resource"
+         */
+        public string $type = 'text',
+        public ?string $uri = null,
+    ) {
+    }
+}

src/Capability/Prompt/PromptGetterInterface.php

@@ -11,5 +11,5 @@ interface PromptGetterInterface
      * @throws PromptGetException      if the prompt execution fails
      * @throws PromptNotFoundException if the prompt is not found
      */
-    public function get(PromptGet $request): mixed;
+    public function get(PromptGet $request): PromptGetResult;
 }

src/Capability/Resource/ResourceReadResult.php

@@ -7,7 +7,6 @@
 final readonly class ResourceReadResult
 {
     public function __construct(
-        public string $id,
         public string $result,
         public string $uri,
 

src/Capability/Tool/ToolCallResult.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpLlm\McpSdk\Capability\Tool;
+
+final readonly class ToolCallResult
+{
+    public function __construct(
+        public string $result,
+        public string $mimeType,
+        /**
+         * @var "text"|"image"|"audio"|"resource"
+         */
+        public string $type = 'text',
+        public bool $isError = false,
+        public ?string $uri = null,
+    ) {
+    }
+}

src/Capability/Tool/ToolExecutorInterface.php

@@ -11,5 +11,5 @@ interface ToolExecutorInterface
      * @throws ToolExecutionException if the tool execution fails
      * @throws ToolNotFoundException  if the tool is not found
      */
-    public function execute(ToolCall $toolCall): mixed;
+    public function execute(ToolCall $toolCall): ToolCallResult;
 }

src/Server/RequestHandler/PromptGetHandler.php

@@ -29,10 +29,39 @@ public function createResponse(Request $message): Response|Error
             return Error::internalError($message->id, 'Error while handling prompt');
         }
 
+        $messages = [];
+        foreach ($result->messages as $resultMessage) {
+            $content = match ($result->type) {
+                'text' => [
+                    'type' => 'text',
+                    'text' => $result->result,
+                ],
+                'image', 'audio' => [
+                    'type' => $result->type,
+                    'data' => $result->result,
+                    'mimeType' => $result->mimeType,
+                ],
+                'resource' => [
+                    'type' => 'resource',
+                    'resource' => [
+                        'uri' => $result->uri,
+                        'mimeType' => $result->mimeType,
+                        'text' => $result->result,
+                    ],
+                ],
+                // TODO better exception
+                default => throw new \InvalidArgumentException('Unsupported PromptGet result type: ' . $result->type),
+            };
+
+            $messages[] = [
+                'role' => $resultMessage->role,
+                'content' => $content,
+            ];
+        }
+
         return new Response($message->id, [
-            'content' => [
-                ['type' => 'text', 'text' => $result],
-            ],
+            'description' => $result->description,
+            'messages' => $messages,
         ]);
     }