Added Compiler Pass to build ToolChain

Address comments

lint

Update src/mcp-bundle/CHANGELOG.md

Co-authored-by: Oskar Stark <[email protected]>

Update src/mcp-bundle/CHANGELOG.md

Co-authored-by: Oskar Stark <[email protected]>

Update src/mcp-bundle/doc/index.rst

Co-authored-by: Oskar Stark <[email protected]>

Update src/mcp-bundle/doc/index.rst

Co-authored-by: Oskar Stark <[email protected]>

Remove strict types

Author: tom-hart-sky-uk

demo/config/services.yaml

@@ -18,11 +18,3 @@ services:
             - '../src/DependencyInjection/'
             - '../src/Entity/'
             - '../src/Kernel.php'
-
-    mcp.tool_executor:
-        class: Symfony\AI\McpSdk\Capability\ToolChain
-        arguments:
-            - ['@App\MCP\Tools\CurrentTimeTool']
-
-    mcp.tool_collection:
-        alias: mcp.tool_executor

demo/src/MCP/Tools/CurrentTimeTool.php

@@ -15,10 +15,12 @@
 use Symfony\AI\McpSdk\Capability\Tool\ToolCall;
 use Symfony\AI\McpSdk\Capability\Tool\ToolCallResult;
 use Symfony\AI\McpSdk\Capability\Tool\ToolExecutorInterface;
+use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
 
 /**
  * @author Tom Hart <[email protected]>
  */
+#[AutoconfigureTag('mcp.tool')]
 class CurrentTimeTool implements MetadataInterface, ToolExecutorInterface
 {
     public function call(ToolCall $input): ToolCallResult

src/mcp-bundle/CHANGELOG.md

@@ -17,4 +17,6 @@ CHANGELOG
  * Add `McpCommand` providing STDIO interface
  * Add bundle configuration for enabling/disabling transports
  * Add cache-based SSE message storage
- * Add service configuration for MCP server setup
+ * Add service configuration for MCP server setup
+ * Add `Symfony\AI\McpBundle\DependencyInjection\ContainerBuilder\McpToolChainCompilerPass`
+   to find services tagged `mcp.tool` and register them in the MCP tool chain.

src/mcp-bundle/doc/index.rst

@@ -63,6 +63,11 @@ Configuration
                 sse:
                     url: 'http://localhost:8000/sse' # URL to SSE endpoint of MCP server
 
+To add your tools to the MCP server, add the following tag::
+
+    #[AutoconfigureTag('mcp.tool')]
+    class CurrentTimeTool implements MetadataInterface, ToolExecutorInterface
+
 .. _`Model Context Protocol`: https://modelcontextprotocol.io/
 .. _`symfony/mcp-sdk`: https://github.com/symfony/mcp-sdk
 .. _`Claude Desktop`: https://claude.ai/download

src/mcp-bundle/src/DependencyInjection/ContainerBuilder/McpToolChainCompilerPass.php

@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\AI\McpBundle\DependencyInjection\ContainerBuilder;
+
+use Symfony\AI\McpSdk\Capability\Tool\CollectionInterface;
+use Symfony\AI\McpSdk\Capability\Tool\ToolExecutorInterface;
+use Symfony\AI\McpSdk\Capability\ToolChain;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\Compiler\PriorityTaggedServiceTrait;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+
+/**
+ * @author Tom Hart <[email protected]>
+ */
+final class McpToolChainCompilerPass implements CompilerPassInterface
+{
+    use PriorityTaggedServiceTrait;
+
+    public function process(ContainerBuilder $container): void
+    {
+        // If the user has already defined this service, don't override it.
+        if ($container->hasDefinition(ToolExecutorInterface::class)) {
+            return;
+        }
+
+        $definition = new Definition(ToolChain::class);
+
+        $taggedServices = $this->findAndSortTaggedServices('mcp.tool', $container);
+
+        $definition->setArgument(0, $taggedServices);
+
+        $container->setDefinition(ToolExecutorInterface::class, $definition);
+
+        if (!$container->hasDefinition(CollectionInterface::class)) {
+            $container->setAlias(CollectionInterface::class, ToolExecutorInterface::class);
+        }
+    }
+}

src/mcp-bundle/src/McpBundle.php

@@ -13,6 +13,7 @@
 
 use Symfony\AI\McpBundle\Command\McpCommand;
 use Symfony\AI\McpBundle\Controller\McpController;
+use Symfony\AI\McpBundle\DependencyInjection\ContainerBuilder\McpToolChainCompilerPass;
 use Symfony\AI\McpBundle\Routing\RouteLoader;
 use Symfony\Component\Config\Definition\Configurator\DefinitionConfigurator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -22,6 +23,13 @@
 
 final class McpBundle extends AbstractBundle
 {
+    public function build(ContainerBuilder $container): void
+    {
+        parent::build($container);
+
+        $container->addCompilerPass(new McpToolChainCompilerPass());
+    }
+
     public function configure(DefinitionConfigurator $definition): void
     {
         $definition->import('../config/options.php');