meshagent-cli 0.34.0__tar.gz → 0.35.3__tar.gz

{meshagent_cli-0.34.0 → meshagent_cli-0.35.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-cli
-Version: 0.34.0
+Version: 0.35.3
 Summary: CLI for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -19,21 +19,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.34.0; extra == "all"
-Requires-Dist: meshagent-api[all]~=0.34.0; extra == "all"
-Requires-Dist: meshagent-computers~=0.34.0; extra == "all"
-Requires-Dist: meshagent-openai~=0.34.0; extra == "all"
-Requires-Dist: meshagent-anthropic~=0.34.0; extra == "all"
-Requires-Dist: meshagent-codex~=0.34.0; extra == "all"
-Requires-Dist: meshagent-mcp~=0.34.0; extra == "all"
-Requires-Dist: meshagent-tools~=0.34.0; extra == "all"
+Requires-Dist: meshagent-agents[all]~=0.35.3; extra == "all"
+Requires-Dist: meshagent-api[all]~=0.35.3; extra == "all"
+Requires-Dist: meshagent-computers~=0.35.3; extra == "all"
+Requires-Dist: meshagent-openai~=0.35.3; extra == "all"
+Requires-Dist: meshagent-anthropic~=0.35.3; extra == "all"
+Requires-Dist: meshagent-codex~=0.35.3; extra == "all"
+Requires-Dist: meshagent-mcp~=0.35.3; extra == "all"
+Requires-Dist: meshagent-tools~=0.35.3; 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.34.0; extra == "mcp-service"
-Requires-Dist: meshagent-api~=0.34.0; extra == "mcp-service"
-Requires-Dist: meshagent-mcp~=0.34.0; extra == "mcp-service"
-Requires-Dist: meshagent-tools~=0.34.0; extra == "mcp-service"
+Requires-Dist: meshagent-agents[all]~=0.35.3; extra == "mcp-service"
+Requires-Dist: meshagent-api~=0.35.3; extra == "mcp-service"
+Requires-Dist: meshagent-mcp~=0.35.3; extra == "mcp-service"
+Requires-Dist: meshagent-tools~=0.35.3; extra == "mcp-service"
 Requires-Dist: supabase-auth~=2.28.0; extra == "mcp-service"
 
 # [Meshagent](https://www.meshagent.com)

{meshagent_cli-0.34.0 → meshagent_cli-0.35.3}/meshagent/cli/cli.py

@@ -29,6 +29,7 @@ from meshagent.cli import helpers
 from meshagent.cli import meeting_transcriber
 from meshagent.cli import rooms
 from meshagent.cli import room
+from meshagent.cli import image
 from meshagent.cli import port
 from meshagent.cli import webserver
 from meshagent.cli import codex
@@ -99,6 +100,7 @@ app.add_typer(task_runner.app, name="task-runner")
 app.add_typer(worker.app, name="worker")
 
 app.add_typer(room.app, name="room")
+app.add_typer(image.app, name="image")
 
 
 def _run_async(coro):

{meshagent_cli-0.34.0 → meshagent_cli-0.35.3}/meshagent/cli/containers.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 import asyncio
 import io
 import os
+import re
 import tarfile
 import time
 from pathlib import Path
@@ -45,6 +46,9 @@ import sys
 
 app = async_typer.AsyncTyper(help="Manage containers and images inside a room")
 _LOG_STREAM_SETTLE_TIMEOUT_SECONDS = 1.0
+_CRI_LOG_LINE_PATTERN = re.compile(
+    r"^(?P<timestamp>\S+)\s+(?P<stream>stdout|stderr)\s+(?P<flags>[FP])\s(?P<message>.*)$"
+)
 
 # -------------------------
 # Helpers
@@ -189,6 +193,24 @@ async def _stream_container_job_logs_and_wait_for_exit(
     return exit_code
 
 
+async def _stream_build_job_logs_and_wait_for_exit(
+    *,
+    client: RoomClient,
+    build_id: str,
+) -> int:
+    stream = client.containers.get_build_logs(build_id=build_id, follow=True)
+    try:
+        exit_code = await _drain_stream_plain(stream, show_progress=False)
+    except Exception:
+        await asyncio.gather(stream.cancel(), return_exceptions=True)
+        raise
+
+    if exit_code is None:
+        raise RuntimeError("build log stream closed before an exit code was returned")
+
+    return exit_code
+
+
 class DockerIgnore:
     def __init__(self, dockerignore_path: str):
         """
@@ -253,11 +275,27 @@ async def _make_targz_from_dir(path: Path) -> bytes:
 
 
 async def _drain_stream_plain(stream, *, show_progress: bool = True):
+    def _format_line(line: str) -> str:
+        has_newline = line.endswith("\n")
+        line_without_newline = line[:-1] if has_newline else line
+        match = _CRI_LOG_LINE_PATTERN.match(line_without_newline)
+        if match is None:
+            return line
+
+        message = match.group("message")
+        if has_newline:
+            return f"{message}\n"
+        return message
+
     async def _logs():
         async for line in stream.logs():
-            # Server emits plain lines; print as-is
             if line is not None:
-                sys.stdout.write(line if line.endswith("\n") else f"{line}\n")
+                formatted_line = _format_line(line)
+                sys.stdout.write(
+                    formatted_line
+                    if formatted_line.endswith("\n")
+                    else f"{formatted_line}\n"
+                )
                 sys.stdout.flush()
 
     async def _prog():
@@ -778,108 +816,6 @@ app.add_typer(images_app, name="image")
 app.add_typer(images_app, name="images", hidden=True)
 
 
-@images_app.async_command("build", help="Build a container image inside a room.")
-async def build_container(
-    *,
-    project_id: ProjectIdOption,
-    room: RoomOption,
-    tag: Annotated[
-        str, typer.Option(..., help="Image tag to build, e.g. repo/name:tag")
-    ],
-    context_path: Annotated[
-        str,
-        typer.Option(
-            ...,
-            "--context-path",
-            help="Build context path inside one of the mounted paths (absolute path)",
-        ),
-    ],
-    dockerfile_path: Annotated[
-        Optional[str],
-        typer.Option(
-            "--dockerfile-path",
-            help="Optional Dockerfile path inside one of the mounted paths (absolute path)",
-        ),
-    ] = None,
-    mount_room_path: Annotated[
-        List[str],
-        typer.Option(
-            "--mount-room-path",
-            help=(
-                "Room storage mount '<source>:<mount>[:ro|rw]'. "
-                "Example '/src:/workspace'"
-            ),
-        ),
-    ] = [],
-    mount_project_path: Annotated[
-        List[str],
-        typer.Option(
-            "--mount-project-path",
-            help=(
-                "Project storage mount '<source>:<mount>[:ro|rw]'. "
-                "Example '/shared:/project:ro'"
-            ),
-        ),
-    ] = [],
-    mount_image: Annotated[
-        List[str],
-        typer.Option(
-            "--mount-image",
-            help=(
-                "Image mount '<image>=<mount>[:ro|rw]'. "
-                "Example 'alpine:latest=/toolchain:ro'"
-            ),
-        ),
-    ] = [],
-    private: Annotated[
-        bool,
-        typer.Option(
-            "--private/--public",
-            help="Whether the build container is private to the participant",
-        ),
-    ] = False,
-    cred: Annotated[
-        List[str],
-        typer.Option(
-            "--cred",
-            help="Docker creds (username,password) or (registry,username,password)",
-        ),
-    ] = [],
-):
-    mount_spec = _parse_image_operation_mounts(
-        mount_room_path=mount_room_path,
-        mount_project_path=mount_project_path,
-        mount_image=mount_image,
-    )
-
-    if not context_path.startswith("/"):
-        raise typer.BadParameter("--context-path must be an absolute path")
-    if dockerfile_path is not None and not dockerfile_path.startswith("/"):
-        raise typer.BadParameter("--dockerfile-path must be an absolute path")
-
-    account_client, client = await _with_client(
-        project_id=project_id,
-        room=room,
-    )
-    try:
-        container_id = await client.containers.build(
-            tag=tag,
-            mounts=[mount_spec],
-            context_path=context_path,
-            dockerfile_path=dockerfile_path,
-            private=private,
-            credentials=_parse_creds(cred),
-        )
-        exit_code = await _stream_container_job_logs_and_wait_for_exit(
-            client=client, container_id=container_id
-        )
-        if exit_code != 0:
-            raise typer.Exit(code=exit_code)
-    finally:
-        await client.__aexit__(None, None, None)
-        await account_client.close()
-
-
 @images_app.async_command("list", help="List container images available in a room.")
 async def images_list(
     *,

{meshagent_cli-0.34.0 → meshagent_cli-0.35.3}/meshagent/cli/containers_test.py

@@ -56,6 +56,21 @@ class _FakeBuildStream:
         return _done().__await__()
 
 
+class _FakeBuildContainers:
+    def __init__(self, *, stream: _FakeBuildStream) -> None:
+        self._stream = stream
+        self.build_log_calls: list[tuple[str, bool]] = []
+
+    def get_build_logs(self, *, build_id: str, follow: bool = True) -> _FakeBuildStream:
+        self.build_log_calls.append((build_id, follow))
+        return self._stream
+
+
+class _FakeBuildClient:
+    def __init__(self, *, stream: _FakeBuildStream) -> None:
+        self.containers = _FakeBuildContainers(stream=stream)
+
+
 @pytest.mark.asyncio
 async def test_stream_container_job_logs_and_wait_for_exit_cancels_follow_stream(
     monkeypatch: pytest.MonkeyPatch,
@@ -123,3 +138,43 @@ async def test_drain_stream_plain_does_not_double_space_newline_terminated_logs(
 
     assert result == "image-1"
     assert capsys.readouterr().out == "step 1\nstep 2\n"
+
+
+@pytest.mark.asyncio
+async def test_drain_stream_plain_strips_cri_log_prefixes(
+    capsys: pytest.CaptureFixture[str],
+) -> None:
+    stream = _FakeBuildStream(
+        lines=[
+            "2026-03-30T04:21:56.562896627Z stderr F step 1\n",
+            "2026-03-30T04:21:57.000000000Z stdout F step 2\n",
+        ]
+    )
+
+    result = await containers._drain_stream_plain(stream, show_progress=False)
+
+    assert result == "image-1"
+    assert capsys.readouterr().out == "step 1\nstep 2\n"
+
+
+@pytest.mark.asyncio
+async def test_stream_build_job_logs_and_wait_for_exit_uses_build_log_stream(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    stream = _FakeBuildStream(lines=["line 1\n"], result=0)
+    client = _FakeBuildClient(stream=stream)
+
+    async def _fake_drain(log_stream, *, show_progress: bool):
+        assert log_stream is stream
+        assert show_progress is False
+        return await log_stream
+
+    monkeypatch.setattr(containers, "_drain_stream_plain", _fake_drain)
+
+    exit_code = await containers._stream_build_job_logs_and_wait_for_exit(
+        client=client,
+        build_id="build-1",
+    )
+
+    assert exit_code == 0
+    assert client.containers.build_log_calls == [("build-1", True)]