meshagent-cli 0.35.7__tar.gz → 0.36.0__tar.gz

{meshagent_cli-0.35.7 → meshagent_cli-0.36.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-cli
-Version: 0.35.7
+Version: 0.36.0
 Summary: CLI for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -20,21 +20,21 @@ Requires-Dist: rich~=14.3.0
 Requires-Dist: textual<2.0,>=0.50
 Requires-Dist: prompt-toolkit~=3.0.52
 Provides-Extra: all
-Requires-Dist: meshagent-agents[all]~=0.35.7; extra == "all"
-Requires-Dist: meshagent-api[all]~=0.35.7; extra == "all"
-Requires-Dist: meshagent-computers~=0.35.7; extra == "all"
-Requires-Dist: meshagent-openai~=0.35.7; extra == "all"
-Requires-Dist: meshagent-anthropic~=0.35.7; extra == "all"
-Requires-Dist: meshagent-codex~=0.35.7; extra == "all"
-Requires-Dist: meshagent-mcp~=0.35.7; extra == "all"
-Requires-Dist: meshagent-tools~=0.35.7; extra == "all"
+Requires-Dist: meshagent-agents[all]~=0.36.0; extra == "all"
+Requires-Dist: meshagent-api[all]~=0.36.0; extra == "all"
+Requires-Dist: meshagent-computers~=0.36.0; extra == "all"
+Requires-Dist: meshagent-openai~=0.36.0; extra == "all"
+Requires-Dist: meshagent-anthropic~=0.36.0; extra == "all"
+Requires-Dist: meshagent-codex~=0.36.0; extra == "all"
+Requires-Dist: meshagent-mcp~=0.36.0; extra == "all"
+Requires-Dist: meshagent-tools~=0.36.0; extra == "all"
 Requires-Dist: supabase-auth~=2.28.0; extra == "all"
 Requires-Dist: prompt-toolkit~=3.0.52; extra == "all"
 Provides-Extra: mcp-service
-Requires-Dist: meshagent-agents[all]~=0.35.7; extra == "mcp-service"
-Requires-Dist: meshagent-api~=0.35.7; extra == "mcp-service"
-Requires-Dist: meshagent-mcp~=0.35.7; extra == "mcp-service"
-Requires-Dist: meshagent-tools~=0.35.7; extra == "mcp-service"
+Requires-Dist: meshagent-agents[all]~=0.36.0; extra == "mcp-service"
+Requires-Dist: meshagent-api~=0.36.0; extra == "mcp-service"
+Requires-Dist: meshagent-mcp~=0.36.0; extra == "mcp-service"
+Requires-Dist: meshagent-tools~=0.36.0; extra == "mcp-service"
 Requires-Dist: supabase-auth~=2.28.0; extra == "mcp-service"
 
 # [Meshagent](https://www.meshagent.com)

{meshagent_cli-0.35.7 → meshagent_cli-0.36.0}/meshagent/cli/chatbot.py

@@ -33,6 +33,7 @@ from meshagent.agents.widget_schema import widget_schema
 from meshagent.cli.common_options import (
     AllowGotoUrlOption,
     ProjectIdOption,
+    ShellConfigMountOption,
     RoomOption,
     ShellEmptyDirMountLegacyOption,
     ShellEmptyDirMountOption,
@@ -68,7 +69,6 @@ from meshagent.cli.helper import (
     resolve_project_id,
     resolve_room,
     supports_openai_shell_tool,
-    upload_room_bytes_stream,
 )
 
 from meshagent.openai import OpenAIResponsesAdapter
@@ -823,17 +823,6 @@ def build_chatbot(
                             rules.extend(cr)
 
             except RoomException:
-                try:
-                    logger.info("attempting to initialize rules file")
-                    await upload_room_bytes_stream(
-                        room=self.room,
-                        path=path,
-                        data="# Add rules to this file to customize your agent's behavior, lines starting with # will be ignored.\n\n".encode(),
-                        overwrite=False,
-                    )
-
-                except RoomException:
-                    pass
                 logger.info(
                     f"unable to load rules from {path}, continuing with default rules"
                 )
@@ -1480,16 +1469,6 @@ def build_process_agent(
                         if selected_rules is not None:
                             rules.extend(selected_rules)
             except RoomException:
-                try:
-                    logger.info("attempting to initialize rules file")
-                    await upload_room_bytes_stream(
-                        room=self.room,
-                        path=path,
-                        data="# Add rules to this file to customize your agent's behavior, lines starting with # will be ignored.\n\n".encode(),
-                        overwrite=False,
-                    )
-                except RoomException:
-                    pass
                 logger.info(
                     f"unable to load rules from {path}, continuing with default rules"
                 )
@@ -1947,6 +1926,7 @@ async def join(
     shell_tool_project_path: ShellProjectMountLegacyOption = [],
     shell_empty_dir_mount: ShellEmptyDirMountOption = [],
     shell_tool_empty_dir: ShellEmptyDirMountLegacyOption = [],
+    shell_tool_config_mount: ShellConfigMountOption = [],
     shell_image_mount: Annotated[
         List[str],
         typer.Option(
@@ -2150,6 +2130,7 @@ async def join(
                 shell_empty_dir_mount,
                 shell_tool_empty_dir,
             ),
+            config_paths=shell_tool_config_mount,
             image_paths=shell_image_mount,
         )
 
@@ -2342,6 +2323,7 @@ async def service(
     shell_tool_project_path: ShellProjectMountLegacyOption = [],
     shell_empty_dir_mount: ShellEmptyDirMountOption = [],
     shell_tool_empty_dir: ShellEmptyDirMountLegacyOption = [],
+    shell_tool_config_mount: ShellConfigMountOption = [],
     shell_image_mount: Annotated[
         List[str],
         typer.Option(
@@ -2509,6 +2491,7 @@ async def service(
             shell_empty_dir_mount,
             shell_tool_empty_dir,
         ),
+        config_paths=shell_tool_config_mount,
         image_paths=shell_image_mount,
     )
 
@@ -2703,6 +2686,7 @@ async def spec(
     shell_tool_project_path: ShellProjectMountLegacyOption = [],
     shell_empty_dir_mount: ShellEmptyDirMountOption = [],
     shell_tool_empty_dir: ShellEmptyDirMountLegacyOption = [],
+    shell_tool_config_mount: ShellConfigMountOption = [],
     require_image_generation: Annotated[
         Optional[str], typer.Option(..., help="Name of an image gen model")
     ] = None,
@@ -2855,6 +2839,7 @@ async def spec(
             shell_empty_dir_mount,
             shell_tool_empty_dir,
         ),
+        config_paths=shell_tool_config_mount,
     )
 
     path = "/agent"
@@ -3067,6 +3052,7 @@ async def deploy(
     shell_tool_project_path: ShellProjectMountLegacyOption = [],
     shell_empty_dir_mount: ShellEmptyDirMountOption = [],
     shell_tool_empty_dir: ShellEmptyDirMountLegacyOption = [],
+    shell_tool_config_mount: ShellConfigMountOption = [],
     require_image_generation: Annotated[
         Optional[str], typer.Option(..., help="Name of an image gen model")
     ] = None,
@@ -3226,6 +3212,7 @@ async def deploy(
             shell_empty_dir_mount,
             shell_tool_empty_dir,
         ),
+        config_paths=shell_tool_config_mount,
     )
 
     path = "/agent"
@@ -4935,6 +4922,7 @@ async def run(
     shell_tool_project_path: ShellProjectMountLegacyOption = [],
     shell_empty_dir_mount: ShellEmptyDirMountOption = [],
     shell_tool_empty_dir: ShellEmptyDirMountLegacyOption = [],
+    shell_tool_config_mount: ShellConfigMountOption = [],
     require_image_generation: Annotated[
         Optional[str], typer.Option(..., help="Name of an image gen model")
     ] = None,
@@ -5150,6 +5138,7 @@ async def run(
                 shell_empty_dir_mount,
                 shell_tool_empty_dir,
             ),
+            config_paths=shell_tool_config_mount,
         )
 
         client = RoomClient(

{meshagent_cli-0.35.7 → meshagent_cli-0.36.0}/meshagent/cli/common_options.py

@@ -97,6 +97,14 @@ ShellEmptyDirMountLegacyOption = Annotated[
     ),
 ]
 
+ShellConfigMountOption = Annotated[
+    list[str],
+    typer.Option(
+        "--shell-tool-config-mount",
+        help="Mount meshagent runtime config files read-only into <mount>",
+    ),
+]
+
 AllowGotoUrlOption = Annotated[
     bool,
     typer.Option(

{meshagent_cli-0.35.7 → meshagent_cli-0.36.0}/meshagent/cli/containers.py

@@ -31,7 +31,6 @@ from meshagent.api import (
     RoomClient,
     WebSocketClientProtocol,
 )
-from meshagent.api.helpers import websocket_room_url
 from meshagent.api.room_server_client import (
     DockerSecret,
 )
@@ -489,7 +488,7 @@ async def _with_client(
         connection = await account_client.connect_room(project_id=project_id, room=room)
 
         proto = WebSocketClientProtocol(
-            url=websocket_room_url(room_name=room),
+            url=connection.room_url,
             token=connection.jwt,
         )
         client_cm = RoomClient(protocol=proto)

{meshagent_cli-0.35.7 → meshagent_cli-0.36.0}/meshagent/cli/containers_test.py

@@ -1,4 +1,5 @@
 import asyncio
+from types import SimpleNamespace
 
 import pytest
 
@@ -106,6 +107,20 @@ class _FakeAccountClient:
         self.close_calls += 1
 
 
+class _FakeConnectAccountClient:
+    def __init__(self, *, connection: SimpleNamespace) -> None:
+        self._connection = connection
+        self.close_calls = 0
+        self.connect_calls: list[dict[str, str]] = []
+
+    async def connect_room(self, *, project_id: str, room: str) -> SimpleNamespace:
+        self.connect_calls.append({"project_id": project_id, "room": room})
+        return self._connection
+
+    async def close(self) -> None:
+        self.close_calls += 1
+
+
 @pytest.mark.asyncio
 async def test_stream_container_job_logs_and_wait_for_exit_cancels_follow_stream(
     monkeypatch: pytest.MonkeyPatch,
@@ -243,3 +258,61 @@ async def test_images_load_uses_room_storage_load_path(
         capsys.readouterr().out
         == "Image loaded: room.meshagent.com/images/example.tar:latest\n"
     )
+
+
+@pytest.mark.asyncio
+async def test_with_client_uses_room_url_from_connection_info(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    connection = SimpleNamespace(
+        jwt="jwt-token",
+        room_url="wss://room-router.meshagent.dev/custom/room-endpoint",
+    )
+    account_client = _FakeConnectAccountClient(connection=connection)
+    protocol_calls: list[dict[str, str]] = []
+
+    class _FakeProtocol:
+        def __init__(self, *, url: str, token: str) -> None:
+            protocol_calls.append({"url": url, "token": token})
+            self.url = url
+            self.token = token
+
+    class _FakeRoomClient:
+        def __init__(self, *, protocol: _FakeProtocol) -> None:
+            self.protocol = protocol
+            self.enter_calls = 0
+
+        async def __aenter__(self) -> "_FakeRoomClient":
+            self.enter_calls += 1
+            return self
+
+    async def _fake_get_client() -> _FakeConnectAccountClient:
+        return account_client
+
+    async def _fake_resolve_project_id(*, project_id):
+        assert project_id == "project-1"
+        return "resolved-project"
+
+    monkeypatch.setattr(containers, "get_client", _fake_get_client)
+    monkeypatch.setattr(containers, "resolve_project_id", _fake_resolve_project_id)
+    monkeypatch.setattr(containers, "resolve_room", lambda room: f"{room}-resolved")
+    monkeypatch.setattr(containers, "WebSocketClientProtocol", _FakeProtocol)
+    monkeypatch.setattr(containers, "RoomClient", _FakeRoomClient)
+
+    returned_account_client, client = await containers._with_client(
+        project_id="project-1",
+        room="room-1",
+    )
+
+    assert returned_account_client is account_client
+    assert account_client.connect_calls == [
+        {"project_id": "resolved-project", "room": "room-1-resolved"}
+    ]
+    assert protocol_calls == [
+        {
+            "url": "wss://room-router.meshagent.dev/custom/room-endpoint",
+            "token": "jwt-token",
+        }
+    ]
+    assert isinstance(client, _FakeRoomClient)
+    assert client.enter_calls == 1

{meshagent_cli-0.35.7 → meshagent_cli-0.36.0}/meshagent/cli/helper.py

@@ -11,6 +11,7 @@ from meshagent.api import RoomClient
 from meshagent.api.helpers import meshagent_base_url
 from meshagent.api.specs.service import (
     ANNOTATION_SERVICE_README,
+    ConfigMountSpec,
     ContainerMountSpec,
     EmptyDirMountSpec,
     ImageStorageMountSpec,
@@ -42,7 +43,7 @@ import json
 from rich import print
 
 SETTINGS_FILE = Path.home() / ".meshagent" / "project.json"
-DEFAULT_SHELL_IMAGE = "python:3.13"
+DEFAULT_SHELL_IMAGE = "meshagent/python:default"
 
 
 def _ensure_cache_dir():
@@ -449,6 +450,15 @@ def split_empty_dir_mount(value: str, option_name: str) -> tuple[str, bool]:
     return mount, read_only
 
 
+def split_config_mount(value: str, option_name: str) -> str:
+    cleaned = value.strip()
+    if cleaned == "":
+        raise typer.BadParameter(f"{option_name} cannot be empty")
+    if ":" in cleaned:
+        raise typer.BadParameter(f"{option_name} must be in the form '<mount>'")
+    return cleaned
+
+
 def split_image_mount(
     value: str, option_name: str
 ) -> tuple[str, str, Optional[str], bool]:
@@ -525,16 +535,20 @@ def parse_shell_tool_mounts(
     project_paths: list[str],
     image_paths: Optional[list[str]] = None,
     empty_dir_paths: Optional[list[str]] = None,
+    config_paths: Optional[list[str]] = None,
 ) -> Optional[ContainerMountSpec]:
     room_mounts: list[RoomStorageMountSpec] = []
     project_mounts: list[ProjectStorageMountSpec] = []
     image_mounts: list[ImageStorageMountSpec] = []
     empty_dir_mounts: list[EmptyDirMountSpec] = []
+    config_mounts: list[ConfigMountSpec] = []
 
     if image_paths is None:
         image_paths = []
     if empty_dir_paths is None:
         empty_dir_paths = []
+    if config_paths is None:
+        config_paths = []
 
     for value in room_paths:
         source, mount, read_only = split_container_mount(
@@ -577,11 +591,16 @@ def parse_shell_tool_mounts(
             )
         )
 
+    for value in config_paths:
+        mount = split_config_mount(value, "--shell-tool-config-mount")
+        config_mounts.append(ConfigMountSpec(path=mount))
+
     if (
         not room_mounts
         and not project_mounts
         and not image_mounts
         and not empty_dir_mounts
+        and not config_mounts
     ):
         return None
 
@@ -590,6 +609,7 @@ def parse_shell_tool_mounts(
         project=project_mounts or None,
         images=image_mounts or None,
         empty_dirs=empty_dir_mounts or None,
+        configs=config_mounts or None,
     )
 
 

{meshagent_cli-0.35.7 → meshagent_cli-0.36.0}/meshagent/cli/helper_test.py

@@ -34,9 +34,9 @@ def test_parse_memory_selector_with_namespace() -> None:
 @pytest.mark.parametrize(
     ("value", "expected"),
     [
-        (None, "python:3.13"),
-        ("", "python:3.13"),
-        ("  ", "python:3.13"),
+        (None, DEFAULT_SHELL_IMAGE),
+        ("", DEFAULT_SHELL_IMAGE),
+        ("  ", DEFAULT_SHELL_IMAGE),
         ("python:3.12", "python:3.12"),
         (" none ", None),
         ("NONE", None),
@@ -148,6 +148,21 @@ def test_parse_shell_tool_mounts_parses_empty_dir_mounts() -> None:
     ]
 
 
+def test_parse_shell_tool_mounts_parses_config_mounts() -> None:
+    mounts = parse_shell_tool_mounts(
+        room_paths=[],
+        project_paths=[],
+        config_paths=["/var/run/meshagent", "/tmp/meshagent-config"],
+    )
+
+    assert mounts is not None
+    assert mounts.configs is not None
+    assert [mount.model_dump(mode="json") for mount in mounts.configs] == [
+        {"path": "/var/run/meshagent"},
+        {"path": "/tmp/meshagent-config"},
+    ]
+
+
 @pytest.mark.parametrize(
     "value",
     [
@@ -166,6 +181,23 @@ def test_parse_shell_tool_mounts_rejects_empty_dir_bind_syntax(value: str) -> No
         )
 
 
+@pytest.mark.parametrize(
+    "value",
+    [
+        "",
+        " ",
+        "/var/run/meshagent:ro",
+    ],
+)
+def test_parse_shell_tool_mounts_rejects_invalid_config_mounts(value: str) -> None:
+    with pytest.raises(typer.BadParameter, match="--shell-tool-config-mount"):
+        parse_shell_tool_mounts(
+            room_paths=[],
+            project_paths=[],
+            config_paths=[value],
+        )
+
+
 @pytest.mark.asyncio
 async def test_init_context_from_spec_handles_missing_annotations(
     monkeypatch: pytest.MonkeyPatch, tmp_path: Path