Move TraceableRegistry to McpBundle with conditional registration

- Move profiler services registration from services.php to McpBundle
- Make TraceableRegistry and DataCollector conditional on kernel.debug
- Use decoration feature with .inner reference
- Drop ai. prefix in favor of mcp. prefix

Author: camilleislasse

src/mcp-bundle/config/services.php

@@ -14,8 +14,6 @@
 use Mcp\Capability\Registry;
 use Mcp\Server;
 use Mcp\Server\Builder;
-use Symfony\AI\McpBundle\Profiler\DataCollector;
-use Symfony\AI\McpBundle\Profiler\TraceableRegistry;
 
 return static function (ContainerConfigurator $container): void {
     $container->services()
@@ -24,27 +22,20 @@
             ->args(['mcp'])
             ->tag('monolog.logger', ['channel' => 'mcp'])
 
-        ->set('ai.mcp.registry.inner', Registry::class)
+        ->set('mcp.registry', Registry::class)
             ->args([service('event_dispatcher'), service('monolog.logger.mcp')])
 
-        ->set('ai.mcp.registry', TraceableRegistry::class)
-            ->args([service('ai.mcp.registry.inner')])
-
         ->set('mcp.server.builder', Builder::class)
             ->factory([Server::class, 'builder'])
             ->call('setServerInfo', [param('mcp.app'), param('mcp.version')])
             ->call('setPaginationLimit', [param('mcp.pagination_limit')])
             ->call('setInstructions', [param('mcp.instructions')])
             ->call('setLogger', [service('monolog.logger.mcp')])
             ->call('setEventDispatcher', [service('event_dispatcher')])
-            ->call('setRegistry', [service('ai.mcp.registry')])
+            ->call('setRegistry', [service('mcp.registry')])
             ->call('setSession', [service('mcp.session.store')])
             ->call('setDiscovery', [param('kernel.project_dir'), param('mcp.discovery.scan_dirs'), param('mcp.discovery.exclude_dirs')])
 
         ->set('mcp.server', Server::class)
-            ->factory([service('mcp.server.builder'), 'build'])
-
-        ->set('ai.mcp.data_collector', DataCollector::class)
-            ->args([service('ai.mcp.registry')])
-            ->tag('data_collector');
+            ->factory([service('mcp.server.builder'), 'build']);
 };

src/mcp-bundle/src/McpBundle.php

@@ -21,13 +21,16 @@
 use Symfony\AI\McpBundle\Command\McpCommand;
 use Symfony\AI\McpBundle\Controller\McpController;
 use Symfony\AI\McpBundle\DependencyInjection\McpPass;
+use Symfony\AI\McpBundle\Profiler\DataCollector;
+use Symfony\AI\McpBundle\Profiler\TraceableRegistry;
 use Symfony\AI\McpBundle\Routing\RouteLoader;
 use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
 use Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory;
 use Symfony\Component\Config\Definition\Configurator\DefinitionConfigurator;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\Bundle\AbstractBundle;
@@ -55,6 +58,19 @@ public function loadExtension(array $config, ContainerConfigurator $container, C
 
         $this->registerMcpAttributes($builder);
 
+        if ($builder->getParameter('kernel.debug')) {
+            $traceableRegistry = (new Definition('mcp.traceable_registry'))
+                ->setClass(TraceableRegistry::class)
+                ->setArguments([new Reference('.inner')])
+                ->setDecoratedService('mcp.registry');
+            $builder->setDefinition('mcp.traceable_registry', $traceableRegistry);
+
+            $dataCollector = (new Definition(DataCollector::class))
+                ->setArguments([new Reference('mcp.traceable_registry')])
+                ->addTag('data_collector');
+            $builder->setDefinition('mcp.data_collector', $dataCollector);
+        }
+
         if (isset($config['client_transports'])) {
             $this->configureClient($config['client_transports'], $config['http'], $builder);
         }