meshagent-cli 0.45.7__tar.gz → 0.46.0__tar.gz

{meshagent_cli-0.45.7/meshagent_cli.egg-info → meshagent_cli-0.46.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-cli
-Version: 0.45.7
+Version: 0.46.0
 Summary: CLI for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -22,8 +22,8 @@ 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.45.7
-Requires-Dist: meshagent-codex==0.45.7
+Requires-Dist: meshagent-llm-proxy==0.46.0
+Requires-Dist: meshagent-codex==0.46.0
 Requires-Dist: rich~=14.3.0
 Requires-Dist: sounddevice~=0.5
 Requires-Dist: textual<9.0,>=8.2.3
@@ -32,23 +32,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.45.7; extra == "all"
-Requires-Dist: meshagent-api[all]==0.45.7; extra == "all"
-Requires-Dist: meshagent-commoncrawl==0.45.7; extra == "all"
-Requires-Dist: meshagent-scrapy==0.45.7; extra == "all"
-Requires-Dist: meshagent-computers==0.45.7; extra == "all"
-Requires-Dist: meshagent-openai==0.45.7; extra == "all"
-Requires-Dist: meshagent-anthropic==0.45.7; extra == "all"
-Requires-Dist: meshagent-otel==0.45.7; extra == "all"
-Requires-Dist: meshagent-mcp==0.45.7; extra == "all"
-Requires-Dist: meshagent-tools==0.45.7; extra == "all"
+Requires-Dist: meshagent-agents[all]==0.46.0; extra == "all"
+Requires-Dist: meshagent-api[all]==0.46.0; extra == "all"
+Requires-Dist: meshagent-commoncrawl==0.46.0; extra == "all"
+Requires-Dist: meshagent-scrapy==0.46.0; extra == "all"
+Requires-Dist: meshagent-computers==0.46.0; extra == "all"
+Requires-Dist: meshagent-openai==0.46.0; extra == "all"
+Requires-Dist: meshagent-anthropic==0.46.0; extra == "all"
+Requires-Dist: meshagent-otel==0.46.0; extra == "all"
+Requires-Dist: meshagent-mcp==0.46.0; extra == "all"
+Requires-Dist: meshagent-tools==0.46.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.45.7; extra == "mcp-service"
-Requires-Dist: meshagent-api==0.45.7; extra == "mcp-service"
-Requires-Dist: meshagent-mcp==0.45.7; extra == "mcp-service"
-Requires-Dist: meshagent-tools==0.45.7; extra == "mcp-service"
+Requires-Dist: meshagent-agents[all]==0.46.0; extra == "mcp-service"
+Requires-Dist: meshagent-api==0.46.0; extra == "mcp-service"
+Requires-Dist: meshagent-mcp==0.46.0; extra == "mcp-service"
+Requires-Dist: meshagent-tools==0.46.0; extra == "mcp-service"
 Requires-Dist: supabase-auth~=2.28.0; extra == "mcp-service"
 Dynamic: license-file
 

{meshagent_cli-0.45.7 → meshagent_cli-0.46.0}/meshagent/cli/containers.py

@@ -538,8 +538,12 @@ async def _with_client(
 
         connection = await account_client.connect_room(project_id=project_id, room=room)
 
+        room_url = connection.room_url
+        if os.getenv("MESHAGENT_ROOM_URL"):
+            room_url = websocket_room_url(room_name=room)
+
         proto = WebSocketClientProtocol(
-            url=websocket_room_url(room_name=room),
+            url=room_url,
             token=connection.jwt,
         )
         client_cm = RoomClient(protocol_factory=proto.create_factory())

{meshagent_cli-0.45.7 → meshagent_cli-0.46.0}/meshagent/cli/containers_test.py

@@ -525,6 +525,7 @@ async def test_images_inspect_renders_detail_tables(
 async def test_with_client_uses_configured_websocket_room_url(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
+    monkeypatch.delenv("MESHAGENT_ROOM_URL", raising=False)
     connection = SimpleNamespace(
         jwt="jwt-token",
         room_url="wss://room-router.meshagent.dev/custom/room-endpoint",
@@ -560,11 +561,6 @@ async def test_with_client_uses_configured_websocket_room_url(
     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)
 
@@ -579,7 +575,63 @@ async def test_with_client_uses_configured_websocket_room_url(
     ]
     assert protocol_calls == [
         {
-            "url": "wss://configured-router/room-1-resolved",
+            "url": "wss://room-router.meshagent.dev/custom/room-endpoint",
+            "token": "jwt-token",
+        }
+    ]
+    assert isinstance(client, _FakeRoomClient)
+    assert client.enter_calls == 1
+
+
+@pytest.mark.asyncio
+async def test_with_client_allows_environment_room_url_override(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setenv("MESHAGENT_ROOM_URL", "wss://override.meshagent.test")
+    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})
+
+        def create_factory(self):
+            return lambda: self
+
+    class _FakeRoomClient:
+        def __init__(self, *, protocol_factory) -> None:
+            self.protocol = protocol_factory()
+            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):
+        return project_id
+
+    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: room)
+    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 protocol_calls == [
+        {
+            "url": "wss://override.meshagent.test/rooms/room-1",
             "token": "jwt-token",
         }
     ]

{meshagent_cli-0.45.7 → meshagent_cli-0.46.0}/meshagent/cli/image.py

@@ -15,14 +15,12 @@ from pathlib import Path, PurePosixPath
 from typing import Annotated, Literal, Optional, Protocol, TYPE_CHECKING
 from urllib.parse import urlparse
 
-from aiohttp import ClientTimeout
 import typer
 from pydantic import ValidationError
 from pydantic_yaml import parse_yaml_raw_as
 from rich import print
 import yaml
 
-from meshagent.api.http import new_client_session
 from meshagent.cli import async_typer
 from meshagent.cli.containers import (
     _drain_stream_plain,
@@ -70,6 +68,7 @@ from meshagent.api.room_server_client import (
     LogStream,
     PublishedBuildImage,
     RoomException,
+    ServicePortRuntimeState,
     ServiceRuntimeState,
 )
 from meshagent.api.room_ports import RESERVED_ROOM_SERVICE_PORTS
@@ -129,7 +128,6 @@ _CLIENT_CLOSE_TIMEOUT_SECONDS = 2.0
 _DEFAULT_CONTEXT_MOUNT_PATH = "/context"
 _DEFAULT_REPOSITORY_TOKEN_TTL_SECONDS = 3600
 _DEPLOY_CACHE_CLEANUP_TIMEOUT_SECONDS = 30.0
-_DEPLOY_LIVENESS_REQUEST_TIMEOUT_SECONDS = 2.0
 _DEPLOY_SERVICE_APPLY_TIMEOUT_SECONDS = 60.0
 _DEPLOY_SERVICE_RESTART_TIMEOUT_SECONDS = 60.0
 _DEPLOY_WAIT_TIMEOUT_SECONDS = 300.0
@@ -3216,37 +3214,6 @@ def _resolve_domain_liveness_path(
     return service_port.liveness
 
 
-def _build_domain_liveness_url(*, domain: str, liveness_path: str) -> str:
-    parsed = urlparse(domain if "://" in domain else f"https://{domain}")
-    scheme = parsed.scheme or "https"
-    netloc = parsed.netloc
-    base_path = parsed.path
-    if netloc == "":
-        netloc = parsed.path
-        base_path = ""
-    if base_path != "/" and base_path.endswith("/"):
-        base_path = base_path.rstrip("/")
-    return f"{scheme}://{netloc}{base_path}{liveness_path}"
-
-
-async def _probe_liveness_url(*, url: str) -> bool:
-    try:
-        async with new_client_session(
-            timeout=ClientTimeout(total=_DEPLOY_LIVENESS_REQUEST_TIMEOUT_SECONDS)
-        ) as session:
-            async with session.get(
-                url,
-                headers={
-                    "Accept": "*/*",
-                    "User-Agent": f"meshagent-cli/{__version__}",
-                },
-            ) as resp:
-                status_code = resp.status
-    except Exception:
-        return False
-    return 200 <= status_code < 400 or status_code in {401, 403}
-
-
 async def _find_room_service_by_name(
     *,
     account_client,
@@ -3580,10 +3547,23 @@ async def _get_service_runtime_state(
     client: RoomClient,
     service_id: str,
 ) -> ServiceRuntimeState | None:
-    service_list = await client.services.list_with_state()
+    service_list = await client.services.list()
     return service_list.service_states.get(service_id)
 
 
+def _find_service_liveness_port(
+    *,
+    state: ServiceRuntimeState,
+    liveness_path: str | None,
+) -> ServicePortRuntimeState | None:
+    if liveness_path is None:
+        return None
+    for port in state.status.ports:
+        if port.liveness == liveness_path:
+            return port
+    return None
+
+
 async def _drain_deploy_log_stream_tui(
     stream: LogStream,
     *,
@@ -3699,33 +3679,28 @@ async def _wait_for_deployed_service_live(
     log_handler: Callable[[str], Awaitable[None]] | None = None,
 ) -> None:
     active_logs: _ActiveDeployLogStream | None = None
-    liveness_url = (
-        _build_domain_liveness_url(domain=domain, liveness_path=liveness_path)
-        if domain is not None and liveness_path is not None
-        else None
-    )
 
     await _emit_deploy_status(
         status_handler,
         rich_message=f"[cyan]Waiting for service to go live:[/] {service_name} ({service_id})",
         plain_message=f"Waiting for service to go live: {service_name} ({service_id})",
     )
-    if domain is not None and liveness_url is not None:
+    if liveness_path is not None:
         await _emit_deploy_status(
             status_handler,
-            rich_message=f"[cyan]Waiting for liveness URL:[/] {liveness_url}",
-            plain_message=f"Waiting for liveness URL: {liveness_url}",
+            rich_message=f"[cyan]Waiting for service liveness:[/] {liveness_path}",
+            plain_message=f"Waiting for service liveness: {liveness_path}",
         )
     elif domain is not None:
         await _emit_deploy_status(
             status_handler,
             rich_message=(
                 f"[yellow]Route created for {domain}, but the service has no HTTP "
-                "liveness path to probe.[/]"
+                "liveness path to check.[/]"
             ),
             plain_message=(
                 f"Route created for {domain}, but the service has no HTTP "
-                "liveness path to probe."
+                "liveness path to check."
             ),
         )
 
@@ -3803,7 +3778,7 @@ async def _wait_for_deployed_service_live(
                 await asyncio.sleep(_DEPLOY_WAIT_POLL_INTERVAL_SECONDS)
                 continue
 
-            if liveness_url is None:
+            if liveness_path is None:
                 await _emit_deploy_status(
                     status_handler,
                     rich_message=f"[green]Service is live:[/] {service_name} ({service_id})",
@@ -3811,11 +3786,15 @@ async def _wait_for_deployed_service_live(
                 )
                 return
 
-            if await _probe_liveness_url(url=liveness_url):
+            liveness_port = _find_service_liveness_port(
+                state=state,
+                liveness_path=liveness_path,
+            )
+            if liveness_port is not None and liveness_port.liveness_status == "ready":
                 await _emit_deploy_status(
                     status_handler,
-                    rich_message=f"[green]Liveness URL responded:[/] {liveness_url}",
-                    plain_message=f"Liveness URL responded: {liveness_url}",
+                    rich_message=f"[green]Service liveness is ready:[/] {liveness_path}",
+                    plain_message=f"Service liveness is ready: {liveness_path}",
                 )
                 return
 

{meshagent_cli-0.45.7 → meshagent_cli-0.46.0}/meshagent/cli/image_test.py

@@ -38,6 +38,8 @@ from meshagent.cli import cli, image
 from meshagent.api.room_server_client import (
     PublishedBuildImage,
     RoomException,
+    ServicePortRuntimeState,
+    ServiceRuntimeStatus,
     ServiceRuntimeState,
 )
 from meshagent.api.specs.service import (
@@ -2274,7 +2276,7 @@ def test_parse_meshagent_token_scope_supports_presets_and_json() -> None:
     user_default = image._parse_meshagent_token_scope(value="userDefault")
     custom = image._parse_meshagent_token_scope(value='{"queues":{"send":["jobs"]}}')
 
-    assert user_default.secrets is not None
+    assert user_default.secrets is None
     assert user_default.admin is None
     assert custom.queues is not None
     assert custom.queues.send == ["jobs"]
@@ -2335,71 +2337,7 @@ async def test_validate_deploy_environment_secrets_requires_run_as() -> None:
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize("status_code", [200, 302, 401, 403])
-async def test_probe_liveness_url_accepts_reachable_statuses(
-    monkeypatch: pytest.MonkeyPatch,
-    status_code: int,
-) -> None:
-    class _FakeResponse:
-        status = status_code
-
-        async def __aenter__(self):
-            return self
-
-        async def __aexit__(self, exc_type, exc, tb) -> None:
-            del exc_type, exc, tb
-
-    class _FakeSession:
-        async def __aenter__(self):
-            return self
-
-        async def __aexit__(self, exc_type, exc, tb) -> None:
-            del exc_type, exc, tb
-
-        def get(self, *args, **kwargs):
-            del args, kwargs
-            return _FakeResponse()
-
-    monkeypatch.setattr(
-        image, "new_client_session", lambda *args, **kwargs: _FakeSession()
-    )
-
-    assert await image._probe_liveness_url(url="https://sheets.meshagent.dev/") is True
-
-
-@pytest.mark.asyncio
-async def test_probe_liveness_url_rejects_server_errors(
-    monkeypatch: pytest.MonkeyPatch,
-) -> None:
-    class _FakeResponse:
-        status = 502
-
-        async def __aenter__(self):
-            return self
-
-        async def __aexit__(self, exc_type, exc, tb) -> None:
-            del exc_type, exc, tb
-
-    class _FakeSession:
-        async def __aenter__(self):
-            return self
-
-        async def __aexit__(self, exc_type, exc, tb) -> None:
-            del exc_type, exc, tb
-
-        def get(self, *args, **kwargs):
-            del args, kwargs
-            return _FakeResponse()
-
-    monkeypatch.setattr(
-        image, "new_client_session", lambda *args, **kwargs: _FakeSession()
-    )
-
-    assert await image._probe_liveness_url(url="https://sheets.meshagent.dev/") is False
-
-
-@pytest.mark.asyncio
-async def test_wait_for_deployed_service_live_streams_logs_and_checks_liveness(
+async def test_wait_for_deployed_service_live_streams_logs_and_checks_service_liveness(
     monkeypatch: pytest.MonkeyPatch,
     _stub_deploy_wait: dict[str, object],
 ) -> None:
@@ -2407,7 +2345,6 @@ async def test_wait_for_deployed_service_live_streams_logs_and_checks_liveness(
         "prints": [],
         "started_logs": [],
         "stopped_logs": [],
-        "probe_urls": [],
     }
     states = [
         ServiceRuntimeState(service_id="service-1", state="starting"),
@@ -2420,11 +2357,29 @@ async def test_wait_for_deployed_service_live_streams_logs_and_checks_liveness(
             service_id="service-1",
             state="running",
             container_id="container-1",
+            status=ServiceRuntimeStatus(
+                ports=[
+                    ServicePortRuntimeState(
+                        num=8000,
+                        liveness="/ready",
+                        liveness_status="not_ready",
+                    )
+                ]
+            ),
         ),
         ServiceRuntimeState(
             service_id="service-1",
             state="running",
             container_id="container-1",
+            status=ServiceRuntimeStatus(
+                ports=[
+                    ServicePortRuntimeState(
+                        num=8000,
+                        liveness="/ready",
+                        liveness_status="ready",
+                    )
+                ]
+            ),
         ),
     ]
     fake_active_logs = SimpleNamespace(container_id="container-1")
@@ -2434,7 +2389,7 @@ async def test_wait_for_deployed_service_live_streams_logs_and_checks_liveness(
             self._runtime_states = runtime_states
             self._index = 0
 
-        async def list_with_state(self):
+        async def list(self):
             state = self._runtime_states[
                 min(self._index, len(self._runtime_states) - 1)
             ]
@@ -2454,19 +2409,12 @@ async def test_wait_for_deployed_service_live_streams_logs_and_checks_liveness(
     async def _fake_stop_deploy_log_stream(*, active_logs) -> None:
         captured["stopped_logs"].append(active_logs)
 
-    probe_results = iter([False, True])
-
-    async def _fake_probe_liveness_url(*, url: str) -> bool:
-        captured["probe_urls"].append(url)
-        return next(probe_results)
-
     monkeypatch.setattr(image.asyncio, "to_thread", _fake_to_thread)
     monkeypatch.setattr(image, "_DEPLOY_WAIT_POLL_INTERVAL_SECONDS", 0)
     monkeypatch.setattr(
         image, "_start_deploy_log_stream", _fake_start_deploy_log_stream
     )
     monkeypatch.setattr(image, "_stop_deploy_log_stream", _fake_stop_deploy_log_stream)
-    monkeypatch.setattr(image, "_probe_liveness_url", _fake_probe_liveness_url)
     monkeypatch.setattr(
         image,
         "print",
@@ -2487,11 +2435,7 @@ async def test_wait_for_deployed_service_live_streams_logs_and_checks_liveness(
 
     assert captured["started_logs"] == ["container-1"]
     assert captured["stopped_logs"] == [fake_active_logs]
-    assert captured["probe_urls"] == [
-        "https://app.meshagent.app/ready",
-        "https://app.meshagent.app/ready",
-    ]
-    assert any("Liveness URL responded" in message for message in captured["prints"])
+    assert any("Service liveness is ready" in message for message in captured["prints"])
 
 
 @pytest.mark.asyncio
@@ -2525,7 +2469,7 @@ async def test_wait_for_deployed_service_live_exits_when_container_restarts(
             self._runtime_states = runtime_states
             self._index = 0
 
-        async def list_with_state(self):
+        async def list(self):
             state = self._runtime_states[
                 min(self._index, len(self._runtime_states) - 1)
             ]
@@ -2832,7 +2776,7 @@ async def test_deploy_image_creates_room_service_with_mounts_env_secret_and_toke
         async def restart(self, *, service_id: str) -> None:
             captured["restarted_service_id"] = service_id
 
-        async def list_with_state(self):
+        async def list(self):
             return SimpleNamespace(
                 service_states={
                     "service-1": ServiceRuntimeState(
@@ -4944,7 +4888,7 @@ async def test_deploy_image_updates_existing_service_route_and_replaces_environm
         async def restart(self, *, service_id: str) -> None:
             captured["restarted_service_id"] = service_id
 
-        async def list_with_state(self):
+        async def list(self):
             return SimpleNamespace(
                 service_states={
                     "service-1": ServiceRuntimeState(
@@ -5048,7 +4992,7 @@ async def test_deploy_image_updates_existing_service_route_and_replaces_environm
     assert env_by_name["MESHAGENT_TOKEN"].token.role == "agent"
     assert env_by_name["MESHAGENT_TOKEN"].token.api is not None
     assert env_by_name["MESHAGENT_TOKEN"].token.api.admin is not None
-    assert env_by_name["MESHAGENT_TOKEN"].token.api.secrets is not None
+    assert env_by_name["MESHAGENT_TOKEN"].token.api.secrets is None
     assert env_by_name["MESHAGENT_TOKEN"].token.api.tunnels is not None
     for env_name in ("OPENAI_API_KEY", "ANTHROPIC_API_KEY"):
         assert env_by_name[env_name].token is not None
@@ -5098,7 +5042,7 @@ async def test_deploy_image_sets_cookie_validation_on_private_published_ports(
         async def restart(self, *, service_id: str) -> None:
             captured["restarted_service_id"] = service_id
 
-        async def list_with_state(self):
+        async def list(self):
             return SimpleNamespace(
                 service_states={
                     "service-1": ServiceRuntimeState(
@@ -5223,7 +5167,7 @@ async def test_deploy_image_preserves_existing_liveness_when_default_is_used(
         async def restart(self, *, service_id: str) -> None:
             captured["restarted_service_id"] = service_id
 
-        async def list_with_state(self):
+        async def list(self):
             return SimpleNamespace(
                 service_states={
                     "service-1": ServiceRuntimeState(
@@ -5325,7 +5269,7 @@ async def test_deploy_image_liveness_flag_overrides_http_ports_only(
         async def restart(self, *, service_id: str) -> None:
             captured["restarted_service_id"] = service_id
 
-        async def list_with_state(self):
+        async def list(self):
             return SimpleNamespace(
                 service_states={
                     "service-1": ServiceRuntimeState(
@@ -5417,7 +5361,7 @@ async def test_deploy_image_domain_requires_exactly_one_published_port(
     )
 
     class _FakeServices:
-        async def list_with_state(self):
+        async def list(self):
             return SimpleNamespace(
                 service_states={
                     "service-1": ServiceRuntimeState(

{meshagent_cli-0.45.7 → meshagent_cli-0.46.0}/meshagent/cli/room_services.py

@@ -9,7 +9,12 @@ from meshagent.cli.helper import (
 )
 from meshagent.api import RoomClient, WebSocketClientProtocol
 from meshagent.api.helpers import websocket_room_url
-from meshagent.api.room_server_client import ServicesClient, ListServicesResult
+from meshagent.api.room_server_client import (
+    ListServicesResult,
+    ServicePortRuntimeState,
+    ServiceRuntimeState,
+    ServicesClient,
+)
 from meshagent.api.specs.service import ServiceSpec
 from datetime import datetime
 from typing import Annotated, Any, Optional
@@ -25,6 +30,22 @@ def _format_unix_timestamp(value: float | None) -> str | None:
     return datetime.fromtimestamp(value).isoformat()
 
 
+def _format_port_status(port: ServicePortRuntimeState) -> str:
+    if port.liveness_status == "not_configured":
+        status = "no liveness"
+    elif port.liveness_status == "ready":
+        status = "ready"
+    else:
+        status = "not ready"
+    return f"{port.num}: {status}"
+
+
+def _format_service_ports(state: ServiceRuntimeState | None) -> str | None:
+    if state is None:
+        return None
+    return ", ".join(_format_port_status(port) for port in state.status.ports)
+
+
 async def _connect_services_client(
     *, project_id: str | None, room: str | None
 ) -> tuple[Any, RoomClient, ServicesClient]:
@@ -74,7 +95,7 @@ async def room_services_list_command(
     )
     try:
         print("[bold green]Fetching services...[/bold green]")
-        result: ListServicesResult = await services_client.list_with_state()
+        result: ListServicesResult = await services_client.list()
         services: list[ServiceSpec] = result.services
 
         rows = []
@@ -86,6 +107,7 @@ async def room_services_list_command(
                     "name": svc.metadata.name,
                     "image": svc.container.image if svc.container is not None else None,
                     "state": state.state if state is not None else None,
+                    "ports": _format_service_ports(state),
                     "container_id": state.container_id if state is not None else None,
                     "restart_scheduled_at": _format_unix_timestamp(
                         state.restart_scheduled_at if state is not None else None
@@ -121,6 +143,7 @@ async def room_services_list_command(
                 "name",
                 "image",
                 "state",
+                "ports",
                 "container_id",
                 "started_at",
                 "restart_scheduled_at",
@@ -157,7 +180,7 @@ async def room_services_describe_command(
         project_id=project_id, room=room
     )
     try:
-        result: ListServicesResult = await services_client.list_with_state()
+        result: ListServicesResult = await services_client.list()
         service = _find_service(
             services=result.services, service_id=service_id, name=name
         )
@@ -282,7 +305,7 @@ async def room_services_restart_command(
             ).create_factory()
         ) as client:
             services_client = ServicesClient(room=client)
-            result: ListServicesResult = await services_client.list_with_state()
+            result: ListServicesResult = await services_client.list()
             services: list[ServiceSpec] = result.services
 
             service: ServiceSpec | None = None