apunkt/SurfSense
1
0
Fork 0
mirror of https://github.com/MODSetter/SurfSense.git synced 2026-05-01 20:03:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

feat(filesystem): enhance local mount path normalization and improve virtual path handling in agent filesystem

Browse source
This commit is contained in:
Anish Sarkar 2026-04-24 02:12:30 +05:30
parent c1a07a093e
commit 1e9db6f26f
3 changed files with 96 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

41
surfsense_backend/app/agents/new_chat/middleware/filesystem.py
View file

@ -782,6 +782,27 @@ class SurfSenseFilesystemMiddleware(FilesystemMiddleware):
return f"/{backend.default_mount()}"
return ""
def _normalize_local_mount_path(
self, candidate: str, runtime: ToolRuntime[None, FilesystemState]
) -> str:
backend = self._get_backend(runtime)
mount_prefix = self._default_mount_prefix(runtime)
if not mount_prefix or not isinstance(backend, MultiRootLocalFolderBackend):
return candidate if candidate.startswith("/") else f"/{candidate.lstrip('/')}"
mount_names = set(backend.list_mounts())
if candidate.startswith("/"):
first_segment = candidate.lstrip("/").split("/", 1)[0]
if first_segment in mount_names:
return candidate
return f"{mount_prefix}{candidate}"
relative = candidate.lstrip("/")
first_segment = relative.split("/", 1)[0]
if first_segment in mount_names:
return f"/{relative}"
return f"{mount_prefix}/{relative}"
def _get_contract_suggested_path(
self, runtime: ToolRuntime[None, FilesystemState]
) -> str:
@ -790,11 +811,7 @@ class SurfSenseFilesystemMiddleware(FilesystemMiddleware):
if isinstance(suggested, str) and suggested.strip():
cleaned = suggested.strip()
if self._filesystem_mode == FilesystemMode.DESKTOP_LOCAL_FOLDER:
mount_prefix = self._default_mount_prefix(runtime)
if mount_prefix and cleaned.startswith("/") and not cleaned.startswith(
f"{mount_prefix}/"
):
return f"{mount_prefix}{cleaned}"
return self._normalize_local_mount_path(cleaned, runtime)
return cleaned
if self._filesystem_mode == FilesystemMode.DESKTOP_LOCAL_FOLDER:
mount_prefix = self._default_mount_prefix(runtime)
@ -811,19 +828,7 @@ class SurfSenseFilesystemMiddleware(FilesystemMiddleware):
if not candidate:
return self._get_contract_suggested_path(runtime)
if self._filesystem_mode == FilesystemMode.DESKTOP_LOCAL_FOLDER:
backend = self._get_backend(runtime)
mount_prefix = self._default_mount_prefix(runtime)
if mount_prefix and not candidate.startswith("/"):
return f"{mount_prefix}/{candidate.lstrip('/')}"
if (
mount_prefix
and isinstance(backend, MultiRootLocalFolderBackend)
and candidate.startswith("/")
):
mount_names = backend.list_mounts()
first_segment = candidate.lstrip("/").split("/", 1)[0]
if first_segment not in mount_names:
return f"{mount_prefix}{candidate}"
return self._normalize_local_mount_path(candidate, runtime)
if not candidate.startswith("/"):
return f"/{candidate.lstrip('/')}"
return candidate