From 4f4a06d11ae18cfad3e53bb70fa6ca07b1194f70 Mon Sep 17 00:00:00 2001
From: JINO-ROHIT <find.jinorohit@gmail.com>
Date: Sat, 17 Jan 2026 15:17:29 +0530
Subject: [PATCH 1/2] skip env creation if exists

---
 camel/toolkits/terminal_toolkit/utils.py | 37 ++++++++++++++++--------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/camel/toolkits/terminal_toolkit/utils.py b/camel/toolkits/terminal_toolkit/utils.py
index 8814a2afcb..6b3d7ea479 100644
--- a/camel/toolkits/terminal_toolkit/utils.py
+++ b/camel/toolkits/terminal_toolkit/utils.py
@@ -297,6 +297,17 @@ def setup_initial_env_with_uv(
 ) -> bool:
     r"""Set up initial environment using uv."""
     try:
+        if platform.system() == 'Windows':
+            python_path = os.path.join(env_path, "Scripts", "python.exe")
+        else:
+            python_path = os.path.join(env_path, "bin", "python")
+
+        if os.path.exists(python_path):
+            if update_callback:
+                update_callback(
+                    "[UV] Environment already exists, skipping creation"
+                )
+            return True
         # Create virtual environment with Python 3.10 using uv
         subprocess.run(
             [uv_path, "venv", "--python", "3.10", env_path],
@@ -306,12 +317,6 @@ def setup_initial_env_with_uv(
             timeout=300,
         )
 
-        # Get the python path from the new environment
-        if platform.system() == 'Windows':
-            python_path = os.path.join(env_path, "Scripts", "python.exe")
-        else:
-            python_path = os.path.join(env_path, "bin", "python")
-
         # Install essential packages using uv
         essential_packages = [
             "pip",
@@ -356,6 +361,20 @@ def setup_initial_env_with_venv(
 ) -> bool:
     r"""Set up initial environment using standard venv."""
     try:
+        # Get pip path
+        if platform.system() == 'Windows':
+            pip_path = os.path.join(env_path, "Scripts", "pip.exe")
+        else:
+            pip_path = os.path.join(env_path, "bin", "pip")
+
+        # Check if environment already exists
+        if os.path.exists(pip_path):
+            if update_callback:
+                update_callback(
+                    "Environment already exists, skipping creation"
+                )
+            return True
+
         # Create virtual environment with system Python
         try:
             venv.create(
@@ -374,12 +393,6 @@ def setup_initial_env_with_venv(
                 symlinks=False,
             )
 
-        # Get pip path
-        if platform.system() == 'Windows':
-            pip_path = os.path.join(env_path, "Scripts", "pip.exe")
-        else:
-            pip_path = os.path.join(env_path, "bin", "pip")
-
         # Upgrade pip and install essential packages
         essential_packages = [
             "pip",

From 961820e15d69c5192015c7e6a302497d40e094aa Mon Sep 17 00:00:00 2001
From: Wendong-Fan <w3ndong.fan@gmail.com>
Date: Tue, 20 Jan 2026 03:32:27 +0800
Subject: [PATCH 2/2] minor format update

---
 camel/toolkits/terminal_toolkit/utils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/camel/toolkits/terminal_toolkit/utils.py b/camel/toolkits/terminal_toolkit/utils.py
index 6b3d7ea479..d20b9c67e0 100644
--- a/camel/toolkits/terminal_toolkit/utils.py
+++ b/camel/toolkits/terminal_toolkit/utils.py
@@ -305,7 +305,7 @@ def setup_initial_env_with_uv(
         if os.path.exists(python_path):
             if update_callback:
                 update_callback(
-                    "[UV] Environment already exists, skipping creation"
+                    "[UV] Environment already exists, skipping creation\n"
                 )
             return True
         # Create virtual environment with Python 3.10 using uv
@@ -371,7 +371,7 @@ def setup_initial_env_with_venv(
         if os.path.exists(pip_path):
             if update_callback:
                 update_callback(
-                    "Environment already exists, skipping creation"
+                    "Environment already exists, skipping creation\n"
                 )
             return True