A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.
Python artificial-intelligencedagdata-sciencedata-visualizationdataflowdeveloper-toolsmachine-learningnotebookspipelinepythonreactivesqlweb-app
Revert "refactor: replace MarimoFileKey alias with FileKey ADT (#9483)" (#9668)
Akshay Agrawal14ff054dac0e
diff --git a/marimo/_server/api/endpoints/assets.py b/marimo/_server/api/endpoints/assets.pyindex fb50b36842..bafd4a4c71 100644--- a/marimo/_server/api/endpoints/assets.py+++ b/marimo/_server/api/endpoints/assets.py@@ -37,11 +37,6 @@ from marimo._server.templates.templates import (inject_script,notebook_page_template,)-from marimo._server.workspace import (- FileKey,- parse_file_key,- serialize_file_key,-)from marimo._session.model import SessionModefrom marimo._utils.async_path import AsyncPathfrom marimo._utils.paths import (@@ -204,14 +199,11 @@ def og_thumbnail(*, request: Request) -> Response:from marimo._utils.paths import normalize_pathapp_state = AppState(request)- raw_file_key = app_state.query_params(FILE_QUERY_PARAM_KEY)- # Empty ``?file=`` falls back to the workspace key — same as missing.- file_key: FileKey | None = (- parse_file_key(raw_file_key)- if raw_file_key- else app_state.session_manager.workspace.get_unique_file_key()+ file_key = (+ app_state.query_params(FILE_QUERY_PARAM_KEY)+ or app_state.session_manager.workspace.get_unique_file_key())- if file_key is None:+ if not file_key:raise HTTPException(status_code=HTTPStatus.NOT_FOUND, detail="File not found")@@ -231,7 +223,7 @@ def og_thumbnail(*, request: Request) -> Response:notebook_path,context=OpenGraphContext(filepath=notebook_path,- file_key=serialize_file_key(file_key),+ file_key=file_key,base_url=app_state.base_url,mode=app_state.mode.value,),@@ -324,12 +316,9 @@ async def index(request: Request) -> Response:index_html = root / "index.html"file_key_from_query = app_state.query_params(FILE_QUERY_PARAM_KEY)- # Empty ``?file=`` falls back to the workspace key — same as missing —- # which preserves the homepage rendering when no file is selected.- file_key: FileKey | None = (- parse_file_key(file_key_from_query)- if file_key_from_query- else app_state.session_manager.workspace.get_unique_file_key()+ file_key = (+ file_key_from_query+ or app_state.session_manager.workspace.get_unique_file_key())# Try local index.html first, fallback to asset_url if local file doesn't exist@@ -347,7 +336,7 @@ async def index(request: Request) -> Response:detail=_missing_index_html_detail(),)- if file_key is None:+ if not file_key:# We don't know which file to use, so we need to render a homepageLOGGER.debug("No file key provided, serving homepage")html = home_page_template(@@ -360,11 +349,10 @@ async def index(request: Request) -> Response:asset_url=app_state.asset_url,)else:- serialized_file_key = serialize_file_key(file_key)- config_manager = app_state.config_manager_at_file(serialized_file_key)+ config_manager = app_state.config_manager_at_file(file_key)# We have a file key, so we can render the app with the file- LOGGER.debug(f"File key provided: {serialized_file_key}")+ LOGGER.debug(f"File key provided: {file_key}")app_manager = app_state.session_manager.app_manager(file_key)app_config = app_manager.app.configabsolute_filepath = app_manager.filename@@ -421,7 +409,7 @@ async def index(request: Request) -> Response:)# Inject service worker registration with the notebook ID- html = _inject_service_worker(html, serialized_file_key)+ html = _inject_service_worker(html, file_key)return HTMLResponse(html, headers=_HTML_SECURITY_HEADERS)@@ -695,9 +683,7 @@ async def serve_public_file(request: Request) -> Response:if notebook_id:# Decode notebook IDnotebook_id = uri_decode_component(notebook_id)- app_manager = app_state.session_manager.app_manager(- parse_file_key(notebook_id)- )+ app_manager = app_state.session_manager.app_manager(notebook_id)if app_manager.filename:notebook_dir = Path(app_manager.filename).parentelse:diff --git a/marimo/_server/api/endpoints/execution.py b/marimo/_server/api/endpoints/execution.pyindex ac25c3e7fa..5372f43a85 100644--- a/marimo/_server/api/endpoints/execution.py+++ b/marimo/_server/api/endpoints/execution.py@@ -30,11 +30,7 @@ from marimo._server.models.models import ()from marimo._server.router import APIRouterfrom marimo._server.uvicorn_utils import close_uvicorn-from marimo._server.workspace import (- FileKey,- PathFileKey,- parse_file_key,-)+from marimo._server.workspace import MarimoFileKeyfrom marimo._types.ids import ConsumerIdfrom marimo._utils.asyncio_utils import cancel_and_wait@@ -437,16 +433,12 @@ async def restart_session(session = app_state.require_current_session()session_manager.close_session(session_id)- # Close RTC doc if it exists. Empty ``?file=`` falls back to the workspace- # key — same as a missing query param — to preserve the prior or-chain.- raw_file_key = app_state.query_params(FILE_QUERY_PARAM_KEY)- file_key: FileKey | None- if raw_file_key:- file_key = parse_file_key(raw_file_key)- else:- file_key = session_manager.workspace.get_unique_file_key()- if file_key is None and session.app_file_manager.path is not None:- file_key = PathFileKey(session.app_file_manager.path)+ # Close RTC doc if it exists+ file_key: MarimoFileKey | None = (+ app_state.query_params(FILE_QUERY_PARAM_KEY)+ or session_manager.workspace.get_unique_file_key()+ or session.app_file_manager.path+ )if file_key is not None:await DOC_MANAGER.remove_doc(file_key)else:@@ -532,12 +524,9 @@ async def takeover_endpoint("""app_state = AppState(request)- raw_file_key = app_state.query_params(FILE_QUERY_PARAM_KEY)- # Empty ``?file=`` falls back to the workspace key — same as missing.- file_key: FileKey | None = (- parse_file_key(raw_file_key)- if raw_file_key- else app_state.session_manager.workspace.get_unique_file_key()+ file_key: MarimoFileKey | None = (+ app_state.query_params(FILE_QUERY_PARAM_KEY)+ or app_state.session_manager.workspace.get_unique_file_key())if file_key is None:LOGGER.error("No file key provided")diff --git a/marimo/_server/api/endpoints/health.py b/marimo/_server/api/endpoints/health.pyindex 0bc59e63d5..702a4b19cd 100644--- a/marimo/_server/api/endpoints/health.py+++ b/marimo/_server/api/endpoints/health.py@@ -11,7 +11,6 @@ from marimo import _loggersfrom marimo._dependencies.dependencies import DependencyManagerfrom marimo._server.api.deps import AppStatefrom marimo._server.router import APIRouter-from marimo._server.workspace import NEW_FILE_WIREfrom marimo._utils.health import (get_cgroup_cpu_percent,get_cgroup_mem_stats,@@ -75,7 +74,7 @@ async def status(request: Request) -> JSONResponse:"""app_state = AppState(request)files = [- session.app_file_manager.filename or NEW_FILE_WIRE+ session.app_file_manager.filename or "__new__"for session in app_state.session_manager.sessions.values()]return JSONResponse(diff --git a/marimo/_server/api/endpoints/home.py b/marimo/_server/api/endpoints/home.pyindex 091936b39e..a16b660313 100644--- a/marimo/_server/api/endpoints/home.py+++ b/marimo/_server/api/endpoints/home.py@@ -25,7 +25,6 @@ from marimo._server.models.home import ()from marimo._server.router import APIRouterfrom marimo._server.workspace import (- PathFileKey,count_files,flatten_files,)@@ -117,7 +116,7 @@ async def workspace_files(for file in marimo_files:try:resolved_path = session_manager.workspace.resolve(- PathFileKey(file.path)+ file.path)except HTTPException as e:if e.status_code == HTTPStatus.NOT_FOUND:diff --git a/marimo/_server/api/endpoints/ws/ws_connection_validator.py b/marimo/_server/api/endpoints/ws/ws_connection_validator.pyindex 7b42fc88a2..21f65a3d03 100644--- a/marimo/_server/api/endpoints/ws/ws_connection_validator.py+++ b/marimo/_server/api/endpoints/ws/ws_connection_validator.py@@ -11,11 +11,7 @@ from marimo import _loggersfrom marimo._server.api.auth import validate_authfrom marimo._server.api.deps import AppStatefrom marimo._server.codes import WebSocketCodes-from marimo._server.workspace import (- FileKey,- parse_file_key,- serialize_file_key,-)+from marimo._server.workspace import MarimoFileKeyfrom marimo._types.ids import SessionIdLOGGER = _loggers.marimo_logger()@@ -30,7 +26,7 @@ class ConnectionParams:"""Parameters extracted from WebSocket connection request."""session_id: SessionId- file_key: FileKey+ file_key: MarimoFileKeykiosk: boolauto_instantiate: boolrtc_enabled: bool@@ -75,7 +71,10 @@ class WebSocketConnectionValidator:session_id = SessionId(raw_session_id)# Extract file_key- file_key = self._extract_file_key()+ file_key: MarimoFileKey | None = (+ self.app_state.query_params(FILE_QUERY_PARAM_KEY)+ or self.app_state.session_manager.workspace.get_unique_file_key()+ )if file_key is None:await self.websocket.close(@@ -87,9 +86,7 @@ class WebSocketConnectionValidator:kiosk = self.app_state.query_params(KIOSK_QUERY_PARAM_KEY) == "true"# Extract config-based parameters- config = self.app_state.config_manager_at_file(- serialize_file_key(file_key)- ).get_config()+ config = self.app_state.config_manager_at_file(file_key).get_config()rtc_enabled = config.get("experimental", {}).get("rtc_v2", False)auto_instantiate = config["runtime"]["auto_instantiate"]@@ -101,13 +98,16 @@ class WebSocketConnectionValidator:rtc_enabled=rtc_enabled,)- async def extract_file_key_only(self) -> FileKey | None:+ async def extract_file_key_only(self) -> MarimoFileKey | None:"""Extract only the file_key parameter (for RTC endpoint).Returns:- FileKey if valid, None otherwise.+ MarimoFileKey if valid, None otherwise."""- file_key = self._extract_file_key()+ file_key: MarimoFileKey | None = (+ self.app_state.query_params(FILE_QUERY_PARAM_KEY)+ or self.app_state.session_manager.workspace.get_unique_file_key()+ )if file_key is None:LOGGER.warning("RTC: Closing websocket - no file key")@@ -117,14 +117,3 @@ class WebSocketConnectionValidator:return Nonereturn file_key-- def _extract_file_key(self) -> FileKey | None:- """Extract a FileKey from query params or fall back to the workspace.-- An empty `?file=` value falls back to the workspace key — same as a- missing query param — to preserve the prior `or`-chain semantics.- """- raw = self.app_state.query_params(FILE_QUERY_PARAM_KEY)- if raw:- return parse_file_key(raw)- return self.app_state.session_manager.workspace.get_unique_file_key()diff --git a/marimo/_server/api/endpoints/ws/ws_kernel_ready.py b/marimo/_server/api/endpoints/ws/ws_kernel_ready.pyindex 2f2cbe2384..f3bdea78cf 100644--- a/marimo/_server/api/endpoints/ws/ws_kernel_ready.py+++ b/marimo/_server/api/endpoints/ws/ws_kernel_ready.py@@ -20,7 +20,7 @@ from marimo._types.ids import CellId_tif TYPE_CHECKING:from marimo._server.rtc.doc import LoroDocManagerfrom marimo._server.session_manager import SessionManager- from marimo._server.workspace import FileKey+ from marimo._server.workspace import MarimoFileKeyfrom marimo._session import SessionLOGGER = _loggers.marimo_logger()@@ -40,7 +40,7 @@ def build_kernel_ready(last_execution_time: dict[CellId_t, float],kiosk: bool,rtc_enabled: bool,- file_key: FileKey,+ file_key: MarimoFileKey,mode: SessionMode,doc_manager: LoroDocManager,auto_instantiated: bool = False,@@ -167,7 +167,7 @@ def _should_init_rtc(rtc_enabled: bool, mode: SessionMode) -> bool:def _try_init_rtc_doc(cell_ids: tuple[CellId_t, ...],codes: tuple[str, ...],- file_key: FileKey,+ file_key: MarimoFileKey,doc_manager: LoroDocManager,) -> None:"""Try to initialize RTC document with cell data.diff --git a/marimo/_server/api/endpoints/ws/ws_rtc_handler.py b/marimo/_server/api/endpoints/ws/ws_rtc_handler.pyindex 17ed3c7077..6e0263ba56 100644--- a/marimo/_server/api/endpoints/ws/ws_rtc_handler.py+++ b/marimo/_server/api/endpoints/ws/ws_rtc_handler.py@@ -13,7 +13,7 @@ if TYPE_CHECKING:from starlette.websockets import WebSocketfrom marimo._server.rtc.doc import LoroDocManager- from marimo._server.workspace import FileKey+ from marimo._server.workspace import MarimoFileKeyLOGGER = _loggers.marimo_logger()@@ -24,7 +24,7 @@ class RTCWebSocketHandler:def __init__(self,websocket: WebSocket,- file_key: FileKey,+ file_key: MarimoFileKey,doc_manager: LoroDocManager,):self.websocket = websocketdiff --git a/marimo/_server/api/lifespans.py b/marimo/_server/api/lifespans.pyindex dcc7bcc990..dfe057b84d 100644--- a/marimo/_server/api/lifespans.py+++ b/marimo/_server/api/lifespans.py@@ -25,7 +25,7 @@ from marimo._server.session_manager import SessionManagerfrom marimo._server.tokens import AuthTokenfrom marimo._server.utils import initialize_mimetypesfrom marimo._server.uvicorn_utils import close_uvicorn-from marimo._server.workspace import NewFileKey+from marimo._server.workspace import NEW_FILEfrom marimo._session.model import SessionModefrom marimo._utils.asyncio_utils import cancel_and_wait, supervised_taskfrom marimo._utils.subprocess import cancel_pending_reaps@@ -174,7 +174,7 @@ async def logging(app: Starlette) -> AsyncIterator[None]:file_name=file.name if file else None,url=_startup_url(state),run=manager.mode == SessionMode.RUN,- new=isinstance(workspace.get_unique_file_key(), NewFileKey),+ new=workspace.get_unique_file_key() == NEW_FILE,network=state.host == "0.0.0.0",startup_tip=state.startup_tip,)diff --git a/marimo/_server/resume_strategies.py b/marimo/_server/resume_strategies.pyindex 250ed75396..1996339cf6 100644--- a/marimo/_server/resume_strategies.py+++ b/marimo/_server/resume_strategies.py@@ -17,7 +17,7 @@ from marimo._types.ids import SessionIdLOGGER = _loggers.marimo_logger()if TYPE_CHECKING:- from marimo._server.workspace import FileKey+ from marimo._server.workspace import MarimoFileKeyclass SessionResumeStrategy(Protocol):@@ -26,7 +26,7 @@ class SessionResumeStrategy(Protocol):def try_resume(self,new_session_id: SessionId,- file_key: FileKey,+ file_key: MarimoFileKey,) -> Session | None:"""Try to resume a session.@@ -53,22 +53,18 @@ class EditModeResumeStrategy(SessionResumeStrategy):def try_resume(self,new_session_id: SessionId,- file_key: FileKey,+ file_key: MarimoFileKey,) -> Session | None:"""Try to resume an orphaned session for the same file."""import os- from marimo._server.workspace import NewFileKey-- if isinstance(file_key, NewFileKey):- return None-- abs_path = os.path.abspath(file_key.path)# Find sessions with the same filesessions_with_file = []for session in self._repository.get_all():session_id = self._repository.get_session_id(session)- if session_id and session.app_file_manager.path == abs_path:+ if session_id and session.app_file_manager.path == os.path.abspath(+ file_key+ ):sessions_with_file.append((session_id, session))if len(sessions_with_file) == 0:@@ -112,7 +108,7 @@ class RunModeResumeStrategy(SessionResumeStrategy):def try_resume(self,new_session_id: SessionId,- file_key: FileKey, # noqa: ARG002+ file_key: MarimoFileKey, # noqa: ARG002) -> Session | None:"""Try to resume a session with matching ID if orphaned."""session = self._repository.get_sync(new_session_id)diff --git a/marimo/_server/rtc/doc.py b/marimo/_server/rtc/doc.pyindex bcd04a212d..617e8b177d 100644--- a/marimo/_server/rtc/doc.py+++ b/marimo/_server/rtc/doc.py@@ -5,7 +5,7 @@ import asynciofrom typing import TYPE_CHECKINGfrom marimo import _loggers-from marimo._server.workspace import FileKey+from marimo._server.workspace import MarimoFileKeyfrom marimo._types.ids import CellId_tfrom marimo._utils.asyncio_utils import supervised_task@@ -17,13 +17,17 @@ LOGGER = _loggers.marimo_logger()class LoroDocManager:def __init__(self) -> None:- self.loro_docs: dict[FileKey, LoroDoc] = {}+ self.loro_docs: dict[MarimoFileKey, LoroDoc] = {}self.loro_docs_lock = asyncio.Lock()- self.loro_docs_clients: dict[FileKey, set[asyncio.Queue[bytes]]] = {}- self.loro_docs_cleaners: dict[FileKey, asyncio.Task[None] | None] = {}+ self.loro_docs_clients: dict[+ MarimoFileKey, set[asyncio.Queue[bytes]]+ ] = {}+ self.loro_docs_cleaners: dict[+ MarimoFileKey, asyncio.Task[None] | None+ ] = {}async def _clean_loro_doc(- self, file_key: FileKey, timeout: float = 60+ self, file_key: MarimoFileKey, timeout: float = 60) -> None:"""Clean up a loro doc if no clients are connected."""try:@@ -46,7 +50,7 @@ class LoroDocManager:async def create_doc(self,- file_key: FileKey,+ file_key: MarimoFileKey,cell_ids: tuple[CellId_t, ...],codes: tuple[str, ...],) -> LoroDoc:@@ -77,7 +81,7 @@ class LoroDocManager:# when the client connects for the first time.return doc- async def get_or_create_doc(self, file_key: FileKey) -> LoroDoc:+ async def get_or_create_doc(self, file_key: MarimoFileKey) -> LoroDoc:"""Get or create a loro doc for a file key."""from loro import LoroDoc@@ -99,7 +103,7 @@ class LoroDocManager:return docdef add_client_to_doc(- self, file_key: FileKey, update_queue: asyncio.Queue[bytes]+ self, file_key: MarimoFileKey, update_queue: asyncio.Queue[bytes]) -> None:"""Add a client queue to the loro doc clients."""if file_key not in self.loro_docs_clients:@@ -109,7 +113,7 @@ class LoroDocManager:async def broadcast_update(self,- file_key: FileKey,+ file_key: MarimoFileKey,message: bytes,exclude_queue: asyncio.Queue[bytes] | None = None,) -> None:@@ -122,7 +126,7 @@ class LoroDocManager:async def remove_client(self,- file_key: FileKey,+ file_key: MarimoFileKey,update_queue: asyncio.Queue[bytes],) -> None:"""Clean up a loro client and potentially the doc if no clients remain."""@@ -149,7 +153,7 @@ class LoroDocManager:name=f"rtc.cleaner.{file_key}",)- async def _do_remove_doc(self, file_key: FileKey) -> None:+ async def _do_remove_doc(self, file_key: MarimoFileKey) -> None:"""Actual implementation of removing a doc, separate from remove_doc to avoid deadlocks."""if file_key in self.loro_docs:del self.loro_docs[file_key]@@ -158,7 +162,7 @@ class LoroDocManager:if file_key in self.loro_docs_cleaners:del self.loro_docs_cleaners[file_key]- async def remove_doc(self, file_key: FileKey) -> None:+ async def remove_doc(self, file_key: MarimoFileKey) -> None:"""Remove a loro doc and all associated clients"""async with self.loro_docs_lock:await self._do_remove_doc(file_key)diff --git a/marimo/_server/session_manager.py b/marimo/_server/session_manager.pyindex 27764e92eb..f65cead6e5 100644--- a/marimo/_server/session_manager.py+++ b/marimo/_server/session_manager.py@@ -26,12 +26,10 @@ from marimo._server.session.listeners import RecentsTrackerListenerfrom marimo._server.token_manager import TokenManagerfrom marimo._server.tokens import AuthToken, SkewProtectionTokenfrom marimo._server.workspace import (- FileKey,- NewFileKey,+ NEW_FILE,+ MarimoFileKey,NotebookWorkspace,- PathFileKey,flatten_files,- serialize_file_key,)from marimo._session.app_host import AppHostContext, AppHostPoolfrom marimo._session.consumer import SessionConsumer@@ -161,11 +159,11 @@ class SessionManager:"""Get all sessions as a dict."""return self._repository.sessions- def app_manager(self, key: FileKey) -> AppFileManager:+ def app_manager(self, key: MarimoFileKey) -> AppFileManager:"""Get the app manager for the given key."""defaults = AppDefaults.from_config_manager(self._config_manager)- if self.mode is SessionMode.EDIT and isinstance(key, PathFileKey):- self.workspace.register_allowed_path(key.path)+ if self.mode is SessionMode.EDIT and not key.startswith(NEW_FILE):+ self.workspace.register_allowed_path(key)return self.workspace.load(key, defaults)def create_session(@@ -173,7 +171,7 @@ class SessionManager:session_id: SessionId,session_consumer: SessionConsumer,query_params: SerializedQueryParams,- file_key: FileKey,+ file_key: MarimoFileKey,auto_instantiate: bool,) -> Session:"""Create a new session."""@@ -186,8 +184,8 @@ class SessionManager:# Get app file managerdefaults = AppDefaults.from_config_manager(self._config_manager)- if self.mode is SessionMode.EDIT and isinstance(file_key, PathFileKey):- self.workspace.register_allowed_path(file_key.path)+ if self.mode is SessionMode.EDIT and not file_key.startswith(NEW_FILE):+ self.workspace.register_allowed_path(file_key)app_file_manager = self.workspace.load(file_key, defaults)# Create the session@@ -204,7 +202,7 @@ class SessionManager:)session = SessionImpl.create(- initialization_id=serialize_file_key(file_key),+ initialization_id=file_key,session_consumer=session_consumer,mode=self.mode,app_metadata=AppMetadata(@@ -314,12 +312,14 @@ class SessionManager:# Search for kiosk sessions by consumer IDreturn self._repository.get_by_consumer_id(ConsumerId(session_id))- def get_session_by_file_key(self, file_key: FileKey) -> Session | None:+ def get_session_by_file_key(+ self, file_key: MarimoFileKey+ ) -> Session | None:"""Get a session by file key."""return self._repository.get_by_file_key(file_key)def maybe_resume_session(- self, new_session_id: SessionId, file_key: FileKey+ self, new_session_id: SessionId, file_key: MarimoFileKey) -> Session | None:"""Try to resume a session if one is resumable.@@ -353,12 +353,12 @@ class SessionManager:if session.kernel_state() is KernelState.STOPPED:self.close_session(session_id)- def any_clients_connected(self, key: FileKey) -> bool:+ def any_clients_connected(self, key: MarimoFileKey) -> bool:"""Returns True if at least one client has an open socket."""- if isinstance(key, NewFileKey):+ if key.startswith(NEW_FILE):return False- sessions_for_file = self._repository.get_by_file_path(key.path)+ sessions_for_file = self._repository.get_by_file_path(key)return any(session.connection_state() == ConnectionState.OPENfor session in sessions_for_filediff --git a/marimo/_server/workspace/__init__.py b/marimo/_server/workspace/__init__.pyindex 5605d49fd3..825904b279 100644--- a/marimo/_server/workspace/__init__.py+++ b/marimo/_server/workspace/__init__.py@@ -14,6 +14,8 @@ import osfrom marimo import _loggersfrom marimo._server.workspace._base import (+ NEW_FILE,+ MarimoFileKey,NotebookWorkspace,count_files,flatten_files,@@ -21,14 +23,6 @@ from marimo._server.workspace._base import (from marimo._server.workspace._directory import DirectoryWorkspacefrom marimo._server.workspace._empty import EmptyWorkspacefrom marimo._server.workspace._fixed import FixedFilesWorkspace-from marimo._server.workspace._keys import (- NEW_FILE_WIRE,- FileKey,- NewFileKey,- PathFileKey,- parse_file_key,- serialize_file_key,-)from marimo._server.workspace._single import SingleFileWorkspacefrom marimo._utils.http import HTTPException, HTTPStatusfrom marimo._utils.marimo_path import MarimoPath@@ -51,18 +45,14 @@ def infer_workspace(path: str) -> NotebookWorkspace:__all__ = [- "NEW_FILE_WIRE",+ "NEW_FILE","DirectoryWorkspace","EmptyWorkspace",- "FileKey","FixedFilesWorkspace",- "NewFileKey",+ "MarimoFileKey","NotebookWorkspace",- "PathFileKey","SingleFileWorkspace","count_files","flatten_files","infer_workspace",- "parse_file_key",- "serialize_file_key",]diff --git a/marimo/_server/workspace/_base.py b/marimo/_server/workspace/_base.pyindex 3725546ee3..148ae753c3 100644--- a/marimo/_server/workspace/_base.py+++ b/marimo/_server/workspace/_base.py@@ -8,12 +8,6 @@ from pathlib import Pathfrom typing import TYPE_CHECKINGfrom marimo._server.app_defaults import AppDefaults-from marimo._server.workspace._keys import (- FileKey,- NewFileKey,- PathFileKey,- serialize_file_key,-)from marimo._session.notebook import AppFileManagerfrom marimo._utils.http import HTTPException, HTTPStatusfrom marimo._utils.marimo_path import MarimoPath@@ -25,6 +19,14 @@ if TYPE_CHECKING:from marimo._server.models.files import FileInfofrom marimo._server.models.home import MarimoFile+# Wire-format key for an untitled notebook. The string boundary is preserved+# for HTTP query params and session initialization IDs.+NEW_FILE: str = "__new__"++# Some unique identifier for a file. Phase 3 will replace this with a tagged+# union (NewFileKey | PathFileKey).+MarimoFileKey = str+class NotebookWorkspace(abc.ABC):"""A server-side abstraction for the set of notebooks a server is hosting.@@ -48,11 +50,11 @@ class NotebookWorkspace(abc.ABC):"""If this workspace represents a single notebook, return it."""@abc.abstractmethod- def get_unique_file_key(self) -> FileKey | None:+ def get_unique_file_key(self) -> MarimoFileKey | None:"""The unique file key for this workspace, if any."""@abc.abstractmethod- def resolve(self, key: FileKey) -> str | None:+ def resolve(self, key: MarimoFileKey) -> str | None:"""Resolve a key to an absolute path; `None` for new files.Useful for endpoints that need file-backed resources (e.g. thumbnails)@@ -61,7 +63,7 @@ class NotebookWorkspace(abc.ABC):def load(self,- key: FileKey,+ key: MarimoFileKey,defaults: AppDefaults | None = None,) -> AppFileManager:"""Load the notebook for the given key into an `AppFileManager`.@@ -125,11 +127,11 @@ class NotebookWorkspace(abc.ABC):del include_markdown-def file_not_found(key: FileKey) -> HTTPException:+def file_not_found(key: MarimoFileKey) -> HTTPException:"""Build the standard 404 response for an unresolvable file key."""return HTTPException(status_code=HTTPStatus.NOT_FOUND,- detail=f"File {serialize_file_key(key)} not found",+ detail=f"File {key} not found",)@@ -163,16 +165,3 @@ def flatten_files(files: list[FileInfo]) -> Iterator[FileInfo]:stack.extend(file.children)else:yield file---__all__ = [- "FileKey",- "NewFileKey",- "NotebookWorkspace",- "PathFileKey",- "count_files",- "file_not_found",- "flatten_files",- "normalize_allowlist_entry",- "serialize_file_key",-]diff --git a/marimo/_server/workspace/_directory.py b/marimo/_server/workspace/_directory.pyindex 30522139aa..58f5bbd4b5 100644--- a/marimo/_server/workspace/_directory.py+++ b/marimo/_server/workspace/_directory.py@@ -10,13 +10,11 @@ from marimo import _loggersfrom marimo._server.files.directory_scanner import DirectoryScannerfrom marimo._server.files.path_validator import PathValidatorfrom marimo._server.workspace._base import (+ NEW_FILE,+ MarimoFileKey,NotebookWorkspace,file_not_found,)-from marimo._server.workspace._keys import (- FileKey,- NewFileKey,-)from marimo._utils.http import HTTPException, HTTPStatusif TYPE_CHECKING:@@ -71,15 +69,15 @@ class DirectoryWorkspace(NotebookWorkspace):def single_file(self) -> MarimoFile | None:return None- def get_unique_file_key(self) -> FileKey | None:+ def get_unique_file_key(self) -> MarimoFileKey | None:return None- def resolve(self, key: FileKey) -> str | None:- if isinstance(key, NewFileKey):+ def resolve(self, key: MarimoFileKey) -> str | None:+ if key.startswith(NEW_FILE):return Nonedirectory = Path(self._directory)- filepath = Path(key.path)+ filepath = Path(key)# Resolve relative paths against the workspace directory.if not filepath.is_absolute():diff --git a/marimo/_server/workspace/_empty.py b/marimo/_server/workspace/_empty.pyindex 85c72fd820..f4c52cf369 100644--- a/marimo/_server/workspace/_empty.py+++ b/marimo/_server/workspace/_empty.py@@ -8,13 +8,11 @@ from pathlib import Pathfrom typing import TYPE_CHECKINGfrom marimo._server.workspace._base import (+ NEW_FILE,+ MarimoFileKey,NotebookWorkspace,file_not_found,)-from marimo._server.workspace._keys import (- FileKey,- NewFileKey,-)from marimo._utils.paths import normalize_pathif TYPE_CHECKING:@@ -31,8 +29,8 @@ class EmptyWorkspace(NotebookWorkspace):continue to work."""- def get_unique_file_key(self) -> FileKey | None:- return NewFileKey()+ def get_unique_file_key(self) -> MarimoFileKey | None:+ return NEW_FILEdef single_file(self) -> MarimoFile | None:return None@@ -41,12 +39,12 @@ class EmptyWorkspace(NotebookWorkspace):def files(self) -> list[FileInfo]:return []- def resolve(self, key: FileKey) -> str | None:- if isinstance(key, NewFileKey):+ def resolve(self, key: MarimoFileKey) -> str | None:+ if key.startswith(NEW_FILE):return None- if os.path.exists(key.path):+ if os.path.exists(key):# Match sibling workspaces: return an absolute normalized path so# downstream comparisons (e.g. session lookups) don't trip on# relative-vs-absolute mismatches.- return str(normalize_path(Path(key.path)))+ return str(normalize_path(Path(key)))raise file_not_found(key)diff --git a/marimo/_server/workspace/_fixed.py b/marimo/_server/workspace/_fixed.pyindex 1836115cd2..75521347aa 100644--- a/marimo/_server/workspace/_fixed.py+++ b/marimo/_server/workspace/_fixed.py@@ -8,14 +8,12 @@ from typing import TYPE_CHECKINGfrom marimo._server.models.files import FileInfofrom marimo._server.workspace._base import (+ NEW_FILE,+ MarimoFileKey,NotebookWorkspace,file_not_found,normalize_allowlist_entry,)-from marimo._server.workspace._keys import (- FileKey,- NewFileKey,-)from marimo._utils.paths import normalize_pathif TYPE_CHECKING:@@ -61,14 +59,14 @@ class FixedFilesWorkspace(NotebookWorkspace):def single_file(self) -> MarimoFile | None:return None- def get_unique_file_key(self) -> FileKey | None:+ def get_unique_file_key(self) -> MarimoFileKey | None:return None- def resolve(self, key: FileKey) -> str | None:- if isinstance(key, NewFileKey):+ def resolve(self, key: MarimoFileKey) -> str | None:+ if key.startswith(NEW_FILE):raise file_not_found(key)- filepath = Path(key.path)+ filepath = Path(key)if not filepath.is_absolute() and self._directory:filepath = Path(self._directory) / filepathnormalized_path = normalize_path(filepath)diff --git a/marimo/_server/workspace/_keys.py b/marimo/_server/workspace/_keys.pydeleted file mode 100644index f053f44dd9..0000000000--- a/marimo/_server/workspace/_keys.py+++ /dev/null@@ -1,56 +0,0 @@-# Copyright 2026 Marimo. All rights reserved.-"""Tagged-union ADT for notebook file keys.--The wire format is a string (HTTP query params, session `initialization_id`)-but inside the server we model the two cases explicitly:--- :class:`NewFileKey` — the untitled (`__new__`) notebook-- :class:`PathFileKey` — a notebook identified by a filesystem path-"""--from __future__ import annotations--from dataclasses import dataclass--# Wire-format sentinel for an untitled notebook. Preserved across HTTP query-# params and session initialization IDs.-NEW_FILE_WIRE: str = "__new__"---@dataclass(frozen=True)-class NewFileKey:- """Sentinel key for an untitled notebook."""---@dataclass(frozen=True)-class PathFileKey:- """Key for a notebook identified by a filesystem path.-- The `path` is the raw value supplied at the boundary; workspaces are- responsible for normalizing and validating it.- """-- path: str---FileKey = NewFileKey | PathFileKey---def parse_file_key(raw: str) -> FileKey:- """Parse a wire-format string into a :class:`FileKey`.-- The literal `__new__` becomes a :class:`NewFileKey`; any other string is- treated as a path. We match the sentinel exactly so non-sentinel keys- flow through normal path validation rather than being short-circuited- to the blank notebook.- """- if raw == NEW_FILE_WIRE:- return NewFileKey()- return PathFileKey(raw)---def serialize_file_key(key: FileKey) -> str:- """Serialize a :class:`FileKey` back to its wire-format string."""- if isinstance(key, NewFileKey):- return NEW_FILE_WIRE- return key.pathdiff --git a/marimo/_server/workspace/_single.py b/marimo/_server/workspace/_single.pyindex 54c8f73aa1..c6c5f2ec5f 100644--- a/marimo/_server/workspace/_single.py+++ b/marimo/_server/workspace/_single.py@@ -8,15 +8,12 @@ from typing import TYPE_CHECKINGfrom marimo._server.models.home import MarimoFilefrom marimo._server.workspace._base import (+ NEW_FILE,+ MarimoFileKey,NotebookWorkspace,file_not_found,normalize_allowlist_entry,)-from marimo._server.workspace._keys import (- FileKey,- NewFileKey,- PathFileKey,-)from marimo._utils.marimo_path import MarimoPathfrom marimo._utils.paths import normalize_path@@ -65,14 +62,14 @@ class SingleFileWorkspace(NotebookWorkspace):def single_file(self) -> MarimoFile | None:return self._file- def get_unique_file_key(self) -> FileKey | None:- return PathFileKey(self._file.path)+ def get_unique_file_key(self) -> MarimoFileKey | None:+ return self._file.path- def resolve(self, key: FileKey) -> str | None:- if isinstance(key, NewFileKey):+ def resolve(self, key: MarimoFileKey) -> str | None:+ if key.startswith(NEW_FILE):return None- filepath = Path(key.path)+ filepath = Path(key)normalized_path = normalize_path(filepath)absolute_path = str(normalized_path)if absolute_path not in self._allowed_paths:diff --git a/marimo/_session/session_repository.py b/marimo/_session/session_repository.pyindex cc3f472066..65a3565a94 100644--- a/marimo/_session/session_repository.py+++ b/marimo/_session/session_repository.py@@ -13,7 +13,7 @@ from marimo._types.ids import ConsumerId, SessionIdif TYPE_CHECKING:from collections.abc import Mapping- from marimo._server.workspace import FileKey+ from marimo._server.workspace import MarimoFileKeyclass SessionRepository:@@ -52,27 +52,14 @@ class SessionRepository:return sessionreturn None- def get_by_file_key(self, file_key: FileKey) -> Session | None:+ def get_by_file_key(self, file_key: MarimoFileKey) -> Session | None:"""Get a session by file key."""import os- from marimo._server.workspace import (- NewFileKey,- serialize_file_key,- )-- serialized = serialize_file_key(file_key)- abs_path = (- None- if isinstance(file_key, NewFileKey)- else os.path.abspath(file_key.path)- )for session in self._sessions.values():- if session.initialization_id == serialized:- return sessionif (- abs_path is not None- and session.app_file_manager.path == abs_path+ session.initialization_id == file_key+ or session.app_file_manager.path == os.path.abspath(file_key)):return sessionreturn Nonediff --git a/tests/_server/api/endpoints/test_assets.py b/tests/_server/api/endpoints/test_assets.pyindex 13484b415d..24c7a292e0 100644--- a/tests/_server/api/endpoints/test_assets.py+++ b/tests/_server/api/endpoints/test_assets.py@@ -19,7 +19,6 @@ from marimo._server.workspace import (EmptyWorkspace,FixedFilesWorkspace,SingleFileWorkspace,- serialize_file_key,)from marimo._session.model import SessionModefrom marimo._utils.marimo_path import MarimoPath@@ -45,11 +44,10 @@ def test_index(client: TestClient) -> None:response = client.get("/", headers=token_header())assert response.status_code == 200, response.textcontent = response.text- file_key = session_manager.workspace.get_unique_file_key()- assert file_key is not None- filename = serialize_file_key(file_key)+ filename = session_manager.workspace.get_unique_file_key()title = parse_title(filename)assert f"<marimo-filename hidden>{filename}</marimo-filename>" in content+ assert filename is not Noneassert filename in contentassert '"mode": "edit"' in contentassert f"<title>{title}</title>" in content@@ -499,11 +497,10 @@ def test_public_file_serving(client: TestClient) -> None:app_state = AppState.from_app(cast(Any, client.app))file_key = app_state.session_manager.workspace.get_unique_file_key()assert file_key is not None- filepath = serialize_file_key(file_key)- assert filepath.endswith(".py")+ assert file_key.endswith(".py")# Create a test file in a public directory- notebook_dir = Path(filepath).parent+ notebook_dir = Path(file_key).parentpublic_dir = notebook_dir / "public"public_dir.mkdir(parents=True, exist_ok=True)test_file = public_dir / "test.txt"@@ -514,7 +511,7 @@ def test_public_file_serving(client: TestClient) -> None:assert response.status_code == 404# Test with notebook ID header- headers = {**token_header(), "X-Notebook-Id": filepath}+ headers = {**token_header(), "X-Notebook-Id": file_key}response = client.get("/public/test.txt", headers=headers)assert response.status_code == 200assert response.text == "test content"@@ -540,11 +537,10 @@ def test_public_file_security(client: TestClient) -> None:app_state = AppState.from_app(cast(Any, client.app))file_key = app_state.session_manager.workspace.get_unique_file_key()assert file_key is not None- filepath = serialize_file_key(file_key)- assert filepath.endswith(".py")+ assert file_key.endswith(".py")# Setup notebook and directories- notebook_dir = Path(filepath).parent+ notebook_dir = Path(file_key).parentpublic_dir = notebook_dir / "public"secret_dir = notebook_dir / "secret"public_dir.mkdir(parents=True, exist_ok=True)@@ -563,7 +559,7 @@ def test_public_file_security(client: TestClient) -> None:app_manager = app_state.session_manager.app_manager(file_key)app_manager.filename = str(notebook_dir / "notebook.py")- headers = {**token_header(), "X-Notebook-Id": filepath}+ headers = {**token_header(), "X-Notebook-Id": file_key}# Test normal file accessresponse = client.get("/public/safe.txt", headers=headers)@@ -736,7 +732,7 @@ def test_index_lsp_workspace_with_root_directory(client,DirectoryWorkspace(str(temp_project_dir), include_markdown=False),):- response = client.get("/?file=__new__", headers=token_header())+ response = client.get("/?file=__new__file.py", headers=token_header())root_path = temp_project_dirroot_uri = json.dumps(root_path.as_uri())document_path = root_path.joinpath(DEFAULT_NOTEBOOK_NAME)@@ -756,7 +752,7 @@ def test_index_lsp_workspace_with_sub_directory(with workspace_scope(client, DirectoryWorkspace(str(subdir), include_markdown=False)):- response = client.get("/?file=__new__", headers=token_header())+ response = client.get("/?file=__new__file.py", headers=token_header())root_path = temp_project_dirroot_uri = json.dumps(root_path.as_uri())document_path = subdir.joinpath(DEFAULT_NOTEBOOK_NAME)diff --git a/tests/_server/api/endpoints/test_file_explorer.py b/tests/_server/api/endpoints/test_file_explorer.pyindex 3456669580..f54869bbca 100644--- a/tests/_server/api/endpoints/test_file_explorer.py+++ b/tests/_server/api/endpoints/test_file_explorer.py@@ -8,7 +8,6 @@ from typing import TYPE_CHECKINGimport pytest-from marimo._server.workspace import serialize_file_keyfrom marimo._utils.platform import is_windowsfrom tests._server.mocks import get_session_manager, token_header@@ -226,9 +225,9 @@ def test_update_file_with_session(client: TestClient) -> None:# Enable watch mode (file watcher is set up automatically)sm.watch = True- file_key = sm.workspace.get_unique_file_key()- assert file_key- file_path = Path(serialize_file_key(file_key))+ file_path = sm.workspace.get_unique_file_key()+ assert file_path+ file_path = Path(file_path)assert file_path.exists()# Create a session by connecting via websocketdiff --git a/tests/_server/api/endpoints/test_files.py b/tests/_server/api/endpoints/test_files.pyindex 0cef47297a..ade1c754da 100644--- a/tests/_server/api/endpoints/test_files.py+++ b/tests/_server/api/endpoints/test_files.py@@ -12,7 +12,6 @@ from unittest.mock import Mock, patchimport msgspecimport pytest-from marimo._server.workspace import serialize_file_keyfrom marimo._utils.platform import is_windowsfrom tests._server.mocks import (get_session_manager,@@ -36,12 +35,12 @@ HEADERS = {@with_session(SESSION_ID)def test_rename(client: TestClient) -> None:- current_file_key = get_session_manager(+ current_filename = get_session_manager(client).workspace.get_unique_file_key()- assert current_file_key- current_path = Path(serialize_file_key(current_file_key))+ assert current_filename+ current_path = Path(current_filename)assert current_path.exists()directory = current_path.parent@@ -104,9 +103,8 @@ def test_read_code_in_run_mode_without_include_code(@pytest.mark.flaky(reruns=5)@with_session(SESSION_ID)def test_save_file(client: TestClient) -> None:- file_key = get_session_manager(client).workspace.get_unique_file_key()- assert file_key- filename = serialize_file_key(file_key)+ filename = get_session_manager(client).workspace.get_unique_file_key()+ assert filenamepath = Path(filename)response = client.post(@@ -159,9 +157,8 @@ def test_save_file(client: TestClient) -> None:)@with_session(SESSION_ID)def test_save_with_header(client: TestClient) -> None:- file_key = get_session_manager(client).workspace.get_unique_file_key()- assert file_key- filename = serialize_file_key(file_key)+ filename = get_session_manager(client).workspace.get_unique_file_key()+ assert filenamepath = Path(filename)assert path.exists()@@ -211,9 +208,8 @@ def test_save_with_header(client: TestClient) -> None:@pytest.mark.flaky(reruns=5)@with_session(SESSION_ID)def test_save_with_invalid_file(client: TestClient) -> None:- file_key = get_session_manager(client).workspace.get_unique_file_key()- assert file_key- filename = serialize_file_key(file_key)+ filename = get_session_manager(client).workspace.get_unique_file_key()+ assert filenamepath = Path(filename)assert path.exists()@@ -290,9 +286,8 @@ def test_save_file_cannot_rename(client: TestClient) -> None:@pytest.mark.flaky(reruns=5)@with_session(SESSION_ID)def test_save_app_config(client: TestClient) -> None:- file_key = get_session_manager(client).workspace.get_unique_file_key()- assert file_key- filename = serialize_file_key(file_key)+ filename = get_session_manager(client).workspace.get_unique_file_key()+ assert filenamepath = Path(filename)def _wait_for_file_reset():@@ -320,9 +315,8 @@ def test_save_app_config(client: TestClient) -> None:@with_session(SESSION_ID)def test_copy_file(client: TestClient) -> None:- file_key = get_session_manager(client).workspace.get_unique_file_key()- assert file_key- filename = serialize_file_key(file_key)+ filename = get_session_manager(client).workspace.get_unique_file_key()+ assert filenamepath = Path(filename)assert path.exists()file_contents = path.read_text()@@ -353,9 +347,8 @@ def test_copy_file(client: TestClient) -> None:@with_session(SESSION_ID)def test_copy_file_with_relative_paths(client: TestClient) -> None:"""Test that copy works with relative paths when workspace has a directory."""- file_key = get_session_manager(client).workspace.get_unique_file_key()- assert file_key- filename = serialize_file_key(file_key)+ filename = get_session_manager(client).workspace.get_unique_file_key()+ assert filenamepath = Path(filename)assert path.exists()file_contents = path.read_text()@@ -400,9 +393,8 @@ def test_copy_file_with_relative_paths(client: TestClient) -> None:@with_session(SESSION_ID)def test_path_traversal_save_blocked(client: TestClient) -> None:"""Save endpoint must not write outside the workspace's directory."""- file_key = get_session_manager(client).workspace.get_unique_file_key()- assert file_key- filename = serialize_file_key(file_key)+ filename = get_session_manager(client).workspace.get_unique_file_key()+ assert filenamepath = Path(filename)directory = str(path.parent)workspace = get_session_manager(client).workspace@@ -431,9 +423,8 @@ def test_path_traversal_save_blocked(client: TestClient) -> None:@with_session(SESSION_ID)def test_path_traversal_rename_blocked(client: TestClient) -> None:"""Rename endpoint must not move files outside the workspace's directory."""- file_key = get_session_manager(client).workspace.get_unique_file_key()- assert file_key- filename = serialize_file_key(file_key)+ filename = get_session_manager(client).workspace.get_unique_file_key()+ assert filenamepath = Path(filename)directory = str(path.parent)workspace = get_session_manager(client).workspace@@ -455,9 +446,8 @@ def test_path_traversal_rename_blocked(client: TestClient) -> None:@with_session(SESSION_ID)def test_path_traversal_copy_blocked(client: TestClient) -> None:"""Copy endpoint must not write outside the workspace's directory."""- file_key = get_session_manager(client).workspace.get_unique_file_key()- assert file_key- filename = serialize_file_key(file_key)+ filename = get_session_manager(client).workspace.get_unique_file_key()+ assert filenamepath = Path(filename)directory = str(path.parent)workspace = get_session_manager(client).workspace@@ -483,12 +473,11 @@ def test_path_traversal_copy_blocked(client: TestClient) -> None:def test_rename_propagates(client: TestClient, websocket: WebSocketTestSession) -> None:- current_file_key = get_session_manager(+ current_filename = get_session_manager(client).workspace.get_unique_file_key()- assert current_file_key- current_filename = serialize_file_key(current_file_key)+ assert current_filenameassert os.path.exists(current_filename)initial_response = client.post(@@ -569,9 +558,8 @@ def test_read_code_without_saved_file(client: TestClient) -> None:@with_session(SESSION_ID)def test_save_with_unicode_content(client: TestClient) -> None:"""Test save endpoint with unicode and special characters."""- file_key = get_session_manager(client).workspace.get_unique_file_key()- assert file_key- filename = serialize_file_key(file_key)+ filename = get_session_manager(client).workspace.get_unique_file_key()+ assert filenamepath = Path(filename)unicode_code = """# Unicode test: 你好世界 🌍 ñáéíóúdiff --git a/tests/_server/api/endpoints/test_home.py b/tests/_server/api/endpoints/test_home.pyindex 12064dff2c..9533ebb99f 100644--- a/tests/_server/api/endpoints/test_home.py+++ b/tests/_server/api/endpoints/test_home.py@@ -15,8 +15,6 @@ from marimo._server.models.home import MarimoFilefrom marimo._server.workspace import (DirectoryWorkspace,FixedFilesWorkspace,- PathFileKey,- serialize_file_key,)from marimo._session.model import SessionModefrom tests._server.mocks import get_session_manager, token_header, with_session@@ -33,10 +31,10 @@ HEADERS = {@with_session(SESSION_ID)def test_workspace_files(client: TestClient) -> None:- current_file_key = get_session_manager(+ current_filename = get_session_manager(client).workspace.get_unique_file_key()- assert current_file_key+ assert current_filenameresponse = client.post("/api/home/workspace_files",@@ -46,7 +44,7 @@ def test_workspace_files(client: TestClient) -> None:body = response.json()files = body["files"]assert len(files) == 1- assert files[0]["path"] == serialize_file_key(current_file_key)+ assert files[0]["path"] == current_filename# Check that new fields are presentassert "hasMore" in bodyassert "fileCount" in body@@ -67,10 +65,10 @@ def test_workspace_files_no_files(client: TestClient) -> None:@with_session(SESSION_ID)def test_running_notebooks(client: TestClient) -> None:- current_file_key = get_session_manager(+ current_filename = get_session_manager(client).workspace.get_unique_file_key()- assert current_file_key+ assert current_filenameresponse = client.post("/api/home/running_notebooks",@@ -79,7 +77,7 @@ def test_running_notebooks(client: TestClient) -> None:body = response.json()files = body["files"]assert len(files) == 1- assert files[0]["path"] == serialize_file_key(current_file_key)+ assert files[0]["path"] == current_filename# TODO: Debug on Windows@@ -381,7 +379,7 @@ def test_tutorial_file_accessible_after_open(client: TestClient) -> None:# Try to get a file manager for the tutorial file# This should not raise an HTTPException about being outside the directory- file_manager = session_manager.app_manager(PathFileKey(tutorial_path))+ file_manager = session_manager.app_manager(tutorial_path)assert file_manager is not Noneassert file_manager.path == tutorial_pathdiff --git a/tests/_server/api/endpoints/test_resume_session.py b/tests/_server/api/endpoints/test_resume_session.pyindex 82c40addc0..9200553000 100644--- a/tests/_server/api/endpoints/test_resume_session.py+++ b/tests/_server/api/endpoints/test_resume_session.py@@ -11,7 +11,6 @@ from marimo._messaging.notification import (CellNotification,KernelReadyNotification,)-from marimo._server.workspace import serialize_file_keyfrom marimo._session import Sessionfrom marimo._types.ids import SessionIdfrom marimo._utils.parse_dataclass import parse_raw@@ -264,9 +263,8 @@ def test_resume_session_after_file_change(client: TestClient) -> None:# Write to the notebook file to add a new cell# we write it as the second to last cell- file_key = session_manager.workspace.get_unique_file_key()- assert file_key- filename = serialize_file_key(file_key)+ filename = session_manager.workspace.get_unique_file_key()+ assert filenamewith open(filename) as f:content = f.read()last_cell_pos = content.rindex("@app.cell")diff --git a/tests/_server/api/endpoints/test_ws.py b/tests/_server/api/endpoints/test_ws.pyindex 535008933b..33b7a084e1 100644--- a/tests/_server/api/endpoints/test_ws.py+++ b/tests/_server/api/endpoints/test_ws.py@@ -18,7 +18,6 @@ from marimo._server.api.endpoints.ws.ws_connection_validator import ()from marimo._server.codes import WebSocketCodesfrom marimo._server.session_manager import SessionManager-from marimo._server.workspace import serialize_file_keyfrom marimo._session.model import ConnectionState, SessionModefrom marimo._utils.parse_dataclass import parse_rawfrom tests._server.api.endpoints.ws_helpers import (@@ -164,9 +163,8 @@ async def test_file_watcher_calls_reload(client: TestClient) -> None:with client.websocket_connect(WS_URL) as websocket:data = websocket.receive_json()assert_kernel_ready_response(data)- file_key = session_manager.workspace.get_unique_file_key()- assert file_key- filename = serialize_file_key(file_key)+ filename = session_manager.workspace.get_unique_file_key()+ assert filenamewith open(filename, "a") as f: # noqa: ASYNC230f.write("\n# test")f.close()diff --git a/tests/_server/api/endpoints/test_ws_rtc.py b/tests/_server/api/endpoints/test_ws_rtc.pyindex 7a290b5a52..4d4cc72025 100644--- a/tests/_server/api/endpoints/test_ws_rtc.py+++ b/tests/_server/api/endpoints/test_ws_rtc.py@@ -9,7 +9,6 @@ from starlette.websockets import WebSocketDisconnectfrom marimo._config.manager import UserConfigManagerfrom marimo._server.api.endpoints.ws_endpoint import DOC_MANAGER-from marimo._server.workspace import serialize_file_keyfrom tests._server.api.endpoints.ws_helpers import (assert_kernel_ready_response,assert_parse_ready_response,@@ -241,9 +240,7 @@ async def test_ws_sync_without_existing_session(client: TestClient) -> None:file_key = get_session_manager(client).workspace.get_unique_file_key()assert file_key is not None- ws_sync_url = (- f"/ws_sync?file={serialize_file_key(file_key)}&access_token=fake-token"- )+ ws_sync_url = f"/ws_sync?file={file_key}&access_token=fake-token"# Try to connect to ws_sync without creating a main session firstwith pytest.raises(WebSocketDisconnect) as exc_info:@@ -268,9 +265,7 @@ async def test_ws_sync_cleanup_on_main_disconnect(client: TestClient) -> None:DOC_MANAGER.loro_docs_clients.clear()ws_1 = "/ws?session_id=123&access_token=fake-token"- ws_sync_url = (- f"/ws_sync?file={serialize_file_key(file_key)}&access_token=fake-token"- )+ ws_sync_url = f"/ws_sync?file={file_key}&access_token=fake-token"with rtc_enabled(get_user_config_manager(client)):with client.websocket_connect(ws_1) as main_websocket:diff --git a/tests/_server/rtc/test_rtc_doc.py b/tests/_server/rtc/test_rtc_doc.pyindex b3cc736dbc..f0920a881b 100644--- a/tests/_server/rtc/test_rtc_doc.py+++ b/tests/_server/rtc/test_rtc_doc.py@@ -7,7 +7,7 @@ from typing import TYPE_CHECKING, castimport pytestfrom marimo._server.rtc.doc import LoroDocManager-from marimo._server.workspace import FileKey, PathFileKey+from marimo._server.workspace import MarimoFileKeyfrom marimo._types.ids import CellId_tif sys.version_info >= (3, 11) and sys.version_info < (3, 14):@@ -41,7 +41,7 @@ async def test_quick_reconnection(setup_doc_manager: None) -> None:"""Test that quick reconnection properly handles cleanup task cancellation"""del setup_doc_manager# Setup- file_key = PathFileKey("test_file")+ file_key = MarimoFileKey("test_file")# Create initial loro_docdoc = LoroDoc()@@ -78,7 +78,7 @@ async def test_quick_reconnection(setup_doc_manager: None) -> None:async def test_two_users_sync(setup_doc_manager: None) -> None:"""Test that two users can connect and sync text properly without duplicates"""del setup_doc_manager- file_key = PathFileKey("test_file")+ file_key = MarimoFileKey("test_file")cell_id = str(CellId_t("test_cell")) # Convert CellId to string for loro# First user connects@@ -126,7 +126,7 @@ async def test_two_users_sync(setup_doc_manager: None) -> None:async def test_concurrent_doc_creation(setup_doc_manager: None) -> None:"""Test concurrent doc creation doesn't cause issues"""del setup_doc_manager- file_key = PathFileKey("test_file")+ file_key = MarimoFileKey("test_file")cell_ids = (CellId_t("cell1"), CellId_t("cell2"))codes = ("print('hello')", "print('world')")@@ -149,7 +149,7 @@ async def test_concurrent_client_operations() -> None:"""Test concurrent client operations don't cause deadlocks"""del setup_doc_manager- file_key = PathFileKey("test_file")+ file_key = MarimoFileKey("test_file")doc = LoroDoc()doc_manager.loro_docs[file_key] = doc@@ -176,7 +176,7 @@ async def test_concurrent_client_operations(async def test_cleanup_task_management(setup_doc_manager: None) -> None:"""Test cleanup task management and cancellation"""del setup_doc_manager- file_key = PathFileKey("test_file")+ file_key = MarimoFileKey("test_file")doc = LoroDoc()doc_manager.loro_docs[file_key] = doc@@ -210,7 +210,7 @@ async def test_cleanup_task_management(setup_doc_manager: None) -> None:async def test_broadcast_update(setup_doc_manager: None) -> None:"""Test broadcast update functionality"""del setup_doc_manager- file_key = PathFileKey("test_file")+ file_key = MarimoFileKey("test_file")doc = LoroDoc()doc_manager.loro_docs[file_key] = doc@@ -238,7 +238,7 @@ async def test_broadcast_update(setup_doc_manager: None) -> None:async def test_remove_nonexistent_doc(setup_doc_manager: None) -> None:"""Test removing a doc that doesn't exist"""del setup_doc_manager- file_key = PathFileKey("nonexistent")+ file_key = MarimoFileKey("nonexistent")await doc_manager.remove_doc(file_key)assert file_key not in doc_manager.loro_docsassert file_key not in doc_manager.loro_docs_clients@@ -251,7 +251,7 @@ async def test_remove_nonexistent_doc(setup_doc_manager: None) -> None:async def test_remove_nonexistent_client(setup_doc_manager: None) -> None:"""Test removing a client that doesn't exist"""del setup_doc_manager- file_key = PathFileKey("test_file")+ file_key = MarimoFileKey("test_file")queue = asyncio.Queue[bytes]()await doc_manager.remove_client(file_key, queue)assert file_key not in doc_manager.loro_docs_clients@@ -263,7 +263,7 @@ async def test_remove_nonexistent_client(setup_doc_manager: None) -> None:async def test_concurrent_doc_removal(setup_doc_manager: None) -> None:"""Test concurrent doc removal doesn't cause issues"""del setup_doc_manager- file_key = PathFileKey("test_file")+ file_key = MarimoFileKey("test_file")doc = LoroDoc()doc_manager.loro_docs[file_key] = doc@@ -291,7 +291,7 @@ async def test_prevent_lock_deadlock(setup_doc_manager: None) -> None:The fixed implementation should handle this without deadlocking."""del setup_doc_manager- file_key = PathFileKey("test_file")+ file_key = MarimoFileKey("test_file")# Create a doc and add a clientdoc = LoroDoc()@@ -332,7 +332,7 @@ async def test_prevent_lock_deadlock(setup_doc_manager: None) -> None:original_clean_loro_doc = doc_manager._clean_loro_docasync def test_clean_loro_doc(- file_key: FileKey, timeout: float = original_timeout+ file_key: MarimoFileKey, timeout: float = original_timeout) -> None:del timeout# Override timeout with our test valuediff --git a/tests/_server/test_file_manager_absolute_path.py b/tests/_server/test_file_manager_absolute_path.pyindex a1ca51b683..141bc7d7ac 100644--- a/tests/_server/test_file_manager_absolute_path.py+++ b/tests/_server/test_file_manager_absolute_path.py@@ -9,7 +9,7 @@ from pathlib import Pathimport pytest-from marimo._server.workspace import DirectoryWorkspace, PathFileKey+from marimo._server.workspace import DirectoryWorkspacefrom marimo._utils.http import HTTPException, HTTPStatusis_windows = sys.platform == "win32"@@ -58,7 +58,7 @@ if __name__ == "__main__":assert file_info.path == "notebook.py"# Try to get a file manager using the relative path from files list- file_manager = router.load(PathFileKey(file_info.path))+ file_manager = router.load(file_info.path)assert file_manager is not None# File manager resolves to absolute pathassert file_manager.filename == str(test_file)@@ -108,7 +108,7 @@ if __name__ == "__main__":assert file_info.path == "notebook.py"# Try to get a file manager using the relative file path- file_manager = router.load(PathFileKey(file_info.path))+ file_manager = router.load(file_info.path)assert file_manager is not Noneassert file_manager.is_notebook_named# File manager resolves to absolute path@@ -151,9 +151,7 @@ if __name__ == "__main__":# Get file manager with absolute pathabsolute_file_path = absolute_files[0].path- absolute_file_manager = absolute_router.load(- PathFileKey(absolute_file_path)- )+ absolute_file_manager = absolute_router.load(absolute_file_path)# Change to the parent directoryoriginal_cwd = os.getcwd()@@ -170,9 +168,7 @@ if __name__ == "__main__":# Get file manager with relative pathrelative_file_path = relative_files[0].path- relative_file_manager = relative_router.load(- PathFileKey(relative_file_path)- )+ relative_file_manager = relative_router.load(relative_file_path)# Both should reference the same fileassert (@@ -233,7 +229,7 @@ if __name__ == "__main__":assert os.path.exists(full_path)# Try to get a file manager- file_manager = router.load(PathFileKey(full_path))+ file_manager = router.load(full_path)assert file_manager is not Noneassert file_manager.is_notebook_namedassert file_manager.read_file() is not None@@ -289,7 +285,7 @@ if __name__ == "__main__":# Try to get a file managerfile_path = files_after[0].path- file_manager = router.load(PathFileKey(file_path))+ file_manager = router.load(file_path)assert file_manager is not Noneassert file_manager.is_notebook_namedcontent = file_manager.read_file()@@ -340,7 +336,7 @@ if __name__ == "__main__":# the router's directoryrelative_filename = "notebook.py"- file_manager = router.load(PathFileKey(relative_filename))+ file_manager = router.load(relative_filename)assert file_manager is not Noneassert file_manager.is_notebook_named# Verify it opened the correct file@@ -404,7 +400,7 @@ if __name__ == "__main__":file_info = files[0]# This should work - using the full absolute path- file_manager = router.load(PathFileKey(file_info.path))+ file_manager = router.load(file_info.path)assert file_manager is not Noneassert file_manager.is_notebook_named@@ -415,7 +411,7 @@ if __name__ == "__main__":# This currently fails but should succeed# The router should resolve the basename relative to its directorytry:- file_manager_from_basename = router.load(PathFileKey(basename))+ file_manager_from_basename = router.load(basename)assert file_manager_from_basename is not Noneassert file_manager_from_basename.is_notebook_namedexcept HTTPException:@@ -474,7 +470,7 @@ if __name__ == "__main__":relative_path = os.path.join("subdir", "notebook.py")try:- file_manager = router.load(PathFileKey(relative_path))+ file_manager = router.load(relative_path)assert file_manager is not Noneassert file_manager.is_notebook_namedexcept HTTPException:@@ -516,7 +512,7 @@ if __name__ == "__main__":# Verify each file can be opened using its relative pathfor file_info in files:- file_manager = router.load(PathFileKey(file_info.path))+ file_manager = router.load(file_info.path)assert file_manager is not Noneassert file_manager.is_notebook_named@@ -543,12 +539,12 @@ if __name__ == "__main__":router = DirectoryWorkspace(absolute_dir, include_markdown=False)# Should be able to open file within the directory- file_manager = router.load(PathFileKey(str(test_file.absolute())))+ file_manager = router.load(str(test_file.absolute()))assert file_manager is not None# Should NOT be able to open file outside the directorywith pytest.raises(HTTPException) as exc_info:- router.load(PathFileKey(str(other_file.absolute())))+ router.load(str(other_file.absolute()))assert exc_info.value.status_code == HTTPStatus.FORBIDDENassert "Access denied" in exc_info.value.detail@@ -574,7 +570,7 @@ if __name__ == "__main__":# Try to access the secret file using absolute pathwith pytest.raises(HTTPException) as exc_info:- router.load(PathFileKey(str(secret_file.absolute())))+ router.load(str(secret_file.absolute()))assert exc_info.value.status_code == HTTPStatus.FORBIDDEN@@ -613,7 +609,7 @@ class TestRelativePathsInFileListing:# Both should be openable using their relative pathsfor path in _collect_file_paths(files):- file_manager = router.load(PathFileKey(path))+ file_manager = router.load(path)assert file_manager is not Noneassert file_manager.is_notebook_named@@ -646,7 +642,7 @@ class TestRelativePathsInFileListing:# Should be openable using the actual path from the files listactual_paths = _collect_file_paths(files)- file_manager = router.load(PathFileKey(actual_paths[0]))+ file_manager = router.load(actual_paths[0])assert file_manager is not Noneassert file_manager.filename == str(deep_file.absolute())@@ -671,12 +667,12 @@ class TestRelativePathsInFileListing:assert relative_path == "notebook.py"# Open with relative path- manager_from_relative = router.load(PathFileKey(relative_path))+ manager_from_relative = router.load(relative_path)assert manager_from_relative is not None# Open with absolute pathabsolute_path = str(test_file.absolute())- manager_from_absolute = router.load(PathFileKey(absolute_path))+ manager_from_absolute = router.load(absolute_path)assert manager_from_absolute is not None# Both should point to the same file@@ -699,7 +695,7 @@ class TestRelativePathsInFileListing:# Try to access file outside using path traversalwith pytest.raises(HTTPException) as exc_info:- router.load(PathFileKey("../outside.py"))+ router.load("../outside.py")assert exc_info.value.status_code == HTTPStatus.FORBIDDEN@@ -724,7 +720,7 @@ class TestRelativePathsInFileListing:for attempt in traversal_attempts:with pytest.raises(HTTPException) as exc_info:- router.load(PathFileKey(str(attempt)))+ router.load(str(attempt))assert exc_info.value.status_code == HTTPStatus.FORBIDDEN, (f"Path traversal '{attempt}' should be blocked")@@ -747,7 +743,7 @@ class TestFileManagerPathResolution:)# Try to open with ./ prefix- file_manager = router.load(PathFileKey("./notebook.py"))+ file_manager = router.load("./notebook.py")assert file_manager is not Noneassert file_manager.filename == str(test_file.absolute())@@ -767,7 +763,7 @@ class TestFileManagerPathResolution:)# Path normalization should handle redundant slashes- file_manager = router.load(PathFileKey("subdir//notebook.py"))+ file_manager = router.load("subdir//notebook.py")assert file_manager is not Noneassert file_manager.filename == str(test_file.absolute())@@ -781,7 +777,7 @@ class TestFileManagerPathResolution:)with pytest.raises(HTTPException) as exc_info:- router.load(PathFileKey("nonexistent.py"))+ router.load("nonexistent.py")assert exc_info.value.status_code == HTTPStatus.NOT_FOUND@@ -831,7 +827,7 @@ class TestFileManagerPathResolution:os.chdir(other_dir)# Should still be able to open file using relative path- file_manager = router.load(PathFileKey(relative_path))+ file_manager = router.load(relative_path)assert file_manager is not Noneassert file_manager.filename == str(test_file.absolute())diff --git a/tests/_server/test_session_manager.py b/tests/_server/test_session_manager.pyindex c78bf63385..ce7f34b0ff 100644--- a/tests/_server/test_session_manager.py+++ b/tests/_server/test_session_manager.py@@ -12,12 +12,7 @@ from marimo._server.lsp import LspServerfrom marimo._server.session.listeners import RecentsTrackerListenerfrom marimo._server.session_manager import SessionManagerfrom marimo._server.tokens import AuthToken, SkewProtectionToken-from marimo._server.workspace import (- EmptyWorkspace,- NewFileKey,- PathFileKey,- infer_workspace,-)+from marimo._server.workspace import NEW_FILE, EmptyWorkspace, infer_workspacefrom marimo._session import (KernelManager,Session,@@ -105,7 +100,7 @@ async def test_create_session_new(session_id,mock_session_consumer,query_params={},- file_key=NewFileKey(),+ file_key=NEW_FILE,auto_instantiate=False,)assert session_id in session_manager.sessions@@ -123,7 +118,7 @@ async def test_create_session_absolute_url(session_id,mock_session_consumer,query_params={},- file_key=PathFileKey(temp_marimo_file),+ file_key=temp_marimo_file,auto_instantiate=False,)assert session_id in session_manager.sessions@@ -142,20 +137,20 @@ def test_maybe_resume_session_for_new_file(# Resume the same session_id with a new file -> doesn't matchresumed_session = session_manager.maybe_resume_session(- session_id, NewFileKey()+ session_id, NEW_FILE)assert resumed_session is None# Resume the same session_id with a different file -> doesn't match# This is technically a bad state and should be unreachableresumed_session = session_manager.maybe_resume_session(- session_id, PathFileKey("different_file.py")+ session_id, "different_file.py")assert resumed_session is None# Resume with a different session_id -> doesn't matchresumed_session = session_manager.maybe_resume_session(- "different_session_id", NewFileKey()+ "different_session_id", NEW_FILE)assert resumed_session is None@@ -171,20 +166,20 @@ def test_maybe_resume_session_for_existing_file(# Resume the same session_id with the same file -> matchesresumed_session = session_manager.maybe_resume_session(- session_id, PathFileKey(temp_marimo_file)+ session_id, temp_marimo_file)assert resumed_session is mock_session# Resume the same session_id with a different file -> doesn't match# This is technically a bad state and should be unreachableresumed_session = session_manager.maybe_resume_session(- session_id, PathFileKey("different_file.py")+ session_id, "different_file.py")assert resumed_session is None# Resume with a different session_id -> matchesresumed_session = session_manager.maybe_resume_session(- "different_session_id", PathFileKey(temp_marimo_file)+ "different_session_id", temp_marimo_file)assert resumed_session is mock_session@@ -204,11 +199,8 @@ def test_any_clients_connected_new_file() -> None:add_session(session_manager, session_id, mock_session)mock_session.app_file_manager = AppFileManager(filename=None)- assert session_manager.any_clients_connected(NewFileKey()) is False- assert (- session_manager.any_clients_connected(PathFileKey("different_file.py"))- is False- )+ assert session_manager.any_clients_connected(NEW_FILE) is False+ assert session_manager.any_clients_connected("different_file.py") is Falsedef test_any_clients_connected_existing_file(@@ -218,15 +210,9 @@ def test_any_clients_connected_existing_file() -> None:add_session(session_manager, session_id, mock_session)mock_session.app_file_manager = AppFileManager(filename=temp_marimo_file)- assert session_manager.any_clients_connected(NewFileKey()) is False- assert (- session_manager.any_clients_connected(PathFileKey(temp_marimo_file))- is True- )- assert (- session_manager.any_clients_connected(PathFileKey("different_file.py"))- is False- )+ assert session_manager.any_clients_connected(NEW_FILE) is False+ assert session_manager.any_clients_connected(temp_marimo_file) is True+ assert session_manager.any_clients_connected("different_file.py") is Falsedef test_close_all_sessions(@@ -272,7 +258,7 @@ async def test_create_session_with_script_config_overrides(session_id,mock_session_consumer,query_params={},- file_key=PathFileKey(str(tmp_path / "test.py")),+ file_key=str(tmp_path / "test.py"),auto_instantiate=False,)assert session_id in session_manager.sessions@@ -479,7 +465,7 @@ async def test_recents_touch_called_on_session_create(SessionId("recents_test_session"),mock_session_consumer,query_params={},- file_key=PathFileKey(str(tmp_file)),+ file_key=str(tmp_file),auto_instantiate=False,)diff --git a/tests/_server/test_sessions.py b/tests/_server/test_sessions.pyindex 08d689f945..8d0694ecda 100644--- a/tests/_server/test_sessions.py+++ b/tests/_server/test_sessions.py@@ -37,7 +37,7 @@ from marimo._runtime.commands import ()from marimo._server.session_manager import SessionManagerfrom marimo._server.utils import initialize_asyncio-from marimo._server.workspace import PathFileKey, SingleFileWorkspace+from marimo._server.workspace import SingleFileWorkspacefrom marimo._session import Sessionfrom marimo._session.consumer import SessionConsumerfrom marimo._session.events import SessionEventBus@@ -453,7 +453,7 @@ def __():1""")- file_key = PathFileKey(str(tmp_file))+ file_key = str(tmp_file)try:# Create a session manager with file watching enabled@@ -702,7 +702,7 @@ async def test_watch_mode_with_watcher_on_save_autorun(tmp_path: Path) -> None:session_id=session_id,session_consumer=session_consumer,query_params={},- file_key=PathFileKey(str(tmp_file)),+ file_key=str(tmp_file),auto_instantiate=False,)mock_session_view = MagicMock(spec=SessionView)@@ -811,7 +811,7 @@ async def test_watch_mode_with_watcher_on_save_lazy(tmp_path: Path) -> None:session_id=session_id,session_consumer=session_consumer,query_params={},- file_key=PathFileKey(str(tmp_file)),+ file_key=str(tmp_file),auto_instantiate=False,)@@ -907,7 +907,7 @@ def __():session_id=session_id,session_consumer=session_consumer,query_params={},- file_key=PathFileKey(str(tmp_path1)),+ file_key=str(tmp_path1),auto_instantiate=False,)diff --git a/tests/_server/test_workspace.py b/tests/_server/test_workspace.pyindex 665530366d..c8366c06e9 100644--- a/tests/_server/test_workspace.py+++ b/tests/_server/test_workspace.py@@ -13,18 +13,14 @@ from marimo._server.files.path_validator import PathValidatorfrom marimo._server.models.files import FileInfofrom marimo._server.models.home import MarimoFilefrom marimo._server.workspace import (- NEW_FILE_WIRE,+ NEW_FILE,DirectoryWorkspace,EmptyWorkspace,FixedFilesWorkspace,- NewFileKey,- PathFileKey,SingleFileWorkspace,count_files,flatten_files,infer_workspace,- parse_file_key,- serialize_file_key,)from marimo._utils.http import HTTPException, HTTPStatusfrom marimo._utils.marimo_path import MarimoPath@@ -100,7 +96,7 @@ class TestNotebookWorkspace(unittest.TestCase):def test_empty_workspace(self):workspace = EmptyWorkspace()assert workspace.single_file() is None- assert workspace.get_unique_file_key() == NewFileKey()+ assert workspace.get_unique_file_key() == NEW_FILEdef test_directory_workspace_lists_files(self):workspace = DirectoryWorkspace(self.test_dir, include_markdown=False)@@ -128,26 +124,26 @@ class TestNotebookWorkspace(unittest.TestCase):def test_fixed_files_restricts_access(self):workspace = FixedFilesWorkspace([_marimo_file(self.test_file1.name)])with pytest.raises(HTTPException) as exc:- workspace.load(PathFileKey(self.test_file2.name))+ workspace.load(self.test_file2.name)assert exc.value.status_code == HTTPStatus.NOT_FOUNDdef test_fixed_files_register_allowed_path_is_noop(self):workspace = FixedFilesWorkspace([_marimo_file(self.test_file1.name)])workspace.register_allowed_path(self.test_file2.name)with pytest.raises(HTTPException) as exc:- workspace.load(PathFileKey(self.test_file2.name))+ workspace.load(self.test_file2.name)assert exc.value.status_code == HTTPStatus.NOT_FOUNDdef test_single_file_register_allowed_path_grows_allowlist(self):workspace = SingleFileWorkspace(_marimo_file(self.test_file1.name))workspace.register_allowed_path(self.test_file2.name)- manager = workspace.load(PathFileKey(self.test_file2.name))+ manager = workspace.load(self.test_file2.name)assert manager is not Nonedef test_fixed_files_disallows_new_file_key(self):workspace = FixedFilesWorkspace([_marimo_file(self.test_file1.name)])with pytest.raises(HTTPException) as exc:- workspace.load(NewFileKey())+ workspace.load(NEW_FILE)assert exc.value.status_code == HTTPStatus.NOT_FOUNDdef test_fixed_files_resolve_supports_relative_key(self):@@ -158,20 +154,20 @@ class TestNotebookWorkspace(unittest.TestCase):relative_key = str(Path(self.test_file1.name).relative_to(self.test_dir))- resolved = workspace.resolve(PathFileKey(relative_key))+ resolved = workspace.resolve(relative_key)assert resolved == self.test_file1.namedef test_directory_workspace_load(self):workspace = DirectoryWorkspace(self.test_dir, include_markdown=False)filename = self.test_file1.nameassert os.path.exists(filename), f"File {filename} does not exist"- file_manager = workspace.load(key=PathFileKey(filename))+ file_manager = workspace.load(key=filename)assert file_manager.filename == filenamedef test_directory_workspace_load_nested(self):workspace = DirectoryWorkspace(self.test_dir, include_markdown=False)nested_filename = self.nested_file.name- file_manager = workspace.load(key=PathFileKey(nested_filename))+ file_manager = workspace.load(key=nested_filename)assert file_manager.filename == self.nested_file.nameassert file_manager.filename is not Noneassert os.path.exists(file_manager.filename)@@ -215,7 +211,7 @@ class TestNotebookWorkspace(unittest.TestCase):MarimoPath(self.test_file1.name))with pytest.raises(HTTPException) as exc:- workspace.resolve(PathFileKey(self.test_file2.name))+ workspace.resolve(self.test_file2.name)assert exc.value.status_code == HTTPStatus.NOT_FOUNDdef test_single_file_blocks_path_traversal(self):@@ -228,7 +224,7 @@ class TestNotebookWorkspace(unittest.TestCase):self.nested_dir, "..", "..", "..", "etc", "passwd")with pytest.raises(HTTPException) as exc:- workspace.resolve(PathFileKey(traversal))+ workspace.resolve(traversal)assert exc.value.status_code == HTTPStatus.NOT_FOUNDdef test_single_file_accepts_dotdot_that_normalizes_to_allowed(self):@@ -240,7 +236,7 @@ class TestNotebookWorkspace(unittest.TestCase):equivalent = os.path.join(self.nested_dir, "..", os.path.basename(self.test_file1.name))- resolved = workspace.resolve(PathFileKey(equivalent))+ resolved = workspace.resolve(equivalent)assert resolved == self.test_file1.name# ----- security: FixedFilesWorkspace -----@@ -252,7 +248,7 @@ class TestNotebookWorkspace(unittest.TestCase):directory=self.test_dir,)with pytest.raises(HTTPException) as exc:- workspace.resolve(PathFileKey("../../../etc/passwd"))+ workspace.resolve("../../../etc/passwd")assert exc.value.status_code == HTTPStatus.NOT_FOUNDdef test_fixed_files_blocks_absolute_path_outside_allowlist(self):@@ -264,7 +260,7 @@ class TestNotebookWorkspace(unittest.TestCase):# test_file2 exists on disk inside the same directory but is not on the# allowlist — must still be denied.with pytest.raises(HTTPException) as exc:- workspace.resolve(PathFileKey(self.test_file2.name))+ workspace.resolve(self.test_file2.name)assert exc.value.status_code == HTTPStatus.NOT_FOUNDdef test_fixed_files_accepts_dotdot_that_normalizes_to_allowed(self):@@ -273,7 +269,7 @@ class TestNotebookWorkspace(unittest.TestCase):self.nested_dir, "..", os.path.basename(self.test_file1.name))workspace = FixedFilesWorkspace([_marimo_file(dotdot_path)])- resolved = workspace.resolve(PathFileKey(dotdot_path))+ resolved = workspace.resolve(dotdot_path)assert resolved is not Noneassert os.path.exists(resolved)@@ -281,34 +277,25 @@ class TestNotebookWorkspace(unittest.TestCase):"""`__new__` keys are not valid in run mode."""workspace = FixedFilesWorkspace([])with pytest.raises(HTTPException) as exc:- workspace.resolve(NewFileKey())+ workspace.resolve(NEW_FILE)assert exc.value.status_code == HTTPStatus.NOT_FOUND# ----- security: DirectoryWorkspace ------ def test_directory_workspace_new_file_key_returns_none(self):- """`NewFileKey` resolves to `None` (a blank notebook)."""- workspace = DirectoryWorkspace(self.test_dir, include_markdown=False)- assert workspace.resolve(NewFileKey()) is None-- def test_directory_workspace_only_exact_sentinel_is_new(self):- """Only the exact `__new__` sentinel resolves to the blank notebook.+ def test_directory_workspace_new_file_prefix_does_not_leak(self):+ """`__new__` prefix returns None — does not bypass containment.- After the FileKey ADT migration, anything other than the literal- `__new__` parses to a :class:`PathFileKey` and goes through normal- containment validation.+ `startswith(NEW_FILE)` could otherwise be coaxed into accepting+ crafted keys like `__new__../etc/passwd`; verify those still resolve+ to `None` (a blank notebook), never an arbitrary file."""workspace = DirectoryWorkspace(self.test_dir, include_markdown=False)- for raw in (- "__new__suffix.py",- "__new__/nested.py",+ for key in (+ NEW_FILE,+ f"{NEW_FILE}../etc/passwd",+ f"{NEW_FILE}/etc/passwd",):- with pytest.raises(HTTPException) as exc:- workspace.resolve(PathFileKey(raw))- assert exc.value.status_code in (- HTTPStatus.FORBIDDEN,- HTTPStatus.NOT_FOUND,- )+ assert workspace.resolve(key) is Nonedef test_directory_workspace_temp_dir_does_not_enable_traversal(self):"""A temp-dir bypass must not let attackers escape via `..`."""@@ -322,7 +309,7 @@ class TestNotebookWorkspace(unittest.TestCase):# Path that traverses through the temp dir to escape entirely.traversal = os.path.join(temp_dir, "..", "..", "etc", "passwd")with pytest.raises(HTTPException) as exc:- workspace.resolve(PathFileKey(traversal))+ workspace.resolve(traversal)# The path normalizes to /etc/passwd (or equivalent), neither in# the temp dir nor in the workspace directory — must be denied.assert exc.value.status_code in (@@ -335,14 +322,14 @@ class TestNotebookWorkspace(unittest.TestCase):def test_empty_workspace_load_with_new_file_key_returns_blank(self):"""Bare `__new__` key always yields an unbacked manager."""workspace = EmptyWorkspace()- manager = workspace.load(NewFileKey())+ manager = workspace.load(NEW_FILE)assert manager.filename is Nonedef test_empty_workspace_load_with_nonexistent_path_404s(self):"""Concrete keys that don't exist on disk must 404."""workspace = EmptyWorkspace()with pytest.raises(HTTPException) as exc:- workspace.load(PathFileKey("/this/path/does/not/exist.py"))+ workspace.load("/this/path/does/not/exist.py")assert exc.value.status_code == HTTPStatus.NOT_FOUNDdef test_empty_workspace_resolve_returns_absolute_normalized(self):@@ -355,7 +342,7 @@ class TestNotebookWorkspace(unittest.TestCase):os.chdir(self.test_dir)relative_key = os.path.basename(self.test_file1.name)workspace = EmptyWorkspace()- resolved = workspace.resolve(PathFileKey(relative_key))+ resolved = workspace.resolve(relative_key)assert resolved is not Noneassert os.path.isabs(resolved)assert os.path.samefile(resolved, self.test_file1.name)@@ -372,33 +359,10 @@ class TestNotebookWorkspace(unittest.TestCase):process owner."""workspace = EmptyWorkspace()- manager = workspace.load(PathFileKey(self.test_file1.name))+ manager = workspace.load(self.test_file1.name)assert manager.filename == self.test_file1.name-def test_file_key_roundtrip() -> None:- """parse(serialize(k)) == k for both variants."""- new_key = NewFileKey()- assert parse_file_key(serialize_file_key(new_key)) == new_key-- path_key = PathFileKey("/tmp/notebook.py")- assert parse_file_key(serialize_file_key(path_key)) == path_key---def test_file_key_wire_format() -> None:- """The serialized form is the wire string preserved across HTTP/WS."""- assert serialize_file_key(NewFileKey()) == NEW_FILE_WIRE- assert serialize_file_key(PathFileKey("/foo.py")) == "/foo.py"---def test_parse_file_key_only_exact_sentinel_is_new() -> None:- """Strings that look like `__new__` prefixes are paths, not new files."""- assert parse_file_key(NEW_FILE_WIRE) == NewFileKey()- assert parse_file_key("__new__suffix.py") == PathFileKey(- "__new__suffix.py"- )--def test_flatten_files() -> None:root = FileInfo(id="root",@@ -854,7 +818,7 @@ def test_lazy_router_allows_temp_dir_files(tmp_path: Path):# Without registering temp dir, accessing temp file should failwith pytest.raises(HTTPException) as exc_info:- router.load(PathFileKey(str(temp_file)))+ router.load(str(temp_file))assert exc_info.value.status_code == HTTPStatus.FORBIDDENassert "outside the allowed directory" in exc_info.value.detail@@ -862,7 +826,7 @@ def test_lazy_router_allows_temp_dir_files(tmp_path: Path):router.register_temp_dir(str(temp_dir))# Now accessing the temp file should succeed- manager = router.load(PathFileKey(str(temp_file)))+ manager = router.load(str(temp_file))assert manager is not Noneassert manager.path == str(temp_file)@@ -894,13 +858,13 @@ def test_lazy_router_temp_dir_doesnt_affect_normal_files(router.register_temp_dir(str(other_temp_dir))# Base file should still be accessible- manager = router.load(PathFileKey(str(base_file)))+ manager = router.load(str(base_file))assert manager is not Noneassert manager.path == str(base_file)# Outside file should still be blocked (not in registered temp dir)with pytest.raises(HTTPException) as exc_info:- router.load(PathFileKey(str(outside_file)))+ router.load(str(outside_file))assert exc_info.value.status_code == HTTPStatus.FORBIDDEN@@ -932,5 +896,5 @@ def test_lazy_router_symlink_directory_outside_allowed(tmp_path: Path):# Symlinks are preserved (not resolved), so the path# base_dir/shared/outside.py is inside base_dirrouter = DirectoryWorkspace(str(base_dir), include_markdown=False)- manager = router.load(PathFileKey(str(file_through_symlink)))+ manager = router.load(str(file_through_symlink))assert manager is not Nonediff --git a/tests/_session/test_resume_strategies.py b/tests/_session/test_resume_strategies.pyindex 5e2de2b134..9220259618 100644--- a/tests/_session/test_resume_strategies.py+++ b/tests/_session/test_resume_strategies.py@@ -13,7 +13,6 @@ from marimo._server.resume_strategies import (EditModeResumeStrategy,RunModeResumeStrategy,)-from marimo._server.workspace import PathFileKeyfrom marimo._session.model import ConnectionStatefrom marimo._session.session_repository import SessionRepositoryfrom marimo._types.ids import SessionId@@ -33,9 +32,7 @@ def test_edit_mode_resume_no_existing_sessions() -> None:repository = SessionRepository()strategy = EditModeResumeStrategy(repository)- result = strategy.try_resume(- SessionId("new-session"), PathFileKey("test.py")- )+ result = strategy.try_resume(SessionId("new-session"), "test.py")assert result is None@@ -51,7 +48,7 @@ def test_edit_mode_resume_orphaned_session() -> None:# Try to resumenew_session_id = SessionId("new-session")- result = strategy.try_resume(new_session_id, PathFileKey("test.py"))+ result = strategy.try_resume(new_session_id, "test.py")# Should return the orphaned sessionassert result is orphaned_session@@ -73,7 +70,7 @@ def test_edit_mode_resume_open_session_not_resumed() -> None:# Try to resumenew_session_id = SessionId("new-session")- result = strategy.try_resume(new_session_id, PathFileKey("test.py"))+ result = strategy.try_resume(new_session_id, "test.py")# Should return None because session is not orphanedassert result is None@@ -96,7 +93,7 @@ def test_edit_mode_resume_different_file() -> None:# Try to resume for different filenew_session_id = SessionId("new-session")- result = strategy.try_resume(new_session_id, PathFileKey("test.py"))+ result = strategy.try_resume(new_session_id, "test.py")# Should return None because file doesn't matchassert result is None@@ -118,7 +115,7 @@ def test_edit_mode_resume_multiple_sessions_raises_error() -> None:InvalidSessionException,match="Only one session should exist while editing",):- strategy.try_resume(SessionId("new-session"), PathFileKey("test.py"))+ strategy.try_resume(SessionId("new-session"), "test.py")def test_run_mode_resume_no_existing_session() -> None:@@ -126,9 +123,7 @@ def test_run_mode_resume_no_existing_session() -> None:repository = SessionRepository()strategy = RunModeResumeStrategy(repository)- result = strategy.try_resume(- SessionId("non-existent"), PathFileKey("test.py")- )+ result = strategy.try_resume(SessionId("non-existent"), "test.py")assert result is None@@ -143,7 +138,7 @@ def test_run_mode_resume_orphaned_session() -> None:repository.add_sync(session_id, orphaned_session)# Try to resume with same ID- result = strategy.try_resume(session_id, PathFileKey("test.py"))+ result = strategy.try_resume(session_id, "test.py")# Should return the orphaned sessionassert result is orphaned_session@@ -160,7 +155,7 @@ def test_run_mode_resume_open_session_not_resumed() -> None:repository.add_sync(session_id, open_session)# Try to resume- result = strategy.try_resume(session_id, PathFileKey("test.py"))+ result = strategy.try_resume(session_id, "test.py")# Should return None because session is not orphanedassert result is None@@ -180,8 +175,8 @@ def test_run_mode_allows_multiple_sessions_same_file() -> None:repository.add_sync(session2_id, session2)# Should be able to resume each by their ID- result1 = strategy.try_resume(session1_id, PathFileKey("test.py"))- result2 = strategy.try_resume(session2_id, PathFileKey("test.py"))+ result1 = strategy.try_resume(session1_id, "test.py")+ result2 = strategy.try_resume(session2_id, "test.py")assert result1 is session1assert result2 is session2