feat(cli): mobilerun cli 0.8

Dockerfile

@@ -22,4 +22,4 @@ RUN uv sync --locked --no-dev --no-editable --extra anthropic --no-cache
 
 ENTRYPOINT [".venv/bin/mobilerun"]
 
-CMD ["setup"]
+CMD ["device", "setup"]

compat/pyproject.toml

@@ -1,16 +1,16 @@
 [project]
 name = "droidrun"
-version = "0.7.4"
+version = "0.8.0"
 description = "Compatibility shim — droidrun has been renamed to mobilerun"
 requires-python = ">=3.11,<3.14"
-dependencies = ["mobilerun==0.7.4"]
+dependencies = ["mobilerun==0.8.0"]
 
 [project.optional-dependencies]
-anthropic = ["mobilerun[anthropic]==0.7.4"]
-deepseek = ["mobilerun[deepseek]==0.7.4"]
-langfuse = ["mobilerun[langfuse]==0.7.4"]
-typesafe = ["mobilerun[typesafe]==0.7.4"]
-dev = ["mobilerun[dev]==0.7.4"]
+anthropic = ["mobilerun[anthropic]==0.8.0"]
+deepseek = ["mobilerun[deepseek]==0.8.0"]
+langfuse = ["mobilerun[langfuse]==0.8.0"]
+typesafe = ["mobilerun[typesafe]==0.8.0"]
+dev = ["mobilerun[dev]==0.8.0"]
 
 [project.scripts]
 droidrun = "droidrun.cli_shim:main"

mobilerun/__init__.py

@@ -3,26 +3,24 @@
 """
 
 import logging
+from importlib import import_module
 from importlib.metadata import version
+from typing import TYPE_CHECKING
+
+from mobilerun.agent.utils.errors import HtmlErrorPageFilter
+from mobilerun.log_handlers import CLILogHandler
 
 __version__ = version("mobilerun")
 
 # Attach a default CLILogHandler so that every consumer (CLI, SDK,
 # tools-only) gets visible output without explicit setup.  CLI flows can
 # replace this with their own handler via ``configure_logging()``.
-from mobilerun.log_handlers import CLILogHandler
 
 _logger = logging.getLogger("mobilerun")
 _logger.addHandler(CLILogHandler())
 _logger.setLevel(logging.INFO)
 _logger.propagate = False
 
-# Import main classes for easier access
-from mobilerun.agent import ResultEvent  # noqa: E402
-from mobilerun.agent.droid import MobileAgent, MobileAgentState  # noqa: E402
-from mobilerun.agent.utils.decision_loader import load_decision_model  # noqa: E402
-from mobilerun.agent.utils.errors import HtmlErrorPageFilter  # noqa: E402
-from mobilerun.agent.utils.llm_picker import load_llm  # noqa: E402
 
 # llama-index's retry warnings include provider error bodies verbatim.
 for _retry_logger in (
@@ -31,35 +29,64 @@
 ):
     logging.getLogger(_retry_logger).addFilter(HtmlErrorPageFilter())
 
-# Import configuration classes
-from mobilerun.config_manager import (  # noqa: E402
-    # Agent configs
-    AgentConfig,
-    AppCardConfig,
-    CredentialsConfig,
-    DecisionConfig,
-    DecisionProfile,
-    DelegationConfig,
-    # Feature configs
-    DeviceConfig,
-    ExecutorConfig,
-    FastAgentConfig,
-    LLMProfile,
-    LoggingConfig,
-    ManagerConfig,
-    MobileConfig,
-    TelemetryConfig,
-    ToolsConfig,
-    TracingConfig,
-)
-
-# Import macro functionality
-from mobilerun.macro import (  # noqa: E402
-    MacroPlayer,
-    replay_macro_file,
-    replay_macro_folder,
-)
-from mobilerun.tools import AndroidDriver, DeviceDriver, RecordingDriver  # noqa: E402
+if TYPE_CHECKING:
+    from mobilerun.agent import ResultEvent
+    from mobilerun.agent.droid import MobileAgent, MobileAgentState
+    from mobilerun.agent.utils.decision_loader import load_decision_model
+    from mobilerun.agent.utils.llm_picker import load_llm
+    from mobilerun.config_manager import (
+        AgentConfig,
+        AppCardConfig,
+        CredentialsConfig,
+        DecisionConfig,
+        DecisionProfile,
+        DelegationConfig,
+        DeviceConfig,
+        ExecutorConfig,
+        FastAgentConfig,
+        LLMProfile,
+        LoggingConfig,
+        ManagerConfig,
+        MobileConfig,
+        TelemetryConfig,
+        ToolsConfig,
+        TracingConfig,
+    )
+    from mobilerun.macro import MacroPlayer, replay_macro_file, replay_macro_folder
+    from mobilerun.tools import AndroidDriver, DeviceDriver, RecordingDriver
+
+_EXPORTS = {
+    "ResultEvent": ("mobilerun.agent", "ResultEvent"),
+    "MobileAgent": ("mobilerun.agent.droid", "MobileAgent"),
+    "MobileAgentState": ("mobilerun.agent.droid", "MobileAgentState"),
+    "load_decision_model": (
+        "mobilerun.agent.utils.decision_loader",
+        "load_decision_model",
+    ),
+    "load_llm": ("mobilerun.agent.utils.llm_picker", "load_llm"),
+    "AgentConfig": ("mobilerun.config_manager", "AgentConfig"),
+    "AppCardConfig": ("mobilerun.config_manager", "AppCardConfig"),
+    "CredentialsConfig": ("mobilerun.config_manager", "CredentialsConfig"),
+    "DecisionConfig": ("mobilerun.config_manager", "DecisionConfig"),
+    "DecisionProfile": ("mobilerun.config_manager", "DecisionProfile"),
+    "DelegationConfig": ("mobilerun.config_manager", "DelegationConfig"),
+    "DeviceConfig": ("mobilerun.config_manager", "DeviceConfig"),
+    "ExecutorConfig": ("mobilerun.config_manager", "ExecutorConfig"),
+    "FastAgentConfig": ("mobilerun.config_manager", "FastAgentConfig"),
+    "LLMProfile": ("mobilerun.config_manager", "LLMProfile"),
+    "LoggingConfig": ("mobilerun.config_manager", "LoggingConfig"),
+    "ManagerConfig": ("mobilerun.config_manager", "ManagerConfig"),
+    "MobileConfig": ("mobilerun.config_manager", "MobileConfig"),
+    "TelemetryConfig": ("mobilerun.config_manager", "TelemetryConfig"),
+    "ToolsConfig": ("mobilerun.config_manager", "ToolsConfig"),
+    "TracingConfig": ("mobilerun.config_manager", "TracingConfig"),
+    "MacroPlayer": ("mobilerun.macro", "MacroPlayer"),
+    "replay_macro_file": ("mobilerun.macro", "replay_macro_file"),
+    "replay_macro_folder": ("mobilerun.macro", "replay_macro_folder"),
+    "AndroidDriver": ("mobilerun.tools", "AndroidDriver"),
+    "DeviceDriver": ("mobilerun.tools", "DeviceDriver"),
+    "RecordingDriver": ("mobilerun.tools", "RecordingDriver"),
+}
 
 # Make main components available at package level
 __all__ = [
@@ -115,5 +142,16 @@ def __getattr__(name):
             DeprecationWarning,
             stacklevel=2,
         )
-        return globals()[new_name]
+        return getattr(import_module(__name__), new_name)
+    if name in _EXPORTS:
+        module, attribute = _EXPORTS[name]
+        value = getattr(import_module(module), attribute)
+        globals()[name] = value
+        return value
+    if name in {"agent", "tools", "macro", "config_manager"}:
+        return import_module(f"{__name__}.{name}")
     raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
+
+
+def __dir__():
+    return sorted(set(globals()) | set(__all__))

mobilerun/agent/__init__.py

@@ -1,3 +1,26 @@
-from mobilerun.agent.droid.events import ResultEvent
+from importlib import import_module
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from mobilerun.agent.droid.events import ResultEvent
+
+_EXPORTS = {
+    "ResultEvent": ("mobilerun.agent.droid.events", "ResultEvent"),
+}
 
 __all__ = ["ResultEvent"]
+
+
+def __getattr__(name):
+    if name in _EXPORTS:
+        module, attribute = _EXPORTS[name]
+        value = getattr(import_module(module), attribute)
+        globals()[name] = value
+        return value
+    if name in {"droid", "utils"}:
+        return import_module(f"{__name__}.{name}")
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
+
+
+def __dir__():
+    return sorted(set(globals()) | set(__all__))

mobilerun/agent/droid/__init__.py

@@ -1,30 +1,41 @@
-"""
-Mobilerun Agent Module.
+"""Mobilerun Agent Module.
 
 This module provides a ReAct agent for automating Android devices using reasoning and acting.
 """
 
-from mobilerun.agent.droid.droid_agent import MobileAgent
-from mobilerun.agent.droid.state import MobileAgentState
+from importlib import import_module
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from mobilerun.agent.droid.droid_agent import MobileAgent
+    from mobilerun.agent.droid.state import MobileAgentState
 
-# Legacy aliases for backward compatibility
-_LEGACY_ALIASES = {
-    "DroidAgent": MobileAgent,
-    "DroidAgentState": MobileAgentState,
+_EXPORTS = {
+    "MobileAgent": ("mobilerun.agent.droid.droid_agent", "MobileAgent"),
+    "MobileAgentState": ("mobilerun.agent.droid.state", "MobileAgentState"),
 }
 
+__all__ = ["MobileAgent", "MobileAgentState", "DroidAgent", "DroidAgentState"]
+
 
 def __getattr__(name):
-    if name in _LEGACY_ALIASES:
+    aliases = {"DroidAgent": "MobileAgent", "DroidAgentState": "MobileAgentState"}
+    if name in aliases:
         import warnings
 
         warnings.warn(
             f"{name} has been renamed. Update your imports.",
             DeprecationWarning,
             stacklevel=2,
         )
-        return _LEGACY_ALIASES[name]
+        return getattr(import_module(__name__), aliases[name])
+    if name in _EXPORTS:
+        module, attribute = _EXPORTS[name]
+        value = getattr(import_module(module), attribute)
+        globals()[name] = value
+        return value
     raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
 
 
-__all__ = ["MobileAgent", "MobileAgentState", "DroidAgent", "DroidAgentState"]
+def __dir__():
+    return sorted(set(globals()) | set(__all__))

mobilerun/agent/droid/droid_agent.py

@@ -483,9 +483,7 @@ def __init__(
             )
 
         self._stream_screenshots = (
-            os.environ.get("MOBILERUN_STREAM_SCREENSHOTS")
-            or os.environ.get("DROIDRUN_STREAM_SCREENSHOTS")
-            or ""
+            os.environ.get("MOBILERUN_STREAM_SCREENSHOTS") or ""
         ).lower() in ("1", "true")
 
         self.timeout = timeout

mobilerun/agent/fast_agent/fast_agent.py

@@ -187,9 +187,7 @@ def __init__(
         self.state_provider = state_provider
         self.save_trajectory = save_trajectory
         self._stream_screenshots = (
-            os.environ.get("MOBILERUN_STREAM_SCREENSHOTS")
-            or os.environ.get("DROIDRUN_STREAM_SCREENSHOTS")
-            or ""
+            os.environ.get("MOBILERUN_STREAM_SCREENSHOTS") or ""
         ).lower() in ("1", "true")
         self.shared_state = shared_state
         self.output_model = output_model

mobilerun/agent/manager/manager_agent.py

@@ -107,9 +107,7 @@ def __init__(
         self.state_provider = state_provider
         self.save_trajectory = save_trajectory
         self._stream_screenshots = (
-            os.environ.get("MOBILERUN_STREAM_SCREENSHOTS")
-            or os.environ.get("DROIDRUN_STREAM_SCREENSHOTS")
-            or ""
+            os.environ.get("MOBILERUN_STREAM_SCREENSHOTS") or ""
         ).lower() in ("1", "true")
         self.shared_state = shared_state
         self.registry = registry

mobilerun/agent/utils/__init__.py

@@ -1,16 +1,31 @@
-"""
-Utility modules for Mobilerun agents.
-"""
-
-from .chat_utils import (
-    filter_empty_messages,
-    has_content,
-    limit_history,
-    to_chat_messages,
-)
-from .prompt_resolver import PromptResolver
-from .signatures import build_tool_registry
-from .trajectory import Trajectory
+"""Utility modules for Mobilerun agents."""
+
+from importlib import import_module
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from mobilerun.agent.utils.chat_utils import (
+        filter_empty_messages,
+        has_content,
+        limit_history,
+        to_chat_messages,
+    )
+    from mobilerun.agent.utils.prompt_resolver import PromptResolver
+    from mobilerun.agent.utils.signatures import build_tool_registry
+    from mobilerun.agent.utils.trajectory import Trajectory
+
+_EXPORTS = {
+    "filter_empty_messages": (
+        "mobilerun.agent.utils.chat_utils",
+        "filter_empty_messages",
+    ),
+    "has_content": ("mobilerun.agent.utils.chat_utils", "has_content"),
+    "limit_history": ("mobilerun.agent.utils.chat_utils", "limit_history"),
+    "to_chat_messages": ("mobilerun.agent.utils.chat_utils", "to_chat_messages"),
+    "PromptResolver": ("mobilerun.agent.utils.prompt_resolver", "PromptResolver"),
+    "build_tool_registry": ("mobilerun.agent.utils.signatures", "build_tool_registry"),
+    "Trajectory": ("mobilerun.agent.utils.trajectory", "Trajectory"),
+}
 
 __all__ = [
     # Chat utilities
@@ -25,3 +40,16 @@
     # Trajectory
     "Trajectory",
 ]
+
+
+def __getattr__(name):
+    if name in _EXPORTS:
+        module, attribute = _EXPORTS[name]
+        value = getattr(import_module(module), attribute)
+        globals()[name] = value
+        return value
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
+
+
+def __dir__():
+    return sorted(set(globals()) | set(__all__))

mobilerun/agent/utils/android_device.py

@@ -22,7 +22,7 @@ def create_android_portal_http_driver(
     if not token:
         raise ValueError(
             "Android Portal HTTP needs the Portal auth token. Copy it from the "
-            "Portal app and set MOBILERUN_DEVICE_TOKEN or device.auth_token."
+            "Portal app and set MOBILERUN_ANDROID_PORTAL_TOKEN or device.auth_token."
         )
     return AndroidPortalHttpDriver(url, token)
 

mobilerun/agent/utils/llm_picker.py

@@ -147,7 +147,7 @@ def _validate_gemini_oauth_model(model: object) -> None:
         raise ValueError(
             f"Model '{model_id}' is a Gemini Developer API id and is not valid "
             f"for the Antigravity OAuth catalog. Re-run "
-            f"`mobilerun configure gemini` and pick one of: {supported}."
+            f"`mobilerun auth login gemini` and pick one of: {supported}."
         )
 
 

mobilerun/agent/utils/oauth/anthropic_oauth_llm.py

@@ -530,9 +530,7 @@ def login(
 
         # Headless environments: skip local server, use hosted callback page
         use_headless = _is_headless_environment() or (
-            os.environ.get("MOBILERUN_OAUTH_MANUAL")
-            or os.environ.get("DROIDRUN_OAUTH_MANUAL")
-            or ""
+            os.environ.get("MOBILERUN_OAUTH_MANUAL") or ""
         ).lower() in ("1", "true", "yes")
         if use_headless:
             return self.login_headless(

mobilerun/agent/utils/oauth/gemini_oauth_code_assist_llm.py

@@ -257,7 +257,7 @@ def __init__(
             raise ValueError(
                 f"Gemini OAuth model '{selected_model}' is retired. "
                 f"Use '{GEMINI_OAUTH_DEFAULT_MODEL}' or re-run "
-                "`mobilerun configure gemini` to choose an available model."
+                "`mobilerun auth login gemini` to choose an available model."
             )
 
         super().__init__(
@@ -604,9 +604,7 @@ def login(
 
         # Headless environments: use authcode redirect flow (no local server)
         use_authcode = _is_headless_environment() or (
-            os.environ.get("MOBILERUN_OAUTH_MANUAL")
-            or os.environ.get("DROIDRUN_OAUTH_MANUAL")
-            or ""
+            os.environ.get("MOBILERUN_OAUTH_MANUAL") or ""
         ).lower() in ("1", "true", "yes")
         if use_authcode:
             return self.login_headless(