refactor: remove DispatchableRegistry

Author: butschster

src/Capability/Registry.php

@@ -17,11 +17,16 @@
 use Mcp\Capability\Registry\ResourceReference;
 use Mcp\Capability\Registry\ResourceTemplateReference;
 use Mcp\Capability\Registry\ToolReference;
+use Mcp\Event\PromptListChangedEvent;
+use Mcp\Event\ResourceListChangedEvent;
+use Mcp\Event\ResourceTemplateListChangedEvent;
+use Mcp\Event\ToolListChangedEvent;
 use Mcp\Schema\Prompt;
 use Mcp\Schema\Resource;
 use Mcp\Schema\ResourceTemplate;
 use Mcp\Schema\ServerCapabilities;
 use Mcp\Schema\Tool;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 
@@ -56,6 +61,7 @@ final class Registry implements ReferenceProviderInterface, ReferenceRegistryInt
     private array $resourceTemplates = [];
 
     public function __construct(
+        private readonly ?EventDispatcherInterface $eventDispatcher = null,
         private readonly LoggerInterface $logger = new NullLogger(),
     ) {
     }
@@ -68,12 +74,12 @@ public function getCapabilities(): ServerCapabilities
 
         return new ServerCapabilities(
             tools: [] !== $this->tools,
-            toolsListChanged: false,
+            toolsListChanged: $this->eventDispatcher instanceof EventDispatcherInterface,
             resources: [] !== $this->resources || [] !== $this->resourceTemplates,
             resourcesSubscribe: false,
-            resourcesListChanged: false,
+            resourcesListChanged: $this->eventDispatcher instanceof EventDispatcherInterface,
             prompts: [] !== $this->prompts,
-            promptsListChanged: false,
+            promptsListChanged: $this->eventDispatcher instanceof EventDispatcherInterface,
             logging: false,
             completions: true,
         );
@@ -93,6 +99,8 @@ public function registerTool(Tool $tool, callable|array|string $handler, bool $i
         }
 
         $this->tools[$toolName] = new ToolReference($tool, $handler, $isManual);
+
+        $this->eventDispatcher?->dispatch(new ToolListChangedEvent());
     }
 
     public function registerResource(Resource $resource, callable|array|string $handler, bool $isManual = false): void
@@ -109,6 +117,8 @@ public function registerResource(Resource $resource, callable|array|string $hand
         }
 
         $this->resources[$uri] = new ResourceReference($resource, $handler, $isManual);
+
+        $this->eventDispatcher?->dispatch(new ResourceListChangedEvent());
     }
 
     public function registerResourceTemplate(
@@ -134,6 +144,8 @@ public function registerResourceTemplate(
             $isManual,
             $completionProviders,
         );
+
+        $this->eventDispatcher?->dispatch(new ResourceTemplateListChangedEvent());
     }
 
     public function registerPrompt(
@@ -154,6 +166,8 @@ public function registerPrompt(
         }
 
         $this->prompts[$promptName] = new PromptReference($prompt, $handler, $isManual, $completionProviders);
+
+        $this->eventDispatcher?->dispatch(new PromptListChangedEvent());
     }
 
     public function clear(): void

src/Schema/ServerCapabilities.php

@@ -45,21 +45,6 @@ public function __construct(
     ) {
     }
 
-    public function withEvents(): self
-    {
-        return new self(
-            tools: $this->tools,
-            toolsListChanged: true,
-            resources: $this->resources,
-            resourcesSubscribe: $this->resourcesSubscribe,
-            resourcesListChanged: true,
-            prompts: $this->prompts,
-            promptsListChanged: true,
-            logging: $this->logging,
-            completions: $this->completions,
-        );
-    }
-
     /**
      * @param array{
      *     logging?: mixed,

src/Server/ServerBuilder.php

@@ -279,16 +279,12 @@ public function build(): Server
         $logger = $this->logger ?? new NullLogger();
 
         $container = $this->container ?? new Container();
-        $referenceProvider = new Registry($logger);
-        $registry = new DispatchableRegistry(
-            referenceProvider: new Registry($logger),
-            eventDispatcher: $this->eventDispatcher,
-        );
+        $registry = new Registry($this->eventDispatcher, $logger);
 
         $referenceHandler = new ReferenceHandler($container);
-        $toolExecutor = $this->toolExecutor ??= new ToolExecutor($referenceProvider, $referenceHandler, $logger);
-        $resourceReader = $this->resourceReader ??= new ResourceReader($referenceProvider, $referenceHandler);
-        $promptGetter = $this->promptGetter ??= new PromptGetter($referenceProvider, $referenceHandler);
+        $toolExecutor = $this->toolExecutor ??= new ToolExecutor($registry, $referenceHandler, $logger);
+        $resourceReader = $this->resourceReader ??= new ResourceReader($registry, $referenceHandler);
+        $promptGetter = $this->promptGetter ??= new PromptGetter($registry, $referenceHandler);
 
         $this->registerManualElements($registry, $logger);
 
@@ -300,7 +296,7 @@ public function build(): Server
         return new Server(
             jsonRpcHandler: Handler::make(
                 registry: $registry,
-                referenceProvider: $referenceProvider,
+                referenceProvider: $registry,
                 implementation: $this->serverInfo,
                 toolExecutor: $toolExecutor,
                 resourceReader: $resourceReader,