fix: relative path fixes for home mode

marimo/_server/api/endpoints/assets.py

@@ -144,14 +144,23 @@ async def index(request: Request) -> HTMLResponse:
         app_manager = app_state.session_manager.app_manager(file_key)
         app_config = app_manager.app.config
 
+        # Make filename relative to file router's directory if possible
+        filename = app_manager.filename
+        directory = app_state.session_manager.file_router.directory
+        if filename and directory:
+            try:
+                filename = str(Path(filename).relative_to(directory))
+            except ValueError:
+                pass  # Keep absolute if not under directory
+
         html = notebook_page_template(
             html=html,
             base_url=app_state.base_url,
             user_config=config_manager.get_user_config(),
             config_overrides=config_manager.get_config_overrides(),
             server_token=app_state.skew_protection_token,
             app_config=app_config,
-            filename=app_manager.filename,
+            filename=filename,
             mode=app_state.mode,
             runtime_config=[{"url": app_state.remote_url}]
             if app_state.remote_url

marimo/_server/api/endpoints/file_explorer.py

@@ -65,8 +65,11 @@ async def list_files(
                     schema:
                         $ref: "#/components/schemas/FileListResponse"
     """
+    app_state = AppState(request)
     body = await parse_request(request, cls=FileListRequest)
-    root = body.path or file_system.get_root()
+    # Use file router's directory as default, fall back to cwd
+    directory = app_state.session_manager.file_router.directory
+    root = body.path or directory or file_system.get_root()
     files = file_system.list_files(root)
     return FileListResponse(files=files, root=root)
 

marimo/_server/api/endpoints/files.py

@@ -1,6 +1,7 @@
 # Copyright 2026 Marimo. All rights reserved.
 from __future__ import annotations
 
+from pathlib import Path
 from typing import TYPE_CHECKING
 
 from starlette.authentication import requires
@@ -109,9 +110,15 @@ async def rename_file(
     """
     body = await parse_request(request, cls=RenameNotebookRequest)
     app_state = AppState(request)
+
+    # Resolve relative filenames against the file router's directory
+    if not Path(body.filename).is_absolute():
+        directory = app_state.session_manager.file_router.directory
+        if directory:
+            body.filename = str(Path(directory) / body.filename)
+
     filename = await abspath(body.filename)
 
-    # Convert to absolute path
     app_state.require_current_session().put_control_request(
         RenameNotebookCommand(filename=filename),
         from_consumer_id=ConsumerId(app_state.require_current_session_id()),
@@ -152,6 +159,13 @@ async def save(
     """
     app_state = AppState(request)
     body = await parse_request(request, cls=SaveNotebookRequest)
+
+    # Resolve relative filenames against the file router's directory
+    if body.filename and not Path(body.filename).is_absolute():
+        directory = app_state.session_manager.file_router.directory
+        if directory:
+            body.filename = str(Path(directory) / body.filename)
+
     session = app_state.require_current_session()
     contents = session.app_file_manager.save(body)
 
@@ -186,6 +200,13 @@ async def copy(
     """
     app_state = AppState(request)
     body = await parse_request(request, cls=CopyNotebookRequest)
+
+    # Resolve relative filenames against the file router's directory
+    if body.destination and not Path(body.destination).is_absolute():
+        directory = app_state.session_manager.file_router.directory
+        if directory:
+            body.destination = str(Path(directory) / body.destination)
+
     session = app_state.require_current_session()
     contents = session.app_file_manager.copy(body)
 

marimo/_server/api/endpoints/home.py

@@ -3,6 +3,7 @@
 
 import asyncio
 import os
+import pathlib
 import tempfile
 from typing import TYPE_CHECKING
 
@@ -58,7 +59,12 @@ async def read_code(
                         $ref: "#/components/schemas/RecentFilesResponse"
     """
     app_state = AppState(request)
-    files = app_state.session_manager.recents.get_recents()
+    # Pass the file router's directory to filter and relativize paths
+    directory = None
+    dir_str = app_state.session_manager.file_router.directory
+    if dir_str:
+        directory = pathlib.Path(dir_str)
+    files = app_state.session_manager.recents.get_recents(directory)
     return RecentFilesResponse(files=files)
 
 

marimo/_server/file_router.py

@@ -167,15 +167,16 @@ def maybe_get_single_file(self) -> Optional[MarimoFile]:
 
 class LazyListOfFilesAppFileRouter(AppFileRouter):
     def __init__(self, directory: str, include_markdown: bool) -> None:
-        # pass through Path to canonicalize, strips trailing slashes
-        self._directory = str(Path(directory))
+        # Make directory absolute but don't resolve symlinks to preserve user paths
+        abs_directory = Path(directory).absolute()
+        self._directory = str(abs_directory)
         self.include_markdown = include_markdown
         self._lazy_files: Optional[list[FileInfo]] = None
 
         # Use PathValidator for security validation
-        self._validator = PathValidator(Path(directory))
-        # Use DirectoryScanner for file discovery
-        self._scanner = DirectoryScanner(directory, include_markdown)
+        self._validator = PathValidator(abs_directory)
+        # Use DirectoryScanner for file discovery (use absolute path)
+        self._scanner = DirectoryScanner(str(abs_directory), include_markdown)
 
     @property
     def directory(self) -> str:
@@ -233,23 +234,22 @@ def get_file_manager(
         directory = Path(self._directory)
         filepath = Path(key)
 
+        # Resolve filepath for use
+        # If filepath is relative, resolve it relative to directory
+        if not filepath.is_absolute():
+            filepath = directory / filepath
+
         # Use PathValidator for security validation
         # Check if file is in an allowed temp directory (e.g., for tutorials)
         # If so, skip the directory validation
         is_in_allowed_temp_dir = self._validator.is_file_in_allowed_temp_dir(
-            key
+            str(filepath)
         )
 
         if not is_in_allowed_temp_dir:
             # Validate that filepath is inside directory
             self._validator.validate_inside_directory(directory, filepath)
 
-        # Resolve filepath for use
-        # If directory is absolute and filepath is relative, resolve relative to directory
-        if directory.is_absolute() and not filepath.is_absolute():
-            filepath = directory / filepath
-        # Note: We don't call resolve() here to preserve the original path format
-
         if filepath.exists():
             return AppFileManager(str(filepath), defaults=defaults)
 

marimo/_server/files/directory_scanner.py

@@ -3,6 +3,7 @@
 
 import os
 import time
+from pathlib import Path
 from typing import Optional
 
 from marimo import _loggers
@@ -183,10 +184,14 @@ def recurse(
                         continue
                     children = recurse(entry.path, depth + 1)
                     if children:
+                        entry_path = Path(entry.path)
+                        relative_path = str(
+                            entry_path.relative_to(self.directory)
+                        )
                         folders.append(
                             FileInfo(
-                                id=entry.path,
-                                path=entry.path,
+                                id=relative_path,
+                                path=relative_path,
                                 name=entry.name,
                                 is_directory=True,
                                 is_marimo_file=False,
@@ -196,9 +201,13 @@ def recurse(
                 elif entry.name.endswith(self.allowed_extensions):
                     if is_marimo_app(entry.path):
                         file_count[0] += 1
+                        entry_path = Path(entry.path)
+                        relative_path = str(
+                            entry_path.relative_to(self.directory)
+                        )
                         file_info = FileInfo(
-                            id=entry.path,
-                            path=entry.path,
+                            id=relative_path,
+                            path=relative_path,
                             name=entry.name,
                             is_directory=False,
                             is_marimo_file=True,

marimo/_server/recents.py

@@ -1,14 +1,12 @@
 # Copyright 2026 Marimo. All rights reserved.
 from __future__ import annotations
 
-import os
 import pathlib
 from dataclasses import dataclass, field
 
 from marimo import _loggers
 from marimo._server.models.home import MarimoFile
 from marimo._utils.config.config import ConfigReader
-from marimo._utils.paths import pretty_path
 
 
 @dataclass
@@ -77,7 +75,9 @@ def rename(self, old_filename: str, new_filename: str) -> None:
 
             self.config.write_toml(state)
 
-    def get_recents(self) -> list[MarimoFile]:
+    def get_recents(
+        self, directory: pathlib.Path | None = None
+    ) -> list[MarimoFile]:
         if not self.config:
             return []
 
@@ -86,19 +86,21 @@ def get_recents(self) -> list[MarimoFile]:
         )
         files: list[MarimoFile] = []
 
-        cwd = pathlib.Path.cwd()
+        base_dir = directory or pathlib.Path.cwd()
         limited_files = state.files[: self.MAX_FILES]
         for file in limited_files:
             file_path = pathlib.Path(file)
-            if _is_tmp_file(file) or cwd not in file_path.parents:
+            if _is_tmp_file(file) or not file_path.is_relative_to(base_dir):
                 continue
-            if not os.path.exists(file):
+            if not file_path.exists():
                 continue
+            # Return path relative to base_dir
+            relative_path = file_path.relative_to(base_dir)
             files.append(
                 MarimoFile(
-                    name=os.path.basename(file),
-                    path=pretty_path(file),
-                    last_modified=os.path.getmtime(file),
+                    name=file_path.name,
+                    path=str(relative_path),
+                    last_modified=file_path.stat().st_mtime,
                 )
             )
 

marimo/_server/session_manager.py

@@ -109,6 +109,7 @@ def _get_code() -> str:
         # Add recents tracking listener
         self.recents = RecentFilesManager()
         self._event_bus = SessionEventBus()
+        self._event_bus.subscribe(RecentsTrackerListener(self.recents))
 
         # Initialize file watching components
         self._watcher_manager = FileWatcherManager()
@@ -160,9 +161,7 @@ def create_session(
         # Create the session
         from marimo._runtime.commands import AppMetadata
 
-        extensions: list[SessionExtension] = [
-            RecentsTrackerListener(self.recents)
-        ]
+        extensions: list[SessionExtension] = []
         if self.watch:
             extensions.append(
                 SessionFileWatcherExtension(