droidrun 0.3.10.dev5__py3-none-any.whl → 0.3.10.dev7__py3-none-any.whl

droidrun/config_manager/prompt_loader.py

@@ -1,75 +1,72 @@
 """
-Prompt loading utility for markdown-based prompts.
-
-Supports variable substitution with escape sequences:
-- {variable} → replaced with value
-- {{variable}} → literal {variable}
-- Missing variables → left as {variable}
+Prompt loading utility using Jinja2 templates.
+
+Features:
+- Loads from absolute file paths (resolved by AgentConfig + PathResolver)
+- Conditional rendering: {% if variable %}...{% endif %}
+- Loops with slicing: {% for item in items[-5:] %}...{% endfor %}
+- Filters: {{ variable|default("fallback") }}
+- Missing variables: silently ignored (renders as empty string)
+- Extra variables: silently ignored
 """
 
-import re
 from pathlib import Path
 from typing import Any, Dict
 
-from droidrun.config_manager.path_resolver import PathResolver
+from jinja2 import Environment
 
 
 class PromptLoader:
-    """Load and format markdown prompts with variable substitution."""
+    """Simple Jinja2 template renderer - loads from absolute file paths."""
+
+    _env = None  # Cached Jinja2 environment
+
+    @classmethod
+    def _get_environment(cls) -> Environment:
+        """Get or create cached Jinja2 environment."""
+        if cls._env is None:
+            cls._env = Environment(
+                trim_blocks=True,           # Remove first newline after block
+                lstrip_blocks=True,         # Strip leading whitespace before blocks
+                keep_trailing_newline=False,
+            )
+
+        return cls._env
 
     @staticmethod
-    def load_prompt(path: str, variables: Dict[str, Any] = None) -> str:
+    def load_prompt(file_path: str, variables: Dict[str, Any] = None) -> str:
         """
-        Load prompt from .md file and substitute variables.
-
-        Path resolution:
-        - Checks working directory first (for user overrides)
-        - Falls back to project directory (for default prompts)
-        - Example: "config/prompts/codeact/system.md"
+        Load and render Jinja2 template from absolute file path.
 
-        Variable substitution:
-        - {variable} → replaced with value from variables dict
-        - {{variable}} → becomes literal {variable} in output
-        - Missing variables → left as {variable} (no error)
+        Path resolution is handled by AgentConfig + PathResolver.
+        This method just loads and renders.
 
         Args:
-            path: Path to prompt file (relative or absolute)
-            variables: Dict of variable names to values
+            file_path: ABSOLUTE path to template file (from AgentConfig methods)
+            variables: Dict of variables to pass to template
+                      - Missing variables: silently ignored (render as empty string)
+                      - Extra variables: silently ignored
 
         Returns:
-            Formatted prompt string
+            Rendered prompt string
 
         Raises:
-            FileNotFoundError: If prompt file doesn't exist
-        """
-        # Resolve path (checks working dir, then project dir)
-        prompt_path = PathResolver.resolve(path, must_exist=True)
-
-        prompt_text = prompt_path.read_text(encoding="utf-8")
-
-        if variables is None:
-            return prompt_text
+            FileNotFoundError: If template file doesn't exist
 
-        # Handle escaped braces: {{variable}} → {variable}
-        # Strategy: Replace {{...}} with placeholder, do substitution, restore
-        escaped_pattern = re.compile(r'\{\{([^}]+)\}\}')
-        placeholders = {}
-        counter = [0]
-
-        def escape_replacer(match):
-            placeholder = f"__ESCAPED_{counter[0]}__"
-            placeholders[placeholder] = "{" + match.group(1) + "}"
-            counter[0] += 1
-            return placeholder
+        """
+        path = Path(file_path)
 
-        prompt_text = escaped_pattern.sub(escape_replacer, prompt_text)
+        if not path.exists():
+            raise FileNotFoundError(f"Prompt file not found: {file_path}")
 
-        # Substitute variables
-        for key, value in variables.items():
-            prompt_text = prompt_text.replace(f"{{{key}}}", str(value))
+        # Read template content
+        template_content = path.read_text(encoding="utf-8")
 
-        # Restore escaped braces
-        for placeholder, original in placeholders.items():
-            prompt_text = prompt_text.replace(placeholder, original)
+        # Get cached environment and create template from string
+        env = PromptLoader._get_environment()
+        template = env.from_string(template_content)
 
-        return prompt_text
+        # Render with variables (empty dict if None)
+        # Missing variables render as empty string (default Undefined behavior)
+        # Extra variables are silently ignored
+        return template.render(**(variables or {}))

droidrun/macro/cli.py

@@ -4,7 +4,6 @@ Command-line interface for DroidRun macro replay.
 
 import asyncio
 import logging
-import os
 from typing import Optional
 
 import click

droidrun/portal.py

@@ -190,6 +190,23 @@ def setup_keyboard(device: AdbDevice):
     except Exception as e:
         raise Exception("Error setting up keyboard") from e
 
+def disable_keyboard(device: AdbDevice, target_ime: str = "com.droidrun.portal/.DroidrunKeyboardIME"):
+    """
+    Disable a specific IME (keyboard) and optionally switch to another.
+    By default, disables the DroidRun keyboard.
+
+    Args:
+        target_ime: The IME package/activity to disable (default: DroidRun keyboard)
+
+    Returns:
+        bool: True if disabled successfully, False otherwise
+    """
+    try:
+        device.shell(f"ime disable {target_ime}")
+        return True
+    except Exception as e:
+        raise Exception("Error disabling keyboard") from e
+
 def test():
     device = adb.device()
     ping_portal(device, debug=False)

droidrun/tools/adb.py

@@ -71,7 +71,9 @@ class AdbTools(Tools):
         self.app_opener_llm = app_opener_llm
         self.text_manipulator_llm = text_manipulator_llm
 
-        self.setup_keyboard()
+        # Set up keyboard
+        from droidrun.portal import setup_keyboard
+        setup_keyboard(self.device)
 
         # Set up TCP forwarding if requested
         if self.use_tcp:
@@ -150,24 +152,6 @@ class AdbTools(Tools):
             logger.error(f"Failed to remove TCP port forwarding: {e}")
             return False
 
-    def setup_keyboard(self) -> bool:
-        """
-        Set up the DroidRun keyboard as the default input method.
-        Simple setup that just switches to DroidRun keyboard without saving/restoring.
-
-        Returns:
-            bool: True if setup was successful, False otherwise
-        """
-        try:
-            self.device.shell("ime enable com.droidrun.portal/.DroidrunKeyboardIME")
-            self.device.shell("ime set com.droidrun.portal/.DroidrunKeyboardIME")
-            logger.debug("DroidRun keyboard setup completed")
-            return True
-
-        except Exception as e:
-            logger.error(f"Failed to setup DroidRun keyboard: {e}")
-            return False
-
     def __del__(self):
         """Cleanup when the object is destroyed."""
         if hasattr(self, "tcp_forwarded") and self.tcp_forwarded:
@@ -312,12 +296,9 @@ class AdbTools(Tools):
             # Extract coordinates using the helper function
             x, y = self._extract_element_coordinates_by_index(index)
 
-            logger.debug(
-                f"Tapping element with index {index} at coordinates ({x}, {y})"
-            )
             # Get the device and tap at the coordinates
             self.device.click(x, y)
-            logger.debug(f"Tapped element with index {index} at coordinates ({x}, {y})")
+            print(f"Tapped element with index {index} at coordinates ({x}, {y})")
 
             # Emit coordinate action event for trajectory recording
             if self._ctx:
@@ -350,8 +331,7 @@ class AdbTools(Tools):
                 )
                 self._ctx.write_event_to_stream(tap_event)
 
-            # Add a small delay to allow UI to update
-            time.sleep(0.5)
+
 
             # Create a descriptive response
             def find_element_by_index(elements, target_index):
@@ -463,7 +443,7 @@ class AdbTools(Tools):
 
             self.device.swipe(start_x, start_y, end_x, end_y, float(duration_ms / 1000))
             time.sleep(duration_ms / 1000)
-            logger.debug(
+            print(
                 f"Swiped from ({start_x}, {start_y}) to ({end_x}, {end_y}) in {duration_ms} milliseconds"
             )
             return True
@@ -546,7 +526,7 @@ class AdbTools(Tools):
                     timeout=10,
                 )
 
-                logger.debug(
+                print(
                     f"Keyboard input TCP response: {response.status_code}, {response.text}"
                 )
 
@@ -575,7 +555,7 @@ class AdbTools(Tools):
 
                 # Execute the command and capture output for better error handling
                 result = self.device.shell(cmd)
-                logger.debug(f"Content provider result: {result}")
+                print(f"Content provider result: {result}")
 
             if self._ctx:
                 input_event = InputTextActionEvent(
@@ -585,7 +565,7 @@ class AdbTools(Tools):
                 )
                 self._ctx.write_event_to_stream(input_event)
 
-            logger.debug(
+            print(
                 f"Text input completed (clear={clear}): {text[:50]}{'...' if len(text) > 50 else ''}"
             )
             return f"Text input completed (clear={clear}): {text[:50]}{'...' if len(text) > 50 else ''}"
@@ -604,7 +584,7 @@ class AdbTools(Tools):
         This presses the Android back button.
         """
         try:
-            logger.debug("Pressing key BACK")
+            print("Pressing key BACK")
             self.device.keyevent(4)
 
             if self._ctx:
@@ -652,9 +632,8 @@ class AdbTools(Tools):
                 )
                 self._ctx.write_event_to_stream(key_event)
 
-            logger.debug(f"Pressing key {key_name}")
             self.device.keyevent(keycode)
-            logger.debug(f"Pressed key {key_name}")
+            print(f"Pressed key {key_name}")
             return f"Pressed key {key_name}"
         except ValueError as e:
             return f"Error: {str(e)}"
@@ -670,7 +649,7 @@ class AdbTools(Tools):
         """
         try:
 
-            logger.debug(f"Starting app {package} with activity {activity}")
+            print(f"Starting app {package} with activity {activity}")
             if not activity:
                 dumpsys_output = self.device.shell(
                     f"cmd package resolve-activity --brief {package}"
@@ -689,7 +668,7 @@ class AdbTools(Tools):
             print(f"Activity: {activity}")
 
             self.device.app_start(package, activity)
-            logger.debug(f"App started: {package} with activity {activity}")
+            print(f"App started: {package} with activity {activity}")
             return f"App started: {package} with activity {activity}"
         except Exception as e:
             return f"Error: {str(e)}"

{droidrun-0.3.10.dev5.dist-info → droidrun-0.3.10.dev7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: droidrun
-Version: 0.3.10.dev5
+Version: 0.3.10.dev7
 Summary: A framework for controlling Android devices through LLM agents
 Project-URL: Homepage, https://github.com/droidrun/droidrun
 Project-URL: Bug Tracker, https://github.com/droidrun/droidrun/issues
@@ -29,6 +29,7 @@ Requires-Python: >=3.11
 Requires-Dist: adbutils>=2.10.2
 Requires-Dist: apkutils==2.0.0
 Requires-Dist: arize-phoenix>=12.3.0
+Requires-Dist: httpx>=0.27.0
 Requires-Dist: llama-index==0.14.4
 Requires-Dist: posthog>=6.7.6
 Requires-Dist: pydantic>=2.11.10
@@ -36,14 +37,6 @@ Requires-Dist: rich>=14.1.0
 Provides-Extra: anthropic
 Requires-Dist: anthropic>=0.67.0; extra == 'anthropic'
 Requires-Dist: llama-index-llms-anthropic<0.9.0,>=0.8.6; extra == 'anthropic'
-Provides-Extra: backend
-Requires-Dist: aiohttp>=3.9.0; extra == 'backend'
-Requires-Dist: fastapi>=0.104.0; extra == 'backend'
-Requires-Dist: pydantic-settings>=2.0.0; extra == 'backend'
-Requires-Dist: python-dotenv>=1.0.0; extra == 'backend'
-Requires-Dist: python-multipart>=0.0.6; extra == 'backend'
-Requires-Dist: uvicorn[standard]>=0.24.0; extra == 'backend'
-Requires-Dist: websockets>=12.0; extra == 'backend'
 Provides-Extra: deepseek
 Requires-Dist: llama-index-llms-deepseek>=0.2.1; extra == 'deepseek'
 Provides-Extra: dev

{droidrun-0.3.10.dev5.dist-info → droidrun-0.3.10.dev7.dist-info}/RECORD

@@ -1,26 +1,26 @@
 droidrun/__init__.py,sha256=c2exmv8MuTJ6wWXqzPR30pKGENeIgWe5ytY5hSQYuBc,621
 droidrun/__main__.py,sha256=8HpscyKn49EH05wXIdoxMiU43xPKb1czq8Aze2vIIqI,106
-droidrun/portal.py,sha256=Z4daRlMOpsiGxtJ4csuEaEiXAfGM5otbbrcrHvGhAB4,6161
+droidrun/portal.py,sha256=QCfJecUpuyd9io_76ngJizs1ebKubMzVMmCWXpgC6PM,6737
 droidrun/agent/__init__.py,sha256=91sM0qTmdV5trlXOWE4D_nRhXVPgHKMnYU_9Stc_obQ,209
 droidrun/agent/usage.py,sha256=6PVeHctNa0EmHmNPTdOUv5e3-EK6AMu6D2Pz5OMqs5c,7145
 droidrun/agent/codeact/__init__.py,sha256=lagBdrury33kbHN1XEZ-xzJ-RywmpkUUoUidOno9ym8,96
-droidrun/agent/codeact/codeact_agent.py,sha256=r7sjVhsmgMdXdrCwCDxLFJE9Eeh9_E1Jd39Fs7T7iX8,20810
+droidrun/agent/codeact/codeact_agent.py,sha256=7EkuazNIpTOX-W1oSG0XmtOwcmNOyaiPddgNxnK10No,20292
 droidrun/agent/codeact/events.py,sha256=kRKTQPzogPiQwmOCc_fGcg1g1zDXXVeBpDl45GTdpYU,734
 droidrun/agent/common/constants.py,sha256=q7ywmOXCsJZg8m9ctpzQ-nxvuj5GMn28Pr8z3dMj1Rg,94
 droidrun/agent/common/events.py,sha256=rbPWdlqNNMdnVjYhJOL2mJcNNORHhjXOkY8XiLPzp7c,1182
 droidrun/agent/context/__init__.py,sha256=-CiAv66qym_WgFy5vCRfNLxmiprmEbssu6S_2jj0LZw,452
 droidrun/agent/context/episodic_memory.py,sha256=0WKmOPe_KDWGdxudUXkmNVO1vj7L1g2zpyhAA54E1Lk,308
-droidrun/agent/context/task_manager.py,sha256=GXrGuBr8cukoLBRmvGIRsq0otwCC4s7N0NAVYql9oGY,5023
+droidrun/agent/context/task_manager.py,sha256=A2COoBMXBOCtrASC4QI8ZdYizNVLOD04e4rzviVIMbk,5013
 droidrun/agent/droid/__init__.py,sha256=3Kzejs0p2hqKzgMc253W147P-Y84bYnQX7AZ4pybIsU,297
-droidrun/agent/droid/droid_agent.py,sha256=urCFKVyNz1jF_CFc7PTVEG3m_tFpwlmDOhwNZCa0lgk,21761
-droidrun/agent/droid/events.py,sha256=eAxrGzA1yUGutInecFML0ms_361NgYmunK8XJ5-AEjE,3876
+droidrun/agent/droid/droid_agent.py,sha256=FRHNsuEyDY7n6jGwxnjoyAAgHhHWRQkbx5-Onen0Zvw,21722
+droidrun/agent/droid/events.py,sha256=m7FoIpAb4Fd6pcFyoWf9Jx9mYhSV8qMCieHEfYS7Fsg,4059
 droidrun/agent/executor/__init__.py,sha256=2B531GoY7L1Hs_RJIVu62ARsP9mj86do8MiFl6ejpZ4,456
 droidrun/agent/executor/events.py,sha256=sYMs24at_VtikPKqSh_yNRYByDt4JpS1jiEob9UjNrs,1377
-droidrun/agent/executor/executor_agent.py,sha256=OQIVd7n0EjUZYwefbNRrhKheohLygQW9zDEpC4pDeq0,15153
-droidrun/agent/executor/prompts.py,sha256=nUsr4oF1RjmByOVvBIgjw6_739hO3C916QEVYFjXuqw,7530
-droidrun/agent/manager/__init__.py,sha256=mXvIvRihVAlLXOVQgvA9wsMdcZ2ICvhEg4ZoV97O32w,525
+droidrun/agent/executor/executor_agent.py,sha256=mBbL-NfZ59w-8TDz_etuku-fgPzrL9DE4h5vi-STEWM,13923
+droidrun/agent/executor/prompts.py,sha256=amHWdGV-q-lgFkwg8N8VGeshvUqkEdxTM8GHnt7uTUQ,1182
+droidrun/agent/manager/__init__.py,sha256=A8esHVpxzHd3Epzkl0j5seNkRQqwNEn1a97eeLmbsww,525
 droidrun/agent/manager/events.py,sha256=X0tUwCX2mU8I4bGR4JW2NmUqiOrX-Hrb017vGVPVyHw,855
-droidrun/agent/manager/manager_agent.py,sha256=fCDIFnpHRq75iEEvGtnbB7DnEjtZ9ZTvdWRBjJzTEXU,21094
+droidrun/agent/manager/manager_agent.py,sha256=nXftmLlSLDs9LLB3rHE3EzpaCnUKa6v1dNfjFTMV9ys,22256
 droidrun/agent/manager/prompts.py,sha256=qfDYcSbpWpnUaavAuPE6qY6Df6w25LmtY1mEiBUMti0,2060
 droidrun/agent/oneflows/app_starter_workflow.py,sha256=MSJ6_jfbiCfSIjnw-qfSDFDuqsUS6rUGLsdKVj43wvY,3525
 droidrun/agent/oneflows/text_manipulator.py,sha256=mO59DF1uif9poUWy90UehrBmHbNxL9ph4Evtgt1ODbQ,8751
@@ -28,34 +28,38 @@ droidrun/agent/utils/__init__.py,sha256=Oro0oyiz1xzRpchWLDA1TZJELJNSwBOb2WdGgknt
 droidrun/agent/utils/async_utils.py,sha256=_JhZ_ZfCkRTfPsufFDhUUds_Vp6z1-TokzUG4H8G7pc,338
 droidrun/agent/utils/chat_utils.py,sha256=mginY1rbP5t06O3hz2RpJJJNzggaE8VhWjnFid844vw,13797
 droidrun/agent/utils/device_state_formatter.py,sha256=3MuR3XQulnrsdzmMYfTEegA_XkYTTiETXMRtOtyqoC0,6889
-droidrun/agent/utils/executer.py,sha256=vz6mLeV4xti3dd_bDBd4aWHDA6T-ym0EbdEicrtK0aA,4233
+droidrun/agent/utils/executer.py,sha256=mCq-T9gekgFK9oSHz2H9ctHIyJQFzp9MWQgzuxP0TU0,4191
 droidrun/agent/utils/inference.py,sha256=dupCtMYXUGuBJz9RqTgSsLYe_MOSB0LEhfHIdtFC8x0,3893
-droidrun/agent/utils/llm_picker.py,sha256=m5PHBe8iex5n_a5fPwfPd5Qdup_atx4C6iv0-wTCGzY,7232
+droidrun/agent/utils/llm_picker.py,sha256=KQzrRcHE38NwujDbNth5F9v5so9HVvHjfkQznMsv-cM,9397
 droidrun/agent/utils/message_utils.py,sha256=_wngf082gg232y_3pC_yn4fnPhHiyYAxhU4ewT78roo,2309
-droidrun/agent/utils/tools.py,sha256=SW-nBSfKTgPxDafV8dVX345JwmW378y_x86sLxiISj4,9243
+droidrun/agent/utils/tools.py,sha256=anc10NAKmZx91JslHFpo6wfnUOZ2pnPXJS-5nMVHC_A,9930
 droidrun/agent/utils/trajectory.py,sha256=Z6C19Y9hsRxjLZWywqYWTApKU7PelvWM-5Tsl3h7KEw,19718
+droidrun/app_cards/app_card_provider.py,sha256=wy7CGFnBd_EPU58xNdv4ZWUA9F4Plon71N4-5RT5vNg,827
+droidrun/app_cards/providers/__init__.py,sha256=vN4TvBtsvfdvzgqbIJegIfHhct0aTFZjvJazWFDvdhg,372
+droidrun/app_cards/providers/composite_provider.py,sha256=oi7dlkv_Hv2rEZMxQlO1jP9fQcTBydr40zCyunCNxQA,3156
+droidrun/app_cards/providers/local_provider.py,sha256=RRGQ7VR7qHT9uKSOlSvqCTRq_p4W5HzlWue7B6tcbT0,3904
+droidrun/app_cards/providers/server_provider.py,sha256=rOJyiCE_zTCCK9SAJeee3vLWISytoZrBUiXB6LaJEv8,4148
 droidrun/cli/__init__.py,sha256=5cO-QBcUl5w35zO18OENj4OShdglQjn8Ne9aqgSh-PM,167
-droidrun/cli/logs.py,sha256=lZX44S7pvrpbwfIXX6WYVPeDdvjjRozRb-oc6u-yCks,12686
-droidrun/cli/main.py,sha256=dJdKleue-kLZs8xfQ3s2m_XiWm3ShrFy46Ne0S5P0JU,26171
-droidrun/config_manager/__init__.py,sha256=-3FZJ2K985yhrIq2uPtlutCImdVzWvckdL1X4XCFi5s,547
-droidrun/config_manager/app_card_loader.py,sha256=WKU3knxOcUo4v2mNh0XPljUW03Sc1fK4yBJVDERAeJY,5055
-droidrun/config_manager/config_manager.py,sha256=4XUBTJnkoO_9AFU13j5nNygFIQFHyZ_Q_b3R6b796m4,21529
-droidrun/config_manager/path_resolver.py,sha256=R9Yf3JWdrdvNXSg-6yXBO2NSr8HTuSvJfGcuyz0dY-I,3417
-droidrun/config_manager/prompt_loader.py,sha256=nzlL3YMyteY91fOMryQD3XRny_2oytAmaXRZfLBNH2M,2450
+droidrun/cli/logs.py,sha256=V8rn6oXgYObExX4dG8MUnQXxUdKOk1QlTkOQtI5e6wo,12686
+droidrun/cli/main.py,sha256=0-63OyiNlT944eOBqjw3fG8Edove88tqNEFkCKVHb8w,35372
+droidrun/config_manager/__init__.py,sha256=SeLoEYVU5jMEtXLjx76VE_3rxzZXjCMlVPW7hodU128,460
+droidrun/config_manager/config_manager.py,sha256=hPETII_5wYvfb11e7sJlfCVk9p3WbA7nHPAV3bQQdmE,19930
+droidrun/config_manager/path_resolver.py,sha256=vQKT5XmnENtSK3B1D-iItL8CpOQTKzfKZ1wTO4khlTs,3421
+droidrun/config_manager/prompt_loader.py,sha256=JqGHjT4Ik5iwPfnaXkCc1W1cm4QmIqq2duPuye14jSc,2430
 droidrun/macro/__init__.py,sha256=TKRNlMJqClV1p1dkfES4eo-Bq1VkSiTC1DDMxMjnUWE,357
 droidrun/macro/__main__.py,sha256=MWdBvQVhOoeKlC8atDwjVbPSn0-XNt4PDbpCCoeJuUk,193
-droidrun/macro/cli.py,sha256=hlnQVY399El26cpFiXiP3-lcXB_gh6SDpAoPbCiMqsA,9161
+droidrun/macro/cli.py,sha256=jQqnnrAnH_KTxuPsYsvIdftPlVcvpb5a5yn5v6A6cCg,9151
 droidrun/macro/replay.py,sha256=ILhnvN3VYhMK13wkaD5oDwP4wCYTniwcgesUON-9L5o,10721
 droidrun/telemetry/__init__.py,sha256=2G9PwAuVWsd6qRMKSscssvmL57ILlOK5EV0KezPiF1I,271
 droidrun/telemetry/events.py,sha256=y-i2d5KiPkikVXrzMQu87osy1LAZTBIx8DlPIWGAXG0,486
 droidrun/telemetry/phoenix.py,sha256=JHdFdRHXu7cleAb4X4_Y5yn5zPSIApwyKCOxoaj_gf4,7117
 droidrun/telemetry/tracker.py,sha256=YWOkyLE8XiHainVSB77JE37y-rloOYVYs6j53Aw1J8A,2735
 droidrun/tools/__init__.py,sha256=BbQFKuPn-5MwGzr-3urMDK8S1ZsP96D96y7WTJYB3AA,271
-droidrun/tools/adb.py,sha256=X9fvrQWBTCKkWTB4oXfRj5PRb__SA8zO0J0-TMbsJ1U,43908
+droidrun/tools/adb.py,sha256=ziMbQ02TDBvm04ffG1wlYUstsYABNopZaq0aOBh0xtA,42985
 droidrun/tools/ios.py,sha256=GMYbiNNBeHLwVQAo4_fEZ7snr4JCHE6sG11rcuPvSpk,21831
 droidrun/tools/tools.py,sha256=0eAZFTaY10eiiUcJM4AkURmTGX-O1RRXjpQ5MHj2Ydo,5241
-droidrun-0.3.10.dev5.dist-info/METADATA,sha256=VAVgYvK3zhdx2jLhH8DdvYrU4Oba3d2453aUOt4MQKc,7429
-droidrun-0.3.10.dev5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-droidrun-0.3.10.dev5.dist-info/entry_points.txt,sha256=o259U66js8TIybQ7zs814Oe_LQ_GpZsp6a9Cr-xm5zE,51
-droidrun-0.3.10.dev5.dist-info/licenses/LICENSE,sha256=s-uxn9qChu-kFdRXUp6v_0HhsaJ_5OANmfNOFVm2zdk,1069
-droidrun-0.3.10.dev5.dist-info/RECORD,,
+droidrun-0.3.10.dev7.dist-info/METADATA,sha256=gac2d1ul1MhI-nSmx1ttR3XtWJoIhq6lIyZE4mufMRE,7044
+droidrun-0.3.10.dev7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+droidrun-0.3.10.dev7.dist-info/entry_points.txt,sha256=o259U66js8TIybQ7zs814Oe_LQ_GpZsp6a9Cr-xm5zE,51
+droidrun-0.3.10.dev7.dist-info/licenses/LICENSE,sha256=s-uxn9qChu-kFdRXUp6v_0HhsaJ_5OANmfNOFVm2zdk,1069
+droidrun-0.3.10.dev7.dist-info/RECORD,,

droidrun/config_manager/app_card_loader.py

@@ -1,148 +0,0 @@
-"""
-App card loading utility for package-specific prompts.
-
-Supports flexible file path resolution and caches loaded content.
-"""
-
-import json
-from pathlib import Path
-from typing import Dict, Optional
-
-from droidrun.config_manager.path_resolver import PathResolver
-
-
-class AppCardLoader:
-    """Load app cards based on package names with content caching."""
-
-    _mapping_cache: Optional[Dict[str, str]] = None
-    _cache_dir: Optional[str] = None
-    _content_cache: Dict[str, str] = {}
-
-    @staticmethod
-    def load_app_card(
-        package_name: str, app_cards_dir: str = "config/app_cards"
-    ) -> str:
-        """
-        Load app card for a package name.
-
-        Path resolution:
-        - Checks working directory first (for user overrides)
-        - Falls back to project directory (for default cards)
-        - Supports absolute paths (used as-is)
-
-        File loading from app_cards.json:
-        1. Relative to app_cards_dir (most common):
-           {"com.google.gm": "gmail.md"}
-           → {app_cards_dir}/gmail.md
-
-        2. Relative path (checks working dir, then project dir):
-           {"com.google.gm": "config/custom_cards/gmail.md"}
-
-        3. Absolute path:
-           {"com.google.gm": "/usr/share/droidrun/cards/gmail.md"}
-
-        Args:
-            package_name: Android package name (e.g., "com.google.android.gm")
-            app_cards_dir: Directory path (relative or absolute)
-
-        Returns:
-            App card content or empty string if not found
-        """
-        if not package_name:
-            return ""
-
-        # Check content cache first (key: package_name:app_cards_dir)
-        cache_key = f"{package_name}:{app_cards_dir}"
-        if cache_key in AppCardLoader._content_cache:
-            return AppCardLoader._content_cache[cache_key]
-
-        # Load mapping (with cache)
-        mapping = AppCardLoader._load_mapping(app_cards_dir)
-
-        # Get file path from mapping
-        if package_name not in mapping:
-            # Cache the empty result to avoid repeated lookups
-            AppCardLoader._content_cache[cache_key] = ""
-            return ""
-
-        file_path_str = mapping[package_name]
-        file_path = Path(file_path_str)
-
-        # Determine resolution strategy
-        if file_path.is_absolute():
-            # Absolute path: use as-is
-            app_card_path = file_path
-        elif file_path_str.startswith(("config/", "prompts/", "docs/")):
-            # Project-relative path: resolve with unified resolver
-            app_card_path = PathResolver.resolve(file_path_str)
-        else:
-            # App_cards-relative: resolve dir first, then append filename
-            cards_dir_resolved = PathResolver.resolve(app_cards_dir)
-            app_card_path = cards_dir_resolved / file_path_str
-
-        # Read file
-        try:
-            if not app_card_path.exists():
-                # Cache the empty result
-                AppCardLoader._content_cache[cache_key] = ""
-                return ""
-
-            content = app_card_path.read_text(encoding="utf-8")
-            # Cache the content
-            AppCardLoader._content_cache[cache_key] = content
-            return content
-        except Exception:
-            # Cache the empty result on error
-            AppCardLoader._content_cache[cache_key] = ""
-            return ""
-
-    @staticmethod
-    def _load_mapping(app_cards_dir: str) -> Dict[str, str]:
-        """Load and cache the app_cards.json mapping."""
-        # Cache invalidation: if dir changed, reload
-        if (
-            AppCardLoader._mapping_cache is not None
-            and AppCardLoader._cache_dir == app_cards_dir
-        ):
-            return AppCardLoader._mapping_cache
-
-        # Resolve app cards directory
-        cards_dir_resolved = PathResolver.resolve(app_cards_dir)
-        mapping_path = cards_dir_resolved / "app_cards.json"
-
-        try:
-            if not mapping_path.exists():
-                AppCardLoader._mapping_cache = {}
-                AppCardLoader._cache_dir = app_cards_dir
-                return {}
-
-            with open(mapping_path, "r", encoding="utf-8") as f:
-                mapping = json.load(f)
-
-            AppCardLoader._mapping_cache = mapping
-            AppCardLoader._cache_dir = app_cards_dir
-            return mapping
-        except Exception:
-            AppCardLoader._mapping_cache = {}
-            AppCardLoader._cache_dir = app_cards_dir
-            return {}
-
-    @staticmethod
-    def clear_cache() -> None:
-        """Clear all caches (useful for testing or runtime reloading)."""
-        AppCardLoader._mapping_cache = None
-        AppCardLoader._cache_dir = None
-        AppCardLoader._content_cache.clear()
-
-    @staticmethod
-    def get_cache_stats() -> Dict[str, int]:
-        """
-        Get cache statistics.
-
-        Returns:
-            Dict with cache stats (useful for debugging)
-        """
-        return {
-            "mapping_cached": 1 if AppCardLoader._mapping_cache is not None else 0,
-            "content_entries": len(AppCardLoader._content_cache),
-        }