Skip to content

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

refactor(cli): consolidate SDK/task/session files into cloud_task.py and cloud_session.py

ShawnPana7706c555329d
diff --git a/browser_use/skill_cli/commands/__init__.py b/browser_use/skill_cli/commands/__init__.py
index 6bf4299e0..9f9695884 100644
--- a/browser_use/skill_cli/commands/__init__.py
+++ b/browser_use/skill_cli/commands/__init__.py
@@ -1,5 +1,25 @@
"""Command handlers for browser-use CLI."""
-from browser_use.skill_cli.commands import agent, browser, doctor, python_exec, session, setup, tunnel
+from browser_use.skill_cli.commands import (
+ agent,
+ browser,
+ cloud_session,
+ cloud_task,
+ doctor,
+ python_exec,
+ session,
+ setup,
+ tunnel,
+)
-__all__ = ['browser', 'python_exec', 'agent', 'session', 'tunnel', 'setup', 'doctor']
+__all__ = [
+ 'agent',
+ 'browser',
+ 'cloud_session',
+ 'cloud_task',
+ 'doctor',
+ 'python_exec',
+ 'session',
+ 'setup',
+ 'tunnel',
+]
diff --git a/browser_use/skill_cli/commands/agent.py b/browser_use/skill_cli/commands/agent.py
index e6c8e1f54..3d6ffaf65 100644
--- a/browser_use/skill_cli/commands/agent.py
+++ b/browser_use/skill_cli/commands/agent.py
@@ -78,7 +78,7 @@ async def _handle_cloud_task(params: dict[str, Any]) -> Any:
By default uses US proxy for all cloud tasks.
"""
- from browser_use.skill_cli.commands import cloud_task
+ from browser_use.skill_cli.commands import cloud_session, cloud_task
task = params['task']
@@ -103,7 +103,7 @@ async def _handle_cloud_task(params: dict[str, Any]) -> Any:
# Create session first if profile or proxy specified and no session_id
if (profile_id or proxy_country) and not session_id:
- session = cloud_task.create_session(
+ session = cloud_session.create_session(
profile_id=profile_id,
proxy_country=proxy_country,
keep_alive=params.get('keep_alive'),
diff --git a/browser_use/skill_cli/commands/session_management.py b/browser_use/skill_cli/commands/cloud_session.py
similarity index 66%
rename from browser_use/skill_cli/commands/session_management.py
rename to browser_use/skill_cli/commands/cloud_session.py
index 21e39c0db..794ae6972 100644
--- a/browser_use/skill_cli/commands/session_management.py
+++ b/browser_use/skill_cli/commands/cloud_session.py
@@ -1,16 +1,119 @@
-"""Session management command handlers for browser-use CLI.
+"""Cloud session SDK wrappers and CLI handlers.
-Handles: session list, session get, session stop, session create, session share
+This module provides:
+- SDK wrapper functions for the Browser-Use Cloud Session API
+- CLI command handlers for `browser-use session <command>`
"""
import argparse
import json
+import logging
import sys
-from datetime import datetime, timezone
+from concurrent.futures import ThreadPoolExecutor, as_completed
from typing import Any
-from browser_use.skill_cli.api_key import APIKeyRequired, require_api_key
-from browser_use.skill_cli.commands import cloud_task
+from browser_use_sdk.types.session_item_view import SessionItemView
+from browser_use_sdk.types.session_view import SessionView
+from browser_use_sdk.types.share_view import ShareView
+
+from browser_use.skill_cli.commands.utils import format_duration, get_sdk_client
+
+logger = logging.getLogger(__name__)
+
+
+# ============ SDK Wrappers ============
+
+
+def create_session(**kwargs: Any) -> SessionItemView:
+ """Create a cloud browser session.
+
+ Args:
+ profile_id: Cloud profile ID for persistent auth/cookies
+ proxy_country: Proxy country code (us, gb, de, etc.)
+ keep_alive: Keep session alive after task completes
+ persist_memory: Share memory between tasks in session
+ start_url: URL to navigate to when session starts
+ screen_width: Browser screen width in pixels
+ screen_height: Browser screen height in pixels
+
+ Returns:
+ SessionItemView with session details
+ """
+ # Map our param names to SDK param names
+ param_map = {
+ 'proxy_country': 'proxy_country_code',
+ 'screen_width': 'browser_screen_width',
+ 'screen_height': 'browser_screen_height',
+ }
+ params = {}
+ for k, v in kwargs.items():
+ if v is not None:
+ params[param_map.get(k, k)] = v
+
+ return get_sdk_client().sessions.create_session(**params)
+
+
+def list_sessions(limit: int = 10, status: str | None = None) -> list[SessionItemView]:
+ """List cloud browser sessions."""
+ client = get_sdk_client()
+ response = client.sessions.list_sessions(
+ page_size=min(limit, 100),
+ filter_by=status,
+ )
+ return list(response.items) if response.items else []
+
+
+def get_session(session_id: str) -> SessionView:
+ """Get details of a specific session."""
+ return get_sdk_client().sessions.get_session(session_id)
+
+
+def stop_session(session_id: str) -> SessionView:
+ """Stop a cloud session."""
+ return get_sdk_client().sessions.update_session(session_id, action='stop')
+
+
+def delete_session(session_id: str) -> None:
+ """Delete a cloud session and all its tasks."""
+ get_sdk_client().sessions.delete_session(session_id)
+
+
+def create_public_share(session_id: str) -> ShareView:
+ """Create a public share URL for a session."""
+ return get_sdk_client().sessions.create_session_public_share(session_id)
+
+
+def delete_public_share(session_id: str) -> None:
+ """Delete the public share for a session."""
+ get_sdk_client().sessions.delete_session_public_share(session_id)
+
+
+def stop_sessions_parallel(session_ids: list[str]) -> tuple[list[str], list[dict[str, Any]]]:
+ """Stop multiple cloud sessions in parallel."""
+ client = get_sdk_client()
+ stopped: list[str] = []
+ errors: list[dict[str, Any]] = []
+
+ def stop_one(sid: str) -> tuple[str, str | None]:
+ try:
+ client.sessions.update_session(sid, action='stop')
+ return (sid, None)
+ except Exception as e:
+ return (sid, str(e))
+
+ with ThreadPoolExecutor(max_workers=10) as executor:
+ futures = {executor.submit(stop_one, sid): sid for sid in session_ids}
+ for future in as_completed(futures):
+ sid, error = future.result()
+ if error:
+ errors.append({'id': sid, 'error': error})
+ else:
+ stopped.append(sid)
+
+ return stopped, errors
+
+
+# ============ CLI Handlers ============
def handle_session_command(args: argparse.Namespace) -> int:
@@ -24,6 +127,7 @@ def handle_session_command(args: argparse.Namespace) -> int:
Returns:
Exit code (0 for success, 1 for error)
"""
+ from browser_use.skill_cli.api_key import APIKeyRequired, require_api_key
from browser_use.skill_cli.install_config import is_mode_available
# Check if remote mode is available
@@ -59,32 +163,7 @@ def handle_session_command(args: argparse.Namespace) -> int:
return 1
-def _format_duration(started_at: datetime | None, finished_at: datetime | None) -> str:
- """Format duration between two timestamps, or elapsed time if still running."""
- if not started_at:
- return ''
-
- try:
- if finished_at:
- end = finished_at
- else:
- end = datetime.now(timezone.utc)
-
- delta = end - started_at
- total_seconds = int(delta.total_seconds())
-
- if total_seconds < 60:
- return f'{total_seconds}s'
- elif total_seconds < 3600:
- minutes = total_seconds // 60
- seconds = total_seconds % 60
- return f'{minutes}m {seconds}s'
- else:
- hours = total_seconds // 3600
- minutes = (total_seconds % 3600) // 60
- return f'{hours}h {minutes}m'
- except Exception:
- return ''
+# ============ CLI Helper Functions ============
def _session_to_dict(session: Any) -> dict[str, Any]:
@@ -106,7 +185,7 @@ def _handle_list(args: argparse.Namespace) -> int:
"""Handle 'session list' command."""
try:
status_filter = getattr(args, 'status', None)
- sessions = cloud_task.list_sessions(limit=args.limit, status=status_filter)
+ sessions = list_sessions(limit=args.limit, status=status_filter)
except Exception as e:
print(f'Error: {e}', file=sys.stderr)
return 1
@@ -140,7 +219,7 @@ def _handle_list(args: argparse.Namespace) -> int:
short_id = session_id[:8] + '...' if len(session_id) > 8 else session_id
# Build line with duration
- duration = _format_duration(started_at, finished_at)
+ duration = format_duration(started_at, finished_at)
line = f' {status_emoji} {short_id} [{status}]'
if duration:
line += f' {duration}'
@@ -156,7 +235,7 @@ def _handle_list(args: argparse.Namespace) -> int:
def _handle_get(args: argparse.Namespace) -> int:
"""Handle 'session get <session_id>' command."""
try:
- session = cloud_task.get_session(args.session_id)
+ session = get_session(args.session_id)
except Exception as e:
print(f'Error: {e}', file=sys.stderr)
return 1
@@ -180,7 +259,7 @@ def _handle_get(args: argparse.Namespace) -> int:
}.get(status, '❓')
# Build header with duration
- duration = _format_duration(started_at, finished_at)
+ duration = format_duration(started_at, finished_at)
header_parts = [f'{status_emoji} {session_id[:8]}... [{status}]']
if duration:
header_parts.append(duration)
@@ -210,7 +289,7 @@ def _handle_stop(args: argparse.Namespace) -> int:
return _handle_stop_all(args)
try:
- cloud_task.stop_session(args.session_id)
+ stop_session(args.session_id)
except Exception as e:
print(f'Error: {e}', file=sys.stderr)
return 1
@@ -227,7 +306,7 @@ def _handle_stop_all(args: argparse.Namespace) -> int:
"""Handle 'session stop --all' command."""
try:
# Get all active sessions
- sessions = cloud_task.list_sessions(limit=100, status='active')
+ sessions = list_sessions(limit=100, status='active')
except Exception as e:
print(f'Error listing sessions: {e}', file=sys.stderr)
return 1
@@ -244,7 +323,7 @@ def _handle_stop_all(args: argparse.Namespace) -> int:
return 0
# Stop all sessions in parallel
- stopped, errors = cloud_task.stop_sessions_parallel(session_ids)
+ stopped, errors = stop_sessions_parallel(session_ids)
if getattr(args, 'json', False):
print(json.dumps({'stopped': stopped, 'errors': errors}))
@@ -276,7 +355,7 @@ def _handle_create(args: argparse.Namespace) -> int:
return 1
try:
- session = cloud_task.create_session(
+ session = create_session(
profile_id=getattr(args, 'profile', None),
proxy_country=getattr(args, 'proxy_country', None),
keep_alive=getattr(args, 'keep_alive', None),
@@ -306,7 +385,7 @@ def _handle_share(args: argparse.Namespace) -> int:
# Delete share if requested
if getattr(args, 'delete', False):
try:
- cloud_task.delete_public_share(session_id)
+ delete_public_share(session_id)
except Exception as e:
print(f'Error: {e}', file=sys.stderr)
return 1
@@ -319,7 +398,7 @@ def _handle_share(args: argparse.Namespace) -> int:
# Create share
try:
- share = cloud_task.create_public_share(session_id)
+ share = create_public_share(session_id)
except Exception as e:
print(f'Error: {e}', file=sys.stderr)
return 1
diff --git a/browser_use/skill_cli/commands/cloud_task.py b/browser_use/skill_cli/commands/cloud_task.py
index 586fae1e9..8523984a3 100644
--- a/browser_use/skill_cli/commands/cloud_task.py
+++ b/browser_use/skill_cli/commands/cloud_task.py
@@ -1,22 +1,22 @@
-"""Cloud Task/Session API via browser-use-sdk.
+"""Cloud task SDK wrappers and CLI handlers.
-This module provides functions to interact with the Browser-Use Cloud API
-for creating and managing cloud-based agent tasks and sessions.
+This module provides:
+- SDK wrapper functions for the Browser-Use Cloud Task API
+- CLI command handlers for `browser-use task <command>`
"""
+import argparse
+import json
import logging
-from concurrent.futures import ThreadPoolExecutor, as_completed
+import sys
from typing import Any
-from browser_use_sdk.types.session_item_view import SessionItemView
-from browser_use_sdk.types.session_view import SessionView
-from browser_use_sdk.types.share_view import ShareView
from browser_use_sdk.types.task_created_response import TaskCreatedResponse
from browser_use_sdk.types.task_item_view import TaskItemView
from browser_use_sdk.types.task_log_file_response import TaskLogFileResponse
from browser_use_sdk.types.task_view import TaskView
-from browser_use.skill_cli.sdk import get_sdk_client
+from browser_use.skill_cli.commands.utils import format_duration, get_sdk_client
logger = logging.getLogger(__name__)
@@ -26,99 +26,7 @@ def _filter_none(kwargs: dict[str, Any]) -> dict[str, Any]:
return {k: v for k, v in kwargs.items() if v is not None}
-# ============ Sessions ============
-
-
-def create_session(**kwargs: Any) -> SessionItemView:
- """Create a cloud browser session.
-
- Args:
- profile_id: Cloud profile ID for persistent auth/cookies
- proxy_country: Proxy country code (us, gb, de, etc.)
- keep_alive: Keep session alive after task completes
- persist_memory: Share memory between tasks in session
- start_url: URL to navigate to when session starts
- screen_width: Browser screen width in pixels
- screen_height: Browser screen height in pixels
-
- Returns:
- SessionItemView with session details
- """
- # Map our param names to SDK param names
- param_map = {
- 'proxy_country': 'proxy_country_code',
- 'screen_width': 'browser_screen_width',
- 'screen_height': 'browser_screen_height',
- }
- params = {}
- for k, v in kwargs.items():
- if v is not None:
- params[param_map.get(k, k)] = v
-
- return get_sdk_client().sessions.create_session(**params)
-
-
-def list_sessions(limit: int = 10, status: str | None = None) -> list[SessionItemView]:
- """List cloud browser sessions."""
- client = get_sdk_client()
- response = client.sessions.list_sessions(
- page_size=min(limit, 100),
- filter_by=status,
- )
- return list(response.items) if response.items else []
-
-
-def get_session(session_id: str) -> SessionView:
- """Get details of a specific session."""
- return get_sdk_client().sessions.get_session(session_id)
-
-
-def stop_session(session_id: str) -> SessionView:
- """Stop a cloud session."""
- return get_sdk_client().sessions.update_session(session_id, action='stop')
-
-
-def delete_session(session_id: str) -> None:
- """Delete a cloud session and all its tasks."""
- get_sdk_client().sessions.delete_session(session_id)
-
-
-def create_public_share(session_id: str) -> ShareView:
- """Create a public share URL for a session."""
- return get_sdk_client().sessions.create_session_public_share(session_id)
-
-
-def delete_public_share(session_id: str) -> None:
- """Delete the public share for a session."""
- get_sdk_client().sessions.delete_session_public_share(session_id)
-
-
-def stop_sessions_parallel(session_ids: list[str]) -> tuple[list[str], list[dict[str, Any]]]:
- """Stop multiple cloud sessions in parallel."""
- client = get_sdk_client()
- stopped: list[str] = []
- errors: list[dict[str, Any]] = []
-
- def stop_one(sid: str) -> tuple[str, str | None]:
- try:
- client.sessions.update_session(sid, action='stop')
- return (sid, None)
- except Exception as e:
- return (sid, str(e))
-
- with ThreadPoolExecutor(max_workers=10) as executor:
- futures = {executor.submit(stop_one, sid): sid for sid in session_ids}
- for future in as_completed(futures):
- sid, error = future.result()
- if error:
- errors.append({'id': sid, 'error': error})
- else:
- stopped.append(sid)
-
- return stopped, errors
-
-
-# ============ Tasks ============
+# ============ SDK Wrappers ============
def create_task(task: str, **kwargs: Any) -> TaskCreatedResponse:
@@ -178,9 +86,6 @@ def get_task_logs(task_id: str) -> TaskLogFileResponse:
return get_sdk_client().tasks.get_task_logs(task_id)
-# ============ Polling ============
-
-
async def poll_until_complete(
task_id: str,
stream: bool = False,
@@ -205,3 +110,303 @@ async def poll_until_complete(
return task
await asyncio.sleep(poll_interval)
+
+
+# ============ CLI Handlers ============
+
+
+def handle_task_command(args: argparse.Namespace) -> int:
+ """Handle task subcommands.
+
+ Task commands manage cloud tasks and always require the cloud API.
+
+ Args:
+ args: Parsed command-line arguments
+
+ Returns:
+ Exit code (0 for success, 1 for error)
+ """
+ from browser_use.skill_cli.api_key import APIKeyRequired, require_api_key
+ from browser_use.skill_cli.install_config import is_mode_available
+
+ # Check if remote mode is available
+ if not is_mode_available('remote'):
+ print(
+ 'Error: Task management requires remote mode.\n'
+ 'Remote mode is not installed. Reinstall with --full to enable:\n'
+ ' curl -fsSL https://browser-use.com/cli/install.sh | bash -s -- --full',
+ file=sys.stderr,
+ )
+ return 1
+
+ # Check API key
+ try:
+ require_api_key('Cloud tasks')
+ except APIKeyRequired as e:
+ print(f'Error: {e}', file=sys.stderr)
+ return 1
+
+ if args.task_command == 'list':
+ return _handle_list(args)
+ elif args.task_command == 'status':
+ return _handle_status(args)
+ elif args.task_command == 'stop':
+ return _handle_stop(args)
+ elif args.task_command == 'logs':
+ return _handle_logs(args)
+ else:
+ print('Usage: browser-use task <command>')
+ print('Commands: list, status <task_id>, stop <task_id>, logs <task_id>')
+ return 1
+
+
+# ============ CLI Helper Functions ============
+
+
+def _task_item_to_dict(task: Any) -> dict[str, Any]:
+ """Convert SDK TaskItemView to dict for JSON output."""
+ return {
+ 'id': task.id,
+ 'status': task.status,
+ 'task': task.task,
+ 'sessionId': task.session_id,
+ }
+
+
+def _task_to_dict(task: Any) -> dict[str, Any]:
+ """Convert SDK TaskView to dict for JSON output."""
+ return {
+ 'id': task.id,
+ 'status': task.status,
+ 'task': task.task,
+ 'output': task.output,
+ 'cost': task.cost,
+ 'sessionId': task.session_id,
+ 'startedAt': task.started_at.isoformat() if task.started_at else None,
+ 'finishedAt': task.finished_at.isoformat() if task.finished_at else None,
+ 'steps': [_step_to_dict(s) for s in (task.steps or [])],
+ }
+
+
+def _step_to_dict(step: Any) -> dict[str, Any]:
+ """Convert SDK step to dict for JSON output."""
+ return {
+ 'number': step.number,
+ 'url': step.url,
+ 'memory': step.memory,
+ 'actions': step.actions,
+ }
+
+
+def _handle_list(args: argparse.Namespace) -> int:
+ """Handle 'task list' command."""
+ try:
+ status_filter = getattr(args, 'status', None)
+ session_filter = getattr(args, 'session', None)
+ tasks = list_tasks(
+ limit=args.limit,
+ status=status_filter,
+ session_id=session_filter,
+ )
+ except Exception as e:
+ print(f'Error: {e}', file=sys.stderr)
+ return 1
+
+ if getattr(args, 'json', False):
+ print(json.dumps([_task_item_to_dict(t) for t in tasks]))
+ else:
+ if not tasks:
+ status_msg = f' with status "{status_filter}"' if status_filter else ''
+ session_msg = f' in session "{session_filter}"' if session_filter else ''
+ print(f'No tasks found{status_msg}{session_msg}')
+ else:
+ header = f'Tasks ({len(tasks)})'
+ if status_filter:
+ header = f'{status_filter.capitalize()} tasks ({len(tasks)})'
+ print(f'{header}:')
+ for t in tasks:
+ task_id = t.id or 'unknown'
+ status = t.status or 'unknown'
+ task_desc = t.task or ''
+ # Truncate long task descriptions
+ if len(task_desc) > 50:
+ task_desc = task_desc[:47] + '...'
+
+ # Status emoji
+ status_emoji = {
+ 'started': '🔄',
+ 'running': '🔄',
+ 'finished': '✅',
+ 'stopped': '⏹️',
+ 'failed': '❌',
+ }.get(status, '❓')
+
+ print(f' {status_emoji} {task_id[:8]}... [{status}] {task_desc}')
+
+ return 0
+
+
+def _handle_status(args: argparse.Namespace) -> int:
+ """Handle 'task status <task_id>' command."""
+ try:
+ # Use get_task() for full details including steps
+ task = get_task(args.task_id)
+ except Exception as e:
+ print(f'Error: {e}', file=sys.stderr)
+ return 1
+
+ if getattr(args, 'json', False):
+ print(json.dumps(_task_to_dict(task)))
+ else:
+ task_id = task.id or args.task_id
+ task_status = task.status or 'unknown'
+ output = task.output
+ cost = task.cost
+ steps = task.steps or []
+ started_at = task.started_at
+ finished_at = task.finished_at
+
+ compact = getattr(args, 'compact', False)
+ verbose = getattr(args, 'verbose', False)
+ last_n = getattr(args, 'last', None)
+ reverse = getattr(args, 'reverse', False)
+ specific_step = getattr(args, 'step', None)
+
+ # Determine display mode:
+ # - Default: show only latest step
+ # - --compact: show all steps with reasoning
+ # - --verbose: show all steps with full details
+ show_all_steps = compact or verbose
+
+ # Status emoji
+ status_emoji = {
+ 'started': '🔄',
+ 'running': '🔄',
+ 'finished': '✅',
+ 'stopped': '⏹️',
+ 'failed': '❌',
+ }.get(task_status, '❓')
+
+ # Build header line: status, cost, duration
+ parts = [f'{status_emoji} {task_id[:8]}... [{task_status}]']
+ if cost is not None:
+ parts.append(f'${cost}')
+ duration = format_duration(started_at, finished_at)
+ if duration:
+ parts.append(duration)
+ print(' '.join(parts))
+
+ # Show steps
+ if steps:
+ total_steps = len(steps)
+
+ # Filter to specific step if requested
+ if specific_step is not None:
+ steps = [s for s in steps if s.number == specific_step]
+ if not steps:
+ print(f' Step {specific_step} not found (task has {total_steps} steps)')
+ else:
+ print(f' (showing step {specific_step} of {total_steps})')
+ # Display the specific step
+ for step in steps:
+ _print_step(step, verbose)
+ elif not show_all_steps:
+ # Default mode: show only the latest step
+ latest_step = steps[-1]
+ earlier_count = total_steps - 1
+ if earlier_count > 0:
+ print(f' ... {earlier_count} earlier steps')
+ _print_step(latest_step, verbose=False)
+ else:
+ # --compact or --verbose: show all steps (with optional filters)
+ skipped_earlier = 0
+ if last_n is not None and last_n < total_steps:
+ skipped_earlier = total_steps - last_n
+ steps = steps[-last_n:]
+
+ # Apply --reverse
+ if reverse:
+ steps = list(reversed(steps))
+
+ # Show count info
+ if skipped_earlier > 0:
+ print(f' ... {skipped_earlier} earlier steps')
+
+ # Display steps
+ for step in steps:
+ _print_step(step, verbose)
+
+ if output:
+ print(f'\nOutput: {output}')
+
+ return 0
+
+
+def _print_step(step: Any, verbose: bool) -> None:
+ """Print a single step in compact or verbose format."""
+ step_num = step.number if step.number is not None else '?'
+ memory = step.memory or ''
+
+ if verbose:
+ url = step.url or ''
+ actions = step.actions or []
+
+ # Truncate URL for display
+ short_url = url[:60] + '...' if len(url) > 60 else url
+
+ print(f' [{step_num}] {short_url}')
+ if memory:
+ # Truncate memory/reasoning for display
+ short_memory = memory[:100] + '...' if len(memory) > 100 else memory
+ print(f' Reasoning: {short_memory}')
+ if actions:
+ for action in actions[:2]: # Show max 2 actions per step
+ # Truncate action for display
+ short_action = action[:70] + '...' if len(action) > 70 else action
+ print(f' Action: {short_action}')
+ if len(actions) > 2:
+ print(f' ... and {len(actions) - 2} more actions')
+ else:
+ # Compact mode: just step number and reasoning
+ if memory:
+ # Truncate reasoning for compact display
+ short_memory = memory[:80] + '...' if len(memory) > 80 else memory
+ print(f' {step_num}. {short_memory}')
+ else:
+ print(f' {step_num}. (no reasoning)')
+
+
+def _handle_stop(args: argparse.Namespace) -> int:
+ """Handle 'task stop <task_id>' command."""
+ try:
+ stop_task(args.task_id)
+ except Exception as e:
+ print(f'Error: {e}', file=sys.stderr)
+ return 1
+
+ if getattr(args, 'json', False):
+ print(json.dumps({'stopped': args.task_id}))
+ else:
+ print(f'Stopped task: {args.task_id}')
+
+ return 0
+
+
+def _handle_logs(args: argparse.Namespace) -> int:
+ """Handle 'task logs <task_id>' command."""
+ try:
+ result = get_task_logs(args.task_id)
+ except Exception as e:
+ print(f'Error: {e}', file=sys.stderr)
+ return 1
+
+ if getattr(args, 'json', False):
+ print(json.dumps({'downloadUrl': result.download_url}))
+ else:
+ download_url = result.download_url
+ if download_url:
+ print(f'Download logs: {download_url}')
+ else:
+ print('No logs available for this task')
+
+ return 0
diff --git a/browser_use/skill_cli/commands/profile.py b/browser_use/skill_cli/commands/profile.py
index 310f73a54..5b076fabc 100644
--- a/browser_use/skill_cli/commands/profile.py
+++ b/browser_use/skill_cli/commands/profile.py
@@ -12,7 +12,7 @@ import tempfile
from pathlib import Path
from typing import Any, Literal
-from browser_use.skill_cli.sdk import get_sdk_client
+from browser_use.skill_cli.commands.utils import get_sdk_client
logger = logging.getLogger(__name__)
diff --git a/browser_use/skill_cli/commands/task_management.py b/browser_use/skill_cli/commands/task_management.py
deleted file mode 100644
index b059b9079..000000000
--- a/browser_use/skill_cli/commands/task_management.py
+++ /dev/null
@@ -1,334 +0,0 @@
-"""Task management command handlers for browser-use CLI.
-
-Handles: task list, task status, task stop, task logs
-"""
-
-import argparse
-import json
-import sys
-from datetime import datetime, timezone
-from typing import Any
-
-from browser_use.skill_cli.api_key import APIKeyRequired, require_api_key
-from browser_use.skill_cli.commands import cloud_task
-
-
-def handle_task_command(args: argparse.Namespace) -> int:
- """Handle task subcommands.
-
- Task commands manage cloud tasks and always require the cloud API.
-
- Args:
- args: Parsed command-line arguments
-
- Returns:
- Exit code (0 for success, 1 for error)
- """
- from browser_use.skill_cli.install_config import is_mode_available
-
- # Check if remote mode is available
- if not is_mode_available('remote'):
- print(
- 'Error: Task management requires remote mode.\n'
- 'Remote mode is not installed. Reinstall with --full to enable:\n'
- ' curl -fsSL https://browser-use.com/cli/install.sh | bash -s -- --full',
- file=sys.stderr,
- )
- return 1
-
- # Check API key
- try:
- require_api_key('Cloud tasks')
- except APIKeyRequired as e:
- print(f'Error: {e}', file=sys.stderr)
- return 1
-
- if args.task_command == 'list':
- return _handle_list(args)
- elif args.task_command == 'status':
- return _handle_status(args)
- elif args.task_command == 'stop':
- return _handle_stop(args)
- elif args.task_command == 'logs':
- return _handle_logs(args)
- else:
- print('Usage: browser-use task <command>')
- print('Commands: list, status <task_id>, stop <task_id>, logs <task_id>')
- return 1
-
-
-def _format_duration(started_at: datetime | None, finished_at: datetime | None) -> str:
- """Format duration between two timestamps, or elapsed time if still running."""
- if not started_at:
- return ''
-
- try:
- if finished_at:
- end = finished_at
- else:
- end = datetime.now(timezone.utc)
-
- delta = end - started_at
- total_seconds = int(delta.total_seconds())
-
- if total_seconds < 60:
- return f'{total_seconds}s'
- elif total_seconds < 3600:
- minutes = total_seconds // 60
- seconds = total_seconds % 60
- return f'{minutes}m {seconds}s'
- else:
- hours = total_seconds // 3600
- minutes = (total_seconds % 3600) // 60
- return f'{hours}h {minutes}m'
- except Exception:
- return ''
-
-
-def _task_item_to_dict(task: Any) -> dict[str, Any]:
- """Convert SDK TaskItemView to dict for JSON output."""
- return {
- 'id': task.id,
- 'status': task.status,
- 'task': task.task,
- 'sessionId': task.session_id,
- }
-
-
-def _task_to_dict(task: Any) -> dict[str, Any]:
- """Convert SDK TaskView to dict for JSON output."""
- return {
- 'id': task.id,
- 'status': task.status,
- 'task': task.task,
- 'output': task.output,
- 'cost': task.cost,
- 'sessionId': task.session_id,
- 'startedAt': task.started_at.isoformat() if task.started_at else None,
- 'finishedAt': task.finished_at.isoformat() if task.finished_at else None,
- 'steps': [_step_to_dict(s) for s in (task.steps or [])],
- }
-
-
-def _step_to_dict(step: Any) -> dict[str, Any]:
- """Convert SDK step to dict for JSON output."""
- return {
- 'number': step.number,
- 'url': step.url,
- 'memory': step.memory,
- 'actions': step.actions,
- }
-
-
-def _handle_list(args: argparse.Namespace) -> int:
- """Handle 'task list' command."""
- try:
- status_filter = getattr(args, 'status', None)
- session_filter = getattr(args, 'session', None)
- tasks = cloud_task.list_tasks(
- limit=args.limit,
- status=status_filter,
- session_id=session_filter,
- )
- except Exception as e:
- print(f'Error: {e}', file=sys.stderr)
- return 1
-
- if getattr(args, 'json', False):
- print(json.dumps([_task_item_to_dict(t) for t in tasks]))
- else:
- if not tasks:
- status_msg = f' with status "{status_filter}"' if status_filter else ''
- session_msg = f' in session "{session_filter}"' if session_filter else ''
- print(f'No tasks found{status_msg}{session_msg}')
- else:
- header = f'Tasks ({len(tasks)})'
- if status_filter:
- header = f'{status_filter.capitalize()} tasks ({len(tasks)})'
- print(f'{header}:')
- for t in tasks:
- task_id = t.id or 'unknown'
- status = t.status or 'unknown'
- task_desc = t.task or ''
- # Truncate long task descriptions
- if len(task_desc) > 50:
- task_desc = task_desc[:47] + '...'
-
- # Status emoji
- status_emoji = {
- 'started': '🔄',
- 'running': '🔄',
- 'finished': '✅',
- 'stopped': '⏹️',
- 'failed': '❌',
- }.get(status, '❓')
-
- print(f' {status_emoji} {task_id[:8]}... [{status}] {task_desc}')
-
- return 0
-
-
-def _handle_status(args: argparse.Namespace) -> int:
- """Handle 'task status <task_id>' command."""
- try:
- # Use get_task() for full details including steps
- task = cloud_task.get_task(args.task_id)
- except Exception as e:
- print(f'Error: {e}', file=sys.stderr)
- return 1
-
- if getattr(args, 'json', False):
- print(json.dumps(_task_to_dict(task)))
- else:
- task_id = task.id or args.task_id
- task_status = task.status or 'unknown'
- output = task.output
- cost = task.cost
- steps = task.steps or []
- started_at = task.started_at
- finished_at = task.finished_at
-
- compact = getattr(args, 'compact', False)
- verbose = getattr(args, 'verbose', False)
- last_n = getattr(args, 'last', None)
- reverse = getattr(args, 'reverse', False)
- specific_step = getattr(args, 'step', None)
-
- # Determine display mode:
- # - Default: show only latest step
- # - --compact: show all steps with reasoning
- # - --verbose: show all steps with full details
- show_all_steps = compact or verbose
-
- # Status emoji
- status_emoji = {
- 'started': '🔄',
- 'running': '🔄',
- 'finished': '✅',
- 'stopped': '⏹️',
- 'failed': '❌',
- }.get(task_status, '❓')
-
- # Build header line: status, cost, duration
- parts = [f'{status_emoji} {task_id[:8]}... [{task_status}]']
- if cost is not None:
- parts.append(f'${cost}')
- duration = _format_duration(started_at, finished_at)
- if duration:
- parts.append(duration)
- print(' '.join(parts))
-
- # Show steps
- if steps:
- total_steps = len(steps)
-
- # Filter to specific step if requested
- if specific_step is not None:
- steps = [s for s in steps if s.number == specific_step]
- if not steps:
- print(f' Step {specific_step} not found (task has {total_steps} steps)')
- else:
- print(f' (showing step {specific_step} of {total_steps})')
- # Display the specific step
- for step in steps:
- _print_step(step, verbose)
- elif not show_all_steps:
- # Default mode: show only the latest step
- latest_step = steps[-1]
- earlier_count = total_steps - 1
- if earlier_count > 0:
- print(f' ... {earlier_count} earlier steps')
- _print_step(latest_step, verbose=False)
- else:
- # --compact or --verbose: show all steps (with optional filters)
- skipped_earlier = 0
- if last_n is not None and last_n < total_steps:
- skipped_earlier = total_steps - last_n
- steps = steps[-last_n:]
-
- # Apply --reverse
- if reverse:
- steps = list(reversed(steps))
-
- # Show count info
- if skipped_earlier > 0:
- print(f' ... {skipped_earlier} earlier steps')
-
- # Display steps
- for step in steps:
- _print_step(step, verbose)
-
- if output:
- print(f'\nOutput: {output}')
-
- return 0
-
-
-def _print_step(step: Any, verbose: bool) -> None:
- """Print a single step in compact or verbose format."""
- step_num = step.number if step.number is not None else '?'
- memory = step.memory or ''
-
- if verbose:
- url = step.url or ''
- actions = step.actions or []
-
- # Truncate URL for display
- short_url = url[:60] + '...' if len(url) > 60 else url
-
- print(f' [{step_num}] {short_url}')
- if memory:
- # Truncate memory/reasoning for display
- short_memory = memory[:100] + '...' if len(memory) > 100 else memory
- print(f' Reasoning: {short_memory}')
- if actions:
- for action in actions[:2]: # Show max 2 actions per step
- # Truncate action for display
- short_action = action[:70] + '...' if len(action) > 70 else action
- print(f' Action: {short_action}')
- if len(actions) > 2:
- print(f' ... and {len(actions) - 2} more actions')
- else:
- # Compact mode: just step number and reasoning
- if memory:
- # Truncate reasoning for compact display
- short_memory = memory[:80] + '...' if len(memory) > 80 else memory
- print(f' {step_num}. {short_memory}')
- else:
- print(f' {step_num}. (no reasoning)')
-
-
-def _handle_stop(args: argparse.Namespace) -> int:
- """Handle 'task stop <task_id>' command."""
- try:
- cloud_task.stop_task(args.task_id)
- except Exception as e:
- print(f'Error: {e}', file=sys.stderr)
- return 1
-
- if getattr(args, 'json', False):
- print(json.dumps({'stopped': args.task_id}))
- else:
- print(f'Stopped task: {args.task_id}')
-
- return 0
-
-
-def _handle_logs(args: argparse.Namespace) -> int:
- """Handle 'task logs <task_id>' command."""
- try:
- result = cloud_task.get_task_logs(args.task_id)
- except Exception as e:
- print(f'Error: {e}', file=sys.stderr)
- return 1
-
- if getattr(args, 'json', False):
- print(json.dumps({'downloadUrl': result.download_url}))
- else:
- download_url = result.download_url
- if download_url:
- print(f'Download logs: {download_url}')
- else:
- print('No logs available for this task')
-
- return 0
diff --git a/browser_use/skill_cli/commands/utils.py b/browser_use/skill_cli/commands/utils.py
new file mode 100644
index 000000000..88e61cb67
--- /dev/null
+++ b/browser_use/skill_cli/commands/utils.py
@@ -0,0 +1,46 @@
+"""Shared utilities for CLI command handlers."""
+
+from datetime import datetime, timezone
+
+from browser_use_sdk import BrowserUse
+
+_client: BrowserUse | None = None
+
+
+def get_sdk_client() -> BrowserUse:
+ """Get authenticated SDK client (singleton)."""
+ global _client
+ if _client is None:
+ from browser_use.skill_cli.api_key import require_api_key
+
+ api_key = require_api_key('Cloud API')
+ _client = BrowserUse(api_key=api_key)
+ return _client
+
+
+def format_duration(started_at: datetime | None, finished_at: datetime | None) -> str:
+ """Format duration between two timestamps, or elapsed time if still running."""
+ if not started_at:
+ return ''
+
+ try:
+ if finished_at:
+ end = finished_at
+ else:
+ end = datetime.now(timezone.utc)
+
+ delta = end - started_at
+ total_seconds = int(delta.total_seconds())
+
+ if total_seconds < 60:
+ return f'{total_seconds}s'
+ elif total_seconds < 3600:
+ minutes = total_seconds // 60
+ seconds = total_seconds % 60
+ return f'{minutes}m {seconds}s'
+ else:
+ hours = total_seconds // 3600
+ minutes = (total_seconds % 3600) // 60
+ return f'{hours}h {minutes}m'
+ except Exception:
+ return ''
diff --git a/browser_use/skill_cli/main.py b/browser_use/skill_cli/main.py
index 888850899..f58440bdc 100755
--- a/browser_use/skill_cli/main.py
+++ b/browser_use/skill_cli/main.py
@@ -869,7 +869,7 @@ def _handle_remote_run_with_wait(args: argparse.Namespace) -> int:
"""Handle remote run with --wait directly (prints task info immediately, then waits)."""
import asyncio
- from browser_use.skill_cli.commands import cloud_task
+ from browser_use.skill_cli.commands import cloud_session, cloud_task
if not args.task:
print('Error: No task provided', file=sys.stderr)
@@ -894,7 +894,7 @@ def _handle_remote_run_with_wait(args: argparse.Namespace) -> int:
# Create session first if profile or proxy specified and no session_id
if (profile_id or proxy_country) and not session_id:
- session = cloud_task.create_session(
+ session = cloud_session.create_session(
profile_id=profile_id,
proxy_country=proxy_country,
keep_alive=getattr(args, 'keep_alive', None),
@@ -1082,13 +1082,13 @@ def main() -> int:
# Handle task command - cloud task management
if args.command == 'task':
- from browser_use.skill_cli.commands.task_management import handle_task_command
+ from browser_use.skill_cli.commands.cloud_task import handle_task_command
return handle_task_command(args)
# Handle session command - cloud session management
if args.command == 'session':
- from browser_use.skill_cli.commands.session_management import handle_session_command
+ from browser_use.skill_cli.commands.cloud_session import handle_session_command
return handle_session_command(args)
diff --git a/browser_use/skill_cli/sdk.py b/browser_use/skill_cli/sdk.py
deleted file mode 100644
index a915c0167..000000000
--- a/browser_use/skill_cli/sdk.py
+++ /dev/null
@@ -1,16 +0,0 @@
-"""Browser-Use SDK client factory."""
-
-from browser_use_sdk import BrowserUse
-
-_client: BrowserUse | None = None
-
-
-def get_sdk_client() -> BrowserUse:
- """Get authenticated SDK client (singleton)."""
- global _client
- if _client is None:
- from browser_use.skill_cli.api_key import require_api_key
-
- api_key = require_api_key('Cloud API')
- _client = BrowserUse(api_key=api_key)
- return _client