code-puppy 0.0.348__py3-none-any.whl → 0.0.372__py3-none-any.whl

code_puppy/tools/browser/browser_control.py

@@ -7,7 +7,7 @@ from pydantic_ai import RunContext
 from code_puppy.messaging import emit_error, emit_info, emit_success, emit_warning
 from code_puppy.tools.common import generate_group_id
 
-from .camoufox_manager import get_camoufox_manager
+from .browser_manager import get_session_browser_manager
 
 
 async def initialize_browser(
@@ -22,7 +22,7 @@ async def initialize_browser(
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
 
         # Configure browser settings
         browser_manager.headless = headless
@@ -75,7 +75,7 @@ async def close_browser() -> Dict[str, Any]:
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
         await browser_manager.close()
 
         emit_warning("Browser closed successfully", message_group=group_id)
@@ -94,7 +94,7 @@ async def get_browser_status() -> Dict[str, Any]:
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
 
         if not browser_manager._initialized:
             return {
@@ -139,7 +139,7 @@ async def create_new_page(url: Optional[str] = None) -> Dict[str, Any]:
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
 
         if not browser_manager._initialized:
             return {
@@ -168,7 +168,7 @@ async def list_pages() -> Dict[str, Any]:
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
 
         if not browser_manager._initialized:
             return {"success": False, "error": "Browser not initialized"}

code_puppy/tools/browser/browser_interactions.py

@@ -7,7 +7,7 @@ from pydantic_ai import RunContext
 from code_puppy.messaging import emit_error, emit_info, emit_success
 from code_puppy.tools.common import generate_group_id
 
-from .camoufox_manager import get_camoufox_manager
+from .browser_manager import get_session_browser_manager
 
 
 async def click_element(
@@ -24,14 +24,15 @@ async def click_element(
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
         page = await browser_manager.get_current_page()
 
         if not page:
             return {"success": False, "error": "No active browser page available"}
 
-        # Find element
-        element = page.locator(selector)
+        # Find element - use .first to handle cases where selector matches multiple elements
+        # This avoids Playwright's strict mode violation errors
+        element = page.locator(selector).first
 
         # Wait for element to be visible and enabled
         await element.wait_for(state="visible", timeout=timeout)
@@ -69,13 +70,13 @@ async def double_click_element(
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
         page = await browser_manager.get_current_page()
 
         if not page:
             return {"success": False, "error": "No active browser page available"}
 
-        element = page.locator(selector)
+        element = page.locator(selector).first
         await element.wait_for(state="visible", timeout=timeout)
         await element.dblclick(force=force, timeout=timeout)
 
@@ -99,13 +100,13 @@ async def hover_element(
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
         page = await browser_manager.get_current_page()
 
         if not page:
             return {"success": False, "error": "No active browser page available"}
 
-        element = page.locator(selector)
+        element = page.locator(selector).first
         await element.wait_for(state="visible", timeout=timeout)
         await element.hover(force=force, timeout=timeout)
 
@@ -130,13 +131,13 @@ async def set_element_text(
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
         page = await browser_manager.get_current_page()
 
         if not page:
             return {"success": False, "error": "No active browser page available"}
 
-        element = page.locator(selector)
+        element = page.locator(selector).first
         await element.wait_for(state="visible", timeout=timeout)
 
         if clear_first:
@@ -169,13 +170,13 @@ async def get_element_text(
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
         page = await browser_manager.get_current_page()
 
         if not page:
             return {"success": False, "error": "No active browser page available"}
 
-        element = page.locator(selector)
+        element = page.locator(selector).first
         await element.wait_for(state="visible", timeout=timeout)
 
         text = await element.text_content()
@@ -197,13 +198,13 @@ async def get_element_value(
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
         page = await browser_manager.get_current_page()
 
         if not page:
             return {"success": False, "error": "No active browser page available"}
 
-        element = page.locator(selector)
+        element = page.locator(selector).first
         await element.wait_for(state="visible", timeout=timeout)
 
         value = await element.input_value()
@@ -231,13 +232,13 @@ async def select_option(
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
         page = await browser_manager.get_current_page()
 
         if not page:
             return {"success": False, "error": "No active browser page available"}
 
-        element = page.locator(selector)
+        element = page.locator(selector).first
         await element.wait_for(state="visible", timeout=timeout)
 
         if value is not None:
@@ -278,13 +279,13 @@ async def check_element(
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
         page = await browser_manager.get_current_page()
 
         if not page:
             return {"success": False, "error": "No active browser page available"}
 
-        element = page.locator(selector)
+        element = page.locator(selector).first
         await element.wait_for(state="visible", timeout=timeout)
         await element.check(timeout=timeout)
 
@@ -307,13 +308,13 @@ async def uncheck_element(
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
         page = await browser_manager.get_current_page()
 
         if not page:
             return {"success": False, "error": "No active browser page available"}
 
-        element = page.locator(selector)
+        element = page.locator(selector).first
         await element.wait_for(state="visible", timeout=timeout)
         await element.uncheck(timeout=timeout)
 

code_puppy/tools/browser/browser_locators.py

@@ -7,7 +7,7 @@ from pydantic_ai import RunContext
 from code_puppy.messaging import emit_info, emit_success
 from code_puppy.tools.common import generate_group_id
 
-from .camoufox_manager import get_camoufox_manager
+from .browser_manager import get_session_browser_manager
 
 
 async def find_by_role(
@@ -23,7 +23,7 @@ async def find_by_role(
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
         page = await browser_manager.get_current_page()
 
         if not page:
@@ -75,7 +75,7 @@ async def find_by_text(
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
         page = await browser_manager.get_current_page()
 
         if not page:
@@ -127,7 +127,7 @@ async def find_by_label(
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
         page = await browser_manager.get_current_page()
 
         if not page:
@@ -190,7 +190,7 @@ async def find_by_placeholder(
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
         page = await browser_manager.get_current_page()
 
         if not page:
@@ -248,7 +248,7 @@ async def find_by_test_id(
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
         page = await browser_manager.get_current_page()
 
         if not page:
@@ -304,7 +304,7 @@ async def run_xpath_query(
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
         page = await browser_manager.get_current_page()
 
         if not page:
@@ -359,7 +359,7 @@ async def find_buttons(
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
         page = await browser_manager.get_current_page()
 
         if not page:
@@ -410,7 +410,7 @@ async def find_links(
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
         page = await browser_manager.get_current_page()
 
         if not page:

code_puppy/tools/browser/browser_manager.py

@@ -0,0 +1,316 @@
+"""Playwright browser manager for browser automation.
+
+Supports multiple simultaneous instances with unique profile directories.
+"""
+
+import asyncio
+import atexit
+import contextvars
+import os
+from pathlib import Path
+from typing import Optional
+
+from playwright.async_api import Browser, BrowserContext, Page
+
+from code_puppy import config
+from code_puppy.messaging import emit_info, emit_success, emit_warning
+
+# Store active manager instances by session ID
+_active_managers: dict[str, "BrowserManager"] = {}
+
+# Context variable for browser session - properly inherits through async tasks
+# This allows parallel agent invocations to each have their own browser instance
+_browser_session_var: contextvars.ContextVar[Optional[str]] = contextvars.ContextVar(
+    "browser_session", default=None
+)
+
+
+def set_browser_session(session_id: Optional[str]) -> contextvars.Token:
+    """Set the browser session ID for the current context.
+
+    This must be called BEFORE any tool calls that use the browser.
+    The context will properly propagate to all subsequent async calls.
+
+    Args:
+        session_id: The session ID to use for browser operations.
+
+    Returns:
+        A token that can be used to reset the context.
+    """
+    return _browser_session_var.set(session_id)
+
+
+def get_browser_session() -> Optional[str]:
+    """Get the browser session ID for the current context.
+
+    Returns:
+        The current session ID, or None if not set.
+    """
+    return _browser_session_var.get()
+
+
+def get_session_browser_manager() -> "BrowserManager":
+    """Get the BrowserManager for the current context's session.
+
+    This is the preferred way to get a browser manager in tool functions,
+    as it automatically uses the correct session ID for the current
+    agent context.
+
+    Returns:
+        A BrowserManager instance for the current session.
+    """
+    session_id = get_browser_session()
+    return get_browser_manager(session_id)
+
+
+# Flag to track if cleanup has already run
+_cleanup_done: bool = False
+
+
+class BrowserManager:
+    """Browser manager for Playwright-based browser automation.
+
+    Supports multiple simultaneous instances, each with its own profile directory.
+    Uses Chromium by default for maximum compatibility.
+    """
+
+    _browser: Optional[Browser] = None
+    _context: Optional[BrowserContext] = None
+    _initialized: bool = False
+
+    def __init__(self, session_id: Optional[str] = None):
+        """Initialize manager settings.
+
+        Args:
+            session_id: Optional session ID for this instance.
+                If None, uses 'default' as the session ID.
+        """
+        self.session_id = session_id or "default"
+
+        # Default to headless=True (no browser spam during tests)
+        # Override with BROWSER_HEADLESS=false to see the browser
+        self.headless = os.getenv("BROWSER_HEADLESS", "true").lower() != "false"
+        self.homepage = "https://www.google.com"
+
+        # Unique profile directory per session for browser state
+        self.profile_dir = self._get_profile_directory()
+
+    def _get_profile_directory(self) -> Path:
+        """Get or create the profile directory for this session.
+
+        Each session gets its own profile directory under:
+        XDG_CACHE_HOME/code_puppy/browser_profiles/<session_id>/
+
+        This allows multiple instances to run simultaneously.
+        """
+        cache_dir = Path(config.CACHE_DIR)
+        profiles_base = cache_dir / "browser_profiles"
+        profile_path = profiles_base / self.session_id
+        profile_path.mkdir(parents=True, exist_ok=True, mode=0o700)
+        return profile_path
+
+    async def async_initialize(self) -> None:
+        """Initialize Chromium browser via Playwright."""
+        if self._initialized:
+            return
+
+        try:
+            emit_info(f"Initializing Chromium browser (session: {self.session_id})...")
+            await self._initialize_browser()
+            self._initialized = True
+
+        except Exception:
+            await self._cleanup()
+            raise
+
+    async def _initialize_browser(self) -> None:
+        """Initialize Playwright Chromium browser with persistent context."""
+        from playwright.async_api import async_playwright
+
+        emit_info(f"Using persistent profile: {self.profile_dir}")
+
+        pw = await async_playwright().start()
+        # Use persistent context directory for Chromium to preserve browser state
+        context = await pw.chromium.launch_persistent_context(
+            user_data_dir=str(self.profile_dir), headless=self.headless
+        )
+        self._context = context
+        self._browser = context.browser
+        self._initialized = True
+
+    async def get_current_page(self) -> Optional[Page]:
+        """Get the currently active page. Lazily creates one if none exist."""
+        if not self._initialized or not self._context:
+            await self.async_initialize()
+
+        if not self._context:
+            return None
+
+        pages = self._context.pages
+        if pages:
+            return pages[0]
+
+        # Lazily create a new blank page without navigation
+        return await self._context.new_page()
+
+    async def new_page(self, url: Optional[str] = None) -> Page:
+        """Create a new page and optionally navigate to URL."""
+        if not self._initialized:
+            await self.async_initialize()
+
+        page = await self._context.new_page()
+        if url:
+            await page.goto(url)
+        return page
+
+    async def close_page(self, page: Page) -> None:
+        """Close a specific page."""
+        await page.close()
+
+    async def get_all_pages(self) -> list[Page]:
+        """Get all open pages."""
+        if not self._context:
+            return []
+        return self._context.pages
+
+    async def _cleanup(self, silent: bool = False) -> None:
+        """Clean up browser resources and save persistent state.
+
+        Args:
+            silent: If True, suppress all errors (used during shutdown).
+        """
+        try:
+            # Save browser state before closing (cookies, localStorage, etc.)
+            if self._context:
+                try:
+                    storage_state_path = self.profile_dir / "storage_state.json"
+                    await self._context.storage_state(path=str(storage_state_path))
+                    if not silent:
+                        emit_success(f"Browser state saved to {storage_state_path}")
+                except Exception as e:
+                    if not silent:
+                        emit_warning(f"Could not save storage state: {e}")
+
+                try:
+                    await self._context.close()
+                except Exception:
+                    pass  # Ignore errors during context close
+                self._context = None
+
+            if self._browser:
+                try:
+                    await self._browser.close()
+                except Exception:
+                    pass  # Ignore errors during browser close
+                self._browser = None
+
+            self._initialized = False
+
+            # Remove from active managers
+            if self.session_id in _active_managers:
+                del _active_managers[self.session_id]
+
+        except Exception as e:
+            if not silent:
+                emit_warning(f"Warning during cleanup: {e}")
+
+    async def close(self) -> None:
+        """Close the browser and clean up resources."""
+        await self._cleanup()
+        emit_info(f"Browser closed (session: {self.session_id})")
+
+
+def get_browser_manager(session_id: Optional[str] = None) -> BrowserManager:
+    """Get or create a BrowserManager instance.
+
+    Args:
+        session_id: Optional session ID. If provided and a manager with this
+            session exists, returns that manager. Otherwise creates a new one.
+            If None, uses 'default' as the session ID.
+
+    Returns:
+        A BrowserManager instance.
+
+    Example:
+        # Default session (for single-agent use)
+        manager = get_browser_manager()
+
+        # Named session (for multi-agent use)
+        manager = get_browser_manager("qa-agent-1")
+    """
+    session_id = session_id or "default"
+
+    if session_id not in _active_managers:
+        _active_managers[session_id] = BrowserManager(session_id)
+
+    return _active_managers[session_id]
+
+
+async def cleanup_all_browsers() -> None:
+    """Close all active browser manager instances.
+
+    This should be called before application exit to ensure all browser
+    connections are properly closed and no dangling futures remain.
+    """
+    global _cleanup_done
+
+    if _cleanup_done:
+        return
+
+    _cleanup_done = True
+
+    # Get a copy of the keys since we'll be modifying the dict during cleanup
+    session_ids = list(_active_managers.keys())
+
+    for session_id in session_ids:
+        manager = _active_managers.get(session_id)
+        if manager and manager._initialized:
+            try:
+                await manager._cleanup(silent=True)
+            except Exception:
+                pass  # Silently ignore all errors during exit cleanup
+
+
+def _sync_cleanup_browsers() -> None:
+    """Synchronous cleanup wrapper for use with atexit.
+
+    Creates a new event loop to run the async cleanup since the main
+    event loop may have already been closed when atexit handlers run.
+    """
+    global _cleanup_done
+
+    if _cleanup_done or not _active_managers:
+        return
+
+    try:
+        # Try to get the running loop first
+        try:
+            loop = asyncio.get_running_loop()
+            # If we're in an async context, schedule the cleanup
+            # but this is unlikely in atexit handlers
+            loop.create_task(cleanup_all_browsers())
+            return
+        except RuntimeError:
+            pass  # No running loop, which is expected in atexit
+
+        # Create a new event loop for cleanup
+        loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(loop)
+        try:
+            loop.run_until_complete(cleanup_all_browsers())
+        finally:
+            loop.close()
+    except Exception:
+        # Silently swallow ALL errors during exit cleanup
+        # We don't want to spam the user with errors on exit
+        pass
+
+
+# Register the cleanup handler with atexit
+# This ensures browsers are closed even if close_browser() isn't explicitly called
+atexit.register(_sync_cleanup_browsers)
+
+
+# Backwards compatibility aliases
+CamoufoxManager = BrowserManager
+get_camoufox_manager = get_browser_manager

code_puppy/tools/browser/browser_navigation.py

@@ -7,7 +7,7 @@ from pydantic_ai import RunContext
 from code_puppy.messaging import emit_error, emit_info, emit_success
 from code_puppy.tools.common import generate_group_id
 
-from .camoufox_manager import get_camoufox_manager
+from .browser_manager import get_session_browser_manager
 
 
 async def navigate_to_url(url: str) -> Dict[str, Any]:
@@ -18,7 +18,7 @@ async def navigate_to_url(url: str) -> Dict[str, Any]:
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
         page = await browser_manager.get_current_page()
 
         if not page:
@@ -48,7 +48,7 @@ async def get_page_info() -> Dict[str, Any]:
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
         page = await browser_manager.get_current_page()
 
         if not page:
@@ -71,7 +71,7 @@ async def go_back() -> Dict[str, Any]:
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
         page = await browser_manager.get_current_page()
 
         if not page:
@@ -93,7 +93,7 @@ async def go_forward() -> Dict[str, Any]:
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
         page = await browser_manager.get_current_page()
 
         if not page:
@@ -115,7 +115,7 @@ async def reload_page(wait_until: str = "domcontentloaded") -> Dict[str, Any]:
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
         page = await browser_manager.get_current_page()
 
         if not page:
@@ -139,7 +139,7 @@ async def wait_for_load_state(
         message_group=group_id,
     )
     try:
-        browser_manager = get_camoufox_manager()
+        browser_manager = get_session_browser_manager()
         page = await browser_manager.get_current_page()
 
         if not page: