update path setting

Author: Wendong-Fan

camel/toolkits/terminal_toolkit/terminal_toolkit.py

@@ -1240,48 +1240,50 @@ def shell_write_content_to_file(self, content: str, file_path: str) -> str:
         Returns:
             str: A confirmation message indicating success or an error message.
         """
-        if self.safe_mode and self.working_dir and not self.use_docker_backend:
-            # Resolve relative paths relative to working_dir, not CWD
-            if os.path.isabs(file_path):
-                abs_file_path = os.path.normpath(file_path)
-            else:
-                abs_file_path = os.path.normpath(
+        # For local backend, resolve relative paths to working_dir
+        if not self.use_docker_backend and self.working_dir:
+            if not os.path.isabs(file_path):
+                file_path = os.path.normpath(
                     os.path.join(self.working_dir, file_path)
                 )
-            working_dir_normalized = os.path.normpath(
-                os.path.abspath(self.working_dir)
-            )
-            abs_file_path = os.path.abspath(abs_file_path)
-            # Use os.path.commonpath for secure path containment check
-            try:
-                common = os.path.commonpath(
-                    [abs_file_path, working_dir_normalized]
+            else:
+                file_path = os.path.normpath(file_path)
+            file_path = os.path.abspath(file_path)
+
+            # Safe mode path containment check for local backend
+            if self.safe_mode:
+                working_dir_normalized = os.path.normpath(
+                    os.path.abspath(self.working_dir)
                 )
-                if common != working_dir_normalized:
+                # Use os.path.commonpath for secure path containment check
+                try:
+                    common = os.path.commonpath(
+                        [file_path, working_dir_normalized]
+                    )
+                    if common != working_dir_normalized:
+                        return (
+                            "Error: Cannot write to a file outside of the "
+                            "working directory in safe mode."
+                        )
+                except ValueError:
+                    # Paths are on different drives (Windows) or invalid
                     return (
                         "Error: Cannot write to a file outside of the "
                         "working directory in safe mode."
                     )
-            except ValueError:
-                # Paths are on different drives (Windows) or invalid
-                return (
-                    "Error: Cannot write to a file outside of the "
-                    "working directory in safe mode."
-                )
-            # Use the resolved absolute path for local writes
-            file_path = abs_file_path
 
         log_entry = (
             f"--- Writing content to file at {time.ctime()} ---\n"
             f"> {file_path}\n"
         )
         if self.use_docker_backend:
+            temp_host_path = None
             try:
                 # Ensure parent directory exists in container
                 parent_dir = os.path.dirname(file_path)
                 if parent_dir:
                     quoted_dir = shlex.quote(parent_dir)
-                    mkdir_cmd = f'sh -c "mkdir -p {quoted_dir}"'
+                    mkdir_cmd = f'sh -lc "mkdir -p {quoted_dir}"'
                     mkdir_exec = self.docker_api_client.exec_create(
                         self.container.id, mkdir_cmd
                     )
@@ -1307,7 +1309,6 @@ def shell_write_content_to_file(self, content: str, file_path: str) -> str:
                 log_entry += f"\n-------- \n{content}\n--------\n"
                 with open(self.blocking_log_file, "a", encoding="utf-8") as f:
                     f.write(log_entry + "\n")
-                os.remove(temp_host_path)  # Clean up the temporary file
                 return (
                     f"Content successfully written to '{file_path}' "
                     f"in Docker container."
@@ -1328,6 +1329,13 @@ def shell_write_content_to_file(self, content: str, file_path: str) -> str:
                     f"Error writing to file '{file_path}' "
                     f"in Docker container: {e}"
                 )
+            finally:
+                # Clean up the temporary file
+                if temp_host_path and os.path.exists(temp_host_path):
+                    try:
+                        os.remove(temp_host_path)
+                    except OSError:
+                        pass
 
         else:
             try: