Rebase concrete exceptions onto Mcp\Exception base classes

src/Exception/ClientRegistrationException.php

@@ -11,7 +11,7 @@
 
 namespace Mcp\Exception;
 
-final class ClientRegistrationException extends \RuntimeException implements ExceptionInterface
+final class ClientRegistrationException extends RuntimeException
 {
     public function __construct(
         string $message,

src/Exception/ElicitationException.php

@@ -19,6 +19,6 @@
  *
  * @author Johannes Wachter <johannes@sulu.io>
  */
-final class ElicitationException extends \RuntimeException implements ExceptionInterface
+final class ElicitationException extends RuntimeException
 {
 }

src/Exception/HandlerNotFoundException.php

@@ -14,6 +14,6 @@
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-class HandlerNotFoundException extends \InvalidArgumentException implements NotFoundExceptionInterface
+class HandlerNotFoundException extends InvalidArgumentException implements NotFoundExceptionInterface
 {
 }

src/Exception/InvalidCursorException.php

@@ -14,7 +14,7 @@
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-final class InvalidCursorException extends \InvalidArgumentException implements ExceptionInterface
+final class InvalidCursorException extends InvalidArgumentException
 {
     public function __construct(
         public readonly string $cursor,

src/Exception/InvalidInputMessageException.php

@@ -14,7 +14,7 @@
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-class InvalidInputMessageException extends \InvalidArgumentException implements ExceptionInterface
+class InvalidInputMessageException extends InvalidArgumentException
 {
     private string|int|null $requestId = null;
 

src/Exception/MissingRequiredClientCapabilityException.php

@@ -22,7 +22,7 @@
  *
  * @author Christopher Hertel <mail@christopher-hertel.de>
  */
-class MissingRequiredClientCapabilityException extends \RuntimeException implements ExceptionInterface
+class MissingRequiredClientCapabilityException extends RuntimeException
 {
     public function __construct(
         public readonly ClientCapabilities $requiredCapabilities,

src/Exception/PromptGetException.php

@@ -14,6 +14,6 @@
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-final class PromptGetException extends \RuntimeException implements ExceptionInterface
+final class PromptGetException extends RuntimeException
 {
 }

src/Exception/PromptNotFoundException.php

@@ -14,7 +14,7 @@
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-final class PromptNotFoundException extends \RuntimeException implements NotFoundExceptionInterface
+final class PromptNotFoundException extends RuntimeException implements NotFoundExceptionInterface
 {
     public function __construct(
         public readonly string $name,

src/Exception/RegistryException.php

@@ -13,7 +13,7 @@
 
 use Mcp\Schema\JsonRpc\Error;
 
-final class RegistryException extends \Exception implements ExceptionInterface
+final class RegistryException extends Exception
 {
     public static function invalidParams(string $message = 'Invalid params', ?\Throwable $previous = null): self
     {

src/Exception/ResourceNotFoundException.php

@@ -14,7 +14,7 @@
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-final class ResourceNotFoundException extends \RuntimeException implements NotFoundExceptionInterface
+final class ResourceNotFoundException extends RuntimeException implements NotFoundExceptionInterface
 {
     public function __construct(
         public readonly string $uri,

src/Exception/ResourceReadException.php

@@ -14,6 +14,6 @@
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-final class ResourceReadException extends \RuntimeException implements ExceptionInterface
+final class ResourceReadException extends RuntimeException
 {
 }

src/Exception/RootsException.php

@@ -19,6 +19,6 @@
  *
  * @author Johannes Wachter <johannes@sulu.io>
  */
-final class RootsException extends \RuntimeException implements ExceptionInterface
+final class RootsException extends RuntimeException
 {
 }

src/Exception/RuntimeException.php

@@ -14,6 +14,6 @@
 /**
  * @author Christopher Hertel <mail@christopher-hertel.de>
  */
-final class RuntimeException extends \RuntimeException implements ExceptionInterface
+class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
 }

src/Exception/SamplingException.php

@@ -19,6 +19,6 @@
  *
  * @author Kyrian Obikwelu <koshnawaza@gmail.com>
  */
-final class SamplingException extends \RuntimeException implements ExceptionInterface
+final class SamplingException extends RuntimeException
 {
 }

src/Exception/ToolCallException.php

@@ -14,6 +14,6 @@
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-final class ToolCallException extends \RuntimeException implements ExceptionInterface
+final class ToolCallException extends RuntimeException
 {
 }

src/Exception/ToolNotFoundException.php

@@ -14,7 +14,7 @@
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-final class ToolNotFoundException extends \RuntimeException implements NotFoundExceptionInterface
+final class ToolNotFoundException extends RuntimeException implements NotFoundExceptionInterface
 {
     public function __construct(
         public readonly string $name,

src/JsonRpc/MessageFactory.php

@@ -191,6 +191,8 @@ private function createMessage(array $data): MessageInterface
             $messageClass = $this->findMessageClassByMethod($data['method']);
 
             return $messageClass::fromArray($data);
+        } catch (InvalidInputMessageException $e) {
+            throw $e;
         } catch (InvalidArgumentException $e) {
             throw new InvalidInputMessageException($e->getMessage(), 0, $e);
         }

tests/Unit/Exception/ExceptionHierarchyTest.php

@@ -0,0 +1,71 @@
+<?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\Tests\Unit\Exception;
+
+use Mcp\Exception\BadMethodCallException;
+use Mcp\Exception\Exception;
+use Mcp\Exception\ExceptionInterface;
+use Mcp\Exception\InvalidArgumentException;
+use Mcp\Exception\LogicException;
+use Mcp\Exception\RuntimeException;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+
+final class ExceptionHierarchyTest extends TestCase
+{
+    /**
+     * The SDK-level base classes every concrete exception must descend from,
+     * so that `catch (\Mcp\Exception\RuntimeException)` and friends work.
+     */
+    private const BASE_CLASSES = [
+        Exception::class,
+        RuntimeException::class,
+        InvalidArgumentException::class,
+        LogicException::class,
+        BadMethodCallException::class,
+    ];
+
+    #[DataProvider('provideConcreteExceptions')]
+    public function testExceptionExtendsAnMcpBaseClass(string $class): void
+    {
+        $this->assertTrue(
+            is_subclass_of($class, ExceptionInterface::class),
+            \sprintf('"%s" must implement "%s".', $class, ExceptionInterface::class),
+        );
+
+        foreach (self::BASE_CLASSES as $base) {
+            if (is_subclass_of($class, $base)) {
+                $this->addToAssertionCount(1);
+
+                return;
+            }
+        }
+
+        $this->fail(\sprintf('"%s" must extend one of the Mcp\Exception base classes, so it is catchable through them.', $class));
+    }
+
+    /**
+     * @return iterable<string, array{class-string}>
+     */
+    public static function provideConcreteExceptions(): iterable
+    {
+        foreach (glob(\dirname(__DIR__, 3).'/src/Exception/*.php') ?: [] as $file) {
+            $class = 'Mcp\Exception\\'.basename($file, '.php');
+
+            if (!class_exists($class) || \in_array($class, self::BASE_CLASSES, true)) {
+                continue;
+            }
+
+            yield $class => [$class];
+        }
+    }
+}

tests/Unit/JsonRpc/MessageFactoryTest.php

@@ -241,6 +241,18 @@ public function testMissingAllIdentifyingFields(): void
         $this->assertStringContainsString('missing', $results[0]->getMessage());
     }
 
+    public function testInvalidInputMessageExceptionIsNotReWrapped(): void
+    {
+        $missingMethod = $this->factory->create('{"jsonrpc": "2.0", "params": {}}');
+        $unknownMethod = $this->factory->create('{"jsonrpc": "2.0", "method": "unknown/method", "id": 1}');
+
+        foreach ([$missingMethod[0], $unknownMethod[0]] as $exception) {
+            $this->assertInstanceOf(InvalidInputMessageException::class, $exception);
+            $this->assertSame(InvalidInputMessageException::class, $exception::class);
+            $this->assertNull($exception->getPrevious());
+        }
+    }
+
     public function testUnknownMethod(): void
     {
         $json = '{"jsonrpc": "2.0", "method": "unknown/method", "id": 1}';