meshagent-cli 0.41.4__tar.gz → 0.41.6__tar.gz

{meshagent_cli-0.41.4 → meshagent_cli-0.41.6}/PKG-INFO

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

{meshagent_cli-0.41.4 → meshagent_cli-0.41.6}/meshagent/cli/ask.py

@@ -14,6 +14,7 @@ import time
 import uuid
 from collections.abc import Awaitable, Callable, Sequence
 from dataclasses import dataclass
+from importlib import resources
 from typing import Annotated, Any, Literal, Protocol, runtime_checkable
 
 import click
@@ -131,6 +132,7 @@ from meshagent.agents.process import (
 from meshagent.api import Participant, RoomException
 from meshagent.cli import async_typer, auth_async
 from meshagent.cli.common_options import ProjectIdOption
+from meshagent.cli.create import CREATE_TEMPLATE_PACKAGE
 from meshagent.cli.helper import resolve_project_id
 from meshagent.cli.preamble_rules import DEFAULT_PREAMBLE_RULE
 from meshagent.cli.tool_call_summary import format_tool_call_summary
@@ -419,6 +421,9 @@ class _AskExternalThreadState(Protocol):
     @property
     def thread_status_text(self) -> str | None: ...
 
+    @property
+    def thread_status(self) -> AgentThreadStatus | None: ...
+
     @property
     def queued_message_labels(self) -> tuple[str, ...]: ...
 
@@ -471,6 +476,9 @@ class _AgentMessageChannelClient(Protocol):
     @property
     def thread_status_text(self) -> str | None: ...
 
+    @property
+    def thread_status(self) -> AgentThreadStatus | None: ...
+
     @property
     def queued_message_labels(self) -> tuple[str, ...]: ...
 
@@ -509,6 +517,44 @@ def _thread_status_text(status: object) -> str | None:
     return normalized
 
 
+def _format_grouped_status_digits(value: int) -> str:
+    text = str(value)
+    parts: list[str] = []
+    for index, char in enumerate(text):
+        if index > 0 and (len(text) - index) % 3 == 0:
+            parts.append(",")
+        parts.append(char)
+    return "".join(parts)
+
+
+def _format_agent_thread_status_text(message: AgentThreadStatus) -> str | None:
+    text = _thread_status_text(message.status)
+    if text is None:
+        return None
+    if message.lines_added is not None or message.lines_removed is not None:
+        parts = [text]
+        if message.lines_added is not None:
+            parts.append(f"+{_format_grouped_status_digits(message.lines_added)}")
+        if message.lines_removed is not None:
+            parts.append(f"-{_format_grouped_status_digits(message.lines_removed)}")
+        return " ".join(parts)
+    if message.total_bytes is not None and message.total_bytes > 100:
+        return f"{text} {_format_grouped_status_digits(message.total_bytes)} bytes"
+    return text
+
+
+def _ask_thread_status_feed_text(status: object) -> str | None:
+    if isinstance(status, AgentThreadStatus):
+        text = _format_agent_thread_status_text(status)
+        if text is None:
+            return None
+        return f"• {text}"
+    text = _thread_status_text(status)
+    if text is None:
+        return None
+    return f"• {text}"
+
+
 def _agent_message_content_text(
     content: list[AgentTextContent | AgentFileContent],
 ) -> str:
@@ -645,7 +691,7 @@ def _image_dataset_client_from_agent_client(
     chat_client = client.client
     if not isinstance(chat_client, MessagingChatClient):
         return None
-    return ImageDatasetClient(chat_client.room)
+    return ImageDatasetClient(chat_client.room.datasets)
 
 
 def _role_for_sender(
@@ -995,6 +1041,10 @@ class _AgentMessageSession:
             return self._thread_status_text
         return self._client.thread_status_text
 
+    @property
+    def thread_status(self) -> AgentThreadStatus | None:
+        return self._client.thread_status
+
     @property
     def queued_message_labels(self) -> tuple[str, ...]:
         return self._client.queued_message_labels
@@ -1378,10 +1428,14 @@ class _AskSession:
         resolved_current_working_directory = os.path.abspath(
             current_working_directory or os.getcwd()
         )
+        self._resource_stack = contextlib.ExitStack()
+        create_samples_path = _enter_create_samples_path(self._resource_stack)
+        self._create_samples_path = create_samples_path
         self._current_working_directory = resolved_current_working_directory
         self._toolkits = _build_ask_toolkits(
             model=model,
             current_working_directory=resolved_current_working_directory,
+            create_samples_path=create_samples_path,
         )
         self._status_adapter = _StatusAwareLLMAdapter(delegate=llm_adapter)
         self._process = LLMAgentProcess(
@@ -1391,6 +1445,7 @@ class _AskSession:
             toolkits=self._toolkits,
             turn_instructions_provider=_build_ask_turn_instructions_provider(
                 current_working_directory=resolved_current_working_directory,
+                create_samples_path=create_samples_path,
                 interactive=interactive,
                 preamble_rule=preamble_rule,
             ),
@@ -1411,10 +1466,18 @@ class _AskSession:
     def current_working_directory(self) -> str:
         return self._current_working_directory
 
+    @property
+    def create_samples_path(self) -> str:
+        return self._create_samples_path
+
     @property
     def thread_status_text(self) -> str | None:
         return self._session.thread_status_text
 
+    @property
+    def thread_status(self) -> AgentThreadStatus | None:
+        return self._session.thread_status
+
     @property
     def queued_message_labels(self) -> tuple[str, ...]:
         return self._session.queued_message_labels
@@ -1437,10 +1500,13 @@ class _AskSession:
         await self._supervisor.start()
 
     async def stop(self) -> None:
-        self._status_adapter.set_status_callback(None)
-        await self._session.close(close_client=False)
-        await self._channel_client.close()
-        await self._supervisor.stop()
+        try:
+            self._status_adapter.set_status_callback(None)
+            await self._session.close(close_client=False)
+            await self._channel_client.close()
+            await self._supervisor.stop()
+        finally:
+            self._resource_stack.close()
 
     def _handle_adapter_status(self, status: str) -> None:
         self._session.add_agent_message(
@@ -1566,10 +1632,19 @@ async def _resolve_ask_access_token() -> str | None:
     return normalized_access_token
 
 
+def _enter_create_samples_path(resource_stack: contextlib.ExitStack) -> str:
+    create_samples_resource = resources.files(CREATE_TEMPLATE_PACKAGE)
+    create_samples_path = resource_stack.enter_context(
+        resources.as_file(create_samples_resource)
+    )
+    return os.path.abspath(os.fspath(create_samples_path))
+
+
 def _build_ask_toolkits(
     *,
     model: str,
     current_working_directory: str,
+    create_samples_path: str | None = None,
 ) -> list[Toolkit]:
     from meshagent.anthropic.web_fetch import WebFetchTool as AnthropicWebFetchTool
     from meshagent.anthropic.web_search import (
@@ -1578,13 +1653,23 @@ def _build_ask_toolkits(
     from meshagent.openai.tools.responses_adapter import ApplyPatchTool, WebSearchTool
     from meshagent.tools.web_toolkit import WebFetchTool
 
-    storage_toolkit = StorageToolkit(
-        mounts=[
+    storage_mounts = [
+        StorageToolLocalMount(
+            path=current_working_directory,
+            local_path=current_working_directory,
+        )
+    ]
+    if create_samples_path is not None:
+        storage_mounts.append(
             StorageToolLocalMount(
-                path=current_working_directory,
-                local_path=current_working_directory,
+                path=create_samples_path,
+                local_path=create_samples_path,
+                read_only=True,
             )
-        ]
+        )
+
+    storage_toolkit = StorageToolkit(
+        mounts=storage_mounts,
     )
     toolkits: list[Toolkit] = [storage_toolkit]
 
@@ -1604,6 +1689,7 @@ def _build_ask_toolkits(
 def _build_ask_instructions(
     *,
     current_working_directory: str,
+    create_samples_path: str | None = None,
     interactive: bool = True,
     preamble_rule: bool = True,
 ) -> str:
@@ -1622,7 +1708,16 @@ def _build_ask_instructions(
         ),
         (
             "You can also use the meshagent cli to perform tasks. You can get "
-            "help for the sdk and its subcommands with the --help flag."
+            "help for the sdk and its subcommands with the --help flag. "
+            "meshagent create has an interactive mode, and users generally "
+            "want that mode when creating sample projects unless they ask for "
+            "a fully scripted flow."
+        ),
+        (
+            "When discussing deployment, assume the user wants to deploy with "
+            "meshagent and its built-in deployment flow. Do not recommend "
+            "third-party deployment services unless the user asks for them or "
+            "the project clearly requires one."
         ),
         (
             "The current working directory is "
@@ -1631,6 +1726,13 @@ def _build_ask_instructions(
             "so read and write files there using that exact path."
         ),
     ]
+    if create_samples_path is not None:
+        sections.append(
+            "The embedded meshagent create sample projects are mounted read-only "
+            f"at {create_samples_path}. Grep and read those examples when "
+            "answering questions about generated project structure, generated "
+            "files, or MeshAgent sample code."
+        )
     if not interactive:
         sections.append(
             "You are not being run interactively. Return useful and actionable "
@@ -1644,11 +1746,13 @@ def _build_ask_instructions(
 def _build_ask_turn_instructions_provider(
     *,
     current_working_directory: str,
+    create_samples_path: str | None = None,
     interactive: bool,
     preamble_rule: bool = True,
 ) -> TurnInstructionsProvider:
     instructions = _build_ask_instructions(
         current_working_directory=current_working_directory,
+        create_samples_path=create_samples_path,
         interactive=interactive,
         preamble_rule=preamble_rule,
     )
@@ -1682,15 +1786,20 @@ def _is_cancelled_turn_error(error: Exception) -> bool:
     return isinstance(error, RoomException) and error.code == "cancelled"
 
 
+_ASK_SUPPRESSED_LOGGER_NAMES = ("agent-process", "openai_agent")
+
+
 @contextlib.contextmanager
 def _suppress_ask_process_logs() -> Any:
-    logger = logging.getLogger("agent-process")
-    previous_disabled = logger.disabled
-    logger.disabled = True
+    loggers = [logging.getLogger(name) for name in _ASK_SUPPRESSED_LOGGER_NAMES]
+    previous_disabled = {logger: logger.disabled for logger in loggers}
+    for logger in loggers:
+        logger.disabled = True
     try:
         yield
     finally:
-        logger.disabled = previous_disabled
+        for logger, disabled in previous_disabled.items():
+            logger.disabled = disabled
 
 
 def _suppress_textual_debug_features() -> None:
@@ -2048,6 +2157,7 @@ async def _run_ask_tui(
             self._pending_session_image_message_ids: set[str] = set()
             self._external_thread_active = False
             self._active_assistant_entry: _AskFeedEntry | None = None
+            self._thread_status_entry_id = "__meshagent_ask_thread_status__"
             self._status_text: str | None = None
             self._usage_state: _AskUsageState | None = None
             self._reasoning_parts: dict[str, list[str]] = {}
@@ -2772,7 +2882,7 @@ async def _run_ask_tui(
                 return
             if isinstance(message, AgentThreadStatus):
                 self._sync_session_messages()
-                self._set_status_text(_thread_status_text(message.status))
+                self._set_thread_status_text(message)
                 return
             if isinstance(message, AgentTextContentStarted):
                 await self._prepare_active_assistant_text_item(item_id=message.item_id)
@@ -3147,6 +3257,38 @@ async def _run_ask_tui(
             self._render_status_line()
             self._render_turn_queue()
 
+        def _set_thread_status_text(self, status: object) -> None:
+            if isinstance(status, AgentThreadStatus):
+                self._status_text = _format_agent_thread_status_text(status)
+            else:
+                self._status_text = _thread_status_text(status)
+            changed = self._set_thread_status_feed_entry(status)
+            self._render_status_line()
+            self._render_turn_queue()
+            if changed:
+                self._render_feed()
+                self._scroll_to_end()
+
+        def _set_thread_status_feed_entry(self, status: object) -> bool:
+            text = _ask_thread_status_feed_text(status)
+            if text is None:
+                for index, entry in enumerate(self._entries):
+                    if entry.message_id != self._thread_status_entry_id:
+                        continue
+                    del self._entries[index]
+                    if index < self._rendered_entry_count:
+                        self._reset_rendered_feed()
+                    return True
+                return False
+            return self._append_or_replace_feed_entry(
+                _AskFeedEntry(
+                    role="event",
+                    text=text,
+                    pending=True,
+                    message_id=self._thread_status_entry_id,
+                )
+            )
+
         def _sync_external_thread_state(self) -> None:
             session = self._session
             if not isinstance(session, _AskExternalThreadState):
@@ -3167,7 +3309,12 @@ async def _run_ask_tui(
                     self._thread_generation = generation
                     self._reset_current_thread_feed()
 
-            status = session.thread_status_text
+            thread_status = session.thread_status
+            status = (
+                _format_agent_thread_status_text(thread_status)
+                if thread_status is not None
+                else session.thread_status_text
+            )
             labels = list(session.queued_message_labels)
             active = status is not None and status.strip() != ""
             status_changed = active != self._external_thread_active
@@ -3179,10 +3326,18 @@ async def _run_ask_tui(
                 if status is not None and status.strip() != "":
                     status_changed = status_changed or status != self._status_text
                     self._status_text = status
+                    if self._set_thread_status_feed_entry(thread_status or status):
+                        self._render_feed()
+                        self._scroll_to_end()
             else:
                 next_status = status if active else None
                 status_changed = status_changed or next_status != self._status_text
                 self._status_text = next_status
+                if self._set_thread_status_feed_entry(
+                    thread_status if active else next_status
+                ):
+                    self._render_feed()
+                    self._scroll_to_end()
 
             if status_changed:
                 self._render_status_line()
@@ -3718,7 +3873,7 @@ async def _run_ask_tui(
             interactive=True,
             preamble_rule=preamble_rule,
         ) as created_session:
-            await _run_app(created_session.thread_session)
+            await _run_app(created_session)
 
 
 @app.async_command("ask", help="Send a one-shot LLM prompt.")