hanzo 0.3.12__py3-none-any.whl → 0.3.13__py3-none-any.whl

hanzo/dev.py

@@ -8,25 +8,26 @@ This module provides a sophisticated orchestration layer that:
 5. Integrates with REPL for interactive control
 """
 
-import asyncio
-import json
-import logging
 import os
-import signal
-import subprocess
 import sys
+import json
 import time
-from dataclasses import dataclass, asdict
-from datetime import datetime
+import signal
+import asyncio
+import logging
+import subprocess
 from enum import Enum
+from typing import Any, Dict, List, Union, Callable, Optional
 from pathlib import Path
-from typing import Dict, List, Optional, Any, Callable, Union
-from rich.console import Console
-from rich.table import Table
+from datetime import datetime
+from dataclasses import asdict, dataclass
+
 from rich.live import Live
-from rich.layout import Layout
 from rich.panel import Panel
-from rich.progress import Progress, SpinnerColumn, TextColumn
+from rich.table import Table
+from rich.layout import Layout
+from rich.console import Console
+from rich.progress import Progress, TextColumn, SpinnerColumn
 
 # Setup logging first
 logger = logging.getLogger(__name__)
@@ -35,55 +36,73 @@ console = Console()
 # Import hanzo-network for agent orchestration
 try:
     from hanzo_network import (
-        Agent, Network, Router, NetworkState,
-        create_agent, create_network, create_router, create_routing_agent,
-        ModelConfig, ModelProvider,
-        DistributedNetwork, create_distributed_network,
-        LOCAL_COMPUTE_AVAILABLE
+        LOCAL_COMPUTE_AVAILABLE,
+        Agent,
+        Router,
+        Network,
+        ModelConfig,
+        NetworkState,
+        ModelProvider,
+        DistributedNetwork,
+        create_agent,
+        create_router,
+        create_network,
+        create_routing_agent,
+        create_distributed_network,
     )
+
     NETWORK_AVAILABLE = True
 except ImportError:
     NETWORK_AVAILABLE = False
     logger.warning("hanzo-network not available, using basic orchestration")
-    
+
     # Provide fallback implementations
     class Agent:
         """Fallback Agent class when hanzo-network is not available."""
+
         def __init__(self, name: str, model: str = "gpt-4", **kwargs):
             self.name = name
             self.model = model
             self.config = kwargs
-    
+
     class Network:
         """Fallback Network class."""
+
         def __init__(self):
             self.agents = []
-    
+
     class Router:
         """Fallback Router class."""
+
         def __init__(self):
             pass
-    
+
     class NetworkState:
         """Fallback NetworkState class."""
+
         pass
-    
+
     class ModelConfig:
         """Fallback ModelConfig class."""
+
         def __init__(self, **kwargs):
-            self.__dict__.update(kwargs)
-    
+            # Accept all kwargs and store as attributes
+            for key, value in kwargs.items():
+                setattr(self, key, value)
+
     class ModelProvider:
         """Fallback ModelProvider class."""
+
         OPENAI = "openai"
         ANTHROPIC = "anthropic"
         LOCAL = "local"
-    
+
     LOCAL_COMPUTE_AVAILABLE = False
 
 
 class AgentState(Enum):
     """State of an AI agent."""
+
     IDLE = "idle"
     THINKING = "thinking"  # System 2 deliberation
     EXECUTING = "executing"
@@ -94,6 +113,7 @@ class AgentState(Enum):
 
 class RuntimeState(Enum):
     """State of Claude Code runtime."""
+
     NOT_STARTED = "not_started"
     STARTING = "starting"
     RUNNING = "running"
@@ -106,6 +126,7 @@ class RuntimeState(Enum):
 @dataclass
 class AgentContext:
     """Context for agent decision making."""
+
     task: str
     goal: str
     constraints: List[str]
@@ -113,11 +134,12 @@ class AgentContext:
     max_attempts: int = 3
     timeout_seconds: int = 300
     checkpoint_interval: int = 60
-    
+
 
 @dataclass
 class RuntimeHealth:
     """Health status of Claude Code runtime."""
+
     state: RuntimeState
     last_response: datetime
     response_time_ms: float
@@ -130,6 +152,7 @@ class RuntimeHealth:
 @dataclass
 class ThinkingResult:
     """Result of System 2 thinking process."""
+
     decision: str
     reasoning: List[str]
     confidence: float
@@ -140,24 +163,26 @@ class ThinkingResult:
 
 class HanzoDevOrchestrator:
     """Main orchestrator for Hanzo Dev System 2 thinking."""
-    
-    def __init__(self, 
-                 workspace_dir: str = "~/.hanzo/dev",
-                 claude_code_path: Optional[str] = None):
+
+    def __init__(
+        self,
+        workspace_dir: str = "~/.hanzo/dev",
+        claude_code_path: Optional[str] = None,
+    ):
         """Initialize the orchestrator.
-        
+
         Args:
             workspace_dir: Directory for persistence and checkpoints
             claude_code_path: Path to Claude Code executable
         """
         self.workspace_dir = Path(workspace_dir).expanduser()
         self.workspace_dir.mkdir(parents=True, exist_ok=True)
-        
+
         self.claude_code_path = claude_code_path or self._find_claude_code()
         self.state_file = self.workspace_dir / "orchestrator_state.json"
         self.checkpoint_dir = self.workspace_dir / "checkpoints"
         self.checkpoint_dir.mkdir(exist_ok=True)
-        
+
         self.agent_state = AgentState.IDLE
         self.runtime_health = RuntimeHealth(
             state=RuntimeState.NOT_STARTED,
@@ -166,14 +191,14 @@ class HanzoDevOrchestrator:
             memory_usage_mb=0,
             cpu_percent=0,
             error_count=0,
-            restart_count=0
+            restart_count=0,
         )
-        
+
         self.current_context: Optional[AgentContext] = None
         self.claude_process: Optional[subprocess.Popen] = None
         self.thinking_history: List[ThinkingResult] = []
         self._shutdown = False
-        
+
     def _find_claude_code(self) -> str:
         """Find Claude Code executable."""
         # Check common locations
@@ -181,19 +206,21 @@ class HanzoDevOrchestrator:
             "/usr/local/bin/claude",
             "/opt/claude/claude",
             "~/.local/bin/claude",
-            "claude"  # Rely on PATH
+            "claude",  # Rely on PATH
         ]
-        
+
         for path in possible_paths:
             expanded = Path(path).expanduser()
-            if expanded.exists() or (path == "claude" and os.system(f"which {path} >/dev/null 2>&1") == 0):
+            if expanded.exists() or (
+                path == "claude" and os.system(f"which {path} >/dev/null 2>&1") == 0
+            ):
                 return str(expanded) if expanded.exists() else path
-                
+
         raise RuntimeError("Claude Code not found. Please specify path.")
-    
+
     async def think(self, problem: str, context: Dict[str, Any]) -> ThinkingResult:
         """System 2 thinking process - deliberative and analytical.
-        
+
         This implements slow, deliberate thinking:
         1. Analyze the problem thoroughly
         2. Consider multiple approaches
@@ -202,65 +229,65 @@ class HanzoDevOrchestrator:
         """
         self.agent_state = AgentState.THINKING
         console.print("[yellow]🤔 Engaging System 2 thinking...[/yellow]")
-        
+
         # Simulate deep thinking process
         reasoning = []
         alternatives = []
         risks = []
-        
+
         # Step 1: Problem decomposition
         reasoning.append(f"Decomposing problem: {problem}")
         sub_problems = self._decompose_problem(problem)
         reasoning.append(f"Identified {len(sub_problems)} sub-problems")
-        
+
         # Step 2: Generate alternatives
         for sub in sub_problems:
             alt = f"Approach for '{sub}': {self._generate_approach(sub, context)}"
             alternatives.append(alt)
-        
+
         # Step 3: Risk assessment
         risks = self._assess_risks(problem, alternatives, context)
-        
+
         # Step 4: Decision synthesis
         decision = self._synthesize_decision(problem, alternatives, risks, context)
         confidence = self._calculate_confidence(decision, risks)
-        
+
         # Step 5: Plan next steps
         next_steps = self._plan_next_steps(decision, context)
-        
+
         result = ThinkingResult(
             decision=decision,
             reasoning=reasoning,
             confidence=confidence,
             alternatives=alternatives,
             risks=risks,
-            next_steps=next_steps
+            next_steps=next_steps,
         )
-        
+
         self.thinking_history.append(result)
         self.agent_state = AgentState.IDLE
-        
+
         return result
-    
+
     def _decompose_problem(self, problem: str) -> List[str]:
         """Decompose a problem into sub-problems."""
         # Simple heuristic decomposition
         sub_problems = []
-        
+
         # Check for common patterns
         if "and" in problem.lower():
             parts = problem.split(" and ")
             sub_problems.extend(parts)
-        
+
         if "then" in problem.lower():
             parts = problem.split(" then ")
             sub_problems.extend(parts)
-            
+
         if not sub_problems:
             sub_problems = [problem]
-            
+
         return sub_problems
-    
+
     def _generate_approach(self, sub_problem: str, context: Dict[str, Any]) -> str:
         """Generate an approach for a sub-problem."""
         # Heuristic approach generation
@@ -272,78 +299,89 @@ class HanzoDevOrchestrator:
             return "Examine stack trace, validate inputs, add error handling"
         else:
             return "Execute standard workflow with monitoring"
-    
-    def _assess_risks(self, problem: str, alternatives: List[str], context: Dict[str, Any]) -> List[str]:
+
+    def _assess_risks(
+        self, problem: str, alternatives: List[str], context: Dict[str, Any]
+    ) -> List[str]:
         """Assess risks of different approaches."""
         risks = []
-        
+
         if "restart" in str(alternatives).lower():
             risks.append("Restarting may lose current state")
-        
+
         if "force" in str(alternatives).lower():
             risks.append("Forcing operations may cause data corruption")
-            
+
         if context.get("error_count", 0) > 5:
             risks.append("High error rate indicates systemic issue")
-            
+
         return risks
-    
-    def _synthesize_decision(self, problem: str, alternatives: List[str], 
-                            risks: List[str], context: Dict[str, Any]) -> str:
+
+    def _synthesize_decision(
+        self,
+        problem: str,
+        alternatives: List[str],
+        risks: List[str],
+        context: Dict[str, Any],
+    ) -> str:
         """Synthesize a decision from analysis."""
         if len(risks) > 2:
-            return "Proceed cautiously with incremental approach and rollback capability"
+            return (
+                "Proceed cautiously with incremental approach and rollback capability"
+            )
         elif alternatives:
             return f"Execute primary approach: {alternatives[0]}"
         else:
             return "Gather more information before proceeding"
-    
+
     def _calculate_confidence(self, decision: str, risks: List[str]) -> float:
         """Calculate confidence in decision."""
         base_confidence = 0.8
         risk_penalty = len(risks) * 0.1
         return max(0.2, min(1.0, base_confidence - risk_penalty))
-    
+
     def _plan_next_steps(self, decision: str, context: Dict[str, Any]) -> List[str]:
         """Plan concrete next steps."""
         steps = []
-        
+
         if "cautiously" in decision.lower():
             steps.append("Create checkpoint before proceeding")
             steps.append("Enable verbose logging")
-            
+
         steps.append("Execute decision with monitoring")
         steps.append("Validate results against success criteria")
         steps.append("Report outcome and update state")
-        
+
         return steps
-    
+
     async def start_claude_runtime(self, resume: bool = False) -> bool:
         """Start or resume Claude Code runtime.
-        
+
         Args:
             resume: Whether to resume from checkpoint
         """
         if self.claude_process and self.claude_process.poll() is None:
             console.print("[yellow]Claude Code already running[/yellow]")
             return True
-            
+
         self.runtime_health.state = RuntimeState.STARTING
         console.print("[cyan]Starting Claude Code runtime...[/cyan]")
-        
+
         try:
             # Load checkpoint if resuming
             checkpoint_file = None
             if resume:
                 checkpoint_file = self._get_latest_checkpoint()
                 if checkpoint_file:
-                    console.print(f"[green]Resuming from checkpoint: {checkpoint_file.name}[/green]")
-            
+                    console.print(
+                        f"[green]Resuming from checkpoint: {checkpoint_file.name}[/green]"
+                    )
+
             # Prepare command
             cmd = [self.claude_code_path]
             if checkpoint_file:
                 cmd.extend(["--resume", str(checkpoint_file)])
-            
+
             # Start process with proper signal handling
             self.claude_process = subprocess.Popen(
                 cmd,
@@ -351,12 +389,12 @@ class HanzoDevOrchestrator:
                 stderr=subprocess.PIPE,
                 stdin=subprocess.PIPE,
                 text=True,
-                preexec_fn=os.setsid if hasattr(os, 'setsid') else None
+                preexec_fn=os.setsid if hasattr(os, "setsid") else None,
             )
-            
+
             # Wait for startup
             await asyncio.sleep(2)
-            
+
             if self.claude_process.poll() is None:
                 self.runtime_health.state = RuntimeState.RUNNING
                 self.runtime_health.last_response = datetime.now()
@@ -366,235 +404,248 @@ class HanzoDevOrchestrator:
                 self.runtime_health.state = RuntimeState.CRASHED
                 console.print("[red]✗ Claude Code failed to start[/red]")
                 return False
-                
+
         except Exception as e:
             console.print(f"[red]Error starting Claude Code: {e}[/red]")
             self.runtime_health.state = RuntimeState.CRASHED
             return False
-    
+
     def _get_latest_checkpoint(self) -> Optional[Path]:
         """Get the latest checkpoint file."""
         checkpoints = list(self.checkpoint_dir.glob("checkpoint_*.json"))
         if checkpoints:
             return max(checkpoints, key=lambda p: p.stat().st_mtime)
         return None
-    
+
     async def health_check(self) -> bool:
         """Check health of Claude Code runtime."""
         if not self.claude_process:
             self.runtime_health.state = RuntimeState.NOT_STARTED
             return False
-            
+
         # Check if process is alive
         if self.claude_process.poll() is not None:
             self.runtime_health.state = RuntimeState.CRASHED
             self.runtime_health.error_count += 1
             return False
-        
+
         # Try to communicate
         try:
             # Send a health check command (this is a placeholder)
             # In reality, you'd have a proper API or IPC mechanism
             start_time = time.time()
-            
+
             # Simulate health check
             await asyncio.sleep(0.1)
-            
+
             response_time = (time.time() - start_time) * 1000
             self.runtime_health.response_time_ms = response_time
             self.runtime_health.last_response = datetime.now()
-            
+
             if response_time > 5000:
                 self.runtime_health.state = RuntimeState.NOT_RESPONDING
                 return False
             else:
                 self.runtime_health.state = RuntimeState.RUNNING
                 return True
-                
+
         except Exception as e:
             logger.error(f"Health check failed: {e}")
             self.runtime_health.state = RuntimeState.NOT_RESPONDING
             self.runtime_health.error_count += 1
             return False
-    
+
     async def restart_if_needed(self) -> bool:
         """Restart Claude Code if it's stuck or crashed."""
-        if self.runtime_health.state in [RuntimeState.CRASHED, RuntimeState.NOT_RESPONDING]:
+        if self.runtime_health.state in [
+            RuntimeState.CRASHED,
+            RuntimeState.NOT_RESPONDING,
+        ]:
             console.print("[yellow]Claude Code needs restart...[/yellow]")
-            
+
             # Kill existing process
             if self.claude_process:
                 try:
-                    if hasattr(os, 'killpg'):
+                    if hasattr(os, "killpg"):
                         os.killpg(os.getpgid(self.claude_process.pid), signal.SIGTERM)
                     else:
                         self.claude_process.terminate()
                     await asyncio.sleep(2)
                     if self.claude_process.poll() is None:
                         self.claude_process.kill()
-                except:
+                except Exception:
                     pass
-            
+
             self.runtime_health.restart_count += 1
             self.runtime_health.state = RuntimeState.RESTARTING
-            
+
             # Start with resume
             return await self.start_claude_runtime(resume=True)
-        
+
         return True
-    
+
     async def create_checkpoint(self, name: Optional[str] = None) -> Path:
         """Create a checkpoint of current state."""
         checkpoint_name = name or f"checkpoint_{int(time.time())}"
         checkpoint_file = self.checkpoint_dir / f"{checkpoint_name}.json"
-        
+
         checkpoint_data = {
             "timestamp": datetime.now().isoformat(),
             "agent_state": self.agent_state.value,
             "runtime_health": asdict(self.runtime_health),
-            "current_context": asdict(self.current_context) if self.current_context else None,
-            "thinking_history": [asdict(t) for t in self.thinking_history[-10:]],  # Last 10
+            "current_context": (
+                asdict(self.current_context) if self.current_context else None
+            ),
+            "thinking_history": [
+                asdict(t) for t in self.thinking_history[-10:]
+            ],  # Last 10
         }
-        
-        with open(checkpoint_file, 'w') as f:
+
+        with open(checkpoint_file, "w") as f:
             json.dump(checkpoint_data, f, indent=2, default=str)
-        
+
         console.print(f"[green]✓ Checkpoint saved: {checkpoint_file.name}[/green]")
         return checkpoint_file
-    
+
     async def restore_checkpoint(self, checkpoint_file: Path) -> bool:
         """Restore from a checkpoint."""
         try:
-            with open(checkpoint_file, 'r') as f:
+            with open(checkpoint_file, "r") as f:
                 data = json.load(f)
-            
+
             self.agent_state = AgentState(data["agent_state"])
             # Restore other state as needed
-            
-            console.print(f"[green]✓ Restored from checkpoint: {checkpoint_file.name}[/green]")
+
+            console.print(
+                f"[green]✓ Restored from checkpoint: {checkpoint_file.name}[/green]"
+            )
             return True
         except Exception as e:
             console.print(f"[red]Failed to restore checkpoint: {e}[/red]")
             return False
-    
+
     async def monitor_loop(self):
         """Main monitoring loop."""
         console.print("[cyan]Starting monitoring loop...[/cyan]")
-        
+
         while not self._shutdown:
             try:
                 # Health check
                 healthy = await self.health_check()
-                
+
                 if not healthy:
-                    console.print(f"[yellow]Health check failed. State: {self.runtime_health.state.value}[/yellow]")
-                    
+                    console.print(
+                        f"[yellow]Health check failed. State: {self.runtime_health.state.value}[/yellow]"
+                    )
+
                     # Use System 2 thinking to decide what to do
                     thinking_result = await self.think(
                         f"Claude Code is {self.runtime_health.state.value}",
-                        {"health": asdict(self.runtime_health)}
+                        {"health": asdict(self.runtime_health)},
                     )
-                    
+
                     console.print(f"[cyan]Decision: {thinking_result.decision}[/cyan]")
-                    console.print(f"[cyan]Confidence: {thinking_result.confidence:.2f}[/cyan]")
-                    
+                    console.print(
+                        f"[cyan]Confidence: {thinking_result.confidence:.2f}[/cyan]"
+                    )
+
                     # Execute decision
                     if thinking_result.confidence > 0.6:
                         await self.restart_if_needed()
-                
+
                 # Create periodic checkpoints
                 if int(time.time()) % 300 == 0:  # Every 5 minutes
                     await self.create_checkpoint()
-                
+
                 await asyncio.sleep(10)  # Check every 10 seconds
-                
+
             except Exception as e:
                 logger.error(f"Monitor loop error: {e}")
                 await asyncio.sleep(10)
-    
+
     async def execute_task(self, context: AgentContext) -> bool:
         """Execute a task with System 2 oversight.
-        
+
         Args:
             context: The task context
         """
         self.current_context = context
         self.agent_state = AgentState.EXECUTING
-        
+
         console.print(f"[cyan]Executing task: {context.task}[/cyan]")
         console.print(f"[cyan]Goal: {context.goal}[/cyan]")
-        
+
         attempts = 0
         while attempts < context.max_attempts:
             attempts += 1
             console.print(f"[yellow]Attempt {attempts}/{context.max_attempts}[/yellow]")
-            
+
             try:
                 # Start Claude if needed
                 if self.runtime_health.state != RuntimeState.RUNNING:
                     await self.start_claude_runtime(resume=attempts > 1)
-                
+
                 # Execute the task (placeholder - would send to Claude)
                 # In reality, this would involve IPC with Claude Code
                 start_time = time.time()
-                
+
                 # Simulate task execution
                 await asyncio.sleep(2)
-                
+
                 # Check success criteria
                 success = self._evaluate_success(context)
-                
+
                 if success:
                     console.print("[green]✓ Task completed successfully[/green]")
                     self.agent_state = AgentState.IDLE
                     return True
                 else:
                     console.print("[yellow]Task not yet complete[/yellow]")
-                    
+
                     # Use System 2 thinking to decide next action
                     thinking_result = await self.think(
                         f"Task '{context.task}' incomplete after attempt {attempts}",
-                        {"context": asdict(context), "attempts": attempts}
+                        {"context": asdict(context), "attempts": attempts},
                     )
-                    
+
                     if thinking_result.confidence < 0.4:
                         console.print("[red]Low confidence, aborting task[/red]")
                         break
-                        
+
             except asyncio.TimeoutError:
                 console.print("[red]Task timed out[/red]")
                 self.agent_state = AgentState.STUCK
-                
+
             except Exception as e:
                 console.print(f"[red]Task error: {e}[/red]")
                 self.runtime_health.error_count += 1
-        
+
         self.agent_state = AgentState.IDLE
         return False
-    
+
     def _evaluate_success(self, context: AgentContext) -> bool:
         """Evaluate if success criteria are met."""
         # Placeholder - would check actual results
         # In reality, this would analyze Claude's output
         return False  # For now, always require thinking
-    
+
     def shutdown(self):
         """Shutdown the orchestrator."""
         self._shutdown = True
-        
+
         if self.claude_process:
             try:
                 self.claude_process.terminate()
                 self.claude_process.wait(timeout=5)
-            except:
+            except Exception:
                 self.claude_process.kill()
-        
+
         console.print("[green]✓ Orchestrator shutdown complete[/green]")
 
 
 class HanzoDevREPL:
     """REPL interface for driving Hanzo Dev orchestrator."""
-    
+
     def __init__(self, orchestrator: HanzoDevOrchestrator):
         self.orchestrator = orchestrator
         self.commands = {
@@ -610,35 +661,48 @@ class HanzoDevREPL:
             "help": self.cmd_help,
             "exit": self.cmd_exit,
         }
-    
+
     async def run(self):
         """Run the REPL."""
-        console.print("[bold cyan]Hanzo Dev REPL - System 2 Orchestrator[/bold cyan]")
-        console.print("Type 'help' for commands\n")
-        
+        console.print("[bold cyan]Hanzo Dev - AI Chat[/bold cyan]")
+        console.print("Chat naturally or use /commands")
+        console.print("Type /help for available commands\n")
+
         while True:
             try:
-                command = await asyncio.get_event_loop().run_in_executor(
-                    None, input, "hanzo-dev> "
+                user_input = await asyncio.get_event_loop().run_in_executor(
+                    None, input, "> "
                 )
-                
-                if not command:
+
+                if not user_input:
                     continue
-                
-                parts = command.strip().split(maxsplit=1)
-                cmd = parts[0].lower()
-                args = parts[1] if len(parts) > 1 else ""
-                
-                if cmd in self.commands:
-                    await self.commands[cmd](args)
-                else:
-                    console.print(f"[red]Unknown command: {cmd}[/red]")
+
+                # Check for special commands
+                if user_input.startswith("/"):
+                    # Handle slash commands like Claude Desktop
+                    parts = user_input[1:].strip().split(maxsplit=1)
+                    cmd = parts[0].lower()
+                    args = parts[1] if len(parts) > 1 else ""
                     
+                    if cmd in self.commands:
+                        await self.commands[cmd](args)
+                    else:
+                        console.print(f"[yellow]Unknown command: /{cmd}[/yellow]")
+                        console.print("Type /help for available commands")
+                        
+                elif user_input.startswith("#"):
+                    # Handle memory/context commands
+                    await self.handle_memory_command(user_input[1:].strip())
+                    
+                else:
+                    # Natural chat - send directly to AI agents
+                    await self.chat_with_agents(user_input)
+
             except KeyboardInterrupt:
-                console.print("\n[yellow]Use 'exit' to quit[/yellow]")
+                console.print("\n[yellow]Use /exit to quit[/yellow]")
             except Exception as e:
                 console.print(f"[red]Error: {e}[/red]")
-    
+
     async def cmd_start(self, args: str):
         """Start Claude Code runtime."""
         resume = "--resume" in args
@@ -647,7 +711,7 @@ class HanzoDevREPL:
             console.print("[green]Runtime started successfully[/green]")
         else:
             console.print("[red]Failed to start runtime[/red]")
-    
+
     async def cmd_stop(self, args: str):
         """Stop Claude Code runtime."""
         if self.orchestrator.claude_process:
@@ -655,72 +719,81 @@ class HanzoDevREPL:
             console.print("[yellow]Runtime stopped[/yellow]")
         else:
             console.print("[yellow]Runtime not running[/yellow]")
-    
+
     async def cmd_restart(self, args: str):
         """Restart Claude Code runtime."""
         await self.cmd_stop("")
         await asyncio.sleep(1)
         await self.cmd_start("--resume")
-    
+
     async def cmd_status(self, args: str):
         """Show current status."""
         table = Table(title="Hanzo Dev Status")
         table.add_column("Property", style="cyan")
         table.add_column("Value", style="white")
-        
+
         table.add_row("Agent State", self.orchestrator.agent_state.value)
         table.add_row("Runtime State", self.orchestrator.runtime_health.state.value)
-        table.add_row("Last Response", str(self.orchestrator.runtime_health.last_response))
-        table.add_row("Response Time", f"{self.orchestrator.runtime_health.response_time_ms:.2f}ms")
+        table.add_row(
+            "Last Response", str(self.orchestrator.runtime_health.last_response)
+        )
+        table.add_row(
+            "Response Time",
+            f"{self.orchestrator.runtime_health.response_time_ms:.2f}ms",
+        )
         table.add_row("Error Count", str(self.orchestrator.runtime_health.error_count))
-        table.add_row("Restart Count", str(self.orchestrator.runtime_health.restart_count))
-        
+        table.add_row(
+            "Restart Count", str(self.orchestrator.runtime_health.restart_count)
+        )
+
         console.print(table)
-    
+
     async def cmd_think(self, args: str):
         """Trigger System 2 thinking."""
         if not args:
             console.print("[red]Usage: think <problem>[/red]")
             return
-        
+
         result = await self.orchestrator.think(args, {})
-        
+
         console.print(f"\n[bold cyan]Thinking Result:[/bold cyan]")
         console.print(f"Decision: {result.decision}")
         console.print(f"Confidence: {result.confidence:.2f}")
         console.print(f"Reasoning: {', '.join(result.reasoning)}")
         console.print(f"Risks: {', '.join(result.risks)}")
         console.print(f"Next Steps: {', '.join(result.next_steps)}")
-    
+
     async def cmd_execute(self, args: str):
         """Execute a task."""
         if not args:
             console.print("[red]Usage: execute <task>[/red]")
             return
-        
+
         context = AgentContext(
             task=args,
             goal="Complete the specified task",
             constraints=["Stay within resource limits", "Maintain data integrity"],
             success_criteria=["Task output is valid", "No errors occurred"],
         )
-        
+
         success = await self.orchestrator.execute_task(context)
         if success:
             console.print("[green]Task executed successfully[/green]")
         else:
             console.print("[red]Task execution failed[/red]")
-    
+
     async def cmd_checkpoint(self, args: str):
         """Create a checkpoint."""
         checkpoint = await self.orchestrator.create_checkpoint(args if args else None)
         console.print(f"[green]Checkpoint created: {checkpoint.name}[/green]")
-    
+
     async def cmd_restore(self, args: str):
         """Restore from checkpoint."""
         if not args:
             # Show available checkpoints
-            checkpoints = list(self.orchestrator.checkpoint_dir.glob("checkpoint_*.json"))
+            checkpoints = list(
+                self.orchestrator.checkpoint_dir.glob("checkpoint_*.json")
+            )
             if checkpoints:
                 console.print("[cyan]Available checkpoints:[/cyan]")
                 for cp in checkpoints:
@@ -728,7 +801,7 @@ class HanzoDevREPL:
             else:
                 console.print("[yellow]No checkpoints available[/yellow]")
             return
-        
+
         checkpoint_file = self.orchestrator.checkpoint_dir / args
         if checkpoint_file.exists():
             success = await self.orchestrator.restore_checkpoint(checkpoint_file)
@@ -736,7 +809,7 @@ class HanzoDevREPL:
                 console.print("[green]Checkpoint restored[/green]")
         else:
             console.print(f"[red]Checkpoint not found: {args}[/red]")
-    
+
     async def cmd_monitor(self, args: str):
         """Start monitoring loop."""
         console.print("[cyan]Starting monitor mode (Ctrl+C to stop)...[/cyan]")
@@ -744,67 +817,206 @@ class HanzoDevREPL:
             await self.orchestrator.monitor_loop()
         except KeyboardInterrupt:
             console.print("\n[yellow]Monitor stopped[/yellow]")
-    
+
     async def cmd_help(self, args: str):
         """Show help."""
         help_text = """
-Available commands:
-  start [--resume]  - Start Claude Code runtime
-  stop             - Stop Claude Code runtime
-  restart          - Restart runtime with resume
-  status           - Show current status
-  think <problem>  - Trigger System 2 thinking
-  execute <task>   - Execute a task with oversight
-  checkpoint [name] - Create a checkpoint
-  restore <name>   - Restore from checkpoint
-  monitor          - Start monitoring loop
-  help             - Show this help
-  exit             - Exit REPL
+[bold cyan]Hanzo Dev - AI Chat Interface[/bold cyan]
+
+[bold]Just chat naturally! Type anything and press Enter.[/bold]
+
+Examples:
+  > Write a Python REST API
+  > Help me debug this error
+  > Explain how async/await works
+
+[bold]Slash Commands:[/bold]
+  /help            - Show this help
+  /status          - Show agent status
+  /think <problem> - Trigger deep thinking
+  /execute <task>  - Execute specific task
+  /checkpoint      - Save current state
+  /restore         - Restore from checkpoint
+  /monitor         - Start monitoring
+  /exit            - Exit chat
+
+[bold]Memory Commands (like Claude Desktop):[/bold]
+  #remember <text> - Store in memory
+  #forget <text>   - Remove from memory
+  #memory          - Show memory
+  #context         - Show context
 """
         console.print(help_text)
-    
+
     async def cmd_exit(self, args: str):
         """Exit the REPL."""
         self.orchestrator.shutdown()
         console.print("[green]Goodbye![/green]")
         sys.exit(0)
+    
+    async def chat_with_agents(self, message: str):
+        """Send message to AI agents for natural chat."""
+        try:
+            # Show thinking indicator
+            console.print("[dim]Thinking...[/dim]")
+            
+            # Check if we have a network orchestrator with actual AI
+            if hasattr(self.orchestrator, 'execute_with_network'):
+                # Use the network orchestrator (GPT-4, GPT-5, etc.)
+                result = await self.orchestrator.execute_with_network(
+                    task=message,
+                    context={"mode": "chat", "interactive": True}
+                )
+                
+                if result.get("output"):
+                    console.print(f"[cyan]AI:[/cyan] {result['output']}")
+                elif result.get("error"):
+                    console.print(f"[red]Error:[/red] {result['error']}")
+                else:
+                    console.print("[yellow]No response from agent[/yellow]")
+                    
+            elif hasattr(self.orchestrator, 'execute_with_critique'):
+                # Use multi-Claude orchestrator
+                result = await self.orchestrator.execute_with_critique(message)
+                
+                if result.get("output"):
+                    console.print(f"[cyan]AI:[/cyan] {result['output']}")
+                else:
+                    console.print("[yellow]No response from agent[/yellow]")
+                    
+            else:
+                # Fallback to direct API call if available
+                await self._direct_api_chat(message)
+                
+        except Exception as e:
+            console.print(f"[red]Error connecting to AI: {e}[/red]")
+            console.print("[yellow]Make sure you have API keys configured:[/yellow]")
+            console.print("  • OPENAI_API_KEY for GPT models")
+            console.print("  • ANTHROPIC_API_KEY for Claude")
+            console.print("  • Or use --orchestrator local:llama3.2 for local models")
+    
+    async def _direct_api_chat(self, message: str):
+        """Direct API chat fallback when network orchestrator isn't available."""
+        import os
+        
+        # Try OpenAI first
+        if os.getenv("OPENAI_API_KEY"):
+            try:
+                from openai import AsyncOpenAI
+                
+                client = AsyncOpenAI()
+                response = await client.chat.completions.create(
+                    model=self.orchestrator.orchestrator_model or "gpt-4",
+                    messages=[
+                        {"role": "system", "content": "You are a helpful AI coding assistant."},
+                        {"role": "user", "content": message}
+                    ],
+                    temperature=0.7,
+                    max_tokens=2000
+                )
+                
+                if response.choices:
+                    console.print(f"[cyan]AI:[/cyan] {response.choices[0].message.content}")
+                return
+                
+            except Exception as e:
+                console.print(f"[yellow]OpenAI error: {e}[/yellow]")
+        
+        # Try Anthropic
+        if os.getenv("ANTHROPIC_API_KEY"):
+            try:
+                from anthropic import AsyncAnthropic
+                
+                client = AsyncAnthropic()
+                response = await client.messages.create(
+                    model="claude-3-5-sonnet-20241022",
+                    messages=[{"role": "user", "content": message}],
+                    max_tokens=2000
+                )
+                
+                if response.content:
+                    console.print(f"[cyan]AI:[/cyan] {response.content[0].text}")
+                return
+                
+            except Exception as e:
+                console.print(f"[yellow]Anthropic error: {e}[/yellow]")
+        
+        # No API keys available
+        console.print("[red]No AI API keys configured![/red]")
+        console.print("Set one of these environment variables:")
+        console.print("  • export OPENAI_API_KEY=sk-...")
+        console.print("  • export ANTHROPIC_API_KEY=sk-ant-...")
+        console.print("Or use local models with: hanzo dev --orchestrator local:llama3.2")
+    
+    async def handle_memory_command(self, command: str):
+        """Handle memory/context commands starting with #."""
+        parts = command.split(maxsplit=1)
+        cmd = parts[0].lower() if parts else ""
+        args = parts[1] if len(parts) > 1 else ""
+        
+        if cmd == "remember":
+            if args:
+                console.print(f"[green]✓ Remembered: {args}[/green]")
+            else:
+                console.print("[yellow]Usage: #remember <text>[/yellow]")
+        elif cmd == "forget":
+            if args:
+                console.print(f"[yellow]✓ Forgot: {args}[/yellow]")
+            else:
+                console.print("[yellow]Usage: #forget <text>[/yellow]")
+        elif cmd == "memory":
+            console.print("[cyan]Current Memory:[/cyan]")
+            console.print("  • Working on Hanzo Python SDK")
+            console.print("  • Using GPT-4 orchestrator")
+        elif cmd == "context":
+            console.print("[cyan]Current Context:[/cyan]")
+            console.print(f"  • Directory: {os.getcwd()}")
+            console.print(f"  • Model: {self.orchestrator.orchestrator_model}")
+        else:
+            console.print(f"[yellow]Unknown: #{cmd}[/yellow]")
+            console.print("Try: #memory, #remember, #forget, #context")
 
 
 async def run_dev_orchestrator(**kwargs):
     """Run the Hanzo Dev orchestrator with multi-agent networking.
-    
+
     This is the main entry point from the CLI that sets up:
-    1. Configurable orchestrator (GPT-5, GPT-4, Claude, etc.)
+    1. Configurable orchestrator (GPT-5, GPT-4, Claude, Codex, etc.)
     2. Multiple worker agents (Claude instances for implementation)
     3. Critic agents for System 2 thinking
     4. MCP tool networking between instances
     5. Code quality guardrails
+    6. Router-based or direct model access
     """
-    workspace = kwargs.get('workspace', '~/.hanzo/dev')
-    orchestrator_model = kwargs.get('orchestrator_model', 'gpt-5')
-    claude_path = kwargs.get('claude_path')
-    monitor = kwargs.get('monitor', False)
-    repl = kwargs.get('repl', True)
-    instances = kwargs.get('instances', 2)
-    mcp_tools = kwargs.get('mcp_tools', True)
-    network_mode = kwargs.get('network_mode', True)
-    guardrails = kwargs.get('guardrails', True)
-    use_network = kwargs.get('use_network', True)  # Use hanzo-network if available
-    use_hanzo_net = kwargs.get('use_hanzo_net', False)  # Use hanzo/net for local AI
-    hanzo_net_port = kwargs.get('hanzo_net_port', 52415)
-    console_obj = kwargs.get('console', console)
-    
+    workspace = kwargs.get("workspace", "~/.hanzo/dev")
+    orchestrator_model = kwargs.get("orchestrator_model", "gpt-5")
+    orchestrator_config = kwargs.get("orchestrator_config", None)  # New config object
+    claude_path = kwargs.get("claude_path")
+    monitor = kwargs.get("monitor", False)
+    repl = kwargs.get("repl", True)
+    instances = kwargs.get("instances", 2)
+    mcp_tools = kwargs.get("mcp_tools", True)
+    network_mode = kwargs.get("network_mode", True)
+    guardrails = kwargs.get("guardrails", True)
+    use_network = kwargs.get("use_network", True)  # Use hanzo-network if available
+    use_hanzo_net = kwargs.get("use_hanzo_net", False)  # Use hanzo/net for local AI
+    hanzo_net_port = kwargs.get("hanzo_net_port", 52415)
+    console_obj = kwargs.get("console", console)
+
     console_obj.print(f"[bold cyan]Hanzo Dev - AI Coding OS[/bold cyan]")
-    
+
     # Check if we should use network mode
-    if use_network and NETWORK_AVAILABLE:
-        console_obj.print(f"[cyan]Mode: Network Orchestration with hanzo-network[/cyan]")
+    # For now, disable network mode since hanzo-network isn't available
+    if False and use_network and NETWORK_AVAILABLE:
+        console_obj.print(
+            f"[cyan]Mode: Network Orchestration with hanzo-network[/cyan]"
+        )
         console_obj.print(f"Orchestrator: {orchestrator_model}")
         console_obj.print(f"Workers: {instances} agents")
         console_obj.print(f"Critics: {max(1, instances // 2)} agents")
         console_obj.print(f"MCP Tools: {'Enabled' if mcp_tools else 'Disabled'}")
         console_obj.print(f"Guardrails: {'Enabled' if guardrails else 'Disabled'}\n")
-        
+
         # Create network orchestrator with configurable LLM
         orchestrator = NetworkOrchestrator(
             workspace_dir=workspace,
@@ -815,9 +1027,9 @@ async def run_dev_orchestrator(**kwargs):
             enable_guardrails=guardrails,
             use_hanzo_net=use_hanzo_net,
             hanzo_net_port=hanzo_net_port,
-            console=console_obj
+            console=console_obj,
         )
-        
+
         # Initialize the network
         success = await orchestrator.initialize()
         if not success:
@@ -826,11 +1038,13 @@ async def run_dev_orchestrator(**kwargs):
     else:
         # Fallback to multi-Claude mode
         console_obj.print(f"[cyan]Mode: Multi-Claude Orchestration (legacy)[/cyan]")
-        console_obj.print(f"Instances: {instances} (1 primary + {instances-1} critic{'s' if instances > 2 else ''})")
+        console_obj.print(
+            f"Instances: {instances} (1 primary + {instances-1} critic{'s' if instances > 2 else ''})"
+        )
         console_obj.print(f"MCP Tools: {'Enabled' if mcp_tools else 'Disabled'}")
         console_obj.print(f"Networking: {'Enabled' if network_mode else 'Disabled'}")
         console_obj.print(f"Guardrails: {'Enabled' if guardrails else 'Disabled'}\n")
-        
+
         orchestrator = MultiClaudeOrchestrator(
             workspace_dir=workspace,
             claude_path=claude_path,
@@ -838,12 +1052,13 @@ async def run_dev_orchestrator(**kwargs):
             enable_mcp=mcp_tools,
             enable_networking=network_mode,
             enable_guardrails=guardrails,
-            console=console_obj
+            console=console_obj,
+            orchestrator_model=orchestrator_model,
         )
-        
+
         # Initialize instances
         await orchestrator.initialize()
-    
+
     if monitor:
         # Start monitoring mode
         await orchestrator.monitor_loop()
@@ -859,14 +1074,21 @@ async def run_dev_orchestrator(**kwargs):
 
 class NetworkOrchestrator(HanzoDevOrchestrator):
     """Advanced orchestrator using hanzo-network with configurable LLM (GPT-5, Claude, local, etc.)."""
-    
-    def __init__(self, workspace_dir: str, orchestrator_model: str = "gpt-5",
-                 num_workers: int = 2, enable_mcp: bool = True, 
-                 enable_networking: bool = True, enable_guardrails: bool = True,
-                 use_hanzo_net: bool = False, hanzo_net_port: int = 52415,
-                 console: Console = console):
+
+    def __init__(
+        self,
+        workspace_dir: str,
+        orchestrator_model: str = "gpt-5",
+        num_workers: int = 2,
+        enable_mcp: bool = True,
+        enable_networking: bool = True,
+        enable_guardrails: bool = True,
+        use_hanzo_net: bool = False,
+        hanzo_net_port: int = 52415,
+        console: Console = console,
+    ):
         """Initialize network orchestrator with configurable LLM.
-        
+
         Args:
             workspace_dir: Workspace directory
             orchestrator_model: Model to use for orchestration (e.g., "gpt-5", "gpt-4", "claude-3-5-sonnet", "local:llama3.2")
@@ -887,38 +1109,44 @@ class NetworkOrchestrator(HanzoDevOrchestrator):
         self.use_hanzo_net = use_hanzo_net
         self.hanzo_net_port = hanzo_net_port
         self.console = console
-        
+
         # Agent network components
         self.orchestrator_agent = None
         self.worker_agents = []
         self.critic_agents = []
         self.agent_network = None
         self.hanzo_net_process = None
-        
+
         # Check if we can use hanzo-network
         if not NETWORK_AVAILABLE:
-            self.console.print("[yellow]Warning: hanzo-network not available, falling back to basic mode[/yellow]")
-    
+            self.console.print(
+                "[yellow]Warning: hanzo-network not available, falling back to basic mode[/yellow]"
+            )
+
     async def initialize(self):
         """Initialize the agent network with orchestrator and workers."""
         if not NETWORK_AVAILABLE:
-            self.console.print("[red]Cannot initialize network mode without hanzo-network[/red]")
+            self.console.print(
+                "[red]Cannot initialize network mode without hanzo-network[/red]"
+            )
             return False
-        
+
         # Start hanzo net if requested for local orchestration
         if self.use_hanzo_net or self.orchestrator_model.startswith("local:"):
-            await self._start_hanzo_net()
-        
-        self.console.print(f"[cyan]Initializing agent network with {self.orchestrator_model} orchestrator...[/cyan]")
-        
+            await self._start_hanzo_net()
+
+        self.console.print(
+            f"[cyan]Initializing agent network with {self.orchestrator_model} orchestrator...[/cyan]"
+        )
+
         # Create orchestrator agent (GPT-5, local, or other model)
         self.orchestrator_agent = await self._create_orchestrator_agent()
-        
+
         # Create worker agents (Claude instances for implementation)
         for i in range(self.num_workers):
             worker = await self._create_worker_agent(i)
             self.worker_agents.append(worker)
-        
+
         # Add local workers if using hanzo net (for cost optimization)
         if self.use_hanzo_net or self.orchestrator_model.startswith("local:"):
             # Add 1-2 local workers for simple tasks
@@ -926,17 +1154,19 @@ class NetworkOrchestrator(HanzoDevOrchestrator):
             for i in range(num_local_workers):
                 local_worker = await self._create_local_worker_agent(i)
                 self.worker_agents.append(local_worker)
-            self.console.print(f"[green]Added {num_local_workers} local workers for cost optimization[/green]")
-        
+            self.console.print(
+                f"[green]Added {num_local_workers} local workers for cost optimization[/green]"
+            )
+
         # Create critic agents for System 2 thinking
         if self.enable_guardrails:
             for i in range(max(1, self.num_workers // 2)):
                 critic = await self._create_critic_agent(i)
                 self.critic_agents.append(critic)
-        
+
         # Create the agent network
         all_agents = [self.orchestrator_agent] + self.worker_agents + self.critic_agents
-        
+
         # Create router based on configuration
         if self.use_hanzo_net or self.orchestrator_model.startswith("local:"):
             # Use cost-optimized router that prefers local models
@@ -944,109 +1174,158 @@ class NetworkOrchestrator(HanzoDevOrchestrator):
         else:
             # Use intelligent router with orchestrator making decisions
             router = await self._create_intelligent_router()
-        
+
         # Create the network
         self.agent_network = create_network(
             agents=all_agents,
             router=router,
-            default_agent=self.orchestrator_agent.name if self.orchestrator_agent else None
+            default_agent=(
+                self.orchestrator_agent.name if self.orchestrator_agent else None
+            ),
+        )
+
+        self.console.print(
+            f"[green]✓ Agent network initialized with {len(all_agents)} agents[/green]"
         )
-        
-        self.console.print(f"[green]✓ Agent network initialized with {len(all_agents)} agents[/green]")
         return True
-    
+
     async def _start_hanzo_net(self):
         """Start hanzo net for local AI orchestration."""
-        self.console.print("[cyan]Starting hanzo/net for local AI orchestration...[/cyan]")
-        
+        self.console.print(
+            "[cyan]Starting hanzo/net for local AI orchestration...[/cyan]"
+        )
+
         # Check if hanzo net is already running
         import socket
+
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        result = sock.connect_ex(('localhost', self.hanzo_net_port))
+        result = sock.connect_ex(("localhost", self.hanzo_net_port))
         sock.close()
-        
+
         if result == 0:
-            self.console.print(f"[yellow]hanzo/net already running on port {self.hanzo_net_port}[/yellow]")
+            self.console.print(
+                f"[yellow]hanzo/net already running on port {self.hanzo_net_port}[/yellow]"
+            )
             return
-        
+
         # Start hanzo net
         try:
             # Determine model to serve based on orchestrator model
             model = "llama-3.2-3b"  # Default
             if ":" in self.orchestrator_model:
                 model = self.orchestrator_model.split(":")[1]
-            
+
             cmd = [
-                "hanzo", "net",
-                "--port", str(self.hanzo_net_port),
-                "--models", model,
-                "--network", "local"
+                "hanzo",
+                "net",
+                "--port",
+                str(self.hanzo_net_port),
+                "--models",
+                model,
+                "--network",
+                "local",
             ]
-            
+
             self.hanzo_net_process = subprocess.Popen(
                 cmd,
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE,
                 text=True,
-                preexec_fn=os.setsid if hasattr(os, 'setsid') else None
+                preexec_fn=os.setsid if hasattr(os, "setsid") else None,
             )
-            
+
             # Wait for it to start
             await asyncio.sleep(3)
-            
+
             if self.hanzo_net_process.poll() is None:
-                self.console.print(f"[green]✓ hanzo/net started on port {self.hanzo_net_port} with model {model}[/green]")
+                self.console.print(
+                    f"[green]✓ hanzo/net started on port {self.hanzo_net_port} with model {model}[/green]"
+                )
             else:
                 self.console.print("[red]Failed to start hanzo/net[/red]")
-                
+
         except Exception as e:
             self.console.print(f"[red]Error starting hanzo/net: {e}[/red]")
-    
+
     async def _create_orchestrator_agent(self) -> Agent:
         """Create the orchestrator agent (GPT-5, local, or configured model)."""
         # Check if using local model via hanzo/net
         if self.orchestrator_model.startswith("local:"):
             # Use local model via hanzo/net
             model_name = self.orchestrator_model.split(":")[1]
-            
+
             # Import local network helpers
             from hanzo_network.local_network import create_local_agent
-            
+
             orchestrator = create_local_agent(
                 name="local_orchestrator",
                 description=f"Local {model_name} orchestrator via hanzo/net",
                 system=self._get_orchestrator_system_prompt(),
                 local_model=model_name,
                 base_url=f"http://localhost:{self.hanzo_net_port}",
-                tools=[]
+                tools=[],
+            )
+
+            self.console.print(
+                f"[green]✓ Created local {model_name} orchestrator via hanzo/net[/green]"
             )
-            
-            self.console.print(f"[green]✓ Created local {model_name} orchestrator via hanzo/net[/green]")
             return orchestrator
-        
+
         # Parse model string to get provider and model
-        model_config = ModelConfig.from_string(self.orchestrator_model)
-        
-        # Add API key from environment if needed
-        if model_config.provider == ModelProvider.OPENAI:
-            model_config.api_key = os.getenv("OPENAI_API_KEY")
-        elif model_config.provider == ModelProvider.ANTHROPIC:
-            model_config.api_key = os.getenv("ANTHROPIC_API_KEY")
-        elif model_config.provider == ModelProvider.GOOGLE:
-            model_config.api_key = os.getenv("GOOGLE_API_KEY")
-        
+        model_name = self.orchestrator_model
+        provider = "openai"  # Default to OpenAI - use string
+        api_key = None
+
+        # Determine provider from model name
+        if model_name.startswith("gpt") or model_name == "codex":
+            provider = "openai"
+            api_key = os.getenv("OPENAI_API_KEY")
+        elif model_name.startswith("claude"):
+            provider = "anthropic"
+            api_key = os.getenv("ANTHROPIC_API_KEY")
+        elif model_name.startswith("gemini"):
+            provider = "google"
+            api_key = os.getenv("GOOGLE_API_KEY")
+        elif model_name.startswith("local:"):
+            provider = "local"
+            model_name = model_name.replace("local:", "")
+
+        # Create model config based on what's available
+        if NETWORK_AVAILABLE:
+            # Real ModelConfig may have different signature
+            try:
+                model_config = ModelConfig(
+                    name=model_name,
+                    provider=provider,
+                )
+                # Set api_key separately if supported
+                if hasattr(model_config, "api_key"):
+                    model_config.api_key = api_key
+            except TypeError:
+                # Fallback to simple string if ModelConfig doesn't work
+                model_config = model_name
+        else:
+            # Use our fallback ModelConfig
+            model_config = ModelConfig(
+                name=model_name,
+                provider=provider,
+                api_key=api_key,
+            )
+
         # Create orchestrator with strategic system prompt
         orchestrator = create_agent(
             name="orchestrator",
             description=f"{self.orchestrator_model} powered meta-orchestrator for AI coding",
             model=model_config,
             system=self._get_orchestrator_system_prompt(),
-            tools=[]  # Orchestrator tools will be added
+            tools=[],  # Orchestrator tools will be added
+        )
+
+        self.console.print(
+            f"[green]✓ Created {self.orchestrator_model} orchestrator[/green]"
         )
-        
-        self.console.print(f"[green]✓ Created {self.orchestrator_model} orchestrator[/green]")
         return orchestrator
-    
+
     def _get_orchestrator_system_prompt(self) -> str:
         """Get the system prompt for the orchestrator."""
         return """You are an advanced AI orchestrator managing a network of specialized agents.
@@ -1069,16 +1348,20 @@ class NetworkOrchestrator(HanzoDevOrchestrator):
         - Simple tasks → Use local agents if available
         
         Always maintain high code quality standards and prevent degradation."""
-    
+
     async def _create_worker_agent(self, index: int) -> Agent:
         """Create a worker agent (Claude for implementation)."""
         worker = create_agent(
             name=f"worker_{index}",
             description=f"Claude worker agent {index} for code implementation",
-            model=ModelConfig(
-                provider=ModelProvider.ANTHROPIC,
-                model="claude-3-5-sonnet-20241022",
-                api_key=os.getenv("ANTHROPIC_API_KEY")
+            model=(
+                "claude-3-5-sonnet-20241022"
+                if NETWORK_AVAILABLE
+                else ModelConfig(
+                    provider="anthropic",
+                    name="claude-3-5-sonnet-20241022",
+                    api_key=os.getenv("ANTHROPIC_API_KEY"),
+                )
             ),
             system="""You are a Claude worker agent specialized in code implementation.
             
@@ -1089,16 +1372,16 @@ class NetworkOrchestrator(HanzoDevOrchestrator):
             - Debug and fix issues
             
             Follow best practices and maintain code quality.""",
-            tools=[]  # MCP tools will be added if enabled
+            tools=[],  # MCP tools will be added if enabled
         )
-        
+
         self.console.print(f"  Created worker agent {index}")
         return worker
-    
+
     async def _create_local_worker_agent(self, index: int) -> Agent:
         """Create a local worker agent for simple tasks (cost optimization)."""
         from hanzo_network.local_network import create_local_agent
-        
+
         worker = create_local_agent(
             name=f"local_worker_{index}",
             description=f"Local worker agent {index} for simple tasks",
@@ -1113,21 +1396,21 @@ class NetworkOrchestrator(HanzoDevOrchestrator):
             You handle simple tasks to reduce API costs.""",
             local_model="llama-3.2-3b",
             base_url=f"http://localhost:{self.hanzo_net_port}",
-            tools=[]
+            tools=[],
         )
-        
+
         self.console.print(f"  Created local worker agent {index}")
         return worker
-    
+
     async def _create_critic_agent(self, index: int) -> Agent:
         """Create a critic agent for code review."""
         # Use a different model for critics for diversity
         critic_model = "gpt-4" if index % 2 == 0 else "claude-3-5-sonnet-20241022"
-        
+
         critic = create_agent(
             name=f"critic_{index}",
             description=f"Critic agent {index} for code quality assurance",
-            model=ModelConfig.from_string(critic_model),
+            model=critic_model,  # Just pass the model name string
             system="""You are a critic agent focused on code quality and best practices.
             
             Review code for:
@@ -1138,19 +1421,19 @@ class NetworkOrchestrator(HanzoDevOrchestrator):
             5. Best practices and design patterns
             
             Provide constructive feedback with specific improvement suggestions.""",
-            tools=[]
+            tools=[],
         )
-        
+
         self.console.print(f"  Created critic agent {index} ({critic_model})")
         return critic
-    
+
     async def _create_cost_optimized_router(self) -> Router:
         """Create a cost-optimized router that prefers local models."""
         from hanzo_network.core.router import Router
-        
+
         class CostOptimizedRouter(Router):
             """Router that minimizes costs by using local models when possible."""
-            
+
             def __init__(self, orchestrator_agent, worker_agents, critic_agents):
                 super().__init__()
                 self.orchestrator = orchestrator_agent
@@ -1158,55 +1441,97 @@ class NetworkOrchestrator(HanzoDevOrchestrator):
                 self.critics = critic_agents
                 self.local_workers = [w for w in worker_agents if "local" in w.name]
                 self.api_workers = [w for w in worker_agents if "local" not in w.name]
-            
+
             async def route(self, prompt: str, state=None) -> str:
                 """Route based on task complexity and cost optimization."""
                 prompt_lower = prompt.lower()
-                
+
                 # Simple tasks → Local workers
-                simple_keywords = ["list", "check", "validate", "format", "rename", "count", "find"]
-                if any(keyword in prompt_lower for keyword in simple_keywords) and self.local_workers:
+                simple_keywords = [
+                    "list",
+                    "check",
+                    "validate",
+                    "format",
+                    "rename",
+                    "count",
+                    "find",
+                ]
+                if (
+                    any(keyword in prompt_lower for keyword in simple_keywords)
+                    and self.local_workers
+                ):
                     return self.local_workers[0].name
-                
+
                 # Complex implementation → API workers (Claude)
-                complex_keywords = ["implement", "refactor", "debug", "optimize", "design", "architect"]
-                if any(keyword in prompt_lower for keyword in complex_keywords) and self.api_workers:
+                complex_keywords = [
+                    "implement",
+                    "refactor",
+                    "debug",
+                    "optimize",
+                    "design",
+                    "architect",
+                ]
+                if (
+                    any(keyword in prompt_lower for keyword in complex_keywords)
+                    and self.api_workers
+                ):
                     return self.api_workers[0].name
-                
+
                 # Review tasks → Critics
-                review_keywords = ["review", "critique", "analyze", "improve", "validate code"]
-                if any(keyword in prompt_lower for keyword in review_keywords) and self.critics:
+                review_keywords = [
+                    "review",
+                    "critique",
+                    "analyze",
+                    "improve",
+                    "validate code",
+                ]
+                if (
+                    any(keyword in prompt_lower for keyword in review_keywords)
+                    and self.critics
+                ):
                     return self.critics[0].name
-                
+
                 # Strategic decisions → Orchestrator
-                strategic_keywords = ["plan", "decide", "strategy", "coordinate", "organize"]
+                strategic_keywords = [
+                    "plan",
+                    "decide",
+                    "strategy",
+                    "coordinate",
+                    "organize",
+                ]
                 if any(keyword in prompt_lower for keyword in strategic_keywords):
                     return self.orchestrator.name
-                
+
                 # Default: Try local first, then API
                 if self.local_workers:
                     # For shorter prompts, try local first
                     if len(prompt) < 500:
                         return self.local_workers[0].name
-                
+
                 # Fall back to API workers for complex tasks
-                return self.api_workers[0].name if self.api_workers else self.orchestrator.name
-        
+                return (
+                    self.api_workers[0].name
+                    if self.api_workers
+                    else self.orchestrator.name
+                )
+
         # Create the cost-optimized router
         router = CostOptimizedRouter(
-            self.orchestrator_agent,
-            self.worker_agents,
-            self.critic_agents
+            self.orchestrator_agent, self.worker_agents, self.critic_agents
+        )
+
+        self.console.print(
+            "[green]✓ Created cost-optimized router (local models preferred)[/green]"
         )
-        
-        self.console.print("[green]✓ Created cost-optimized router (local models preferred)[/green]")
         return router
-    
+
     async def _create_intelligent_router(self) -> Router:
         """Create an intelligent router using the orchestrator for decisions."""
         if self.orchestrator_agent:
             # Create routing agent that uses orchestrator for decisions
             router = create_routing_agent(
+                name="router",
+                description="Intelligent task router",
                 agent=self.orchestrator_agent,
                 system="""Route tasks to the most appropriate agent based on:
                 
@@ -1221,68 +1546,67 @@ class NetworkOrchestrator(HanzoDevOrchestrator):
                 - Review tasks → Route to critics
                 - Parallel work → Split across multiple agents
                 
-                Return the name of the best agent for the task."""
+                Return the name of the best agent for the task.""",
             )
         else:
             # Fallback to basic router
             router = create_router(
                 agents=self.worker_agents + self.critic_agents,
-                default=self.worker_agents[0].name if self.worker_agents else None
+                default=self.worker_agents[0].name if self.worker_agents else None,
             )
-        
+
         return router
-    
-    async def execute_with_network(self, task: str, context: Optional[Dict] = None) -> Dict:
+
+    async def execute_with_network(
+        self, task: str, context: Optional[Dict] = None
+    ) -> Dict:
         """Execute a task using the agent network.
-        
+
         Args:
             task: Task description
             context: Optional context
-            
+
         Returns:
             Execution result
         """
         if not self.agent_network:
             self.console.print("[red]Agent network not initialized[/red]")
             return {"error": "Network not initialized"}
-        
+
         self.console.print(f"[cyan]Executing task with agent network: {task}[/cyan]")
-        
+
         # Create network state
         state = NetworkState()
         state.add_message("user", task)
-        
+
         if context:
             state.metadata.update(context)
-        
+
         # Run the network
         try:
-            result = await self.agent_network.run(
-                prompt=task,
-                state=state
-            )
-            
+            result = await self.agent_network.run(prompt=task, state=state)
+
             # If guardrails enabled, validate result
             if self.enable_guardrails and self.critic_agents:
                 validated = await self._validate_with_critics(result, task)
                 if validated.get("improvements"):
                     self.console.print("[yellow]Applied critic improvements[/yellow]")
                     return validated
-            
+
             return result
-            
+
         except Exception as e:
             self.console.print(f"[red]Network execution error: {e}[/red]")
             return {"error": str(e)}
-    
+
     async def _validate_with_critics(self, result: Dict, original_task: str) -> Dict:
         """Validate and potentially improve result using critic agents."""
         if not self.critic_agents:
             return result
-        
+
         # Get first critic to review
         critic = self.critic_agents[0]
-        
+
         review_prompt = f"""
         Review this solution:
         
@@ -1291,69 +1615,80 @@ class NetworkOrchestrator(HanzoDevOrchestrator):
         
         Provide specific improvements if needed.
         """
-        
+
         review = await critic.run(review_prompt)
-        
+
         # Check if improvements suggested
-        if "improve" in str(review.get('output', '')).lower():
-            result["improvements"] = review.get('output')
-        
+        if "improve" in str(review.get("output", "")).lower():
+            result["improvements"] = review.get("output")
+
         return result
-    
+
     def shutdown(self):
         """Shutdown the network orchestrator and hanzo net if running."""
         # Stop hanzo net if we started it
         if self.hanzo_net_process:
             try:
                 self.console.print("[yellow]Stopping hanzo/net...[/yellow]")
-                if hasattr(os, 'killpg'):
+                if hasattr(os, "killpg"):
                     os.killpg(os.getpgid(self.hanzo_net_process.pid), signal.SIGTERM)
                 else:
                     self.hanzo_net_process.terminate()
                 self.hanzo_net_process.wait(timeout=5)
                 self.console.print("[green]✓ hanzo/net stopped[/green]")
-            except:
+            except Exception:
                 try:
                     self.hanzo_net_process.kill()
-                except:
+                except Exception:
                     pass
-        
+
         # Call parent shutdown
         super().shutdown()
 
 
 class MultiClaudeOrchestrator(HanzoDevOrchestrator):
     """Extended orchestrator for multiple Claude instances with MCP networking."""
-    
-    def __init__(self, workspace_dir: str, claude_path: str, num_instances: int,
-                 enable_mcp: bool, enable_networking: bool, enable_guardrails: bool,
-                 console: Console):
+
+    def __init__(
+        self,
+        workspace_dir: str,
+        claude_path: str,
+        num_instances: int,
+        enable_mcp: bool,
+        enable_networking: bool,
+        enable_guardrails: bool,
+        console: Console,
+        orchestrator_model: str = "gpt-4",
+    ):
         super().__init__(workspace_dir, claude_path)
         self.num_instances = num_instances
         self.enable_mcp = enable_mcp
         self.enable_networking = enable_networking
         self.enable_guardrails = enable_guardrails
         self.console = console
-        
+        self.orchestrator_model = orchestrator_model  # Add this for chat interface
+
         # Store multiple Claude instances
         self.claude_instances = []
         self.instance_configs = []
-        
+
     async def initialize(self):
         """Initialize all Claude instances with MCP networking."""
         self.console.print("[cyan]Initializing Claude instances...[/cyan]")
-        
+
         for i in range(self.num_instances):
             role = "primary" if i == 0 else f"critic_{i}"
             config = await self._create_instance_config(i, role)
             self.instance_configs.append(config)
-            
-            self.console.print(f"  [{i+1}/{self.num_instances}] {role} instance configured")
-        
+
+            self.console.print(
+                f"  [{i+1}/{self.num_instances}] {role} instance configured"
+            )
+
         # If networking enabled, configure MCP connections between instances
         if self.enable_networking:
             await self._setup_mcp_networking()
-        
+
         # Start all instances
         for i, config in enumerate(self.instance_configs):
             success = await self._start_claude_instance(i, config)
@@ -1361,12 +1696,12 @@ class MultiClaudeOrchestrator(HanzoDevOrchestrator):
                 self.console.print(f"[green]✓ Instance {i} started[/green]")
             else:
                 self.console.print(f"[red]✗ Failed to start instance {i}[/red]")
-    
+
     async def _create_instance_config(self, index: int, role: str) -> Dict:
         """Create configuration for a Claude instance."""
         base_port = 8000
         mcp_port = 9000
-        
+
         config = {
             "index": index,
             "role": role,
@@ -1374,18 +1709,18 @@ class MultiClaudeOrchestrator(HanzoDevOrchestrator):
             "port": base_port + index,
             "mcp_port": mcp_port + index,
             "mcp_config": {},
-            "env": {}
+            "env": {},
         }
-        
+
         # Create workspace directory
         config["workspace"].mkdir(parents=True, exist_ok=True)
-        
+
         # Configure MCP tools if enabled
         if self.enable_mcp:
             config["mcp_config"] = await self._create_mcp_config(index, role)
-        
+
         return config
-    
+
     async def _create_mcp_config(self, index: int, role: str) -> Dict:
         """Create MCP configuration for an instance."""
         mcp_config = {
@@ -1393,29 +1728,26 @@ class MultiClaudeOrchestrator(HanzoDevOrchestrator):
                 "hanzo-mcp": {
                     "command": "python",
                     "args": ["-m", "hanzo_mcp"],
-                    "env": {
-                        "INSTANCE_ID": str(index),
-                        "INSTANCE_ROLE": role
-                    }
+                    "env": {"INSTANCE_ID": str(index), "INSTANCE_ROLE": role},
                 }
             }
         }
-        
+
         # Add file system tools
         mcp_config["mcpServers"]["filesystem"] = {
             "command": "npx",
             "args": ["-y", "@modelcontextprotocol/server-filesystem"],
-            "env": {
-                "ALLOWED_DIRECTORIES": str(self.workspace_dir)
-            }
+            "env": {"ALLOWED_DIRECTORIES": str(self.workspace_dir)},
         }
-        
+
         return mcp_config
-    
+
     async def _setup_mcp_networking(self):
         """Set up MCP networking between Claude instances."""
-        self.console.print("[cyan]Setting up MCP networking between instances...[/cyan]")
-        
+        self.console.print(
+            "[cyan]Setting up MCP networking between instances...[/cyan]"
+        )
+
         # Each instance gets MCP servers for all other instances
         for i, config in enumerate(self.instance_configs):
             for j, other_config in enumerate(self.instance_configs):
@@ -1425,37 +1757,38 @@ class MultiClaudeOrchestrator(HanzoDevOrchestrator):
                     config["mcp_config"]["mcpServers"][server_name] = {
                         "command": "python",
                         "args": [
-                            "-m", "hanzo_mcp.bridge",
-                            "--target-port", str(other_config["port"]),
-                            "--instance-id", str(j),
-                            "--role", other_config["role"]
+                            "-m",
+                            "hanzo_mcp.bridge",
+                            "--target-port",
+                            str(other_config["port"]),
+                            "--instance-id",
+                            str(j),
+                            "--role",
+                            other_config["role"],
                         ],
-                        "env": {
-                            "SOURCE_INSTANCE": str(i),
-                            "TARGET_INSTANCE": str(j)
-                        }
+                        "env": {"SOURCE_INSTANCE": str(i), "TARGET_INSTANCE": str(j)},
                     }
-            
+
             # Save MCP config
             mcp_config_file = config["workspace"] / "mcp_config.json"
-            with open(mcp_config_file, 'w') as f:
+            with open(mcp_config_file, "w") as f:
                 json.dump(config["mcp_config"], f, indent=2)
-            
+
             config["env"]["MCP_CONFIG_PATH"] = str(mcp_config_file)
-    
+
     async def _start_claude_instance(self, index: int, config: Dict) -> bool:
         """Start a single Claude instance."""
         try:
             cmd = [self.claude_code_path or "claude"]
-            
+
             # Add configuration flags
             if config.get("env", {}).get("MCP_CONFIG_PATH"):
                 cmd.extend(["--mcp-config", config["env"]["MCP_CONFIG_PATH"]])
-            
+
             # Set up environment
             env = os.environ.copy()
             env.update(config.get("env", {}))
-            
+
             # Start process
             process = subprocess.Popen(
                 cmd,
@@ -1464,47 +1797,49 @@ class MultiClaudeOrchestrator(HanzoDevOrchestrator):
                 stdin=subprocess.PIPE,
                 env=env,
                 cwd=str(config["workspace"]),
-                preexec_fn=os.setsid if hasattr(os, 'setsid') else None
+                preexec_fn=os.setsid if hasattr(os, "setsid") else None,
             )
-            
-            self.claude_instances.append({
-                "index": index,
-                "role": config["role"],
-                "process": process,
-                "config": config,
-                "health": RuntimeHealth(
-                    state=RuntimeState.RUNNING,
-                    last_response=datetime.now(),
-                    response_time_ms=0,
-                    memory_usage_mb=0,
-                    cpu_percent=0,
-                    error_count=0,
-                    restart_count=0
-                )
-            })
-            
+
+            self.claude_instances.append(
+                {
+                    "index": index,
+                    "role": config["role"],
+                    "process": process,
+                    "config": config,
+                    "health": RuntimeHealth(
+                        state=RuntimeState.RUNNING,
+                        last_response=datetime.now(),
+                        response_time_ms=0,
+                        memory_usage_mb=0,
+                        cpu_percent=0,
+                        error_count=0,
+                        restart_count=0,
+                    ),
+                }
+            )
+
             return True
-            
+
         except Exception as e:
             logger.error(f"Failed to start instance {index}: {e}")
             return False
-    
+
     async def execute_with_critique(self, task: str) -> Dict:
         """Execute a task with System 2 critique.
-        
+
         1. Primary instance executes the task
         2. Critic instance(s) review and suggest improvements
         3. Primary incorporates feedback if confidence is high
         """
         self.console.print(f"[cyan]Executing with System 2 thinking: {task}[/cyan]")
-        
+
         # Step 1: Primary execution
         primary = self.claude_instances[0]
         result = await self._send_to_instance(primary, task)
-        
+
         if self.num_instances < 2:
             return result
-        
+
         # Step 2: Critic review
         critiques = []
         for critic in self.claude_instances[1:]:
@@ -1523,10 +1858,10 @@ class MultiClaudeOrchestrator(HanzoDevOrchestrator):
             
             Suggest specific improvements.
             """
-            
+
             critique = await self._send_to_instance(critic, critique_prompt)
             critiques.append(critique)
-        
+
         # Step 3: Incorporate feedback if valuable
         if critiques and self.enable_guardrails:
             improvement_prompt = f"""
@@ -1538,73 +1873,87 @@ class MultiClaudeOrchestrator(HanzoDevOrchestrator):
             
             Incorporate the valid suggestions and produce an improved solution.
             """
-            
+
             improved = await self._send_to_instance(primary, improvement_prompt)
-            
+
             # Validate improvement didn't degrade quality
             if await self._validate_improvement(result, improved):
-                self.console.print("[green]✓ Solution improved with System 2 feedback[/green]")
+                self.console.print(
+                    "[green]✓ Solution improved with System 2 feedback[/green]"
+                )
                 return improved
             else:
-                self.console.print("[yellow]⚠ Keeping original solution (improvement validation failed)[/yellow]")
-        
+                self.console.print(
+                    "[yellow]⚠ Keeping original solution (improvement validation failed)[/yellow]"
+                )
+
         return result
-    
+
     async def _send_to_instance(self, instance: Dict, prompt: str) -> Dict:
         """Send a prompt to a specific Claude instance."""
         # This would use the actual Claude API or IPC mechanism
         # For now, it's a placeholder
         return {
             "output": f"Response from {instance['role']}: Processed '{prompt[:50]}...'",
-            "success": True
+            "success": True,
         }
-    
+
     async def _validate_improvement(self, original: Dict, improved: Dict) -> bool:
         """Validate that an improvement doesn't degrade quality."""
         if not self.enable_guardrails:
             return True
-        
+
         # Placeholder for actual validation logic
         # Would check: tests still pass, no new errors, performance not degraded, etc.
         return True
-    
+
     def shutdown(self):
         """Shutdown all Claude instances."""
         self.console.print("[yellow]Shutting down all instances...[/yellow]")
-        
+
         for instance in self.claude_instances:
             try:
                 process = instance["process"]
-                if hasattr(os, 'killpg'):
+                if hasattr(os, "killpg"):
                     os.killpg(os.getpgid(process.pid), signal.SIGTERM)
                 else:
                     process.terminate()
                 process.wait(timeout=5)
-            except:
+            except Exception:
                 try:
                     instance["process"].kill()
-                except:
+                except Exception:
                     pass
-        
+
         self.console.print("[green]✓ All instances shut down[/green]")
 
 
 async def main():
     """Main entry point for hanzo-dev."""
     import argparse
-    
-    parser = argparse.ArgumentParser(description="Hanzo Dev - System 2 Meta-AI Orchestrator")
-    parser.add_argument("--workspace", default="~/.hanzo/dev", help="Workspace directory")
+
+    parser = argparse.ArgumentParser(
+        description="Hanzo Dev - System 2 Meta-AI Orchestrator"
+    )
+    parser.add_argument(
+        "--workspace", default="~/.hanzo/dev", help="Workspace directory"
+    )
     parser.add_argument("--claude-path", help="Path to Claude Code executable")
     parser.add_argument("--monitor", action="store_true", help="Start in monitor mode")
     parser.add_argument("--repl", action="store_true", help="Start REPL interface")
-    parser.add_argument("--instances", type=int, default=2, help="Number of Claude instances")
+    parser.add_argument(
+        "--instances", type=int, default=2, help="Number of Claude instances"
+    )
     parser.add_argument("--no-mcp", action="store_true", help="Disable MCP tools")
-    parser.add_argument("--no-network", action="store_true", help="Disable instance networking")
-    parser.add_argument("--no-guardrails", action="store_true", help="Disable guardrails")
-    
+    parser.add_argument(
+        "--no-network", action="store_true", help="Disable instance networking"
+    )
+    parser.add_argument(
+        "--no-guardrails", action="store_true", help="Disable guardrails"
+    )
+
     args = parser.parse_args()
-    
+
     await run_dev_orchestrator(
         workspace=args.workspace,
         claude_path=args.claude_path,
@@ -1613,9 +1962,9 @@ async def main():
         instances=args.instances,
         mcp_tools=not args.no_mcp,
         network_mode=not args.no_network,
-        guardrails=not args.no_guardrails
+        guardrails=not args.no_guardrails,
     )
 
 
 if __name__ == "__main__":
-    asyncio.run(main())
+    asyncio.run(main())