souleyez 2.43.29__py3-none-any.whl → 2.43.34__py3-none-any.whl

souleyez/main.py

@@ -16,7 +16,13 @@ from rich.console import Console
 from rich.table import Table
 
 try:
-    from souleyez.engine.background import enqueue_job, list_jobs, get_job, start_worker, worker_loop
+    from souleyez.engine.background import (
+        enqueue_job,
+        list_jobs,
+        get_job,
+        start_worker,
+        worker_loop,
+    )
     from souleyez.storage.engagements import EngagementManager
     from souleyez.ui.interactive import run_interactive_menu
     from souleyez.ui.dashboard import run_dashboard
@@ -29,10 +35,10 @@ def _check_prerequisites():
     """Check for required system tools and warn if missing."""
     missing = []
 
-    if not shutil.which('curl'):
-        missing.append('curl')
-    if not shutil.which('pip3'):
-        missing.append('python3-pip')
+    if not shutil.which("curl"):
+        missing.append("curl")
+    if not shutil.which("pip3"):
+        missing.append("python3-pip")
 
     if missing:
         click.secho("⚠️  Missing prerequisites:", fg="yellow", bold=True)
@@ -54,11 +60,12 @@ def _check_first_run_setup():
         return
 
     # Skip if running the setup command itself
-    if len(sys.argv) > 1 and sys.argv[1] in ('setup', '--version', '--help'):
+    if len(sys.argv) > 1 and sys.argv[1] in ("setup", "--version", "--help"):
         return
 
     try:
         from souleyez.utils.tool_checker import get_tool_stats
+
         installed, total = get_tool_stats()
 
         # If less than 3 tools installed, prompt user
@@ -68,7 +75,9 @@ def _check_first_run_setup():
             click.secho("  FIRST RUN DETECTED", fg="cyan", bold=True)
             click.secho("=" * 60, fg="cyan")
             click.echo()
-            click.echo(f"  SoulEyez wraps 40+ pentesting tools, but only {installed}/{total}")
+            click.echo(
+                f"  SoulEyez wraps 40+ pentesting tools, but only {installed}/{total}"
+            )
             click.echo("  tools are currently installed on your system.")
             click.echo()
             click.echo("  Run the setup wizard to install tools like nmap, sqlmap,")
@@ -83,6 +92,7 @@ def _check_first_run_setup():
 
                 # Import and run setup
                 from souleyez.ui.tool_setup import run_tool_setup
+
                 run_tool_setup(check_only=False, install_all=False)
                 sys.exit(0)
             else:
@@ -104,7 +114,7 @@ def _check_privileged_tools():
     import subprocess
 
     # Skip if running setup or help commands
-    if len(sys.argv) > 1 and sys.argv[1] in ('setup', '--version', '--help'):
+    if len(sys.argv) > 1 and sys.argv[1] in ("setup", "--version", "--help"):
         return
 
     marker_file = Path.home() / ".souleyez" / ".sudoers_declined"
@@ -114,18 +124,16 @@ def _check_privileged_tools():
         return
 
     # Check if nmap is installed and needs configuration
-    nmap_path = shutil.which('nmap')
+    nmap_path = shutil.which("nmap")
     if not nmap_path:
         return
 
     # Check if passwordless sudo already works
     # First clear any cached sudo credentials so we test the actual config
     try:
-        subprocess.run(['sudo', '-k'], capture_output=True, timeout=5)
+        subprocess.run(["sudo", "-k"], capture_output=True, timeout=5)
         result = subprocess.run(
-            ['sudo', '-n', nmap_path, '--version'],
-            capture_output=True,
-            timeout=5
+            ["sudo", "-n", nmap_path, "--version"], capture_output=True, timeout=5
         )
         if result.returncode == 0:
             return  # Already configured
@@ -151,6 +159,7 @@ def _check_privileged_tools():
 
         try:
             import subprocess
+
             # Use printf to ensure newline at end (required by sudoers parser)
             # echo should add newline but some environments strip it
             cmd = f"printf '%s\\n' '{sudoers_line}' | sudo tee {sudoers_file} > /dev/null && sudo chmod 0440 {sudoers_file}"
@@ -159,7 +168,10 @@ def _check_privileged_tools():
             if proc.returncode == 0:
                 click.secho("  ✓ Configured! Privileged scans now work.", fg="green")
             else:
-                click.secho("  ✗ Failed to configure. Run 'souleyez setup --fix-permissions'", fg="red")
+                click.secho(
+                    "  ✗ Failed to configure. Run 'souleyez setup --fix-permissions'",
+                    fg="red",
+                )
         except Exception as e:
             click.secho(f"  ✗ Error: {e}", fg="red")
         click.echo()
@@ -173,16 +185,18 @@ def _check_privileged_tools():
 
 
 @click.group()
-@click.version_option(version='2.43.29')
+@click.version_option(version="2.43.34")
 def cli():
     """SoulEyez - AI-Powered Pentesting Platform by CyberSoul Security"""
     from souleyez.log_config import init_logging
+
     init_logging()
 
     # Initialize auth system for CLI commands
     try:
         from souleyez.auth import init_auth
         from souleyez.storage.database import get_db
+
         init_auth(get_db().db_path)
     except Exception:
         pass  # Auth not required for all commands (e.g., --help, --version)
@@ -199,6 +213,7 @@ def cli():
     # Ensure user has local copy of wordlists
     try:
         from souleyez.wordlists import ensure_user_wordlists
+
         ensure_user_wordlists()
     except ImportError:
         pass
@@ -211,9 +226,17 @@ def interactive():
 
 
 @cli.command()
-@click.option("--check", "-c", is_flag=True, help="Only check tool status, don't install")
-@click.option("--install-all", "-a", is_flag=True, help="Install all missing tools automatically")
-@click.option("--fix-permissions", is_flag=True, help="Configure tools for privileged operations (nmap, responder)")
+@click.option(
+    "--check", "-c", is_flag=True, help="Only check tool status, don't install"
+)
+@click.option(
+    "--install-all", "-a", is_flag=True, help="Install all missing tools automatically"
+)
+@click.option(
+    "--fix-permissions",
+    is_flag=True,
+    help="Configure tools for privileged operations (nmap, responder)",
+)
 def setup(check, install_all, fix_permissions):
     """Install and configure pentesting tools for your system.
 
@@ -236,22 +259,23 @@ def setup(check, install_all, fix_permissions):
         _fix_tool_permissions()
         return
     from souleyez.ui.tool_setup import run_tool_setup
+
     run_tool_setup(check_only=check, install_all=install_all)
 
 
 # Privileged tools configuration - binary tools
-PRIVILEGED_BINARY_TOOLS = ['nmap']
+PRIVILEGED_BINARY_TOOLS = ["nmap"]
 
 # Privileged tools configuration - script-based tools
 PRIVILEGED_SCRIPT_TOOLS = {
-    'responder': {
-        'interpreter': '/usr/bin/python3',
-        'script_paths': [
-            '/usr/share/responder/Responder.py',
-            '/opt/Responder/Responder.py',
-            str(Path.home() / 'tools/Responder/Responder.py'),
+    "responder": {
+        "interpreter": "/usr/bin/python3",
+        "script_paths": [
+            "/usr/share/responder/Responder.py",
+            "/opt/Responder/Responder.py",
+            str(Path.home() / "tools/Responder/Responder.py"),
         ],
-        'description': 'LLMNR/NBT-NS credential capture'
+        "description": "LLMNR/NBT-NS credential capture",
     }
 }
 
@@ -269,7 +293,7 @@ def _fix_tool_permissions():
     import subprocess
 
     click.echo()
-    click.echo(click.style("  PRIVILEGED TOOL SETUP", bold=True, fg='cyan'))
+    click.echo(click.style("  PRIVILEGED TOOL SETUP", bold=True, fg="cyan"))
     click.echo("  " + "─" * 50)
     click.echo()
     click.echo("  Configuring passwordless sudo for security tools.")
@@ -293,11 +317,9 @@ def _fix_tool_permissions():
 
         # Check if passwordless sudo already works
         try:
-            subprocess.run(['sudo', '-k'], capture_output=True, timeout=5)
+            subprocess.run(["sudo", "-k"], capture_output=True, timeout=5)
             result = subprocess.run(
-                ['sudo', '-n', tool_path, '--version'],
-                capture_output=True,
-                timeout=5
+                ["sudo", "-n", tool_path, "--version"], capture_output=True, timeout=5
             )
             if result.returncode == 0:
                 binary_tools_already_fixed.append(tool_name)
@@ -308,25 +330,29 @@ def _fix_tool_permissions():
 
     # Check script-based tools
     for tool_name, tool_info in PRIVILEGED_SCRIPT_TOOLS.items():
-        script_path = _find_script_path(tool_info['script_paths'])
+        script_path = _find_script_path(tool_info["script_paths"])
         if not script_path:
             script_tools_not_installed.append(tool_name)
             continue
 
-        interpreter = tool_info['interpreter']
+        interpreter = tool_info["interpreter"]
         try:
-            subprocess.run(['sudo', '-k'], capture_output=True, timeout=5)
+            subprocess.run(["sudo", "-k"], capture_output=True, timeout=5)
             result = subprocess.run(
-                ['sudo', '-n', interpreter, script_path, '--help'],
+                ["sudo", "-n", interpreter, script_path, "--help"],
                 capture_output=True,
-                timeout=5
+                timeout=5,
             )
             if result.returncode == 0:
                 script_tools_already_fixed.append(tool_name)
             else:
-                script_tools_to_fix.append((tool_name, interpreter, script_path, tool_info['description']))
+                script_tools_to_fix.append(
+                    (tool_name, interpreter, script_path, tool_info["description"])
+                )
         except Exception:
-            script_tools_to_fix.append((tool_name, interpreter, script_path, tool_info['description']))
+            script_tools_to_fix.append(
+                (tool_name, interpreter, script_path, tool_info["description"])
+            )
 
     # Show status
     click.echo("  " + click.style("STATUS:", bold=True))
@@ -339,10 +365,14 @@ def _fix_tool_permissions():
         click.echo(f"    {click.style('✓', fg='green')} {name} - already configured")
 
     for name in binary_tools_not_installed:
-        click.echo(f"    {click.style('○', fg='yellow')} {name} - not installed (skipping)")
+        click.echo(
+            f"    {click.style('○', fg='yellow')} {name} - not installed (skipping)"
+        )
 
     for name in script_tools_not_installed:
-        click.echo(f"    {click.style('○', fg='yellow')} {name} - not installed (skipping)")
+        click.echo(
+            f"    {click.style('○', fg='yellow')} {name} - not installed (skipping)"
+        )
 
     for name, _ in binary_tools_to_fix:
         click.echo(f"    {click.style('✗', fg='red')} {name} - needs configuration")
@@ -353,7 +383,9 @@ def _fix_tool_permissions():
     click.echo()
 
     if not binary_tools_to_fix and not script_tools_to_fix:
-        click.echo(click.style("  All installed tools are already configured!", fg='green'))
+        click.echo(
+            click.style("  All installed tools are already configured!", fg="green")
+        )
         return
 
     click.echo("  This requires sudo to configure /etc/sudoers.d/")
@@ -406,12 +438,22 @@ def _fix_tool_permissions():
             click.echo(f"    {click.style('✗', fg='red')} Error: {e}")
 
     click.echo()
-    click.echo(click.style("  Done! Privileged scans now work automatically.", fg='green'))
+    click.echo(
+        click.style("  Done! Privileged scans now work automatically.", fg="green")
+    )
 
 
 @cli.command()
-@click.option("--follow", "-f", type=int, default=None, help="Follow live output of job ID")
-@click.option("--refresh", "-r", type=int, default=15, help="Refresh interval in seconds (default: 15)")
+@click.option(
+    "--follow", "-f", type=int, default=None, help="Follow live output of job ID"
+)
+@click.option(
+    "--refresh",
+    "-r",
+    type=int,
+    default=15,
+    help="Refresh interval in seconds (default: 15)",
+)
 @require_password
 def dashboard(follow, refresh):
     """Launch live dashboard with real-time job status and findings."""
@@ -443,22 +485,26 @@ def engagement_list():
     em = EngagementManager()
     engagements = em.list()
     current = em.get_current()
-    
+
     if not engagements:
-        click.echo("No engagements found. Create one with: souleyez engagement create <name>")
+        click.echo(
+            "No engagements found. Create one with: souleyez engagement create <name>"
+        )
         return
-    
+
     click.echo("\n" + "=" * 80)
     click.echo("ENGAGEMENTS")
     click.echo("=" * 80)
-    
+
     for eng in engagements:
-        marker = "* " if current and eng['id'] == current['id'] else "  "
-        stats = em.stats(eng['id'])
-        click.echo(f"{marker}{eng['name']:<20} | Hosts: {stats['hosts']:>3} | Services: {stats['services']:>3} | Findings: {stats['findings']:>3}")
-        if eng.get('description'):
+        marker = "* " if current and eng["id"] == current["id"] else "  "
+        stats = em.stats(eng["id"])
+        click.echo(
+            f"{marker}{eng['name']:<20} | Hosts: {stats['hosts']:>3} | Services: {stats['services']:>3} | Findings: {stats['findings']:>3}"
+        )
+        if eng.get("description"):
             click.echo(f"  └─ {eng['description']}")
-    
+
     click.echo("=" * 80)
     if current:
         click.echo(f"Current: {current['name']}")
@@ -484,13 +530,13 @@ def engagement_current():
     """Show current engagement."""
     em = EngagementManager()
     current = em.get_current()
-    
+
     if not current:
         click.echo("No engagement selected")
         return
-    
-    stats = em.stats(current['id'])
-    
+
+    stats = em.stats(current["id"])
+
     click.echo("\n" + "=" * 60)
     click.echo(f"Current Engagement: {current['name']}")
     click.echo("=" * 60)
@@ -511,22 +557,22 @@ def engagement_delete(name, force):
     """Delete an engagement and all its data."""
     em = EngagementManager()
     eng = em.get(name)
-    
+
     if not eng:
         click.echo(f"✗ Workspace '{name}' not found", err=True)
         return
-    
+
     if not force:
-        stats = em.stats(eng['id'])
+        stats = em.stats(eng["id"])
         click.echo(f"\nWarning: This will delete engagement '{name}' and:")
         click.echo(f"  - {stats['hosts']} hosts")
         click.echo(f"  - {stats['services']} services")
         click.echo(f"  - {stats['findings']} findings")
-        
+
         if not click.confirm("\nAre you sure?"):
             click.echo("Cancelled")
             return
-    
+
     if em.delete(name):
         click.echo(f"✓ Deleted workspace '{name}'")
     else:
@@ -535,60 +581,62 @@ def engagement_delete(name, force):
 
 @engagement.command("delete-all")
 @click.option("--force", "-f", is_flag=True, help="Skip confirmation")
-@click.option("--keep-current", is_flag=True, help="Keep the currently active engagement")
+@click.option(
+    "--keep-current", is_flag=True, help="Keep the currently active engagement"
+)
 def engagement_delete_all(force, keep_current):
     """Delete all engagements (except optionally the current one)."""
     em = EngagementManager()
     all_engagements = em.list()
-    
+
     if not all_engagements:
         click.echo("No engagements to delete")
         return
-    
+
     # Get current engagement if we're keeping it
     current = em.get_current() if keep_current else None
-    
+
     # Filter engagements to delete
     to_delete = []
     for eng in all_engagements:
-        if keep_current and current and eng['id'] == current['id']:
+        if keep_current and current and eng["id"] == current["id"]:
             continue
         to_delete.append(eng)
-    
+
     if not to_delete:
         click.echo("No engagements to delete")
         return
-    
+
     # Show what will be deleted
     click.echo(f"\n⚠️  Warning: This will delete {len(to_delete)} engagement(s):")
     for eng in to_delete[:10]:  # Show first 10
         click.echo(f"  - {eng['name']}")
-    
+
     if len(to_delete) > 10:
         click.echo(f"  ... and {len(to_delete) - 10} more")
-    
+
     if keep_current and current:
         click.echo(f"\n✓ Will keep current engagement: {current['name']}")
-    
+
     # Confirmation
     if not force:
         click.echo()
         if not click.confirm(f"Delete {len(to_delete)} engagement(s)?", default=False):
             click.echo("Cancelled")
             return
-    
+
     # Delete engagements
     deleted = 0
     failed = 0
-    
+
     click.echo()
-    with click.progressbar(to_delete, label='Deleting engagements') as bar:
+    with click.progressbar(to_delete, label="Deleting engagements") as bar:
         for eng in bar:
-            if em.delete(eng['name']):
+            if em.delete(eng["name"]):
                 deleted += 1
             else:
                 failed += 1
-    
+
     click.echo()
     click.echo(f"✓ Deleted {deleted} engagement(s)")
     if failed > 0:
@@ -597,10 +645,12 @@ def engagement_delete_all(force, keep_current):
 
 # Register engagement team subcommand
 from souleyez.commands.engagement import team
+
 engagement.add_command(team)
 
 # Register audit commands
 from souleyez.commands.audit import audit
+
 cli.add_command(audit)
 
 
@@ -608,6 +658,7 @@ cli.add_command(audit)
 # SCOPE MANAGEMENT
 # ============================================================================
 
+
 @cli.group()
 def scope():
     """Engagement scope management - define and enforce target boundaries."""
@@ -621,7 +672,9 @@ def scope():
 @click.option("--url", help="Add URL (e.g., https://app.example.com)")
 @click.option("--hostname", help="Add specific hostname or IP")
 @click.option("--exclude", is_flag=True, help="Add as exclusion (deny rule)")
-@click.option("--description", "-d", default="", help="Description for this scope entry")
+@click.option(
+    "--description", "-d", default="", help="Description for this scope entry"
+)
 def scope_add(engagement_name, cidr, domain, url, hostname, exclude, description):
     """Add a scope entry to an engagement."""
     from souleyez.security.scope_validator import ScopeManager
@@ -636,24 +689,27 @@ def scope_add(engagement_name, cidr, domain, url, hostname, exclude, description
 
     # Determine scope type and value
     if cidr:
-        scope_type, value = 'cidr', cidr
+        scope_type, value = "cidr", cidr
     elif domain:
-        scope_type, value = 'domain', domain
+        scope_type, value = "domain", domain
     elif url:
-        scope_type, value = 'url', url
+        scope_type, value = "url", url
     elif hostname:
-        scope_type, value = 'hostname', hostname
+        scope_type, value = "hostname", hostname
     else:
-        click.echo("Error: Must specify one of --cidr, --domain, --url, or --hostname", err=True)
+        click.echo(
+            "Error: Must specify one of --cidr, --domain, --url, or --hostname",
+            err=True,
+        )
         return
 
     try:
         scope_id = manager.add_scope(
-            engagement_id=eng['id'],
+            engagement_id=eng["id"],
             scope_type=scope_type,
             value=value,
             is_excluded=exclude,
-            description=description
+            description=description,
         )
         action = "exclusion" if exclude else "scope entry"
         click.echo(f"Added {action}: {scope_type}={value} (id={scope_id})")
@@ -674,8 +730,8 @@ def scope_list(engagement_name):
         return
 
     manager = ScopeManager()
-    validator = ScopeValidator(eng['id'])
-    entries = manager.list_scope(eng['id'])
+    validator = ScopeValidator(eng["id"])
+    entries = manager.list_scope(eng["id"])
     enforcement = validator.get_enforcement_mode()
 
     click.echo(f"\nScope for '{engagement_name}' (enforcement: {enforcement})")
@@ -689,9 +745,11 @@ def scope_list(engagement_name):
     click.echo("-" * 70)
 
     for entry in entries:
-        excluded = "EXCLUDE" if entry.get('is_excluded') else ""
-        click.echo(f"{entry['id']:<5} {entry['scope_type']:<10} {entry['value']:<35} {excluded:<10}")
-        if entry.get('description'):
+        excluded = "EXCLUDE" if entry.get("is_excluded") else ""
+        click.echo(
+            f"{entry['id']:<5} {entry['scope_type']:<10} {entry['value']:<35} {excluded:<10}"
+        )
+        if entry.get("description"):
             click.echo(f"      {entry['description']}")
 
     click.echo()
@@ -719,7 +777,7 @@ def scope_remove(engagement_name, scope_id):
 
 @scope.command("enforcement")
 @click.argument("engagement_name")
-@click.argument("mode", type=click.Choice(['off', 'warn', 'block']))
+@click.argument("mode", type=click.Choice(["off", "warn", "block"]))
 def scope_enforcement(engagement_name, mode):
     """Set enforcement mode for an engagement.
 
@@ -737,7 +795,7 @@ def scope_enforcement(engagement_name, mode):
         return
 
     manager = ScopeManager()
-    if manager.set_enforcement(eng['id'], mode):
+    if manager.set_enforcement(eng["id"], mode):
         click.echo(f"Enforcement mode set to '{mode}' for '{engagement_name}'")
     else:
         click.echo("Error: Failed to set enforcement mode", err=True)
@@ -756,7 +814,7 @@ def scope_validate(engagement_name, target):
         click.echo(f"Error: Engagement '{engagement_name}' not found", err=True)
         return
 
-    validator = ScopeValidator(eng['id'])
+    validator = ScopeValidator(eng["id"])
     result = validator.validate_target(target)
 
     if result.is_in_scope:
@@ -783,7 +841,7 @@ def scope_revalidate(engagement_name):
         return
 
     hm = HostManager()
-    result = hm.revalidate_scope_status(eng['id'])
+    result = hm.revalidate_scope_status(eng["id"])
 
     click.echo(f"Revalidated hosts for '{engagement_name}':")
     click.echo(f"  Updated: {result['updated']}")
@@ -805,7 +863,7 @@ def scope_log(engagement_name, limit):
         return
 
     manager = ScopeManager()
-    log_entries = manager.get_validation_log(eng['id'], limit)
+    log_entries = manager.get_validation_log(eng["id"], limit)
 
     click.echo(f"\nScope validation log for '{engagement_name}' (last {limit})")
     click.echo("=" * 80)
@@ -818,10 +876,10 @@ def scope_log(engagement_name, limit):
     click.echo("-" * 80)
 
     for entry in log_entries:
-        timestamp = entry.get('created_at', '')[:19]  # Trim to datetime
-        target = entry.get('target', '')[:24]
-        result = entry.get('validation_result', '')
-        action = entry.get('action_taken', '')
+        timestamp = entry.get("created_at", "")[:19]  # Trim to datetime
+        target = entry.get("target", "")[:24]
+        result = entry.get("validation_result", "")
+        action = entry.get("action_taken", "")
         click.echo(f"{timestamp:<20} {target:<25} {result:<12} {action:<10}")
 
 
@@ -839,7 +897,7 @@ def jobs():
 def jobs_enqueue(tool, target, args, label):
     """Enqueue a background job."""
     args_list = args.split() if args else []
-    
+
     try:
         job_id = enqueue_job(tool, target, args_list, label)
         click.echo(f"✓ Enqueued job {job_id}: {tool} {target}")
@@ -855,30 +913,32 @@ def jobs_enqueue(tool, target, args, label):
 def jobs_list(limit, status):
     """List background jobs."""
     jobs_data = list_jobs(limit=limit)
-    
+
     if status:
-        jobs_data = [j for j in jobs_data if j.get('status') == status]
-    
+        jobs_data = [j for j in jobs_data if j.get("status") == status]
+
     if not jobs_data:
         click.echo("No jobs found")
         return
-    
+
     click.echo("\n" + "=" * 100)
-    click.echo(f"{'ID':<5} {'Tool':<12} {'Target':<25} {'Status':<10} {'Label':<20} {'Created':<20}")
+    click.echo(
+        f"{'ID':<5} {'Tool':<12} {'Target':<25} {'Status':<10} {'Label':<20} {'Created':<20}"
+    )
     click.echo("=" * 100)
-    
+
     for job in jobs_data:
-        status_val = job.get('status', 'N/A')
+        status_val = job.get("status", "N/A")
 
         # Color code status
-        if status_val == 'done':
-            status_str = click.style(f"{status_val:<10}", fg='green')
-        elif status_val == 'running':
-            status_str = click.style(f"{status_val:<10}", fg='yellow')
-        elif status_val in ('error', 'failed'):
-            status_str = click.style(f"{status_val:<10}", fg='red')
-        elif status_val == 'killed':
-            status_str = click.style(f"{status_val:<10}", fg='magenta')
+        if status_val == "done":
+            status_str = click.style(f"{status_val:<10}", fg="green")
+        elif status_val == "running":
+            status_str = click.style(f"{status_val:<10}", fg="yellow")
+        elif status_val in ("error", "failed"):
+            status_str = click.style(f"{status_val:<10}", fg="red")
+        elif status_val == "killed":
+            status_str = click.style(f"{status_val:<10}", fg="magenta")
         else:
             status_str = f"{status_val:<10}"
 
@@ -890,7 +950,7 @@ def jobs_list(limit, status):
             f"{job.get('label', '')[:19]:<20} "
             f"{job.get('created_at', 'N/A'):<20}"
         )
-    
+
     click.echo("=" * 100 + "\n")
 
 
@@ -899,11 +959,11 @@ def jobs_list(limit, status):
 def jobs_get(job_id):
     """Get job details."""
     job = get_job(job_id)
-    
+
     if not job:
         click.echo(f"✗ Job {job_id} not found", err=True)
         return
-    
+
     click.echo("\n" + "=" * 60)
     click.echo(f"Job {job_id}")
     click.echo("=" * 60)
@@ -916,10 +976,10 @@ def jobs_get(job_id):
     click.echo(f"Started:    {job.get('started_at', 'N/A')}")
     click.echo(f"Finished:   {job.get('finished_at', 'N/A')}")
     click.echo(f"Log:        {job.get('log', 'N/A')}")
-    
-    if job.get('error'):
+
+    if job.get("error"):
         click.echo(f"Error:      {job['error']}")
-    
+
     click.echo("=" * 60 + "\n")
 
 
@@ -942,32 +1002,32 @@ def jobs_show(job_id):
     click.echo(f"Tool:       {job.get('tool', 'N/A')}")
     click.echo(f"Target:     {job.get('target', 'N/A')}")
     click.echo(f"Args:       {' '.join(job.get('args', []))}")
-    if job.get('label'):
+    if job.get("label"):
         click.echo(f"Label:      {job['label']}")
     click.echo(f"Status:     {job.get('status', 'N/A')}")
     click.echo(f"Created:    {job.get('created_at', 'N/A')}")
-    if job.get('started_at'):
+    if job.get("started_at"):
         click.echo(f"Started:    {job['started_at']}")
-    if job.get('finished_at'):
+    if job.get("finished_at"):
         click.echo(f"Finished:   {job['finished_at']}")
 
-    if job.get('error'):
+    if job.get("error"):
         click.echo(f"Error:      {job['error']}")
 
     click.echo()
 
     # Show log output
-    log_path = job.get('log')
+    log_path = job.get("log")
     if log_path and os.path.exists(log_path):
-        click.echo(click.style("LOG OUTPUT:", bold=True, fg='cyan'))
+        click.echo(click.style("LOG OUTPUT:", bold=True, fg="cyan"))
         click.echo("-" * 70)
 
         try:
-            with open(log_path, 'r', encoding='utf-8', errors='replace') as f:
+            with open(log_path, "r", encoding="utf-8", errors="replace") as f:
                 content = f.read()
 
             # Show last 100 lines
-            lines = content.split('\n')
+            lines = content.split("\n")
             if len(lines) > 100:
                 click.echo(f"... (showing last 100 of {len(lines)} lines)\n")
                 lines = lines[-100:]
@@ -976,9 +1036,9 @@ def jobs_show(job_id):
                 click.echo(line)
 
         except Exception as e:
-            click.echo(click.style(f"Error reading log: {e}", fg='red'))
+            click.echo(click.style(f"Error reading log: {e}", fg="red"))
     else:
-        click.echo(click.style("No log file available", fg='yellow'))
+        click.echo(click.style("No log file available", fg="yellow"))
 
     click.echo("\n" + "=" * 70 + "\n")
 
@@ -989,19 +1049,19 @@ def jobs_show(job_id):
 def jobs_tail(job_id, follow):
     """Tail job log file."""
     import subprocess
-    
+
     job = get_job(job_id)
-    
+
     if not job:
         click.echo(f"✗ Job {job_id} not found", err=True)
         return
-    
-    log_path = job.get('log')
-    
+
+    log_path = job.get("log")
+
     if not log_path or not os.path.exists(log_path):
         click.echo(f"✗ Log file not found: {log_path}", err=True)
         return
-    
+
     try:
         if follow:
             subprocess.run(["tail", "-f", log_path])
@@ -1026,20 +1086,20 @@ def jobs_kill(job_id, force):
         click.echo(f"✗ Job {job_id} not found", err=True)
         return
 
-    status = job.get('status')
-    
+    status = job.get("status")
+
     # Allow killing queued, running, and error jobs
-    if status not in ['queued', 'running', 'error']:
+    if status not in ["queued", "running", "error"]:
         click.echo(f"✗ Job {job_id} cannot be killed (status: {status})", err=True)
         return
 
     if kill_job(job_id):
-        if status == 'queued':
-            click.secho(f"✓ Job {job_id} removed from queue", fg='green')
-        elif status == 'error':
-            click.secho(f"✓ Job {job_id} marked as killed", fg='green')
+        if status == "queued":
+            click.secho(f"✓ Job {job_id} removed from queue", fg="green")
+        elif status == "error":
+            click.secho(f"✓ Job {job_id} marked as killed", fg="green")
         else:
-            click.secho(f"✓ Job {job_id} killed successfully", fg='green')
+            click.secho(f"✓ Job {job_id} killed successfully", fg="green")
     else:
         click.echo(f"✗ Failed to kill job {job_id}", err=True)
 
@@ -1047,29 +1107,35 @@ def jobs_kill(job_id, force):
 @jobs.command("sanitize")
 @click.argument("job_id", type=int, required=False)
 @click.option("--all", is_flag=True, help="Sanitize all job logs")
-@click.option("--dry-run", is_flag=True, help="Show what would be redacted without modifying logs")
+@click.option(
+    "--dry-run", is_flag=True, help="Show what would be redacted without modifying logs"
+)
 def jobs_sanitize(job_id, all, dry_run):
     """Sanitize job logs by redacting credentials."""
     from souleyez.engine.log_sanitizer import LogSanitizer
     from souleyez.storage.crypto import CryptoManager
-    
+
     crypto_mgr = CryptoManager()
     if not crypto_mgr.is_enabled():
-        click.secho("⚠️  Warning: Encryption is not enabled.", fg='yellow')
-        click.echo("   Sanitization is primarily useful when encryption is enabled to prevent")
+        click.secho("⚠️  Warning: Encryption is not enabled.", fg="yellow")
+        click.echo(
+            "   Sanitization is primarily useful when encryption is enabled to prevent"
+        )
         click.echo("   plaintext credentials in logs while encrypted in database.")
         if not click.confirm("Continue anyway?"):
             return
-    
+
     if all:
         jobs_to_sanitize = list_jobs(limit=10000)
         if not jobs_to_sanitize:
             click.echo("No jobs found")
             return
-        
+
         click.echo(f"Found {len(jobs_to_sanitize)} job(s)")
-        
-        if not dry_run and not click.confirm(f"Sanitize logs for all {len(jobs_to_sanitize)} jobs?"):
+
+        if not dry_run and not click.confirm(
+            f"Sanitize logs for all {len(jobs_to_sanitize)} jobs?"
+        ):
             return
     elif job_id:
         job = get_job(job_id)
@@ -1082,60 +1148,62 @@ def jobs_sanitize(job_id, all, dry_run):
         click.echo("Usage: souleyez jobs sanitize <job_id>")
         click.echo("       souleyez jobs sanitize --all")
         return
-    
+
     sanitized_count = 0
     redacted_count = 0
-    
+
     for job in jobs_to_sanitize:
-        jid = job['id']
-        log_path = job.get('log')
-        
+        jid = job["id"]
+        log_path = job.get("log")
+
         if not log_path or not os.path.exists(log_path):
             continue
-        
+
         try:
-            with open(log_path, 'r', encoding='utf-8', errors='replace') as f:
+            with open(log_path, "r", encoding="utf-8", errors="replace") as f:
                 original = f.read()
-            
+
             if not LogSanitizer.contains_credentials(original):
                 continue
-            
+
             sanitized = LogSanitizer.sanitize(original)
-            
+
             if original == sanitized:
                 continue
-            
+
             summary = LogSanitizer.get_redaction_summary(original, sanitized)
-            
+
             if dry_run:
                 click.echo(f"Job {jid}: {summary}")
                 redacted_count += 1
             else:
-                with open(log_path, 'w', encoding='utf-8') as f:
+                with open(log_path, "w", encoding="utf-8") as f:
                     f.write(sanitized)
-                click.secho(f"✓ Job {jid}: {summary}", fg='green')
+                click.secho(f"✓ Job {jid}: {summary}", fg="green")
                 sanitized_count += 1
-        
+
         except Exception as e:
             click.echo(f"✗ Job {jid}: Failed - {e}", err=True)
-    
+
     if dry_run:
         click.echo(f"\n{redacted_count} job log(s) contain credentials (dry-run)")
     else:
-        click.secho(f"\n✓ Sanitized {sanitized_count} job log(s)", fg='green')
+        click.secho(f"\n✓ Sanitized {sanitized_count} job log(s)", fg="green")
 
 
 @jobs.command("reparse")
 @click.argument("job_id", type=int, required=False)
 @click.option("--all", is_flag=True, help="Reparse all completed jobs")
 @click.option("--tool", "-t", default=None, help="Filter by tool type")
-def jobs_reparse(job_id, all, tool):
+@click.option("--chain", is_flag=True, help="Re-evaluate chain rules after reparsing")
+def jobs_reparse(job_id, all, tool, chain):
     """Reparse completed job results to update database and status.
 
     Useful for applying new parsing logic to old jobs. This will:
     - Re-run the parser on existing log files
     - Update findings/credentials in database
     - Update job status (e.g., no_results -> done if data found)
+    - Optionally re-trigger chain rules with --chain
     """
     from souleyez.engine.result_handler import reparse_job
 
@@ -1147,9 +1215,13 @@ def jobs_reparse(job_id, all, tool):
 
         # Filter by status and optionally by tool
         # Include no_results since that's what we're trying to fix
-        jobs_to_reparse = [j for j in jobs_to_reparse if j.get('status') in ('done', 'error', 'no_results')]
+        jobs_to_reparse = [
+            j
+            for j in jobs_to_reparse
+            if j.get("status") in ("done", "error", "no_results")
+        ]
         if tool:
-            jobs_to_reparse = [j for j in jobs_to_reparse if j.get('tool') == tool]
+            jobs_to_reparse = [j for j in jobs_to_reparse if j.get("tool") == tool]
 
         if not jobs_to_reparse:
             filter_msg = f" for tool '{tool}'" if tool else ""
@@ -1166,8 +1238,11 @@ def jobs_reparse(job_id, all, tool):
             click.echo(f"✗ Job {job_id} not found", err=True)
             return
 
-        if job.get('status') not in ('done', 'error', 'no_results'):
-            click.echo(f"✗ Job {job_id} is not completed (status: {job.get('status')})", err=True)
+        if job.get("status") not in ("done", "error", "no_results"):
+            click.echo(
+                f"✗ Job {job_id} is not completed (status: {job.get('status')})",
+                err=True,
+            )
             return
 
         jobs_to_reparse = [job]
@@ -1184,62 +1259,82 @@ def jobs_reparse(job_id, all, tool):
     error_count = 0
 
     for job in jobs_to_reparse:
-        jid = job['id']
-        tool_name = job.get('tool', 'unknown')
-        old_status = job.get('status')
+        jid = job["id"]
+        tool_name = job.get("tool", "unknown")
+        old_status = job.get("status")
 
         try:
             result = reparse_job(jid)
 
-            if not result.get('success'):
-                msg = result.get('message', 'Unknown error')
-                if 'No parser' in msg:
+            if not result.get("success"):
+                msg = result.get("message", "Unknown error")
+                if "No parser" in msg:
                     click.echo(f"  Job {jid} ({tool_name}): No parser available")
                     skipped_count += 1
                 else:
-                    click.secho(f"✗ Job {jid} ({tool_name}): {msg}", fg='red')
+                    click.secho(f"✗ Job {jid} ({tool_name}): {msg}", fg="red")
                     error_count += 1
             else:
                 # Show what was parsed
-                parse_result = result.get('parse_result', {})
-                new_status = result.get('new_status')
+                parse_result = result.get("parse_result", {})
+                new_status = result.get("new_status")
                 summary = []
 
-                if parse_result.get('hosts_added', 0) > 0:
+                if parse_result.get("hosts_added", 0) > 0:
                     summary.append(f"{parse_result['hosts_added']} hosts")
-                if parse_result.get('osint_added', 0) > 0:
+                if parse_result.get("osint_added", 0) > 0:
                     summary.append(f"{parse_result['osint_added']} OSINT records")
-                if parse_result.get('findings_added', 0) > 0:
+                if parse_result.get("findings_added", 0) > 0:
                     summary.append(f"{parse_result['findings_added']} findings")
-                if parse_result.get('credentials_added', 0) > 0:
+                if parse_result.get("credentials_added", 0) > 0:
                     summary.append(f"{parse_result['credentials_added']} credentials")
-                if parse_result.get('users_found', 0) > 0:
+                if parse_result.get("users_found", 0) > 0:
                     summary.append(f"{parse_result['users_found']} users")
-                if parse_result.get('shares_found', 0) > 0:
+                if parse_result.get("shares_found", 0) > 0:
                     summary.append(f"{parse_result['shares_found']} shares")
 
                 summary_str = ", ".join(summary) if summary else "parsed"
 
                 # Highlight status changes
                 if old_status != new_status:
-                    click.secho(f"✓ Job {jid} ({tool_name}): {summary_str} [{old_status} → {new_status}]", fg='green')
+                    click.secho(
+                        f"✓ Job {jid} ({tool_name}): {summary_str} [{old_status} → {new_status}]",
+                        fg="green",
+                    )
                     updated_count += 1
                 else:
-                    click.secho(f"✓ Job {jid} ({tool_name}): {summary_str}", fg='green')
+                    click.secho(f"✓ Job {jid} ({tool_name}): {summary_str}", fg="green")
                 parsed_count += 1
 
+                # Re-evaluate chain rules if requested
+                if chain and parse_result:
+                    try:
+                        from souleyez.core.tool_chaining import ToolChaining
+
+                        crm = ToolChaining()
+                        chain_job_ids = crm.auto_chain(
+                            job=job, parse_results=parse_result
+                        )
+                        if chain_job_ids:
+                            click.secho(
+                                f"  → Chained {len(chain_job_ids)} job(s): {chain_job_ids}",
+                                fg="cyan",
+                            )
+                    except Exception as chain_err:
+                        click.secho(f"  → Chain error: {chain_err}", fg="yellow")
+
         except Exception as e:
-            click.secho(f"✗ Job {jid} ({tool_name}): Failed - {e}", fg='red')
+            click.secho(f"✗ Job {jid} ({tool_name}): Failed - {e}", fg="red")
             error_count += 1
 
     click.echo(f"\n{'=' * 60}")
-    click.secho(f"✓ Reparsed: {parsed_count}", fg='green')
+    click.secho(f"✓ Reparsed: {parsed_count}", fg="green")
     if updated_count > 0:
-        click.secho(f"  Status updated: {updated_count}", fg='cyan')
+        click.secho(f"  Status updated: {updated_count}", fg="cyan")
     if skipped_count > 0:
         click.echo(f"  Skipped: {skipped_count}")
     if error_count > 0:
-        click.secho(f"✗ Errors: {error_count}", fg='red')
+        click.secho(f"✗ Errors: {error_count}", fg="red")
     click.echo("=" * 60)
 
 
@@ -1269,19 +1364,20 @@ def worker_start(fg):
 def worker_status():
     """Check worker status."""
     import subprocess
-    
+
     try:
         # Use pgrep to find worker_loop processes (more reliable than ps + grep)
         result = subprocess.run(
-            ["pgrep", "-f", "worker_loop"],
-            capture_output=True,
-            text=True
+            ["pgrep", "-f", "worker_loop"], capture_output=True, text=True
         )
-        
+
         if result.returncode == 0 and result.stdout.strip():
             # Found worker processes
-            pids = result.stdout.strip().split('\n')
-            click.secho(f"✓ Worker is running ({len(pids)} process{'es' if len(pids) > 1 else ''}):", fg='green')
+            pids = result.stdout.strip().split("\n")
+            click.secho(
+                f"✓ Worker is running ({len(pids)} process{'es' if len(pids) > 1 else ''}):",
+                fg="green",
+            )
             for pid in pids:
                 click.echo(f"  PID {pid}: background worker")
         else:
@@ -1292,12 +1388,12 @@ def worker_status():
         try:
             result = subprocess.run(["ps", "aux"], capture_output=True, text=True)
             worker_procs = []
-            for line in result.stdout.split('\n'):
-                if 'worker_loop' in line and 'grep' not in line:
+            for line in result.stdout.split("\n"):
+                if "worker_loop" in line and "grep" not in line:
                     worker_procs.append(line)
-            
+
             if worker_procs:
-                click.secho("✓ Worker is running:", fg='green')
+                click.secho("✓ Worker is running:", fg="green")
                 for proc in worker_procs:
                     parts = proc.split()
                     if len(parts) >= 2:
@@ -1316,22 +1412,22 @@ def list_plugins():
     """List available plugins."""
     try:
         from souleyez.engine.loader import discover_plugins
-        
+
         plugins = discover_plugins()
-        
+
         if not plugins:
             click.echo("No plugins found")
             return
-        
+
         click.echo("\n" + "=" * 80)
         click.echo("AVAILABLE PLUGINS")
         click.echo("=" * 80)
-        
+
         for key, plugin in sorted(plugins.items()):
-            name = getattr(plugin, 'name', 'Unknown')
-            category = getattr(plugin, 'category', 'misc')
+            name = getattr(plugin, "name", "Unknown")
+            category = getattr(plugin, "category", "misc")
             click.echo(f"{key:<15} | {name:<30} | {category}")
-        
+
         click.echo("=" * 80)
         click.echo(f"Total: {len(plugins)} plugins\n")
     except Exception as e:
@@ -1340,6 +1436,7 @@ def list_plugins():
 
 # ==================== DATABASE COMMANDS ====================
 
+
 @cli.group()
 def db():
     """Database management commands."""
@@ -1351,19 +1448,19 @@ def db_migrate():
     """Apply pending database migrations."""
     from souleyez.storage.migrations.migration_manager import MigrationManager
     from souleyez.storage.database import get_db
-    
+
     click.echo()
-    click.echo(click.style("🔄 DATABASE MIGRATION", bold=True, fg='cyan'))
+    click.echo(click.style("🔄 DATABASE MIGRATION", bold=True, fg="cyan"))
     click.echo("=" * 80)
-    
+
     # Get database path
     db_instance = get_db()
     db_path = db_instance.db_path
-    
+
     # Run migrations
     manager = MigrationManager(db_path)
     applied = manager.migrate()
-    
+
     click.echo()
 
 
@@ -1372,11 +1469,11 @@ def db_status():
     """Show database migration status."""
     from souleyez.storage.migrations.migration_manager import MigrationManager
     from souleyez.storage.database import get_db
-    
+
     # Get database path
     db_instance = get_db()
     db_path = db_instance.db_path
-    
+
     # Show status
     manager = MigrationManager(db_path)
     manager.status()
@@ -1388,36 +1485,36 @@ def db_encrypt():
     import getpass
     from souleyez.storage.credentials import CredentialsManager
     from souleyez.storage.crypto import get_crypto_manager
-    
+
     crypto = get_crypto_manager()
-    
+
     # Check if encryption is enabled
     if not crypto.is_encryption_enabled():
-        click.echo(click.style("✗ Encryption is not enabled", fg='red'))
+        click.echo(click.style("✗ Encryption is not enabled", fg="red"))
         click.echo("Run 'souleyez interactive' to set up encryption first")
         return
-    
+
     # Unlock crypto if needed
     if not crypto.is_unlocked():
-        click.echo(click.style("🔐 Master password required", fg='cyan'))
+        click.echo(click.style("🔐 Master password required", fg="cyan"))
         password = getpass.getpass("Enter master password: ")
         try:
             crypto.unlock(password)
-            click.echo(click.style("✓ Unlocked", fg='green'))
+            click.echo(click.style("✓ Unlocked", fg="green"))
         except Exception as e:
-            click.echo(click.style(f"✗ Failed to unlock: {e}", fg='red'))
+            click.echo(click.style(f"✗ Failed to unlock: {e}", fg="red"))
             return
-    
+
     # Encrypt all credentials
     cm = CredentialsManager()
     result = cm.encrypt_all_unencrypted()
-    
-    if 'error' in result:
-        click.echo(click.style(f"✗ {result['error']}", fg='red'))
+
+    if "error" in result:
+        click.echo(click.style(f"✗ {result['error']}", fg="red"))
         return
-    
+
     click.echo()
-    click.echo(click.style("✓ Encryption complete", fg='green', bold=True))
+    click.echo(click.style("✓ Encryption complete", fg="green", bold=True))
     click.echo(f"  • Encrypted: {result.get('encrypted', 0)} credentials")
     click.echo(f"  • Already encrypted: {result.get('skipped', 0)} credentials")
     click.echo(f"  • Total: {result.get('total', 0)} credentials")
@@ -1430,35 +1527,40 @@ def _run_doctor(fix=False, verbose=False):
     import sqlite3
 
     click.echo()
-    click.echo(click.style("🩺 SoulEyez Doctor", fg='cyan', bold=True))
-    click.echo(click.style("=" * 50, fg='cyan'))
+    click.echo(click.style("🩺 SoulEyez Doctor", fg="cyan", bold=True))
+    click.echo(click.style("=" * 50, fg="cyan"))
     click.echo()
 
     issues = []
     warnings = []
 
     def check_pass(msg):
-        click.echo(click.style(f"  ✓ {msg}", fg='green'))
+        click.echo(click.style(f"  ✓ {msg}", fg="green"))
 
     def check_fail(msg, fix_cmd=None):
-        click.echo(click.style(f"  ✗ {msg}", fg='red'))
+        click.echo(click.style(f"  ✗ {msg}", fg="red"))
         issues.append((msg, fix_cmd))
 
     def check_warn(msg, suggestion=None):
-        click.echo(click.style(f"  ⚠ {msg}", fg='yellow'))
+        click.echo(click.style(f"  ⚠ {msg}", fg="yellow"))
         warnings.append((msg, suggestion))
 
     # Section 1: Python Environment
     click.echo(click.style("Python Environment", bold=True))
     import sys
-    python_version = f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}"
+
+    python_version = (
+        f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}"
+    )
     if sys.version_info >= (3, 8):
         check_pass(f"Python {python_version}")
     else:
-        check_fail(f"Python {python_version} (need 3.8+)", "Install Python 3.8 or newer")
+        check_fail(
+            f"Python {python_version} (need 3.8+)", "Install Python 3.8 or newer"
+        )
 
     # Check required packages
-    required_packages = ['click', 'rich', 'wcwidth']
+    required_packages = ["click", "rich", "wcwidth"]
     for pkg in required_packages:
         try:
             __import__(pkg)
@@ -1471,14 +1573,16 @@ def _run_doctor(fix=False, verbose=False):
 
     # Section 2: Data Directory
     click.echo(click.style("Data Directory", bold=True))
-    data_dir = Path.home() / '.souleyez'
+    data_dir = Path.home() / ".souleyez"
     if data_dir.exists():
         check_pass(f"Data directory: {data_dir}")
     else:
-        check_warn(f"Data directory missing: {data_dir}", "Will be created on first run")
+        check_warn(
+            f"Data directory missing: {data_dir}", "Will be created on first run"
+        )
 
     # Check database
-    db_path = data_dir / 'souleyez.db'
+    db_path = data_dir / "souleyez.db"
     if db_path.exists():
         try:
             conn = sqlite3.connect(str(db_path))
@@ -1488,7 +1592,9 @@ def _run_doctor(fix=False, verbose=False):
             conn.close()
             check_pass(f"Database OK ({count} engagements)")
         except Exception as e:
-            check_fail(f"Database error: {str(e)[:40]}", "Run: souleyez setup --repair-db")
+            check_fail(
+                f"Database error: {str(e)[:40]}", "Run: souleyez setup --repair-db"
+            )
     else:
         check_warn("No database yet", "Will be created on first run")
 
@@ -1497,9 +1603,9 @@ def _run_doctor(fix=False, verbose=False):
     # Section 3: Essential Tools
     click.echo(click.style("Essential Tools", bold=True))
     essential_tools = {
-        'nmap': 'sudo apt install nmap',
-        'git': 'sudo apt install git',
-        'curl': 'sudo apt install curl',
+        "nmap": "sudo apt install nmap",
+        "git": "sudo apt install git",
+        "curl": "sudo apt install curl",
     }
 
     for tool, install_cmd in essential_tools.items():
@@ -1514,6 +1620,7 @@ def _run_doctor(fix=False, verbose=False):
     click.echo(click.style("Pentesting Tools", bold=True))
     # Use the same tool checker as the setup wizard for consistency
     from souleyez.utils.tool_checker import get_tool_stats
+
     installed, total = get_tool_stats()
 
     if installed == total:
@@ -1527,22 +1634,27 @@ def _run_doctor(fix=False, verbose=False):
 
     # Section 5: Configuration
     click.echo(click.style("Configuration", bold=True))
-    config_file = data_dir / 'config.json'
+    config_file = data_dir / "config.json"
     if config_file.exists():
         try:
             import json
+
             with open(config_file) as f:
                 config = json.load(f)
             check_pass("Config file valid")
 
             # Check AI providers
-            ai_config = config.get('ai', {})
-            provider = ai_config.get('provider', '')
-            has_ollama = provider == 'ollama' or ai_config.get('ollama_model')
-            has_claude = ai_config.get('claude_api_key') or ai_config.get('anthropic_api_key')
-            has_openai = ai_config.get('openai_api_key')
+            ai_config = config.get("ai", {})
+            provider = ai_config.get("provider", "")
+            has_ollama = provider == "ollama" or ai_config.get("ollama_model")
+            has_claude = ai_config.get("claude_api_key") or ai_config.get(
+                "anthropic_api_key"
+            )
+            has_openai = ai_config.get("openai_api_key")
             if has_ollama or has_claude or has_openai:
-                provider_name = provider or ('ollama' if has_ollama else 'claude' if has_claude else 'openai')
+                provider_name = provider or (
+                    "ollama" if has_ollama else "claude" if has_claude else "openai"
+                )
                 check_pass(f"AI provider: {provider_name}")
         except Exception as e:
             check_fail(f"Config error: {str(e)[:30]}", "Check ~/.souleyez/config.json")
@@ -1555,45 +1667,58 @@ def _run_doctor(fix=False, verbose=False):
     click.echo(click.style("System Configuration", bold=True))
 
     # Check sudoers files for proper format (trailing newline)
-    sudoers_dir = Path('/etc/sudoers.d')
-    sudoers_tools = ['nmap', 'souleyez-responder']  # Tools we configure in sudoers
+    sudoers_dir = Path("/etc/sudoers.d")
+    sudoers_tools = ["nmap", "souleyez-responder"]  # Tools we configure in sudoers
     for tool in sudoers_tools:
         sudoers_file = sudoers_dir / tool
         if sudoers_file.exists():
             try:
                 # Check file size vs expected content
                 content = sudoers_file.read_bytes()
-                if content and not content.endswith(b'\n'):
-                    check_fail(f"Sudoers {tool}: missing newline",
-                              f"echo '' | sudo tee -a /etc/sudoers.d/{tool}")
+                if content and not content.endswith(b"\n"):
+                    check_fail(
+                        f"Sudoers {tool}: missing newline",
+                        f"echo '' | sudo tee -a /etc/sudoers.d/{tool}",
+                    )
                 elif verbose:
                     check_pass(f"Sudoers {tool}: OK")
             except PermissionError:
                 if verbose:
-                    click.echo(click.style(f"  - Sudoers {tool}: need sudo to verify", fg='bright_black'))
+                    click.echo(
+                        click.style(
+                            f"  - Sudoers {tool}: need sudo to verify",
+                            fg="bright_black",
+                        )
+                    )
 
     # Check PATH for common tool directories
-    path_dirs = os.environ.get('PATH', '').split(':')
-    pipx_bin = str(Path.home() / '.local' / 'bin')
-    go_bin = str(Path.home() / 'go' / 'bin')
+    path_dirs = os.environ.get("PATH", "").split(":")
+    pipx_bin = str(Path.home() / ".local" / "bin")
+    go_bin = str(Path.home() / "go" / "bin")
 
     # Detect shell config file (zsh for Kali, bash for others)
-    shell = os.environ.get('SHELL', '/bin/bash')
-    shell_rc = '~/.zshrc' if 'zsh' in shell else '~/.bashrc'
+    shell = os.environ.get("SHELL", "/bin/bash")
+    shell_rc = "~/.zshrc" if "zsh" in shell else "~/.bashrc"
 
     if pipx_bin in path_dirs:
         if verbose:
             check_pass("PATH includes ~/.local/bin (pipx)")
     else:
         if Path(pipx_bin).exists() and any(Path(pipx_bin).iterdir()):
-            check_warn("~/.local/bin not in PATH", f"Add to {shell_rc}: export PATH=\"$HOME/.local/bin:$PATH\"")
+            check_warn(
+                "~/.local/bin not in PATH",
+                f'Add to {shell_rc}: export PATH="$HOME/.local/bin:$PATH"',
+            )
 
     if go_bin in path_dirs:
         if verbose:
             check_pass("PATH includes ~/go/bin")
     else:
         if Path(go_bin).exists() and any(Path(go_bin).iterdir()):
-            check_warn("~/go/bin not in PATH", f"Add to {shell_rc}: export PATH=\"$HOME/go/bin:$PATH\"")
+            check_warn(
+                "~/go/bin not in PATH",
+                f'Add to {shell_rc}: export PATH="$HOME/go/bin:$PATH"',
+            )
 
     # Check database is writable
     if db_path.exists():
@@ -1609,69 +1734,183 @@ def _run_doctor(fix=False, verbose=False):
     # Check background worker
     try:
         import subprocess
-        result = subprocess.run(['pgrep', '-f', 'souleyez worker'],
-                               capture_output=True, timeout=5)
+
+        result = subprocess.run(
+            ["pgrep", "-f", "souleyez worker"], capture_output=True, timeout=5
+        )
         if result.returncode == 0:
             check_pass("Background worker running")
         else:
-            check_warn("Background worker not running", "souleyez dashboard (starts automatically)")
+            check_warn(
+                "Background worker not running",
+                "souleyez dashboard (starts automatically)",
+            )
     except Exception:
         pass
 
+    # Check for orphaned pending chains
+    try:
+        from souleyez.core.pending_chains import _read_chains, purge_orphaned_chains
+
+        chains = _read_chains()
+        if chains:
+            # Check which are orphaned
+            db_path = os.path.join(data_dir, "souleyez.db")
+            conn = sqlite3.connect(db_path)
+            cursor = conn.execute("SELECT id FROM engagements")
+            valid_ids = {row[0] for row in cursor.fetchall()}
+            conn.close()
+
+            orphaned = [
+                c
+                for c in chains
+                if c.get("engagement_id") not in valid_ids
+                and c.get("engagement_id") is not None
+            ]
+            if orphaned:
+                check_warn(
+                    f"Orphaned pending chains: {len(orphaned)}",
+                    "Run with --fix to clean up",
+                )
+                if fix:
+                    purged = purge_orphaned_chains()
+                    if purged > 0:
+                        check_pass(f"Cleaned up {purged} orphaned chains")
+            elif verbose:
+                check_pass(f"Pending chains OK ({len(chains)} active)")
+        elif verbose:
+            check_pass("No pending chains")
+    except Exception:
+        pass
+
+    # Check dashboard cache status
+    if verbose:
+        try:
+            from souleyez.ui.dashboard import _header_cache, _HEADER_CACHE_TTL
+
+            cache_entries = len(_header_cache)
+            if cache_entries > 0:
+                check_pass(
+                    f"Dashboard cache: {cache_entries} entries (TTL: {_HEADER_CACHE_TTL}s)"
+                )
+            else:
+                check_pass("Dashboard cache: empty (will populate on first load)")
+        except Exception:
+            pass
+
+        try:
+            from souleyez.intelligence.exploit_suggestions import (
+                _SUGGESTION_CACHE,
+                _CACHE_TIMEOUT,
+            )
+
+            cache_entries = len(_SUGGESTION_CACHE)
+            if cache_entries > 0:
+                check_pass(
+                    f"Exploit suggestions cache: {cache_entries} entries (TTL: {_CACHE_TIMEOUT}s)"
+                )
+            else:
+                check_pass(
+                    "Exploit suggestions cache: empty (will populate on first load)"
+                )
+        except Exception:
+            pass
+
     click.echo()
 
     # Section 7: MSF Database (if msfconsole available)
-    if shutil.which('msfconsole'):
+    if shutil.which("msfconsole"):
         click.echo(click.style("Metasploit", bold=True))
-        # Check user config first, then system-wide config (Kali uses system-wide)
-        msf_db = Path.home() / '.msf4' / 'database.yml'
-        system_msf_db = Path('/usr/share/metasploit-framework/config/database.yml')
-        if msf_db.exists() or system_msf_db.exists():
-            check_pass("MSF database configured")
-        else:
-            check_fail("MSF database not initialized", "msfdb init")
+
+        # Use comprehensive msfdb status check
+        from souleyez.utils.tool_checker import check_msfdb_status
+
+        db_status = check_msfdb_status()
+
+        if db_status["initialized"] and db_status["running"]:
+            check_pass("MSF database initialized and running")
+        elif db_status["initialized"] and not db_status["running"]:
+            check_warn(
+                "MSF database initialized but PostgreSQL not running",
+                "sudo systemctl start postgresql",
+            )
+        elif not db_status["initialized"]:
+            # Fall back to file check in case msfdb status failed
+            msf_db = Path.home() / ".msf4" / "database.yml"
+            system_msf_db = Path("/usr/share/metasploit-framework/config/database.yml")
+            if msf_db.exists() or system_msf_db.exists():
+                check_warn(
+                    "MSF database config exists but status unclear",
+                    db_status.get("message", "Run: sudo msfdb status"),
+                )
+            else:
+                check_fail("MSF database not initialized", "msfdb init")
+
+        if verbose:
+            click.echo(
+                click.style(
+                    f"    Status: {db_status.get('message', 'Unknown')}",
+                    fg="bright_black",
+                )
+            )
 
         # Check if root has access (for sudo msfconsole)
         # Skip if we can't access /root (not an error, just needs sudo to check)
-        root_msf_db = Path('/root/.msf4/database.yml')
+        root_msf_db = Path("/root/.msf4/database.yml")
         try:
             if root_msf_db.exists():
                 check_pass("Sudo MSF access configured")
             else:
-                check_warn("Sudo MSF may not connect to DB",
-                          "sudo cp ~/.msf4/database.yml /root/.msf4/")
+                check_warn(
+                    "Sudo MSF may not connect to DB",
+                    "sudo cp ~/.msf4/database.yml /root/.msf4/",
+                )
         except PermissionError:
             # Can't check without sudo - not a problem, just skip
             if verbose:
-                click.echo(click.style("  - Sudo MSF config: need sudo to verify", fg='bright_black'))
+                click.echo(
+                    click.style(
+                        "  - Sudo MSF config: need sudo to verify", fg="bright_black"
+                    )
+                )
 
         click.echo()
 
     # Summary
-    click.echo(click.style("=" * 50, fg='cyan'))
+    click.echo(click.style("=" * 50, fg="cyan"))
     if not issues and not warnings:
-        click.echo(click.style("✓ All checks passed! SoulEyez is healthy.", fg='green', bold=True))
+        click.echo(
+            click.style(
+                "✓ All checks passed! SoulEyez is healthy.", fg="green", bold=True
+            )
+        )
     else:
         if issues:
-            click.echo(click.style(f"\n{len(issues)} issue(s) found:", fg='red', bold=True))
+            click.echo(
+                click.style(f"\n{len(issues)} issue(s) found:", fg="red", bold=True)
+            )
             for issue, fix_cmd in issues:
                 click.echo(f"  • {issue}")
                 if fix_cmd:
-                    click.echo(click.style(f"    Fix: {fix_cmd}", fg='cyan'))
+                    click.echo(click.style(f"    Fix: {fix_cmd}", fg="cyan"))
 
         if warnings:
-            click.echo(click.style(f"\n{len(warnings)} warning(s):", fg='yellow', bold=True))
+            click.echo(
+                click.style(f"\n{len(warnings)} warning(s):", fg="yellow", bold=True)
+            )
             for warning, suggestion in warnings:
                 click.echo(f"  • {warning}")
                 if suggestion:
-                    click.echo(click.style(f"    Suggestion: {suggestion}", fg='cyan'))
+                    click.echo(click.style(f"    Suggestion: {suggestion}", fg="cyan"))
 
     # Auto-fix if requested
     if fix and issues:
         click.echo()
-        click.echo(click.style("Attempting auto-fix...", fg='cyan', bold=True))
+        click.echo(click.style("Attempting auto-fix...", fg="cyan", bold=True))
         # TODO: Implement auto-fix for common issues
-        click.echo("Auto-fix not yet implemented. Please run the suggested commands manually.")
+        click.echo(
+            "Auto-fix not yet implemented. Please run the suggested commands manually."
+        )
 
     click.echo()
 
@@ -1679,8 +1918,8 @@ def _run_doctor(fix=False, verbose=False):
 
 
 @cli.command()
-@click.option('--fix', is_flag=True, help='Attempt to automatically fix issues')
-@click.option('--verbose', '-v', is_flag=True, help='Show detailed diagnostic info')
+@click.option("--fix", is_flag=True, help="Attempt to automatically fix issues")
+@click.option("--verbose", "-v", is_flag=True, help="Show detailed diagnostic info")
 def doctor(fix, verbose):
     """Diagnose and fix common SoulEyez issues.
 
@@ -1705,11 +1944,12 @@ def tutorial():
     - Understanding the dashboard
     """
     from souleyez.ui.tutorial import run_tutorial
+
     run_tutorial()
 
 
-@cli.command('install-desktop')
-@click.option('--remove', is_flag=True, help='Remove the desktop shortcut')
+@cli.command("install-desktop")
+@click.option("--remove", is_flag=True, help="Remove the desktop shortcut")
 def install_desktop(remove):
     """Install SoulEyez desktop shortcut in Applications menu.
 
@@ -1719,29 +1959,33 @@ def install_desktop(remove):
     import shutil
     from importlib import resources
 
-    applications_dir = Path.home() / '.local' / 'share' / 'applications'
-    icons_dir = Path.home() / '.local' / 'share' / 'icons'
-    desktop_file = applications_dir / 'souleyez.desktop'
-    icon_dest = icons_dir / 'souleyez.png'
+    applications_dir = Path.home() / ".local" / "share" / "applications"
+    icons_dir = Path.home() / ".local" / "share" / "icons"
+    desktop_file = applications_dir / "souleyez.desktop"
+    icon_dest = icons_dir / "souleyez.png"
 
     if remove:
         # Remove desktop shortcut
         removed = False
         if desktop_file.exists():
             desktop_file.unlink()
-            click.echo(click.style("  Removed desktop shortcut", fg='green'))
+            click.echo(click.style("  Removed desktop shortcut", fg="green"))
             removed = True
         if icon_dest.exists():
             icon_dest.unlink()
-            click.echo(click.style("  Removed icon", fg='green'))
+            click.echo(click.style("  Removed icon", fg="green"))
             removed = True
         if removed:
-            click.echo(click.style("\nSoulEyez removed from Applications menu.", fg='cyan'))
+            click.echo(
+                click.style("\nSoulEyez removed from Applications menu.", fg="cyan")
+            )
         else:
-            click.echo(click.style("No desktop shortcut found.", fg='yellow'))
+            click.echo(click.style("No desktop shortcut found.", fg="yellow"))
         return
 
-    click.echo(click.style("\nInstalling SoulEyez desktop shortcut...\n", fg='cyan', bold=True))
+    click.echo(
+        click.style("\nInstalling SoulEyez desktop shortcut...\n", fg="cyan", bold=True)
+    )
 
     # Create directories
     applications_dir.mkdir(parents=True, exist_ok=True)
@@ -1752,20 +1996,21 @@ def install_desktop(remove):
         # Try importlib.resources first (Python 3.9+)
         try:
             from importlib.resources import files
-            icon_source = files('souleyez.assets').joinpath('souleyez-icon.png')
-            with open(icon_source, 'rb') as src:
+
+            icon_source = files("souleyez.assets").joinpath("souleyez-icon.png")
+            with open(icon_source, "rb") as src:
                 icon_data = src.read()
         except (ImportError, TypeError, FileNotFoundError):
             # Fallback: find icon relative to this file
-            icon_source = Path(__file__).parent / 'assets' / 'souleyez-icon.png'
-            with open(icon_source, 'rb') as src:
+            icon_source = Path(__file__).parent / "assets" / "souleyez-icon.png"
+            with open(icon_source, "rb") as src:
                 icon_data = src.read()
 
-        with open(icon_dest, 'wb') as dst:
+        with open(icon_dest, "wb") as dst:
             dst.write(icon_data)
-        click.echo(click.style("  Installed icon", fg='green'))
+        click.echo(click.style("  Installed icon", fg="green"))
     except Exception as e:
-        click.echo(click.style(f"  Warning: Could not copy icon: {e}", fg='yellow'))
+        click.echo(click.style(f"  Warning: Could not copy icon: {e}", fg="yellow"))
         icon_dest = "utilities-terminal"  # Fallback to system icon
 
     # Create .desktop file
@@ -1781,21 +2026,27 @@ Keywords=pentest;security;hacking;nmap;metasploit;
 """
 
     desktop_file.write_text(desktop_content)
-    click.echo(click.style("  Created desktop entry", fg='green'))
+    click.echo(click.style("  Created desktop entry", fg="green"))
 
     # Update desktop database (optional, may not be available)
     try:
         import subprocess
-        subprocess.run(['update-desktop-database', str(applications_dir)],
-                      capture_output=True, check=False)
+
+        subprocess.run(
+            ["update-desktop-database", str(applications_dir)],
+            capture_output=True,
+            check=False,
+        )
     except Exception:
         pass  # Not critical if this fails
 
     click.echo()
-    click.echo(click.style("SoulEyez added to Applications menu!", fg='green', bold=True))
+    click.echo(
+        click.style("SoulEyez added to Applications menu!", fg="green", bold=True)
+    )
     click.echo()
     click.echo("You can find it under:")
-    click.echo(click.style("  Applications > Security > SoulEyez", fg='cyan'))
+    click.echo(click.style("  Applications > Security > SoulEyez", fg="cyan"))
     click.echo()
     click.echo("To remove: souleyez install-desktop --remove")
 
@@ -1805,106 +2056,129 @@ def main():
     cli()
 
 
-
 @cli.command()
-@click.option('--purge-data', is_flag=True, help='Remove all user data (~/.souleyez)')
-@click.confirmation_option(prompt='Are you sure you want to uninstall SoulEyez?')
+@click.option("--purge-data", is_flag=True, help="Remove all user data (~/.souleyez)")
+@click.confirmation_option(prompt="Are you sure you want to uninstall SoulEyez?")
 def uninstall(purge_data):
     """Uninstall SoulEyez and optionally remove all user data."""
     import subprocess
     import shutil
     import signal
-    
-    click.echo(click.style("\n🗑️  Uninstalling SoulEyez...", fg='yellow', bold=True))
+
+    click.echo(click.style("\n🗑️  Uninstalling SoulEyez...", fg="yellow", bold=True))
     click.echo()
-    
+
     # Stop background worker (both dev mode and CLI mode)
     click.echo("1. Stopping background worker...")
     try:
-        subprocess.run(['pkill', '-f', 'souleyez.engine.background'],
-                      capture_output=True, check=False)
-        subprocess.run(['pkill', '-f', 'souleyez worker'],
-                      capture_output=True, check=False)
-        click.echo(click.style("   ✓ Worker stopped", fg='green'))
+        subprocess.run(
+            ["pkill", "-f", "souleyez.engine.background"],
+            capture_output=True,
+            check=False,
+        )
+        subprocess.run(
+            ["pkill", "-f", "souleyez worker"], capture_output=True, check=False
+        )
+        click.echo(click.style("   ✓ Worker stopped", fg="green"))
     except Exception as e:
-        click.echo(click.style(f"   ⚠ Could not stop worker: {e}", fg='yellow'))
-    
+        click.echo(click.style(f"   ⚠ Could not stop worker: {e}", fg="yellow"))
+
     # Remove user data if requested
     if purge_data:
         click.echo("\n2. Removing user data...")
-        data_dir = Path.home() / '.souleyez'
+        data_dir = Path.home() / ".souleyez"
         if data_dir.exists():
-            click.echo(click.style(f"   ⚠ WARNING: This will delete:", fg='yellow', bold=True))
+            click.echo(
+                click.style(f"   ⚠ WARNING: This will delete:", fg="yellow", bold=True)
+            )
             click.echo(f"   • Database: {data_dir / 'souleyez.db'}")
             click.echo(f"   • Crypto keys: {data_dir / 'crypto.json'}")
             click.echo(f"   • Logs: {data_dir / 'souleyez.log'}")
             click.echo(f"   • All engagement data")
             click.echo()
-            
-            if click.confirm(click.style("   Delete ALL user data?", fg='red', bold=True)):
+
+            if click.confirm(
+                click.style("   Delete ALL user data?", fg="red", bold=True)
+            ):
                 try:
                     shutil.rmtree(data_dir)
-                    click.echo(click.style(f"   ✓ Removed {data_dir}", fg='green'))
+                    click.echo(click.style(f"   ✓ Removed {data_dir}", fg="green"))
                 except Exception as e:
-                    click.echo(click.style(f"   ✗ Error: {e}", fg='red'))
+                    click.echo(click.style(f"   ✗ Error: {e}", fg="red"))
             else:
-                click.echo(click.style("   → User data preserved", fg='cyan'))
+                click.echo(click.style("   → User data preserved", fg="cyan"))
         else:
-            click.echo(click.style("   ℹ No user data found", fg='cyan'))
+            click.echo(click.style("   ℹ No user data found", fg="cyan"))
     else:
-        click.echo(click.style("\n2. User data preserved in ~/.souleyez", fg='cyan'))
+        click.echo(click.style("\n2. User data preserved in ~/.souleyez", fg="cyan"))
         click.echo("   • Your engagements and database are safe")
         click.echo("   • Reinstalling will restore access to your data")
         click.echo("   • To remove data: souleyez uninstall --purge-data")
-    
+
     # Remove application with pipx
     click.echo("\n3. Removing application...")
     click.echo("   Run: pipx uninstall souleyez")
     click.echo()
-    
+
     try:
-        result = subprocess.run(['pipx', 'uninstall', 'souleyez'], 
-                              capture_output=True, text=True, check=False)
+        result = subprocess.run(
+            ["pipx", "uninstall", "souleyez"],
+            capture_output=True,
+            text=True,
+            check=False,
+        )
         if result.returncode == 0:
-            click.echo(click.style("   ✓ SoulEyez uninstalled successfully", fg='green'))
+            click.echo(
+                click.style("   ✓ SoulEyez uninstalled successfully", fg="green")
+            )
         else:
-            click.echo(click.style(f"   ⚠ pipx uninstall returned: {result.stderr}", fg='yellow'))
+            click.echo(
+                click.style(
+                    f"   ⚠ pipx uninstall returned: {result.stderr}", fg="yellow"
+                )
+            )
             click.echo("   You may need to run manually: pipx uninstall souleyez")
     except FileNotFoundError:
-        click.echo(click.style("   ℹ pipx not found - uninstall manually", fg='cyan'))
+        click.echo(click.style("   ℹ pipx not found - uninstall manually", fg="cyan"))
         click.echo("   Run: pip uninstall souleyez")
     except Exception as e:
-        click.echo(click.style(f"   ✗ Error: {e}", fg='red'))
-    
+        click.echo(click.style(f"   ✗ Error: {e}", fg="red"))
+
     click.echo()
     if purge_data:
-        click.echo(click.style("✓ SoulEyez completely removed", fg='green', bold=True))
+        click.echo(click.style("✓ SoulEyez completely removed", fg="green", bold=True))
     else:
-        click.echo(click.style("✓ SoulEyez removed (data preserved)", fg='green', bold=True))
+        click.echo(
+            click.style("✓ SoulEyez removed (data preserved)", fg="green", bold=True)
+        )
     click.echo()
 
 
 # Import and register auth commands (must be before if __name__ block)
 from souleyez.commands.auth import login, logout, whoami
+
 cli.add_command(login)
 cli.add_command(logout)
 cli.add_command(whoami)
 
 # Import and register user management commands
 from souleyez.commands.user import user
+
 cli.add_command(user)
 
 # Import and register license management commands
 from souleyez.commands.license import license
+
 cli.add_command(license)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()
 
 
 # ==================== HOST COMMANDS ====================
 
+
 @cli.group()
 def hosts():
     """Host management commands."""
@@ -1912,7 +2186,9 @@ def hosts():
 
 
 @hosts.command("list")
-@click.option("--engagement", "-w", default=None, help="Engagement name (default: current)")
+@click.option(
+    "--engagement", "-w", default=None, help="Engagement name (default: current)"
+)
 @click.option("--all", "-a", is_flag=True, help="Show all hosts (including down hosts)")
 @click.option("--status", "-s", default=None, help="Filter by status (up/down/unknown)")
 def hosts_list(engagement, all, status):
@@ -1929,23 +2205,28 @@ def hosts_list(engagement, all, status):
     else:
         eng = em.get_current()
         if not eng:
-            click.echo("✗ No engagement selected. Use: souleyez engagement use <name>", err=True)
+            click.echo(
+                "✗ No engagement selected. Use: souleyez engagement use <name>",
+                err=True,
+            )
             return
 
     hm = HostManager()
-    all_hosts = hm.list_hosts(eng['id'])
+    all_hosts = hm.list_hosts(eng["id"])
 
     # Filter hosts
     if status:
-        hosts = [h for h in all_hosts if h.get('status', 'unknown') == status]
+        hosts = [h for h in all_hosts if h.get("status", "unknown") == status]
     elif not all:
         # Default: only show 'up' hosts
-        hosts = [h for h in all_hosts if h.get('status', 'unknown') == 'up']
+        hosts = [h for h in all_hosts if h.get("status", "unknown") == "up"]
     else:
         hosts = all_hosts
 
     if not hosts:
-        filter_msg = f" with status='{status}'" if status else " (live only)" if not all else ""
+        filter_msg = (
+            f" with status='{status}'" if status else " (live only)" if not all else ""
+        )
         click.echo(f"No hosts found in workspace '{eng['name']}'{filter_msg}")
         return
 
@@ -1978,8 +2259,16 @@ def hosts_list(engagement, all, status):
 @click.argument("ip_address")
 @click.option("--hostname", "-n", default=None, help="Hostname")
 @click.option("--os", default=None, help="Operating system")
-@click.option("--status", "-s", default="up", type=click.Choice(['up', 'down', 'unknown']), help="Host status")
-@click.option("--engagement", "-e", default=None, help="Engagement name (default: current)")
+@click.option(
+    "--status",
+    "-s",
+    default="up",
+    type=click.Choice(["up", "down", "unknown"]),
+    help="Host status",
+)
+@click.option(
+    "--engagement", "-e", default=None, help="Engagement name (default: current)"
+)
 def hosts_add(ip_address, hostname, os, status, engagement):
     """Manually add a host to engagement."""
     from souleyez.storage.hosts import HostManager
@@ -1994,20 +2283,20 @@ def hosts_add(ip_address, hostname, os, status, engagement):
     else:
         eng = em.get_current()
         if not eng:
-            click.echo("✗ No engagement selected. Use: souleyez engagement use <name>", err=True)
+            click.echo(
+                "✗ No engagement selected. Use: souleyez engagement use <name>",
+                err=True,
+            )
             return
 
     hm = HostManager()
 
     try:
-        host_data = {
-            'ip': ip_address,
-            'hostname': hostname,
-            'os': os,
-            'status': status
-        }
-        host_id = hm.add_or_update_host(eng['id'], host_data)
-        click.echo(f"✓ Added host {ip_address} to engagement '{eng['name']}' (id={host_id})")
+        host_data = {"ip": ip_address, "hostname": hostname, "os": os, "status": status}
+        host_id = hm.add_or_update_host(eng["id"], host_data)
+        click.echo(
+            f"✓ Added host {ip_address} to engagement '{eng['name']}' (id={host_id})"
+        )
         if hostname:
             click.echo(f"  Hostname: {hostname}")
         if os:
@@ -2019,11 +2308,13 @@ def hosts_add(ip_address, hostname, os, status, engagement):
 
 @hosts.command("show")
 @click.argument("ip_address")
-@click.option("--engagement", "-w", default=None, help="Engagement name (default: current)")
+@click.option(
+    "--engagement", "-w", default=None, help="Engagement name (default: current)"
+)
 def hosts_show(ip_address, engagement):
     """Show detailed host information."""
     from souleyez.storage.hosts import HostManager
-    
+
     em = EngagementManager()
 
     if engagement:
@@ -2036,16 +2327,18 @@ def hosts_show(ip_address, engagement):
         if not eng:
             click.echo("✗ No engagement selected", err=True)
             return
-    
+
     hm = HostManager()
-    host = hm.get_host_by_ip(eng['id'], ip_address)
-    
+    host = hm.get_host_by_ip(eng["id"], ip_address)
+
     if not host:
-        click.echo(f"✗ Host {ip_address} not found in workspace '{eng['name']}'", err=True)
+        click.echo(
+            f"✗ Host {ip_address} not found in workspace '{eng['name']}'", err=True
+        )
         return
-    
-    services = hm.get_host_services(host['id'])
-    
+
+    services = hm.get_host_services(host["id"])
+
     click.echo("\n" + "=" * 80)
     click.echo(f"HOST: {host['ip_address']}")
     click.echo("=" * 80)
@@ -2055,13 +2348,15 @@ def hosts_show(ip_address, engagement):
     click.echo(f"MAC:          {host.get('mac_address') or 'N/A'}")
     click.echo(f"First seen:   {host.get('created_at', 'N/A')}")
     click.echo(f"Last updated: {host.get('updated_at', 'N/A')}")
-    
+
     click.echo("\n" + "-" * 80)
     click.echo(f"SERVICES ({len(services)})")
     click.echo("-" * 80)
-    
+
     if services:
-        click.echo(f"{'Port':<10} {'Protocol':<10} {'State':<10} {'Service':<20} {'Version':<30}")
+        click.echo(
+            f"{'Port':<10} {'Protocol':<10} {'State':<10} {'Service':<20} {'Version':<30}"
+        )
         click.echo("-" * 80)
         for svc in services:
             click.echo(
@@ -2073,24 +2368,37 @@ def hosts_show(ip_address, engagement):
             )
     else:
         click.echo("No services found")
-    
+
     click.echo("=" * 80 + "\n")
 
 
 @hosts.command("update")
 @click.argument("ip_address")
-@click.option("--status", type=click.Choice(['active', 'compromised', 'offline', 'up', 'down']), help="Host status")
-@click.option("--access-level", type=click.Choice(['none', 'user', 'admin', 'root']), help="Access level gained")
+@click.option(
+    "--status",
+    type=click.Choice(["active", "compromised", "offline", "up", "down"]),
+    help="Host status",
+)
+@click.option(
+    "--access-level",
+    type=click.Choice(["none", "user", "admin", "root"]),
+    help="Access level gained",
+)
 @click.option("--notes", help="Additional notes about the host")
-@click.option("--engagement", "-w", default=None, help="Engagement name (default: current)")
+@click.option(
+    "--engagement", "-w", default=None, help="Engagement name (default: current)"
+)
 def hosts_update(ip_address, status, access_level, notes, engagement):
     """Update host status, access level, and notes."""
     from souleyez.storage.hosts import HostManager
-    
+
     if not status and not access_level and notes is None:
-        click.echo("✗ Must provide at least one of --status, --access-level, or --notes", err=True)
+        click.echo(
+            "✗ Must provide at least one of --status, --access-level, or --notes",
+            err=True,
+        )
         return
-    
+
     em = EngagementManager()
 
     if engagement:
@@ -2103,18 +2411,22 @@ def hosts_update(ip_address, status, access_level, notes, engagement):
         if not eng:
             click.echo("✗ No engagement selected", err=True)
             return
-    
+
     hm = HostManager()
-    host = hm.get_host_by_ip(eng['id'], ip_address)
-    
+    host = hm.get_host_by_ip(eng["id"], ip_address)
+
     if not host:
-        click.echo(f"✗ Host {ip_address} not found in workspace '{eng['name']}'", err=True)
+        click.echo(
+            f"✗ Host {ip_address} not found in workspace '{eng['name']}'", err=True
+        )
         return
-    
-    success = hm.update_host_status(host['id'], status=status, access_level=access_level, notes=notes)
-    
+
+    success = hm.update_host_status(
+        host["id"], status=status, access_level=access_level, notes=notes
+    )
+
     if success:
-        click.echo(click.style(f"✓ Host {ip_address} updated", fg='green'))
+        click.echo(click.style(f"✓ Host {ip_address} updated", fg="green"))
         if status:
             click.echo(f"  Status: {status}")
         if access_level:
@@ -2122,11 +2434,12 @@ def hosts_update(ip_address, status, access_level, notes, engagement):
         if notes:
             click.echo(f"  Notes: {notes}")
     else:
-        click.echo(click.style(f"✗ Failed to update host {ip_address}", fg='red'))
+        click.echo(click.style(f"✗ Failed to update host {ip_address}", fg="red"))
 
 
 # ==================== SERVICE COMMANDS ====================
 
+
 @cli.group()
 def services():
     """Service management commands."""
@@ -2136,11 +2449,18 @@ def services():
 @services.command("add")
 @click.argument("ip_address")
 @click.argument("port", type=int)
-@click.argument("protocol", type=click.Choice(['tcp', 'udp']))
+@click.argument("protocol", type=click.Choice(["tcp", "udp"]))
 @click.option("--service", "-s", default=None, help="Service name (e.g., ssh, http)")
 @click.option("--version", "-v", default=None, help="Service version")
-@click.option("--state", default="open", type=click.Choice(['open', 'closed', 'filtered']), help="Service state")
-@click.option("--engagement", "-e", default=None, help="Engagement name (default: current)")
+@click.option(
+    "--state",
+    default="open",
+    type=click.Choice(["open", "closed", "filtered"]),
+    help="Service state",
+)
+@click.option(
+    "--engagement", "-e", default=None, help="Engagement name (default: current)"
+)
 def services_add(ip_address, port, protocol, service, version, state, engagement):
     """Manually add a service to a host."""
     from souleyez.storage.hosts import HostManager
@@ -2155,35 +2475,37 @@ def services_add(ip_address, port, protocol, service, version, state, engagement
     else:
         eng = em.get_current()
         if not eng:
-            click.echo("✗ No engagement selected. Use: souleyez engagement use <name>", err=True)
+            click.echo(
+                "✗ No engagement selected. Use: souleyez engagement use <name>",
+                err=True,
+            )
             return
 
     hm = HostManager()
 
     # Get or create host
-    host = hm.get_host_by_ip(eng['id'], ip_address)
+    host = hm.get_host_by_ip(eng["id"], ip_address)
     if not host:
         # Create host first
         click.echo(f"Host {ip_address} not found, creating it...")
-        host_data = {
-            'ip': ip_address,
-            'status': 'up'
-        }
-        host_id = hm.add_or_update_host(eng['id'], host_data)
+        host_data = {"ip": ip_address, "status": "up"}
+        host_id = hm.add_or_update_host(eng["id"], host_data)
     else:
-        host_id = host['id']
+        host_id = host["id"]
 
     # Add service
     try:
         service_data = {
-            'port': port,
-            'protocol': protocol,
-            'state': state,
-            'service': service,
-            'version': version
+            "port": port,
+            "protocol": protocol,
+            "state": state,
+            "service": service,
+            "version": version,
         }
         service_id = hm.add_service(host_id, service_data)
-        click.echo(f"✓ Added service {ip_address}:{port}/{protocol} to engagement '{eng['name']}' (id={service_id})")
+        click.echo(
+            f"✓ Added service {ip_address}:{port}/{protocol} to engagement '{eng['name']}' (id={service_id})"
+        )
         if service:
             click.echo(f"  Service: {service}")
         if version:
@@ -2194,14 +2516,16 @@ def services_add(ip_address, port, protocol, service, version, state, engagement
 
 
 @services.command("list")
-@click.option("--engagement", "-w", default=None, help="Engagement name (default: current)")
+@click.option(
+    "--engagement", "-w", default=None, help="Engagement name (default: current)"
+)
 @click.option("--port", "-p", type=int, default=None, help="Filter by port")
 def services_list(engagement, port):
     """List all services across all hosts."""
     from souleyez.storage.hosts import HostManager
-    
+
     em = EngagementManager()
-    
+
     if engagement:
         eng = em.get(engagement)
         if not eng:
@@ -2212,36 +2536,40 @@ def services_list(engagement, port):
         if not eng:
             click.echo("✗ No engagement selected", err=True)
             return
-    
+
     hm = HostManager()
-    
+
     # Get all hosts and their services
-    hosts = hm.list_hosts(eng['id'])
-    
+    hosts = hm.list_hosts(eng["id"])
+
     all_services = []
     for host in hosts:
-        services = hm.get_host_services(host['id'])
+        services = hm.get_host_services(host["id"])
         for svc in services:
-            if port is None or svc['port'] == port:
-                all_services.append({
-                    'host_ip': host['ip_address'],
-                    'host_name': host.get('hostname'),
-                    **svc
-                })
-    
+            if port is None or svc["port"] == port:
+                all_services.append(
+                    {
+                        "host_ip": host["ip_address"],
+                        "host_name": host.get("hostname"),
+                        **svc,
+                    }
+                )
+
     if not all_services:
         click.echo(f"No services found in workspace '{eng['name']}'")
         return
-    
+
     click.echo("\n" + "=" * 120)
     click.echo(f"SERVICES - Engagement: {eng['name']}")
     if port:
         click.echo(f"Filtered by port: {port}")
     click.echo("=" * 120)
-    click.echo(f"{'Host':<18} {'Port':<8} {'Proto':<8} {'State':<10} {'Service':<20} {'Version':<40}")
+    click.echo(
+        f"{'Host':<18} {'Port':<8} {'Proto':<8} {'State':<10} {'Service':<20} {'Version':<40}"
+    )
     click.echo("=" * 120)
-    
-    for svc in sorted(all_services, key=lambda x: (x['host_ip'], x['port'])):
+
+    for svc in sorted(all_services, key=lambda x: (x["host_ip"], x["port"])):
         click.echo(
             f"{svc['host_ip']:<18} "
             f"{svc['port']:<8} "
@@ -2250,13 +2578,14 @@ def services_list(engagement, port):
             f"{(svc.get('service_name') or 'unknown')[:19]:<20} "
             f"{(svc.get('service_version') or 'N/A')[:39]:<40}"
         )
-    
+
     click.echo("=" * 120)
     click.echo(f"Total: {len(all_services)} services\n")
 
 
 # ==================== FINDINGS COMMANDS ====================
 
+
 @cli.group()
 @require_password
 def findings():
@@ -2265,8 +2594,15 @@ def findings():
 
 
 @findings.command("list")
-@click.option("--engagement", "-w", default=None, help="Engagement name (default: current)")
-@click.option("--severity", "-s", default=None, help="Filter by severity (critical, high, medium, low, info)")
+@click.option(
+    "--engagement", "-w", default=None, help="Engagement name (default: current)"
+)
+@click.option(
+    "--severity",
+    "-s",
+    default=None,
+    help="Filter by severity (critical, high, medium, low, info)",
+)
 @click.option("--tool", "-t", default=None, help="Filter by tool")
 @click.option("--host", "-h", default=None, help="Filter by host IP")
 def findings_list(engagement, severity, tool, host):
@@ -2292,14 +2628,17 @@ def findings_list(engagement, severity, tool, host):
     host_id = None
     if host:
         from souleyez.storage.hosts import HostManager
+
         hm = HostManager()
-        host_obj = hm.get_host_by_ip(eng['id'], host)
+        host_obj = hm.get_host_by_ip(eng["id"], host)
         if not host_obj:
             click.echo(f"✗ Host {host} not found", err=True)
             return
-        host_id = host_obj['id']
+        host_id = host_obj["id"]
 
-    findings = fm.list_findings(eng['id'], host_id=host_id, severity=severity, tool=tool)
+    findings = fm.list_findings(
+        eng["id"], host_id=host_id, severity=severity, tool=tool
+    )
 
     if not findings:
         click.echo(f"No findings found in workspace '{eng['name']}'")
@@ -2307,11 +2646,11 @@ def findings_list(engagement, severity, tool, host):
 
     # Get severity color mapping
     severity_colors = {
-        'critical': 'red',
-        'high': 'red',
-        'medium': 'yellow',
-        'low': 'blue',
-        'info': 'white'
+        "critical": "red",
+        "high": "red",
+        "medium": "yellow",
+        "low": "blue",
+        "info": "white",
     }
 
     click.echo("\n" + "=" * 140)
@@ -2321,11 +2660,13 @@ def findings_list(engagement, severity, tool, host):
     if tool:
         click.echo(f"Filtered by tool: {tool}")
     click.echo("=" * 140)
-    click.echo(f"{'ID':<6} {'Severity':<10} {'Host':<18} {'Port':<6} {'Tool':<10} {'Title':<80}")
+    click.echo(
+        f"{'ID':<6} {'Severity':<10} {'Host':<18} {'Port':<6} {'Tool':<10} {'Title':<80}"
+    )
     click.echo("=" * 140)
 
     for finding in findings:
-        sev_color = severity_colors.get(finding.get('severity', 'info'), 'white')
+        sev_color = severity_colors.get(finding.get("severity", "info"), "white")
         click.echo(
             f"{finding['id']:<6} "
             f"{click.style(finding.get('severity', 'info').upper()[:9], fg=sev_color):<19} "
@@ -2362,13 +2703,13 @@ def findings_show(finding_id):
     click.echo(f"\nDescription:")
     click.echo(f"  {finding.get('description', 'N/A')}")
 
-    if finding.get('path'):
+    if finding.get("path"):
         click.echo(f"\nPath:         {finding['path']}")
 
-    if finding.get('port'):
+    if finding.get("port"):
         click.echo(f"Port:         {finding['port']}")
 
-    if finding.get('refs'):
+    if finding.get("refs"):
         click.echo(f"\nReference:    {finding['refs']}")
 
     click.echo(f"\nDiscovered:   {finding.get('created_at', 'N/A')}")
@@ -2376,7 +2717,9 @@ def findings_show(finding_id):
 
 
 @findings.command("summary")
-@click.option("--engagement", "-w", default=None, help="Engagement name (default: current)")
+@click.option(
+    "--engagement", "-w", default=None, help="Engagement name (default: current)"
+)
 def findings_summary(engagement):
     """Show findings summary by severity."""
     from souleyez.storage.findings import FindingsManager
@@ -2395,7 +2738,7 @@ def findings_summary(engagement):
             return
 
     fm = FindingsManager()
-    summary = fm.get_findings_summary(eng['id'])
+    summary = fm.get_findings_summary(eng["id"])
 
     total = sum(summary.values())
 
@@ -2405,17 +2748,17 @@ def findings_summary(engagement):
     click.echo(f"{'Severity':<15} {'Count':<10} {'Percentage':<15}")
     click.echo("=" * 60)
 
-    for severity in ['critical', 'high', 'medium', 'low', 'info']:
+    for severity in ["critical", "high", "medium", "low", "info"]:
         count = summary.get(severity, 0)
         pct = (count / total * 100) if total > 0 else 0
 
         color = {
-            'critical': 'red',
-            'high': 'red',
-            'medium': 'yellow',
-            'low': 'blue',
-            'info': 'white'
-        }.get(severity, 'white')
+            "critical": "red",
+            "high": "red",
+            "medium": "yellow",
+            "low": "blue",
+            "info": "white",
+        }.get(severity, "white")
 
         click.echo(
             f"{click.style(severity.upper(), fg=color):<24} "
@@ -2430,6 +2773,7 @@ def findings_summary(engagement):
 
 # ==================== OSINT COMMANDS ====================
 
+
 @cli.group()
 @require_password
 def osint():
@@ -2438,8 +2782,12 @@ def osint():
 
 
 @osint.command("list")
-@click.option("--engagement", "-w", default=None, help="Engagement name (default: current)")
-@click.option("--type", "-t", default=None, help="Filter by data type (email, host, ip, url, asn)")
+@click.option(
+    "--engagement", "-w", default=None, help="Engagement name (default: current)"
+)
+@click.option(
+    "--type", "-t", default=None, help="Filter by data type (email, host, ip, url, asn)"
+)
 @click.option("--source", "-s", default=None, help="Filter by source tool")
 def osint_list(engagement, type, source):
     """List all OSINT data in engagement."""
@@ -2459,7 +2807,7 @@ def osint_list(engagement, type, source):
             return
 
     om = OsintManager()
-    osint_data = om.list_osint_data(eng['id'], data_type=type, source=source)
+    osint_data = om.list_osint_data(eng["id"], data_type=type, source=source)
 
     if not osint_data:
         click.echo(f"No OSINT data found in workspace '{eng['name']}'")
@@ -2472,7 +2820,9 @@ def osint_list(engagement, type, source):
     if source:
         click.echo(f"Filtered by source: {source}")
     click.echo("=" * 120)
-    click.echo(f"{'ID':<6} {'Type':<12} {'Source':<15} {'Value':<70} {'Discovered':<20}")
+    click.echo(
+        f"{'ID':<6} {'Type':<12} {'Source':<15} {'Value':<70} {'Discovered':<20}"
+    )
     click.echo("=" * 120)
 
     for item in osint_data:
@@ -2489,7 +2839,9 @@ def osint_list(engagement, type, source):
 
 
 @osint.command("summary")
-@click.option("--engagement", "-w", default=None, help="Engagement name (default: current)")
+@click.option(
+    "--engagement", "-w", default=None, help="Engagement name (default: current)"
+)
 def osint_summary(engagement):
     """Show OSINT data summary by type."""
     from souleyez.storage.osint import OsintManager
@@ -2508,7 +2860,7 @@ def osint_summary(engagement):
             return
 
     om = OsintManager()
-    summary = om.get_osint_summary(eng['id'])
+    summary = om.get_osint_summary(eng["id"])
 
     total = sum(summary.values())
 
@@ -2526,20 +2878,16 @@ def osint_summary(engagement):
         count = summary[data_type]
         pct = (count / total * 100) if total > 0 else 0
 
-        click.echo(
-            f"{data_type:<15} "
-            f"{count:<10} "
-            f"{pct:.1f}%"
-        )
+        click.echo(f"{data_type:<15} " f"{count:<10} " f"{pct:.1f}%")
 
     click.echo("=" * 60)
     click.echo(f"{'TOTAL':<15} {total}")
     click.echo("=" * 60 + "\n")
 
 
-
 # ==================== WEB PATHS COMMANDS ====================
 
+
 @cli.group()
 def paths():
     """Web paths/directories management commands."""
@@ -2547,8 +2895,12 @@ def paths():
 
 
 @paths.command("list")
-@click.option("--engagement", "-w", default=None, help="Engagement name (default: current)")
-@click.option("--status", "-s", type=int, default=None, help="Filter by HTTP status code")
+@click.option(
+    "--engagement", "-w", default=None, help="Engagement name (default: current)"
+)
+@click.option(
+    "--status", "-s", type=int, default=None, help="Filter by HTTP status code"
+)
 @click.option("--host", "-h", default=None, help="Filter by host IP or hostname")
 def paths_list(engagement, status, host):
     """List discovered web paths."""
@@ -2574,10 +2926,10 @@ def paths_list(engagement, status, host):
     host_id = None
     if host:
         hm = HostManager()
-        hosts = hm.list_hosts(eng['id'])
+        hosts = hm.list_hosts(eng["id"])
         for h in hosts:
-            if h.get('hostname') == host or h.get('ip_address') == host:
-                host_id = h['id']
+            if h.get("hostname") == host or h.get("ip_address") == host:
+                host_id = h["id"]
                 break
         if not host_id:
             click.echo(f"✗ Host {host} not found", err=True)
@@ -2587,7 +2939,7 @@ def paths_list(engagement, status, host):
     if host_id:
         paths = wpm.list_web_paths(host_id=host_id, status_code=status)
     else:
-        paths = wpm.list_web_paths(engagement_id=eng['id'], status_code=status)
+        paths = wpm.list_web_paths(engagement_id=eng["id"], status_code=status)
 
     if not paths:
         click.echo(f"No web paths found in workspace '{eng['name']}'")
@@ -2604,18 +2956,18 @@ def paths_list(engagement, status, host):
     click.echo("=" * 140)
 
     for path in paths:
-        status_code = path.get('status_code', 'N/A')
+        status_code = path.get("status_code", "N/A")
         # Color code status
         if status_code == 200:
-            status_str = click.style(str(status_code), fg='green')
+            status_str = click.style(str(status_code), fg="green")
         elif 300 <= status_code < 400:
-            status_str = click.style(str(status_code), fg='yellow')
+            status_str = click.style(str(status_code), fg="yellow")
         elif 400 <= status_code < 500:
-            status_str = click.style(str(status_code), fg='red')
+            status_str = click.style(str(status_code), fg="red")
         else:
             status_str = str(status_code)
 
-        host_info = path.get('hostname') or path.get('ip_address') or 'N/A'
+        host_info = path.get("hostname") or path.get("ip_address") or "N/A"
 
         click.echo(
             f"{path['id']:<6} "
@@ -2630,7 +2982,9 @@ def paths_list(engagement, status, host):
 
 
 @paths.command("summary")
-@click.option("--engagement", "-w", default=None, help="Engagement name (default: current)")
+@click.option(
+    "--engagement", "-w", default=None, help="Engagement name (default: current)"
+)
 def paths_summary(engagement):
     """Show web paths summary by status code."""
     from souleyez.storage.web_paths import WebPathsManager
@@ -2649,7 +3003,7 @@ def paths_summary(engagement):
             return
 
     wpm = WebPathsManager()
-    summary = wpm.get_paths_summary(eng['id'])
+    summary = wpm.get_paths_summary(eng["id"])
 
     total = sum(summary.values())
 
@@ -2663,18 +3017,20 @@ def paths_summary(engagement):
     click.echo(f"{'Status Code':<15} {'Count':<10} {'Percentage':<15}")
     click.echo("=" * 60)
 
-    for status_code in sorted(summary.keys(), key=lambda x: int(x) if x.isdigit() else 999):
+    for status_code in sorted(
+        summary.keys(), key=lambda x: int(x) if x.isdigit() else 999
+    ):
         count = summary[status_code]
         pct = (count / total * 100) if total > 0 else 0
 
         # Color code
         status_int = int(status_code) if status_code.isdigit() else 0
         if status_int == 200:
-            status_display = click.style(status_code, fg='green')
+            status_display = click.style(status_code, fg="green")
         elif 300 <= status_int < 400:
-            status_display = click.style(status_code, fg='yellow')
+            status_display = click.style(status_code, fg="yellow")
         elif 400 <= status_int < 500:
-            status_display = click.style(status_code, fg='red')
+            status_display = click.style(status_code, fg="red")
         else:
             status_display = status_code
 
@@ -2691,6 +3047,7 @@ def paths_summary(engagement):
 
 # ==================== CREDENTIALS COMMANDS ====================
 
+
 @cli.group()
 def creds():
     """Credentials management - similar to MSF's creds command."""
@@ -2700,11 +3057,20 @@ def creds():
 @creds.command("add")
 @click.argument("username")
 @click.argument("password")
-@click.option("--service", "-s", default=None, help="Service type (ssh, smb, mysql, etc.)")
+@click.option(
+    "--service", "-s", default=None, help="Service type (ssh, smb, mysql, etc.)"
+)
 @click.option("--host", "-h", default=None, help="Host IP address")
 @click.option("--port", "-p", type=int, default=None, help="Port number")
-@click.option("--status", default="untested", type=click.Choice(['valid', 'invalid', 'untested']), help="Credential status")
-@click.option("--engagement", "-e", default=None, help="Engagement name (default: current)")
+@click.option(
+    "--status",
+    default="untested",
+    type=click.Choice(["valid", "invalid", "untested"]),
+    help="Credential status",
+)
+@click.option(
+    "--engagement", "-e", default=None, help="Engagement name (default: current)"
+)
 def creds_add(username, password, service, host, port, status, engagement):
     """Manually add credentials to engagement."""
     from souleyez.storage.credentials import CredentialsManager
@@ -2720,34 +3086,37 @@ def creds_add(username, password, service, host, port, status, engagement):
     else:
         eng = em.get_current()
         if not eng:
-            click.echo("✗ No engagement selected. Use: souleyez engagement use <name>", err=True)
+            click.echo(
+                "✗ No engagement selected. Use: souleyez engagement use <name>",
+                err=True,
+            )
             return
 
     # Get host_id if host specified
     host_id = None
     if host:
         hm = HostManager()
-        host_obj = hm.get_host_by_ip(eng['id'], host)
+        host_obj = hm.get_host_by_ip(eng["id"], host)
         if not host_obj:
             # Create host if it doesn't exist
             click.echo(f"Host {host} not found, creating it...")
-            host_data = {'ip': host, 'status': 'up'}
-            host_id = hm.add_or_update_host(eng['id'], host_data)
+            host_data = {"ip": host, "status": "up"}
+            host_id = hm.add_or_update_host(eng["id"], host_data)
         else:
-            host_id = host_obj['id']
+            host_id = host_obj["id"]
 
     cm = CredentialsManager()
 
     try:
         cred_id = cm.add_credential(
-            engagement_id=eng['id'],
+            engagement_id=eng["id"],
             host_id=host_id,
             username=username,
             password=password,
             service=service,
             port=port,
             status=status,
-            tool='manual'
+            tool="manual",
         )
         click.echo(f"✓ Added credential to engagement '{eng['name']}' (id={cred_id})")
         click.echo(f"  Username: {username}")
@@ -2764,8 +3133,12 @@ def creds_add(username, password, service, host, port, status, engagement):
 
 
 @creds.command("list")
-@click.option("--engagement", "-w", default=None, help="Engagement name (default: current)")
-@click.option("--service", "-s", default=None, help="Filter by service (ssh, smb, mysql, etc.)")
+@click.option(
+    "--engagement", "-w", default=None, help="Engagement name (default: current)"
+)
+@click.option(
+    "--service", "-s", default=None, help="Filter by service (ssh, smb, mysql, etc.)"
+)
 @click.option("--status", "-t", default=None, help="Filter by status (valid, untested)")
 @click.option("--host", "-h", default=None, help="Filter by host IP")
 def creds_list(engagement, service, status, host):
@@ -2796,13 +3169,15 @@ def creds_list(engagement, service, status, host):
     host_id = None
     if host:
         hm = HostManager()
-        host_obj = hm.get_host_by_ip(eng['id'], host)
+        host_obj = hm.get_host_by_ip(eng["id"], host)
         if not host_obj:
             click.echo(f"✗ Host {host} not found", err=True)
             return
-        host_id = host_obj['id']
+        host_id = host_obj["id"]
 
-    creds = cm.list_credentials(eng['id'], host_id=host_id, service=service, status=status)
+    creds = cm.list_credentials(
+        eng["id"], host_id=host_id, service=service, status=status
+    )
 
     if not creds:
         filter_msg = ""
@@ -2814,7 +3189,7 @@ def creds_list(engagement, service, status, host):
         return
 
     # Get stats
-    stats = cm.get_stats(eng['id'])
+    stats = cm.get_stats(eng["id"])
 
     click.echo("\n" + "=" * 100)
     click.echo(f"CREDENTIALS - Engagement: {eng['name']}")
@@ -2830,18 +3205,22 @@ def creds_list(engagement, service, status, host):
     click.echo("=" * 100)
 
     # Summary line
-    click.echo(f"Total: {stats['total']}  |  " +
-               click.style(f"Valid: {stats['valid']}", fg='green', bold=True) +
-               f"  |  Usernames: {stats['users_only']}  |  Pairs: {stats['pairs']}")
+    click.echo(
+        f"Total: {stats['total']}  |  "
+        + click.style(f"Valid: {stats['valid']}", fg="green", bold=True)
+        + f"  |  Usernames: {stats['users_only']}  |  Pairs: {stats['pairs']}"
+    )
     click.echo()
 
     # Separate valid and untested
-    valid_creds = [c for c in creds if c.get('status') == 'valid']
-    untested_creds = [c for c in creds if c.get('status') != 'valid']
+    valid_creds = [c for c in creds if c.get("status") == "valid"]
+    untested_creds = [c for c in creds if c.get("status") != "valid"]
 
     # Show valid credentials
     if valid_creds:
-        click.echo(click.style("VALID CREDENTIALS (Confirmed Working)", bold=True, fg='green'))
+        click.echo(
+            click.style("VALID CREDENTIALS (Confirmed Working)", bold=True, fg="green")
+        )
         click.echo()
 
         # Create Rich Table
@@ -2856,12 +3235,12 @@ def creds_list(engagement, service, status, host):
         table.add_column("Tool", width=15)
 
         for cred in valid_creds:
-            username = cred.get('username', '')[:19]
-            password = cred.get('password', '')[:19]
-            service_name = cred.get('service', 'N/A')[:9]
-            ip = cred.get('ip_address', 'N/A')[:17]
-            port = str(cred.get('port', 'N/A'))[:5]
-            tool_name = cred.get('tool', 'N/A')[:14]
+            username = cred.get("username", "")[:19]
+            password = cred.get("password", "")[:19]
+            service_name = cred.get("service", "N/A")[:9]
+            ip = cred.get("ip_address", "N/A")[:17]
+            port = str(cred.get("port", "N/A"))[:5]
+            tool_name = cred.get("tool", "N/A")[:14]
 
             table.add_row("✓", username, password, service_name, ip, port, tool_name)
 
@@ -2870,19 +3249,25 @@ def creds_list(engagement, service, status, host):
 
     # Show discovered usernames
     if untested_creds:
-        click.echo(click.style(f"DISCOVERED USERNAMES ({len(untested_creds)} untested)", bold=True, fg='cyan'))
+        click.echo(
+            click.style(
+                f"DISCOVERED USERNAMES ({len(untested_creds)} untested)",
+                bold=True,
+                fg="cyan",
+            )
+        )
         click.echo(DesignSystem.separator())
 
         # Group by service
         by_service = {}
         for cred in untested_creds:
-            svc = cred.get('service', 'unknown')
+            svc = cred.get("service", "unknown")
             if svc not in by_service:
                 by_service[svc] = []
-            by_service[svc].append(cred.get('username', ''))
+            by_service[svc].append(cred.get("username", ""))
 
         for svc, usernames in sorted(by_service.items()):
-            user_list = ', '.join(sorted(usernames))
+            user_list = ", ".join(sorted(usernames))
             click.echo(f"{svc.upper():<8} ({len(usernames):2}): {user_list}")
 
         click.echo(DesignSystem.separator())
@@ -2891,7 +3276,9 @@ def creds_list(engagement, service, status, host):
 
 
 @creds.command("stats")
-@click.option("--engagement", "-w", default=None, help="Engagement name (default: current)")
+@click.option(
+    "--engagement", "-w", default=None, help="Engagement name (default: current)"
+)
 def creds_stats(engagement):
     """Show credentials statistics."""
     from souleyez.storage.credentials import CredentialsManager
@@ -2910,13 +3297,15 @@ def creds_stats(engagement):
             return
 
     cm = CredentialsManager()
-    stats = cm.get_stats(eng['id'])
+    stats = cm.get_stats(eng["id"])
 
     click.echo("\n" + "=" * 60)
     click.echo(f"CREDENTIALS STATISTICS - Engagement: {eng['name']}")
     click.echo("=" * 60)
     click.echo(f"Total Credentials:       {stats['total']}")
-    click.echo(f"Valid (confirmed):       {click.style(str(stats['valid']), fg='green')}")
+    click.echo(
+        f"Valid (confirmed):       {click.style(str(stats['valid']), fg='green')}"
+    )
     click.echo(f"Username-only:           {stats['users_only']}")
     click.echo(f"Password-only:           {stats['passwords_only']}")
     click.echo(f"Username:Password pairs: {stats['pairs']}")
@@ -2925,26 +3314,294 @@ def creds_stats(engagement):
 
 @creds.command("update")
 @click.argument("credential_id", type=int)
-@click.option("--status", type=click.Choice(['untested', 'valid', 'invalid']), help="Credential status")
+@click.option(
+    "--status",
+    type=click.Choice(["untested", "valid", "invalid"]),
+    help="Credential status",
+)
 @click.option("--notes", help="Additional notes")
 def creds_update(credential_id, status, notes):
     """Update credential status and notes."""
     from souleyez.storage.credentials import CredentialsManager
-    
+
     if not status and notes is None:
         click.echo("✗ Must provide --status or --notes", err=True)
         return
-    
+
     cm = CredentialsManager()
-    
+
     try:
         success = cm.update_credential_status(credential_id, status=status, notes=notes)
         if success:
-            click.echo(click.style(f"✓ Credential {credential_id} updated", fg='green'))
+            click.echo(click.style(f"✓ Credential {credential_id} updated", fg="green"))
         else:
-            click.echo(click.style(f"✗ Credential {credential_id} not found", fg='red'))
+            click.echo(click.style(f"✗ Credential {credential_id} not found", fg="red"))
     except Exception as e:
-        click.echo(click.style(f"✗ Error: {e}", fg='red'))
+        click.echo(click.style(f"✗ Error: {e}", fg="red"))
+
+
+@creds.command("cleanup")
+@require_password
+@click.option("--engagement", "-e", type=int, help="Engagement ID (default: all)")
+@click.option(
+    "--confirm",
+    is_flag=True,
+    default=False,
+    help="Actually delete the garbage credentials",
+)
+@click.option(
+    "--all",
+    "-a",
+    "show_all",
+    is_flag=True,
+    default=False,
+    help="Show all garbage credentials (default: first 20)",
+)
+def creds_cleanup(engagement, confirm, show_all):
+    """Remove garbage credentials (scanner artifacts, injection payloads).
+
+    By default runs in dry-run mode to show what would be deleted.
+    Use --confirm to actually delete the garbage entries.
+
+    Examples:
+        souleyez creds cleanup              # Preview what would be deleted
+        souleyez creds cleanup --all        # Show all garbage credentials
+        souleyez creds cleanup --confirm    # Actually delete garbage
+        souleyez creds cleanup -e 5         # Preview for engagement 5 only
+    """
+    import re
+    from souleyez.storage.credentials import CredentialsManager
+    from souleyez.storage.engagements import EngagementManager
+
+    def is_garbage_username(username: str) -> bool:
+        """Check if username is scanner garbage."""
+        if not username or len(username) > 100:
+            return True
+
+        username_lower = username.lower()
+
+        # Scanner tool signatures
+        scanner_patterns = [
+            "netsparker",
+            "burpsuite",
+            "burp",
+            "acunetix",
+            "nikto",
+            "sqlmap",
+            "havij",
+            "w3af",
+            "owasp",
+            "zap",
+            "wvs",
+        ]
+        for pattern in scanner_patterns:
+            if pattern in username_lower:
+                return True
+
+        # Template injection patterns
+        injection_patterns = [
+            "{{",
+            "}}",
+            "${",
+            "}$",
+            "<%",
+            "%>",
+            "{%",
+            "%}",
+            "sleep(",
+            "benchmark(",
+            "waitfor delay",
+            "pg_sleep",
+        ]
+        for pattern in injection_patterns:
+            if pattern in username_lower:
+                return True
+
+        # Path traversal patterns
+        path_patterns = [
+            "/etc/",
+            "\\etc\\",
+            "/passwd",
+            "/shadow",
+            "/windows/",
+            "c:\\",
+            ".asp",
+            ".aspx",
+            ".axd",
+            ".php",
+            ".jsp",
+            ".pl",
+            "../",
+            "..\\",
+            "file://",
+            "php://",
+            "data://",
+            "::1/",
+            "[::1]",
+            "/elmah",
+            "/trace",
+            "127.0.0.1/",
+        ]
+        for pattern in path_patterns:
+            if pattern in username_lower:
+                return True
+
+        # Command injection patterns
+        cmd_patterns = [
+            "& ping ",
+            "| ping ",
+            "; ping ",
+            "ping -",
+            "& whoami",
+            "| whoami",
+            "; whoami",
+            "`whoami`",
+            "$(whoami)",
+            "cmd.exe",
+            "/bin/sh",
+            "& dir",
+            "| dir",
+            "; dir",
+            "& ls",
+            "| ls",
+            "; ls",
+            "nc -",
+            "ncat ",
+            "netcat ",
+        ]
+        for pattern in cmd_patterns:
+            if pattern in username_lower:
+                return True
+
+        # SQL injection patterns
+        sql_patterns = [
+            "' or ",
+            "' and ",
+            "1=1",
+            "1'='1",
+            "' union ",
+            "select ",
+            "insert ",
+            "update ",
+            "delete ",
+            "drop ",
+            "concat(",
+            "char(",
+            "chr(",
+            "0x00",
+            "@@version",
+        ]
+        for pattern in sql_patterns:
+            if pattern in username_lower:
+                return True
+
+        # URL encoding patterns
+        if "%27" in username or "%22" in username or "%3c" in username_lower:
+            return True
+
+        # Hex patterns
+        if re.search(r"0x[0-9a-f]{4,}", username_lower):
+            return True
+
+        # Starts/ends with injection chars
+        injection_chars = ['"', "'", ";", "|", "&", "`", "(", ")", "<", ">"]
+        if username[0] in injection_chars or username[-1] in injection_chars:
+            return True
+
+        # Too many special characters
+        special_count = sum(1 for c in username if c in "{}[]()$%^&*|\\/<>\"`'")
+        if special_count > 3:
+            return True
+
+        # Mostly digits and long
+        if len(username) > 20:
+            alnum_only = re.sub(r"[^a-zA-Z0-9]", "", username)
+            if len(alnum_only) > 0:
+                digit_ratio = sum(1 for c in alnum_only if c.isdigit()) / len(
+                    alnum_only
+                )
+                if digit_ratio > 0.7:
+                    return True
+
+        return False
+
+    cm = CredentialsManager()
+    em = EngagementManager()
+
+    # Get credentials (must decrypt to check actual usernames)
+    if engagement:
+        creds_list = cm.list_credentials_for_engagement(engagement, decrypt=True)
+        eng_name = f"engagement {engagement}"
+    else:
+        # Get all engagements (unfiltered for cleanup operation)
+        all_creds = []
+        for eng in em.list(user_filtered=False):
+            eng_creds = cm.list_credentials_for_engagement(eng["id"], decrypt=True)
+            all_creds.extend(eng_creds)
+        creds_list = all_creds
+        eng_name = "all engagements"
+
+    # Find garbage
+    garbage = []
+    for cred in creds_list:
+        username = cred.get("username", "")
+        if is_garbage_username(username):
+            garbage.append(cred)
+
+    if not garbage:
+        click.echo(
+            click.style(f"✓ No garbage credentials found in {eng_name}", fg="green")
+        )
+        return
+
+    # Display what we found
+    click.echo(
+        click.style(
+            f"\nFound {len(garbage)} garbage credential(s) in {eng_name}:\n",
+            fg="yellow",
+            bold=True,
+        )
+    )
+
+    # Table header
+    click.echo(f"  {'ID':<6} {'Service':<18} {'Username':<50}")
+    click.echo("-" * 80)
+
+    display_list = garbage if show_all else garbage[:20]
+    for cred in display_list:
+        username = (cred.get("username") or "<empty>")[:48]
+        cred_id = str(cred.get("id", "?"))
+        service = (cred.get("service") or "unknown")[:16]
+        click.echo(f"  {cred_id:<6} {service:<18} {username}")
+
+    if not show_all and len(garbage) > 20:
+        click.echo(f"\n  ... and {len(garbage) - 20} more (use --all to see all)")
+
+    click.echo("-" * 80)
+
+    if confirm:
+        # Actually delete
+        click.echo(
+            click.style(f"\nDeleting {len(garbage)} garbage credential(s)...", fg="red")
+        )
+        deleted = 0
+        for cred in garbage:
+            try:
+                cm.delete_credential(cred["id"])
+                deleted += 1
+            except Exception as e:
+                click.echo(f"  Failed to delete {cred['id']}: {e}")
+
+        click.echo(
+            click.style(f"✓ Deleted {deleted} garbage credential(s)", fg="green")
+        )
+    else:
+        click.echo(
+            click.style(
+                f"\n[DRY RUN] Would delete {len(garbage)} credential(s)", fg="yellow"
+            )
+        )
+        click.echo("Run with --confirm to actually delete them.")
 
 
 @cli.group()
@@ -2955,11 +3612,37 @@ def report():
 
 
 @report.command("generate")
-@click.option("--format", "-f", type=click.Choice(['markdown', 'html', 'json'], case_sensitive=False), default='html', help="Report format")
-@click.option("--type", "-t", type=click.Choice(['executive', 'technical', 'summary', 'detection'], case_sensitive=False), default='technical', help="Report type (executive, technical, summary, detection)")
-@click.option("--output", "-o", type=str, help="Output file path (default: reports/<engagement>_<timestamp>.<ext>)")
-@click.option("--engagement", "-e", type=int, help="Engagement ID (default: current engagement)")
-@click.option("--ai", is_flag=True, default=False, help="Enable AI-enhanced report (PRO tier, requires Claude API or Ollama)")
+@click.option(
+    "--format",
+    "-f",
+    type=click.Choice(["markdown", "html", "json"], case_sensitive=False),
+    default="html",
+    help="Report format",
+)
+@click.option(
+    "--type",
+    "-t",
+    type=click.Choice(
+        ["executive", "technical", "summary", "detection"], case_sensitive=False
+    ),
+    default="technical",
+    help="Report type (executive, technical, summary, detection)",
+)
+@click.option(
+    "--output",
+    "-o",
+    type=str,
+    help="Output file path (default: reports/<engagement>_<timestamp>.<ext>)",
+)
+@click.option(
+    "--engagement", "-e", type=int, help="Engagement ID (default: current engagement)"
+)
+@click.option(
+    "--ai",
+    is_flag=True,
+    default=False,
+    help="Enable AI-enhanced report (PRO tier, requires Claude API or Ollama)",
+)
 def report_generate(format, type, output, engagement, ai):
     """Generate a penetration test report.
 
@@ -2985,54 +3668,61 @@ def report_generate(format, type, output, engagement, ai):
     if engagement:
         eng = em.get_by_id(engagement)
         if not eng:
-            click.echo(click.style(f"✗ Engagement {engagement} not found", fg='red'))
+            click.echo(click.style(f"✗ Engagement {engagement} not found", fg="red"))
             return
     else:
         eng = em.get_current()
         if not eng:
-            click.echo(click.style("✗ No current engagement. Use 'souleyez engagement list' to see available engagements.", fg='red'))
+            click.echo(
+                click.style(
+                    "✗ No current engagement. Use 'souleyez engagement list' to see available engagements.",
+                    fg="red",
+                )
+            )
             return
 
-    engagement_id = eng['id']
-    engagement_name = eng['name']
+    engagement_id = eng["id"]
+    engagement_name = eng["name"]
 
     # Detection reports require Wazuh integration
-    if type == 'detection':
+    if type == "detection":
         from souleyez.integrations.wazuh.config import WazuhConfig
+
         wazuh_config = WazuhConfig.get_config(engagement_id)
-        if not wazuh_config or not wazuh_config.get('enabled'):
-            click.echo(click.style(
-                "✗ Detection reports require Wazuh integration.",
-                fg='red'
-            ))
+        if not wazuh_config or not wazuh_config.get("enabled"):
+            click.echo(
+                click.style("✗ Detection reports require Wazuh integration.", fg="red")
+            )
             click.echo("  Configure Wazuh first: souleyez wazuh configure")
             return
 
         # Check for detection results
         from souleyez.storage.database import get_db
+
         db = get_db()
         results = db.execute(
             "SELECT COUNT(*) FROM detection_results WHERE engagement_id = ?",
-            (engagement_id,)
+            (engagement_id,),
         ).fetchone()[0]
         if results == 0:
-            click.echo(click.style(
-                "✗ No detection validation results found.",
-                fg='red'
-            ))
+            click.echo(
+                click.style("✗ No detection validation results found.", fg="red")
+            )
             click.echo("  Run attacks and validate detections first.")
             click.echo("  Use: souleyez detection validate")
             return
 
     # Show report type being generated
     type_label = {
-        'executive': 'EXECUTIVE (C-Level)',
-        'technical': 'TECHNICAL (Full Details)',
-        'summary': 'SUMMARY (Quick Status)',
-        'detection': 'DETECTION COVERAGE (SIEM Analysis)'
+        "executive": "EXECUTIVE (C-Level)",
+        "technical": "TECHNICAL (Full Details)",
+        "summary": "SUMMARY (Quick Status)",
+        "detection": "DETECTION COVERAGE (SIEM Analysis)",
     }
     ai_label = " + AI Enhanced" if ai else ""
-    click.echo(f"Generating {click.style(type_label[type] + ai_label, fg='yellow', bold=True)} {format.upper()} report")
+    click.echo(
+        f"Generating {click.style(type_label[type] + ai_label, fg='yellow', bold=True)} {format.upper()} report"
+    )
     click.echo(f"Engagement: {click.style(engagement_name, fg='cyan', bold=True)}")
 
     # Check AI availability if requested
@@ -3040,26 +3730,38 @@ def report_generate(format, type, output, engagement, ai):
     if ai:
         from souleyez.ai import AIReportService
         from souleyez.ai.llm_factory import LLMFactory
+
         ai_provider = LLMFactory.get_available_provider()
         if ai_provider and ai_provider.is_available():
             provider_info = ai_provider.get_status()
-            provider_name = provider_info.get('provider', 'Unknown')
-            click.echo(f"AI Provider: {click.style(provider_name, fg='magenta', bold=True)}")
+            provider_name = provider_info.get("provider", "Unknown")
+            click.echo(
+                f"AI Provider: {click.style(provider_name, fg='magenta', bold=True)}"
+            )
 
             # Show privacy warning for cloud providers
-            if provider_name.lower() == 'claude':
-                click.echo(click.style("⚠ PRIVACY: Engagement data will be sent to Anthropic's servers.", fg='yellow'))
+            if provider_name.lower() == "claude":
+                click.echo(
+                    click.style(
+                        "⚠ PRIVACY: Engagement data will be sent to Anthropic's servers.",
+                        fg="yellow",
+                    )
+                )
         else:
-            click.echo(click.style("⚠ AI not available. Falling back to standard report.", fg='yellow'))
+            click.echo(
+                click.style(
+                    "⚠ AI not available. Falling back to standard report.", fg="yellow"
+                )
+            )
             click.echo("  Configure Claude API key or ensure Ollama is running.")
             ai = False
             ai_provider = None
 
     # Generate output filename if not specified
     if not output:
-        timestamp = datetime.datetime.now().strftime('%Y%m%d_%H%M%S')
-        safe_name = engagement_name.replace(' ', '_').replace('/', '_')
-        ext = format if format != 'markdown' else 'md'
+        timestamp = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")
+        safe_name = engagement_name.replace(" ", "_").replace("/", "_")
+        ext = format if format != "markdown" else "md"
         # Include report type and AI in filename
         ai_suffix = "_ai" if ai else ""
         output = f"reports/{safe_name}_{type}{ai_suffix}_{timestamp}.{ext}"
@@ -3071,6 +3773,7 @@ def report_generate(format, type, output, engagement, ai):
         # Set explicit AI provider to avoid factory fallback issues
         if ai_provider:
             from souleyez.ai import AIReportService
+
             rg._ai_service = AIReportService(provider=ai_provider)
 
         # Generate report with specified type and AI enhancement
@@ -3079,17 +3782,18 @@ def report_generate(format, type, output, engagement, ai):
             format=format,
             output_path=output,
             report_type=type,
-            ai_enhanced=ai
+            ai_enhanced=ai,
         )
 
-        click.echo(click.style(f"✓ Report generated successfully!", fg='green'))
+        click.echo(click.style(f"✓ Report generated successfully!", fg="green"))
         click.echo(f"  Type: {type_label[type]}{' + AI' if ai else ''}")
         click.echo(f"  Format: {format.upper()}")
         click.echo(f"  File: {report_path}")
 
         # Show summary (different for detection reports)
-        if type == 'detection':
+        if type == "detection":
             from souleyez.reporting.detection_report import DetectionReportGatherer
+
             gatherer = DetectionReportGatherer(engagement_id)
             stats = gatherer.get_summary_stats()
             click.echo(f"\nDetection Summary:")
@@ -3106,8 +3810,9 @@ def report_generate(format, type, output, engagement, ai):
             click.echo(f"  Credentials: {len(data['credentials'])}")
 
     except Exception as e:
-        click.echo(click.style(f"✗ Error generating report: {e}", fg='red'))
+        click.echo(click.style(f"✗ Error generating report: {e}", fg="red"))
         import traceback
+
         traceback.print_exc()
 
 
@@ -3115,13 +3820,16 @@ def report_generate(format, type, output, engagement, ai):
 def report_list():
     """List generated reports."""
     import os
+
     reports_dir = Path("reports")
 
     if not reports_dir.exists():
         click.echo("No reports directory found.")
         return
 
-    reports = sorted(reports_dir.glob("*.*"), key=lambda p: p.stat().st_mtime, reverse=True)
+    reports = sorted(
+        reports_dir.glob("*.*"), key=lambda p: p.stat().st_mtime, reverse=True
+    )
 
     if not reports:
         click.echo("No reports found.")
@@ -3135,7 +3843,9 @@ def report_list():
         size = rpt.stat().st_size
         mtime = datetime.datetime.fromtimestamp(rpt.stat().st_mtime)
         click.echo(f"{rpt.name}")
-        click.echo(f"  Size: {size:,} bytes | Modified: {mtime.strftime('%Y-%m-%d %H:%M:%S')}")
+        click.echo(
+            f"  Size: {size:,} bytes | Modified: {mtime.strftime('%Y-%m-%d %H:%M:%S')}"
+        )
 
     click.echo("=" * 70 + "\n")
 
@@ -3144,6 +3854,7 @@ def report_list():
 # AI Commands
 # ============================================================================
 
+
 @cli.group()
 def ai():
     """AI-powered attack path recommendations (Pro feature)."""
@@ -3163,27 +3874,31 @@ def ai_status():
     status = service.get_status()
 
     # Display connection status
-    if status['connected']:
-        click.echo(click.style("✓ Ollama Connection: ", fg='green') + "Connected")
+    if status["connected"]:
+        click.echo(click.style("✓ Ollama Connection: ", fg="green") + "Connected")
         click.echo(f"  Endpoint: {status['endpoint']}")
     else:
-        click.echo(click.style("✗ Ollama Connection: ", fg='red') + "Not connected")
+        click.echo(click.style("✗ Ollama Connection: ", fg="red") + "Not connected")
         click.echo(f"  Endpoint: {status['endpoint']}")
-        if status.get('error'):
+        if status.get("error"):
             click.echo(f"  Error: {status['error']}")
-        click.echo("\n" + click.style("💡 TIP:", fg='yellow') + " Install Ollama from https://ollama.ai")
+        click.echo(
+            "\n"
+            + click.style("💡 TIP:", fg="yellow")
+            + " Install Ollama from https://ollama.ai"
+        )
         click.echo("  Then run: ollama serve")
         click.echo("=" * 70 + "\n")
         return
 
     # Display available models
     click.echo(f"\nAvailable Models: {len(status['models'])}")
-    if status['models']:
-        for model in status['models']:
-            if status['configured_model'] in model:
-                click.echo(f"  • {model} " + click.style("(configured)", fg='cyan'))
-            elif status['default_model'] in model:
-                click.echo(f"  • {model} " + click.style("(default)", fg='yellow'))
+    if status["models"]:
+        for model in status["models"]:
+            if status["configured_model"] in model:
+                click.echo(f"  • {model} " + click.style("(configured)", fg="cyan"))
+            elif status["default_model"] in model:
+                click.echo(f"  • {model} " + click.style("(default)", fg="yellow"))
             else:
                 click.echo(f"  • {model}")
     else:
@@ -3191,11 +3906,13 @@ def ai_status():
 
     # Display configured model status
     click.echo(f"\nConfigured Model: {status['configured_model']}")
-    if status['model_available']:
-        click.echo(click.style("✓ Status: ", fg='green') + "Ready")
+    if status["model_available"]:
+        click.echo(click.style("✓ Status: ", fg="green") + "Ready")
     else:
-        click.echo(click.style("✗ Status: ", fg='red') + "Not available")
-        click.echo(f"\n" + click.style("💡 TIP:", fg='yellow') + f" Pull the model with:")
+        click.echo(click.style("✗ Status: ", fg="red") + "Not available")
+        click.echo(
+            f"\n" + click.style("💡 TIP:", fg="yellow") + f" Pull the model with:"
+        )
         click.echo(f"  ollama pull {status['configured_model']}")
         click.echo(f"  Or change the model in Settings & Security → AI Settings")
 
@@ -3217,39 +3934,41 @@ def ai_init():
     # Check connection
     click.echo("🔄 Checking Ollama connection...")
     if not service.check_connection():
-        click.echo(click.style("✗ Failed:", fg='red') + " Cannot connect to Ollama")
-        click.echo("\n" + click.style("💡 TIP:", fg='yellow') + " Install and start Ollama:")
+        click.echo(click.style("✗ Failed:", fg="red") + " Cannot connect to Ollama")
+        click.echo(
+            "\n" + click.style("💡 TIP:", fg="yellow") + " Install and start Ollama:"
+        )
         click.echo("  1. Download from https://ollama.ai")
         click.echo("  2. Run: ollama serve")
         click.echo("=" * 70 + "\n")
         sys.exit(1)
 
-    click.echo(click.style("✓ Connected", fg='green') + " to Ollama\n")
+    click.echo(click.style("✓ Connected", fg="green") + " to Ollama\n")
 
     # Check if model exists
     configured_model = service.model
     click.echo(f"🔍 Checking for model: {configured_model}...")
 
     if service.check_model():
-        click.echo(click.style("✓ Model already available", fg='green'))
-        click.echo("\n" + click.style("✓ AI features ready!", fg='green', bold=True))
+        click.echo(click.style("✓ Model already available", fg="green"))
+        click.echo("\n" + click.style("✓ AI features ready!", fg="green", bold=True))
         click.echo("=" * 70 + "\n")
         return
 
     # Model doesn't exist, pull it
-    click.echo(click.style("⬇️  Model not found, pulling now...", fg='yellow'))
+    click.echo(click.style("⬇️  Model not found, pulling now...", fg="yellow"))
     click.echo(f"   This may take a few minutes depending on your connection.\n")
 
     try:
         if service.pull_model():
-            click.echo(click.style("\n✓ Model pulled successfully!", fg='green'))
-            click.echo(click.style("✓ AI features ready!", fg='green', bold=True))
+            click.echo(click.style("\n✓ Model pulled successfully!", fg="green"))
+            click.echo(click.style("✓ AI features ready!", fg="green", bold=True))
         else:
-            click.echo(click.style("\n✗ Failed to pull model", fg='red'))
+            click.echo(click.style("\n✗ Failed to pull model", fg="red"))
             click.echo("  Please try manually: ollama pull " + configured_model)
             sys.exit(1)
     except Exception as e:
-        click.echo(click.style(f"\n✗ Error pulling model: {e}", fg='red'))
+        click.echo(click.style(f"\n✗ Error pulling model: {e}", fg="red"))
         click.echo("  Please try manually: ollama pull " + configured_model)
         sys.exit(1)
 
@@ -3257,8 +3976,20 @@ def ai_init():
 
 
 @ai.command("recommend")
-@click.option("--engagement", "-e", type=int, default=None, help="Engagement ID to analyze (default: current)")
-@click.option("--steps", "-s", type=int, default=1, help="Number of attack steps to generate (default: 1)")
+@click.option(
+    "--engagement",
+    "-e",
+    type=int,
+    default=None,
+    help="Engagement ID to analyze (default: current)",
+)
+@click.option(
+    "--steps",
+    "-s",
+    type=int,
+    default=1,
+    help="Number of attack steps to generate (default: 1)",
+)
 def ai_recommend(engagement, steps):
     """Generate AI-powered attack path recommendation."""
     from souleyez.ai.recommender import AttackRecommender
@@ -3271,16 +4002,21 @@ def ai_recommend(engagement, steps):
         # Use specified engagement ID
         engagement_data = eng_mgr.get_by_id(engagement)
         if not engagement_data:
-            click.echo(click.style(f"✗ Error:", fg='red') + f" Engagement ID {engagement} not found")
+            click.echo(
+                click.style(f"✗ Error:", fg="red")
+                + f" Engagement ID {engagement} not found"
+            )
             sys.exit(1)
     else:
         # Use current engagement
         engagement_data = eng_mgr.get_current()
         if not engagement_data:
-            click.echo(click.style("✗ Error:", fg='red') + " No current engagement selected")
+            click.echo(
+                click.style("✗ Error:", fg="red") + " No current engagement selected"
+            )
             click.echo("  Use: souleyez engagement use <name>")
             sys.exit(1)
-        engagement = engagement_data['id']
+        engagement = engagement_data["id"]
 
     click.echo("\n" + "=" * 70)
     if steps > 1:
@@ -3293,65 +4029,82 @@ def ai_recommend(engagement, steps):
     # Generate recommendation
     click.echo("🤔 Analyzing engagement data...")
     recommender = AttackRecommender()
-    
+
     if steps > 1:
         result = recommender.generate_chain(engagement, num_steps=steps)
     else:
         result = recommender.suggest_next_step(engagement)
 
     # Check for errors
-    if result.get('error'):
-        click.echo(click.style("✗ Failed:", fg='red') + f" {result['error']}")
-        if 'ai init' in result['error']:
-            click.echo("\n" + click.style("💡 TIP:", fg='yellow') + " Run: souleyez ai init")
+    if result.get("error"):
+        click.echo(click.style("✗ Failed:", fg="red") + f" {result['error']}")
+        if "ai init" in result["error"]:
+            click.echo(
+                "\n" + click.style("💡 TIP:", fg="yellow") + " Run: souleyez ai init"
+            )
         click.echo("=" * 70 + "\n")
         sys.exit(1)
 
     # Display recommendation
     if steps > 1:
         # Display multi-step chain
-        click.echo(click.style("✓ Attack chain generated!", fg='green') + "\n")
-        
-        for step in result['steps']:
-            click.echo(click.style(f"STEP {step['step_number']}:", fg='yellow', bold=True) + f" {step['action']}")
+        click.echo(click.style("✓ Attack chain generated!", fg="green") + "\n")
+
+        for step in result["steps"]:
+            click.echo(
+                click.style(f"STEP {step['step_number']}:", fg="yellow", bold=True)
+                + f" {step['action']}"
+            )
             click.echo(f"  {click.style('TARGET:', fg='cyan')} {step['target']}")
             click.echo(f"  {click.style('RATIONALE:', fg='white')} {step['rationale']}")
             click.echo(f"  {click.style('EXPECTED:', fg='green')} {step['expected']}")
-            
-            risk_color = {'LOW': 'green', 'MEDIUM': 'yellow', 'HIGH': 'red'}.get(step['risk'], 'white')
-            click.echo(f"  {click.style('RISK:', fg='cyan')} {click.style(step['risk'], fg=risk_color)}")
-            click.echo(f"  {click.style('DEPENDENCIES:', fg='cyan')} {step['dependencies']}")
+
+            risk_color = {"LOW": "green", "MEDIUM": "yellow", "HIGH": "red"}.get(
+                step["risk"], "white"
+            )
+            click.echo(
+                f"  {click.style('RISK:', fg='cyan')} {click.style(step['risk'], fg=risk_color)}"
+            )
+            click.echo(
+                f"  {click.style('DEPENDENCIES:', fg='cyan')} {step['dependencies']}"
+            )
             click.echo()
     else:
         # Display single-step recommendation
-        click.echo(click.style("✓ Recommendation generated!", fg='green') + "\n")
+        click.echo(click.style("✓ Recommendation generated!", fg="green") + "\n")
 
-        click.echo(click.style("NEXT ACTION:", fg='cyan', bold=True))
+        click.echo(click.style("NEXT ACTION:", fg="cyan", bold=True))
         click.echo(f"  {result['action']}\n")
 
-        click.echo(click.style("TARGET:", fg='cyan', bold=True))
+        click.echo(click.style("TARGET:", fg="cyan", bold=True))
         click.echo(f"  {result['target']}\n")
 
-        click.echo(click.style("RATIONALE:", fg='cyan', bold=True))
+        click.echo(click.style("RATIONALE:", fg="cyan", bold=True))
         click.echo(f"  {result['rationale']}\n")
 
-        click.echo(click.style("EXPECTED OUTCOME:", fg='cyan', bold=True))
+        click.echo(click.style("EXPECTED OUTCOME:", fg="cyan", bold=True))
         click.echo(f"  {result['expected_outcome']}\n")
 
         # Color-code risk level
-        risk = result['risk_level']
-        risk_colors = {'low': 'green', 'medium': 'yellow', 'high': 'red'}
-        risk_color = risk_colors.get(risk, 'white')
+        risk = result["risk_level"]
+        risk_colors = {"low": "green", "medium": "yellow", "high": "red"}
+        risk_color = risk_colors.get(risk, "white")
 
-        click.echo(click.style("RISK LEVEL:", fg='cyan', bold=True))
+        click.echo(click.style("RISK LEVEL:", fg="cyan", bold=True))
         click.echo("  " + click.style(risk.upper(), fg=risk_color, bold=True))
 
     click.echo("\n" + "=" * 70 + "\n")
 
 
-@ai.command('paths')
-@click.option('--engagement', '-e', type=int, help='Engagement ID (default: current)')
-@click.option('--number', '-n', type=int, default=3, help='Number of paths to generate (default: 3)')
+@ai.command("paths")
+@click.option("--engagement", "-e", type=int, help="Engagement ID (default: current)")
+@click.option(
+    "--number",
+    "-n",
+    type=int,
+    default=3,
+    help="Number of paths to generate (default: 3)",
+)
 def ai_paths(engagement, number):
     """Generate and rank multiple attack paths."""
     from souleyez.storage.engagements import EngagementManager
@@ -3363,64 +4116,88 @@ def ai_paths(engagement, number):
     if engagement:
         eng = em.get_by_id(engagement)
         if not eng:
-            click.echo(click.style(f"✗ Engagement {engagement} not found", fg='red'))
+            click.echo(click.style(f"✗ Engagement {engagement} not found", fg="red"))
             return
     else:
         eng = em.get_current()
         if not eng:
-            click.echo(click.style("✗ No active engagement. Use: souleyez engagement use <name>", fg='red'))
+            click.echo(
+                click.style(
+                    "✗ No active engagement. Use: souleyez engagement use <name>",
+                    fg="red",
+                )
+            )
             return
 
-    click.echo(click.style(f"\n🤖 Generating {number} alternative attack paths...", fg='cyan', bold=True))
-    click.echo(click.style("⏳ This may take 1-3 minutes depending on AI model speed...\n", fg='yellow'))
+    click.echo(
+        click.style(
+            f"\n🤖 Generating {number} alternative attack paths...",
+            fg="cyan",
+            bold=True,
+        )
+    )
+    click.echo(
+        click.style(
+            "⏳ This may take 1-3 minutes depending on AI model speed...\n", fg="yellow"
+        )
+    )
 
     # Generate paths
     recommender = AttackRecommender()
-    result = recommender.suggest_multiple_paths(eng['id'], num_paths=number)
+    result = recommender.suggest_multiple_paths(eng["id"], num_paths=number)
 
     # Handle errors
-    if result.get('error'):
-        click.echo(click.style(f"✗ Error: {result['error']}", fg='red'))
+    if result.get("error"):
+        click.echo(click.style(f"✗ Error: {result['error']}", fg="red"))
         return
 
-    paths = result.get('paths', [])
+    paths = result.get("paths", [])
     if not paths:
-        click.echo(click.style("No attack paths generated", fg='yellow'))
+        click.echo(click.style("No attack paths generated", fg="yellow"))
         return
 
     # Display ranked paths
     click.echo("=" * 80)
-    click.echo(click.style(f"RANKED ATTACK PATHS (Top {len(paths)})", bold=True, fg='cyan'))
+    click.echo(
+        click.style(f"RANKED ATTACK PATHS (Top {len(paths)})", bold=True, fg="cyan")
+    )
     click.echo("=" * 80)
 
     for scored_path in paths:
-        rank = scored_path['rank']
-        path = scored_path['path']
-        scores = scored_path['scores']
-        total = scored_path['total_score']
+        rank = scored_path["rank"]
+        path = scored_path["path"]
+        scores = scored_path["scores"]
+        total = scored_path["total_score"]
 
         # Rank header with score
         if rank == 1:
-            rank_color = 'green'
-            rank_icon = '🥇'
+            rank_color = "green"
+            rank_icon = "🥇"
         elif rank == 2:
-            rank_color = 'yellow'
-            rank_icon = '🥈'
+            rank_color = "yellow"
+            rank_icon = "🥈"
         elif rank == 3:
-            rank_color = 'cyan'
-            rank_icon = '🥉'
+            rank_color = "cyan"
+            rank_icon = "🥉"
         else:
-            rank_color = 'white'
-            rank_icon = f'#{rank}'
+            rank_color = "white"
+            rank_icon = f"#{rank}"
 
-        click.echo(f"\n{rank_icon} " + click.style(f"PATH {rank}", bold=True, fg=rank_color) +
-                   click.style(f" (Score: {total}/100)", fg=rank_color))
+        click.echo(
+            f"\n{rank_icon} "
+            + click.style(f"PATH {rank}", bold=True, fg=rank_color)
+            + click.style(f" (Score: {total}/100)", fg=rank_color)
+        )
         click.echo("-" * 80)
 
         # Path details
         click.echo(f"ACTION: {path['action']}")
         click.echo(f"TARGET: {path['target']}")
-        risk_color = 'green' if path['risk_level'] == 'LOW' else ('yellow' if path['risk_level'] == 'MEDIUM' else 'red')
+        risk_color = (
+            "green"
+            if path["risk_level"] == "LOW"
+            else ("yellow" if path["risk_level"] == "MEDIUM" else "red")
+        )
         click.echo(f"RISK: {click.style(path['risk_level'], fg=risk_color)}")
         click.echo(f"\nRATIONALE: {path['rationale']}")
         click.echo(f"EXPECTED: {path['expected']}")
@@ -3433,38 +4210,55 @@ def ai_paths(engagement, number):
         click.echo(f"   Complexity:         -{scores['complexity']} (penalty)")
 
     click.echo("\n" + "=" * 80)
-    click.echo(click.style(f"\n💡 Tip: Execute top path with: souleyez ai execute", fg='cyan'))
+    click.echo(
+        click.style(f"\n💡 Tip: Execute top path with: souleyez ai execute", fg="cyan")
+    )
 
 
 @ai.command("execute")
-@click.option("--engagement", "-e", type=int, default=None, help="Engagement ID (default: current)")
+@click.option(
+    "--engagement",
+    "-e",
+    type=int,
+    default=None,
+    help="Engagement ID (default: current)",
+)
 @click.option("--once", is_flag=True, help="Run only one iteration then stop")
 @click.option("--dry-run", is_flag=True, help="Show commands but don't execute")
 @click.option("--auto-low", is_flag=True, help="Auto-approve LOW risk commands")
-@click.option("--auto-medium", is_flag=True, help="Auto-approve LOW and MEDIUM risk commands")
-@click.option("--max-iterations", "-n", type=int, default=None, help="Maximum iterations to run")
+@click.option(
+    "--auto-medium", is_flag=True, help="Auto-approve LOW and MEDIUM risk commands"
+)
+@click.option(
+    "--max-iterations", "-n", type=int, default=None, help="Maximum iterations to run"
+)
 def ai_execute(engagement, once, dry_run, auto_low, auto_medium, max_iterations):
     """Execute AI-driven attack recommendations interactively."""
     from souleyez.ai.executor import InteractiveExecutor
     from souleyez.ai.safety import ApprovalMode
     from souleyez.storage.engagements import EngagementManager
-    
+
     # Get engagement
     eng_mgr = EngagementManager()
-    
+
     if engagement:
         engagement_data = eng_mgr.get_by_id(engagement)
         if not engagement_data:
-            click.echo(click.style(f"✗ Error:", fg='red') + f" Engagement ID {engagement} not found")
+            click.echo(
+                click.style(f"✗ Error:", fg="red")
+                + f" Engagement ID {engagement} not found"
+            )
             sys.exit(1)
     else:
         engagement_data = eng_mgr.get_current()
         if not engagement_data:
-            click.echo(click.style("✗ Error:", fg='red') + " No current engagement selected")
+            click.echo(
+                click.style("✗ Error:", fg="red") + " No current engagement selected"
+            )
             click.echo("  Use: souleyez engagement use <name>")
             sys.exit(1)
-        engagement = engagement_data['id']
-    
+        engagement = engagement_data["id"]
+
     # Determine approval mode
     if dry_run:
         approval_mode = ApprovalMode.DRY_RUN
@@ -3474,20 +4268,18 @@ def ai_execute(engagement, once, dry_run, auto_low, auto_medium, max_iterations)
         approval_mode = ApprovalMode.AUTO_LOW
     else:
         approval_mode = ApprovalMode.MANUAL
-    
+
     # Create executor and run
     try:
         executor = InteractiveExecutor(approval_mode=approval_mode)
         executor.execute_loop(
-            engagement_id=engagement,
-            max_iterations=max_iterations,
-            once=once
+            engagement_id=engagement, max_iterations=max_iterations, once=once
         )
     except KeyboardInterrupt:
-        click.echo(click.style("\n\n🛑 Execution stopped by user", fg='yellow'))
+        click.echo(click.style("\n\n🛑 Execution stopped by user", fg="yellow"))
         sys.exit(0)
     except Exception as e:
-        click.echo(click.style(f"\n✗ Fatal error: {e}", fg='red'))
+        click.echo(click.style(f"\n✗ Fatal error: {e}", fg="red"))
         sys.exit(1)
 
 
@@ -3495,6 +4287,7 @@ def ai_execute(engagement, once, dry_run, auto_low, auto_medium, max_iterations)
 # Import Commands
 # ============================================================================
 
+
 @cli.group()
 def import_data():
     """Import data from external sources."""
@@ -3502,8 +4295,8 @@ def import_data():
 
 
 @import_data.command("msf")
-@click.argument('xml_file', type=click.Path(exists=True))
-@click.option('-v', '--verbose', is_flag=True, help='Show detailed import progress')
+@click.argument("xml_file", type=click.Path(exists=True))
+@click.option("-v", "--verbose", is_flag=True, help="Show detailed import progress")
 def import_msf(xml_file, verbose):
     """
     Import data from Metasploit Framework XML export.
@@ -3520,13 +4313,24 @@ def import_msf(xml_file, verbose):
     current_ws = em.get_current()
 
     if not current_ws:
-        click.echo(click.style("✗ No engagement selected! Use 'souleyez engagement use <name>'", fg='red'))
+        click.echo(
+            click.style(
+                "✗ No engagement selected! Use 'souleyez engagement use <name>'",
+                fg="red",
+            )
+        )
         return
 
-    engagement_id = current_ws['id']
-    engagement_name = current_ws['name']
+    engagement_id = current_ws["id"]
+    engagement_name = current_ws["name"]
 
-    click.echo(click.style(f"\n🔄 Importing Metasploit data into engagement: {engagement_name}", fg='cyan', bold=True))
+    click.echo(
+        click.style(
+            f"\n🔄 Importing Metasploit data into engagement: {engagement_name}",
+            fg="cyan",
+            bold=True,
+        )
+    )
     click.echo()
 
     importer = MSFImporter(engagement_id)
@@ -3535,7 +4339,9 @@ def import_msf(xml_file, verbose):
         stats = importer.import_xml(xml_file, verbose=verbose)
 
         click.echo()
-        click.echo(click.style("✓ Import completed successfully!", fg='green', bold=True))
+        click.echo(
+            click.style("✓ Import completed successfully!", fg="green", bold=True)
+        )
         click.echo()
         click.echo("Import Summary:")
         click.echo(f"  • Hosts:           {stats['hosts']}")
@@ -3543,20 +4349,23 @@ def import_msf(xml_file, verbose):
         click.echo(f"  • Credentials:     {stats['credentials']}")
         click.echo(f"  • Vulnerabilities: {stats['vulnerabilities']}")
 
-        if stats['skipped'] > 0:
+        if stats["skipped"] > 0:
             click.echo(f"  • Skipped:         {stats['skipped']}")
 
         click.echo()
-        click.echo(click.style("💡 TIP:", fg='yellow', bold=True) + " View imported data with:")
+        click.echo(
+            click.style("💡 TIP:", fg="yellow", bold=True) + " View imported data with:"
+        )
         click.echo("  • souleyez dashboard")
         click.echo("  • souleyez interactive")
         click.echo("  • souleyez report generate")
         click.echo()
 
     except Exception as e:
-        click.echo(click.style(f"\n✗ Import failed: {e}", fg='red'))
+        click.echo(click.style(f"\n✗ Import failed: {e}", fg="red"))
         if verbose:
             import traceback
+
             traceback.print_exc()
         return
 
@@ -3568,7 +4377,7 @@ def config():
 
 
 @config.command("get")
-@click.argument('key')
+@click.argument("key")
 def config_get(key):
     """
     Get a configuration value.
@@ -3590,8 +4399,8 @@ def config_get(key):
 
 
 @config.command("set")
-@click.argument('key')
-@click.argument('value')
+@click.argument("key")
+@click.argument("value")
 def config_set(key, value):
     """
     Set a configuration value.
@@ -3610,26 +4419,33 @@ def config_set(key, value):
     cfg = read_config()
 
     # Convert value types for common settings
-    if key in ('settings.threads', 'security.session_timeout_minutes',
-               'security.max_login_attempts', 'security.lockout_duration_minutes',
-               'security.min_password_length', 'crypto.iterations',
-               'database.backup_interval_hours', 'ai.max_tokens',
-               'logging.max_bytes', 'logging.backup_count'):
+    if key in (
+        "settings.threads",
+        "security.session_timeout_minutes",
+        "security.max_login_attempts",
+        "security.lockout_duration_minutes",
+        "security.min_password_length",
+        "crypto.iterations",
+        "database.backup_interval_hours",
+        "ai.max_tokens",
+        "logging.max_bytes",
+        "logging.backup_count",
+    ):
         try:
             value = int(value)
         except ValueError:
-            click.echo(click.style(f"Error: {key} requires an integer value", fg='red'))
+            click.echo(click.style(f"Error: {key} requires an integer value", fg="red"))
             return
 
-    if key in ('ai.temperature',):
+    if key in ("ai.temperature",):
         try:
             value = float(value)
         except ValueError:
-            click.echo(click.style(f"Error: {key} requires a numeric value", fg='red'))
+            click.echo(click.style(f"Error: {key} requires a numeric value", fg="red"))
             return
 
-    if key in ('database.backup_enabled',):
-        value = value.lower() in ('true', '1', 'yes')
+    if key in ("database.backup_enabled",):
+        value = value.lower() in ("true", "1", "yes")
 
     # Set the value
     _set_nested(cfg, key, value)
@@ -3637,7 +4453,7 @@ def config_set(key, value):
     # Write config
     write_config(cfg)
 
-    click.echo(click.style(f"✓ Set {key} = {value}", fg='green'))
+    click.echo(click.style(f"✓ Set {key} = {value}", fg="green"))
 
 
 @config.command("list")
@@ -3654,8 +4470,10 @@ def config_list():
 
 # Import and register screenshot commands
 from souleyez.commands.screenshots import screenshots
+
 cli.add_command(screenshots)
 
 # Import and register deliverable commands
 from souleyez.commands.deliverables import deliverables
+
 cli.add_command(deliverables)