From 84c4ba7609adf6e8c8ccc989d6a1b51cc26792f9 Mon Sep 17 00:00:00 2001
From: Shiniese <135589327+Shiniese@users.noreply.github.com>
Date: Thu, 2 Apr 2026 15:30:42 +0800
Subject: [PATCH] refactor: use unified get_media_dir() to get media path

---
 nanobot/agent/tools/filesystem.py | 4 ++--
 nanobot/agent/tools/shell.py      | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/nanobot/agent/tools/filesystem.py b/nanobot/agent/tools/filesystem.py
index a0e470fa9..e3a8fecaf 100644
--- a/nanobot/agent/tools/filesystem.py
+++ b/nanobot/agent/tools/filesystem.py
@@ -7,6 +7,7 @@ from typing import Any
 
 from nanobot.agent.tools.base import Tool
 from nanobot.utils.helpers import build_image_content_blocks, detect_image_mime
+from nanobot.config.paths import get_media_dir
 
 
 def _resolve_path(
@@ -21,8 +22,7 @@ def _resolve_path(
         p = workspace / p
     resolved = p.resolve()
     if allowed_dir:
-        from nanobot.config.paths import get_runtime_subdir
-        media_path = get_runtime_subdir("media").resolve()
+        media_path = get_media_dir().resolve()
         all_dirs = [allowed_dir] + [media_path] + (extra_allowed_dirs or []) 
         if not any(_is_under(resolved, d) for d in all_dirs):
             raise PermissionError(f"Path {path} is outside allowed directory {allowed_dir}")
diff --git a/nanobot/agent/tools/shell.py b/nanobot/agent/tools/shell.py
index 77803e8b3..c987a5f99 100644
--- a/nanobot/agent/tools/shell.py
+++ b/nanobot/agent/tools/shell.py
@@ -10,6 +10,7 @@ from typing import Any
 from loguru import logger
 
 from nanobot.agent.tools.base import Tool
+from nanobot.config.paths import get_media_dir
 
 
 class ExecTool(Tool):
@@ -184,9 +185,7 @@ class ExecTool(Tool):
                 except Exception:
                     continue
 
-                from nanobot.config.paths import get_runtime_subdir
-                media_path = get_runtime_subdir("media").resolve()
-
+                media_path = get_media_dir().resolve()
                 if (p.is_absolute() 
                     and cwd_path not in p.parents 
                     and p != cwd_path