refactor agent activation flow

Author: daltonnyx

AgentCrew/__init__.py

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

AgentCrew/modules/agents/local_agent.py

@@ -213,7 +213,16 @@ def activate(self):
         if self.is_active:
             return True  # Already active
 
+        self.is_active = True
+
         self.register_tools()
+        from AgentCrew.modules.mcpclient.manager import MCPSessionManager
+
+        # Reinitialize MCP session manager for the current agent
+        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:
@@ -223,7 +232,6 @@ 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):

AgentCrew/modules/agents/manager.py

@@ -117,13 +117,6 @@ def select_agent(self, agent_name: str) -> bool:
                     )
             # Activate the new agent
             if self.current_agent:
-                if isinstance(self.current_agent, LocalAgent):
-                    from AgentCrew.modules.mcpclient.manager import MCPSessionManager
-
-                    mcp_manager = MCPSessionManager.get_instance()
-                    if mcp_manager.initialized:
-                        mcp_manager.initialize_for_agent(self.current_agent.name)
-
                 self.current_agent.activate()
 
             return True
@@ -306,29 +299,11 @@ def update_llm_service(self, llm_service):
         Args:
             llm_service: The new LLM service to use
         """
-        if self.current_agent:
-            # Deactivate the current agent
-            self.current_agent.deactivate()
-
-            if isinstance(self.current_agent, LocalAgent):
-                # Update the LLM service for the current agent
-                self.current_agent.update_llm_service(llm_service)
-
-                from AgentCrew.modules.mcpclient.manager import MCPSessionManager
 
-                # Reinitialize MCP session manager for the current agent
-                mcp_manager = MCPSessionManager.get_instance()
-                if mcp_manager.initialized:
-                    mcp_manager.initialize_for_agent(self.current_agent.name)
-
-            # Reactivate the agent with the new LLM service
-            self.current_agent.activate()
-
-            # Update all other agents' LLM service but keep them deactivated
-            for _, agent in self.agents.items():
-                if agent != self.current_agent:
-                    if isinstance(agent, LocalAgent):
-                        agent.update_llm_service(llm_service)
+        # Update all other agents' LLM service but keep them deactivated
+        for _, agent in self.agents.items():
+            if isinstance(agent, LocalAgent):
+                agent.update_llm_service(llm_service)
 
     def get_remote_system_prompt(self):
         return """

pyproject.toml

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