Second pass at implementing the mcp-agent CLI

pyproject.toml

@@ -30,7 +30,7 @@ dependencies = [
     "pyyaml>=6.0.2",
     "rich>=13.9.4",
     "scikit-learn>=1.6.0",
-    "typer>=0.15.1",
+    "typer>=0.15.3",
     "websockets>=12.0",
 ]
 
@@ -78,6 +78,7 @@ cli = [
     "httpx>=0.28.1",
     "pyjwt>=2.10.1",
     "typer[all]>=0.15.1",
+    "watchdog>=6.0.0"
 ]
 
 [build-system]

src/mcp_agent/cli/commands/build.py

@@ -378,6 +378,9 @@ def build(
 
         console.print(server_table)
         console.print()
+    else:
+        console.print("[yellow]No MCP servers found in configuration[/yellow]")
+        console.print()
 
     # Show warnings
     if report["warnings"]:

src/mcp_agent/cli/commands/dev.py

@@ -6,15 +6,14 @@
 
 from __future__ import annotations
 
-import asyncio
+import subprocess
+import sys
 from pathlib import Path
 import shutil
-import time
 
 import typer
 from rich.console import Console
 
-from mcp_agent.cli.core.utils import load_user_app
 from mcp_agent.config import get_settings
 
 
@@ -39,16 +38,16 @@ def _preflight_ok() -> bool:
                 ok = False
         return ok
 
-    async def _run_once():
-        app_obj = load_user_app(script)
-        async with app_obj.run():
-            console.print(f"Running {script}")
-            # Sleep until cancelled
-            try:
-                while True:
-                    await asyncio.sleep(1)
-            except asyncio.CancelledError:
-                pass
+    def _run_script() -> subprocess.Popen:
+        """Run the script as a subprocess."""
+        console.print(f"Running {script}")
+        # Run the script with the same Python interpreter
+        return subprocess.Popen(
+            [sys.executable, str(script)],
+            stdout=None,  # Inherit stdout
+            stderr=None,  # Inherit stderr
+            stdin=None,  # Inherit stdin
+        )
 
     # Simple preflight
     _ = _preflight_ok()
@@ -57,50 +56,77 @@ async def _run_once():
     try:
         from watchdog.observers import Observer  # type: ignore
         from watchdog.events import FileSystemEventHandler  # type: ignore
+        import time
 
         class _Handler(FileSystemEventHandler):
             def __init__(self):
                 self.touched = False
 
             def on_modified(self, event):  # type: ignore
-                self.touched = True
+                if not event.is_directory:
+                    self.touched = True
 
             def on_created(self, event):  # type: ignore
-                self.touched = True
-
-        loop = asyncio.get_event_loop()
-        task = loop.create_task(_run_once())
+                if not event.is_directory:
+                    self.touched = True
 
         handler = _Handler()
         observer = Observer()
         observer.schedule(handler, path=str(script.parent), recursive=True)
         observer.start()
         console.print("Live reload enabled (watchdog)")
+
+        # Start the script
+        process = _run_script()
+
         try:
             while True:
                 time.sleep(0.5)
+
+                # Check if process died
+                if process.poll() is not None:
+                    console.print(
+                        f"[red]Process exited with code {process.returncode}[/red]"
+                    )
+                    break
+
+                # Check for file changes
                 if handler.touched:
                     handler.touched = False
                     console.print("Change detected. Restarting...")
-                    task.cancel()
+                    process.terminate()
                     try:
-                        loop.run_until_complete(task)
-                    except Exception:
-                        pass
-                    task = loop.create_task(_run_once())
+                        process.wait(timeout=5)
+                    except subprocess.TimeoutExpired:
+                        process.kill()
+                        process.wait()
+                    process = _run_script()
+
         except KeyboardInterrupt:
-            pass
+            console.print("\n[yellow]Stopping...[/yellow]")
+            process.terminate()
+            try:
+                process.wait(timeout=5)
+            except subprocess.TimeoutExpired:
+                process.kill()
+                process.wait()
         finally:
             observer.stop()
             observer.join()
-            task.cancel()
-            try:
-                loop.run_until_complete(task)
-            except Exception:
-                pass
-    except Exception:
-        # Fallback: run once
+
+    except ImportError:
+        # Fallback: run once without watchdog
+        console.print(
+            "[yellow]Watchdog not installed. Running without live reload.[/yellow]"
+        )
+        process = _run_script()
         try:
-            asyncio.run(_run_once())
+            process.wait()
         except KeyboardInterrupt:
-            pass
+            console.print("\n[yellow]Stopping...[/yellow]")
+            process.terminate()
+            try:
+                process.wait(timeout=5)
+            except subprocess.TimeoutExpired:
+                process.kill()
+                process.wait()

src/mcp_agent/cli/commands/invoke.py

@@ -16,7 +16,7 @@
 
 
 app = typer.Typer(help="Invoke an agent or workflow programmatically")
-console = Console()
+console = Console(color_system=None)
 
 
 @app.callback(invoke_without_command=True)
@@ -27,6 +27,9 @@ def invoke(
     vars: Optional[str] = typer.Option(None, "--vars", help="JSON structured inputs"),
     script: Optional[str] = typer.Option(None, "--script"),
     model: Optional[str] = typer.Option(None, "--model"),
+    servers: Optional[str] = typer.Option(
+        None, "--servers", help="Comma-separated list of MCP server names"
+    ),
 ) -> None:
     """Run either an agent (LLM) or a workflow from the user's app script."""
     if not agent and not workflow:
@@ -50,16 +53,18 @@ async def _run():
         async with app_obj.run():
             if agent:
                 # Run via LLM
+                server_list = servers.split(",") if servers else []
+                server_list = [s.strip() for s in server_list if s.strip()]
                 llm = create_llm(
                     agent_name=agent,
-                    server_names=[],
+                    server_names=server_list,
                     provider=None,
                     model=model,
                     context=app_obj.context,
                 )
                 if message:
                     res = await llm.generate_str(message)
-                    console.print(res)
+                    console.print(res, end="\n\n\n")
                     return
                 if payload:
                     # If structured vars contain messages, prefer that key; else stringify
@@ -69,7 +74,7 @@ async def _run():
                         or json.dumps(payload)
                     )
                     res = await llm.generate_str(msg)
-                    console.print(res)
+                    console.print(res, end="\n\n\n")
                     return
                 typer.secho("No input provided", err=True, fg=typer.colors.YELLOW)
                 return
@@ -98,7 +103,7 @@ async def _run():
                 val = getattr(result, "value", result)
             except Exception:
                 val = result
-            console.print(val)
+            console.print(val, end="\n\n\n")
 
     from pathlib import Path
 

src/mcp_agent/cli/commands/serve.py

@@ -191,6 +191,8 @@ async def _run():
             info_table.add_row("Address", f"http://{address}")
             if transport == "sse":
                 info_table.add_row("SSE Endpoint", f"http://{address}/sse")
+            elif transport == "http":
+                info_table.add_row("HTTP Endpoint", f"http://{address}/mcp")
 
         # Show registered components
         if hasattr(app_obj, "workflows") and app_obj.workflows:
@@ -251,6 +253,7 @@ async def _run():
         def signal_handler(sig, frame):
             console.print("\n[yellow]Shutting down server...[/yellow]")
             shutdown_event.set()
+            os._exit(0)
 
         signal.signal(signal.SIGINT, signal_handler)
         signal.signal(signal.SIGTERM, signal_handler)
@@ -284,7 +287,7 @@ def signal_handler(sig, frame):
 
                 # Configure uvicorn
                 uvicorn_config = uvicorn.Config(
-                    mcp.app,
+                    mcp.streamable_http_app if transport == "http" else mcp.sse_app,
                     host=host,
                     port=port or 8000,
                     log_level="debug" if debug else "info",
@@ -307,6 +310,10 @@ def signal_handler(sig, frame):
 
                 if transport == "sse":
                     console.print(f"[bold]SSE:[/bold] http://{host}:{port or 8000}/sse")
+                elif transport == "http":
+                    console.print(
+                        f"[bold]HTTP:[/bold] http://{host}:{port or 8000}/mcp"
+                    )
 
                 console.print("\n[dim]Press Ctrl+C to stop the server[/dim]\n")
 

src/mcp_agent/cli/commands/server.py

@@ -12,8 +12,9 @@
 from rich.table import Table
 from rich.prompt import Confirm
 
-from mcp_agent.config import Settings, MCPServerSettings, MCPSettings
+from mcp_agent.config import Settings, MCPServerSettings, MCPSettings, get_settings
 from mcp_agent.cli.utils.importers import import_servers_from_mcp_json
+from mcp_agent.core.context import cleanup_context
 
 
 app = typer.Typer(help="Local server helpers")
@@ -338,7 +339,7 @@ def list_servers(
     ),
 ) -> None:
     """List configured servers."""
-    settings = Settings()
+    settings = get_settings()
     servers = (settings.mcp.servers if settings.mcp else {}) or {}
 
     if not servers:
@@ -443,7 +444,7 @@ def add(
     ),
 ) -> None:
     """Add a server to configuration."""
-    settings = Settings()
+    settings = get_settings()
     if settings.mcp is None:
         settings.mcp = MCPSettings()
     servers = settings.mcp.servers or {}
@@ -759,7 +760,8 @@ async def _probe():
                             pass  # Resources might not be supported
 
                         console.print(
-                            f"\n[green bold]✅ Server '{name}' is working correctly![/green bold]"
+                            f"\n[green bold]✅ Server '{name}' is working correctly![/green bold]",
+                            end="\n\n",
                         )
 
             except asyncio.TimeoutError:
@@ -773,6 +775,9 @@ async def _probe():
                     console.print(f"[dim]{traceback.format_exc()}[/dim]")
                 raise typer.Exit(1)
 
+        # Force complete shutdown of logging infrastructure for CLI commands
+        await cleanup_context(shutdown_logger=True)
+
     try:
         asyncio.run(asyncio.wait_for(_probe(), timeout=timeout))
     except asyncio.TimeoutError:

src/mcp_agent/cli/main.py

@@ -27,6 +27,15 @@
 from mcp_agent.cli.cloud.commands import deploy_config, login, logout, whoami
 from mcp_agent.cli.commands import (
     check as check_cmd,
+    chat as chat_cmd,
+    dev as dev_cmd,
+    invoke as invoke_cmd,
+    serve as serve_cmd,
+    server as server_cmd,
+    build as build_cmd,
+    logs as logs_cmd,
+    doctor as doctor_cmd,
+    configure as configure_cmd,
 )
 from mcp_agent.cli.commands import (
     config as config_cmd,
@@ -50,8 +59,8 @@
 
 app = typer.Typer(
     help="mcp-agent CLI",
-    add_completion=False,
-    no_args_is_help=False,
+    add_completion=True,
+    no_args_is_help=True,
     context_settings={"help_option_names": ["-h", "--help"]},
     cls=HelpfulTyperGroup,
 )
@@ -124,19 +133,19 @@ def main(
 app.add_typer(models_cmd.app, name="models", help="List and manage models")
 
 # TODO: Uncomment after testing - Local Development and beyond
-# app.add_typer(chat_cmd.app, name="chat", help="Ephemeral REPL for quick iteration")
-# app.add_typer(dev_cmd.app, name="dev", help="Run app locally with live reload")
-# app.add_typer(
-#     invoke_cmd.app, name="invoke", help="Invoke agent/workflow programmatically"
-# )
-# app.add_typer(serve_cmd.app, name="serve", help="Serve app as an MCP server")
-# app.add_typer(server_cmd.app, name="server", help="Local server helpers")
-# app.add_typer(
-#     build_cmd.app, name="build", help="Preflight and bundle prep for deployment"
-# )
-# app.add_typer(logs_cmd.app, name="logs", help="Tail local logs")
-# app.add_typer(doctor_cmd.app, name="doctor", help="Comprehensive diagnostics")
-# app.add_typer(configure_cmd.app, name="configure", help="Client integration helpers")
+app.add_typer(chat_cmd.app, name="chat", help="Ephemeral REPL for quick iteration")
+app.add_typer(dev_cmd.app, name="dev", help="Run app locally with live reload")
+app.add_typer(
+    invoke_cmd.app, name="invoke", help="Invoke agent/workflow programmatically"
+)
+app.add_typer(serve_cmd.app, name="serve", help="Serve app as an MCP server")
+app.add_typer(server_cmd.app, name="server", help="Local server helpers")
+app.add_typer(
+    build_cmd.app, name="build", help="Preflight and bundle prep for deployment"
+)
+app.add_typer(logs_cmd.app, name="logs", help="Tail local logs")
+app.add_typer(doctor_cmd.app, name="doctor", help="Comprehensive diagnostics")
+app.add_typer(configure_cmd.app, name="configure", help="Client integration helpers")
 
 # Mount cloud commands
 app.add_typer(cloud_app, name="cloud", help="MCP Agent Cloud commands")