meshagent-cli 0.41.9__tar.gz → 0.42.2__tar.gz

{meshagent_cli-0.41.9 → meshagent_cli-0.42.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-cli
-Version: 0.41.9
+Version: 0.42.2
 Summary: CLI for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -22,7 +22,7 @@ Requires-Dist: openpyxl~=3.1
 Requires-Dist: xlsxwriter~=3.2
 Requires-Dist: pathspec<2,>=1.0.3
 Requires-Dist: zstandard~=0.25.0
-Requires-Dist: meshagent-llm-proxy==0.41.9
+Requires-Dist: meshagent-llm-proxy==0.42.2
 Requires-Dist: rich~=14.3.0
 Requires-Dist: sounddevice~=0.5
 Requires-Dist: textual<9.0,>=8.2.3
@@ -30,23 +30,23 @@ Requires-Dist: prompt-toolkit~=3.0.52
 Requires-Dist: ascii-magic~=2.3
 Requires-Dist: pillow~=11.3.0
 Provides-Extra: all
-Requires-Dist: meshagent-agents[all]==0.41.9; extra == "all"
-Requires-Dist: meshagent-api[all]==0.41.9; extra == "all"
-Requires-Dist: meshagent-commoncrawl==0.41.9; extra == "all"
-Requires-Dist: meshagent-scrapy==0.41.9; extra == "all"
-Requires-Dist: meshagent-computers==0.41.9; extra == "all"
-Requires-Dist: meshagent-openai==0.41.9; extra == "all"
-Requires-Dist: meshagent-anthropic==0.41.9; extra == "all"
-Requires-Dist: meshagent-otel==0.41.9; extra == "all"
-Requires-Dist: meshagent-mcp==0.41.9; extra == "all"
-Requires-Dist: meshagent-tools==0.41.9; extra == "all"
+Requires-Dist: meshagent-agents[all]==0.42.2; extra == "all"
+Requires-Dist: meshagent-api[all]==0.42.2; extra == "all"
+Requires-Dist: meshagent-commoncrawl==0.42.2; extra == "all"
+Requires-Dist: meshagent-scrapy==0.42.2; extra == "all"
+Requires-Dist: meshagent-computers==0.42.2; extra == "all"
+Requires-Dist: meshagent-openai==0.42.2; extra == "all"
+Requires-Dist: meshagent-anthropic==0.42.2; extra == "all"
+Requires-Dist: meshagent-otel==0.42.2; extra == "all"
+Requires-Dist: meshagent-mcp==0.42.2; extra == "all"
+Requires-Dist: meshagent-tools==0.42.2; 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.41.9; extra == "mcp-service"
-Requires-Dist: meshagent-api==0.41.9; extra == "mcp-service"
-Requires-Dist: meshagent-mcp==0.41.9; extra == "mcp-service"
-Requires-Dist: meshagent-tools==0.41.9; extra == "mcp-service"
+Requires-Dist: meshagent-agents[all]==0.42.2; extra == "mcp-service"
+Requires-Dist: meshagent-api==0.42.2; extra == "mcp-service"
+Requires-Dist: meshagent-mcp==0.42.2; extra == "mcp-service"
+Requires-Dist: meshagent-tools==0.42.2; extra == "mcp-service"
 Requires-Dist: supabase-auth~=2.28.0; extra == "mcp-service"
 Dynamic: license-file
 

{meshagent_cli-0.41.9 → meshagent_cli-0.42.2}/meshagent/cli/ask.py

@@ -3891,7 +3891,7 @@ async def ask(
             help="Output format for non-interactive responses.",
             case_sensitive=False,
         ),
-    ] = "text",
+    ] = "markdown",
     model: Annotated[
         str,
         typer.Option("--model", help="Name of the LLM model to use"),

{meshagent_cli-0.41.9 → meshagent_cli-0.42.2}/meshagent/cli/ask_test.py

@@ -1227,9 +1227,11 @@ async def test_resolve_ask_access_token_prefers_meshagent_token(monkeypatch) ->
 
 
 @pytest.mark.asyncio
-async def test_ask_command_uses_oauth_token_and_prints_result(monkeypatch) -> None:
+async def test_ask_command_uses_oauth_token_and_renders_markdown_by_default(
+    monkeypatch,
+) -> None:
     captured: dict[str, object] = {}
-    printed: list[tuple[tuple[object, ...], dict[str, object]]] = []
+    rendered: list[object] = []
 
     async def _fake_get_access_token() -> str:
         return "oauth-token"
@@ -1255,10 +1257,19 @@ async def test_ask_command_uses_oauth_token_and_prints_result(monkeypatch) -> No
     monkeypatch.setattr(ask_module, "resolve_project_id", _fake_resolve_project_id)
     monkeypatch.setattr(ask_module, "_build_ask_adapter", _fake_build_ask_adapter)
 
-    def _fake_echo(*args: object, **kwargs: object) -> None:
-        printed.append((args, dict(kwargs)))
+    class _FakeConsole:
+        def print(self, value: object) -> None:
+            rendered.append(value)
 
-    monkeypatch.setattr(ask_module.click, "echo", _fake_echo)
+    monkeypatch.setattr(ask_module, "Console", _FakeConsole)
+    monkeypatch.setattr(ask_module, "Markdown", lambda text: ("markdown", text))
+    monkeypatch.setattr(
+        ask_module.click,
+        "echo",
+        lambda *args, **kwargs: (_ for _ in ()).throw(
+            AssertionError("streaming output should not be used")
+        ),
+    )
 
     await ask_module.ask(
         project_id="project-123",
@@ -1271,11 +1282,7 @@ async def test_ask_command_uses_oauth_token_and_prints_result(monkeypatch) -> No
         "project_id": "project-123",
         "access_token": "oauth-token",
     }
-    assert printed == [
-        (("hello",), {"nl": False}),
-        ((" world",), {"nl": False}),
-        ((), {}),
-    ]
+    assert rendered == [("markdown", "hello world")]
 
 
 def test_meshagent_ask_cli_invocation_prints_streamed_response(
@@ -1311,6 +1318,8 @@ def test_meshagent_ask_cli_invocation_prints_streamed_response(
             "project-123",
             "--message",
             "hello",
+            "--format",
+            "text",
             "--model",
             "gpt-5.5",
         ],
@@ -1603,6 +1612,7 @@ async def test_ask_command_prefers_meshagent_token_over_oauth(monkeypatch) -> No
     await ask_module.ask(
         project_id="project-123",
         message="hello",
+        format="text",
         model="gpt-5.5",
     )
 

{meshagent_cli-0.41.9 → meshagent_cli-0.42.2}/meshagent/cli/containers.py

@@ -30,6 +30,7 @@ from meshagent.cli.helper import (
     split_container_mount,
     split_image_mount,
 )
+from meshagent.api.helpers import websocket_room_url
 from meshagent.api import (
     RoomClient,
     WebSocketClientProtocol,
@@ -555,7 +556,7 @@ async def _with_client(
         connection = await account_client.connect_room(project_id=project_id, room=room)
 
         proto = WebSocketClientProtocol(
-            url=connection.room_url,
+            url=websocket_room_url(room_name=room),
             token=connection.jwt,
         )
         client_cm = RoomClient(protocol_factory=proto.create_factory())

{meshagent_cli-0.41.9 → meshagent_cli-0.42.2}/meshagent/cli/containers_test.py

@@ -522,7 +522,7 @@ async def test_images_inspect_renders_detail_tables(
 
 
 @pytest.mark.asyncio
-async def test_with_client_uses_room_url_from_connection_info(
+async def test_with_client_uses_configured_websocket_room_url(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
     connection = SimpleNamespace(
@@ -560,6 +560,11 @@ async def test_with_client_uses_room_url_from_connection_info(
     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,
+        "websocket_room_url",
+        lambda room_name: f"wss://configured-router/{room_name}",
+    )
     monkeypatch.setattr(containers, "WebSocketClientProtocol", _FakeProtocol)
     monkeypatch.setattr(containers, "RoomClient", _FakeRoomClient)
 
@@ -574,7 +579,7 @@ async def test_with_client_uses_room_url_from_connection_info(
     ]
     assert protocol_calls == [
         {
-            "url": "wss://room-router.meshagent.dev/custom/room-endpoint",
+            "url": "wss://configured-router/room-1-resolved",
             "token": "jwt-token",
         }
     ]

{meshagent_cli-0.41.9 → meshagent_cli-0.42.2}/meshagent/cli/create.py

@@ -129,7 +129,7 @@ NPM_CHATBOT_UI_NEXT_STEPS = (
 )
 CONTACT_FORM_NEXT_STEPS = (
     "./scripts/install.sh",
-    "meshagent rooms create --name <room> --if-not-exists",
+    "meshagent rooms create <room> --if-not-exists",
     "./scripts/dev.sh --room <room>",
     "CONTACT_FORM_TO=you@example.com ./scripts/deploy.sh --room <room>",
 )

{meshagent_cli-0.41.9 → meshagent_cli-0.42.2}/meshagent/cli/create_test.py

@@ -2,11 +2,46 @@ from __future__ import annotations
 
 from click.testing import CliRunner
 
+from meshagent.api.specs.service import ServiceTemplateSpec
 from meshagent.cli import create as create_module
 from meshagent.cli.doctor import diagnose_project
 from meshagent.cli.create import create_command
 
 
+def _assert_runtime_image_mount_deploy_yaml(
+    project_path,
+    *,
+    runtime: str,
+    command: str,
+) -> ServiceTemplateSpec:
+    deploy_yaml = (project_path / ".meshagent" / "deploy.yaml").read_text(
+        encoding="utf-8"
+    )
+    spec = ServiceTemplateSpec.from_yaml(
+        deploy_yaml,
+        values={
+            "image": "registry.example.com/test-app:dev",
+            "from_email": "from@example.com",
+            "to_email": "to@example.com",
+        },
+    )
+
+    assert spec.container is not None
+    container = spec.container
+    assert container.image == f"meshagent/{runtime}:default"
+    assert container.command == command
+    assert container.working_dir == "/app"
+    assert container.storage is not None
+    assert container.storage.images is not None
+    assert len(container.storage.images) == 1
+    image_mount = container.storage.images[0]
+    assert image_mount.image == "registry.example.com/test-app:dev"
+    assert image_mount.path == "/app"
+    assert image_mount.subpath == "app"
+    assert image_mount.read_only is True
+    return spec
+
+
 def _assert_node_content_toolkit(
     source: str,
     *,
@@ -133,6 +168,11 @@ def test_init_creates_python_backend_agent_by_default_in_non_tty(tmp_path) -> No
     assert "LABEL meshagent.runtime=python" in dockerfile
     assert 'CMD ["-m", "server"]' in dockerfile
     assert "EXPOSE" not in dockerfile
+    _assert_runtime_image_mount_deploy_yaml(
+        tmp_path,
+        runtime="python",
+        command="python -m server",
+    )
     assert 'PYTHON="${PYTHON:-python3.13}"' in install_sh
     assert 'VENV="${VENV:-.venv}"' in install_sh
     assert 'PIP_ONLY_BINARY="${PIP_ONLY_BINARY:-:all:}"' in install_sh
@@ -284,6 +324,11 @@ def test_init_creates_python_webserver_non_interactively(tmp_path) -> None:
     assert "FROM scratch" in dockerfile
     assert "LABEL meshagent.runtime=python" in dockerfile
     assert "EXPOSE 8000" in dockerfile
+    _assert_runtime_image_mount_deploy_yaml(
+        tmp_path,
+        runtime="python",
+        command="python -m server",
+    )
     assert 'PYTHON="${PYTHON:-python3.13}"' in install_sh
     assert 'VENV="${VENV:-.venv}"' in install_sh
     assert 'PIP_ONLY_BINARY="${PIP_ONLY_BINARY:-:all:}"' in install_sh
@@ -317,7 +362,7 @@ def test_init_creates_python_contact_form_non_interactively(tmp_path) -> None:
     assert "2. Create room" in result.output
     assert "3. Run locally" in result.output
     assert "4. Deploy" in result.output
-    assert "meshagent rooms create --name <room> --if-not-exists" in result.output
+    assert "meshagent rooms create <room> --if-not-exists" in result.output
     assert (
         "Before testing a submission, set up the sender mailbox for that room"
         in result.output
@@ -354,7 +399,7 @@ def test_init_creates_python_contact_form_non_interactively(tmp_path) -> None:
     deploy_yaml = (tmp_path / ".meshagent" / "deploy.yaml").read_text(encoding="utf-8")
 
     assert "Python Contact Form" in readme
-    assert "meshagent rooms create --name <room> --if-not-exists" in readme
+    assert "meshagent rooms create <room> --if-not-exists" in readme
     assert "./scripts/dev.sh --room <room>" in readme
     assert "CONTACT_FORM_TO=you@example.com ./scripts/deploy.sh --room <room>" in readme
     assert (
@@ -389,6 +434,11 @@ def test_init_creates_python_contact_form_non_interactively(tmp_path) -> None:
     assert "FROM scratch" in dockerfile
     assert "LABEL meshagent.runtime=python" in dockerfile
     assert "EXPOSE 8000" in dockerfile
+    _assert_runtime_image_mount_deploy_yaml(
+        tmp_path,
+        runtime="python",
+        command="python -m server",
+    )
     assert 'PYTHON="${PYTHON:-python3.13}"' in install_sh
     assert 'VENV="${VENV:-.venv}"' in install_sh
     assert 'PIP_ONLY_BINARY="${PIP_ONLY_BINARY:-:all:}"' in install_sh
@@ -403,13 +453,13 @@ def test_init_creates_python_contact_form_non_interactively(tmp_path) -> None:
     assert "CONTACT_FORM_OPEN_BROWSER" in dev_sh
     assert "CONTACT_FORM_OPEN_BROWSER_PROMPT" not in dev_sh
     assert "read -r OPEN_BROWSER_ANSWER" not in dev_sh
-    assert 'meshagent rooms create --name "$ROOM_NAME" --if-not-exists' in dev_sh
+    assert 'meshagent rooms create "$ROOM_NAME" --if-not-exists' in dev_sh
     assert 'meshagent room connect "$@" -- "$VENV_PYTHON" -u server.py' in dev_sh
     assert 'if [ "$status" -eq 130 ] || [ "$status" -eq 143 ]; then' in dev_sh
     assert "Stopped contact form." in dev_sh
     assert "If the room does not exist yet, create it first:" in dev_sh
-    assert "meshagent rooms create --name <room> --if-not-exists" in dev_sh
-    assert 'meshagent rooms create --name "$ROOM_NAME" --if-not-exists' not in deploy_sh
+    assert "meshagent rooms create <room> --if-not-exists" in dev_sh
+    assert 'meshagent rooms create "$ROOM_NAME" --if-not-exists' not in deploy_sh
     assert "--meshagent-token agentDefault" in deploy_sh
     assert '--set "from_email=$CONTACT_FORM_FROM"' in deploy_sh
     assert '--set "to_email=$CONTACT_FORM_TO"' in deploy_sh
@@ -497,6 +547,11 @@ def test_init_creates_javascript_webserver_non_interactively(tmp_path) -> None:
     assert "FROM scratch" in dockerfile_text
     assert "LABEL meshagent.runtime=node" in dockerfile_text
     assert "EXPOSE 3000" in dockerfile_text
+    _assert_runtime_image_mount_deploy_yaml(
+        tmp_path,
+        runtime="node",
+        command="node index.js",
+    )
 
 
 def test_init_creates_javascript_backend_agent_non_interactively(tmp_path) -> None:
@@ -547,6 +602,11 @@ def test_init_creates_javascript_backend_agent_non_interactively(tmp_path) -> No
     assert "FROM scratch" in dockerfile
     assert "LABEL meshagent.runtime=node" in dockerfile
     assert "EXPOSE" not in dockerfile
+    _assert_runtime_image_mount_deploy_yaml(
+        tmp_path,
+        runtime="node",
+        command="node index.js",
+    )
 
 
 def test_init_creates_typescript_webserver_non_interactively(tmp_path) -> None:
@@ -609,6 +669,11 @@ def test_init_creates_typescript_webserver_non_interactively(tmp_path) -> None:
     assert "FROM scratch" in dockerfile_text
     assert "LABEL meshagent.runtime=node" in dockerfile_text
     assert "EXPOSE 3000" in dockerfile_text
+    _assert_runtime_image_mount_deploy_yaml(
+        tmp_path,
+        runtime="node",
+        command="node index.js",
+    )
     assert diagnosis.language == "TypeScript"
     assert diagnosis.javascript_flavor == "Node.js/TypeScript"
     assert diagnosis.sdk == "@meshagent/meshagent"
@@ -661,6 +726,11 @@ def test_init_creates_typescript_backend_agent_non_interactively(tmp_path) -> No
     assert "FROM scratch" in dockerfile
     assert "LABEL meshagent.runtime=node" in dockerfile
     assert "EXPOSE" not in dockerfile
+    _assert_runtime_image_mount_deploy_yaml(
+        tmp_path,
+        runtime="node",
+        command="node index.js",
+    )
     assert diagnosis.language == "TypeScript"
     assert diagnosis.javascript_flavor == "Node.js/TypeScript"
     assert diagnosis.sdk == "@meshagent/meshagent"
@@ -727,6 +797,11 @@ def test_init_creates_typescript_chatbot_non_interactively(tmp_path) -> None:
     assert "FROM scratch" in dockerfile
     assert "LABEL meshagent.runtime=node" in dockerfile
     assert "EXPOSE 3000" in dockerfile
+    _assert_runtime_image_mount_deploy_yaml(
+        tmp_path,
+        runtime="node",
+        command="node index.js",
+    )
     assert diagnosis.language == "TypeScript"
     assert diagnosis.javascript_flavor == "Node.js/TypeScript"
     assert diagnosis.sdk is None
@@ -804,6 +879,11 @@ def test_init_creates_typescript_anthropic_chatbot_non_interactively(
     assert "FROM scratch" in dockerfile
     assert "LABEL meshagent.runtime=node" in dockerfile
     assert "EXPOSE 3000" in dockerfile
+    _assert_runtime_image_mount_deploy_yaml(
+        tmp_path,
+        runtime="node",
+        command="node index.js",
+    )
     assert diagnosis.language == "TypeScript"
     assert diagnosis.javascript_flavor == "Node.js/TypeScript"
     assert diagnosis.sdk is None
@@ -966,7 +1046,7 @@ def test_init_creates_typescript_chatbot_ui_non_interactively(tmp_path) -> None:
     assert '"build": "next build"' in package_json
     assert '"start": "node .next/standalone/server.js"' in package_json
     assert (
-        '"deploy": "meshagent deploy . --tag meshagent-create-typescript-chatbot-ui:dev --private --validation-mode=cookie --extra-port=3001:/messages --liveness /health --wait"'
+        '"deploy": "meshagent deploy . --tag meshagent-create-typescript-chatbot-ui:dev --private --validation-mode=cookie --extra-port=assistant:/messages --liveness /health --wait"'
         in package_json
     )
     assert 'from "@msgpack/msgpack"' in page_tsx
@@ -983,6 +1063,16 @@ def test_init_creates_typescript_chatbot_ui_non_interactively(tmp_path) -> None:
     assert 'CMD ["server.js"]' in dockerfile
     assert "ENV HOSTNAME=0.0.0.0" in dockerfile
     assert "EXPOSE 3000" in dockerfile
+    spec = _assert_runtime_image_mount_deploy_yaml(
+        tmp_path,
+        runtime="node",
+        command="node server.js",
+    )
+    assert spec.container is not None
+    assert spec.container.environment is not None
+    env = {entry.name: entry.value for entry in spec.container.environment}
+    assert env["HOSTNAME"] == "0.0.0.0"
+    assert env["PORT"] == "3000"
 
 
 def test_init_rejects_react_backend_agent(tmp_path) -> None: