ouroboros-ai 0.2.3__py3-none-any.whl → 0.4.0__py3-none-any.whl

ouroboros/cli/commands/run.py

@@ -8,13 +8,16 @@ from __future__ import annotations
 
 import asyncio
 from pathlib import Path
-from typing import Annotated
+from typing import TYPE_CHECKING, Annotated, Any
 
 import typer
 import yaml
 
+if TYPE_CHECKING:
+    from ouroboros.mcp.client.manager import MCPClientManager
+
 from ouroboros.cli.formatters import console
-from ouroboros.cli.formatters.panels import print_error, print_info, print_success
+from ouroboros.cli.formatters.panels import print_error, print_info, print_success, print_warning
 from ouroboros.core.security import InputValidator
 
 app = typer.Typer(
@@ -24,7 +27,7 @@ app = typer.Typer(
 )
 
 
-def _load_seed_from_yaml(seed_file: Path) -> dict:
+def _load_seed_from_yaml(seed_file: Path) -> dict[str, Any]:
     """Load seed configuration from YAML file.
 
     Args:
@@ -45,21 +48,88 @@ def _load_seed_from_yaml(seed_file: Path) -> dict:
 
     try:
         with open(seed_file) as f:
-            return yaml.safe_load(f)
+            data: dict[str, Any] = yaml.safe_load(f)
+            return data
     except Exception as e:
         print_error(f"Failed to load seed file: {e}")
         raise typer.Exit(1) from e
 
 
+async def _initialize_mcp_manager(
+    config_path: Path,
+    tool_prefix: str,
+) -> "MCPClientManager | None":
+    """Initialize MCPClientManager from config file.
+
+    Args:
+        config_path: Path to MCP config YAML.
+        tool_prefix: Prefix to add to MCP tool names.
+
+    Returns:
+        Configured MCPClientManager or None on error.
+    """
+    from ouroboros.mcp.client.manager import MCPClientManager
+    from ouroboros.orchestrator.mcp_config import load_mcp_config
+
+    # Load configuration
+    result = load_mcp_config(config_path)
+    if result.is_err:
+        print_error(f"Failed to load MCP config: {result.error}")
+        return None
+
+    config = result.value
+
+    # Create manager with connection settings
+    manager = MCPClientManager(
+        max_retries=config.connection.retry_attempts,
+        health_check_interval=config.connection.health_check_interval,
+        default_timeout=config.connection.timeout_seconds,
+    )
+
+    # Add all servers
+    for server_config in config.servers:
+        add_result = await manager.add_server(server_config)
+        if add_result.is_err:
+            print_warning(f"Failed to add MCP server '{server_config.name}': {add_result.error}")
+        else:
+            print_info(f"Added MCP server: {server_config.name}")
+
+    # Connect to all servers
+    if manager.servers:
+        print_info("Connecting to MCP servers...")
+        connect_results = await manager.connect_all()
+
+        connected_count = 0
+        for server_name, connect_result in connect_results.items():
+            if connect_result.is_ok:
+                server_info = connect_result.value
+                print_success(f"  Connected to '{server_name}' ({len(server_info.tools)} tools)")
+                connected_count += 1
+            else:
+                print_warning(f"  Failed to connect to '{server_name}': {connect_result.error}")
+
+        if connected_count == 0:
+            print_warning("No MCP servers connected. Continuing without external tools.")
+            return None
+
+        print_info(f"Connected to {connected_count}/{len(manager.servers)} MCP servers")
+
+    return manager
+
+
 async def _run_orchestrator(
     seed_file: Path,
     resume_session: str | None = None,
+    mcp_config: Path | None = None,
+    mcp_tool_prefix: str = "",
 ) -> None:
     """Run workflow via orchestrator mode (Claude Agent SDK).
 
     Args:
         seed_file: Path to seed YAML file.
         resume_session: Optional session ID to resume.
+        mcp_config: Optional path to MCP config file.
+        mcp_tool_prefix: Prefix for MCP tool names.
     """
     from ouroboros.core.seed import Seed
     from ouroboros.orchestrator import ClaudeAgentAdapter, OrchestratorRunner
@@ -77,6 +147,12 @@ async def _run_orchestrator(
     print_info(f"Loaded seed: {seed.goal[:80]}...")
     print_info(f"Acceptance criteria: {len(seed.acceptance_criteria)}")
 
+    # Initialize MCP manager if config provided
+    mcp_manager = None
+    if mcp_config:
+        print_info(f"Loading MCP configuration from: {mcp_config}")
+        mcp_manager = await _initialize_mcp_manager(mcp_config, mcp_tool_prefix)
+
     # Initialize components
     import os
     db_path = os.path.expanduser("~/.ouroboros/ouroboros.db")
@@ -85,32 +161,44 @@ async def _run_orchestrator(
     await event_store.initialize()
 
     adapter = ClaudeAgentAdapter()
-    runner = OrchestratorRunner(adapter, event_store, console)
+    runner = OrchestratorRunner(
+        adapter,
+        event_store,
+        console,
+        mcp_manager=mcp_manager,
+        mcp_tool_prefix=mcp_tool_prefix,
+    )
 
     # Execute
-    if resume_session:
-        print_info(f"Resuming session: {resume_session}")
-        result = await runner.resume_session(resume_session, seed)
-    else:
-        print_info("Starting new orchestrator execution...")
-        result = await runner.execute_seed(seed)
-
-    # Handle result
-    if result.is_ok:
-        res = result.value
-        if res.success:
-            print_success("Execution completed successfully!")
-            print_info(f"Session ID: {res.session_id}")
-            print_info(f"Messages processed: {res.messages_processed}")
-            print_info(f"Duration: {res.duration_seconds:.1f}s")
+    try:
+        if resume_session:
+            print_info(f"Resuming session: {resume_session}")
+            result = await runner.resume_session(resume_session, seed)
+        else:
+            print_info("Starting new orchestrator execution...")
+            result = await runner.execute_seed(seed)
+
+        # Handle result
+        if result.is_ok:
+            res = result.value
+            if res.success:
+                print_success("Execution completed successfully!")
+                print_info(f"Session ID: {res.session_id}")
+                print_info(f"Messages processed: {res.messages_processed}")
+                print_info(f"Duration: {res.duration_seconds:.1f}s")
+            else:
+                print_error("Execution failed")
+                print_info(f"Session ID: {res.session_id}")
+                console.print(f"[dim]Error: {res.final_message[:200]}[/dim]")
+                raise typer.Exit(1)
         else:
-            print_error("Execution failed")
-            print_info(f"Session ID: {res.session_id}")
-            console.print(f"[dim]Error: {res.final_message[:200]}[/dim]")
+            print_error(f"Orchestrator error: {result.error}")
             raise typer.Exit(1)
-    else:
-        print_error(f"Orchestrator error: {result.error}")
-        raise typer.Exit(1)
+    finally:
+        # Cleanup MCP connections
+        if mcp_manager:
+            print_info("Disconnecting MCP servers...")
+            await mcp_manager.disconnect_all()
 
 
 @app.command()
@@ -141,6 +229,20 @@ def workflow(
             help="Resume a previous orchestrator session by ID.",
         ),
     ] = None,
+    mcp_config: Annotated[
+        Path | None,
+        typer.Option(
+            "--mcp-config",
+            help="Path to MCP client configuration YAML file for external tool integration.",
+        ),
+    ] = None,
+    mcp_tool_prefix: Annotated[
+        str,
+        typer.Option(
+            "--mcp-tool-prefix",
+            help="Prefix to add to all MCP tool names (e.g., 'mcp_').",
+        ),
+    ] = "",
     dry_run: Annotated[
         bool,
         typer.Option("--dry-run", "-n", help="Validate seed without executing."),
@@ -156,6 +258,24 @@ def workflow(
 
     Use --orchestrator to execute via Claude Agent SDK (Epic 8).
     Use --resume with --orchestrator to continue a previous session.
+    Use --mcp-config to connect to external MCP servers for additional tools.
+
+    MCP Configuration File Format (YAML):
+
+        mcp_servers:
+          - name: "filesystem"
+            transport: "stdio"
+            command: "npx"
+            args: ["-y", "@anthropic/mcp-server-filesystem", "/workspace"]
+          - name: "github"
+            transport: "stdio"
+            command: "npx"
+            args: ["-y", "@anthropic/mcp-server-github"]
+            env:
+              GITHUB_TOKEN: "${GITHUB_TOKEN}"
+        connection:
+          timeout_seconds: 30
+          retry_attempts: 3
 
     Examples:
 
@@ -165,9 +285,22 @@ def workflow(
         # Orchestrator mode (Claude Agent SDK)
         ouroboros run workflow --orchestrator seed.yaml
 
+        # With MCP server integration
+        ouroboros run workflow --orchestrator --mcp-config mcp.yaml seed.yaml
+
+        # With MCP tool prefix
+        ouroboros run workflow -o --mcp-config mcp.yaml --mcp-tool-prefix "ext_" seed.yaml
+
         # Resume a previous orchestrator session
         ouroboros run workflow --orchestrator --resume orch_abc123 seed.yaml
     """
+    # Validate MCP config requires orchestrator mode
+    if mcp_config and not orchestrator and not resume_session:
+        print_warning(
+            "--mcp-config requires --orchestrator flag. Enabling orchestrator mode."
+        )
+        orchestrator = True
+
     if orchestrator or resume_session:
         # Orchestrator mode
         if resume_session and not orchestrator:
@@ -175,7 +308,12 @@ def workflow(
                 "[yellow]Warning: --resume requires --orchestrator flag. "
                 "Enabling orchestrator mode.[/yellow]"
             )
-        asyncio.run(_run_orchestrator(seed_file, resume_session))
+        asyncio.run(_run_orchestrator(
+            seed_file,
+            resume_session,
+            mcp_config,
+            mcp_tool_prefix,
+        ))
     else:
         # Standard workflow (placeholder)
         print_info(f"Would execute workflow from: {seed_file}")

ouroboros/cli/main.py

@@ -9,7 +9,7 @@ from typing import Annotated
 import typer
 
 from ouroboros import __version__
-from ouroboros.cli.commands import config, init, run, status
+from ouroboros.cli.commands import config, init, mcp, run, status
 from ouroboros.cli.formatters import console
 
 # Create the main Typer app
@@ -25,6 +25,7 @@ app.add_typer(init.app, name="init")
 app.add_typer(run.app, name="run")
 app.add_typer(config.app, name="config")
 app.add_typer(status.app, name="status")
+app.add_typer(mcp.app, name="mcp")
 
 
 def version_callback(value: bool) -> None: