diff --git a/metagpt/const.py b/metagpt/const.py
index 8d52f6e92..17ce9210a 100644
--- a/metagpt/const.py
+++ b/metagpt/const.py
@@ -152,4 +152,3 @@ AGENT = "agent"
 
 # SWE agent
 SWE_SETUP_PATH = get_metagpt_package_root() / "metagpt/tools/swe_agent_commands/setup_default.sh"
-SWE_CMD_WORK_DIR = DEFAULT_WORKSPACE_ROOT / "swe_agent_workdir"
diff --git a/metagpt/prompts/di/swe_agent.py b/metagpt/prompts/di/swe_agent.py
index 7455cf30a..69c02de0c 100644
--- a/metagpt/prompts/di/swe_agent.py
+++ b/metagpt/prompts/di/swe_agent.py
@@ -224,6 +224,8 @@ IMPORTANT_TIPS = """
 14. If provided an issue link, you MUST go to the issue page using Browser tool to understand the issue before starting your fix.
 
 15. When the edit fails, try to enlarge the starting line.
+
+16. Once again, and this is critical: YOU CAN ONLY ENTER ONE COMMAND AT A TIME.
 """
 
 NEXT_STEP_TEMPLATE = f"""
diff --git a/metagpt/tools/libs/terminal.py b/metagpt/tools/libs/terminal.py
index 9bb6a09ec..36fa5da15 100644
--- a/metagpt/tools/libs/terminal.py
+++ b/metagpt/tools/libs/terminal.py
@@ -4,7 +4,7 @@ from asyncio import Queue
 from asyncio.subprocess import PIPE, STDOUT
 from typing import Optional
 
-from metagpt.const import DEFAULT_WORKSPACE_ROOT, SWE_CMD_WORK_DIR, SWE_SETUP_PATH
+from metagpt.const import DEFAULT_WORKSPACE_ROOT, SWE_SETUP_PATH
 from metagpt.logs import logger
 from metagpt.tools.tool_registry import register_tool
 from metagpt.utils.report import END_MARKER_VALUE, TerminalReporter
@@ -151,10 +151,7 @@ class Bash(Terminal):
 
     def __init__(self):
         """init"""
-        if not SWE_CMD_WORK_DIR.exists():
-            SWE_CMD_WORK_DIR.mkdir(parents=True)
-
-        os.environ["SWE_CMD_WORK_DIR"] = str(SWE_CMD_WORK_DIR)
+        os.environ["SWE_CMD_WORK_DIR"] = str(DEFAULT_WORKSPACE_ROOT)
         super().__init__()
         self.start_flag = False