meshagent-cli 0.46.4__tar.gz → 0.47.1__tar.gz

{meshagent_cli-0.46.4 → meshagent_cli-0.47.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-cli
-Version: 0.46.4
+Version: 0.47.1
 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.46.4
-Requires-Dist: meshagent-codex==0.46.4
+Requires-Dist: meshagent-llm-proxy==0.47.1
+Requires-Dist: meshagent-codex==0.47.1
 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.46.4; extra == "all"
-Requires-Dist: meshagent-api[all]==0.46.4; extra == "all"
-Requires-Dist: meshagent-commoncrawl==0.46.4; extra == "all"
-Requires-Dist: meshagent-scrapy==0.46.4; extra == "all"
-Requires-Dist: meshagent-computers==0.46.4; extra == "all"
-Requires-Dist: meshagent-openai==0.46.4; extra == "all"
-Requires-Dist: meshagent-anthropic==0.46.4; extra == "all"
-Requires-Dist: meshagent-otel==0.46.4; extra == "all"
-Requires-Dist: meshagent-mcp==0.46.4; extra == "all"
-Requires-Dist: meshagent-tools==0.46.4; extra == "all"
+Requires-Dist: meshagent-agents[all]==0.47.1; extra == "all"
+Requires-Dist: meshagent-api[all]==0.47.1; extra == "all"
+Requires-Dist: meshagent-commoncrawl==0.47.1; extra == "all"
+Requires-Dist: meshagent-scrapy==0.47.1; extra == "all"
+Requires-Dist: meshagent-computers==0.47.1; extra == "all"
+Requires-Dist: meshagent-openai==0.47.1; extra == "all"
+Requires-Dist: meshagent-anthropic==0.47.1; extra == "all"
+Requires-Dist: meshagent-otel==0.47.1; extra == "all"
+Requires-Dist: meshagent-mcp==0.47.1; extra == "all"
+Requires-Dist: meshagent-tools==0.47.1; 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.46.4; extra == "mcp-service"
-Requires-Dist: meshagent-api==0.46.4; extra == "mcp-service"
-Requires-Dist: meshagent-mcp==0.46.4; extra == "mcp-service"
-Requires-Dist: meshagent-tools==0.46.4; extra == "mcp-service"
+Requires-Dist: meshagent-agents[all]==0.47.1; extra == "mcp-service"
+Requires-Dist: meshagent-api==0.47.1; extra == "mcp-service"
+Requires-Dist: meshagent-mcp==0.47.1; extra == "mcp-service"
+Requires-Dist: meshagent-tools==0.47.1; extra == "mcp-service"
 Requires-Dist: supabase-auth~=2.28.0; extra == "mcp-service"
 Dynamic: license-file
 

{meshagent_cli-0.46.4 → meshagent_cli-0.47.1}/meshagent/cli/agent_package_cli.py

@@ -9,51 +9,19 @@ from rich.text import Text
 from typing import Annotated
 
 from meshagent.agents import Package, deploy_package, run_package
-import meshagent.agents.package as package_module
+from meshagent.agents.package import load_package
 from meshagent.api import RoomClient, WebSocketClientProtocol
 from meshagent.cli import async_typer
 from meshagent.cli.common_options import ProjectIdOption, RoomOption
 from meshagent.cli.containers import _stream_container_job_logs_and_wait_for_exit
 from meshagent.cli.helper import get_client, resolve_project_id, resolve_room
-from meshagent.cli.multi import import_from_path
 
 
 app = async_typer.AsyncTyper(help="Build, run, and deploy packaged services.")
 
 
 def _load_package(*, module_path: str, export_name: str) -> Package:
-    resolved_module_path = Path(module_path).expanduser().resolve()
-    with package_module._agent_base_path_scope(resolved_module_path.parent):
-        module = import_from_path(str(resolved_module_path))
-
-        if export_name not in module.__dict__:
-            raise ImportError(f"{resolved_module_path} does not define {export_name}")
-
-        exported = module.__dict__[export_name]
-        if isinstance(exported, Package):
-            exported._bind_module_path(module_path=resolved_module_path)
-            exported._bind_module_export(
-                export_name=export_name,
-                export_is_factory=False,
-            )
-            return exported
-
-        if callable(exported):
-            built = exported()
-            if isinstance(built, Package):
-                built._bind_module_path(module_path=resolved_module_path)
-                built._bind_module_export(
-                    export_name=export_name,
-                    export_is_factory=True,
-                )
-                return built
-            raise TypeError(
-                f"{resolved_module_path}:{export_name} returned {type(built).__name__}, expected meshagent.agents.Package"
-            )
-
-        raise TypeError(
-            f"{resolved_module_path}:{export_name} is {type(exported).__name__}, expected meshagent.agents.Package or a zero-argument callable returning one"
-        )
+    return load_package(module_path=module_path, export_name=export_name)
 
 
 def _print_packaged_files(*, package: Package) -> None:

{meshagent_cli-0.46.4 → meshagent_cli-0.47.1}/meshagent/cli/agent_package_cli_test.py

@@ -184,8 +184,8 @@ async def test_package_run_command_invokes_package_run_and_tails_logs(
             captured["delete"] = container_id
 
     class _FakeRoomClient:
-        def __init__(self, *, protocol) -> None:
-            del protocol
+        def __init__(self, *, protocol_factory) -> None:
+            del protocol_factory
             self.containers = _FakeContainers()
 
         async def __aenter__(self):
@@ -293,8 +293,8 @@ async def test_package_run_command_deletes_container_on_interrupt(
             captured["delete"] = container_id
 
     class _FakeRoomClient:
-        def __init__(self, *, protocol) -> None:
-            del protocol
+        def __init__(self, *, protocol_factory) -> None:
+            del protocol_factory
             self.containers = _FakeContainers()
 
         async def __aenter__(self):

{meshagent_cli-0.46.4 → meshagent_cli-0.47.1}/meshagent/cli/agents.py

@@ -6,6 +6,7 @@ import typer
 from rich import print
 
 from meshagent.api import RoomException
+from meshagent.api.client import ManagedAgent
 from meshagent.api.managed_agents import ManagedAgentSpec
 from meshagent.agents.chat_client import ChatThreadSession, WebSocketChatClient
 from meshagent.agents.messages import (
@@ -24,6 +25,35 @@ app = async_typer.AsyncTyper(
 )
 
 
+async def _list_agents(
+    account_client,
+    *,
+    project_id: str,
+    count: int,
+    offset: int,
+    filter: str | None,
+) -> list[ManagedAgent]:
+    agents: list[ManagedAgent] = []
+    continuation_token: str | None = None
+    # The "my" view is paged in access-object order, so exhaust it before applying
+    # the CLI's global name ordering and offset.
+    while True:
+        page = await account_client.list_agents_page(
+            project_id=project_id,
+            page_size=100,
+            continuation_token=continuation_token,
+            filter=filter,
+            view="my",
+        )
+        agents.extend(page.agents)
+        continuation_token = page.continuation_token
+        if continuation_token is None or not page.agents:
+            break
+
+    agents.sort(key=lambda agent: agent.name.lower())
+    return agents[offset : offset + count]
+
+
 def _maybe_parse_json_object(label: str, value: Optional[str]) -> Optional[dict]:
     if value is None:
         return None
@@ -597,19 +627,27 @@ async def agent_list_command(
     ] = None,
     offset: Annotated[int, typer.Option(help="Offset for pagination", min=0)] = 0,
     order_by: Annotated[
-        str, typer.Option(help='Order by column (e.g. "agent_name", "created_at")')
+        str, typer.Option(help='Order agents by name; only "agent_name" is supported')
     ] = "agent_name",
     filter: Annotated[
         Optional[str],
         typer.Option("--filter", help="Lowercase contains filter for agent names"),
     ] = None,
 ):
+    if order_by != "agent_name":
+        raise typer.BadParameter(
+            'Only "agent_name" is supported.', param_hint="--order-by"
+        )
+
     account_client = await get_client()
     try:
         project_id = await resolve_project_id(project_id=project_id)
-        agents = await account_client.list_agents(
+        agent_count = limit if limit is not None else count
+        agents = await _list_agents(
+            account_client,
             project_id=project_id,
-            page_size=limit if limit is not None else count,
+            count=agent_count,
+            offset=offset,
             filter=filter,
         )
         output = [

{meshagent_cli-0.46.4 → meshagent_cli-0.47.1}/meshagent/cli/agents_test.py

@@ -1,6 +1,7 @@
 import json
 
 import pytest
+import typer
 
 from meshagent.agents.chat_client import BaseChatClient, ChatThreadSession
 from meshagent.agents.messages import (
@@ -10,7 +11,7 @@ from meshagent.agents.messages import (
     AgentTextContent,
     StartThread,
 )
-from meshagent.api.client import ManagedAgent
+from meshagent.api.client import AgentsPage, ManagedAgent
 from meshagent.api.managed_agents import (
     AllowedOpenAIModel,
     ManagedAgentMetadata,
@@ -25,6 +26,7 @@ class _FakeAgentClient:
         self.create_agent_calls: list[dict[str, object]] = []
         self.update_agent_calls: list[dict[str, object]] = []
         self.list_agents_calls: list[dict[str, object]] = []
+        self.list_agents_page_results: list[AgentsPage] = []
         self.get_agent_calls: list[dict[str, object]] = []
         self.list_agents_result: list[ManagedAgent] = []
         self.get_agent_result: ManagedAgent | None = None
@@ -60,21 +62,27 @@ class _FakeAgentClient:
             }
         )
 
-    async def list_agents(
+    async def list_agents_page(
         self,
         *,
         project_id: str,
         page_size: int,
+        continuation_token: str | None = None,
         filter: str | None = None,
-    ) -> list[ManagedAgent]:
+        view: str | None = None,
+    ) -> AgentsPage:
         self.list_agents_calls.append(
             {
                 "project_id": project_id,
                 "page_size": page_size,
+                "continuation_token": continuation_token,
                 "filter": filter,
+                "view": view,
             }
         )
-        return self.list_agents_result
+        if self.list_agents_page_results:
+            return self.list_agents_page_results.pop(0)
+        return AgentsPage(agents=self.list_agents_result, continuation_token=None)
 
     async def get_agent(self, *, project_id: str, name: str) -> ManagedAgent:
         self.get_agent_calls.append({"project_id": project_id, "name": name})
@@ -112,10 +120,12 @@ class _FakeWebSocketChatClient(BaseChatClient):
             )
 
 
-def _sample_configuration(*, agent_id: str | None = "agent-1") -> ManagedAgentSpec:
+def _sample_configuration(
+    *, agent_id: str | None = "agent-1", name: str = "planner"
+) -> ManagedAgentSpec:
     return ManagedAgentSpec(
         id=agent_id,
-        metadata=ManagedAgentMetadata(name="planner"),
+        metadata=ManagedAgentMetadata(name=name),
         allowed_models=[AllowedOpenAIModel(model="gpt-4.1")],
     )
 
@@ -123,8 +133,10 @@ def _sample_configuration(*, agent_id: str | None = "agent-1") -> ManagedAgentSp
 def _sample_agent(
     *,
     configuration: ManagedAgentSpec | None = None,
+    agent_id: str = "agent-1",
+    name: str = "planner",
 ) -> ManagedAgent:
-    configuration = configuration or _sample_configuration()
+    configuration = configuration or _sample_configuration(agent_id=agent_id, name=name)
     return ManagedAgent(
         id=configuration.id or "agent-1",
         name=configuration.name,
@@ -269,7 +281,9 @@ async def test_agent_list_command_outputs_current_agent_shape(
         {
             "project_id": "resolved-project",
             "page_size": 100,
+            "continuation_token": None,
             "filter": None,
+            "view": "my",
         }
     ]
     assert printed == [
@@ -287,6 +301,71 @@ async def test_agent_list_command_outputs_current_agent_shape(
     assert client.closed is True
 
 
+@pytest.mark.asyncio
+async def test_agent_list_command_fetches_all_before_name_sort_and_offset(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    client = _FakeAgentClient()
+    client.list_agents_page_results = [
+        AgentsPage(
+            agents=[
+                _sample_agent(agent_id=f"agent-{index}", name=f"agent-{index:03}")
+                for index in range(60, 160)
+            ],
+            continuation_token="cursor-1",
+        ),
+        AgentsPage(
+            agents=[
+                _sample_agent(agent_id=f"agent-{index}", name=f"agent-{index:03}")
+                for index in range(60)
+            ],
+            continuation_token=None,
+        ),
+    ]
+    printed: list[str] = []
+    _patch_agent_command(monkeypatch, client=client)
+    monkeypatch.setattr(agents, "print", lambda value: printed.append(value))
+
+    await agents.agent_list_command(
+        project_id="project-1",
+        count=150,
+        offset=10,
+        filter="planner",
+        o="json",
+    )
+
+    assert client.list_agents_calls == [
+        {
+            "project_id": "resolved-project",
+            "page_size": 100,
+            "continuation_token": None,
+            "filter": "planner",
+            "view": "my",
+        },
+        {
+            "project_id": "resolved-project",
+            "page_size": 100,
+            "continuation_token": "cursor-1",
+            "filter": "planner",
+            "view": "my",
+        },
+    ]
+    output = json.loads(printed[0])
+    assert len(output) == 150
+    assert output[0]["name"] == "agent-010"
+    assert output[-1]["name"] == "agent-159"
+    assert client.closed is True
+
+
+@pytest.mark.asyncio
+async def test_agent_list_rejects_unsupported_order() -> None:
+    with pytest.raises(typer.BadParameter, match='Only "agent_name" is supported'):
+        await agents.agent_list_command(
+            project_id="project-1",
+            order_by="created_at",
+        )
+
+
 @pytest.mark.asyncio
 async def test_agent_use_session_starts_thread_without_stopping_websocket_client() -> (
     None

{meshagent_cli-0.46.4 → meshagent_cli-0.47.1}/meshagent/cli/ask.py

@@ -137,6 +137,7 @@ from meshagent.agents.process import (
     TurnInstructionsProvider,
 )
 from meshagent.api import Participant, RoomException
+from meshagent.api.messaging import Content
 from meshagent.cli import async_typer, auth_async
 from meshagent.cli._filedrop import (
     dropped_file_paths_from_text,
@@ -348,6 +349,7 @@ def _format_ask_tool_call_entry_text(
     toolkit: str,
     tool: str,
     arguments: dict[str, Any] | None,
+    result: Content | dict[str, object] | None = None,
     logs: list[str],
     error_message: str | None,
     completed: bool = True,
@@ -357,6 +359,7 @@ def _format_ask_tool_call_entry_text(
         toolkit=toolkit,
         tool=tool,
         arguments=arguments,
+        result=result,
         failed=failed,
         completed=completed,
     )
@@ -539,6 +542,21 @@ async def _send_chat_thread_prompt(
     await session.start_thread(text=prompt, attachments=file_attachments)
 
 
+async def _run_ask_chat_thread_prompt(
+    *,
+    session: ChatThreadSession,
+    prompt: str,
+    attachments: Sequence[_AskInputAttachment],
+    on_message: Callable[[AgentMessage], Awaitable[None] | None],
+) -> None:
+    """Run a TUI turn while forwarding each event exactly as it arrives."""
+    await session.ask(
+        prompt=prompt,
+        attachments=attachments,
+        on_message=on_message,
+    )
+
+
 class _AgentMessageChannelClient(Protocol):
     @property
     def has_thread_path(self) -> bool: ...
@@ -3866,10 +3884,11 @@ async def _run_ask_tui(
             prompt: str,
             attachments: Sequence[_AskInputAttachment] = (),
         ) -> None:
-            await _send_chat_thread_prompt(
+            await _run_ask_chat_thread_prompt(
                 session=session,
                 prompt=prompt,
                 attachments=attachments,
+                on_message=self._handle_agent_message,
             )
 
         async def _finalize_active_assistant(self) -> None:
@@ -4685,6 +4704,7 @@ async def _run_ask_tui(
                 toolkit=toolkit,
                 tool=tool,
                 arguments=arguments,
+                result=message.result,
                 logs=logs,
                 error_message=error_message,
             )

{meshagent_cli-0.46.4 → meshagent_cli-0.47.1}/meshagent/cli/ask_test.py

@@ -173,6 +173,122 @@ class _FakeTTY:
         return self._is_tty
 
 
+@pytest.mark.asyncio
+async def test_run_ask_chat_thread_prompt_forwards_streamed_deltas_once() -> None:
+    delivered: list[object] = []
+    rendered_text = ""
+    render_snapshots: list[str] = []
+
+    class _StreamingSession:
+        async def ask(self, *, prompt, attachments, on_message):
+            assert prompt == "stream this"
+            assert attachments == ()
+            messages = (
+                AgentTextContentStarted(
+                    type=AGENT_EVENT_TEXT_CONTENT_STARTED,
+                    thread_id="/threads/process-run",
+                    turn_id="turn-1",
+                    item_id="item-1",
+                ),
+                AgentTextContentDelta(
+                    type=AGENT_EVENT_TEXT_CONTENT_DELTA,
+                    thread_id="/threads/process-run",
+                    turn_id="turn-1",
+                    item_id="item-1",
+                    text="Hello ",
+                ),
+                AgentTextContentDelta(
+                    type=AGENT_EVENT_TEXT_CONTENT_DELTA,
+                    thread_id="/threads/process-run",
+                    turn_id="turn-1",
+                    item_id="item-1",
+                    text="world",
+                ),
+                AgentTextContentEnded(
+                    type=AGENT_EVENT_TEXT_CONTENT_ENDED,
+                    thread_id="/threads/process-run",
+                    turn_id="turn-1",
+                    item_id="item-1",
+                ),
+            )
+            for message in messages:
+                await ask_module._maybe_await(on_message(message))
+            # The aggregate return value must not be rendered after the deltas.
+            return "Hello world"
+
+    async def _render(message) -> None:
+        nonlocal rendered_text
+        delivered.append(message)
+        if isinstance(message, AgentTextContentDelta):
+            rendered_text += message.text
+            render_snapshots.append(rendered_text)
+
+    await ask_module._run_ask_chat_thread_prompt(
+        session=_StreamingSession(),
+        prompt="stream this",
+        attachments=(),
+        on_message=_render,
+    )
+
+    assert render_snapshots == ["Hello ", "Hello world"]
+    assert rendered_text == "Hello world"
+    assert [type(message) for message in delivered] == [
+        AgentTextContentStarted,
+        AgentTextContentDelta,
+        AgentTextContentDelta,
+        AgentTextContentEnded,
+    ]
+
+
+@pytest.mark.asyncio
+async def test_run_ask_chat_thread_prompt_preserves_sequential_turn_context() -> None:
+    completed_prompts: list[str] = []
+    request_contexts: list[tuple[str, ...]] = []
+
+    class _ContextualSession:
+        async def ask(self, *, prompt, attachments, on_message):
+            assert attachments == ()
+            request_contexts.append((*completed_prompts, prompt))
+            item_id = f"item-{len(request_contexts)}"
+            await ask_module._maybe_await(
+                on_message(
+                    AgentTextContentDelta(
+                        type=AGENT_EVENT_TEXT_CONTENT_DELTA,
+                        thread_id="/threads/process-run",
+                        turn_id=f"turn-{len(request_contexts)}",
+                        item_id=item_id,
+                        text=f"response to {prompt}",
+                    )
+                )
+            )
+            completed_prompts.extend((prompt, f"response to {prompt}"))
+            return f"response to {prompt}"
+
+    session = _ContextualSession()
+    delivered: list[AgentTextContentDelta] = []
+    await ask_module._run_ask_chat_thread_prompt(
+        session=session,
+        prompt="first prompt",
+        attachments=(),
+        on_message=delivered.append,
+    )
+    await ask_module._run_ask_chat_thread_prompt(
+        session=session,
+        prompt="second prompt",
+        attachments=(),
+        on_message=delivered.append,
+    )
+
+    assert request_contexts == [
+        ("first prompt",),
+        ("first prompt", "response to first prompt", "second prompt"),
+    ]
+    assert [message.text for message in delivered] == [
+        "response to first prompt",
+        "response to second prompt",
+    ]
+
+
 async def _local_chat_session(
     send_message,
 ) -> tuple[ask_module.LocalChatClient, ask_module._AgentMessageSession]:

{meshagent_cli-0.46.4 → meshagent_cli-0.47.1}/meshagent/cli/cli.py

@@ -376,5 +376,12 @@ SHELL_RENDERERS = {
 }
 
 
+def main() -> None:
+    from meshagent.agents.channel_process import dispatch_main
+
+    if not dispatch_main(executable_name=Path(sys.argv[0]).name, argv=sys.argv[1:]):
+        raise SystemExit(app())
+
+
 if __name__ == "__main__":
-    app()
+    main()

{meshagent_cli-0.46.4 → meshagent_cli-0.47.1}/meshagent/cli/cli_test.py

@@ -5,6 +5,7 @@ import types
 import pytest
 
 from meshagent.api import RoomException
+from meshagent.agents import channel_process
 from meshagent.cli import async_typer
 from meshagent.cli import cli
 from meshagent.cli.testing import CliRunner
@@ -132,6 +133,17 @@ def test_app_prints_room_exception_without_traceback(capsys) -> None:
     assert captured.out == ""
 
 
+def test_main_exits_with_status_returned_by_async_typer(monkeypatch) -> None:
+    monkeypatch.setattr(channel_process, "dispatch_main", lambda **kwargs: False)
+    monkeypatch.setattr(cli, "app", lambda: 23)
+    monkeypatch.setattr(sys, "argv", ["meshagent", "build"])
+
+    with pytest.raises(SystemExit) as exc_info:
+        cli.main()
+
+    assert exc_info.value.code == 23
+
+
 def test_room_help_lists_agents_command() -> None:
     result = CliRunner().invoke(cli.app, ["room", "--help"])