devpilot-agentic-cli 1.0.0__py3-none-any.whl → 1.0.2__py3-none-any.whl

agent/cli.py

@@ -161,14 +161,29 @@ async def main_async() -> None:
 
     if config.a2a_enabled:
         import uvicorn
-        a2a_cfg = uvicorn.Config(
-            app=a2a_app,
-            host="0.0.0.0",
-            port=config.a2a_port,
-            log_level="error",
-        )
-        a2a_server = uvicorn.Server(a2a_cfg)
-        a2a_task   = asyncio.create_task(a2a_server.serve())
+        import socket
+        
+        # Check if port is available
+        port_in_use = False
+        with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+            try:
+                s.bind(("0.0.0.0", config.a2a_port))
+            except OSError:
+                port_in_use = True
+                
+        if port_in_use:
+            UI.print_error(f"Port {config.a2a_port} is already in use. A2A server disabled. Use --a2a-port <port> to change.")
+            a2a_server = None
+            a2a_task = None
+        else:
+            a2a_cfg = uvicorn.Config(
+                app=a2a_app,
+                host="0.0.0.0",
+                port=config.a2a_port,
+                log_level="error",
+            )
+            a2a_server = uvicorn.Server(a2a_cfg)
+            a2a_task   = asyncio.create_task(a2a_server.serve())
     else:
         a2a_server = None
         a2a_task   = None
@@ -217,12 +232,13 @@ async def main_async() -> None:
         config=config,
         repo_context=repo_context,
     )
-    await app.run_async()
-
-    if a2a_server and a2a_task:
-        a2a_server.should_exit = True
-        await a2a_task
-    await mcp_manager.close()
+    try:
+        await app.run_async()
+    finally:
+        if a2a_server and a2a_task:
+            a2a_server.should_exit = True
+            await a2a_task
+        await mcp_manager.close()
 
 
 def main() -> None:

agent/mcp_client.py

@@ -7,7 +7,7 @@ and registers them into the ToolRegistry.
 """
 
 import json
-from contextlib import AsyncExitStack
+import asyncio
 from pathlib import Path
 
 from mcp.client.session import ClientSession
@@ -23,8 +23,60 @@ class MCPManager:
 
     def __init__(self, config_path: Path):
         self.config_path = config_path
-        self.exit_stack = AsyncExitStack()
         self.sessions: dict[str, ClientSession] = {}
+        self._tasks: list[asyncio.Task] = []
+
+    async def _run_server(
+        self, 
+        name: str, 
+        command: str, 
+        args: list[str], 
+        env: dict | None, 
+        registry: ToolRegistry, 
+        ready_event: asyncio.Event
+    ) -> None:
+        try:
+            server_params = StdioServerParameters(command=command, args=args, env=env)
+            async with stdio_client(server_params) as (read, write):
+                async with ClientSession(read, write) as session:
+                    await session.initialize()
+                    self.sessions[name] = session
+
+                    # Fetch and register tools
+                    tools_response = await session.list_tools()
+                    for mcp_tool in tools_response.tools:
+                        canonical_schema = {
+                            "name": mcp_tool.name,
+                            "description": mcp_tool.description or "",
+                            "input_schema": mcp_tool.inputSchema,
+                            "_mcp_server_id": name,
+                        }
+
+                        def make_executor(session_ref: ClientSession, tool_name: str):
+                            async def _executor(tool_input: dict) -> ToolResult:
+                                try:
+                                    result = await session_ref.call_tool(tool_name, tool_input)
+                                    text_contents = [c.text for c in result.content if isinstance(c, TextContent)]
+                                    output = "\n".join(text_contents)
+                                    return ToolResult(output, is_error=result.isError)
+                                except Exception as e:
+                                    return ToolResult(f"MCP execution error: {e}", is_error=True)
+                            return _executor
+
+                        registry.register_mcp_tool(canonical_schema, make_executor(session, mcp_tool.name))
+
+                    UI.print_info(f"Connected to MCP server: {name} ({len(tools_response.tools)} tools)")
+                    ready_event.set()
+
+                    try:
+                        await asyncio.Event().wait()
+                    except asyncio.CancelledError:
+                        pass
+        except Exception as e:
+            UI.print_error(f"Failed to connect to MCP server '{name}': {e}")
+            registry.deregister_mcp_tools(name)
+        finally:
+            ready_event.set()
 
     async def connect_all(self, registry: ToolRegistry) -> None:
         """Connect to all servers in mcp_servers.json and register tools."""
@@ -39,14 +91,12 @@ class MCPManager:
             UI.print_error(f"Failed to read mcp_servers.json: {e}")
             return
 
-        # Handle both list of dicts and dict of dicts formats for mcp_servers.json
         if isinstance(servers, dict):
-            # In official MCP config format, it's a dict mapping name to config
             server_items = servers.items()
         else:
-            # Fallback if it's a list
             server_items = [(s.get("name", f"server_{i}"), s) for i, s in enumerate(servers)]
 
+        events = []
         for name, server_config in server_items:
             if server_config.get("enabled", True) is False:
                 continue
@@ -58,47 +108,23 @@ class MCPManager:
                 UI.print_error(f"MCP server '{name}' missing 'command'. Skipping.")
                 continue
 
-            try:
-                server_params = StdioServerParameters(command=command, args=args, env=server_config.get("env"))
-                stdio_transport = await self.exit_stack.enter_async_context(stdio_client(server_params))
-                read, write = stdio_transport
-                session = await self.exit_stack.enter_async_context(ClientSession(read, write))
-                await session.initialize()
-
-                self.sessions[name] = session
-
-                # Fetch and register tools
-                tools_response = await session.list_tools()
-                for mcp_tool in tools_response.tools:
-                    # Convert to canonical schema format
-                    canonical_schema = {
-                        "name": mcp_tool.name,
-                        "description": mcp_tool.description or "",
-                        "input_schema": mcp_tool.inputSchema,
-                        "_mcp_server_id": name,
-                    }
-
-                    # Create closure for execution
-                    def make_executor(session_ref: ClientSession, tool_name: str):
-                        async def _executor(tool_input: dict) -> ToolResult:
-                            try:
-                                result = await session_ref.call_tool(tool_name, tool_input)
-                                # Flatten result text
-                                text_contents = [c.text for c in result.content if isinstance(c, TextContent)]
-                                output = "\n".join(text_contents)
-                                return ToolResult(output, is_error=result.isError)
-                            except Exception as e:
-                                return ToolResult(f"MCP execution error: {e}", is_error=True)
-                        return _executor
-
-                    registry.register_mcp_tool(canonical_schema, make_executor(session, mcp_tool.name))
-
-                UI.print_info(f"Connected to MCP server: {name} ({len(tools_response.tools)} tools)")
-            except Exception as e:
-                UI.print_error(f"Failed to connect to MCP server '{name}': {e}")
-                registry.deregister_mcp_tools(name)
+            ready_event = asyncio.Event()
+            events.append(ready_event)
+            task = asyncio.create_task(
+                self._run_server(name, command, args, server_config.get("env"), registry, ready_event)
+            )
+            self._tasks.append(task)
+
+        if events:
+            await asyncio.gather(*(e.wait() for e in events))
 
     async def close(self) -> None:
         """Close all connections."""
-        await self.exit_stack.aclose()
+        for task in self._tasks:
+            task.cancel()
+        
+        if self._tasks:
+            await asyncio.gather(*self._tasks, return_exceptions=True)
+            
         self.sessions.clear()
+        self._tasks.clear()

agent/ui.py

@@ -171,7 +171,7 @@ class UI:
         if UI._tui_app:
             UI._tui_app.post_message(ErrorEvent(msg))
             return
-        console.print(f"[danger]❌ {msg}[/danger]")
+        console.print(f"[danger]Error: {msg}[/danger]")
 
     @staticmethod
     def print_info(msg: str) -> None:
@@ -179,7 +179,7 @@ class UI:
         if UI._tui_app:
             UI._tui_app.post_message(InfoEvent(msg))
             return
-        console.print(f"[info]ℹ️ {msg}[/info]")
+        console.print(f"[info]Info: {msg}[/info]")
 
     @staticmethod
     def print_success(msg: str) -> None:
@@ -187,7 +187,7 @@ class UI:
         if UI._tui_app:
             UI._tui_app.post_message(SuccessEvent(msg))
             return
-        console.print(f"[bold green]✓ {msg}[/bold green]")
+        console.print(f"[bold green]Success: {msg}[/bold green]")
 
     @staticmethod
     def print_thinking_block(thinking_text: str) -> None:

{devpilot_agentic_cli-1.0.0.dist-info → devpilot_agentic_cli-1.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devpilot-agentic-cli
-Version: 1.0.0
+Version: 1.0.2
 Summary: Autonomous AI coding agent for your terminal — Claude, GPT-4o, Groq, Ollama, and more
 Author: Thijesh Praveen V
 License: MIT

{devpilot_agentic_cli-1.0.0.dist-info → devpilot_agentic_cli-1.0.2.dist-info}/RECORD

@@ -1,14 +1,14 @@
 agent/__init__.py,sha256=lfJPQT9NbRRWfa9YABD9u8apcLjs3tzDVZvrOb69GBQ,25
 agent/a2a_client.py,sha256=vY4qZahkWP-DVU2smIeTz1xLj61kkDjE9Tmt_-9PKUU,3416
 agent/a2a_server.py,sha256=3rkDy8dm49_5qCa6fKYkLdmHTnHs5ocHBuZ8j32-p48,5230
-agent/cli.py,sha256=qhhBnJUKfzL7wlQOm9IP_S_0JdmpwESU4JMXDVZVGoU,8208
+agent/cli.py,sha256=YdgLLIk4vgK-gGZ-Ia-kSZ_BbgfB2WE9QX83jiGsv48,8819
 agent/config.py,sha256=GWS719hDNvvzgJAq9MF2FAGEVwM1AKA_B4WSDDzKEAg,10580
 agent/context.py,sha256=a--jOYLX5jM-8RDLV0tAvZHOx9H5M6SNxSJipzEUZe4,7323
 agent/history.py,sha256=IMY3IO5TN9Sh7tJPAWE9VZYC0pkAwgPj2a_F1yA4OmE,6730
 agent/loop.py,sha256=8lTvCSAljPdmyyJ1uf0Q9qulUFNE3d4v3ZNzRae4c1w,3514
-agent/mcp_client.py,sha256=vR09S4q5UrI4Ps3Uz7ZKdK4QN0UBJ3ouCtUrdJQZIIo,4416
+agent/mcp_client.py,sha256=lasmMq602_OEirzTNO57dNEF7mWaed_A6NaNTY3voOQ,4978
 agent/setup_wizard.py,sha256=jCXpp1vY9HRqJLO9eC6M9T6JlHXP7LsausmhkciB0d8,12774
-agent/ui.py,sha256=pOavPs73WIT-fdROsN_h4KAcyr6qQxNhBfjoSwOos6o,8276
+agent/ui.py,sha256=LK8L2fTq_JIcYiVVjpVWaoYMFWXwqUcqYL4gspdAqvs,8283
 agent/providers/__init__.py,sha256=6xBg26vCBV2e3hybMT2JCHEZoRNpImkVOK-FytBW4xY,166
 agent/providers/anthropic_provider.py,sha256=i257T8T7fYuUEVvsy-3_eudbjSlxZqbn3zi7DFvukRE,6067
 agent/providers/base.py,sha256=2ppPB5ko9FrtS-U20E5rcKUQ1KAp6adnqmIRHdYONh4,5174
@@ -28,8 +28,8 @@ agent/tools/shell.py,sha256=i9nar3gyS28p6wjfAljNREUll-7RiD_LhQQ_CDkz-CM,3923
 agent/tools/web_search.py,sha256=7a533lYcRG0rwYle00xsIncfPRL1zCiS-wsL_qVxlyI,3736
 agent/tui/__init__.py,sha256=FB4u1BY9RSmYVfCM2yMeCyMmzjnb9T0bhmPp9hHH8Ys,37
 agent/tui/app.py,sha256=ZClXMLgXvohtLlYogKMpQISjEiFTHzNP6XPSeM6y4xU,18598
-devpilot_agentic_cli-1.0.0.dist-info/METADATA,sha256=2deUrhlyQc90YKHuHF4wpfAo8Ry6mP8x0uA2ijt-pyU,11105
-devpilot_agentic_cli-1.0.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-devpilot_agentic_cli-1.0.0.dist-info/entry_points.txt,sha256=Zi0zH4sqSQptehekvn5CBhU452GQ23Vyja4l8C58IuY,44
-devpilot_agentic_cli-1.0.0.dist-info/top_level.txt,sha256=0gvCG7PHc22NA63j3bTGi2Zc37ym9t8Pf90ZLzf1kGA,6
-devpilot_agentic_cli-1.0.0.dist-info/RECORD,,
+devpilot_agentic_cli-1.0.2.dist-info/METADATA,sha256=HGoT4GuEaEX-l_-Fp4Cu5sewyRn9X058Bqp7HHUdXlA,11105
+devpilot_agentic_cli-1.0.2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+devpilot_agentic_cli-1.0.2.dist-info/entry_points.txt,sha256=Zi0zH4sqSQptehekvn5CBhU452GQ23Vyja4l8C58IuY,44
+devpilot_agentic_cli-1.0.2.dist-info/top_level.txt,sha256=0gvCG7PHc22NA63j3bTGi2Zc37ym9t8Pf90ZLzf1kGA,6
+devpilot_agentic_cli-1.0.2.dist-info/RECORD,,