Skip to content

Open-source Python library for AI browser agents, plus Browser Use Cloud: stealth browsers and a hosted agent API.

More robust switch and close tab

Magnus Müller022a3e352fef
diff --git a/browser_use/browser/session.py b/browser_use/browser/session.py
index 83e046b58..ca81b5c46 100644
--- a/browser_use/browser/session.py
+++ b/browser_use/browser/session.py
@@ -740,10 +740,26 @@ class BrowserSession(BaseModel):
async def on_CloseTabEvent(self, event: CloseTabEvent) -> None:
"""Handle tab closure - update focus if needed."""
+ try:
+ # Remove from session pool first to prevent further use
+ stale_session = self._cdp_session_pool.pop(event.target_id, None)
+ if stale_session and stale_session.owns_cdp_client:
+ try:
+ await stale_session.disconnect()
+ except Exception:
+ pass
- cdp_session = await self.get_or_create_cdp_session(target_id=None, focus=False)
- await self.event_bus.dispatch(TabClosedEvent(target_id=event.target_id))
- await cdp_session.cdp_client.send.Target.closeTarget(params={'targetId': event.target_id})
+ # Dispatch tab closed event
+ await self.event_bus.dispatch(TabClosedEvent(target_id=event.target_id))
+
+ # Try to close the target, but don't fail if it's already closed
+ try:
+ cdp_session = await self.get_or_create_cdp_session(target_id=None, focus=False)
+ await cdp_session.cdp_client.send.Target.closeTarget(params={'targetId': event.target_id})
+ except Exception as e:
+ self.logger.debug(f'Target may already be closed: {e}')
+ except Exception as e:
+ self.logger.warning(f'Error during tab close cleanup: {e}')
async def on_TabCreatedEvent(self, event: TabCreatedEvent) -> None:
"""Handle tab creation - apply viewport settings to new tab."""
@@ -1656,19 +1672,39 @@ class BrowserSession(BaseModel):
async def get_target_id_from_tab_id(self, tab_id: str) -> TargetID:
"""Get the full-length TargetID from the truncated 4-char tab_id."""
+ # First check cached sessions
for full_target_id in self._cdp_session_pool.keys():
if full_target_id.endswith(tab_id):
- return full_target_id
+ # Verify target still exists
+ if await self._is_target_valid(full_target_id):
+ return full_target_id
+ else:
+ # Remove stale session from pool
+ self.logger.debug(f'Removing stale session for target {full_target_id}')
+ stale_session = self._cdp_session_pool.pop(full_target_id, None)
+ if stale_session and stale_session.owns_cdp_client:
+ try:
+ await stale_session.disconnect()
+ except Exception:
+ pass
- # may not have a cached session, so we need to get all pages and find the target id
+ # Get all current targets and find the one matching tab_id
all_targets = await self.cdp_client.send.Target.getTargets()
# Filter for valid page/tab targets only
for target in all_targets.get('targetInfos', []):
- if target['targetId'].endswith(tab_id):
+ if target['targetId'].endswith(tab_id) and target.get('type') == 'page':
return target['targetId']
raise ValueError(f'No TargetID found ending in tab_id=...{tab_id}')
+ async def _is_target_valid(self, target_id: TargetID) -> bool:
+ """Check if a target ID is still valid."""
+ try:
+ await self.cdp_client.send.Target.getTargetInfo(params={'targetId': target_id})
+ return True
+ except Exception:
+ return False
+
async def get_target_id_from_url(self, url: str) -> TargetID:
"""Get the TargetID from a URL."""
all_targets = await self.cdp_client.send.Target.getTargets()
diff --git a/browser_use/tools/service.py b/browser_use/tools/service.py
index 892c2bb9c..545da61f7 100644
--- a/browser_use/tools/service.py
+++ b/browser_use/tools/service.py
@@ -49,7 +49,7 @@ from browser_use.tools.views import (
SwitchTabAction,
UploadFileAction,
)
-from browser_use.utils import _log_pretty_url, time_execution_sync
+from browser_use.utils import time_execution_sync
logger = logging.getLogger(__name__)
@@ -503,43 +503,51 @@ class Tools(Generic[Context]):
@self.registry.action('Switch tab', param_model=SwitchTabAction)
async def switch_tab(params: SwitchTabAction, browser_session: BrowserSession):
- # Dispatch switch tab event
+ # Simple switch tab logic
try:
target_id = await browser_session.get_target_id_from_tab_id(params.tab_id)
event = browser_session.event_bus.dispatch(SwitchTabEvent(target_id=target_id))
await event
- new_target_id = await event.event_result(raise_if_any=True, raise_if_none=False)
- assert new_target_id, 'SwitchTabEvent did not return a TargetID for the new tab that was switched to'
- memory = f'Switched to Tab with ID {new_target_id[-4:]}'
+ new_target_id = await event.event_result(raise_if_any=False, raise_if_none=False) # Don't raise on errors
+
+ if new_target_id:
+ memory = f'Switched to tab #{new_target_id[-4:]}'
+ else:
+ memory = f'Switched to tab #{params.tab_id}'
+
logger.info(f'🔄 {memory}')
return ActionResult(extracted_content=memory, long_term_memory=memory)
except Exception as e:
- logger.error(f'Failed to switch tab: {type(e).__name__}: {e}')
- return ActionResult(error=f'Failed to switch to tab {params.tab_id}.')
+ logger.warning(f'Tab switch may have failed: {e}')
+ memory = f'Attempted to switch to tab #{params.tab_id}'
+ return ActionResult(extracted_content=memory, long_term_memory=memory)
@self.registry.action('Close an existing tab', param_model=CloseTabAction)
async def close_tab(params: CloseTabAction, browser_session: BrowserSession):
- # Dispatch close tab event
+ # Simple close tab logic
try:
target_id = await browser_session.get_target_id_from_tab_id(params.tab_id)
- cdp_session = await browser_session.get_or_create_cdp_session()
- target_info = await cdp_session.cdp_client.send.Target.getTargetInfo(
- params={'targetId': target_id}, session_id=cdp_session.session_id
- )
- tab_url = target_info['targetInfo']['url']
+
+ # Dispatch close tab event - handle stale target IDs gracefully
event = browser_session.event_bus.dispatch(CloseTabEvent(target_id=target_id))
await event
- await event.event_result(raise_if_any=True, raise_if_none=False)
- memory = f'Closed tab # {params.tab_id} ({_log_pretty_url(tab_url)})'
+ await event.event_result(raise_if_any=False, raise_if_none=False) # Don't raise on errors
+
+ memory = f'Closed tab #{params.tab_id}'
logger.info(f'🗑️ {memory}')
return ActionResult(
extracted_content=memory,
long_term_memory=memory,
)
except Exception as e:
- logger.error(f'Failed to close tab: {e}')
- return ActionResult(error=f'Failed to close tab {params.tab_id}.')
+ # Handle stale target IDs gracefully
+ logger.warning(f'Tab {params.tab_id} may already be closed: {e}')
+ memory = f'Tab #{params.tab_id} closed (was already closed or invalid)'
+ return ActionResult(
+ extracted_content=memory,
+ long_term_memory=memory,
+ )
# Content Actions