refactoring how tool should be load

Author: daltonnyx

AgentCrew/__init__.py

@@ -1 +1 @@
-__version__ = "0.6.6-2"
+__version__ = "0.6.6-3"

AgentCrew/main.py

@@ -443,6 +443,7 @@ def setup_agents(services, config_path, remoting_provider=None, model_id=None):
             if remoting_provider:
                 agent.set_custom_system_prompt(agent_manager.get_remote_system_prompt())
                 agent.is_remoting_mode = True
+                agent.activate()
         agent_manager.register_agent(agent)
 
     from AgentCrew.modules.mcpclient.tool import register as mcp_register
@@ -647,13 +648,13 @@ def chat(provider, agent_config, mcp_config, memory_llm, console):
         else:
             ui = ConsoleUI(message_handler)
             ui.start()
-    except SystemExit:
-        from AgentCrew.modules.mcpclient import MCPSessionManager
-
-        MCPSessionManager.get_instance().cleanup()
     except Exception as e:
         print(traceback.format_exc())
         click.echo(f"❌ Error: {str(e)}", err=True)
+    finally:
+        from AgentCrew.modules.mcpclient import MCPSessionManager
+
+        MCPSessionManager.get_instance().cleanup()
 
 
 @cli.command()
@@ -741,13 +742,13 @@ def a2a_server(
         click.echo(f"Starting A2A server on {host}:{port}")
         click.echo(f"Available agents: {', '.join(agent_manager.agents.keys())}")
         server.start()
-    except SystemExit:
-        from AgentCrew.modules.mcpclient import MCPSessionManager
-
-        MCPSessionManager.get_instance().cleanup()
     except Exception as e:
         print(traceback.format_exc())
         click.echo(f"❌ Error: {str(e)}", err=True)
+    finally:
+        from AgentCrew.modules.mcpclient import MCPSessionManager
+
+        MCPSessionManager.get_instance().cleanup()
 
 
 @cli.command()

AgentCrew/modules/agents/local_agent.py

@@ -213,17 +213,17 @@ def activate(self):
         if self.is_active:
             return True  # Already active
 
-        self.is_active = True
+        from AgentCrew.modules.mcpclient.manager import MCPSessionManager
 
         self.register_tools()
-        from AgentCrew.modules.mcpclient.manager import MCPSessionManager
+        self._register_tools_with_llm()
 
         # Reinitialize MCP session manager for the current agent
-        mcp_manager = MCPSessionManager.get_instance()
-        if mcp_manager.initialized:
-            mcp_manager.initialize_for_agent(self.name)
+        if not self.is_remoting_mode:
+            mcp_manager = MCPSessionManager.get_instance()
+            if mcp_manager.initialized:
+                mcp_manager.initialize_for_agent(self.name)
 
-        self._register_tools_with_llm()
         system_prompt = self.get_system_prompt()
         if self.custom_system_prompt:
             system_prompt = system_prompt + "\n---\n\n" + self.custom_system_prompt
@@ -232,6 +232,7 @@ def activate(self):
 
         self.llm.set_system_prompt(system_prompt)
         self.llm.temperature = self.temperature if self.temperature is not None else 0.4
+        self.is_active = True
         return True
 
     def deactivate(self):

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agentcrew-ai"
-version = "0.6.6-2"
+version = "0.6.6-3"
 requires-python = ">=3.12"
 classifiers = [
     "Programming Language :: Python :: 3",