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
refactor: move session files (#7626)
Myles Scolnicka254045abb68
diff --git a/development_docs/adding_backend_and_mcp_tools.md b/development_docs/adding_backend_and_mcp_tools.mdindex 75d94835e0..0e02b76c1a 100644--- a/development_docs/adding_backend_and_mcp_tools.md+++ b/development_docs/adding_backend_and_mcp_tools.md@@ -76,7 +76,7 @@ from marimo._ai._tools.utils.exceptions import ToolExecutionErrorfrom marimo._types.ids import SessionIdif TYPE_CHECKING:- from marimo._server.sessions import Session+ from marimo._session import Session@dataclassdiff --git a/marimo/_ai/_tools/base.py b/marimo/_ai/_tools/base.pyindex ae4597a68b..7462d66484 100644--- a/marimo/_ai/_tools/base.py+++ b/marimo/_ai/_tools/base.py@@ -35,7 +35,7 @@ from marimo._server.ai.tools.types import (ValidationFunction,)from marimo._server.api.deps import AppStateBase-from marimo._server.model import ConnectionState+from marimo._session.model import ConnectionStatefrom marimo._types.ids import CellId_t, SessionIdfrom marimo._utils.case import to_snake_casefrom marimo._utils.dataclass_to_openapi import PythonTypeToOpenAPI@@ -54,7 +54,8 @@ if TYPE_CHECKING:from starlette.applications import Starlette- from marimo._server.sessions import Session, SessionManager+ from marimo._server.session_manager import SessionManager+ from marimo._session import Session@dataclassdiff --git a/marimo/_ai/_tools/tools/cells.py b/marimo/_ai/_tools/tools/cells.pyindex fbc6f32101..d765a583dd 100644--- a/marimo/_ai/_tools/tools/cells.py+++ b/marimo/_ai/_tools/tools/cells.py@@ -23,7 +23,7 @@ from marimo._types.ids import CellId_t, SessionIdif TYPE_CHECKING:from marimo._ast.models import CellData- from marimo._server.sessions import Session+ from marimo._session import Sessionclass SupportedCellType(str, Enum):diff --git a/marimo/_ai/_tools/tools/datasource.py b/marimo/_ai/_tools/tools/datasource.pyindex f3be0115ac..5e64f4ae3c 100644--- a/marimo/_ai/_tools/tools/datasource.py+++ b/marimo/_ai/_tools/tools/datasource.py@@ -17,7 +17,7 @@ from marimo._utils.fuzzy_match import compile_regex, is_fuzzy_matchLOGGER = _loggers.marimo_logger()if TYPE_CHECKING:- from marimo._server.sessions import Session+ from marimo._session import Session@dataclassdiff --git a/marimo/_ai/_tools/tools/tables_and_variables.py b/marimo/_ai/_tools/tools/tables_and_variables.pyindex 87a9593567..891156fc19 100644--- a/marimo/_ai/_tools/tools/tables_and_variables.py+++ b/marimo/_ai/_tools/tools/tables_and_variables.py@@ -8,7 +8,7 @@ from marimo._ai._tools.base import ToolBasefrom marimo._ai._tools.types import SuccessResult, ToolGuidelinesfrom marimo._data.models import DataTableColumnfrom marimo._messaging.notification import VariableValue-from marimo._server.sessions import Session+from marimo._session import Sessionfrom marimo._types.ids import SessionIddiff --git a/marimo/_ai/text_to_notebook.py b/marimo/_ai/text_to_notebook.pyindex d36f6d9bde..9d51f27a03 100644--- a/marimo/_ai/text_to_notebook.py+++ b/marimo/_ai/text_to_notebook.py@@ -11,7 +11,7 @@ from marimo._config.cli_state import (get_cli_state,write_cli_state,)-from marimo._server.utils import print_+from marimo._utils.print import print_TERMS = """Before using marimo's Text-To-Notebook AI feature, you should know:diff --git a/marimo/_cli/cli.py b/marimo/_cli/cli.pyindex 13854aa6fd..0eb8442fc2 100644--- a/marimo/_cli/cli.py+++ b/marimo/_cli/cli.py@@ -34,8 +34,8 @@ from marimo._cli.utils import (from marimo._config.settings import GLOBAL_SETTINGSfrom marimo._lint import run_checkfrom marimo._server.file_router import AppFileRouter-from marimo._server.model import SessionModefrom marimo._server.start import start+from marimo._session.model import SessionModefrom marimo._tutorials import (Tutorial,create_temp_tutorial_file,diff --git a/marimo/_cli/development/commands.py b/marimo/_cli/development/commands.pyindex 032cac055e..5c2b33c5b3 100644--- a/marimo/_cli/development/commands.py+++ b/marimo/_cli/development/commands.py@@ -17,7 +17,7 @@ from marimo._data.models import DataTypefrom marimo._messaging.errors import Error as MarimoErrorfrom marimo._messaging.notification import NotificationMessagefrom marimo._runtime.commands import CommandMessage-from marimo._server.session.serialize import (+from marimo._session.state.serialize import (serialize_notebook,serialize_session_view,)@@ -177,7 +177,6 @@ def _generate_server_api_schema() -> dict[str, Any]:packages.ListPackagesResponse,packages.PackageOperationResponse,packages.RemovePackageRequest,- packages.DependencyTreeNode,packages.DependencyTreeResponse,home.OpenTutorialRequest,home.RecentFilesResponse,diff --git a/marimo/_ipc/connection.py b/marimo/_ipc/connection.pyindex c201e0611f..b4073afb59 100644--- a/marimo/_ipc/connection.py+++ b/marimo/_ipc/connection.py@@ -13,7 +13,7 @@ import zmqfrom marimo import _loggersfrom marimo._ipc.queue_proxy import PushQueue, start_receiver_threadfrom marimo._ipc.types import ConnectionInfo-from marimo._server.types import QueueType+from marimo._session.queue import QueueTypeif typing.TYPE_CHECKING:from marimo._messaging.types import KernelMessagediff --git a/marimo/_ipc/queue_manager.py b/marimo/_ipc/queue_manager.pyindex 27fb9ef875..0f3b6feccf 100644--- a/marimo/_ipc/queue_manager.py+++ b/marimo/_ipc/queue_manager.py@@ -16,7 +16,7 @@ if typing.TYPE_CHECKING:CommandMessage,UpdateUIElementCommand,)- from marimo._server.types import QueueType+ from marimo._session.queue import QueueType@dataclasses.dataclassdiff --git a/marimo/_ipc/queue_proxy.py b/marimo/_ipc/queue_proxy.pyindex ffdf53d94d..62dac6d25d 100644--- a/marimo/_ipc/queue_proxy.py+++ b/marimo/_ipc/queue_proxy.py@@ -10,7 +10,7 @@ import typingimport zmqfrom marimo import _loggers-from marimo._server.types import QueueType+from marimo._session.queue import QueueTypeLOGGER = _loggers.marimo_logger()diff --git a/marimo/_islands/_island_generator.py b/marimo/_islands/_island_generator.pyindex 1ce6e98c95..8eb42cf2d6 100644--- a/marimo/_islands/_island_generator.py+++ b/marimo/_islands/_island_generator.py@@ -14,8 +14,7 @@ from marimo._ast.cell import Cell, CellConfigfrom marimo._ast.compiler import compile_cellfrom marimo._messaging.cell_output import CellOutputfrom marimo._output.utils import uri_encode_component-from marimo._server.file_router import AppFileRouter-from marimo._server.notebook import AppFileManager+from marimo._session.notebook import AppFileManagerfrom marimo._types.ids import CellId_tfrom marimo._utils.marimo_path import MarimoPathfrom marimo._version import __version__@@ -24,7 +23,7 @@ if sys.platform == "win32": # handling for windowsasyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())if TYPE_CHECKING:- from marimo._server.session.session_view import SessionView+ from marimo._session.state.session_view import SessionViewLOGGER = _loggers.marimo_logger()@@ -267,6 +266,8 @@ class MarimoIslandGenerator:- filename (str): Marimo .py filename to convert to reactive HTML.- display_code (bool): Whether to display the code in HTML snippets."""+ from marimo._server.file_router import AppFileRouter+path = MarimoPath(filename)file_router = AppFileRouter.from_filename(path)file_key = file_router.get_unique_file_key()diff --git a/marimo/_messaging/streams.py b/marimo/_messaging/streams.pyindex 9eb978a271..23c16b2c84 100644--- a/marimo/_messaging/streams.py+++ b/marimo/_messaging/streams.py@@ -24,7 +24,7 @@ from marimo._messaging.types import (Stdout,Stream,)-from marimo._server.types import QueueType+from marimo._session.queue import QueueTypefrom marimo._types.ids import CellId_tif TYPE_CHECKING:diff --git a/marimo/_plugins/stateless/mpl/_mpl.py b/marimo/_plugins/stateless/mpl/_mpl.pyindex aaa7ff0cbe..1d6974f571 100644--- a/marimo/_plugins/stateless/mpl/_mpl.py+++ b/marimo/_plugins/stateless/mpl/_mpl.py@@ -29,7 +29,6 @@ from marimo._runtime.context import ()from marimo._runtime.context.kernel_context import KernelRuntimeContextfrom marimo._runtime.runtime import app_meta-from marimo._server.utils import find_free_portfrom marimo._utils.platform import is_pyodideLOGGER = _loggers.marimo_logger()@@ -96,6 +95,8 @@ class MplServerManager:# Find a free port, with some randomization to avoid conflictsimport random+ from marimo._server.utils import find_free_port+base_port = 10_000 + random.randint(0, 1000) # Add some randomizationport = (free_port if free_port is not None else find_free_port(base_port)diff --git a/marimo/_pyodide/bootstrap.py b/marimo/_pyodide/bootstrap.pyindex 20e2bb5c9c..de91ad5e02 100644--- a/marimo/_pyodide/bootstrap.py+++ b/marimo/_pyodide/bootstrap.py@@ -20,9 +20,9 @@ from marimo._runtime.commands import (SerializedQueryParams,UpdateUIElementCommand,)-from marimo._server.model import SessionModefrom marimo._server.models.models import SaveNotebookRequest-from marimo._server.notebook import AppFileManager+from marimo._session.model import SessionMode+from marimo._session.notebook import AppFileManagerfrom marimo._utils.parse_dataclass import parse_rawif TYPE_CHECKING:diff --git a/marimo/_pyodide/pyodide_session.py b/marimo/_pyodide/pyodide_session.pyindex 690a6878b7..b4b5171b26 100644--- a/marimo/_pyodide/pyodide_session.py+++ b/marimo/_pyodide/pyodide_session.py@@ -44,7 +44,6 @@ from marimo._runtime.utils.set_ui_element_request_manager import ()from marimo._server.export.exporter import Exporterfrom marimo._server.files.os_file_system import OSFileSystem-from marimo._server.model import SessionModefrom marimo._server.models.export import ExportAsHTMLRequestfrom marimo._server.models.files import (FileCreateRequest,@@ -69,7 +68,8 @@ from marimo._server.models.models import (SaveNotebookRequest,SaveUserConfigurationRequest,)-from marimo._server.session.session_view import SessionView+from marimo._session.model import SessionMode+from marimo._session.state.session_view import SessionViewfrom marimo._snippets.snippets import read_snippetsfrom marimo._utils.formatter import DefaultFormatterfrom marimo._utils.inline_script_metadata import PyProjectReader@@ -78,7 +78,7 @@ from marimo._utils.parse_dataclass import parse_rawif TYPE_CHECKING:from marimo._ast.cell import CellConfigfrom marimo._messaging.types import KernelMessage- from marimo._server.notebook.file_manager import AppFileManager+ from marimo._session.notebook.file_manager import AppFileManagerfrom marimo._types.ids import CellId_tLOGGER = _loggers.marimo_logger()diff --git a/marimo/_runtime/app/kernel_runner.py b/marimo/_runtime/app/kernel_runner.pyindex 9316e664d9..b54d26e18e 100644--- a/marimo/_runtime/app/kernel_runner.py+++ b/marimo/_runtime/app/kernel_runner.py@@ -16,7 +16,7 @@ from marimo._runtime.commands import (from marimo._runtime.context.types import get_contextfrom marimo._runtime.patches import create_main_modulefrom marimo._runtime.runner import cell_runner-from marimo._server.model import SessionMode+from marimo._session.model import SessionModefrom marimo._types.ids import CellId_tif TYPE_CHECKING:diff --git a/marimo/_runtime/complete.py b/marimo/_runtime/complete.pyindex 9e263c195b..96e0dce2c8 100644--- a/marimo/_runtime/complete.py+++ b/marimo/_runtime/complete.py@@ -22,7 +22,7 @@ from marimo._messaging.types import Streamfrom marimo._output.md import _mdfrom marimo._runtime import dataflowfrom marimo._runtime.commands import CodeCompletionCommand-from marimo._server.types import QueueType+from marimo._session.queue import QueueTypefrom marimo._utils.docs import MarimoConverterfrom marimo._utils.format_signature import format_signaturefrom marimo._utils.rst_to_html import convert_rst_to_htmldiff --git a/marimo/_runtime/context/kernel_context.py b/marimo/_runtime/context/kernel_context.pyindex 6dc4f7039e..f1a6a59558 100644--- a/marimo/_runtime/context/kernel_context.py+++ b/marimo/_runtime/context/kernel_context.py@@ -18,7 +18,7 @@ from marimo._runtime.context.types import (from marimo._runtime.dataflow import DirectedGraphfrom marimo._runtime.functions import FunctionRegistryfrom marimo._runtime.params import CLIArgs, QueryParams-from marimo._server.model import SessionMode+from marimo._session.model import SessionModeif TYPE_CHECKING:from collections.abc import Iteratordiff --git a/marimo/_runtime/context/utils.py b/marimo/_runtime/context/utils.pyindex b877df31b9..90df5f1e8c 100644--- a/marimo/_runtime/context/utils.py+++ b/marimo/_runtime/context/utils.py@@ -6,7 +6,7 @@ from typing import Literal, Optionalfrom marimo._output.rich_help import mddocfrom marimo._runtime.context import ContextNotInitializedError, get_context-from marimo._server.model import SessionMode+from marimo._session.model import SessionModefrom marimo._utils.assert_never import assert_neverRunMode = Literal["run", "edit", "script", "test"]diff --git a/marimo/_runtime/packages/package_manager.py b/marimo/_runtime/packages/package_manager.pyindex 2c46ae68ee..5a075867be 100644--- a/marimo/_runtime/packages/package_manager.py+++ b/marimo/_runtime/packages/package_manager.py@@ -15,7 +15,7 @@ from marimo._messaging.notification_utils import broadcast_notificationfrom marimo._runtime.packages.utils import append_versionif TYPE_CHECKING:- from marimo._server.models.packages import DependencyTreeNode+ from marimo._utils.uv_tree import DependencyTreeNodeLOGGER = _loggers.marimo_logger()diff --git a/marimo/_runtime/packages/pypi_package_manager.py b/marimo/_runtime/packages/pypi_package_manager.pyindex 14645f47cf..0f015919bb 100644--- a/marimo/_runtime/packages/pypi_package_manager.py+++ b/marimo/_runtime/packages/pypi_package_manager.py@@ -20,10 +20,9 @@ from marimo._runtime.packages.package_manager import (PackageDescription,)from marimo._runtime.packages.utils import split_packages-from marimo._server.models.packages import DependencyTreeNodefrom marimo._utils.platform import is_pyodidefrom marimo._utils.uv import find_uv_bin-from marimo._utils.uv_tree import parse_uv_tree+from marimo._utils.uv_tree import DependencyTreeNode, parse_uv_treePY_EXE = sys.executablediff --git a/marimo/_runtime/runner/hooks_post_execution.py b/marimo/_runtime/runner/hooks_post_execution.pyindex 8b8a12491d..bb52d8620f 100644--- a/marimo/_runtime/runner/hooks_post_execution.py+++ b/marimo/_runtime/runner/hooks_post_execution.py@@ -37,7 +37,7 @@ from marimo._runtime.context.types import get_context, get_global_contextfrom marimo._runtime.control_flow import MarimoInterrupt, MarimoStopErrorfrom marimo._runtime.runner import cell_runnerfrom marimo._runtime.side_effect import SideEffect-from marimo._server.model import SessionMode+from marimo._session.model import SessionModefrom marimo._sql.engines.duckdb import (INTERNAL_DUCKDB_ENGINE,DuckDBEngine,diff --git a/marimo/_runtime/runtime.py b/marimo/_runtime/runtime.pyindex acef1e75de..8151b8b9ba 100644--- a/marimo/_runtime/runtime.py+++ b/marimo/_runtime/runtime.py@@ -186,8 +186,8 @@ from marimo._secrets.load_dotenv import (load_dotenv_with_fallback,)from marimo._secrets.secrets import get_secret_keys-from marimo._server.model import SessionMode-from marimo._server.types import QueueType+from marimo._session.model import SessionMode+from marimo._session.queue import QueueTypefrom marimo._sql.engines.duckdb import INTERNAL_DUCKDB_ENGINE, DuckDBEnginefrom marimo._sql.engines.types import (EngineCatalog,diff --git a/marimo/_runtime/utils/set_ui_element_request_manager.py b/marimo/_runtime/utils/set_ui_element_request_manager.pyindex d60c8b1083..974ff70894 100644--- a/marimo/_runtime/utils/set_ui_element_request_manager.py+++ b/marimo/_runtime/utils/set_ui_element_request_manager.py@@ -4,7 +4,7 @@ from __future__ import annotationsfrom typing import TYPE_CHECKING, Anyfrom marimo._runtime.commands import UpdateUIElementCommand-from marimo._server.types import QueueType+from marimo._session.queue import QueueTypefrom marimo._types.ids import UIElementIdif TYPE_CHECKING:diff --git a/marimo/_runtime/virtual_file.py b/marimo/_runtime/virtual_file.pyindex 0a03dbc53c..26ae0f15f3 100644--- a/marimo/_runtime/virtual_file.py+++ b/marimo/_runtime/virtual_file.py@@ -14,8 +14,8 @@ from marimo import _loggersfrom marimo._messaging.mimetypes import KnownMimeTypefrom marimo._runtime.cell_lifecycle_item import CellLifecycleItemfrom marimo._runtime.context import ContextNotInitializedError-from marimo._server.api.status import HTTPException, HTTPStatusfrom marimo._utils.data_uri import build_data_url+from marimo._utils.http import HTTPException, HTTPStatusfrom marimo._utils.platform import is_pyodideif TYPE_CHECKING:diff --git a/marimo/_runtime/win32_interrupt_handler.py b/marimo/_runtime/win32_interrupt_handler.pyindex 45cb9d47f9..af12dc0ffe 100644--- a/marimo/_runtime/win32_interrupt_handler.py+++ b/marimo/_runtime/win32_interrupt_handler.py@@ -8,7 +8,7 @@ from _thread import interrupt_mainfrom typing import TYPE_CHECKINGif TYPE_CHECKING:- from marimo._server.types import QueueType+ from marimo._session.queue import QueueTypeclass Win32InterruptHandler(threading.Thread):diff --git a/marimo/_secrets/secrets.py b/marimo/_secrets/secrets.pyindex aea2dda5e9..baaaadeb88 100644--- a/marimo/_secrets/secrets.py+++ b/marimo/_secrets/secrets.py@@ -1,6 +1,8 @@# Copyright 2026 Marimo. All rights reserved.from __future__ import annotations+from typing import TYPE_CHECKING+from marimo import _loggersfrom marimo._config.config import MarimoConfigfrom marimo._secrets.env_provider import (@@ -8,10 +10,12 @@ from marimo._secrets.env_provider import (EnvSecretsProvider,)from marimo._secrets.models import SecretKeysWithProvider, SecretProvider-from marimo._server.models.secrets import CreateSecretRequestLOGGER = _loggers.marimo_logger()+if TYPE_CHECKING:+ from marimo._server.models.secrets import CreateSecretRequest+def _get_providers(config: MarimoConfig, original_environ: dict[str, str]diff --git a/marimo/_server/ai/config.py b/marimo/_server/ai/config.pyindex 5297992739..72e2497f32 100644--- a/marimo/_server/ai/config.py+++ b/marimo/_server/ai/config.py@@ -21,7 +21,7 @@ from marimo._server.ai.constants import DEFAULT_MAX_TOKENS, DEFAULT_MODELfrom marimo._server.ai.ids import AiModelIdfrom marimo._server.ai.tools.tool_manager import get_tool_managerfrom marimo._server.ai.tools.types import ToolDefinition-from marimo._server.api.status import HTTPStatus+from marimo._utils.http import HTTPStatus@dataclassdiff --git a/marimo/_server/ai/providers.py b/marimo/_server/ai/providers.pyindex c9a3b003e3..5ebe027256 100644--- a/marimo/_server/ai/providers.py+++ b/marimo/_server/ai/providers.py@@ -39,8 +39,8 @@ from marimo._server.ai.config import AnyProviderConfigfrom marimo._server.ai.ids import AiModelIdfrom marimo._server.ai.tools.tool_manager import get_tool_managerfrom marimo._server.ai.tools.types import ToolDefinition-from marimo._server.api.status import HTTPStatusfrom marimo._server.models.completion import UIMessage as ServerUIMessage+from marimo._utils.http import HTTPStatusTIMEOUT = 30# Long-thinking models can take a long time to complete, so we set a longer timeoutdiff --git a/marimo/_server/api/dependency_tree.py b/marimo/_server/api/dependency_tree.pyindex 1dab2252e0..b0c2e2d641 100644--- a/marimo/_server/api/dependency_tree.py+++ b/marimo/_server/api/dependency_tree.py@@ -1,7 +1,7 @@# Copyright 2026 Marimo. All rights reserved.from __future__ import annotations-from marimo._server.models.packages import DependencyTreeNode+from marimo._utils.uv_tree import DependencyTreeNodedef parse_name_version(content: str) -> tuple[str, str | None]:diff --git a/marimo/_server/api/deps.py b/marimo/_server/api/deps.pyindex 307e7921e4..af66c3cba2 100644--- a/marimo/_server/api/deps.py+++ b/marimo/_server/api/deps.py@@ -5,9 +5,9 @@ from typing import TYPE_CHECKING, Any, Optional, Union, castfrom marimo import _loggers as loggersfrom marimo._config.manager import MarimoConfigManager, ScriptConfigManager-from marimo._server.model import SessionMode-from marimo._server.sessions import SessionManager+from marimo._server.session_manager import SessionManagerfrom marimo._server.tokens import SkewProtectionToken+from marimo._session.model import SessionModefrom marimo._types.ids import SessionIdif TYPE_CHECKING:@@ -18,7 +18,7 @@ if TYPE_CHECKING:from starlette.websockets import WebSocketfrom uvicorn import Server- from marimo._server.sessions import Session+ from marimo._session import SessionLOGGER = loggers.marimo_logger()diff --git a/marimo/_server/api/endpoints/ai.py b/marimo/_server/api/endpoints/ai.pyindex 0bd0db57ff..9d4409fbca 100644--- a/marimo/_server/api/endpoints/ai.py+++ b/marimo/_server/api/endpoints/ai.py@@ -40,7 +40,6 @@ from marimo._server.ai.providers import ()from marimo._server.ai.tools.tool_manager import get_tool_managerfrom marimo._server.api.deps import AppState-from marimo._server.api.status import HTTPStatusfrom marimo._server.api.utils import parse_requestfrom marimo._server.models.completion import (AiCompletionRequest,@@ -55,6 +54,7 @@ from marimo._server.models.models import ()from marimo._server.responses import StructResponsefrom marimo._server.router import APIRouter+from marimo._utils.http import HTTPStatusif TYPE_CHECKING:from collections.abc import AsyncGeneratordiff --git a/marimo/_server/api/endpoints/config.py b/marimo/_server/api/endpoints/config.pyindex 715acacf40..17eebcf35d 100644--- a/marimo/_server/api/endpoints/config.py+++ b/marimo/_server/api/endpoints/config.py@@ -22,7 +22,7 @@ from marimo._server.models.models import (UpdateUserConfigRequest,)from marimo._server.router import APIRouter-from marimo._server.sessions import send_message_to_consumer+from marimo._session import send_message_to_consumerfrom marimo._types.ids import ConsumerIdif TYPE_CHECKING:diff --git a/marimo/_server/api/endpoints/export.py b/marimo/_server/api/endpoints/export.pyindex a2dea62029..faede0e381 100644--- a/marimo/_server/api/endpoints/export.py+++ b/marimo/_server/api/endpoints/export.py@@ -14,11 +14,9 @@ from marimo._convert.script import convert_from_ir_to_scriptfrom marimo._dependencies.dependencies import DependencyManagerfrom marimo._messaging.msgspec_encoder import asdictfrom marimo._server.api.deps import AppState-from marimo._server.api.status import HTTPStatusfrom marimo._server.api.utils import parse_requestfrom marimo._server.export.exporter import AutoExporter, Exporterfrom marimo._server.export.utils import get_download_filename-from marimo._server.model import SessionModefrom marimo._server.models.export import (ExportAsHTMLRequest,ExportAsMarkdownRequest,@@ -26,6 +24,8 @@ from marimo._server.models.export import ()from marimo._server.models.models import SuccessResponsefrom marimo._server.router import APIRouter+from marimo._session.model import SessionMode+from marimo._utils.http import HTTPStatusif TYPE_CHECKING:from starlette.requests import Requestdiff --git a/marimo/_server/api/endpoints/files.py b/marimo/_server/api/endpoints/files.pyindex 17bdc6b98d..87bf371a4e 100644--- a/marimo/_server/api/endpoints/files.py+++ b/marimo/_server/api/endpoints/files.py@@ -10,7 +10,6 @@ from starlette.responses import PlainTextResponsefrom marimo import _loggersfrom marimo._runtime.commands import RenameNotebookCommandfrom marimo._server.api.deps import AppState-from marimo._server.api.status import HTTPStatusfrom marimo._server.api.utils import parse_requestfrom marimo._server.models.models import (BaseResponse,@@ -24,6 +23,7 @@ from marimo._server.models.models import (from marimo._server.router import APIRouterfrom marimo._types.ids import ConsumerIdfrom marimo._utils.async_path import abspath+from marimo._utils.http import HTTPStatusif TYPE_CHECKING:from starlette.requests import Requestdiff --git a/marimo/_server/api/endpoints/home.py b/marimo/_server/api/endpoints/home.pyindex 8dd04e08d0..72c95f839e 100644--- a/marimo/_server/api/endpoints/home.py+++ b/marimo/_server/api/endpoints/home.py@@ -17,7 +17,6 @@ from marimo._server.file_router import (LazyListOfFilesAppFileRouter,count_files,)-from marimo._server.model import ConnectionStatefrom marimo._server.models.home import (MarimoFile,OpenTutorialRequest,@@ -28,6 +27,7 @@ from marimo._server.models.home import (WorkspaceFilesResponse,)from marimo._server.router import APIRouter+from marimo._session.model import ConnectionStatefrom marimo._tutorials import create_temp_tutorial_file # type: ignorefrom marimo._utils.paths import pretty_pathdiff --git a/marimo/_server/api/endpoints/terminal.py b/marimo/_server/api/endpoints/terminal.pyindex 7575fd2739..23a7569eaf 100644--- a/marimo/_server/api/endpoints/terminal.py+++ b/marimo/_server/api/endpoints/terminal.py@@ -15,8 +15,8 @@ from starlette.websockets import WebSocket, WebSocketDisconnect, WebSocketStatefrom marimo import _loggersfrom marimo._server.api.deps import AppState-from marimo._server.model import SessionModefrom marimo._server.router import APIRouter+from marimo._session.model import SessionModeif TYPE_CHECKING:from collections.abc import Iterablediff --git a/marimo/_server/api/endpoints/ws/ws_kernel_ready.py b/marimo/_server/api/endpoints/ws/ws_kernel_ready.pyindex fc4c216612..d0ea967650 100644--- a/marimo/_server/api/endpoints/ws/ws_kernel_ready.py+++ b/marimo/_server/api/endpoints/ws/ws_kernel_ready.py@@ -13,13 +13,14 @@ from marimo._messaging.notification import (KernelReadyNotification,)from marimo._plugins.core.web_component import JSONType-from marimo._server.model import SessionMode+from marimo._session.model import SessionModefrom marimo._types.ids import CellId_tif TYPE_CHECKING:from marimo._server.file_router import MarimoFileKeyfrom marimo._server.rtc.doc import LoroDocManager- from marimo._server.sessions import Session, SessionManager+ from marimo._server.session_manager import SessionManager+ from marimo._session import SessionLOGGER = _loggers.marimo_logger()diff --git a/marimo/_server/api/endpoints/ws/ws_session_connector.py b/marimo/_server/api/endpoints/ws/ws_session_connector.pyindex 1de5ad2b80..e74f1dc7da 100644--- a/marimo/_server/api/endpoints/ws/ws_session_connector.py+++ b/marimo/_server/api/endpoints/ws/ws_session_connector.py@@ -11,7 +11,8 @@ if TYPE_CHECKING:ConnectionParams,)from marimo._server.api.endpoints.ws_endpoint import WebSocketHandler- from marimo._server.sessions import Session, SessionManager+ from marimo._server.session_manager import SessionManager+ from marimo._session import Sessionfrom starlette.websockets import WebSocketDisconnect@@ -19,8 +20,8 @@ from marimo import _loggersfrom marimo._messaging.types import NoopStreamfrom marimo._runtime.params import QueryParamsfrom marimo._server.codes import WebSocketCodes-from marimo._server.model import ConnectionState, SessionModefrom marimo._server.models.models import InstantiateNotebookRequest+from marimo._session.model import ConnectionState, SessionModeLOGGER = _loggers.marimo_logger()diff --git a/marimo/_server/api/endpoints/ws_endpoint.py b/marimo/_server/api/endpoints/ws_endpoint.pyindex 8e311569fe..8540e9ac9d 100644--- a/marimo/_server/api/endpoints/ws_endpoint.py+++ b/marimo/_server/api/endpoints/ws_endpoint.py@@ -38,15 +38,16 @@ from marimo._server.api.endpoints.ws.ws_session_connector import (SessionConnector,)from marimo._server.codes import WebSocketCodes-from marimo._server.consumer import SessionConsumer-from marimo._server.model import (+from marimo._server.router import APIRouter+from marimo._server.rtc.doc import LoroDocManager+from marimo._server.session_manager import SessionManager+from marimo._session import Session+from marimo._session.consumer import SessionConsumer+from marimo._session.events import SessionEventBus+from marimo._session.model import (ConnectionState,SessionMode,)-from marimo._server.router import APIRouter-from marimo._server.rtc.doc import LoroDocManager-from marimo._server.sessions import Session, SessionManager-from marimo._server.sessions.events import SessionEventBusfrom marimo._types.ids import CellId_t, ConsumerIdLOGGER = _loggers.marimo_logger()diff --git a/marimo/_server/api/interrupt.py b/marimo/_server/api/interrupt.pyindex 4d3ab5c9fc..3e7070d1df 100644--- a/marimo/_server/api/interrupt.py+++ b/marimo/_server/api/interrupt.py@@ -8,7 +8,7 @@ import timefrom typing import Callablefrom marimo._config.settings import GLOBAL_SETTINGS-from marimo._server.utils import (+from marimo._utils.print import (TAB,print_,)diff --git a/marimo/_server/api/lifespans.py b/marimo/_server/api/lifespans.pyindex cc48bcb307..711e50fdc0 100644--- a/marimo/_server/api/lifespans.py+++ b/marimo/_server/api/lifespans.py@@ -14,7 +14,6 @@ from marimo._server.api.interrupt import InterruptHandlerfrom marimo._server.api.utils import open_url_in_browserfrom marimo._server.file_router import AppFileRouterfrom marimo._server.lsp import any_lsp_server_running-from marimo._server.model import SessionModefrom marimo._server.print import (print_experimental_features,print_mcp_client,@@ -22,10 +21,11 @@ from marimo._server.print import (print_shutdown,print_startup,)-from marimo._server.sessions import SessionManager+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._session.model import SessionModeif TYPE_CHECKING:from collections.abc import AsyncIteratordiff --git a/marimo/_server/api/middleware.py b/marimo/_server/api/middleware.pyindex 79f585437b..a5c5e9f9b8 100644--- a/marimo/_server/api/middleware.py+++ b/marimo/_server/api/middleware.py@@ -40,10 +40,10 @@ from marimo._dependencies.dependencies import DependencyManagerfrom marimo._server.api.auth import validate_authfrom marimo._server.api.deps import AppState, AppStateBasefrom marimo._server.codes import WebSocketCodes-from marimo._server.model import SessionMode-from marimo._server.utils import print_tabbedfrom marimo._server.uvicorn_utils import close_uvicorn+from marimo._session.model import SessionModefrom marimo._tracer import server_tracer+from marimo._utils.print import print_tabbedif TYPE_CHECKING:from starlette.datastructures import Statediff --git a/marimo/_server/asgi.py b/marimo/_server/asgi.pyindex edd59fa524..5271536d36 100644--- a/marimo/_server/asgi.py+++ b/marimo/_server/asgi.py@@ -391,11 +391,11 @@ def create_asgi_app(from marimo._server.file_router import AppFileRouterfrom marimo._server.lsp import NoopLspServerfrom marimo._server.main import create_starlette_app- from marimo._server.model import SessionModefrom marimo._server.registry import LIFESPAN_REGISTRY- from marimo._server.sessions import SessionManager+ from marimo._server.session_manager import SessionManagerfrom marimo._server.tokens import AuthTokenfrom marimo._server.utils import initialize_asyncio+ from marimo._session.model import SessionModefrom marimo._utils.lifespans import Lifespansfrom marimo._utils.marimo_path import MarimoPathdiff --git a/marimo/_server/errors.py b/marimo/_server/errors.pyindex 98476ff666..9d8e31cc70 100644--- a/marimo/_server/errors.py+++ b/marimo/_server/errors.py@@ -11,13 +11,13 @@ from marimo import _loggersfrom marimo._messaging.notification import MissingPackageAlertNotificationfrom marimo._runtime.packages.utils import is_python_isolatedfrom marimo._server.api.deps import AppState-from marimo._server.api.status import (+from marimo._session import send_message_to_consumer+from marimo._session.model import SessionMode+from marimo._types.ids import ConsumerId+from marimo._utils.http import (HTTPException as MarimoHTTPException,is_client_error,)-from marimo._server.model import SessionMode-from marimo._server.sessions import send_message_to_consumer-from marimo._types.ids import ConsumerIdif TYPE_CHECKING:from starlette.requests import Requestdiff --git a/marimo/_server/export/__init__.py b/marimo/_server/export/__init__.pyindex b40f73f57b..79ecc4f8a8 100644--- a/marimo/_server/export/__init__.py+++ b/marimo/_server/export/__init__.py@@ -30,18 +30,18 @@ from marimo._schemas.serialization import NotebookSerializationfrom marimo._server.export.exporter import Exporterfrom marimo._server.export.utils import get_download_filenamefrom marimo._server.file_router import AppFileRouter-from marimo._server.model import ConnectionState, SessionModefrom marimo._server.models.export import ExportAsHTMLRequestfrom marimo._server.models.models import InstantiateNotebookRequest-from marimo._server.notebook import AppFileManager+from marimo._session.model import ConnectionState, SessionMode+from marimo._session.notebook import AppFileManagerfrom marimo._types.ids import ConsumerIdfrom marimo._utils.marimo_path import MarimoPathLOGGER = _loggers.marimo_logger()if TYPE_CHECKING:- from marimo._server.session.session_view import SessionView- from marimo._server.sessions.types import Session+ from marimo._session.state.session_view import SessionView+ from marimo._session.types import Session@dataclass@@ -236,9 +236,9 @@ async def run_app_until_completion(cli_args: SerializedCLIArgs,argv: list[str] | None,) -> tuple[SessionView, bool]:- from marimo._server.consumer import SessionConsumer- from marimo._server.sessions.events import SessionEventBus- from marimo._server.sessions.session import SessionImpl+ from marimo._session.consumer import SessionConsumer+ from marimo._session.events import SessionEventBus+ from marimo._session.session import SessionImplinstantiated_event = asyncio.Event()diff --git a/marimo/_server/export/exporter.py b/marimo/_server/export/exporter.pyindex 875e733c92..3fbcd422ef 100644--- a/marimo/_server/export/exporter.py+++ b/marimo/_server/export/exporter.py@@ -42,16 +42,16 @@ from marimo._server.export.utils import (get_filename,)from marimo._server.models.export import ExportAsHTMLRequest-from marimo._server.session.serialize import (- serialize_notebook,- serialize_session_view,-)-from marimo._server.session.session_view import SessionViewfrom marimo._server.templates.templates import (static_notebook_template,wasm_notebook_template,)from marimo._server.tokens import SkewProtectionToken+from marimo._session.state.serialize import (+ serialize_notebook,+ serialize_session_view,+)+from marimo._session.state.session_view import SessionViewfrom marimo._utils import async_pathfrom marimo._utils.code import hash_codefrom marimo._utils.data_uri import build_data_urldiff --git a/marimo/_server/file_router.py b/marimo/_server/file_router.pyindex fd5c312ef7..e743db1658 100644--- a/marimo/_server/file_router.py+++ b/marimo/_server/file_router.py@@ -10,11 +10,11 @@ from typing import TYPE_CHECKING, Optionalfrom marimo import _loggersfrom marimo._config.config import ExportType, SqlOutputType, WidthType-from marimo._server.api.status import HTTPException, HTTPStatusfrom marimo._server.files.os_file_system import natural_sort_filefrom marimo._server.models.files import FileInfofrom marimo._server.models.home import MarimoFile-from marimo._server.notebook import AppFileManager+from marimo._session.notebook import AppFileManager+from marimo._utils.http import HTTPException, HTTPStatusfrom marimo._utils.marimo_path import MarimoPathif TYPE_CHECKING:diff --git a/marimo/_server/main.py b/marimo/_server/main.pyindex 5ff9adbe36..82d6613d11 100644--- a/marimo/_server/main.py+++ b/marimo/_server/main.py@@ -24,12 +24,12 @@ from marimo._server.api.middleware import (TimeoutMiddleware,)from marimo._server.api.router import build_routes-from marimo._server.api.status import (- HTTPException as MarimoHTTPException,-)from marimo._server.errors import handle_errorfrom marimo._server.lsp import LspServerfrom marimo._server.registry import MIDDLEWARE_REGISTRY+from marimo._utils.http import (+ HTTPException as MarimoHTTPException,+)if TYPE_CHECKING:from collections.abc import Iteratordiff --git a/marimo/_server/models/packages.py b/marimo/_server/models/packages.pyindex 6f5ad2de07..8e783db7e1 100644--- a/marimo/_server/models/packages.py+++ b/marimo/_server/models/packages.py@@ -6,6 +6,7 @@ from typing import Optionalimport msgspecfrom marimo._runtime.packages.package_manager import PackageDescription+from marimo._utils.uv_tree import DependencyTreeNodeclass AddPackageRequest(msgspec.Struct, rename="camel"):@@ -36,14 +37,6 @@ class ListPackagesResponse(msgspec.Struct, rename="camel"):packages: list[PackageDescription]-class DependencyTreeNode(msgspec.Struct, rename="camel"):- name: str- version: Optional[str]- # List of {"kind": "extra"|"group", "value": str}- tags: list[dict[str, str]]- dependencies: list[DependencyTreeNode]--class DependencyTreeResponse(msgspec.Struct, rename="camel"):tree: Optional[DependencyTreeNode]diff --git a/marimo/_server/print.py b/marimo/_server/print.pyindex f0888517a8..1f5ef6da7d 100644--- a/marimo/_server/print.py+++ b/marimo/_server/print.py@@ -7,7 +7,7 @@ from typing import Optionalfrom marimo._cli.print import bold, green, mutedfrom marimo._config.config import MarimoConfig, MCPConfig-from marimo._server.utils import print_, print_tabbed+from marimo._utils.print import print_, print_tabbedUTF8_SUPPORTED = Falsediff --git a/marimo/_server/sessions/listeners.py b/marimo/_server/session/listeners.pysimilarity index 93%rename from marimo/_server/sessions/listeners.pyrename to marimo/_server/session/listeners.pyindex 187537e048..5239cffad2 100644--- a/marimo/_server/sessions/listeners.py+++ b/marimo/_server/session/listeners.py@@ -8,12 +8,12 @@ tracking recent files, managing caches, etc.from __future__ import annotationsfrom marimo._server.recents import RecentFilesManager-from marimo._server.sessions.events import (+from marimo._session.events import (SessionEventBus,SessionEventListener,)-from marimo._server.sessions.extensions.types import SessionExtension-from marimo._server.sessions.session import Session+from marimo._session.extensions.types import SessionExtension+from marimo._session.session import Sessionfrom marimo._types.ids import SessionIddiff --git a/marimo/_server/sessions/session_manager.py b/marimo/_server/session_manager.pysimilarity index 93%rename from marimo/_server/sessions/session_manager.pyrename to marimo/_server/session_manager.pyindex 1454f59a6c..6f378e6395 100644--- a/marimo/_server/sessions/session_manager.py+++ b/marimo/_server/session_manager.py@@ -18,34 +18,34 @@ from marimo._runtime.commands import (SerializedCLIArgs,SerializedQueryParams,)-from marimo._server.consumer import SessionConsumerfrom marimo._server.file_router import AppFileRouter, MarimoFileKeyfrom marimo._server.lsp import LspServer-from marimo._server.model import ConnectionState, SessionModefrom marimo._server.recents import RecentFilesManager-from marimo._server.sessions.events import SessionEventBus-from marimo._server.sessions.extensions.types import SessionExtension-from marimo._server.sessions.file_change_handler import (+from marimo._server.session.listeners import RecentsTrackerListener+from marimo._server.token_manager import TokenManager+from marimo._server.tokens import AuthToken, SkewProtectionToken+from marimo._session.consumer import SessionConsumer+from marimo._session.events import SessionEventBus+from marimo._session.extensions.types import SessionExtension+from marimo._session.file_change_handler import (FileChangeCoordinator,create_reload_strategy,)-from marimo._server.sessions.file_watcher_integration import (+from marimo._session.file_watcher_integration import (SessionFileWatcherExtension,)-from marimo._server.sessions.listeners import RecentsTrackerListener-from marimo._server.sessions.resume_strategies import create_resume_strategy-from marimo._server.sessions.session import Session, SessionImpl-from marimo._server.sessions.session_repository import SessionRepository-from marimo._server.sessions.token_manager import TokenManager-from marimo._server.sessions.types import KernelState-from marimo._server.tokens import AuthToken, SkewProtectionToken+from marimo._session.model import ConnectionState, SessionMode+from marimo._session.resume_strategies import create_resume_strategy+from marimo._session.session import Session, SessionImpl+from marimo._session.session_repository import SessionRepository+from marimo._session.types import KernelStatefrom marimo._types.ids import ConsumerId, SessionIdfrom marimo._utils.file_watcher import FileWatcherManagerif TYPE_CHECKING:from collections.abc import Awaitable, Coroutine, Mapping- from marimo._server.notebook import AppFileManager+ from marimo._session.notebook import AppFileManagerLOGGER = _loggers.marimo_logger()@@ -227,7 +227,7 @@ class SessionManager:Returns:tuple[bool, Optional[str]]: (success, error_message)"""- from marimo._server.api.status import HTTPException+ from marimo._utils.http import HTTPExceptionsession = self.get_session(session_id)if not session:diff --git a/marimo/_server/start.py b/marimo/_server/start.pyindex 6c406247e3..ee6b68d699 100644--- a/marimo/_server/start.py+++ b/marimo/_server/start.py@@ -19,9 +19,8 @@ from marimo._runtime.commands import SerializedCLIArgsfrom marimo._server.file_router import AppFileRouterfrom marimo._server.lsp import CompositeLspServer, NoopLspServerfrom marimo._server.main import create_starlette_app-from marimo._server.model import SessionModefrom marimo._server.registry import LIFESPAN_REGISTRY-from marimo._server.sessions import SessionManager+from marimo._server.session_manager import SessionManagerfrom marimo._server.tokens import AuthTokenfrom marimo._server.utils import (find_free_port,@@ -29,6 +28,7 @@ from marimo._server.utils import (initialize_fd_limit,)from marimo._server.uvicorn_utils import initialize_signals+from marimo._session.model import SessionModefrom marimo._tracer import LOGGERfrom marimo._utils.lifespans import Lifespansfrom marimo._utils.paths import marimo_package_pathdiff --git a/marimo/_server/templates/api.py b/marimo/_server/templates/api.pyindex e5e510470a..893568b370 100644--- a/marimo/_server/templates/api.py+++ b/marimo/_server/templates/api.py@@ -15,13 +15,13 @@ from marimo._config.config import MarimoConfig, PartialMarimoConfigfrom marimo._convert.converters import MarimoConvertfrom marimo._schemas.notebook import NotebookV1from marimo._schemas.session import NotebookSessionV1-from marimo._server.model import SessionModefrom marimo._server.templates.templates import (_custom_css_block,notebook_page_template,static_notebook_template,)from marimo._server.tokens import SkewProtectionToken+from marimo._session.model import SessionModefrom marimo._utils.code import hash_codediff --git a/marimo/_server/templates/templates.py b/marimo/_server/templates/templates.pyindex 4388024885..dec4a4cd6f 100644--- a/marimo/_server/templates/templates.py+++ b/marimo/_server/templates/templates.py@@ -15,9 +15,9 @@ from marimo._output.utils import uri_encode_componentfrom marimo._schemas.notebook import NotebookV1from marimo._schemas.session import NotebookSessionV1from marimo._server.api.utils import parse_title-from marimo._server.model import SessionMode-from marimo._server.notebook import read_css_file, read_html_head_filefrom marimo._server.tokens import SkewProtectionToken+from marimo._session.model import SessionMode+from marimo._session.notebook import read_css_file, read_html_head_filefrom marimo._utils.versions import is_editablefrom marimo._version import __version__diff --git a/marimo/_server/sessions/token_manager.py b/marimo/_server/token_manager.pysimilarity index 97%rename from marimo/_server/sessions/token_manager.pyrename to marimo/_server/token_manager.pyindex 1ee9001d01..5c148849ef 100644--- a/marimo/_server/sessions/token_manager.py+++ b/marimo/_server/token_manager.py@@ -9,8 +9,8 @@ from __future__ import annotationsfrom typing import Optional-from marimo._server.model import SessionModefrom marimo._server.tokens import AuthToken, SkewProtectionToken+from marimo._session.model import SessionModeclass TokenManager:diff --git a/marimo/_server/utils.py b/marimo/_server/utils.pyindex 939c8158f7..e58f060e82 100644--- a/marimo/_server/utils.py+++ b/marimo/_server/utils.py@@ -9,31 +9,15 @@ import sysfrom typing import TYPE_CHECKING, Any, TypeVarfrom marimo import _loggers-from marimo._utils.marimo_path import MarimoPathif TYPE_CHECKING:from collections.abc import Coroutinefrom typing import Optional-# use spaces instead of a tab to play well with carriage returns;-# \r\t doesn't appear to overwrite characters at the start of a line,-# but \r{TAB} does ...-TAB = " "LOGGER = _loggers.marimo_logger()-def print_tabbed(string: str, n_tabs: int = 1) -> None:- print_(f"{TAB * n_tabs}{string}")---def canonicalize_filename(filename: str) -> str:- # If its not a valid Python or Markdown file, then add .py- if not MarimoPath.is_valid_path(filename):- filename += ".py"- return os.path.expanduser(filename)--_DEFAULT_BACKLOG = 128@@ -279,12 +263,3 @@ def asyncio_run(coro: Coroutine[Any, Any, T], **kwargs: dict[Any, Any]) -> T:"""initialize_asyncio()return asyncio.run(coro, **kwargs) # type: ignore[arg-type]---def print_(*args: Any, **kwargs: Any) -> None:- try:- import click-- click.echo(*args, **kwargs)- except ImportError:- print(*args, **kwargs) # noqa: T201diff --git a/marimo/_server/sessions/__init__.py b/marimo/_session/__init__.pysimilarity index 77%rename from marimo/_server/sessions/__init__.pyrename to marimo/_session/__init__.pyindex 5662a9ec2d..f09ade2372 100644--- a/marimo/_server/sessions/__init__.py+++ b/marimo/_session/__init__.py@@ -13,17 +13,15 @@ All public APIs are re-exported from this module for backward compatibility.from __future__ import annotations-from marimo._server.sessions.session_manager import SessionManager-from marimo._server.sessions.types import (+from marimo._session.types import (KernelManager,QueueManager,Session,)-from marimo._server.sessions.utils import send_message_to_consumer+from marimo._session.utils import send_message_to_consumer__all__ = ["Session",- "SessionManager","KernelManager","QueueManager","send_message_to_consumer",diff --git a/marimo/_server/consumer.py b/marimo/_session/consumer.pysimilarity index 85%rename from marimo/_server/consumer.pyrename to marimo/_session/consumer.pyindex c3834acde2..02d103059a 100644--- a/marimo/_server/consumer.py+++ b/marimo/_session/consumer.py@@ -4,12 +4,12 @@ from __future__ import annotationsfrom abc import ABC, abstractmethodfrom typing import TYPE_CHECKING-from marimo._server.sessions.extensions.types import SessionExtension+from marimo._session.extensions.types import SessionExtensionfrom marimo._types.ids import ConsumerIdif TYPE_CHECKING:from marimo._messaging.types import KernelMessage- from marimo._server.model import ConnectionState+ from marimo._session.model import ConnectionStateclass SessionConsumer(ABC, SessionExtension):diff --git a/marimo/_server/sessions/events.py b/marimo/_session/events.pysimilarity index 99%rename from marimo/_server/sessions/events.pyrename to marimo/_session/events.pyindex b65a3e697c..51f10961ba 100644--- a/marimo/_server/sessions/events.py+++ b/marimo/_session/events.py@@ -14,7 +14,7 @@ from marimo._types.ids import ConsumerId, SessionIdif TYPE_CHECKING:from marimo._runtime import commands- from marimo._server.sessions.session import Session+ from marimo._session.session import SessionLOGGER = _loggers.marimo_logger()diff --git a/marimo/_server/sessions/extensions/__init__.py b/marimo/_session/extensions/__init__.pysimilarity index 100%rename from marimo/_server/sessions/extensions/__init__.pyrename to marimo/_session/extensions/__init__.pydiff --git a/marimo/_server/sessions/extensions/extensions.py b/marimo/_session/extensions/extensions.pysimilarity index 96%rename from marimo/_server/sessions/extensions/extensions.pyrename to marimo/_session/extensions/extensions.pyindex 8a59de8b09..d3d6da8a42 100644--- a/marimo/_server/sessions/extensions/extensions.py+++ b/marimo/_session/extensions/extensions.py@@ -14,31 +14,31 @@ from marimo import _loggersfrom marimo._cli.print import redfrom marimo._messaging.types import KernelMessagefrom marimo._runtime import commands-from marimo._server.session.serialize import (+from marimo._session.events import SessionEventListener+from marimo._session.extensions.types import SessionExtension+from marimo._session.state.serialize import (SessionCacheKey,SessionCacheManager,)-from marimo._server.sessions.events import SessionEventListener-from marimo._server.sessions.extensions.types import SessionExtension-from marimo._server.sessions.types import (+from marimo._session.types import (KernelManager,KernelState,QueueManager,)-from marimo._server.utils import print_, print_tabbedfrom marimo._utils.distributor import (ConnectionDistributor,Distributor,QueueDistributor,)+from marimo._utils.print import print_, print_tabbedif TYPE_CHECKING:from logging import Logger- from marimo._server.sessions.events import (+ from marimo._session.events import (SessionEventBus,)- from marimo._server.sessions.types import Session+ from marimo._session.types import Sessionfrom marimo._types.ids import ConsumerId, SessionIdLOGGER = _loggers.marimo_logger()@@ -196,7 +196,7 @@ class NotificationListenerExtension(SessionExtension):kernel_manager: KernelManager,queue_manager: QueueManager,) -> Distributor[KernelMessage]:- from marimo._server.model import SessionMode+ from marimo._session.model import SessionModeif kernel_manager.mode == SessionMode.EDIT:return ConnectionDistributor(kernel_manager.kernel_connection)diff --git a/marimo/_server/sessions/extensions/types.py b/marimo/_session/extensions/types.pysimilarity index 86%rename from marimo/_server/sessions/extensions/types.pyrename to marimo/_session/extensions/types.pyindex fc76165c92..e5834528da 100644--- a/marimo/_server/sessions/extensions/types.py+++ b/marimo/_session/extensions/types.py@@ -4,8 +4,8 @@ from __future__ import annotationsfrom typing import TYPE_CHECKING, Protocolif TYPE_CHECKING:- from marimo._server.sessions.events import SessionEventBus- from marimo._server.sessions.session import Session+ from marimo._session.events import SessionEventBus+ from marimo._session.session import Sessionclass SessionExtension(Protocol):diff --git a/marimo/_server/sessions/file_change_handler.py b/marimo/_session/file_change_handler.pysimilarity index 98%rename from marimo/_server/sessions/file_change_handler.pyrename to marimo/_session/file_change_handler.pyindex d3f4d3e204..7ad1254c8c 100644--- a/marimo/_server/sessions/file_change_handler.py+++ b/marimo/_session/file_change_handler.py@@ -18,7 +18,7 @@ from marimo._messaging.notification import (UpdateCellIdsNotification,)from marimo._runtime.commands import DeleteCellCommand, SyncGraphCommand-from marimo._server.model import SessionMode+from marimo._session.model import SessionModefrom marimo._types.ids import CellId_tfrom marimo._utils import async_path@@ -27,7 +27,7 @@ LOGGER = _loggers.marimo_logger()if TYPE_CHECKING:from pathlib import Path- from marimo._server.sessions.types import Session+ from marimo._session.types import Session@dataclassdiff --git a/marimo/_server/sessions/file_watcher_integration.py b/marimo/_session/file_watcher_integration.pysimilarity index 95%rename from marimo/_server/sessions/file_watcher_integration.pyrename to marimo/_session/file_watcher_integration.pyindex c4ec527b2d..9bf10e7abe 100644--- a/marimo/_server/sessions/file_watcher_integration.py+++ b/marimo/_session/file_watcher_integration.py@@ -11,12 +11,12 @@ from pathlib import Pathfrom typing import TYPE_CHECKING, Callablefrom marimo import _loggers-from marimo._server.sessions.events import (+from marimo._session.events import (SessionEventBus,SessionEventListener,)-from marimo._server.sessions.extensions.types import SessionExtension-from marimo._server.sessions.session import Session+from marimo._session.extensions.types import SessionExtension+from marimo._session.session import Sessionfrom marimo._utils.file_watcher import FileWatcherManagerLOGGER = _loggers.marimo_logger()diff --git a/marimo/_server/sessions/managers.py b/marimo/_session/managers.pysimilarity index 98%rename from marimo/_server/sessions/managers.pyrename to marimo/_session/managers.pyindex df10528e0e..775fae7ed7 100644--- a/marimo/_server/sessions/managers.py+++ b/marimo/_session/managers.py@@ -26,11 +26,11 @@ from marimo._messaging.types import KernelMessagefrom marimo._output.formatters.formatters import register_formattersfrom marimo._runtime import commands, runtimefrom marimo._runtime.commands import AppMetadata-from marimo._server.model import SessionMode-from marimo._server.sessions.types import KernelManager, QueueManager-from marimo._server.types import ProcessLike-from marimo._server.utils import print_+from marimo._session.model import SessionMode+from marimo._session.queue import ProcessLike+from marimo._session.types import KernelManager, QueueManagerfrom marimo._types.ids import CellId_t+from marimo._utils.print import print_from marimo._utils.typed_connection import TypedConnectionLOGGER = _loggers.marimo_logger()diff --git a/marimo/_server/model.py b/marimo/_session/model.pysimilarity index 100%rename from marimo/_server/model.pyrename to marimo/_session/model.pydiff --git a/marimo/_server/notebook/__init__.py b/marimo/_session/notebook/__init__.pysimilarity index 67%rename from marimo/_server/notebook/__init__.pyrename to marimo/_session/notebook/__init__.pyindex 39c47c2919..dee33b79c7 100644--- a/marimo/_server/notebook/__init__.py+++ b/marimo/_session/notebook/__init__.py@@ -1,17 +1,22 @@# Copyright 2026 Marimo. All rights reserved."""Notebook file management and storage abstractions."""-from marimo._server.notebook.file_manager import (+from __future__ import annotations++from marimo._session.notebook.file_manager import (AppFileManager,read_css_file,read_html_head_file,)-from marimo._server.notebook.serializer import (+from marimo._session.notebook.serializer import (MarkdownNotebookSerializer,NotebookSerializer,PythonNotebookSerializer,)-from marimo._server.notebook.storage import FilesystemStorage, StorageInterface+from marimo._session.notebook.storage import (+ FilesystemStorage,+ StorageInterface,+)__all__ = ["AppFileManager",diff --git a/marimo/_server/notebook/file_manager.py b/marimo/_session/notebook/file_manager.pysimilarity index 96%rename from marimo/_server/notebook/file_manager.pyrename to marimo/_session/notebook/file_manager.pyindex 53874cf0ca..0014c3615f 100644--- a/marimo/_server/notebook/file_manager.py+++ b/marimo/_session/notebook/file_manager.py@@ -3,7 +3,7 @@ from __future__ import annotationsimport osfrom pathlib import Path-from typing import Any, Optional+from typing import TYPE_CHECKING, Any, Optionalfrom marimo import _loggersfrom marimo._ast import load@@ -17,18 +17,30 @@ from marimo._runtime.layout.layout import (save_layout_config,)from marimo._schemas.serialization import Header, NotebookSerializationV1-from marimo._server.api.status import HTTPException, HTTPStatus-from marimo._server.models.models import (- CopyNotebookRequest,- SaveNotebookRequest,+from marimo._session.notebook.serializer import get_format_handler+from marimo._session.notebook.storage import (+ FilesystemStorage,+ StorageInterface,)-from marimo._server.notebook.serializer import get_format_handler-from marimo._server.notebook.storage import FilesystemStorage, StorageInterface-from marimo._server.utils import canonicalize_filenamefrom marimo._types.ids import CellId_t+from marimo._utils.http import HTTPException, HTTPStatus+from marimo._utils.marimo_path import MarimoPathLOGGER = _loggers.marimo_logger()+if TYPE_CHECKING:+ from marimo._server.models.models import (+ CopyNotebookRequest,+ SaveNotebookRequest,+ )+++def canonicalize_filename(filename: str) -> str:+ # If its not a valid Python or Markdown file, then add .py+ if not MarimoPath.is_valid_path(filename):+ filename += ".py"+ return os.path.expanduser(filename)+class AppFileManager:"""Manages notebook file operations.diff --git a/marimo/_server/notebook/serializer.py b/marimo/_session/notebook/serializer.pysimilarity index 100%rename from marimo/_server/notebook/serializer.pyrename to marimo/_session/notebook/serializer.pydiff --git a/marimo/_server/notebook/storage.py b/marimo/_session/notebook/storage.pysimilarity index 99%rename from marimo/_server/notebook/storage.pyrename to marimo/_session/notebook/storage.pyindex 87e21e07fc..e4b163bf59 100644--- a/marimo/_server/notebook/storage.py+++ b/marimo/_session/notebook/storage.py@@ -7,7 +7,7 @@ from pathlib import Pathfrom typing import Optional, Protocolfrom marimo import _loggers-from marimo._server.api.status import HTTPException, HTTPStatus+from marimo._utils.http import HTTPException, HTTPStatusLOGGER = _loggers.marimo_logger()diff --git a/marimo/_server/types.py b/marimo/_session/queue.pysimilarity index 100%rename from marimo/_server/types.pyrename to marimo/_session/queue.pydiff --git a/marimo/_server/sessions/resume_strategies.py b/marimo/_session/resume_strategies.pysimilarity index 92%rename from marimo/_server/sessions/resume_strategies.pyrename to marimo/_session/resume_strategies.pyindex afe1b80020..8ce152b9ae 100644--- a/marimo/_server/sessions/resume_strategies.py+++ b/marimo/_session/resume_strategies.py@@ -6,17 +6,19 @@ Provides mode-specific logic for determining whether and how to resume sessions.from __future__ import annotations-from typing import Optional, Protocol+from typing import TYPE_CHECKING, Optional, Protocolfrom marimo import _loggers-from marimo._server.file_router import MarimoFileKey-from marimo._server.model import ConnectionState, SessionMode-from marimo._server.sessions.session import Session-from marimo._server.sessions.session_repository import SessionRepository+from marimo._session.model import ConnectionState, SessionMode+from marimo._session.session import Session+from marimo._session.session_repository import SessionRepositoryfrom marimo._types.ids import SessionIdLOGGER = _loggers.marimo_logger()+if TYPE_CHECKING:+ from marimo._server.file_router import MarimoFileKey+class SessionResumeStrategy(Protocol):"""Protocol for session resume strategies."""diff --git a/marimo/_server/sessions/room.py b/marimo/_session/room.pysimilarity index 95%rename from marimo/_server/sessions/room.pyrename to marimo/_session/room.pyindex fd2b18a2ca..26dfff288a 100644--- a/marimo/_server/sessions/room.py+++ b/marimo/_session/room.py@@ -12,13 +12,13 @@ from typing import TYPE_CHECKING, Optionalfrom marimo import _loggersfrom marimo._messaging.types import KernelMessage-from marimo._server.model import ConnectionState+from marimo._session.model import ConnectionStatefrom marimo._types.ids import ConsumerIdLOGGER = _loggers.marimo_logger()if TYPE_CHECKING:- from marimo._server.consumer import SessionConsumer+ from marimo._session.consumer import SessionConsumerclass Room:diff --git a/marimo/_server/sessions/session.py b/marimo/_session/session.pysimilarity index 95%rename from marimo/_server/sessions/session.pyrename to marimo/_session/session.pyindex 6e2d163268..de94994b6d 100644--- a/marimo/_server/sessions/session.py+++ b/marimo/_session/session.py@@ -25,13 +25,9 @@ from marimo._runtime.commands import (HTTPRequest,UpdateUIElementCommand,)-from marimo._server.consumer import SessionConsumer-from marimo._server.model import ConnectionState, SessionMode-from marimo._server.models.models import InstantiateNotebookRequest-from marimo._server.notebook import AppFileManager-from marimo._server.session.session_view import SessionView-from marimo._server.sessions.events import SessionEventBus-from marimo._server.sessions.extensions.extensions import (+from marimo._session.consumer import SessionConsumer+from marimo._session.events import SessionEventBus+from marimo._session.extensions.extensions import (CachingExtension,HeartbeatExtension,LoggingExtension,@@ -40,13 +36,16 @@ from marimo._server.sessions.extensions.extensions import (ReplayExtension,SessionViewExtension,)-from marimo._server.sessions.extensions.types import SessionExtension-from marimo._server.sessions.managers import (+from marimo._session.extensions.types import SessionExtension+from marimo._session.managers import (KernelManagerImpl,QueueManagerImpl,)-from marimo._server.sessions.room import Room-from marimo._server.sessions.types import (+from marimo._session.model import ConnectionState, SessionMode+from marimo._session.notebook import AppFileManager+from marimo._session.room import Room+from marimo._session.state.session_view import SessionView+from marimo._session.types import (KernelManager,KernelState,Session,@@ -57,6 +56,8 @@ from marimo._utils.repr import format_reprif TYPE_CHECKING:from collections.abc import Mapping+ from marimo._server.models.models import InstantiateNotebookRequest+LOGGER = _loggers.marimo_logger()_DEFAULT_TTL_SECONDS = 120diff --git a/marimo/_server/sessions/session_repository.py b/marimo/_session/session_repository.pysimilarity index 97%rename from marimo/_server/sessions/session_repository.pyrename to marimo/_session/session_repository.pyindex 5e90dbde35..84660073be 100644--- a/marimo/_server/sessions/session_repository.py+++ b/marimo/_session/session_repository.py@@ -6,14 +6,15 @@ from __future__ import annotationsimport asynciofrom typing import TYPE_CHECKING, Optional-from marimo._server.file_router import MarimoFileKey-from marimo._server.model import ConnectionState-from marimo._server.sessions.session import Session+from marimo._session.model import ConnectionState+from marimo._session.session import Sessionfrom marimo._types.ids import ConsumerId, SessionIdif TYPE_CHECKING:from collections.abc import Mapping+ from marimo._server.file_router import MarimoFileKey+class SessionRepository:"""In-memory storage for sessions with thread-safe operations."""diff --git a/marimo/_server/session/__init__.py b/marimo/_session/state/__init__.pysimilarity index 100%rename from marimo/_server/session/__init__.pyrename to marimo/_session/state/__init__.pydiff --git a/marimo/_server/session/serialize.py b/marimo/_session/state/serialize.pysimilarity index 99%rename from marimo/_server/session/serialize.pyrename to marimo/_session/state/serialize.pyindex 269f4a78fe..eed0278168 100644--- a/marimo/_server/session/serialize.py+++ b/marimo/_session/state/serialize.py@@ -37,7 +37,7 @@ from marimo._schemas.session import (StreamMediaOutput,StreamOutput,)-from marimo._server.session.session_view import SessionView+from marimo._session.state.session_view import SessionViewfrom marimo._types.ids import CellId_tfrom marimo._utils.async_path import AsyncPathfrom marimo._utils.background_task import AsyncBackgroundTaskdiff --git a/marimo/_server/session/session_view.py b/marimo/_session/state/session_view.pysimilarity index 100%rename from marimo/_server/session/session_view.pyrename to marimo/_session/state/session_view.pydiff --git a/marimo/_server/sessions/types.py b/marimo/_session/types.pysimilarity index 94%rename from marimo/_server/sessions/types.pyrename to marimo/_session/types.pyindex 50843e3b41..6278654317 100644--- a/marimo/_server/sessions/types.py+++ b/marimo/_session/types.py@@ -19,14 +19,14 @@ if TYPE_CHECKING:from marimo._messaging.notification import NotificationMessagefrom marimo._messaging.types import KernelMessagefrom marimo._runtime import commands- from marimo._server.consumer import SessionConsumer- from marimo._server.model import (+ from marimo._session.consumer import SessionConsumer+ from marimo._session.model import (ConnectionState,SessionMode,)- from marimo._server.notebook.file_manager import AppFileManager- from marimo._server.session.session_view import SessionView- from marimo._server.types import ProcessLike, QueueType+ from marimo._session.notebook.file_manager import AppFileManager+ from marimo._session.queue import ProcessLike, QueueType+ from marimo._session.state.session_view import SessionViewfrom marimo._types.ids import ConsumerIdfrom marimo._utils.typed_connection import TypedConnectiondiff --git a/marimo/_server/sessions/utils.py b/marimo/_session/utils.pysimilarity index 88%rename from marimo/_server/sessions/utils.pyrename to marimo/_session/utils.pyindex ef36fd4307..7467b732eb 100644--- a/marimo/_server/sessions/utils.py+++ b/marimo/_session/utils.py@@ -6,12 +6,12 @@ from __future__ import annotationsfrom typing import TYPE_CHECKING, Optionalfrom marimo._messaging.serde import serialize_kernel_message-from marimo._server.model import ConnectionState+from marimo._session.model import ConnectionStatefrom marimo._types.ids import ConsumerIdif TYPE_CHECKING:from marimo._messaging.notification import NotificationMessage- from marimo._server.sessions.session import Session+ from marimo._session.session import Sessiondef send_message_to_consumer(diff --git a/marimo/_utils/distributor.py b/marimo/_utils/distributor.pyindex a02aa2479d..dd8a745fd5 100644--- a/marimo/_utils/distributor.py+++ b/marimo/_utils/distributor.py@@ -7,7 +7,7 @@ import timefrom typing import Any, Callable, Generic, Protocol, TypeVar, Unionfrom marimo import _loggers-from marimo._server.types import QueueType+from marimo._session.queue import QueueTypefrom marimo._utils.disposable import Disposablefrom marimo._utils.typed_connection import TypedConnectiondiff --git a/marimo/_server/api/status.py b/marimo/_utils/http.pysimilarity index 100%rename from marimo/_server/api/status.pyrename to marimo/_utils/http.pydiff --git a/marimo/_utils/print.py b/marimo/_utils/print.pynew file mode 100644index 0000000000..e7499944cd--- /dev/null+++ b/marimo/_utils/print.py@@ -0,0 +1,21 @@+from __future__ import annotations++from typing import Any++# use spaces instead of a tab to play well with carriage returns;+# \r\t doesn't appear to overwrite characters at the start of a line,+# but \r{TAB} does ...+TAB = " "+++def print_tabbed(string: str, n_tabs: int = 1) -> None:+ print_(f"{TAB * n_tabs}{string}")+++def print_(*args: Any, **kwargs: Any) -> None:+ try:+ import click++ click.echo(*args, **kwargs)+ except ImportError:+ print(*args, **kwargs) # noqa: T201diff --git a/marimo/_utils/uv_tree.py b/marimo/_utils/uv_tree.pyindex dcd608e45f..5d75ac0978 100644--- a/marimo/_utils/uv_tree.py+++ b/marimo/_utils/uv_tree.py@@ -1,7 +1,17 @@# Copyright 2026 Marimo. All rights reserved.from __future__ import annotations-from marimo._server.models.packages import DependencyTreeNode+from typing import Optional++import msgspec+++class DependencyTreeNode(msgspec.Struct, rename="camel"):+ name: str+ version: Optional[str]+ # List of {"kind": "extra"|"group", "value": str}+ tags: list[dict[str, str]]+ dependencies: list[DependencyTreeNode]def parse_name_version(content: str) -> tuple[str, str | None]:diff --git a/tests/_ai/tools/tools/test_notebooks.py b/tests/_ai/tools/tools/test_notebooks.pyindex a364fd4285..3f3d51167b 100644--- a/tests/_ai/tools/tools/test_notebooks.py+++ b/tests/_ai/tools/tools/test_notebooks.py@@ -9,7 +9,7 @@ import pytestfrom marimo._ai._tools.base import ToolContextfrom marimo._ai._tools.tools.notebooks import GetActiveNotebooksfrom marimo._ai._tools.types import EmptyArgs, MarimoNotebookInfo-from marimo._server.model import ConnectionState+from marimo._session.model import ConnectionStatefrom marimo._types.ids import SessionIddiff --git a/tests/_ai/tools/tools/test_tables_variables.py b/tests/_ai/tools/tools/test_tables_variables.pyindex 5d8505144e..177307bd2e 100644--- a/tests/_ai/tools/tools/test_tables_variables.py+++ b/tests/_ai/tools/tools/test_tables_variables.py@@ -12,7 +12,7 @@ from marimo._ai._tools.tools.tables_and_variables import ()from marimo._data.models import DataTableColumnfrom marimo._messaging.notification import VariableValue-from marimo._server.sessions import Session+from marimo._session import Session@dataclassdiff --git a/tests/_pyodide/test_bootstrap.py b/tests/_pyodide/test_bootstrap.pyindex d2abfbb444..9d77069845 100644--- a/tests/_pyodide/test_bootstrap.py+++ b/tests/_pyodide/test_bootstrap.py@@ -10,8 +10,8 @@ from marimo._config.config import DEFAULT_CONFIGfrom marimo._messaging.msgspec_encoder import encode_json_strfrom marimo._pyodide.bootstrap import create_session, save_filefrom marimo._pyodide.pyodide_session import PyodideSession-from marimo._server.model import SessionModefrom marimo._server.models.models import SaveNotebookRequest+from marimo._session.model import SessionModefrom marimo._types.ids import CellId_tif TYPE_CHECKING:diff --git a/tests/_pyodide/test_pyodide_session.py b/tests/_pyodide/test_pyodide_session.pyindex e6232991db..d280738625 100644--- a/tests/_pyodide/test_pyodide_session.py+++ b/tests/_pyodide/test_pyodide_session.py@@ -46,8 +46,8 @@ from marimo._runtime.commands import (ValidateSQLCommand,)from marimo._runtime.context.types import teardown_context-from marimo._server.model import SessionMode-from marimo._server.notebook import AppFileManager+from marimo._session.model import SessionMode+from marimo._session.notebook import AppFileManagerfrom marimo._types.ids import CellId_t, UIElementIdif TYPE_CHECKING:diff --git a/tests/_runtime/test_app_mode.py b/tests/_runtime/test_app_mode.pyindex 3a6f5c57b9..7e996f70ec 100644--- a/tests/_runtime/test_app_mode.py+++ b/tests/_runtime/test_app_mode.py@@ -9,7 +9,7 @@ from marimo._runtime.context import (from marimo._runtime.context.kernel_context import KernelRuntimeContextfrom marimo._runtime.context.script_context import ScriptRuntimeContextfrom marimo._runtime.context.utils import get_mode-from marimo._server.model import SessionMode+from marimo._session.model import SessionModedef test_get_mode_kernel_run():diff --git a/tests/_runtime/test_runtime.py b/tests/_runtime/test_runtime.pyindex 9389dbb8c4..7de42d438b 100644--- a/tests/_runtime/test_runtime.py+++ b/tests/_runtime/test_runtime.py@@ -45,7 +45,7 @@ from marimo._runtime.dataflow import EdgeWithVarfrom marimo._runtime.patches import create_main_modulefrom marimo._runtime.runtime import Kernel, notebook_dir, notebook_locationfrom marimo._runtime.scratch import SCRATCH_CELL_ID-from marimo._server.model import SessionMode+from marimo._session.model import SessionModefrom marimo._utils.parse_dataclass import parse_rawfrom tests._messaging.mocks import MockStderr, MockStreamfrom tests.conftest import ExecReqProvider, MockedKerneldiff --git a/tests/_server/ai/test_ai_config.py b/tests/_server/ai/test_ai_config.pyindex 0f9bb7e750..255814c21c 100644--- a/tests/_server/ai/test_ai_config.py+++ b/tests/_server/ai/test_ai_config.py@@ -24,7 +24,7 @@ from marimo._server.ai.config import ()from marimo._server.ai.constants import DEFAULT_MAX_TOKENS, DEFAULT_MODELfrom marimo._server.ai.tools.types import ToolDefinition-from marimo._server.api.status import HTTPStatus+from marimo._utils.http import HTTPStatusclass TestAnyProviderConfig:diff --git a/tests/_server/api/endpoints/test_auto_instantiate.py b/tests/_server/api/endpoints/test_auto_instantiate.pyindex f03aab2d87..470664b5a2 100644--- a/tests/_server/api/endpoints/test_auto_instantiate.py+++ b/tests/_server/api/endpoints/test_auto_instantiate.py@@ -6,7 +6,7 @@ from __future__ import annotationsfrom typing import TYPE_CHECKINGfrom marimo._messaging.notification import KernelReadyNotification-from marimo._server.model import SessionMode+from marimo._session.model import SessionModefrom marimo._utils.parse_dataclass import parse_rawfrom tests._server.mocks import token_headerdiff --git a/tests/_server/api/endpoints/test_files.py b/tests/_server/api/endpoints/test_files.pyindex 5048bba65e..56d3499918 100644--- a/tests/_server/api/endpoints/test_files.py+++ b/tests/_server/api/endpoints/test_files.py@@ -380,7 +380,7 @@ def test_rename_propagates(@with_session(SESSION_ID)def test_read_code_without_saved_file(client: TestClient) -> None:"""Test read_code when file hasn't been saved yet."""- from marimo._server.api.status import HTTPStatus+ from marimo._utils.http import HTTPStatus# Mock the session to have no file pathwith patch("marimo._server.api.endpoints.files.AppState") as mock_state:diff --git a/tests/_server/api/endpoints/test_resume_session.py b/tests/_server/api/endpoints/test_resume_session.pyindex 3ee506ce59..f2618835af 100644--- a/tests/_server/api/endpoints/test_resume_session.py+++ b/tests/_server/api/endpoints/test_resume_session.py@@ -14,7 +14,7 @@ from marimo._messaging.notification import (KernelCapabilitiesNotification,KernelReadyNotification,)-from marimo._server.sessions import Session+from marimo._session import Sessionfrom marimo._types.ids import SessionIdfrom marimo._utils.parse_dataclass import parse_rawfrom tests._server.conftest import get_session_managerdiff --git a/tests/_server/api/endpoints/test_terminal.py b/tests/_server/api/endpoints/test_terminal.pyindex 9d5f368125..a44100c041 100644--- a/tests/_server/api/endpoints/test_terminal.py+++ b/tests/_server/api/endpoints/test_terminal.py@@ -20,8 +20,8 @@ from marimo._server.api.endpoints.terminal import (_setup_child_process,_should_close_on_command,)-from marimo._server.model import SessionMode-from marimo._server.sessions import SessionManager+from marimo._server.session_manager import SessionManager+from marimo._session.model import SessionModefrom tests._server.conftest import get_session_managerif TYPE_CHECKING:diff --git a/tests/_server/api/endpoints/test_ws.py b/tests/_server/api/endpoints/test_ws.pyindex 78ae3922f7..b9dbe338f6 100644--- a/tests/_server/api/endpoints/test_ws.py+++ b/tests/_server/api/endpoints/test_ws.py@@ -17,8 +17,8 @@ from marimo._messaging.notification import (KernelReadyNotification,)from marimo._server.codes import WebSocketCodes-from marimo._server.model import SessionMode-from marimo._server.sessions import SessionManager+from marimo._server.session_manager import SessionManager+from marimo._session.model import SessionModefrom marimo._utils.parse_dataclass import parse_rawfrom tests._server.conftest import get_session_manager, get_user_config_managerfrom tests._server.mocks import token_header@@ -212,7 +212,6 @@ def test_fails_on_multiple_connections_with_same_file(client.post("/api/kernel/shutdown", headers=HEADERS)[email protected](reruns=3)async def test_file_watcher_calls_reload(client: TestClient) -> None:session_manager: SessionManager = get_session_manager(client)session_manager.mode = SessionMode.RUN@@ -232,8 +231,15 @@ async def test_file_watcher_calls_reload(client: TestClient) -> None:assert session_manager._watcher_manager._watcherswatcher = list(session_manager._watcher_manager._watchers.values())[0]await watcher.callback(Path(filename))- data = websocket.receive_json()- assert data == {"op": "reload", "data": {"op": "reload"}}+ # Drain messages until we get the reload message+ # (other messages like 'variables' may arrive first)+ expected = {"op": "reload", "data": {"op": "reload"}}+ for _ in range(10):+ data = websocket.receive_json()+ if data == expected:+ break+ else:+ raise AssertionError(f"Expected {expected}, but never received it")session_manager.mode = SessionMode.EDITsession_manager.watch = Falseclient.post("/api/kernel/shutdown", headers=HEADERS)diff --git a/tests/_server/api/test_middleware.py b/tests/_server/api/test_middleware.pyindex 91fc6ba263..2e316abfbd 100644--- a/tests/_server/api/test_middleware.py+++ b/tests/_server/api/test_middleware.py@@ -26,9 +26,9 @@ from marimo._server.api.middleware import (from marimo._server.main import (create_starlette_app,)-from marimo._server.model import SessionModefrom marimo._server.tokens import AuthTokenfrom marimo._server.utils import find_free_port+from marimo._session.model import SessionModefrom tests._server.mocks import get_mock_session_manager, token_headerif TYPE_CHECKING:diff --git a/tests/_server/conftest.py b/tests/_server/conftest.pyindex 089dd30e29..7187697b90 100644--- a/tests/_server/conftest.py+++ b/tests/_server/conftest.py@@ -14,9 +14,9 @@ from marimo._config.manager import MarimoConfigManager, UserConfigManagerfrom marimo._config.utils import CONFIG_FILENAMEfrom marimo._server.api.deps import AppStatefrom marimo._server.main import create_starlette_app-from marimo._server.session.session_view import SessionView-from marimo._server.sessions import SessionManager+from marimo._server.session_manager import SessionManagerfrom marimo._server.utils import initialize_asyncio+from marimo._session.state.session_view import SessionViewfrom tests._server.mocks import get_mock_session_managerfrom tests.utils import assert_serialize_roundtripdiff --git a/tests/_server/export/test_exporter.py b/tests/_server/export/test_exporter.pyindex 2fc012c717..1839da2922 100644--- a/tests/_server/export/test_exporter.py+++ b/tests/_server/export/test_exporter.py@@ -21,8 +21,8 @@ from marimo._server.export import ()from marimo._server.export.exporter import Exporterfrom marimo._server.models.export import ExportAsHTMLRequest-from marimo._server.notebook import AppFileManager-from marimo._server.session.session_view import SessionView+from marimo._session.notebook import AppFileManager+from marimo._session.state.session_view import SessionViewfrom marimo._utils.marimo_path import MarimoPathfrom tests.mocks import snapshotterdiff --git a/tests/_server/mocks.py b/tests/_server/mocks.pyindex 1fb6e2f721..18d92a6f47 100644--- a/tests/_server/mocks.py+++ b/tests/_server/mocks.py@@ -8,9 +8,9 @@ from typing import TYPE_CHECKING, Any, Callable, Optional, castfrom marimo._config.manager import get_default_config_managerfrom marimo._server.file_router import AppFileRouterfrom marimo._server.lsp import NoopLspServer-from marimo._server.model import SessionMode-from marimo._server.sessions.session_manager import SessionManager+from marimo._server.session_manager import SessionManagerfrom marimo._server.tokens import AuthToken, SkewProtectionToken+from marimo._session.model import SessionModefrom marimo._utils.marimo_path import MarimoPathif TYPE_CHECKING:diff --git a/tests/_server/templates/test_templates.py b/tests/_server/templates/test_templates.pyindex a6100e572e..aad259c4b6 100644--- a/tests/_server/templates/test_templates.py+++ b/tests/_server/templates/test_templates.py@@ -27,9 +27,9 @@ from marimo._schemas.session import (NotebookSessionV1,StreamOutput,)-from marimo._server.model import SessionModefrom marimo._server.templates import templatesfrom marimo._server.tokens import SkewProtectionToken+from marimo._session.model import SessionModefrom marimo._utils.code import hash_codefrom tests._server.templates.utils import normalize_index_htmlfrom tests.mocks import snapshotterdiff --git a/tests/_server/test_errors.py b/tests/_server/test_errors.pyindex a635381e08..5ce9c0ec4e 100644--- a/tests/_server/test_errors.py+++ b/tests/_server/test_errors.py@@ -6,9 +6,9 @@ import msgspecfrom starlette.exceptions import HTTPExceptionfrom starlette.requests import Request-from marimo._server.api.status import HTTPException as MarimoHTTPExceptionfrom marimo._server.errors import handle_error-from marimo._server.model import SessionMode+from marimo._session.model import SessionMode+from marimo._utils.http import HTTPException as MarimoHTTPExceptionasync def test_http_exception():diff --git a/tests/_server/test_file_manager.py b/tests/_server/test_file_manager.pyindex bb4a3f1b14..bb9061adae 100644--- a/tests/_server/test_file_manager.py+++ b/tests/_server/test_file_manager.py@@ -9,11 +9,11 @@ import pytestfrom marimo import __version__from marimo._ast.app import App, InternalAppfrom marimo._ast.cell import CellConfig-from marimo._server.api.status import HTTPException, HTTPStatusfrom marimo._server.models.models import SaveNotebookRequest-from marimo._server.notebook import AppFileManager+from marimo._session.notebook import AppFileManagerfrom marimo._types.ids import CellId_tfrom marimo._utils.cell_matching import similarity_score+from marimo._utils.http import HTTPException, HTTPStatusif TYPE_CHECKING:from collections.abc import Generatordiff --git a/tests/_server/test_file_manager_absolute_path.py b/tests/_server/test_file_manager_absolute_path.pyindex f349a9af2c..029ad4af75 100644--- a/tests/_server/test_file_manager_absolute_path.py+++ b/tests/_server/test_file_manager_absolute_path.py@@ -8,8 +8,8 @@ from pathlib import Pathimport pytest-from marimo._server.api.status import HTTPException, HTTPStatusfrom marimo._server.file_router import AppFileRouter+from marimo._utils.http import HTTPException, HTTPStatusclass TestAbsoluteDirectoryPath:diff --git a/tests/_server/test_file_manager_filename.py b/tests/_server/test_file_manager_filename.pyindex 85ad1de88c..c2ba0b5758 100644--- a/tests/_server/test_file_manager_filename.py+++ b/tests/_server/test_file_manager_filename.py@@ -5,8 +5,8 @@ from pathlib import Pathimport pytest-from marimo._server.api.status import HTTPException-from marimo._server.notebook import AppFileManager+from marimo._session.notebook import AppFileManager+from marimo._utils.http import HTTPExceptionfrom tests.mocks import EDGE_CASE_FILENAMESdiff --git a/tests/_server/test_file_router.py b/tests/_server/test_file_router.pyindex 37cec5a801..7c125a6f3d 100644--- a/tests/_server/test_file_router.py+++ b/tests/_server/test_file_router.py@@ -8,7 +8,6 @@ from pathlib import Pathimport pytest-from marimo._server.api.status import HTTPException, HTTPStatusfrom marimo._server.file_router import (AppFileRouter,LazyListOfFilesAppFileRouter,@@ -19,6 +18,7 @@ from marimo._server.file_router import (validate_inside_directory,)from marimo._server.models.home import MarimoFile+from marimo._utils.http import HTTPException, HTTPStatusfile_contents = """import marimodiff --git a/tests/_server/test_session_manager.py b/tests/_server/test_session_manager.pyindex 28c1501d2b..fb9a6e869e 100644--- a/tests/_server/test_session_manager.py+++ b/tests/_server/test_session_manager.py@@ -7,17 +7,17 @@ from unittest.mock import MagicMock, Mockimport pytestfrom marimo._config.manager import get_default_config_manager-from marimo._server.consumer import SessionConsumerfrom marimo._server.file_router import AppFileRouterfrom marimo._server.lsp import LspServer-from marimo._server.model import ConnectionState, SessionMode-from marimo._server.notebook import AppFileManager-from marimo._server.sessions import (+from marimo._server.session_manager import SessionManager+from marimo._server.tokens import AuthToken, SkewProtectionToken+from marimo._session import (KernelManager,Session,- SessionManager,)-from marimo._server.tokens import AuthToken, SkewProtectionToken+from marimo._session.consumer import SessionConsumer+from marimo._session.model import ConnectionState, SessionMode+from marimo._session.notebook import AppFileManagerfrom marimo._types.ids import SessionIdif TYPE_CHECKING:diff --git a/tests/_server/test_sessions.py b/tests/_server/test_sessions.pyindex f26c599b39..3cc6419d71 100644--- a/tests/_server/test_sessions.py+++ b/tests/_server/test_sessions.py@@ -36,22 +36,22 @@ from marimo._runtime.commands import (SyncGraphCommand,UpdateUIElementCommand,)-from marimo._server.consumer import SessionConsumerfrom marimo._server.file_router import AppFileRouter-from marimo._server.model import ConnectionState, SessionMode-from marimo._server.notebook import AppFileManager-from marimo._server.session.session_view import SessionView-from marimo._server.sessions import Session-from marimo._server.sessions.events import SessionEventBus-from marimo._server.sessions.managers import (+from marimo._server.session_manager import SessionManager+from marimo._server.utils import initialize_asyncio+from marimo._session import Session+from marimo._session.consumer import SessionConsumer+from marimo._session.events import SessionEventBus+from marimo._session.managers import (KernelManagerImpl,QueueManagerImpl,)-from marimo._server.sessions.session import (+from marimo._session.model import ConnectionState, SessionMode+from marimo._session.notebook import AppFileManager+from marimo._session.session import (SessionImpl,)-from marimo._server.sessions.session_manager import SessionManager-from marimo._server.utils import initialize_asyncio+from marimo._session.state.session_view import SessionViewfrom marimo._types.ids import ConsumerId, SessionIdfrom marimo._utils.marimo_path import MarimoPathdiff --git a/tests/_server/sessions/test_token_manager.py b/tests/_server/test_token_manager.pysimilarity index 96%rename from tests/_server/sessions/test_token_manager.pyrename to tests/_server/test_token_manager.pyindex 7564db5dfe..607c857906 100644--- a/tests/_server/sessions/test_token_manager.py+++ b/tests/_server/test_token_manager.py@@ -5,9 +5,9 @@ from __future__ import annotationsimport pytest-from marimo._server.model import SessionMode-from marimo._server.sessions.token_manager import TokenManager+from marimo._server.token_manager import TokenManagerfrom marimo._server.tokens import AuthToken, SkewProtectionToken+from marimo._session.model import SessionModedef test_token_manager_edit_mode_random_tokens() -> None:diff --git a/tests/_server/test_utils_filename.py b/tests/_server/test_utils_filename.pyindex 62b0e17c0a..cb7418041c 100644--- a/tests/_server/test_utils_filename.py+++ b/tests/_server/test_utils_filename.py@@ -5,7 +5,7 @@ import osimport pytest-from marimo._server.utils import canonicalize_filename+from marimo._session.notebook.file_manager import canonicalize_filenameclass TestCanonicalizeFilename:diff --git a/tests/_server/sessions/__init__.py b/tests/_session/__init__.pysimilarity index 100%rename from tests/_server/sessions/__init__.pyrename to tests/_session/__init__.pydiff --git a/tests/_session/conftest.py b/tests/_session/conftest.pynew file mode 100644index 0000000000..c3f1133482--- /dev/null+++ b/tests/_session/conftest.py@@ -0,0 +1,23 @@+# Copyright 2026 Marimo. All rights reserved.+from __future__ import annotations++from typing import TYPE_CHECKING++import pytest++from marimo._session.state.session_view import SessionView+from tests.utils import assert_serialize_roundtrip++if TYPE_CHECKING:+ from collections.abc import Generator+++def session_view() -> Generator[SessionView, None, None]:+ sv = SessionView()++ yield sv++ # Test all operations can be serialized/deserialized+ for operation in sv.notifications:+ assert_serialize_roundtrip(operation)diff --git a/tests/_session/extensions/__init__.py b/tests/_session/extensions/__init__.pynew file mode 100644index 0000000000..fe2d2e388e--- /dev/null+++ b/tests/_session/extensions/__init__.py@@ -0,0 +1 @@+# Copyright 2026 Marimo. All rights reserved.diff --git a/tests/_server/sessions/extensions/test_extensions.py b/tests/_session/extensions/test_extensions.pysimilarity index 96%rename from tests/_server/sessions/extensions/test_extensions.pyrename to tests/_session/extensions/test_extensions.pyindex 0e528b5891..746d447aa7 100644--- a/tests/_server/sessions/extensions/test_extensions.py+++ b/tests/_session/extensions/test_extensions.py@@ -8,9 +8,8 @@ from unittest.mock import Mock, patchimport pytest-from marimo._server.model import ConnectionState, SessionMode-from marimo._server.sessions.events import SessionEventBus-from marimo._server.sessions.extensions.extensions import (+from marimo._session.events import SessionEventBus+from marimo._session.extensions.extensions import (CachingExtension,HeartbeatExtension,LoggingExtension,@@ -19,7 +18,8 @@ from marimo._server.sessions.extensions.extensions import (ReplayExtension,SessionViewExtension,)-from marimo._server.sessions.types import KernelState+from marimo._session.model import ConnectionState, SessionMode+from marimo._session.types import KernelStatefrom marimo._types.ids import CellId_t, RequestId, SessionId@@ -88,7 +88,7 @@ class TestCachingExtension:assert extension.session_cache_manager is None- @patch("marimo._server.sessions.extensions.extensions.SessionCacheManager")+ @patch("marimo._session.extensions.extensions.SessionCacheManager")def test_lifecycle(self, mock_cache_cls, mock_session, event_bus) -> None:"""Test cache manager creation, start, and stop."""mock_cache = Mock()@@ -106,7 +106,7 @@ class TestCachingExtension:mock_cache.stop.assert_called_once()- @patch("marimo._server.sessions.extensions.extensions.SessionCacheManager")+ @patch("marimo._session.extensions.extensions.SessionCacheManager")async def test_rename_updates_path(self, mock_cache_cls, mock_session, event_bus) -> None:@@ -146,9 +146,7 @@ class TestNotificationListenerExtension:manager.stream_queue = asyncio.Queue()return manager- @patch(- "marimo._server.sessions.extensions.extensions.ConnectionDistributor"- )+ @patch("marimo._session.extensions.extensions.ConnectionDistributor")def test_lifecycle(self, mock_dist, mock_session, event_bus, kernel_manager, queue_manager) -> None:diff --git a/tests/_session/notebook/__init__.py b/tests/_session/notebook/__init__.pynew file mode 100644index 0000000000..fe2d2e388e--- /dev/null+++ b/tests/_session/notebook/__init__.py@@ -0,0 +1 @@+# Copyright 2026 Marimo. All rights reserved.diff --git a/tests/_server/notebook/test_serializer.py b/tests/_session/notebook/test_serializer.pysimilarity index 98%rename from tests/_server/notebook/test_serializer.pyrename to tests/_session/notebook/test_serializer.pyindex 7acd099404..474579ca78 100644--- a/tests/_server/notebook/test_serializer.py+++ b/tests/_session/notebook/test_serializer.py@@ -1,6 +1,8 @@# Copyright 2026 Marimo. All rights reserved."""Tests for serializer.py"""+from __future__ import annotations+from pathlib import Pathimport pytest@@ -11,7 +13,7 @@ from marimo._schemas.serialization import (Header,NotebookSerializationV1,)-from marimo._server.notebook.serializer import (+from marimo._session.notebook.serializer import (DEFAULT_FORMAT_HANDLERS,MarkdownNotebookSerializer,PythonNotebookSerializer,diff --git a/tests/_server/notebook/test_storage.py b/tests/_session/notebook/test_storage.pysimilarity index 97%rename from tests/_server/notebook/test_storage.pyrename to tests/_session/notebook/test_storage.pyindex c107aa3594..80c74a862e 100644--- a/tests/_server/notebook/test_storage.py+++ b/tests/_session/notebook/test_storage.py@@ -1,12 +1,14 @@# Copyright 2026 Marimo. All rights reserved."""Tests for storage.py"""+from __future__ import annotations+from pathlib import Pathimport pytest-from marimo._server.api.status import HTTPException-from marimo._server.notebook.storage import FilesystemStorage+from marimo._session.notebook.storage import FilesystemStorage+from marimo._utils.http import HTTPExceptionclass TestFilesystemStorage:diff --git a/tests/_session/state/__init__.py b/tests/_session/state/__init__.pynew file mode 100644index 0000000000..fe2d2e388e--- /dev/null+++ b/tests/_session/state/__init__.py@@ -0,0 +1 @@+# Copyright 2026 Marimo. All rights reserved.diff --git a/tests/_server/session/snapshots/README.md b/tests/_session/state/snapshots/README.mdsimilarity index 100%rename from tests/_server/session/snapshots/README.mdrename to tests/_session/state/snapshots/README.mddiff --git a/tests/_server/session/snapshots/basic_session.json b/tests/_session/state/snapshots/basic_session.jsonsimilarity index 100%rename from tests/_server/session/snapshots/basic_session.jsonrename to tests/_session/state/snapshots/basic_session.jsondiff --git a/tests/_server/session/snapshots/console_session.json b/tests/_session/state/snapshots/console_session.jsonsimilarity index 100%rename from tests/_server/session/snapshots/console_session.jsonrename to tests/_session/state/snapshots/console_session.jsondiff --git a/tests/_server/session/snapshots/error_session.json b/tests/_session/state/snapshots/error_session.jsonsimilarity index 100%rename from tests/_server/session/snapshots/error_session.jsonrename to tests/_session/state/snapshots/error_session.jsondiff --git a/tests/_server/session/snapshots/mime_bundle_session.json b/tests/_session/state/snapshots/mime_bundle_session.jsonsimilarity index 100%rename from tests/_server/session/snapshots/mime_bundle_session.jsonrename to tests/_session/state/snapshots/mime_bundle_session.jsondiff --git a/tests/_server/session/snapshots/mixed_error_session.json b/tests/_session/state/snapshots/mixed_error_session.jsonsimilarity index 100%rename from tests/_server/session/snapshots/mixed_error_session.jsonrename to tests/_session/state/snapshots/mixed_error_session.jsondiff --git a/tests/_server/session/test_serialize_session.py b/tests/_session/state/test_serialize_session.pysimilarity index 99%rename from tests/_server/session/test_serialize_session.pyrename to tests/_session/state/test_serialize_session.pyindex c820de4a2d..dbac17d9f2 100644--- a/tests/_server/session/test_serialize_session.py+++ b/tests/_session/state/test_serialize_session.py@@ -16,7 +16,7 @@ from marimo._messaging.errors import MarimoExceptionRaisedError, UnknownErrorfrom marimo._messaging.notification import CellNotificationfrom marimo._runtime.commands import ExecuteCellsCommandfrom marimo._schemas.session import NotebookSessionV1-from marimo._server.session.serialize import (+from marimo._session.state.serialize import (SessionCacheKey,SessionCacheManager,SessionCacheWriter,@@ -26,7 +26,7 @@ from marimo._server.session.serialize import (serialize_notebook,serialize_session_view,)-from marimo._server.session.session_view import SessionView+from marimo._session.state.session_view import SessionViewfrom marimo._types.ids import CellId_tfrom tests.mocks import snapshotterdiff --git a/tests/_server/session/test_serialize_session_missing_type.py b/tests/_session/state/test_serialize_session_missing_type.pysimilarity index 90%rename from tests/_server/session/test_serialize_session_missing_type.pyrename to tests/_session/state/test_serialize_session_missing_type.pyindex b61f107064..a1238ba46f 100644--- a/tests/_server/session/test_serialize_session_missing_type.py+++ b/tests/_session/state/test_serialize_session_missing_type.py@@ -2,8 +2,8 @@ from __future__ import annotationsfrom marimo._messaging.cell_output import CellChannel, CellOutputfrom marimo._messaging.notification import CellNotification-from marimo._server.session.serialize import serialize_session_view-from marimo._server.session.session_view import SessionView+from marimo._session.state.serialize import serialize_session_view+from marimo._session.state.session_view import SessionViewdef test_serialize_session_with_dict_error_missing_type():diff --git a/tests/_server/session/test_session_view.py b/tests/_session/state/test_session_view.pysimilarity index 99%rename from tests/_server/session/test_session_view.pyrename to tests/_session/state/test_session_view.pyindex b8da15872a..5e4e35e321 100644--- a/tests/_server/session/test_session_view.py+++ b/tests/_session/state/test_session_view.py@@ -39,7 +39,7 @@ from marimo._runtime.commands import (ExecuteCellsCommand,UpdateUIElementCommand,)-from marimo._server.session.session_view import SessionView+from marimo._session.state.session_view import SessionViewfrom marimo._sql.engines.duckdb import INTERNAL_DUCKDB_ENGINEfrom marimo._types.ids import CellId_t, RequestId, VariableName, WidgetModelIdfrom marimo._utils.parse_dataclass import parse_rawdiff --git a/tests/_server/sessions/test_file_change_handler.py b/tests/_session/test_file_change_handler.pysimilarity index 99%rename from tests/_server/sessions/test_file_change_handler.pyrename to tests/_session/test_file_change_handler.pyindex 8b73c39c6a..f0482ad091 100644--- a/tests/_server/sessions/test_file_change_handler.py+++ b/tests/_session/test_file_change_handler.py@@ -18,12 +18,12 @@ from marimo._messaging.notification import ()from marimo._runtime.commands import DeleteCellCommand, SyncGraphCommandfrom marimo._server.models.models import SaveNotebookRequest-from marimo._server.notebook import AppFileManager-from marimo._server.sessions.file_change_handler import (+from marimo._session.file_change_handler import (EditModeReloadStrategy,FileChangeCoordinator,RunModeReloadStrategy,)+from marimo._session.notebook import AppFileManagerfrom marimo._types.ids import CellId_tif TYPE_CHECKING:diff --git a/tests/_server/sessions/test_file_watcher_integration.py b/tests/_session/test_file_watcher_integration.pysimilarity index 96%rename from tests/_server/sessions/test_file_watcher_integration.pyrename to tests/_session/test_file_watcher_integration.pyindex 2b9bf07ab4..75f294d494 100644--- a/tests/_server/sessions/test_file_watcher_integration.py+++ b/tests/_session/test_file_watcher_integration.py@@ -8,11 +8,11 @@ from unittest.mock import AsyncMock, MagicMockimport pytest-from marimo._server.sessions.events import SessionEventBus-from marimo._server.sessions.file_watcher_integration import (+from marimo._session.events import SessionEventBus+from marimo._session.file_watcher_integration import (SessionFileWatcherExtension,)-from marimo._server.sessions.session_repository import SessionRepository+from marimo._session.session_repository import SessionRepositoryfrom marimo._types.ids import SessionIdfrom marimo._utils.file_watcher import FileWatcherManagerdiff --git a/tests/_server/sessions/test_resume_strategies.py b/tests/_session/test_resume_strategies.pysimilarity index 97%rename from tests/_server/sessions/test_resume_strategies.pyrename to tests/_session/test_resume_strategies.pyindex 01cb3b05ca..e3045bbbbf 100644--- a/tests/_server/sessions/test_resume_strategies.py+++ b/tests/_session/test_resume_strategies.py@@ -9,12 +9,12 @@ from unittest.mock import MagicMockimport pytestfrom marimo._server.exceptions import InvalidSessionException-from marimo._server.model import ConnectionState-from marimo._server.sessions.resume_strategies import (+from marimo._session.model import ConnectionState+from marimo._session.resume_strategies import (EditModeResumeStrategy,RunModeResumeStrategy,)-from marimo._server.sessions.session_repository import SessionRepository+from marimo._session.session_repository import SessionRepositoryfrom marimo._types.ids import SessionIddiff --git a/tests/conftest.py b/tests/conftest.pyindex 5e1eb23ea1..0a67a20ad8 100644--- a/tests/conftest.py+++ b/tests/conftest.py@@ -40,7 +40,7 @@ from marimo._runtime.input_override import input_overridefrom marimo._runtime.marimo_pdb import MarimoPdbfrom marimo._runtime.runtime import Kernelfrom marimo._save.stubs.module_stub import ModuleStub-from marimo._server.model import SessionMode+from marimo._session.model import SessionModefrom marimo._types.ids import CellId_tif TYPE_CHECKING: