Address comments

Author: tom-hart-sky-uk

demo/composer.json

@@ -5,20 +5,6 @@
     "license": "MIT",
     "minimum-stability": "dev",
     "prefer-stable": true,
-    "repositories": [
-        {
-            "type": "path",
-            "url": "../src/mcp-bundle"
-        },
-        {
-            "type": "path",
-            "url": "../src/ai-bundle"
-        },
-        {
-            "type": "path",
-            "url": "../src/mcp-sdk"
-        }
-    ],
     "require": {
         "php": ">=8.4",
         "ext-ctype": "*",
@@ -28,7 +14,7 @@
         "mrmysql/youtube-transcript": "^0.0.5",
         "php-http/discovery": "^1.20",
         "runtime/frankenphp-symfony": "^0.2.0",
-        "symfony/ai-bundle": "dev-main",
+        "symfony/ai-bundle": "@dev",
         "symfony/asset": "7.3.*",
         "symfony/asset-mapper": "7.3.*",
         "symfony/clock": "7.3.*",
@@ -39,8 +25,7 @@
         "symfony/flex": "^2.5",
         "symfony/framework-bundle": "7.3.*",
         "symfony/http-client": "7.3.*",
-        "symfony/mcp-sdk": "dev-main",
-        "symfony/mcp-bundle": "dev-main",
+        "symfony/mcp-bundle": "@dev",
         "symfony/monolog-bundle": "^3.10",
         "symfony/runtime": "7.3.*",
         "symfony/twig-bundle": "7.3.*",

demo/config/services.yaml

@@ -18,7 +18,3 @@ services:
             - '../src/DependencyInjection/'
             - '../src/Entity/'
             - '../src/Kernel.php'
-
-    App\MCP\Tools\CurrentTimeTool:
-        tags:
-            - { name: 'mcp_tool' }

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

@@ -20,4 +20,4 @@ CHANGELOG
  * Add cache-based SSE message storage
  * Add service configuration for MCP server setup
  * Added `\Symfony\AI\McpBundle\DependencyInjection\ContainerBuilder\MCPToolChainCompilerPass`
-   to find services tagged `mcp_tool` and register them in the MCP tool chain.
+   to find services tagged `mcp.tool` and register them in the MCP tool chain.

src/mcp-bundle/doc/index.rst

@@ -65,11 +65,10 @@ Configuration
 
 To add your tools to the MCP server, add the tag:
 
-.. code-block:: yaml
+.. code-block:: php
 
-    App\MCP\Tools\MyCustomTool:
-        tags:
-            - { name: 'mcp_tool' }
+    #[AutoconfigureTag('mcp.tool')]
+    class CurrentTimeTool implements MetadataInterface, ToolExecutorInterface
 
 .. _`Model Context Protocol`: https://modelcontextprotocol.io/
 .. _`symfony/mcp-sdk`: https://github.com/symfony/mcp-sdk

src/mcp-bundle/src/DependencyInjection/ContainerBuilder/MCPToolChainCompilerPass.php renamed to src/mcp-bundle/src/DependencyInjection/ContainerBuilder/McpToolChainCompilerPass.php

@@ -24,7 +24,7 @@
 /**
  * @author Tom Hart <[email protected]>
  */
-class MCPToolChainCompilerPass implements CompilerPassInterface
+final class McpToolChainCompilerPass implements CompilerPassInterface
 {
     use PriorityTaggedServiceTrait;
 
@@ -37,7 +37,7 @@ public function process(ContainerBuilder $container): void
 
         $definition = new Definition(ToolChain::class);
 
-        $taggedServices = $this->findAndSortTaggedServices('mcp_tool', $container);
+        $taggedServices = $this->findAndSortTaggedServices('mcp.tool', $container);
 
         $definition->setArgument(0, $taggedServices);