[McpBundle] Wire & configure services explicitly

Author: valtzu

src/mcp-bundle/config/services.php

@@ -25,36 +25,51 @@
 
 return static function (ContainerConfigurator $container): void {
     $container->services()
-        ->defaults()
-            ->autowire()
-            ->autoconfigure()
         ->instanceof(NotificationHandlerInterface::class)
             ->tag('mcp.server.notification_handler')
         ->instanceof(RequestHandlerInterface::class)
             ->tag('mcp.server.request_handler')
-
-        ->set(InitializedHandler::class)
-        ->set(InitializeHandler::class)
-        ->args([
-            '$name' => param('mcp.app'),
-            '$version' => param('mcp.version'),
-        ])
-        ->set(PingHandler::class)
-        ->set(ToolCallHandler::class)
-        ->set(ToolListHandler::class)
+        ->set('mcp.server.notification_handler.initialized', InitializedHandler::class)
+            ->args([])
+            ->tag('mcp.server.notification_handler')
+        ->set('mcp.server.request_handler.initialize', InitializeHandler::class)
+            ->args([
+                '$name' => param('mcp.app'),
+                '$version' => param('mcp.version'),
+            ])
+            ->tag('mcp.server.request_handler')
+        ->set('mcp.server.request_handler.ping', PingHandler::class)
+            ->args([])
+            ->tag('mcp.server.request_handler')
+        ->set('mcp.server.request_handler.tool_call', ToolCallHandler::class)
+            ->args([
+                '$toolExecutor' => service('mcp.tool_executor'),
+            ])
+            ->tag('mcp.server.request_handler')
+        ->set('mcp.server.request_handler.tool_list', ToolListHandler::class)
+            ->args([
+                '$collection' => service('mcp.tool_collection'),
+                '$pageSize' => 20,
+            ])
 
         ->set('mcp.message_factory', Factory::class)
+            ->args([])
         ->set('mcp.server.json_rpc', JsonRpcHandler::class)
             ->args([
                 '$messageFactory' => service('mcp.message_factory'),
                 '$requestHandlers' => tagged_iterator('mcp.server.request_handler'),
                 '$notificationHandlers' => tagged_iterator('mcp.server.notification_handler'),
+                '$logger' => service('logger')->nullOnInvalid(),
             ])
         ->set('mcp.server', Server::class)
             ->args([
                 '$jsonRpcHandler' => service('mcp.server.json_rpc'),
+                '$logger' => service('logger')->nullOnInvalid(),
             ])
             ->alias(Server::class, 'mcp.server')
-        ->set(CachePoolStore::class)
+        ->set('mcp.server.sse.store.cache_pool', CachePoolStore::class)
+            ->args([
+                '$cachePool' => service('cache.app'),
+            ])
     ;
 };

src/mcp-bundle/src/McpBundle.php

@@ -17,6 +17,7 @@
 use Symfony\Component\Config\Definition\Configurator\DefinitionConfigurator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\Bundle\AbstractBundle;
 
 final class McpBundle extends AbstractBundle
@@ -52,13 +53,19 @@ private function configureClient(array $transports, ContainerBuilder $container)
 
         if ($transports['stdio']) {
             $container->register('mcp.server.command', McpCommand::class)
-                ->setAutowired(true)
+                ->setArguments([
+                    '$server' => new Reference('mcp.server'),
+                ])
                 ->addTag('console.command');
         }
 
         if ($transports['sse']) {
             $container->register('mcp.server.controller', McpController::class)
-                ->setAutowired(true)
+                ->setArguments([
+                    '$server' => new Reference('mcp.server'),
+                    '$store' => new Reference('mcp.server.sse.store.cache_pool'),
+                    '$urlGenerator' => new Reference('router'),
+                ])
                 ->setPublic(true)
                 ->addTag('controller.service_arguments');
         }