wup 0.2.29__tar.gz → 0.2.33__tar.gz

{wup-0.2.29/wup.egg-info → wup-0.2.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wup
-Version: 0.2.29
+Version: 0.2.33
 Summary: WUP (What's Up) - Intelligent file watcher for regression testing in large projects
 Author-email: Tom Sapletta <tom@sapletta.com>
 License-Expression: Apache-2.0
@@ -22,6 +22,8 @@ Requires-Dist: psutil>=5.9.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: typer>=0.9.0
 Requires-Dist: pyyaml>=6.0
+Provides-Extra: visual
+Requires-Dist: playwright<2,>=1.40; extra == "visual"
 Dynamic: license-file
 
 # WUP (What's Up)
@@ -29,17 +31,17 @@ Dynamic: license-file
 
 ## AI Cost Tracking
 
-![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.29-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
-![AI Cost](https://img.shields.io/badge/AI%20Cost-$2.28-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-17.3h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
+![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.33-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![AI Cost](https://img.shields.io/badge/AI%20Cost-$2.56-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-18.3h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $2.2757 (39 commits)
-- 👤 **Human dev:** ~$1732 (17.3h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $2.5582 (43 commits)
+- 👤 **Human dev:** ~$1832 (18.3h @ $100/h, 30min dedup)
 
-Generated on 2026-05-17 using [openrouter/qwen/qwen3-coder-next](https://openrouter.ai/qwen/qwen3-coder-next)
+Generated on 2026-05-21 using [openrouter/qwen/qwen3-coder-next](https://openrouter.ai/qwen/qwen3-coder-next)
 
 ---
 
-![PyPI](https://img.shields.io/badge/pypi-wup-blue) ![Version](https://img.shields.io/badge/version-0.2.29-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![PyPI](https://img.shields.io/badge/pypi-wup-blue) ![Version](https://img.shields.io/badge/version-0.2.33-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
 
 **WUP (What's Up)** - Intelligent file watcher for regression testing in large projects.
 

{wup-0.2.29 → wup-0.2.33}/README.md

@@ -3,17 +3,17 @@
 
 ## AI Cost Tracking
 
-![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.29-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
-![AI Cost](https://img.shields.io/badge/AI%20Cost-$2.28-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-17.3h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
+![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.33-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![AI Cost](https://img.shields.io/badge/AI%20Cost-$2.56-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-18.3h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $2.2757 (39 commits)
-- 👤 **Human dev:** ~$1732 (17.3h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $2.5582 (43 commits)
+- 👤 **Human dev:** ~$1832 (18.3h @ $100/h, 30min dedup)
 
-Generated on 2026-05-17 using [openrouter/qwen/qwen3-coder-next](https://openrouter.ai/qwen/qwen3-coder-next)
+Generated on 2026-05-21 using [openrouter/qwen/qwen3-coder-next](https://openrouter.ai/qwen/qwen3-coder-next)
 
 ---
 
-![PyPI](https://img.shields.io/badge/pypi-wup-blue) ![Version](https://img.shields.io/badge/version-0.2.29-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![PyPI](https://img.shields.io/badge/pypi-wup-blue) ![Version](https://img.shields.io/badge/version-0.2.33-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
 
 **WUP (What's Up)** - Intelligent file watcher for regression testing in large projects.
 

{wup-0.2.29 → wup-0.2.33}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "wup"
-version = "0.2.29"
+version = "0.2.33"
 description = "WUP (What's Up) - Intelligent file watcher for regression testing in large projects"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -30,6 +30,11 @@ classifiers = [
 ]
 license = "Apache-2.0"
 
+[project.optional-dependencies]
+visual = [
+    "playwright>=1.40,<2",
+]
+
 [tool.setuptools.packages.find]
 include = ["wup*"]
 

{wup-0.2.29 → wup-0.2.33}/tests/test_testql_watcher.py

@@ -9,6 +9,7 @@ from wup.testql_watcher import TestQLWatcher
 from wup.models.config import (
     ProjectConfig,
     ServiceConfig,
+    TestStrategyConfig,
     TestQLConfig,
     VisualDiffConfig,
     WatchConfig,
@@ -25,14 +26,15 @@ def test_process_changed_file_creates_track_on_failure():
 
         scenario_dir = root / "testql-scenarios"
         scenario_dir.mkdir(parents=True, exist_ok=True)
-        failing_scenario = scenario_dir / "app-users.testql.toon.yaml"
+        failing_scenario = scenario_dir / "api-users-smoke.testql.toon.yaml"
         failing_scenario.write_text("name: failing\n", encoding="utf-8")
 
-        # Pass empty config to prevent loading from temp dir
-        from wup.models.config import TestQLConfig, WatchConfig
+        # Pass config with service to prevent loading from temp dir
+        from wup.models.config import TestQLConfig, WatchConfig, ServiceConfig
+        service_config = ServiceConfig(name="app/users", paths=["app/users"])
         empty_config = WupConfig(
             project=ProjectConfig(name="test"),
-            services=[],
+            services=[service_config],
             test_strategy=None,
             watch=WatchConfig(),  # Add watch config to avoid file filtering issues
             testql=TestQLConfig(scenario_dir="testql-scenarios")
@@ -53,6 +55,9 @@ def test_process_changed_file_creates_track_on_failure():
             return CompletedProcess(args=args, returncode=0, stdout="{}", stderr="")
 
         watcher._run_testql = fake_run_testql  # type: ignore[method-assign]
+        
+        # Mock scenario selection to return our failing scenario
+        watcher._select_scenarios_for_service = lambda service: [failing_scenario]  # type: ignore[method-assign]
 
         result = asyncio.run(watcher.process_changed_file_once(str(app_file)))
 
@@ -332,3 +337,80 @@ def test_visual_differ_initialized_when_enabled():
         assert isinstance(watcher.visual_differ, VisualDiffer)
         assert watcher.visual_differ.cfg.enabled is True
         assert watcher.visual_differ.base_url == "http://localhost:9000"
+
+
+def test_get_config_endpoints_for_service_keeps_connect_pages_on_frontend():
+    """Frontend page routes from explicit_endpoints must not be rebound to backend/api_base_url."""
+    with tempfile.TemporaryDirectory() as tmpdir:
+        config = WupConfig(
+            project=ProjectConfig(name="c2004"),
+            watch=WatchConfig(),
+            services=[
+                ServiceConfig(name="frontend", type="web", paths=["frontend/**"]),
+                ServiceConfig(name="backend", type="web", paths=["backend/**"]),
+            ],
+            test_strategy=TestStrategyConfig(),
+            testql=TestQLConfig(
+                base_url="http://localhost:8100",
+                api_base_url="http://localhost:8101",
+                explicit_endpoints=["/connect-config-sitemap", "/connect-data"],
+            ),
+            visual_diff=VisualDiffConfig(enabled=True),
+        )
+
+        watcher = TestQLWatcher(tmpdir, config=config)
+
+        frontend_endpoints = watcher._get_config_endpoints_for_service("frontend")
+        backend_endpoints = watcher._get_config_endpoints_for_service("backend")
+
+        assert "http://localhost:8100/connect-config-sitemap" in frontend_endpoints
+        assert "http://localhost:8100/connect-data" in frontend_endpoints
+        assert "http://localhost:8101/connect-config-sitemap" not in backend_endpoints
+        assert "http://localhost:8101/connect-data" not in backend_endpoints
+
+
+def test_quick_pass_actions_prefer_config_endpoints_for_visual_diff():
+    """Visual diff should prefer config endpoints over merged mapper endpoints."""
+    with tempfile.TemporaryDirectory() as tmpdir:
+        config = WupConfig(
+            project=ProjectConfig(name="c2004"),
+            watch=WatchConfig(),
+            services=[
+                ServiceConfig(name="frontend", type="web", paths=["frontend/**"]),
+                ServiceConfig(name="backend", type="web", paths=["backend/**"]),
+            ],
+            test_strategy=TestStrategyConfig(),
+            testql=TestQLConfig(
+                base_url="http://localhost:8100",
+                api_base_url="http://localhost:8101",
+                endpoints_by_service={"backend": ["http://localhost:8101/api/v3/health"]},
+                explicit_endpoints=["/connect-config-sitemap", "/connect-data"],
+            ),
+            visual_diff=VisualDiffConfig(enabled=True),
+        )
+
+        watcher = TestQLWatcher(tmpdir, config=config)
+
+        class RecordingDiffer:
+            def __init__(self):
+                self.cfg = VisualDiffConfig(enabled=True)
+                self.calls = []
+
+            async def run_for_service(self, service, endpoints):
+                self.calls.append((service, list(endpoints)))
+                return []
+
+        differ = RecordingDiffer()
+        watcher.visual_differ = differ
+
+        asyncio.run(
+            watcher._quick_pass_actions(
+                "backend",
+                [
+                    "http://localhost:8101/connect-config-sitemap",
+                    "http://localhost:8101/connect-data",
+                ],
+            )
+        )
+
+        assert differ.calls == [("backend", ["http://localhost:8101/api/v3/health"])]

{wup-0.2.29 → wup-0.2.33}/tests/test_wup.py

@@ -1,7 +1,9 @@
 """Tests for WUP (What's Up) - Intelligent file watcher for regression testing."""
 
+import errno
 import json
 import tempfile
+from unittest.mock import MagicMock, patch
 from pathlib import Path
 
 import pytest
@@ -21,7 +23,13 @@ from wup.models.config import (
     VisualDiffConfig,
 )
 from wup.testql_watcher import TestQLWatcher
-from wup.visual_diff import VisualDiffer, _diff_snapshots, _page_slug, _resolve_base_url
+from wup.visual_diff import (
+    VisualDiffer,
+    _diff_snapshots,
+    _looks_like_visual_page,
+    _page_slug,
+    _resolve_base_url,
+)
 
 
 class TestDependencyMapper:
@@ -603,6 +611,50 @@ class TestWupWatcher:
             
             # No filtering should occur
 
+    def test_create_and_start_observer_fallback_on_enospc(self):
+        """Fallback to PollingObserver when inotify watch limit is reached."""
+        with tempfile.TemporaryDirectory() as tmpdir:
+            watcher = WupWatcher(tmpdir)
+            event_handler = MagicMock()
+            fake_observer = MagicMock()
+            fake_observer.start.side_effect = OSError(errno.ENOSPC, "inotify watch limit reached")
+
+            with patch("wup.core.Observer", return_value=fake_observer):
+                with patch("wup.core.PollingObserver") as mock_polling:
+                    fake_polling = MagicMock()
+                    mock_polling.return_value = fake_polling
+                    result = watcher._create_and_start_observer(event_handler, [tmpdir])
+                    assert result is fake_polling
+                    fake_polling.start.assert_called_once()
+
+    def test_create_and_start_observer_fallback_on_emfile(self):
+        """Fallback to PollingObserver when inotify instance limit is reached."""
+        with tempfile.TemporaryDirectory() as tmpdir:
+            watcher = WupWatcher(tmpdir)
+            event_handler = MagicMock()
+            fake_observer = MagicMock()
+            fake_observer.start.side_effect = OSError(errno.EMFILE, "inotify instance limit reached")
+
+            with patch("wup.core.Observer", return_value=fake_observer):
+                with patch("wup.core.PollingObserver") as mock_polling:
+                    fake_polling = MagicMock()
+                    mock_polling.return_value = fake_polling
+                    result = watcher._create_and_start_observer(event_handler, [tmpdir])
+                    assert result is fake_polling
+                    fake_polling.start.assert_called_once()
+
+    def test_create_and_start_observer_reraises_other_oserror(self):
+        """Re-raise OSError that is not ENOSPC or EMFILE."""
+        with tempfile.TemporaryDirectory() as tmpdir:
+            watcher = WupWatcher(tmpdir)
+            event_handler = MagicMock()
+            fake_observer = MagicMock()
+            fake_observer.start.side_effect = OSError(errno.EACCES, "permission denied")
+
+            with patch("wup.core.Observer", return_value=fake_observer):
+                with pytest.raises(OSError, match="permission denied"):
+                    watcher._create_and_start_observer(event_handler, [tmpdir])
+
 
 class TestIntegrationWorkflow:
     """Integration tests for complete workflows."""
@@ -994,9 +1046,29 @@ class TestVisualDiffer:
                 pages_from_endpoints=True,
             )
             differ = VisualDiffer(tmpdir, cfg)
-            pages = differ._pages_for_service("users", ["/api/users", "/api/users/1"])
-            assert "http://localhost:8080/api/users" in pages
-            assert "http://localhost:8080/api/users/1" in pages
+            pages = differ._pages_for_service("users", ["/connect-users", "/connect-users/1"])
+            assert "http://localhost:8080/connect-users" in pages
+            assert "http://localhost:8080/connect-users/1" in pages
+
+    def test_looks_like_visual_page_skips_api_health_routes(self):
+        assert _looks_like_visual_page("http://localhost:8101/api/v3/health") is False
+        assert _looks_like_visual_page("http://localhost:8100/firmware/api/v1/execution/status") is False
+        assert _looks_like_visual_page("http://localhost:8100/connect-config") is True
+
+    def test_pages_for_service_from_endpoints_skips_non_html_probes(self):
+        with tempfile.TemporaryDirectory() as tmpdir:
+            cfg = VisualDiffConfig(
+                base_url="http://localhost:8080",
+                pages_from_endpoints=True,
+            )
+            differ = VisualDiffer(tmpdir, cfg)
+            pages = differ._pages_for_service(
+                "backend",
+                ["/api/v3/health", "/connect-config", "http://localhost:8080/connect-data"],
+            )
+            assert "http://localhost:8080/api/v3/health" not in pages
+            assert "http://localhost:8080/connect-config" in pages
+            assert "http://localhost:8080/connect-data" in pages
 
     def test_pages_for_service_fallback(self):
         with tempfile.TemporaryDirectory() as tmpdir:
@@ -1012,12 +1084,12 @@ class TestVisualDiffer:
         with tempfile.TemporaryDirectory() as tmpdir:
             cfg = VisualDiffConfig(
                 base_url="http://localhost:8080",
-                pages=["https://example.com/health"],
+                pages=["https://example.com/connect-dashboard"],
                 pages_from_endpoints=False,
             )
             differ = VisualDiffer(tmpdir, cfg)
             pages = differ._pages_for_service("svc", [])
-            assert pages == ["https://example.com/health"]
+            assert pages == ["https://example.com/connect-dashboard"]
 
     def test_diff_snapshots_baseline(self):
         new = {"tag": "HTML", "children": [{"tag": "BODY"}]}
@@ -1055,6 +1127,45 @@ class TestVisualDiffer:
             results = asyncio.run(differ.run_for_service("svc", ["/x"]))
             assert results == []
 
+    def test_run_for_service_summarizes_fetch_errors(self, monkeypatch):
+        """Fetch failures should be reported once per service, not once per page."""
+        import asyncio
+        from wup import visual_diff as visual_diff_module
+
+        with tempfile.TemporaryDirectory() as tmpdir:
+            cfg = VisualDiffConfig(
+                enabled=True,
+                base_url="http://localhost:8100",
+                pages_from_endpoints=True,
+                delay_seconds=0,
+            )
+            differ = VisualDiffer(tmpdir, cfg)
+
+            async def fake_check_page(service, url):
+                return {
+                    "url": url,
+                    "diff": {
+                        "status": "error",
+                        "message": "BrowserType.launch: Executable doesn't exist at /tmp/chrome",
+                    },
+                }
+
+            printed = []
+
+            monkeypatch.setattr(visual_diff_module, "_playwright_available", lambda: True)
+            monkeypatch.setattr(differ, "_check_page", fake_check_page)
+            monkeypatch.setattr(visual_diff_module.console, "print", lambda message: printed.append(str(message)))
+
+            results = asyncio.run(
+                differ.run_for_service("frontend", ["/a", "/b", "/c", "/d"])
+            )
+
+            assert len(results) == 4
+            assert len(printed) == 1
+            assert "Visual diff skipped for frontend: 4 page(s) failed to fetch" in printed[0]
+            assert "/a, /b, /c (+1 more)" in printed[0]
+            assert "4x BrowserType.launch: Executable doesn't exist at /tmp/chrome" in printed[0]
+
     def test_get_recent_diffs_empty(self):
         with tempfile.TemporaryDirectory() as tmpdir:
             cfg = VisualDiffConfig()
@@ -1315,8 +1426,29 @@ visual_diff:
             assert vd.base_url == ""
             assert vd.max_depth == 10
             assert vd.pages == []
+            assert vd.pages_from_endpoints is True
             assert vd.headless is True
 
+    def test_load_config_visual_diff_env_overrides_page_discovery(self, monkeypatch):
+        """Env can widen visual page discovery for large frontend apps."""
+        monkeypatch.setenv("WUP_VISUAL_DIFF_MAX_PAGES", "200")
+        monkeypatch.setenv("WUP_VISUAL_DIFF_PAGES_FROM_ENDPOINTS", "true")
+        with tempfile.TemporaryDirectory() as tmpdir:
+            config_path = Path(tmpdir) / "wup.yaml"
+            config_path.write_text(
+                "project:\n"
+                "  name: x\n"
+                "visual_diff:\n"
+                "  enabled: true\n"
+                "  pages_from_endpoints: false\n"
+                "  max_pages: 5\n",
+                encoding="utf-8",
+            )
+            config = load_config(Path(tmpdir), config_path)
+            vd = config.visual_diff
+            assert vd.pages_from_endpoints is True
+            assert vd.max_pages == 200
+
     def test_load_dotenv_sets_env_var(self):
         """_load_dotenv should load .wup.env into os.environ."""
         import os

{wup-0.2.29 → wup-0.2.33}/wup/__init__.py

@@ -7,7 +7,7 @@ WUP monitors file changes and runs intelligent regression tests using a 3-layer
 3. Detail Layer: Full tests with blame reports (only on failure)
 """
 
-__version__ = "0.2.29"
+__version__ = "0.2.33"
 __author__ = "Tom Sapletta"
 
 from .config import load_config, save_config, get_default_config

{wup-0.2.29 → wup-0.2.33}/wup/cli.py

@@ -23,6 +23,100 @@ app = typer.Typer(
 console = Console()
 
 
+def _load_watch_config(
+    project_path: Path,
+    config_path: Optional[Path],
+    probe_interval: Optional[int],
+    mode: str,
+) -> WupConfig:
+    """Load wup.yaml config and apply CLI probe_interval override."""
+    wup_config = load_config(project_path, config_path)
+    if probe_interval is not None:
+        wup_config.testql.probe_interval_s = int(probe_interval)
+    elif mode.lower() == "testql" and not wup_config.testql.probe_interval_s:
+        wup_config.testql.probe_interval_s = 60
+    return wup_config
+
+
+def _print_watch_header(
+    wup_config: WupConfig,
+    cpu_throttle: float,
+    debounce: int,
+    cooldown: int,
+    config_path: Optional[Path],
+) -> None:
+    """Print watcher startup banner."""
+    console.print(f"[bold cyan]🚀 WUP Watcher[/bold cyan]")
+    console.print(f"[dim]Project: {wup_config.project.name}[/dim]")
+    console.print(f"[dim]Description: {wup_config.project.description}[/dim]")
+    console.print(f"[dim]CPU Throttle: {cpu_throttle * 100}%[/dim]")
+    console.print(f"[dim]Debounce: {debounce}s[/dim]")
+    console.print(f"[dim]Cooldown: {cooldown}s[/dim]")
+    if wup_config.testql.probe_interval_s:
+        console.print(f"[dim]Live probes: every {wup_config.testql.probe_interval_s}s[/dim]")
+    console.print(f"[dim]Config: {config_path or 'auto-detected'}[/dim]")
+    console.print()
+
+
+def _refresh_monitoring_manifest(
+    project_path: Path,
+    wup_config: WupConfig,
+    cfg_path: Optional[Path],
+) -> None:
+    """Rebuild and patch monitoring manifest into wup.yaml when possible."""
+    if not cfg_path:
+        return
+    from .monitoring_manifest import build_monitoring_manifest, patch_wup_yaml_monitoring
+    try:
+        manifest = build_monitoring_manifest(project_path, wup_config)
+        patch_wup_yaml_monitoring(cfg_path, manifest)
+        console.print("[dim]Refreshed monitoring manifest in wup.yaml[/dim]")
+    except OSError as exc:
+        console.print(f"[yellow]Could not refresh monitoring manifest: {exc}[/yellow]")
+
+
+def _create_watcher(
+    mode: str,
+    project_path: Path,
+    deps_file: str,
+    cpu_throttle: float,
+    debounce: int,
+    cooldown: int,
+    scenarios_dir: Optional[str],
+    testql_bin: str,
+    browser_service_url: Optional[str],
+    track_dir: str,
+    quick_limit: int,
+    config: WupConfig,
+) -> WupWatcher:
+    """Instantiate the correct watcher class for the chosen mode."""
+    if mode.lower() == "testql":
+        watcher = TestQLWatcher(
+            project_root=str(project_path),
+            deps_file=deps_file,
+            cpu_throttle=cpu_throttle,
+            debounce_seconds=debounce,
+            test_cooldown_seconds=cooldown,
+            scenarios_dir=scenarios_dir,
+            testql_bin=testql_bin,
+            browser_service_url=browser_service_url,
+            track_dir=track_dir,
+            quick_limit=quick_limit,
+            config=config,
+        )
+        console.print("[green]TestQL mode enabled[/green]")
+        return watcher
+
+    return WupWatcher(
+        project_root=str(project_path),
+        deps_file=deps_file,
+        cpu_throttle=cpu_throttle,
+        debounce_seconds=debounce,
+        test_cooldown_seconds=cooldown,
+        config=config,
+    )
+
+
 @app.command()
 def watch(
     project: str = typer.Argument(".", help="Path to the project root directory"),
@@ -60,67 +154,35 @@ def watch(
     ``--mode default`` for the legacy HTTP-only watcher without TestQL.
     """
     project_path = Path(project).resolve()
-    
+
     if not project_path.exists():
         console.print(f"[red]Error: Project path '{project}' does not exist[/red]")
         raise typer.Exit(1)
-    
-    # Load configuration
-    config_path = Path(config) if config else None
-    wup_config = load_config(project_path, config_path)
-    if probe_interval is not None:
-        wup_config.testql.probe_interval_s = int(probe_interval)
-    elif mode.lower() == "testql" and not wup_config.testql.probe_interval_s:
-        wup_config.testql.probe_interval_s = 60
 
+    config_path = Path(config) if config else None
+    wup_config = _load_watch_config(project_path, config_path, probe_interval, mode)
     effective_scenarios_dir = scenarios_dir or wup_config.testql.scenario_dir
 
-    console.print(f"[bold cyan]🚀 WUP Watcher[/bold cyan]")
-    console.print(f"[dim]Project: {wup_config.project.name}[/dim]")
-    console.print(f"[dim]Description: {wup_config.project.description}[/dim]")
-    console.print(f"[dim]CPU Throttle: {cpu_throttle * 100}%[/dim]")
-    console.print(f"[dim]Debounce: {debounce}s[/dim]")
-    console.print(f"[dim]Cooldown: {cooldown}s[/dim]")
-    if wup_config.testql.probe_interval_s:
-        console.print(f"[dim]Live probes: every {wup_config.testql.probe_interval_s}s[/dim]")
-    console.print(f"[dim]Config: {config_path or 'auto-detected'}[/dim]")
-    console.print()
-    
+    _print_watch_header(wup_config, cpu_throttle, debounce, cooldown, config_path)
+
     cfg_path = config_path if config_path and config_path.exists() else find_config_file(project_path)
-    if cfg_path:
-        from .monitoring_manifest import build_monitoring_manifest, patch_wup_yaml_monitoring
-        try:
-            manifest = build_monitoring_manifest(project_path, wup_config)
-            patch_wup_yaml_monitoring(cfg_path, manifest)
-            console.print("[dim]Refreshed monitoring manifest in wup.yaml[/dim]")
-        except OSError as exc:
-            console.print(f"[yellow]Could not refresh monitoring manifest: {exc}[/yellow]")
+    _refresh_monitoring_manifest(project_path, wup_config, cfg_path)
+
+    watcher = _create_watcher(
+        mode=mode,
+        project_path=project_path,
+        deps_file=deps_file,
+        cpu_throttle=cpu_throttle,
+        debounce=debounce,
+        cooldown=cooldown,
+        scenarios_dir=effective_scenarios_dir,
+        testql_bin=testql_bin,
+        browser_service_url=browser_service_url,
+        track_dir=track_dir,
+        quick_limit=quick_limit,
+        config=wup_config,
+    )
 
-    if mode.lower() == "testql":
-        watcher = TestQLWatcher(
-            project_root=str(project_path),
-            deps_file=deps_file,
-            cpu_throttle=cpu_throttle,
-            debounce_seconds=debounce,
-            test_cooldown_seconds=cooldown,
-            scenarios_dir=effective_scenarios_dir,
-            testql_bin=testql_bin,
-            browser_service_url=browser_service_url,
-            track_dir=track_dir,
-            quick_limit=quick_limit,
-            config=wup_config,
-        )
-        console.print("[green]TestQL mode enabled[/green]")
-    else:
-        watcher = WupWatcher(
-            project_root=str(project_path),
-            deps_file=deps_file,
-            cpu_throttle=cpu_throttle,
-            debounce_seconds=debounce,
-            test_cooldown_seconds=cooldown,
-            config=wup_config,
-        )
-    
     if dashboard:
         console.print("[green]Starting watcher with live dashboard...[/green]")
         asyncio.run(watcher.run_with_dashboard())