✨ Unit test: The terminal tool supports password login #1052

Author: WMC001

backend/database/tool_db.py

@@ -165,8 +165,7 @@ def add_tool_field(tool_info):
         tool_params = tool.params
         for ele in tool_params:
             param_name = ele["name"]
-            param_value = tool_info["params"].get(param_name)
-            ele["default"] = param_value
+            ele["default"] = tool_info["params"].get(param_name)
 
         tool_dict = as_dict(tool)
         tool_dict["params"] = tool_params

docker/deploy.sh

@@ -386,19 +386,19 @@ deploy_infrastructure() {
   echo "🔧 Starting infrastructure services..."
   INFRA_SERVICES="nexent-elasticsearch nexent-postgresql nexent-minio redis"
 
-  # Add openssh-server if Terminal tool is enabled
-  if [ "$ENABLE_TERMINAL_TOOL" = "true" ]; then
+  # Add openssh-server if Terminal tool container is enabled
+  if [ "$ENABLE_TERMINAL_TOOL_CONTAINER" = "true" ]; then
     INFRA_SERVICES="$INFRA_SERVICES nexent-openssh-server"
-    echo "🔧 Terminal tool enabled - openssh-server will be included in infrastructure"
+    echo "🔧 Terminal tool container enabled - openssh-server will be included in infrastructure"
   fi
 
   if ! ${docker_compose_command} -p nexent -f "docker-compose${COMPOSE_FILE_SUFFIX}" up -d $INFRA_SERVICES; then
     echo "   ❌ ERROR Failed to start infrastructure services"
     exit 1
   fi
 
-  if [ "$ENABLE_TERMINAL_TOOL" = "true" ]; then
-    echo "🔧 Terminal tool (openssh-server) is now available for AI agents"
+  if [ "$ENABLE_TERMINAL_TOOL_CONTAINER" = "true" ]; then
+    echo "🔧 Terminal tool container (openssh-server) is now available for AI agents"
   fi
 
   # Deploy Supabase services based on DEPLOYMENT_VERSION 
@@ -514,34 +514,33 @@ wait_for_elasticsearch_healthy() {
 }
 
 select_terminal_tool() {
-    # Function to ask if user wants to enable Terminal tool
-    echo "🔧 Terminal Tool Configuration:"
+    # Function to ask if user wants to create Terminal tool container
+    echo "🔧 Terminal Tool Container Setup:"
     echo "    Terminal tool allows AI agents to execute shell commands via SSH."
-    echo "    This creates an openssh-server container for secure command execution."
+    echo "    This will create an openssh-server container for secure command execution."
     if [ -n "$ENABLE_TERMINAL" ]; then
         enable_terminal="$ENABLE_TERMINAL"
     else
-        read -p "👉 Do you want to enable Terminal tool? [Y/N] (default: N): " enable_terminal
+        read -p "👉 Do you want to create Terminal tool container? [Y/N] (default: N): " enable_terminal
     fi
 
     # Sanitize potential Windows CR in input
     enable_terminal=$(sanitize_input "$enable_terminal")
 
     if [[ "$enable_terminal" =~ ^[Yy]$ ]]; then
-        export ENABLE_TERMINAL_TOOL="true"
+        export ENABLE_TERMINAL_TOOL_CONTAINER="true"
         export COMPOSE_PROFILES="${COMPOSE_PROFILES:+$COMPOSE_PROFILES,}terminal"
-        echo "✅ Terminal tool enabled 🔧"
-        echo "   🔧 Deploying an openssh-server container for secure command execution"
-        update_env_var "ENABLE_TERMINAL_TOOL" "true"
+        echo "✅ Terminal tool container will be created 🔧"
+        echo "   🔧 Creating openssh-server container for secure command execution"
 
-        # Ask user to specify directory mapping
+        # Ask user to specify directory mapping for container
         default_terminal_dir="/opt/terminal"
-        echo "   📁 Terminal directory configuration:"
+        echo "   📁 Terminal container directory mapping:"
         echo "      • Container path: /opt/terminal (fixed)"
         echo "      • Host path: You can specify any directory on your host machine"
         echo "      • Default host path: /opt/terminal (recommended)"
         echo ""
-        read -p "   📁 Enter host directory to mount (default: /opt/terminal): " terminal_mount_dir
+        read -p "   📁 Enter host directory to mount to container (default: /opt/terminal): " terminal_mount_dir
         terminal_mount_dir=$(sanitize_input "$terminal_mount_dir")
         TERMINAL_MOUNT_DIR="${terminal_mount_dir:-$default_terminal_dir}"
 
@@ -555,8 +554,8 @@ select_terminal_tool() {
         echo "      • This directory will be created if it doesn't exist"
         echo ""
 
-        # Setup SSH credentials for Terminal tool
-        echo "🔐 Setting up SSH credentials for Terminal tool..."
+        # Setup SSH credentials for Terminal tool container
+        echo "🔐 Setting up SSH credentials for Terminal tool container..."
 
         # Check if SSH credentials are already set
         if [ -n "$SSH_USERNAME" ] && [ -n "$SSH_PASSWORD" ]; then
@@ -565,7 +564,7 @@ select_terminal_tool() {
             echo "🔑 Password: [HIDDEN]"
         else
             # Prompt for SSH credentials
-            echo "Please enter SSH credentials for Terminal tool:"
+            echo "Please enter SSH credentials for Terminal tool container:"
             echo ""
 
             # Get SSH username
@@ -609,9 +608,8 @@ select_terminal_tool() {
         fi
         echo ""
     else
-        export ENABLE_TERMINAL_TOOL="false"
-        echo "🚫 Terminal tool disabled"
-        update_env_var "ENABLE_TERMINAL_TOOL" "false"
+        export ENABLE_TERMINAL_TOOL_CONTAINER="false"
+        echo "🚫 Terminal tool container disabled"
     fi
     echo ""
     echo "--------------------------------"
@@ -676,7 +674,7 @@ main_deploy() {
   # Select deployment version, mode and image source
   select_deployment_version || { echo "❌ Deployment version selection failed"; exit 1; }
   select_deployment_mode || { echo "❌ Deployment mode selection failed"; exit 1; }
-  select_terminal_tool || { echo "❌ Terminal tool configuration failed"; exit 1; }
+  select_terminal_tool || { echo "❌ Terminal tool container configuration failed"; exit 1; }
   choose_image_env || { echo "❌ Image environment setup failed"; exit 1; }
 
   # Add permission

sdk/nexent/core/tools/terminal_tool.py

@@ -31,9 +31,6 @@ class TerminalTool(Tool):
 
     tool_sign = ToolSign.TERMINAL_OPERATION.value  # Terminal operation tool identifier
 
-    # Class-level session storage
-    _sessions: Dict[str, Dict[str, Any]] = {}
-
     def __init__(self, 
                  init_path: str = Field(description="Initial workspace path", default="~"),
                  observer: MessageObserver = Field(description="Message observer", default=None, exclude=True),
@@ -52,12 +49,17 @@ def __init__(self,
             password (str): SSH password for authentication. Required parameter.
         """
         super().__init__()
-        # Handle ~ for home directory
+        # Handle ~ for home directory and None values
         if init_path == "~":
             self.init_path = "~"
+        elif init_path is None:
+            self.init_path = None
         else:
             self.init_path = os.path.abspath(init_path)
-        
+
+        # Class-level session storage
+        self._sessions: Dict[str, Dict[str, Any]] = {}
+
         self.observer = observer
         self.ssh_host = ssh_host
         self.ssh_port = ssh_port
@@ -339,64 +341,3 @@ def forward(self, command: str, session_name: str = "default", timeout: int = 30
                 "error": str(e),
                 "timestamp": time.time()
             }, ensure_ascii=False, indent=2)
-
-    @classmethod
-    def cleanup_all_sessions(cls):
-        """Clean up all active sessions."""
-        for session_name, session in cls._sessions.items():
-            try:
-                if session and "channel" in session:
-                    session["channel"].close()
-                if session and "client" in session:
-                    session["client"].close()
-            except:
-                pass
-        cls._sessions.clear()
-        logger.info("All SSH sessions cleaned up")
-
-
-if __name__ == "__main__":
-    """Test the TerminalTool functionality"""
-    import sys
-    
-    # Basic configuration - 直接创建实例并设置属性
-    tool = TerminalTool.__new__(TerminalTool)
-    Tool.__init__(tool)
-    tool.init_path = "~"  # Use home directory as default
-    tool.observer = None
-    tool.ssh_host = "localhost"  # For local testing
-    tool.ssh_port = 2222
-    tool.ssh_user = input("Enter SSH username: ").strip()
-    tool.password = input("Enter SSH password: ").strip()
-    tool.running_prompt_zh = "正在执行终端命令..."
-    tool.running_prompt_en = "Executing terminal command..."
-    
-    print("=== Terminal Tool Test ===")
-    print("Make sure openssh-server container is running and password authentication is configured.")
-    print("You will be prompted to enter SSH username and password.")
-    print("Commands to test: 'ls -la', 'pwd', 'whoami', 'echo \"Hello World\"', 'exit'")
-    print()
-    
-    try:
-        while True:
-            command = input("Enter command (or 'quit' to exit): ").strip()
-            
-            if command.lower() in ['quit', 'exit']:
-                break
-                
-            if not command:
-                continue
-                
-            print(f"\n>>> Executing: {command}")
-            result = tool.forward(command, session_name="test_session", timeout=30)
-            print(f"Result: {result}")
-            print("-" * 50)
-            
-    except KeyboardInterrupt:
-        print("\nTest interrupted by user")
-    except Exception as e:
-        print(f"Test error: {e}")
-    finally:
-        print("Cleaning up sessions...")
-        TerminalTool.cleanup_all_sessions()
-        print("Test completed.")