Merge pull request #134 from XSpoonAi/feat/modify-cmd

the cli imports the custom agent

Author: veithly

cli/commands.py

@@ -16,6 +16,7 @@
 from prompt_toolkit.styles import Style
 
 from spoon_ai.agents import SpoonReactAI, SpoonReactMCP
+from spoon_ai.agents.my_agents import CUSTOM_AGENTS
 from spoon_ai.retrieval.document_loader import DocumentLoader
 from spoon_ai.schema import Message, Role
 from spoon_ai.trade.aggregator import Aggregator
@@ -302,6 +303,14 @@ def _init_commands(self):
             aliases=["sysinfo", "status", "info"]
         ))
 
+        # Tool Status Command
+        self.add_command(SpoonCommand(
+            name="tool-status",
+            description="Check tool loading status and diagnose issues",
+            handler=self._handle_tool_status,
+            aliases=["tools", "tool-check"]
+        ))
+
         # Configuration Migration Commands
         self.add_command(SpoonCommand(
             name="migrate-config",
@@ -335,7 +344,9 @@ def _help(self, input_list: List[str]):
         if len(input_list) <= 1:
             # show all available commands
             logger.info("Available commands:")
-            for command in self.commands.values():
+            # Use set to deduplicate commands (since aliases point to same object)
+            unique_commands = set(self.commands.values())
+            for command in sorted(unique_commands, key=lambda x: x.name):
                 logger.info(f"  {command.name}: {command.description}")
         else:
             # show help for a specific command
@@ -437,8 +448,13 @@ async def _load_agent(self, name: str):
             elif agent_class == "SpoonReactMCP":
                 # For MCP agents, the unified system handles MCP server lifecycle
                 agent_instance = SpoonReactMCP(**agent_instance_config)
+            elif agent_class in CUSTOM_AGENTS:
+                # Handle custom agents
+                custom_agent_class = CUSTOM_AGENTS[agent_class]
+                agent_instance = custom_agent_class(**agent_instance_config)
             else:
                 logger.error(f"Unknown agent class: {agent_class}")
+                logger.error(f"Available custom agents: {list(CUSTOM_AGENTS.keys())}")
                 return
 
             # Load tools using the unified system
@@ -1659,7 +1675,14 @@ def _handle_system_info(self, input_list: List[str]):
             print_formatted_text(f"  Agent type: {type(self.current_agent).__name__}")
             if hasattr(self.current_agent, 'avaliable_tools'):
                 tool_count = len(self.current_agent.avaliable_tools.tools)
-                print_formatted_text(f"  Available tools: {tool_count}")
+                if tool_count > 0:
+                    print_formatted_text(PromptHTML(f"  <ansigreen>Available tools: {tool_count}</ansigreen>"))
+                    # Show tool names for debugging
+                    tool_names = [tool.name for tool in self.current_agent.avaliable_tools.tools]
+                    print_formatted_text(f"    Tools: {', '.join(tool_names)}")
+                else:
+                    print_formatted_text(PromptHTML("  <ansired>Available tools: 0</ansired>"))
+                    print_formatted_text("    ⚠️  No tools loaded - check configuration and network connectivity")
             if hasattr(self.current_agent, 'llm') and self.current_agent.llm:
                 llm_info = f"{getattr(self.current_agent.llm, 'llm_provider', 'unknown')}"
                 model_name = getattr(self.current_agent.llm, 'model_name', 'unknown')
@@ -1986,4 +2009,55 @@ def _show_migrate_help(self):
         print_formatted_text("Examples:")
         print_formatted_text("  migrate-config                           # Interactive migration")
         print_formatted_text("  migrate-config -f my_config.json         # Migrate specific file")
-        print_formatted_text("  migrate-config --dry-run                 # Preview migration")
+        print_formatted_text("  migrate-config --dry-run                 # Preview migration")
+
+    async def _handle_tool_status(self, input_list: List[str]):
+        """Check tool loading status and diagnose issues"""
+        print("🔧 Tool Status Check")
+        print("=" * 50)
+        
+        if not self.current_agent:
+            print("❌ No agent loaded")
+            print("  Please load an agent first with: load-agent <agent_name>")
+            return
+        
+        print(f"✓ Agent: {self.current_agent.name}")
+        print(f"  Agent type: {type(self.current_agent).__name__}")
+        
+        # Check tools in agent
+        if hasattr(self.current_agent, 'avaliable_tools'):
+            tool_count = len(self.current_agent.avaliable_tools.tools)
+            print(f"✓ Tools loaded: {tool_count}")
+            
+            if tool_count > 0:
+                print("  Tool details:")
+                for i, tool in enumerate(self.current_agent.avaliable_tools.tools, 1):
+                    print(f"    {i}. {tool.name}")
+                    print(f"       Description: {tool.description}")
+                    if hasattr(tool, 'mcp_transport'):
+                        print(f"       Type: MCP tool")
+                    else:
+                        print(f"       Type: Built-in tool")
+            else:
+                print("❌ No tools loaded")
+                print("  Possible causes:")
+                print("    • MCP server connection timeout")
+                print("    • Network connectivity issues")
+                print("    • Configuration errors")
+                print("    • Missing dependencies")
+                
+                # Try to reload tools
+                print("  Attempting to reload tools...")
+                try:
+                    tools = await self.config_manager.load_agent_tools(self.current_agent.name)
+                    if tools:
+                        self.current_agent.avaliable_tools.add_tools(*tools)
+                        print(f"✓ Successfully reloaded {len(tools)} tools")
+                    else:
+                        print("❌ Still no tools after reload")
+                except Exception as e:
+                    print(f"❌ Failed to reload tools: {e}")
+        else:
+            print("❌ Agent doesn't have tool manager")
+        
+        print("=" * 50)

spoon_ai/config/manager.py

@@ -1,5 +1,6 @@
 """Configuration manager for unified tool configuration."""
 
+import asyncio
 import json
 import logging
 import os
@@ -82,17 +83,33 @@ async def load_agent_tools(self, agent_name: str) -> List[BaseTool]:
 
         try:
             for tool_config in agent_config.tools:
-                try:
-                    tool = await self.tool_factory.create_tool(tool_config)
-                    if tool:  # Skip disabled tools
-                        tools.append(tool)
-                        logger.info(f"Created tool: {tool_config.name}")
-                except Exception as e:
-                    logger.error(f"Failed to create tool {tool_config.name}: {e}")
-                    # Continue with other tools instead of failing completely
-                    continue
+                tool_created = False
+                max_retries = 2 if tool_config.type == "mcp" else 1
+                
+                for attempt in range(max_retries):
+                    try:
+                        tool = await self.tool_factory.create_tool(tool_config)
+                        if tool:  # Skip disabled tools
+                            tools.append(tool)
+                            logger.info(f"Created tool: {tool_config.name}")
+                            tool_created = True
+                            break
+                    except Exception as e:
+                        if attempt < max_retries - 1:
+                            logger.warning(f"Failed to create tool {tool_config.name} (attempt {attempt + 1}/{max_retries}): {e}")
+                            logger.info(f"Retrying tool {tool_config.name}...")
+                            await asyncio.sleep(1)  # Wait 1 second before retry
+                        else:
+                            logger.error(f"Failed to create tool {tool_config.name} after {max_retries} attempts: {e}")
+                            # Continue with other tools instead of failing completely
+                            continue
+                
+                if not tool_created:
+                    logger.warning(f"Skipping tool {tool_config.name} due to creation failure")
 
             logger.info(f"Loaded {len(tools)} tools for agent {agent_name}")
+            if len(tools) == 0:
+                logger.warning(f"No tools were successfully loaded for agent {agent_name}")
             return tools
 
         except Exception as e:

spoon_ai/config/mcp_manager.py

@@ -285,7 +285,7 @@ async def _start_server_internal(self, server: MCPServerInstance) -> None:
                     }
                 }
 
-                stdout, stderr = test_process.communicate(input=json.dumps(init_request), timeout=10)
+                stdout, stderr = test_process.communicate(input=json.dumps(init_request), timeout=30)
 
                 if test_process.returncode != 0:
                     raise Exception(f"Process failed with return code {test_process.returncode}: {stderr}")