Bugfix: Register MCP Tools Like MCP Resources (ag2ai#1950)

* test successful tool registration

* unconditionally register for llm

Author: JamesVorder

autogen/tools/tool.py

@@ -96,8 +96,7 @@ def register_for_llm(self, agent: "ConversableAgent") -> None:
         """
         if self._func_schema:
             agent.update_tool_signature(self._func_schema, is_remove=False)
-        else:
-            agent.register_for_llm()(self)
+        agent.register_for_llm()(self)
 
     def register_for_execution(self, agent: "ConversableAgent") -> None:
         """Registers the tool for direct execution by a ConversableAgent.

test/mcp/test_mcp.py

@@ -136,6 +136,24 @@ async def test_convert_resource(self, server_params: "StdioServerParameters") ->
             ]
             assert result.contents == expected_result
 
+    @pytest.mark.asyncio
+    async def test_register_for_llm_tool(
+        self, server_params: "StdioServerParameters", credentials_gpt_4o_mini: Credentials
+    ) -> None:  # type: ignore[no-any-unimported]
+        async with (
+            stdio_client(server_params) as (read, write),
+            ClientSession(read, write, read_timeout_seconds=timedelta(seconds=30)) as session,
+        ):
+            # Initialize the connection
+            await session.initialize()
+            toolkit = await create_toolkit(session=session)
+            agent = AssistantAgent(
+                name="agent",
+                llm_config=credentials_gpt_4o_mini.llm_config,
+            )
+            toolkit.register_for_llm(agent)
+            assert len(agent.tools) == len(toolkit.tools)
+
     @pytest.mark.asyncio
     async def test_convert_resource_with_download_folder(self, server_params: "StdioServerParameters") -> None:  # type: ignore[no-any-unimported]
         async with (