consolidate original and active page to just one page

Author: filip-michalsky

stagehand/main.py

@@ -53,16 +53,14 @@ def __getattr__(self, name):
         """Delegate all attribute access to the current active page."""
         stagehand = object.__getattribute__(self, "_stagehand")
 
-        # Get the current active page
-        if hasattr(stagehand, "_active_page") and stagehand._active_page:
-            active_page = stagehand._active_page
-        elif hasattr(stagehand, "_original_page") and stagehand._original_page:
-            active_page = stagehand._original_page
+        # Get the current page
+        if hasattr(stagehand, "_page") and stagehand._page:
+            page = stagehand._page
         else:
             raise RuntimeError("No active page available")
 
         # For async operations, make them wait for stability
-        attr = getattr(active_page, name)
+        attr = getattr(page, name)
         if callable(attr) and asyncio.iscoroutinefunction(attr):
             # Don't wait for stability on navigation methods
             if name in ["goto", "reload", "go_back", "go_forward"]:
@@ -83,38 +81,32 @@ def __setattr__(self, name, value):
         else:
             stagehand = object.__getattribute__(self, "_stagehand")
 
-            # Get the current active page
-            if hasattr(stagehand, "_active_page") and stagehand._active_page:
-                active_page = stagehand._active_page
-            elif hasattr(stagehand, "_original_page") and stagehand._original_page:
-                active_page = stagehand._original_page
+            # Get the current page
+            if hasattr(stagehand, "_page") and stagehand._page:
+                page = stagehand._page
             else:
                 raise RuntimeError("No active page available")
 
-            # Set the attribute on the active page
-            setattr(active_page, name, value)
+            # Set the attribute on the page
+            setattr(page, name, value)
 
     def __dir__(self):
         """Return attributes of the current active page."""
         stagehand = object.__getattribute__(self, "_stagehand")
 
-        if hasattr(stagehand, "_active_page") and stagehand._active_page:
-            active_page = stagehand._active_page
-        elif hasattr(stagehand, "_original_page") and stagehand._original_page:
-            active_page = stagehand._original_page
+        if hasattr(stagehand, "_page") and stagehand._page:
+            page = stagehand._page
         else:
             return []
 
-        return dir(active_page)
+        return dir(page)
 
     def __repr__(self):
         """Return representation of the current active page."""
         stagehand = object.__getattribute__(self, "_stagehand")
 
-        if hasattr(stagehand, "_active_page") and stagehand._active_page:
-            return f"<LivePageProxy -> {repr(stagehand._active_page)}>"
-        elif hasattr(stagehand, "_original_page") and stagehand._original_page:
-            return f"<LivePageProxy -> {repr(stagehand._original_page)}>"
+        if hasattr(stagehand, "_page") and stagehand._page:
+            return f"<LivePageProxy -> {repr(stagehand._page)}>"
         else:
             return "<LivePageProxy -> No active page>"
 
@@ -252,8 +244,7 @@ def __init__(
         self._browser = None
         self._context: Optional[BrowserContext] = None
         self._playwright_page: Optional[PlaywrightPage] = None
-        self._original_page: Optional[StagehandPage] = None
-        self._active_page: Optional[StagehandPage] = None
+        self._page: Optional[StagehandPage] = None
         self.context: Optional[StagehandContext] = None
         self.use_api = self.config.use_api
         self.experimental = self.config.experimental
@@ -496,16 +487,15 @@ async def init(self):
                     self._browser,
                     self._context,
                     self.context,
-                    self._original_page,
+                    self._page,
                 ) = await connect_browserbase_browser(
                     self._playwright,
                     self.session_id,
                     self.browserbase_api_key,
                     self,
                     self.logger,
                 )
-                self._playwright_page = self._original_page._page
-                self._active_page = self._original_page
+                self._playwright_page = self._page._page
             except Exception:
                 await self.close()
                 raise
@@ -517,16 +507,15 @@ async def init(self):
                     self._browser,
                     self._context,
                     self.context,
-                    self._original_page,
+                    self._page,
                     self._local_user_data_dir_temp,
                 ) = await connect_local_browser(
                     self._playwright,
                     self.local_browser_launch_options,
                     self,
                     self.logger,
                 )
-                self._playwright_page = self._original_page._page
-                self._active_page = self._original_page
+                self._playwright_page = self._page._page
             except Exception:
                 await self.close()
                 raise
@@ -713,7 +702,7 @@ def _set_active_page(self, stagehand_page: StagehandPage):
         Args:
             stagehand_page: The StagehandPage to set as active
         """
-        self._active_page = stagehand_page
+        self._page = stagehand_page
 
     @property
     def page(self) -> Optional[StagehandPage]:

tests/conftest.py

@@ -233,9 +233,8 @@ def mock_stagehand_client(mock_stagehand_config):
         # Mock the essential components
         client.llm = MagicMock()
         client.llm.completion = AsyncMock()
-        # Set internal page properties instead of the read-only page property
-        client._original_page = MagicMock()
-        client._active_page = client._original_page
+        # Set internal page property instead of the read-only page property
+        client._page = MagicMock()
         client.agent = MagicMock()
         client._client = MagicMock()
         client._execute = AsyncMock()

tests/unit/core/test_live_page_proxy.py

@@ -13,49 +13,40 @@ async def test_live_page_proxy_basic_delegation(mock_stagehand_config):
     # Create a Stagehand instance
     stagehand = Stagehand(config=mock_stagehand_config)
 
-    # Mock pages
-    mock_original_page = MagicMock(spec=StagehandPage)
-    mock_original_page.url = "https://original.com"
-    mock_original_page.title = AsyncMock(return_value="Original Page")
-    
-    mock_active_page = MagicMock(spec=StagehandPage)
-    mock_active_page.url = "https://active.com"
-    mock_active_page.title = AsyncMock(return_value="Active Page")
+    # Mock page
+    mock_page = MagicMock(spec=StagehandPage)
+    mock_page.url = "https://active.com"
+    mock_page.title = AsyncMock(return_value="Active Page")
 
-    # Set up the pages
-    stagehand._original_page = mock_original_page
-    stagehand._active_page = mock_active_page
+    # Set up the page
+    stagehand._page = mock_page
     stagehand._initialized = True
 
     # Get the proxy
     proxy = stagehand.page
 
-    # Test that it delegates to the active page
+    # Test that it delegates to the page
     assert proxy.url == "https://active.com"
     title = await proxy.title()
     assert title == "Active Page"
 
 
 @pytest.mark.asyncio
-async def test_live_page_proxy_falls_back_to_original(mock_stagehand_config):
-    """Test that LivePageProxy falls back to original page when no active page"""
+async def test_live_page_proxy_no_page_fallback(mock_stagehand_config):
+    """Test that LivePageProxy raises error when no page is set"""
     # Create a Stagehand instance
     stagehand = Stagehand(config=mock_stagehand_config)
 
-    # Mock original page only
-    mock_original_page = MagicMock(spec=StagehandPage)
-    mock_original_page.url = "https://original.com"
-    
-    # Set up the pages
-    stagehand._original_page = mock_original_page
-    stagehand._active_page = None
+    # No page set
+    stagehand._page = None
     stagehand._initialized = True
 
     # Get the proxy
     proxy = stagehand.page
 
-    # Test that it delegates to the original page
-    assert proxy.url == "https://original.com"
+    # Accessing attributes should raise RuntimeError
+    with pytest.raises(RuntimeError, match="No active page available"):
+        _ = proxy.url
 
 
 @pytest.mark.asyncio
@@ -85,9 +76,8 @@ async def __aexit__(self, *args):
     mock_page = MagicMock(spec=StagehandPage)
     mock_page.click = AsyncMock(return_value=None)
 
-    # Set up the pages
-    stagehand._original_page = mock_page
-    stagehand._active_page = mock_page
+    # Set up the page
+    stagehand._page = mock_page
     stagehand._initialized = True
 
     # Get the proxy
@@ -129,9 +119,8 @@ async def __aexit__(self, *args):
     mock_page.go_back = AsyncMock(return_value=None)
     mock_page.go_forward = AsyncMock(return_value=None)
 
-    # Set up the pages
-    stagehand._original_page = mock_page
-    stagehand._active_page = mock_page
+    # Set up the page
+    stagehand._page = mock_page
     stagehand._initialized = True
 
     # Get the proxy
@@ -167,8 +156,7 @@ async def test_live_page_proxy_dynamic_page_switching(mock_stagehand_config):
     page2.url = "https://page2.com"
 
     # Set up initial state
-    stagehand._original_page = page1
-    stagehand._active_page = page1
+    stagehand._page = page1
     stagehand._initialized = True
 
     # Get the proxy
@@ -177,8 +165,8 @@ async def test_live_page_proxy_dynamic_page_switching(mock_stagehand_config):
     # Initially points to page1
     assert proxy.url == "https://page1.com"
 
-    # Switch active page
-    stagehand._active_page = page2
+    # Switch page
+    stagehand._page = page2
 
     # Now points to page2 without creating a new proxy
     assert proxy.url == "https://page2.com"
@@ -189,9 +177,8 @@ def test_live_page_proxy_no_page_error(mock_stagehand_config):
     # Create a Stagehand instance
     stagehand = Stagehand(config=mock_stagehand_config)
 
-    # No pages set
-    stagehand._original_page = None
-    stagehand._active_page = None
+    # No page set
+    stagehand._page = None
     stagehand._initialized = True
 
     # Get the proxy