crackerjack 0.31.10__py3-none-any.whl → 0.31.13__py3-none-any.whl

crackerjack/mcp/enhanced_progress_monitor.py

@@ -18,7 +18,7 @@ from .progress_components import (
 
 
 class MetricCard(Widget):
-    value = reactive(" -- ")
+    value = reactive(" --")
     label = reactive("Metric")
     trend = reactive("")
     color = reactive("white")
@@ -26,7 +26,7 @@ class MetricCard(Widget):
     def __init__(
         self,
         label: str,
-        value: str = " -- ",
+        value: str = " --",
         trend: str = "",
         color: str = "white",
         **kwargs,
@@ -50,39 +50,39 @@ class AgentActivityWidget(Widget):
 
     def compose(self) -> ComposeResult:
         with Vertical():
-            with Horizontal(id="agent - metrics"):
+            with Horizontal(id="agent-metrics"):
                 yield MetricCard(
                     "Active Agents",
                     "0",
                     color="cyan",
-                    id="active - agents - metric",
+                    id="active-agents-metric",
                 )
                 yield MetricCard(
                     "Issues Fixed",
                     "0",
                     "↑",
                     color="green",
-                    id="issues - fixed - metric",
+                    id="issues-fixed-metric",
                 )
                 yield MetricCard(
                     "Confidence",
-                    "0 % ",
+                    "0%",
                     color="yellow",
-                    id="confidence - metric",
+                    id="confidence-metric",
                 )
                 yield MetricCard(
                     "Cache Hits",
                     "0",
                     color="magenta",
-                    id="cache - hits - metric",
+                    id="cache-hits-metric",
                 )
 
-            yield DataTable(id="agents - detail - table")
+            yield DataTable(id="agents-detail-table")
 
-            yield Label("⏸️ Coordinator: Idle", id="coordinator - status - bar")
+            yield Label("⏸️ Coordinator: Idle", id="coordinator-status-bar")
 
     def on_mount(self) -> None:
-        table = self.query_one("#agents - detail - table", DataTable)
+        table = self.query_one("#agents-detail-table", DataTable)
         table.add_columns(
             ("Agent", 20),
             ("Status", 10),
@@ -100,7 +100,7 @@ class AgentActivityWidget(Widget):
             active_agents = activity.get("active_agents", [])
 
             active_count = len(active_agents)
-            self.query_one("#active - agents - metric", MetricCard).value = str(
+            self.query_one("#active-agents-metric", MetricCard).value = str(
                 active_count,
             )
 
@@ -110,14 +110,14 @@ class AgentActivityWidget(Widget):
             ) / max(active_count, 1)
             cache_hits = activity.get("cache_hits", 0)
 
-            self.query_one("#issues - fixed - metric", MetricCard).value = str(
+            self.query_one("#issues-fixed-metric", MetricCard).value = str(
                 total_fixed,
             )
             self.query_one(
-                "#confidence - metric",
+                "#confidence-metric",
                 MetricCard,
-            ).value = f"{avg_confidence: .0 % }"
-            self.query_one("#cache - hits - metric", MetricCard).value = str(cache_hits)
+            ).value = f"{avg_confidence:.0%}"
+            self.query_one("#cache-hits-metric", MetricCard).value = str(cache_hits)
 
             self._update_coordinator_status(activity)
 
@@ -130,25 +130,25 @@ class AgentActivityWidget(Widget):
         status_icons = {"active": "🟢", "processing": "🔄", "idle": "⏸️", "error": "🔴"}
 
         icon = status_icons.get(status) or "⏸️"
-        status_bar = self.query_one("#coordinator - status - bar", Label)
+        status_bar = self.query_one("#coordinator-status-bar", Label)
         status_bar.update(
             f"{icon} Coordinator: {status.title()} ({total_agents} agents available)",
         )
 
     def _update_agent_table(self, agents: list) -> None:
-        table = self.query_one("#agents - detail - table", DataTable)
+        table = self.query_one("#agents-detail-table", DataTable)
         table.clear()
 
         if not agents:
-            table.add_row("No active agents", " - ", " - ", " - ", " - ")
+            table.add_row("No active agents", "-", "-", "-", "-")
             return
 
         for agent in agents:
             name = agent.get("agent_type", "Unknown")
             status = agent.get("status", "idle")
-            issue_type = agent.get("issue_type", " - ")
-            confidence = f"{agent.get('confidence', 0): .0 % }"
-            time_elapsed = f"{agent.get('processing_time', 0): .1f}s"
+            issue_type = agent.get("issue_type", "-")
+            confidence = f"{agent.get('confidence', 0):.0%}"
+            time_elapsed = f"{agent.get('processing_time', 0):.1f}s"
 
             status_emoji = {
                 "processing": "🔄",
@@ -197,10 +197,10 @@ class JobProgressPanel(Widget):
         self.border_title_align = "left"
 
         with Horizontal():
-            with Vertical(id="job - progress - section"):
+            with Vertical(id="job-progress-section"):
                 yield self._compose_progress_section()
 
-            with Vertical(id="job - metrics - section"):
+            with Vertical(id="job-metrics-section"):
                 yield self._compose_metrics_section()
 
     def _compose_progress_section(self) -> ComposeResult:
@@ -211,14 +211,14 @@ class JobProgressPanel(Widget):
         stage = self.job_data.get("stage", "Unknown")
         status = self.job_data.get("status", "Unknown")
 
-        yield Label(f"Stage: {stage}", classes="stage - label")
-        yield Label(f"Status: {status}", classes="status - label")
+        yield Label(f"Stage: {stage}", classes="stage-label")
+        yield Label(f"Status: {status}", classes="status-label")
         yield Label(f"Iteration: {iteration} / {max_iterations}")
 
         yield ProgressBar(
             total=100,
             progress=progress,
-            id=f"job - progress - {self.job_data.get('job_id', 'unknown')}",
+            id=f"job-progress-{self.job_data.get('job_id', 'unknown')}",
         )
 
         elapsed = time.time() - self.start_time
@@ -229,7 +229,7 @@ class JobProgressPanel(Widget):
         fixed = self.job_data.get("errors_fixed", 0)
         remaining = max(0, total_issues - fixed)
 
-        with Horizontal(classes="metrics - grid"):
+        with Horizontal(classes="metrics-grid"):
             yield MetricCard("Issues Found", str(total_issues), color="yellow")
             yield MetricCard(
                 "Fixed",
@@ -247,16 +247,16 @@ class JobProgressPanel(Widget):
         if total_issues > 0:
             success_rate = (fixed / total_issues) * 100
             yield Label(
-                f"Success Rate: {success_rate: .1f} % ",
-                classes="success - rate",
+                f"Success Rate: {success_rate:.1f}%",
+                classes="success-rate",
             )
 
     def _format_time(self, seconds: float) -> str:
         if seconds < 60:
-            return f"{seconds: .0f}s"
+            return f"{seconds:.0f}s"
         if seconds < 3600:
-            return f"{seconds / 60: .0f}m {seconds % 60: .0f}s"
-        return f"{seconds / 3600: .0f}h {(seconds % 3600) / 60: .0f}m"
+            return f"{seconds / 60:.0f}m {seconds % 60:.0f}s"
+        return f"{seconds / 3600:.0f}h {(seconds % 3600) / 60:.0f}m"
 
 
 class ServiceHealthPanel(Widget):
@@ -266,10 +266,10 @@ class ServiceHealthPanel(Widget):
         self.border_title_align = "left"
 
     def compose(self) -> ComposeResult:
-        yield DataTable(id="services - table")
+        yield DataTable(id="services-table")
 
     def on_mount(self) -> None:
-        table = self.query_one("#services - table", DataTable)
+        table = self.query_one("#services-table", DataTable)
         table.add_columns(
             ("Service", 20),
             ("Status", 12),
@@ -280,7 +280,7 @@ class ServiceHealthPanel(Widget):
         table.zebra_stripes = True
 
     def update_services(self, services: list[dict]) -> None:
-        table = self.query_one("#services - table", DataTable)
+        table = self.query_one("#services-table", DataTable)
         table.clear()
 
         for service in services:
@@ -308,7 +308,7 @@ class ServiceHealthPanel(Widget):
 
             if isinstance(last_check, int | float):
                 last_check_str = datetime.fromtimestamp(last_check).strftime(
-                    " % H: % M: % S",
+                    "%H:%M:%S",
                 )
             else:
                 last_check_str = str(last_check)
@@ -323,12 +323,12 @@ class ServiceHealthPanel(Widget):
 
     def _format_uptime(self, seconds: float) -> str:
         if seconds < 60:
-            return f"{seconds: .0f}s"
+            return f"{seconds:.0f}s"
         if seconds < 3600:
-            return f"{seconds / 60: .0f}m"
+            return f"{seconds / 60:.0f}m"
         if seconds < 86400:
-            return f"{seconds / 3600: .1f}h"
-        return f"{seconds / 86400: .1f}d"
+            return f"{seconds / 3600:.1f}h"
+        return f"{seconds / 86400:.1f}d"
 
 
 class EnhancedCrackerjackDashboard(App):
@@ -349,13 +349,13 @@ class EnhancedCrackerjackDashboard(App):
     def compose(self) -> ComposeResult:
         yield Label("🚀 Crackerjack Progress Monitor", id="header")
 
-        with Container(id="main - content"):
-            yield AgentActivityWidget(id="agent - panel")
+        with Container(id="main-content"):
+            yield AgentActivityWidget(id="agent-panel")
 
-            yield ServiceHealthPanel(id="service - panel")
+            yield ServiceHealthPanel(id="service-panel")
 
-            with Container(id="jobs - container"):
-                yield Label("Loading jobs...", id="jobs - placeholder")
+            with Container(id="jobs-container"):
+                yield Label("Loading jobs...", id="jobs-placeholder")
 
         yield Footer()
 
@@ -368,7 +368,7 @@ class EnhancedCrackerjackDashboard(App):
             jobs_data = jobs_result.get("data", {})
 
             services = self.service_manager.check_all_services()
-            self.query_one("#service - panel", ServiceHealthPanel).update_services(
+            self.query_one("#service-panel", ServiceHealthPanel).update_services(
                 services,
             )
 
@@ -376,7 +376,7 @@ class EnhancedCrackerjackDashboard(App):
                 aggregated_agent_data = self._aggregate_agent_data(
                     jobs_data["individual_jobs"],
                 )
-                self.query_one("#agent - panel", AgentActivityWidget).update_metrics(
+                self.query_one("#agent-panel", AgentActivityWidget).update_metrics(
                     aggregated_agent_data,
                 )
 
@@ -419,13 +419,13 @@ class EnhancedCrackerjackDashboard(App):
         return aggregated
 
     def _update_job_panels(self, jobs: list[dict]) -> None:
-        container = self.query_one("#jobs - container", Container)
+        container = self.query_one("#jobs-container", Container)
 
         with suppress(Exception):
-            container.remove_children("#jobs - placeholder")
+            container.remove_children("#jobs-placeholder")
 
-        existing_job_ids = {panel.id for panel in container.query(".job - panel")}
-        current_job_ids = {f"job - {job['job_id']}" for job in jobs}
+        existing_job_ids = {panel.id for panel in container.query(".job-panel")}
+        current_job_ids = {f"job-{job['job_id']}" for job in jobs}
 
         for panel_id in existing_job_ids - current_job_ids:
             with suppress(Exception):
@@ -433,9 +433,9 @@ class EnhancedCrackerjackDashboard(App):
                 panel.remove()
 
         for job in jobs:
-            panel_id = f"job - {job['job_id']}"
+            panel_id = f"job-{job['job_id']}"
             if panel_id not in existing_job_ids:
-                panel = JobProgressPanel(job, id=panel_id, classes="job - panel")
+                panel = JobProgressPanel(job, id=panel_id, classes="job-panel")
                 container.mount(panel)
             else:
                 panel = container.query_one(f"#{panel_id}", JobProgressPanel)
@@ -461,7 +461,7 @@ async def run_enhanced_progress_monitor(
             from rich.console import Console
 
             console = Console()
-            console.print("[bold cyan]🛠️  Development Mode: Enabled[/bold cyan]")
+            console.print("[bold cyan]🛠️ Development Mode: Enabled[/bold cyan]")
             app.dev = True
 
         await app.run_async()

crackerjack/mcp/file_monitor.py

@@ -19,15 +19,20 @@ import contextlib
 
 from rich.console import Console
 
+from crackerjack.services.secure_path_utils import SecurePathValidator
+
 console = Console()
 
 
 if WATCHDOG_AVAILABLE:
 
     class ProgressFileHandler(FileSystemEventHandler):
-        def __init__(self, callback: Callable[[str, dict], None]) -> None:
+        def __init__(
+            self, callback: Callable[[str, dict], None], progress_dir: Path
+        ) -> None:
             super().__init__()
             self.callback = callback
+            self.progress_dir = SecurePathValidator.validate_safe_path(progress_dir)
             self._last_processed: dict[str, float] = {}
             self._debounce_delay = 0.1
 
@@ -35,29 +40,47 @@ if WATCHDOG_AVAILABLE:
             if event.is_directory:
                 return
 
-            file_path = Path(event.src_path)
+            try:
+                file_path = Path(event.src_path)
 
-            if not file_path.name.startswith("job - ") or file_path.suffix != ".json":
-                return
+                # Validate that the file path is within our allowed progress directory
+                validated_path = SecurePathValidator.validate_safe_path(
+                    file_path, self.progress_dir
+                )
 
-            now = time.time()
-            if file_path.name in self._last_processed:
-                if now - self._last_processed[file_path.name] < self._debounce_delay:
+                if (
+                    not validated_path.name.startswith("job-")
+                    or validated_path.suffix != ".json"
+                ):
                     return
 
-            self._last_processed[file_path.name] = now
+                now = time.time()
+                if validated_path.name in self._last_processed:
+                    if (
+                        now - self._last_processed[validated_path.name]
+                        < self._debounce_delay
+                    ):
+                        return
+
+                self._last_processed[validated_path.name] = now
 
-            job_id = file_path.stem.replace("job - ", "")
+                job_id = validated_path.stem.replace("job-", "")
+            except Exception:
+                # If path validation fails, skip processing this file
+                return
 
             try:
-                with file_path.open() as f:
+                # Validate file size before reading
+                SecurePathValidator.validate_file_size(validated_path)
+
+                with validated_path.open() as f:
                     progress_data = json.load(f)
 
                 self.callback(job_id, progress_data)
 
             except (json.JSONDecodeError, FileNotFoundError, OSError) as e:
                 console.print(
-                    f"[yellow]Warning: Failed to read progress file {file_path}: {e}[/yellow]",
+                    f"[yellow]Warning: Failed to read progress file {file_path}: {e}[/ yellow]",
                 )
 
         def on_created(self, event: FileSystemEvent) -> None:
@@ -71,7 +94,7 @@ else:
 
 class AsyncProgressMonitor:
     def __init__(self, progress_dir: Path) -> None:
-        self.progress_dir = progress_dir
+        self.progress_dir = SecurePathValidator.validate_safe_path(progress_dir)
         self.observer: Observer | None = None
         self.subscribers: dict[str, set[Callable[[dict], None]]] = {}
         self._running = False
@@ -80,7 +103,7 @@ class AsyncProgressMonitor:
 
         if not WATCHDOG_AVAILABLE:
             console.print(
-                "[yellow]Warning: watchdog not available, falling back to polling[/yellow]",
+                "[yellow]Warning: watchdog not available, falling back to polling[/ yellow]",
             )
 
     async def start(self) -> None:
@@ -89,14 +112,14 @@ class AsyncProgressMonitor:
 
         self._running = True
 
-        handler = ProgressFileHandler(self._on_file_changed)
+        handler = ProgressFileHandler(self._on_file_changed, self.progress_dir)
 
         self.observer = Observer()
         self.observer.schedule(handler, str(self.progress_dir), recursive=False)
         self.observer.start()
 
         console.print(
-            f"[green]📁 Started monitoring progress directory: {self.progress_dir}[/green]",
+            f"[green]📁 Started monitoring progress directory: {self.progress_dir}[/ green]",
         )
 
     async def stop(self) -> None:
@@ -107,14 +130,14 @@ class AsyncProgressMonitor:
             self.observer.join()
             self.observer = None
 
-        console.print("[yellow]📁 Stopped progress directory monitoring[/yellow]")
+        console.print("[yellow]📁 Stopped progress directory monitoring[/ yellow]")
 
     def subscribe(self, job_id: str, callback: Callable[[dict], None]) -> None:
         if job_id not in self.subscribers:
             self.subscribers[job_id] = set()
 
         self.subscribers[job_id].add(callback)
-        console.print(f"[cyan]📋 Subscribed to job updates: {job_id}[/cyan]")
+        console.print(f"[cyan]📋 Subscribed to job updates: {job_id}[/ cyan]")
 
     def unsubscribe(self, job_id: str, callback: Callable[[dict], None]) -> None:
         if job_id in self.subscribers:
@@ -123,7 +146,7 @@ class AsyncProgressMonitor:
             if not self.subscribers[job_id]:
                 del self.subscribers[job_id]
 
-        console.print(f"[cyan]📋 Unsubscribed from job updates: {job_id}[/cyan]")
+        console.print(f"[cyan]📋 Unsubscribed from job updates: {job_id}[/ cyan]")
 
     def _on_file_changed(self, job_id: str, progress_data: dict) -> None:
         if job_id in self.subscribers:
@@ -132,13 +155,13 @@ class AsyncProgressMonitor:
                     callback(progress_data)
                 except Exception as e:
                     console.print(
-                        f"[red]Error in progress callback for job {job_id}: {e}[/red]",
+                        f"[red]Error in progress callback for job {job_id}: {e}[/ red]",
                     )
 
                     self.subscribers[job_id].discard(callback)
 
     async def get_current_progress(self, job_id: str) -> dict | None:
-        progress_file = self.progress_dir / f"job - {job_id}.json"
+        progress_file = self.progress_dir / f"job-{job_id}.json"
 
         if not progress_file.exists():
             return None
@@ -156,7 +179,7 @@ class AsyncProgressMonitor:
         cleaned = 0
         cutoff_time = time.time() - (max_age_minutes * 60)
 
-        for progress_file in self.progress_dir.glob("job -* .json"):
+        for progress_file in self.progress_dir.glob("job-* .json"):
             try:
                 if progress_file.stat().st_mtime < cutoff_time:
                     with progress_file.open() as f:
@@ -166,7 +189,7 @@ class AsyncProgressMonitor:
                         progress_file.unlink()
                         cleaned += 1
                         console.print(
-                            f"[dim]🧹 Cleaned up old progress file: {progress_file.name}[/dim]",
+                            f"[dim]🧹 Cleaned up old progress file: {progress_file.name}[/ dim]",
                         )
 
             except (json.JSONDecodeError, OSError, KeyError):
@@ -176,7 +199,7 @@ class AsyncProgressMonitor:
                     progress_file.unlink()
                     cleaned += 1
                     console.print(
-                        f"[dim]🧹 Removed corrupted progress file: {progress_file.name}[/dim]",
+                        f"[dim]🧹 Removed corrupted progress file: {progress_file.name}[/ dim]",
                     )
 
         return cleaned
@@ -184,7 +207,7 @@ class AsyncProgressMonitor:
 
 class PollingProgressMonitor:
     def __init__(self, progress_dir: Path) -> None:
-        self.progress_dir = progress_dir
+        self.progress_dir = SecurePathValidator.validate_safe_path(progress_dir)
         self.subscribers: dict[str, set[Callable[[dict], None]]] = {}
         self._running = False
         self._poll_task: asyncio.Task | None = None
@@ -196,7 +219,7 @@ class PollingProgressMonitor:
         self._running = True
         self._poll_task = asyncio.create_task(self._poll_loop())
         console.print(
-            f"[yellow]📁 Started polling progress directory: {self.progress_dir}[/yellow]",
+            f"[yellow]📁 Started polling progress directory: {self.progress_dir}[/ yellow]",
         )
 
     async def stop(self) -> None:
@@ -208,7 +231,7 @@ class PollingProgressMonitor:
                 await self._poll_task
             self._poll_task = None
 
-        console.print("[yellow]📁 Stopped progress directory polling[/yellow]")
+        console.print("[yellow]📁 Stopped progress directory polling[/ yellow]")
 
     async def _poll_loop(self) -> None:
         while self._running:
@@ -218,7 +241,7 @@ class PollingProgressMonitor:
             except asyncio.CancelledError:
                 break
             except Exception as e:
-                console.print(f"[red]Error in polling loop: {e}[/red]")
+                console.print(f"[red]Error in polling loop: {e}[/ red]")
                 await asyncio.sleep(1)
 
     async def _check_files(self) -> None:
@@ -227,26 +250,33 @@ class PollingProgressMonitor:
 
         current_files = {}
 
-        for progress_file in self.progress_dir.glob("job -* .json"):
+        for progress_file in self.progress_dir.glob("job-*.json"):
             try:
-                mtime = progress_file.stat().st_mtime
-                current_files[progress_file.name] = mtime
+                # Validate file path is within our allowed directory
+                validated_file = SecurePathValidator.validate_safe_path(
+                    progress_file, self.progress_dir
+                )
+
+                mtime = validated_file.stat().st_mtime
+                current_files[validated_file.name] = mtime
 
                 if (
-                    progress_file.name not in self._file_mtimes
-                    or mtime > self._file_mtimes[progress_file.name]
+                    validated_file.name not in self._file_mtimes
+                    or mtime > self._file_mtimes[validated_file.name]
                 ):
-                    job_id = progress_file.stem.replace("job - ", "")
+                    job_id = validated_file.stem.replace("job-", "")
 
                     try:
-                        with progress_file.open() as f:
+                        # Validate file size before reading
+                        SecurePathValidator.validate_file_size(validated_file)
+                        with validated_file.open() as f:
                             progress_data = json.load(f)
 
                         self._notify_subscribers(job_id, progress_data)
 
                     except (json.JSONDecodeError, OSError) as e:
                         console.print(
-                            f"[yellow]Warning: Failed to read progress file {progress_file}: {e}[/yellow]",
+                            f"[yellow]Warning: Failed to read progress file {progress_file}: {e}[/ yellow]",
                         )
 
             except OSError:
@@ -261,7 +291,7 @@ class PollingProgressMonitor:
                     callback(progress_data)
                 except Exception as e:
                     console.print(
-                        f"[red]Error in progress callback for job {job_id}: {e}[/red]",
+                        f"[red]Error in progress callback for job {job_id}: {e}[/ red]",
                     )
                     self.subscribers[job_id].discard(callback)
 
@@ -270,7 +300,7 @@ class PollingProgressMonitor:
             self.subscribers[job_id] = set()
 
         self.subscribers[job_id].add(callback)
-        console.print(f"[cyan]📋 Subscribed to job updates: {job_id} (polling)[/cyan]")
+        console.print(f"[cyan]📋 Subscribed to job updates: {job_id} (polling)[/ cyan]")
 
     def unsubscribe(self, job_id: str, callback: Callable[[dict], None]) -> None:
         if job_id in self.subscribers:
@@ -280,11 +310,11 @@ class PollingProgressMonitor:
                 del self.subscribers[job_id]
 
         console.print(
-            f"[cyan]📋 Unsubscribed from job updates: {job_id} (polling)[/cyan]",
+            f"[cyan]📋 Unsubscribed from job updates: {job_id} (polling)[/ cyan]",
         )
 
     async def get_current_progress(self, job_id: str) -> dict | None:
-        progress_file = self.progress_dir / f"job - {job_id}.json"
+        progress_file = self.progress_dir / f"job-{job_id}.json"
 
         if not progress_file.exists():
             return None
@@ -302,7 +332,7 @@ class PollingProgressMonitor:
         cleaned = 0
         cutoff_time = time.time() - (max_age_minutes * 60)
 
-        for progress_file in self.progress_dir.glob("job -* .json"):
+        for progress_file in self.progress_dir.glob("job-* .json"):
             try:
                 if progress_file.stat().st_mtime < cutoff_time:
                     with progress_file.open() as f:
@@ -312,7 +342,7 @@ class PollingProgressMonitor:
                         progress_file.unlink()
                         cleaned += 1
                         console.print(
-                            f"[dim]🧹 Cleaned up old progress file: {progress_file.name}[/dim]",
+                            f"[dim]🧹 Cleaned up old progress file: {progress_file.name}[/ dim]",
                         )
 
             except (json.JSONDecodeError, OSError, KeyError):
@@ -322,7 +352,7 @@ class PollingProgressMonitor:
                     progress_file.unlink()
                     cleaned += 1
                     console.print(
-                        f"[dim]🧹 Removed corrupted progress file: {progress_file.name}[/dim]",
+                        f"[dim]🧹 Removed corrupted progress file: {progress_file.name}[/ dim]",
                     )
 
         return cleaned