Catch more exceptions

Author: Nyholm

src/mcp-sdk/src/Message/Error.php

@@ -18,6 +18,7 @@
     public const INVALID_PARAMS = -32602;
     public const INTERNAL_ERROR = -32603;
     public const PARSE_ERROR = -32700;
+    public const RESOURCE_NOT_FOUND = -32002;
 
     public function __construct(
         public string|int $id,

src/mcp-sdk/src/Message/Request.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\AI\McpSdk\Message;
 
-final class Request implements \JsonSerializable, \Stringable
+final readonly class Request implements \JsonSerializable, \Stringable
 {
     /**
      * @param array<string, mixed>|null $params

src/mcp-sdk/src/Server/JsonRpcHandler.php

@@ -89,11 +89,15 @@ public function process(string $input): iterable
             } catch (NotFoundExceptionInterface $e) {
                 $this->logger->warning(\sprintf('Failed to create response: %s', $e->getMessage()), ['exception' => $e]);
 
-                yield $this->encodeResponse(Error::methodNotFound($message->id ?? 0, $e->getMessage()));
+                yield $this->encodeResponse(Error::methodNotFound($message->id, $e->getMessage()));
             } catch (\InvalidArgumentException $e) {
                 $this->logger->warning(\sprintf('Invalid argument: %s', $e->getMessage()), ['exception' => $e]);
 
-                yield $this->encodeResponse(Error::invalidParams($message->id ?? 0, $e->getMessage()));
+                yield $this->encodeResponse(Error::invalidParams($message->id, $e->getMessage()));
+            } catch (\Throwable $e) {
+                $this->logger->critical(\sprintf('Uncaught exception: %s', $e->getMessage()), ['exception' => $e]);
+
+                yield $this->encodeResponse(Error::internalError($message->id, $e->getMessage()));
             }
         }
     }

src/mcp-sdk/src/Server/RequestHandler/ResourceReadHandler.php

@@ -14,6 +14,7 @@
 use Symfony\AI\McpSdk\Capability\Resource\ResourceRead;
 use Symfony\AI\McpSdk\Capability\Resource\ResourceReaderInterface;
 use Symfony\AI\McpSdk\Exception\ExceptionInterface;
+use Symfony\AI\McpSdk\Exception\ResourceNotFoundException;
 use Symfony\AI\McpSdk\Message\Error;
 use Symfony\AI\McpSdk\Message\Request;
 use Symfony\AI\McpSdk\Message\Response;
@@ -31,6 +32,8 @@ public function createResponse(Request $message): Response|Error
 
         try {
             $result = $this->reader->read(new ResourceRead(uniqid('', true), $uri));
+        } catch (ResourceNotFoundException $e) {
+            return new Error($message->id, Error::RESOURCE_NOT_FOUND, $e->getMessage());
         } catch (ExceptionInterface) {
             return Error::internalError($message->id, 'Error while reading resource');
         }