Update app.py

app.py

@@ -327,16 +327,17 @@ def get_flask_apps():
 
 def run_command(cmd: str):
     """Handle terminal-like commands including Flask and Python apps"""
-    global current_dir
-    parts = cmd.split()
-    if not parts:
-      return "No command provided"
-    
-    
-    try:
-        raw_cmd = parts[0].lower()
-        args = parts[1:]
+    global current_dir, running_process
+    cmd = cmd.strip()  # Remove leading/trailing whitespace
+    if not cmd:
+        return "No command provided", "", None
+
+    # Split command into command and arguments (maxsplit=1 for commands with spaces)
+    parts = cmd.split(maxsplit=1)
+    raw_cmd = parts[0].lower()
+    args = parts[1] if len(parts) > 1 else ""
 
+    try:
         # === STOP running process ===
         if raw_cmd == "close":
             if running_process and running_process.poll() is None:
@@ -346,29 +347,31 @@ def run_command(cmd: str):
             return f"$ {cmd}\n\nNo active process to stop.", "", None
 
         # === Start Flask app from code ===
-        elif raw_cmd == "flaskrun" and len(args) >= 2:
-            app_name = args[0]
-            code = ''.join(args[:1]).strip('"').strip("'")
-            run_flask_app(app_name, code)
-            return f"Started Flask app: {app_name}"
+        elif raw_cmd == "flaskrun" and args:
+            # Expect args to be: app_name followed by code
+            args_parts = args.split(maxsplit=1)
+            if len(args_parts) < 2:
+                return f"$ {cmd}\n\nUsage: flaskrun <app_name> <code>", "", None
+            app_name, code = args_parts
+            code = code.strip('"').strip("'")
+            result = run_flask_app(app_name, code)
+            return f"$ {cmd}\n\n{result}", "", None
 
         # === Run Python application ===
-        elif raw_cmd == "python3 " and args:
-            file_path = os.path.join(current_dir, args[0])
+        elif raw_cmd == "python3" and args:
+            file_path = expand_path(args)
             if not os.path.exists(file_path):
-              return f"File not found: {file_path}"
+                return f"$ {cmd}\n\nFile not found: {file_path}", "", None
             if is_flask_app(file_path):
-                # Read the Flask app code and run it
                 try:
-                    with open(file_path, 'r') as f:
+                    with open(file_path, 'r', encoding='utf-8') as f:
                         code = f.read()
                     app_name = os.path.splitext(os.path.basename(file_path))[0]
-                    run_flask_app(app_name, code)
-                    return f"Started Flask app: {app_name} from {file_path}"
+                    result = run_flask_app(app_name, code)
+                    return f"$ {cmd}\n\n{result}", "", None
                 except Exception as e:
                     return f"$ {cmd}\n\nError reading Flask app: {e}", "", None
             else:
-                # Run as regular Python script
                 result = run_python_app(file_path)
                 return f"$ {cmd}\n\n{result}", "", None
 
@@ -378,60 +381,63 @@ def run_command(cmd: str):
             return f"$ {cmd}\n\n{apps_info}", "", None
 
         # === View logs ===
-        elif raw_cmd.startswith("logs "):
-            appname = raw_cmd.split(" ", 1)[1]
-            logs = view_logs(appname)
-            return f"$ {cmd}\n\nLogs for {appname}:\n{logs}", "", None
+        elif raw_cmd == "logs" and args:
+            app_name = args
+            logs = view_logs(app_name)
+            return f"$ {cmd}\n\nLogs for {app_name}:\n{logs}", "", None
 
         # === Change directory (cd) ===
-        elif raw_cmd.startswith("cd "):
-            new_path = raw_cmd.split(" ", 1)[1]
-            target = expand_path(new_path)
+        elif raw_cmd == "cd":
+            if not args:
+                return f"$ {cmd}\n\nNo directory specified", "", None
+            target = expand_path(args)
             if os.path.isdir(target):
-                current_dir = target
+                current_dir = os.path.abspath(target)
                 return f"$ {cmd}\n\nChanged directory to: {current_dir}", "", None
-            return f"$ {cmd}\n\nDirectory not found: {new_path}", "", None
+            return f"$ {cmd}\n\nDirectory not found: {args}", "", None
 
         # === Create file/folder ===
-        elif raw_cmd.startswith("create "):
-            new_path = raw_cmd[7:]
-            target = expand_path(new_path)
-            if new_path.endswith("/"):
+        elif raw_cmd == "create":
+            if not args:
+                return f"$ {cmd}\n\nNo path specified", "", None
+            target = expand_path(args)
+            if args.endswith("/"):
                 os.makedirs(target, exist_ok=True)
                 return f"$ {cmd}\n\nCreated folder: {target}", "", None
             else:
                 os.makedirs(os.path.dirname(target), exist_ok=True)
-                with open(target, "w") as f:
+                with open(target, "w", encoding="utf-8") as f:
                     pass
                 return f"$ {cmd}\n\nCreated file: {target}", "", None
 
         # === Delete file/folder ===
-        elif raw_cmd.startswith("delete "):
-            new_path = raw_cmd[7:]
-            target = expand_path(new_path)
+        elif raw_cmd == "delete":
+            if not args:
+                return f"$ {cmd}\n\nNo path specified", "", None
+            target = expand_path(args)
             if os.path.isfile(target):
                 os.remove(target)
                 return f"$ {cmd}\n\nDeleted file: {target}", "", None
             elif os.path.isdir(target):
-                shutil.rmtree(target)
+                shutil.rmtree(target, ignore_errors=True)
                 return f"$ {cmd}\n\nDeleted folder: {target}", "", None
             else:
                 return f"$ {cmd}\n\nNot found: {target}", "", None
 
         # === Open file/folder ===
-        elif raw_cmd.startswith("open "):
-            new_path = raw_cmd[5:]
-            target = expand_path(new_path)
+        elif raw_cmd == "open":
+            if not args:
+                return f"$ {cmd}\n\nNo path specified", "", None
+            target = expand_path(args)
             if not os.path.exists(target):
-                return f"$ {cmd}\n\nFile not found: {new_path}", "", None
-
+                return f"$ {cmd}\n\nFile not found: {args}", "", None
             if os.path.isdir(target):
                 items = os.listdir(target)
                 return f"$ {cmd}\n\n" + ("\n".join(items) if items else "(empty folder)"), "", None
-
             try:
                 with open(target, "r", encoding="utf-8") as f:
                     content = f.read()
+                global open_file_path
                 open_file_path = target
                 return f"$ {cmd}\n\nOpened file: {target}", content, target
             except Exception as e:
@@ -451,21 +457,31 @@ def run_command(cmd: str):
             return "", "", None
 
         # === Normal shell command ===
-        running_process = subprocess.Popen(
-            raw_cmd,
-            shell=True,
-            cwd=current_dir,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True
-        )
-        stdout, stderr = running_process.communicate()
-        running_process = None
-
-        return f"$ {cmd}\n\n{stdout}{stderr}", "", None
+        try:
+            # Avoid shell=True for common commands
+            if raw_cmd == "ls":
+                cmd_parts = ['ls', '-l'] if not args else ['ls', '-l', args]
+            elif raw_cmd == "cat" and args:
+                cmd_parts = ['cat', expand_path(args)]
+            else:
+                cmd_parts = cmd.split()  # Split for safer execution
+            running_process = subprocess.Popen(
+                cmd_parts,
+                shell=False,  # Prefer shell=False for safety
+                cwd=current_dir,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                text=True
+            )
+            stdout, stderr = running_process.communicate()
+            running_process = None
+            output = stdout + stderr
+            return f"$ {cmd}\n\n{output if output else '(no output)'}", "", None
+        except FileNotFoundError:
+            return f"$ {cmd}\n\nCommand not found: {raw_cmd}", "", None
 
     except Exception as e:
-        return f"Error: {e}", "", None
+        return f"$ {cmd}\n\nError: {e}", "", None
 
 def save_file(new_content: str, file_path: str):
     global open_file_path