controlmesh 0.41.2__tar.gz → 0.41.4__tar.gz

{controlmesh-0.41.2 → controlmesh-0.41.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: controlmesh
-Version: 0.41.2
+Version: 0.41.4
 Summary: ControlMesh brings official coding CLIs into Telegram, Matrix, and Feishu with persistent workspaces, long-running jobs, and production-friendly bot operations.
 Project-URL: Homepage, https://github.com/muqiao215/ControlMesh
 Project-URL: Repository, https://github.com/muqiao215/ControlMesh

{controlmesh-0.41.2 → controlmesh-0.41.4}/controlmesh/__init__.py

@@ -1,3 +1,3 @@
 """ControlMesh public package and CLI entrypoint surface."""
 
-__version__ = "0.41.2"
+__version__ = "0.41.4"

{controlmesh-0.41.2 → controlmesh-0.41.4}/controlmesh/config.py

@@ -174,7 +174,7 @@ class TerminalConfig(BaseModel):
     default_model: str = "gpt-5.5"
     default_mode: Literal["enhanced", "native"] = "enhanced"
     prompt: str = "cm> "
-    native_escape_command: str = "/cm"
+    native_escape_command: str = "/native"
     back_command: str = "/back"
     show_background_notifications: bool = True
     background_notification_interval_seconds: float = 2.0

{controlmesh-0.41.2 → controlmesh-0.41.4}/controlmesh/terminal/command_router.py

@@ -5,28 +5,35 @@ from __future__ import annotations
 from rich.console import Console
 
 from controlmesh.orchestrator.registry import OrchestratorResult
+from controlmesh.terminal.help import TERMINAL_HELP
 from controlmesh.terminal.rendering import render_result
 
 
 class TerminalCommandRouter:
     """Handle terminal-local commands before falling back to Orchestrator."""
 
-    CONTROL_PREFIXES = (
-        "/tasks",
-        "/task",
-        "/agents",
-        "/agent",
-        "/@",
-        "/memory",
-        "/cron",
-        "/inbox",
-        "/status",
-        "/model",
-        "/route",
-        "/help",
-        "/upgrade",
-        "/diagnose",
+    CONTROL_COMMANDS = frozenset(
+        {
+            "tasks",
+            "task",
+            "agents",
+            "agent",
+            "agent_start",
+            "agent_stop",
+            "agent_restart",
+            "memory",
+            "cron",
+            "inbox",
+            "status",
+            "model",
+            "route",
+            "upgrade",
+            "diagnose",
+            "history",
+            "sessions",
+        }
     )
+    LOCAL_COMMANDS = frozenset({"help", "cm"})
 
     def __init__(self, runtime, console: Console | None = None) -> None:
         self.runtime = runtime
@@ -35,21 +42,33 @@ class TerminalCommandRouter:
     def is_terminal_command(self, line: str) -> bool:
         """Return whether this line is a terminal/ControlMesh command."""
         text = line.strip()
-        return text.startswith(self.CONTROL_PREFIXES)
+        if not text:
+            return False
+        head = _command_head(text)
+        if head.startswith("@"):
+            return True
+        return head in self.CONTROL_COMMANDS or head in self.LOCAL_COMMANDS
 
     async def handle(self, line: str) -> OrchestratorResult | None:
         """Handle a terminal command and render its result."""
         text = line.strip()
-        if text.startswith("/inbox"):
-            result = await self._handle_inbox(text)
-        elif text.startswith("/@"):
-            result = await self._handle_at_agent(text)
-        elif text.startswith("/memory search "):
-            result = await self._handle_memory_search(text)
-        elif text.startswith("/memory inject "):
-            result = await self._handle_memory_inject(text)
+        canonical = _canonical_command(text)
+        if canonical == "/help":
+            result = OrchestratorResult(text=TERMINAL_HELP)
+        elif canonical == "/cm":
+            result = OrchestratorResult(
+                text="`/cm` has moved to `native` in the terminal. Run `native` to enter provider CLI."
+            )
+        elif canonical.startswith("/inbox"):
+            result = await self._handle_inbox(canonical)
+        elif canonical.startswith("/@"):
+            result = await self._handle_at_agent(canonical)
+        elif canonical.startswith("/memory search "):
+            result = await self._handle_memory_search(canonical)
+        elif canonical.startswith("/memory inject "):
+            result = await self._handle_memory_inject(canonical)
         else:
-            result = await self.runtime.handle_control_command(text)
+            result = await self.runtime.handle_control_command(canonical)
         render_result(self.console, result)
         return result
 
@@ -101,3 +120,15 @@ class TerminalCommandRouter:
         except KeyError as exc:
             return OrchestratorResult(text=str(exc))
         return OrchestratorResult(text=f"Queued {hit_id} for the next enhanced message.")
+
+
+def _command_head(text: str) -> str:
+    head = text.split(None, 1)[0]
+    return head.removeprefix("/")
+
+
+def _canonical_command(text: str) -> str:
+    stripped = text.strip()
+    if stripped.startswith("/"):
+        return stripped
+    return f"/{stripped}"

{controlmesh-0.41.2 → controlmesh-0.41.4}/controlmesh/terminal/enhanced_shell.py

@@ -15,6 +15,8 @@ from controlmesh.terminal.native_pty import NativePTYSession
 class EnhancedShell:
     """Interactive ``cm>`` shell backed by the ControlMesh orchestrator."""
 
+    UNKNOWN_COMMAND_HINT = "Unknown command. Run `help`, or use `chat <message>` for model chat."
+
     def __init__(
         self,
         *,
@@ -31,25 +33,38 @@ class EnhancedShell:
 
     async def run(self) -> None:
         """Run the enhanced shell until exit."""
-        self.console.print("[bold green]ControlMesh Enhanced Codex[/bold green]")
-        self.console.print("[dim]输入 /cm 进入 Codex 原生模式，/exit 退出。[/dim]")
+        self.console.print("[bold green]ControlMesh Terminal[/bold green]")
+        self.console.print(
+            "[dim]Type help for commands. Use chat <message> for model chat, native for provider CLI, exit to quit.[/dim]"
+        )
         while True:
-            line = await asyncio.to_thread(self._prompt_input, self._prompt())
+            try:
+                line = await asyncio.to_thread(self._prompt_input, self._prompt())
+            except (EOFError, KeyboardInterrupt):
+                self.console.print()
+                return
             text = line.strip()
             if not text:
                 continue
             if text in {"/exit", "exit", "quit"}:
                 return
-            if text == self.config.terminal.native_escape_command:
+            if text in self._native_commands():
                 await self.enter_native()
                 continue
             if text == self.config.terminal.back_command:
                 self.console.print("Already in ControlMesh enhanced mode.")
                 continue
+            chat_message = self._chat_message(text)
+            if chat_message is not None:
+                if chat_message:
+                    await self._handle_chat_safely(chat_message)
+                else:
+                    self.console.print("Usage: chat <message>")
+                continue
             if self.router.is_terminal_command(text):
                 await self.router.handle(text)
                 continue
-            await self.handle_enhanced_message(line)
+            self.console.print(self.UNKNOWN_COMMAND_HINT)
 
     async def enter_native(self) -> None:
         """Run the native provider session and return to enhanced mode."""
@@ -83,3 +98,24 @@ class EnhancedShell:
         if updates and self.config.terminal.show_background_notifications:
             return f"cm [{updates} updates]> "
         return base
+
+    @staticmethod
+    def _chat_message(text: str) -> str | None:
+        if text == "chat" or text.startswith("chat "):
+            return text.removeprefix("chat").strip()
+        if text == "/chat" or text.startswith("/chat "):
+            return text.removeprefix("/chat").strip()
+        return None
+
+    async def _handle_chat_safely(self, text: str) -> None:
+        try:
+            await self.handle_enhanced_message(text)
+        except (KeyboardInterrupt, asyncio.CancelledError):
+            self.console.print("\nInterrupted.")
+
+    def _native_commands(self) -> set[str]:
+        commands = {"/native", "native"}
+        configured = self.config.terminal.native_escape_command
+        if configured and configured != "/cm":
+            commands.add(configured)
+        return commands

controlmesh-0.41.4/controlmesh/terminal/help.py

@@ -0,0 +1,31 @@
+"""Local help text for the ControlMesh terminal."""
+
+from __future__ import annotations
+
+
+TERMINAL_HELP = """ControlMesh Terminal
+
+Core:
+  help                 Show this help
+  status               Show ControlMesh status
+  model                Show or change the active model
+  diagnose             Run diagnostics
+  exit                 Quit the terminal
+
+Runtime:
+  tasks list           List tasks
+  tasks doctor         Check task runtime health
+  agents               List agents
+  cron list            List cron jobs
+
+Memory/history:
+  memory today         Show today's memory
+  memory search <query>
+  history
+  sessions
+
+Interaction:
+  chat <message>       Send an explicit model chat message
+  native               Enter the provider-native CLI
+  inbox                Show terminal inbox
+"""

{controlmesh-0.41.2 → controlmesh-0.41.4}/controlmesh/terminal/runtime.py

@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
+import logging
 from collections.abc import Awaitable, Callable
+from contextlib import contextmanager
 
 from controlmesh.config import AgentConfig
 from controlmesh.orchestrator.core import Orchestrator
@@ -13,6 +15,7 @@ from controlmesh.terminal.memory_context import TerminalMemoryContext
 from controlmesh.workspace.paths import resolve_paths
 
 _TextCallback = Callable[[str], Awaitable[None]]
+logger = logging.getLogger(__name__)
 
 
 class TerminalRuntime:
@@ -56,9 +59,17 @@ class TerminalRuntime:
             from controlmesh.multiagent.supervisor import AgentSupervisor
 
             supervisor = AgentSupervisor(self.config)
-            await supervisor.start_core()
-            await supervisor.start_sub_agents(transport_enabled=False)
-        except Exception:
+            with _suppress_optional_startup_tracebacks():
+                await supervisor.start_core()
+                await supervisor.start_sub_agents(transport_enabled=False)
+        except Exception as exc:
+            logger.warning(
+                "Optional terminal background runtime did not start: %s: %s",
+                type(exc).__name__,
+                exc,
+            )
+            if "supervisor" in locals():
+                await supervisor.stop_all()
             return
         self.supervisor = supervisor
         if self.orchestrator is not None:
@@ -121,3 +132,19 @@ def _config_with_terminal_provider(config: AgentConfig, provider: str) -> AgentC
     data["provider"] = provider
     data["model"] = model
     return AgentConfig.model_validate(data)
+
+
+@contextmanager
+def _suppress_optional_startup_tracebacks():
+    noisy_loggers = [
+        logging.getLogger("controlmesh.multiagent.internal_api"),
+        logging.getLogger("controlmesh.multiagent.supervisor"),
+    ]
+    old_disabled = [log.disabled for log in noisy_loggers]
+    try:
+        for log in noisy_loggers:
+            log.disabled = True
+        yield
+    finally:
+        for log, disabled in zip(noisy_loggers, old_disabled, strict=True):
+            log.disabled = disabled

{controlmesh-0.41.2 → controlmesh-0.41.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "controlmesh"
-version = "0.41.2"
+version = "0.41.4"
 description = "ControlMesh brings official coding CLIs into Telegram, Matrix, and Feishu with persistent workspaces, long-running jobs, and production-friendly bot operations."
 readme = "README.md"
 requires-python = ">=3.11"