oagi-core 0.10.3__py3-none-any.whl → 0.11.0__py3-none-any.whl

oagi/agent/default.py

@@ -16,6 +16,7 @@ from ..constants import (
     DEFAULT_TEMPERATURE,
     MODEL_ACTOR,
 )
+from ..handler import reset_handler
 from ..types import (
     ActionEvent,
     AsyncActionHandler,
@@ -68,6 +69,9 @@ class AsyncDefaultAgent:
             logger.info(f"Starting async task execution: {instruction}")
             await self.actor.init_task(instruction, max_steps=self.max_steps)
 
+            # Reset handler state at automation start
+            reset_handler(action_handler)
+
             for i in range(self.max_steps):
                 step_num = i + 1
                 logger.debug(f"Executing step {step_num}/{self.max_steps}")

oagi/agent/factories.py

@@ -65,8 +65,8 @@ def create_thinker_agent(
     )
 
 
-@async_agent_register(mode="tasker")
-def create_planner_agent(
+@async_agent_register(mode="tasker:cvs_appointment")
+def create_cvs_appointment_agent(
     api_key: str | None = None,
     base_url: str | None = None,
     model: str = MODEL_ACTOR,
@@ -75,6 +75,12 @@ def create_planner_agent(
     reflection_interval: int = DEFAULT_REFLECTION_INTERVAL_TASKER,
     step_observer: AsyncStepObserver | None = None,
     step_delay: float = DEFAULT_STEP_DELAY,
+    # CVS-specific parameters
+    first_name: str = "First",
+    last_name: str = "Last",
+    email: str = "user@example.com",
+    birthday: str = "01-01-1990",  # MM-DD-YYYY
+    zip_code: str = "00000",
 ) -> AsyncAgent:
     tasker = TaskerAgent(
         api_key=api_key,
@@ -86,5 +92,71 @@ def create_planner_agent(
         step_observer=step_observer,
         step_delay=step_delay,
     )
-    # tasker.set_task()
+
+    month, day, year = birthday.split("-")
+    instruction = (
+        f"Schedule an appointment at CVS for {first_name} {last_name} "
+        f"with email {email} and birthday {birthday}"
+    )
+    todos = [
+        "Open a new tab, go to www.cvs.com, type 'flu shot' in the search bar and press enter, "
+        "wait for the page to load, then click on the button of Schedule vaccinations on the "
+        "top of the page",
+        f"Enter the first name '{first_name}', last name '{last_name}', and email '{email}' "
+        "in the form. Do not use any suggested autofills. Make sure the mobile phone number "
+        "is empty.",
+        f"Slightly scroll down to see the date of birth, enter Month '{month}', Day '{day}', "
+        f"and Year '{year}' in the form",
+        "Click on 'Continue as guest' button, wait for the page to load with wait, "
+        "click on 'Add vaccines' button, select 'Flu' and click on 'Add vaccines'",
+        f"Click on 'next' to enter the page with recommendation vaccines, then click on "
+        f"'next' again, until on the page of entering zip code, enter '{zip_code}', select "
+        "the first option from the dropdown menu, and click on 'Search'",
+    ]
+
+    tasker.set_task(instruction, todos)
+    return tasker
+
+
+@async_agent_register(mode="tasker:software_qa")
+def create_software_qa_agent(
+    api_key: str | None = None,
+    base_url: str | None = None,
+    model: str = MODEL_ACTOR,
+    max_steps: int = DEFAULT_MAX_STEPS_TASKER,
+    temperature: float = DEFAULT_TEMPERATURE_LOW,
+    reflection_interval: int = DEFAULT_REFLECTION_INTERVAL_TASKER,
+    step_observer: AsyncStepObserver | None = None,
+    step_delay: float = DEFAULT_STEP_DELAY,
+) -> AsyncAgent:
+    tasker = TaskerAgent(
+        api_key=api_key,
+        base_url=base_url,
+        model=model,
+        max_steps=max_steps,
+        temperature=temperature,
+        reflection_interval=reflection_interval,
+        step_observer=step_observer,
+        step_delay=step_delay,
+    )
+
+    instruction = "QA: click through every sidebar button in the Nuclear Player UI"
+    todos = [
+        "Click on 'Dashboard' in the left sidebar",
+        "Click on 'Downloads' in the left sidebar",
+        "Click on 'Lyrics' in the left sidebar",
+        "Click on 'Plugins' in the left sidebar",
+        "Click on 'Search Results' in the left sidebar",
+        "Click on 'Settings' in the left sidebar",
+        "Click on 'Equalizer' in the left sidebar",
+        "Click on 'Visualizer' in the left sidebar",
+        "Click on 'Listening History' in the left sidebar",
+        "Click on 'Favorite Albums' in the left sidebar",
+        "Click on 'Favorite Tracks' in the left sidebar",
+        "Click on 'Favorite Artists' in the left sidebar",
+        "Click on 'Local Library' in the left sidebar",
+        "Click on 'Playlists' in the left sidebar",
+    ]
+
+    tasker.set_task(instruction, todos)
     return tasker

oagi/agent/tasker/planner.py

@@ -11,7 +11,7 @@ from typing import Any
 
 from ...client import AsyncClient
 from ...constants import DEFAULT_REFLECTION_INTERVAL
-from ...types import URL, Image
+from ...types import URL, Image, extract_uuid_from_url
 from .memory import PlannerMemory
 from .models import Action, PlannerOutput, ReflectionOutput
 
@@ -138,11 +138,16 @@ class Planner:
         # Ensure we have a client
         client = self._ensure_client()
 
-        # Upload screenshot if provided
+        # Get screenshot UUID - either extract from URL or upload
         screenshot_uuid = None
         if screenshot:
-            upload_response = await client.put_s3_presigned_url(screenshot)
-            screenshot_uuid = upload_response.uuid
+            # Check if screenshot is already a URL (already uploaded to S3)
+            if isinstance(screenshot, str):
+                screenshot_uuid = extract_uuid_from_url(screenshot)
+            # If not a URL or UUID extraction failed, upload the image
+            if not screenshot_uuid:
+                upload_response = await client.put_s3_presigned_url(screenshot)
+                screenshot_uuid = upload_response.uuid
 
         # Extract memory data if provided
         (
@@ -195,11 +200,16 @@ class Planner:
         # Ensure we have a client
         client = self._ensure_client()
 
-        # Upload screenshot if provided
+        # Get screenshot UUID - either extract from URL or upload
         result_screenshot_uuid = None
         if screenshot:
-            upload_response = await client.put_s3_presigned_url(screenshot)
-            result_screenshot_uuid = upload_response.uuid
+            # Check if screenshot is already a URL (already uploaded to S3)
+            if isinstance(screenshot, str):
+                result_screenshot_uuid = extract_uuid_from_url(screenshot)
+            # If not a URL or UUID extraction failed, upload the image
+            if not result_screenshot_uuid:
+                upload_response = await client.put_s3_presigned_url(screenshot)
+                result_screenshot_uuid = upload_response.uuid
 
         # Extract memory data if provided
         (

oagi/agent/tasker/taskee_agent.py

@@ -19,6 +19,7 @@ from oagi.constants import (
     DEFAULT_TEMPERATURE,
     MODEL_ACTOR,
 )
+from oagi.handler import reset_handler
 from oagi.types import (
     URL,
     ActionEvent,
@@ -28,6 +29,7 @@ from oagi.types import (
     Image,
     PlanEvent,
     StepEvent,
+    extract_uuid_from_url,
 )
 
 from ..protocol import AsyncAgent
@@ -121,6 +123,9 @@ class TaskeeAgent(AsyncAgent):
         Returns:
             True if successful, False otherwise
         """
+        # Reset handler state at todo execution start
+        reset_handler(action_handler)
+
         self.current_todo = instruction
         self.actions = []
         self.total_actions = 0
@@ -256,11 +261,21 @@ class TaskeeAgent(AsyncAgent):
             # Capture screenshot
             screenshot = await image_provider()
 
-            # Upload screenshot first to get UUID (avoids re-upload in actor.step)
+            # Get screenshot UUID - either extract from URL or upload
             try:
-                upload_response = await client.put_s3_presigned_url(screenshot)
-                screenshot_uuid = upload_response.uuid
-                screenshot_url = upload_response.download_url
+                screenshot_uuid = None
+                screenshot_url = None
+
+                # Check if screenshot is already a URL (from SocketIOImageProvider)
+                if isinstance(screenshot, str):
+                    screenshot_uuid = extract_uuid_from_url(screenshot)
+                    screenshot_url = screenshot
+
+                # If not a URL or UUID extraction failed, upload the image
+                if not screenshot_uuid:
+                    upload_response = await client.put_s3_presigned_url(screenshot)
+                    screenshot_uuid = upload_response.uuid
+                    screenshot_url = upload_response.download_url
             except Exception as e:
                 logger.error(f"Error uploading screenshot: {e}")
                 self._record_action(

oagi/agent/tasker/tasker_agent.py

@@ -16,6 +16,7 @@ from oagi.constants import (
     DEFAULT_TEMPERATURE,
     MODEL_ACTOR,
 )
+from oagi.handler import reset_handler
 from oagi.types import AsyncActionHandler, AsyncImageProvider, AsyncObserver, SplitEvent
 
 from ..protocol import AsyncAgent
@@ -112,6 +113,9 @@ class TaskerAgent(AsyncAgent):
         Returns:
             True if all todos completed successfully, False otherwise
         """
+        # Reset handler state at automation start
+        reset_handler(action_handler)
+
         overall_success = True
 
         # Execute todos until none remain

oagi/cli/agent.py

@@ -17,12 +17,9 @@ from oagi.agent.observer import AsyncAgentObserver
 from oagi.constants import (
     API_KEY_HELP_URL,
     DEFAULT_BASE_URL,
-    DEFAULT_MAX_STEPS,
     DEFAULT_MAX_STEPS_THINKER,
     DEFAULT_STEP_DELAY,
-    DEFAULT_TEMPERATURE,
     MODE_ACTOR,
-    MODEL_ACTOR,
     MODEL_THINKER,
 )
 from oagi.exceptions import check_optional_dependency
@@ -40,22 +37,30 @@ def add_agent_parser(subparsers: argparse._SubParsersAction) -> None:
         "run", help="Run an agent with the given instruction"
     )
     run_parser.add_argument(
-        "instruction", type=str, help="Task instruction for the agent to execute"
+        "instruction",
+        type=str,
+        nargs="?",
+        default="",
+        help="Task instruction for the agent to execute (optional for pre-configured modes)",
     )
     run_parser.add_argument(
-        "--model", type=str, help=f"Model to use (default: {MODEL_ACTOR})"
+        "--model", type=str, help="Model to use (default: determined by mode)"
     )
     run_parser.add_argument(
-        "--max-steps", type=int, help="Maximum number of steps (default: 20)"
+        "--max-steps",
+        type=int,
+        help="Maximum number of steps (default: determined by mode)",
     )
     run_parser.add_argument(
-        "--temperature", type=float, help="Sampling temperature (default: 0.5)"
+        "--temperature",
+        type=float,
+        help="Sampling temperature (default: determined by mode)",
     )
     run_parser.add_argument(
         "--mode",
         type=str,
         default=MODE_ACTOR,
-        help=f"Agent mode to use (default: {MODE_ACTOR}). Available modes: actor, planner",
+        help=f"Agent mode to use (default: {MODE_ACTOR}). Use 'oagi agent modes' to list available modes",
     )
     run_parser.add_argument(
         "--oagi-api-key", type=str, help="OAGI API key (default: OAGI_API_KEY env var)"
@@ -82,6 +87,9 @@ def add_agent_parser(subparsers: argparse._SubParsersAction) -> None:
         help=f"Delay in seconds after each step before next screenshot (default: {DEFAULT_STEP_DELAY})",
     )
 
+    # agent modes command
+    agent_subparsers.add_parser("modes", help="List available agent modes")
+
     # agent permission command
     agent_subparsers.add_parser(
         "permission",
@@ -92,10 +100,22 @@ def add_agent_parser(subparsers: argparse._SubParsersAction) -> None:
 def handle_agent_command(args: argparse.Namespace) -> None:
     if args.agent_command == "run":
         run_agent(args)
+    elif args.agent_command == "modes":
+        list_modes()
     elif args.agent_command == "permission":
         check_permissions()
 
 
+def list_modes() -> None:
+    """List all available agent modes."""
+    from oagi.agent import list_agent_modes  # noqa: PLC0415
+
+    modes = list_agent_modes()
+    print("Available agent modes:")
+    for mode in modes:
+        print(f"  - {mode}")
+
+
 def check_permissions() -> None:
     """Check and request macOS permissions for screen recording and accessibility.
 
@@ -207,14 +227,6 @@ def run_agent(args: argparse.Namespace) -> None:
         sys.exit(1)
 
     base_url = args.oagi_base_url or os.getenv("OAGI_BASE_URL", DEFAULT_BASE_URL)
-    model = args.model or MODEL_ACTOR
-    default_max_steps = (
-        DEFAULT_MAX_STEPS_THINKER if model == MODEL_THINKER else DEFAULT_MAX_STEPS
-    )
-    max_steps = args.max_steps or default_max_steps
-    temperature = (
-        args.temperature if args.temperature is not None else DEFAULT_TEMPERATURE
-    )
     mode = args.mode or MODE_ACTOR
     step_delay = args.step_delay if args.step_delay is not None else DEFAULT_STEP_DELAY
     export_format = args.export
@@ -233,26 +245,38 @@ def run_agent(args: argparse.Namespace) -> None:
 
     observer = CombinedObserver()
 
-    # Create agent with observer
-    agent = create_agent(
-        mode=mode,
-        api_key=api_key,
-        base_url=base_url,
-        model=model,
-        max_steps=max_steps,
-        temperature=temperature,
-        step_observer=observer,
-        step_delay=step_delay,
-    )
+    # Build agent kwargs - only pass explicitly provided values, let factory use defaults
+    agent_kwargs = {
+        "mode": mode,
+        "api_key": api_key,
+        "base_url": base_url,
+        "step_observer": observer,
+        "step_delay": step_delay,
+    }
+    if args.model:
+        agent_kwargs["model"] = args.model
+        # If thinker model specified without max_steps, use thinker's default
+        if args.model == MODEL_THINKER and not args.max_steps:
+            agent_kwargs["max_steps"] = DEFAULT_MAX_STEPS_THINKER
+    if args.max_steps:
+        agent_kwargs["max_steps"] = args.max_steps
+    if args.temperature is not None:
+        agent_kwargs["temperature"] = args.temperature
+
+    # Create agent
+    agent = create_agent(**agent_kwargs)
 
     # Create handlers
     action_handler = AsyncPyautoguiActionHandler()
     image_provider = AsyncScreenshotMaker()
 
-    print(f"Starting agent with instruction: {args.instruction}")
+    if args.instruction:
+        print(f"Starting agent with instruction: {args.instruction}")
+    else:
+        print(f"Starting agent with mode: {mode} (using pre-configured instruction)")
     print(
-        f"Mode: {mode}, Model: {model}, Max steps: {max_steps}, "
-        f"Temperature: {temperature}, Step delay: {step_delay}s"
+        f"Mode: {mode}, Model: {agent.model}, Max steps: {agent.max_steps}, "
+        f"Temperature: {agent.temperature}, Step delay: {step_delay}s"
     )
     print("-" * 60)
 

oagi/handler/__init__.py

@@ -14,6 +14,21 @@ from oagi.handler.pyautogui_action_handler import (
 )
 from oagi.handler.screenshot_maker import ScreenshotMaker
 
+
+def reset_handler(handler) -> None:
+    """Reset handler state if supported.
+
+    Uses duck-typing to check if the handler has a reset() method.
+    This allows handlers to reset their internal state (e.g., capslock state)
+    at the start of a new automation task.
+
+    Args:
+        handler: The action handler to reset
+    """
+    if hasattr(handler, "reset"):
+        handler.reset()
+
+
 __all__ = [
     "PILImage",
     "PyautoguiActionHandler",
@@ -21,4 +36,5 @@ __all__ = [
     "AsyncPyautoguiActionHandler",
     "ScreenshotMaker",
     "AsyncScreenshotMaker",
+    "reset_handler",
 ]

oagi/handler/_macos.py

@@ -6,6 +6,15 @@
 #  Licensed under the MIT License.
 # -----------------------------------------------------------------------------
 
+"""macOS-specific keyboard and mouse input handling.
+
+This module provides:
+- macos_click(): Fix for PyAutoGUI multi-click bug on macOS
+- typewrite_exact(): Type text exactly, ignoring system capslock state
+"""
+
+import time
+
 import pyautogui
 
 from ..exceptions import check_optional_dependency
@@ -13,6 +22,134 @@ from ..exceptions import check_optional_dependency
 check_optional_dependency("Quartz", "macOS multiple clicks", "desktop")
 import Quartz  # noqa: E402
 
+# macOS virtual key codes for typeable characters
+KEYCODE_MAP = {
+    "a": 0x00,
+    "b": 0x0B,
+    "c": 0x08,
+    "d": 0x02,
+    "e": 0x0E,
+    "f": 0x03,
+    "g": 0x05,
+    "h": 0x04,
+    "i": 0x22,
+    "j": 0x26,
+    "k": 0x28,
+    "l": 0x25,
+    "m": 0x2E,
+    "n": 0x2D,
+    "o": 0x1F,
+    "p": 0x23,
+    "q": 0x0C,
+    "r": 0x0F,
+    "s": 0x01,
+    "t": 0x11,
+    "u": 0x20,
+    "v": 0x09,
+    "w": 0x0D,
+    "x": 0x07,
+    "y": 0x10,
+    "z": 0x06,
+    "1": 0x12,
+    "2": 0x13,
+    "3": 0x14,
+    "4": 0x15,
+    "5": 0x17,
+    "6": 0x16,
+    "7": 0x1A,
+    "8": 0x1C,
+    "9": 0x19,
+    "0": 0x1D,
+    " ": 0x31,  # space
+    "-": 0x1B,
+    "=": 0x18,
+    "[": 0x21,
+    "]": 0x1E,
+    "\\": 0x2A,
+    ";": 0x29,
+    "'": 0x27,
+    "`": 0x32,
+    ",": 0x2B,
+    ".": 0x2F,
+    "/": 0x2C,
+    "\t": 0x30,  # tab
+    "\n": 0x24,  # return
+}
+
+# Characters that require shift key (on US keyboard layout)
+SHIFT_CHARS = set('~!@#$%^&*()_+{}|:"<>?ABCDEFGHIJKLMNOPQRSTUVWXYZ')
+
+# Mapping of shifted characters to their base key
+SHIFT_KEY_MAP = {
+    "~": "`",
+    "!": "1",
+    "@": "2",
+    "#": "3",
+    "$": "4",
+    "%": "5",
+    "^": "6",
+    "&": "7",
+    "*": "8",
+    "(": "9",
+    ")": "0",
+    "_": "-",
+    "+": "=",
+    "{": "[",
+    "}": "]",
+    "|": "\\",
+    ":": ";",
+    '"': "'",
+    "<": ",",
+    ">": ".",
+    "?": "/",
+}
+
+
+def typewrite_exact(text: str, interval: float = 0.01) -> None:
+    """Type text exactly as specified, ignoring system capslock state.
+
+    This function uses Quartz CGEventCreateKeyboardEvent with explicit
+    flag control via CGEventSetFlags() to type each character with the
+    correct case, regardless of the system's capslock state.
+
+    Args:
+        text: The text to type exactly as specified
+        interval: Time in seconds between each character (default: 0.01)
+    """
+    for char in text:
+        # Determine if this character needs shift
+        needs_shift = char in SHIFT_CHARS
+
+        # Get the base key (for shifted chars, look up the unshifted version)
+        if char.isupper():
+            base_char = char.lower()
+        elif char in SHIFT_KEY_MAP:
+            base_char = SHIFT_KEY_MAP[char]
+        else:
+            base_char = char
+
+        # Get keycode for the base character
+        keycode = KEYCODE_MAP.get(base_char)
+        if keycode is None:
+            # Character not in our keycode map, skip it
+            continue
+
+        # Set flags: shift if needed, otherwise clear all flags
+        flags = Quartz.kCGEventFlagMaskShift if needs_shift else 0
+
+        # Key down
+        event_down = Quartz.CGEventCreateKeyboardEvent(None, keycode, True)
+        Quartz.CGEventSetFlags(event_down, flags)
+        Quartz.CGEventPost(Quartz.kCGHIDEventTap, event_down)
+
+        # Key up
+        event_up = Quartz.CGEventCreateKeyboardEvent(None, keycode, False)
+        Quartz.CGEventSetFlags(event_up, flags)
+        Quartz.CGEventPost(Quartz.kCGHIDEventTap, event_up)
+
+        if interval > 0:
+            time.sleep(interval)
+
 
 def macos_click(x: int, y: int, clicks: int = 1) -> None:
     """

oagi/handler/_windows.py

@@ -0,0 +1,101 @@
+# -----------------------------------------------------------------------------
+#  Copyright (c) OpenAGI Foundation
+#  All rights reserved.
+#
+#  This file is part of the official API project.
+#  Licensed under the MIT License.
+# -----------------------------------------------------------------------------
+
+"""Windows-specific keyboard input handling.
+
+This module provides typewrite_exact() which types text exactly as specified,
+ignoring the system's capslock state by using SendInput with KEYEVENTF_UNICODE.
+"""
+
+import ctypes
+import time
+from ctypes import wintypes
+
+INPUT_KEYBOARD = 1
+KEYEVENTF_UNICODE = 0x0004
+KEYEVENTF_KEYUP = 0x0002
+
+
+class KEYBDINPUT(ctypes.Structure):
+    _fields_ = [
+        ("wVk", wintypes.WORD),
+        ("wScan", wintypes.WORD),
+        ("dwFlags", wintypes.DWORD),
+        ("time", wintypes.DWORD),
+        ("dwExtraInfo", ctypes.POINTER(ctypes.c_ulong)),
+    ]
+
+
+class MOUSEINPUT(ctypes.Structure):
+    _fields_ = [
+        ("dx", ctypes.c_long),
+        ("dy", ctypes.c_long),
+        ("mouseData", wintypes.DWORD),
+        ("dwFlags", wintypes.DWORD),
+        ("time", wintypes.DWORD),
+        ("dwExtraInfo", ctypes.POINTER(ctypes.c_ulong)),
+    ]
+
+
+class HARDWAREINPUT(ctypes.Structure):
+    _fields_ = [
+        ("uMsg", wintypes.DWORD),
+        ("wParamL", wintypes.WORD),
+        ("wParamH", wintypes.WORD),
+    ]
+
+
+class INPUT(ctypes.Structure):
+    class _I(ctypes.Union):
+        _fields_ = [
+            ("ki", KEYBDINPUT),
+            ("mi", MOUSEINPUT),
+            ("hi", HARDWAREINPUT),
+        ]
+
+    _anonymous_ = ("i",)
+    _fields_ = [
+        ("type", wintypes.DWORD),
+        ("i", _I),
+    ]
+
+
+# Configure SendInput with proper argtypes for 64-bit compatibility
+SendInput = ctypes.windll.user32.SendInput
+SendInput.argtypes = [wintypes.UINT, ctypes.POINTER(INPUT), ctypes.c_int]
+SendInput.restype = wintypes.UINT
+
+
+def typewrite_exact(text: str, interval: float = 0.01) -> None:
+    """Type text exactly using Unicode input - ignores capslock, keyboard layout, etc.
+
+    This function uses SendInput with KEYEVENTF_UNICODE to send characters
+    directly by their Unicode codepoint, completely bypassing keyboard state
+    (capslock, layout, etc.).
+
+    Args:
+        text: The text to type exactly as specified
+        interval: Time in seconds between each character (default: 0.01)
+    """
+    for char in text:
+        inputs = (INPUT * 2)()
+
+        # Key down
+        inputs[0].type = INPUT_KEYBOARD
+        inputs[0].ki.wScan = ord(char)
+        inputs[0].ki.dwFlags = KEYEVENTF_UNICODE
+
+        # Key up
+        inputs[1].type = INPUT_KEYBOARD
+        inputs[1].ki.wScan = ord(char)
+        inputs[1].ki.dwFlags = KEYEVENTF_UNICODE | KEYEVENTF_KEYUP
+
+        SendInput(2, inputs, ctypes.sizeof(INPUT))
+
+        if interval > 0:
+            time.sleep(interval)

oagi/handler/async_pyautogui_action_handler.py

@@ -29,6 +29,14 @@ class AsyncPyautoguiActionHandler:
         self.sync_handler = PyautoguiActionHandler(config=config)
         self.config = config or PyautoguiConfig()
 
+    def reset(self):
+        """Reset handler state.
+
+        Delegates to the underlying synchronous handler's reset method.
+        Called at automation start/end and when FINISH action is received.
+        """
+        self.sync_handler.reset()
+
     async def __call__(self, actions: list[Action]) -> None:
         """
         Execute actions asynchronously using a thread pool executor.

oagi/handler/capslock_manager.py

@@ -0,0 +1,55 @@
+# -----------------------------------------------------------------------------
+#  Copyright (c) OpenAGI Foundation
+#  All rights reserved.
+#
+#  This file is part of the official API project.
+#  Licensed under the MIT License.
+# -----------------------------------------------------------------------------
+
+
+class CapsLockManager:
+    """Manages caps lock state for text transformation.
+
+    This class maintains an internal caps lock state that can be toggled
+    independently of the system's caps lock state. This allows for consistent
+    text case handling during automation regardless of the system state.
+    """
+
+    def __init__(self, mode: str = "session"):
+        """Initialize caps lock manager.
+
+        Args:
+            mode: Either "session" (internal state) or "system" (OS-level)
+        """
+        self.mode = mode
+        self.caps_enabled = False
+
+    def reset(self):
+        """Reset caps lock state to default (off).
+
+        Called at automation start/end and when FINISH action is received.
+        """
+        self.caps_enabled = False
+
+    def toggle(self):
+        """Toggle caps lock state in session mode."""
+        if self.mode == "session":
+            self.caps_enabled = not self.caps_enabled
+
+    def transform_text(self, text: str) -> str:
+        """Transform text based on caps lock state.
+
+        Args:
+            text: Input text to transform
+
+        Returns:
+            Transformed text (uppercase alphabets if caps enabled in session mode)
+        """
+        if self.mode == "session" and self.caps_enabled:
+            # Transform letters to uppercase, preserve special characters
+            return "".join(c.upper() if c.isalpha() else c for c in text)
+        return text
+
+    def should_use_system_capslock(self) -> bool:
+        """Check if system-level caps lock should be used."""
+        return self.mode == "system"

oagi/handler/pyautogui_action_handler.py

@@ -13,48 +13,15 @@ from pydantic import BaseModel, Field
 
 from ..exceptions import check_optional_dependency
 from ..types import Action, ActionType, parse_coords, parse_drag_coords, parse_scroll
+from .capslock_manager import CapsLockManager
 
 check_optional_dependency("pyautogui", "PyautoguiActionHandler", "desktop")
 import pyautogui  # noqa: E402
 
 if sys.platform == "darwin":
     from . import _macos
-
-
-class CapsLockManager:
-    """Manages caps lock state for text transformation."""
-
-    def __init__(self, mode: str = "session"):
-        """Initialize caps lock manager.
-
-        Args:
-            mode: Either "session" (internal state) or "system" (OS-level)
-        """
-        self.mode = mode
-        self.caps_enabled = False
-
-    def toggle(self):
-        """Toggle caps lock state in session mode."""
-        if self.mode == "session":
-            self.caps_enabled = not self.caps_enabled
-
-    def transform_text(self, text: str) -> str:
-        """Transform text based on caps lock state.
-
-        Args:
-            text: Input text to transform
-
-        Returns:
-            Transformed text (uppercase if caps enabled in session mode)
-        """
-        if self.mode == "session" and self.caps_enabled:
-            # Transform letters to uppercase, preserve special characters
-            return "".join(c.upper() if c.isalpha() else c for c in text)
-        return text
-
-    def should_use_system_capslock(self) -> bool:
-        """Check if system-level caps lock should be used."""
-        return self.mode == "system"
+elif sys.platform == "win32":
+    from . import _windows
 
 
 class PyautoguiConfig(BaseModel):
@@ -111,6 +78,14 @@ class PyautoguiActionHandler:
         # Initialize caps lock manager
         self.caps_manager = CapsLockManager(mode=self.config.capslock_mode)
 
+    def reset(self):
+        """Reset handler state.
+
+        Called at automation start/end and when FINISH action is received.
+        Resets the internal capslock state.
+        """
+        self.caps_manager.reset()
+
     def _denormalize_coords(self, x: float, y: float) -> tuple[int, int]:
         """Convert coordinates from 0-1000 range to actual screen coordinates.
 
@@ -238,7 +213,14 @@ class PyautoguiActionHandler:
                 text = arg.strip("\"'")
                 # Apply caps lock transformation if needed
                 text = self.caps_manager.transform_text(text)
-                pyautogui.typewrite(text)
+                # Use platform-specific typing that ignores system capslock
+                if sys.platform == "darwin":
+                    _macos.typewrite_exact(text)
+                elif sys.platform == "win32":
+                    _windows.typewrite_exact(text)
+                else:
+                    # Fallback for other platforms
+                    pyautogui.typewrite(text)
 
             case ActionType.SCROLL:
                 x, y, direction = self._parse_scroll(arg)
@@ -251,8 +233,8 @@ class PyautoguiActionHandler:
                 pyautogui.scroll(scroll_amount)
 
             case ActionType.FINISH:
-                # Task completion - no action needed
-                pass
+                # Task completion - reset handler state
+                self.reset()
 
             case ActionType.WAIT:
                 # Wait for a short period

oagi/server/session_store.py

@@ -11,7 +11,7 @@ from datetime import datetime
 from typing import Any
 from uuid import uuid4
 
-from ..constants import MODE_ACTOR, MODEL_ACTOR
+from ..constants import DEFAULT_TEMPERATURE_LOW, MODE_ACTOR, MODEL_ACTOR
 
 
 class Session:
@@ -21,7 +21,7 @@ class Session:
         instruction: str,
         mode: str = MODE_ACTOR,
         model: str = MODEL_ACTOR,
-        temperature: float = 0.0,
+        temperature: float = DEFAULT_TEMPERATURE_LOW,
     ):
         self.session_id: str = session_id
         self.instruction: str = instruction
@@ -57,7 +57,7 @@ class SessionStore:
         instruction: str,
         mode: str = MODE_ACTOR,
         model: str = MODEL_ACTOR,
-        temperature: float = 0.0,
+        temperature: float = DEFAULT_TEMPERATURE_LOW,
         session_id: str | None = None,
     ) -> str:
         if session_id is None:

oagi/server/socketio_server.py

@@ -158,8 +158,8 @@ class SessionNamespace(socketio.AsyncNamespace):
             session_store.update_activity(session_id)
 
             logger.info(
-                f"Session {session_id} initialized with: {event_data.instruction} "
-                f"(mode={event_data.mode}, model={event_data.model})"
+                f"Session {session_id} initialized with: {session.instruction} "
+                f"(mode={session.mode}, model={session.model})"
             )
 
             # Create agent and wrappers
@@ -168,8 +168,8 @@ class SessionNamespace(socketio.AsyncNamespace):
                 api_key=self.config.oagi_api_key,
                 base_url=self.config.oagi_base_url,
                 max_steps=self.config.max_steps,
-                model=event_data.model,
-                temperature=event_data.temperature,
+                model=session.model,
+                temperature=session.temperature,
             )
 
             action_handler = SocketIOActionHandler(self, session)

oagi/types/__init__.py

@@ -32,7 +32,7 @@ from .step_observer import (
     SplitEvent,
     StepEvent,
 )
-from .url import URL
+from .url import URL, extract_uuid_from_url
 
 __all__ = [
     "Action",
@@ -55,6 +55,7 @@ __all__ = [
     "ImageProvider",
     "AsyncImageProvider",
     "URL",
+    "extract_uuid_from_url",
     "parse_coords",
     "parse_drag_coords",
     "parse_scroll",

oagi/types/url.py

@@ -1,3 +1,28 @@
+import re
 from typing import NewType
 
 URL = NewType("URL", str)
+
+# Pattern to extract UUID from S3 URL
+# Formats:
+#   - https://bucket.s3.amazonaws.com/{user_id}/{uuid}.{ext}  (download URL)
+#   - https://bucket.s3.amazonaws.com/{user_id}/{uuid}?...    (presigned URL)
+_UUID_PATTERN = re.compile(
+    r"/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})(?:\.[a-z]+)?(?:\?|$)",
+    re.IGNORECASE,
+)
+
+
+def extract_uuid_from_url(url: str) -> str | None:
+    """Extract UUID from S3 URL.
+
+    Args:
+        url: S3 URL in one of these formats:
+            - https://bucket.s3.amazonaws.com/{user_id}/{uuid}.jpg (download URL)
+            - https://bucket.s3.amazonaws.com/{user_id}/{uuid}?... (presigned URL)
+
+    Returns:
+        UUID string if found, None otherwise
+    """
+    match = _UUID_PATTERN.search(url)
+    return match.group(1) if match else None

{oagi_core-0.10.3.dist-info → oagi_core-0.11.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: oagi-core
-Version: 0.10.3
+Version: 0.11.0
 Summary: Official API of OpenAGI Foundation
 Project-URL: Homepage, https://github.com/agiopen-org/oagi
 Author-email: OpenAGI Foundation <contact@agiopen.org>
@@ -116,6 +116,39 @@ config = PyautoguiConfig(
 action_handler = AsyncPyautoguiActionHandler(config=config)
 ```
 
+### Command Line Interface
+
+Run agents directly from the terminal:
+
+```bash
+# Run with actor model
+oagi agent run "Go to nasdaq.com, search for AAPL. Under More, go to Insider Activity" --model lux-actor-1
+
+# Run with thinker mode (uses lux-thinker-1 model with more steps)
+oagi agent run "Look up the store hours for the nearest Apple Store to zip code 23456 using the Apple Store Locator" --model lux-thinker-1
+
+# Run pre-configured tasker workflows (no instruction needed)
+oagi agent run --mode tasker:software_qa
+
+# List all available modes
+oagi agent modes
+
+# Check macOS permissions (screen recording & accessibility)
+oagi agent permission
+
+# Export execution history
+oagi agent run "Complete the form" --export html --export-file report.html
+```
+
+CLI options:
+- `--mode`: Agent mode (default: actor). Use `oagi agent modes` to list available modes
+- `--model`: Override the model (default: determined by mode)
+- `--max-steps`: Maximum steps (default: determined by mode)
+- `--temperature`: Sampling temperature (default: determined by mode)
+- `--step-delay`: Delay after each action before next screenshot (default: 0.3s)
+- `--export`: Export format (markdown, html, json)
+- `--export-file`: Output file path for export
+
 ### Image Processing
 
 Process and optimize images before sending to API:

{oagi_core-0.10.3.dist-info → oagi_core-0.11.0.dist-info}/RECORD

@@ -3,8 +3,8 @@ oagi/constants.py,sha256=ZhlY_g3Z8w8njvoVykuGe3nty8A1LoGpRo5oJPh6qS0,1142
 oagi/exceptions.py,sha256=Rco37GQTPYUfc2vRO3hozxPF_s8mKFDpFvBg2UKWo3Y,3066
 oagi/logging.py,sha256=YT3KCMFj5fzO98R9xlDDgfSotUuz1xRD6OZeYM2rKoo,1760
 oagi/agent/__init__.py,sha256=KTVLUMhbjgpTJoOWMUZkkiqwhgumvbOZV2tJ9XCLfao,901
-oagi/agent/default.py,sha256=zHcTGyMv5QKE2tqwAsKsN6YyMWeSxCGCMzmv2PHdzMk,4520
-oagi/agent/factories.py,sha256=i-GIOEYmwBiiTq4W8UzKfZPkuZcMuOrlc_8dkxM1zLs,2727
+oagi/agent/default.py,sha256=Ers1Dk6BX-s24ZZXOfiXt9wsilx_LHuTNgi3Yj7Hin4,4653
+oagi/agent/factories.py,sha256=syi_EOlU4SUjo-0CKaML8eIPu3ToUEKua2VHp9lvNF0,5839
 oagi/agent/protocol.py,sha256=IQJGiMN4yZIacrh5e9JQsoM9TyHb8wJRQR4LAk8dSA0,1615
 oagi/agent/registry.py,sha256=7bMA2-pH3xQ9ZavrHB_mnc2fOGSMeICPbOGtHoM7It0,4851
 oagi/agent/observer/__init__.py,sha256=YZ4qvR22pFB0mSDMX6iKKLbBA1dB-nqC7HZVvdMIVGw,909
@@ -16,11 +16,11 @@ oagi/agent/observer/report_template.html,sha256=NOp280_-P2g_4TYbtqPhYxv-y_x3Pwov
 oagi/agent/tasker/__init__.py,sha256=1iTEFe7lzcqh96TL9R0QADPpLJLrUP0shtZ4DlZSv_8,764
 oagi/agent/tasker/memory.py,sha256=NR13l5yxRA8GUE-oupAP4W1n80ZNG0SxpUfxsNltkUY,5033
 oagi/agent/tasker/models.py,sha256=sMQgwIMKhT1tvVF2yoc1hh8GwEiJ6i6qPMy9WoiA8JM,2137
-oagi/agent/tasker/planner.py,sha256=RxDilAGJAaC8gu9EkTwBATDLv7lQlzc3LMyxs0KMR74,14516
-oagi/agent/tasker/taskee_agent.py,sha256=MHl_ZH0p8fJ9iSG-VZe_4WUzdyjg4cLZbvEnccQcV2w,17263
-oagi/agent/tasker/tasker_agent.py,sha256=P0O4Ned8U0JfMFLWT2JCYXyfuHbU8XziPSotrRuNzMM,11157
+oagi/agent/tasker/planner.py,sha256=nSOOcB4NzrOONFhfNvYzxxrelU5NxpbLMpC7B5Q-L-k,15211
+oagi/agent/tasker/taskee_agent.py,sha256=jYG-c36zbhDM3EEt6-YzLlk-K6n7mjFNquEd6BPaRvw,17867
+oagi/agent/tasker/tasker_agent.py,sha256=kbWvvRVS12S8eFd0PRszFrcSSWRzz_f6Jd7LuaRcwJQ,11285
 oagi/cli/__init__.py,sha256=aDnJViTseShpo5fdGPTj-ELysZhmdvB6Z8mEj2D-_N4,359
-oagi/cli/agent.py,sha256=eFwdVZdZcG9ZTMupwoH_JqKSRKDAto3j3z4Xqz5XH7g,10225
+oagi/cli/agent.py,sha256=fd7WtR5zoRJmyHDr67zfBvEX-_BLIjPbBqp-dhy4AAk,11061
 oagi/cli/display.py,sha256=Y8_Dn5RIEfRqZUHVGF6URItW0C3XC7bPLWoAmmhvBS0,1829
 oagi/cli/main.py,sha256=faHns0HaQCGyylDn2YZLpjQESuEiMYjoQVoMkt8FsH4,2292
 oagi/cli/server.py,sha256=JFpzCOeaftITxesz8Ya-_Efs03bgotBg7aYwmMZhPwU,3033
@@ -30,41 +30,43 @@ oagi/client/__init__.py,sha256=F9DShPUdb6vZYmN1fpM1VYzp4MWqUao_e_R1KYmM4Q4,410
 oagi/client/async_.py,sha256=Z8DyQHEl_XAyw1Fs0o3qQzEX9lGlZhqCTSEtQh5XHSw,11204
 oagi/client/base.py,sha256=tKYmhJufg7sqEOOp7nn0S9jv4hDYfM-pBuluh0pqew0,16756
 oagi/client/sync.py,sha256=CcesgCk_b26v_DF9OKpjfSHKSMjK0N2ywAxwaGnJ4fo,11040
-oagi/handler/__init__.py,sha256=Ha11L42K33K3L9S4lQ10UC0DnD5g6egtQUsJpS_tKgg,835
-oagi/handler/_macos.py,sha256=aHkp-xGzvWL_SBjuS690i9jf93OITFJfGHzHeYCK65I,1957
-oagi/handler/async_pyautogui_action_handler.py,sha256=hQzseR1yBD0QMpgsEVNsUmuApGVAIIyGYD06BXd82Dc,1615
+oagi/handler/__init__.py,sha256=vEUvyiUvTRf1GE4vTiz_bQjLv3psdmHyt0mfKJHq24M,1247
+oagi/handler/_macos.py,sha256=Gs8GrhA_WAyv9Yw0D41duliP32Xk6vouyMeWjWJJT90,5187
+oagi/handler/_windows.py,sha256=MSgPDYEOetSjbn9eJDSrdzBVlUGgGsTlegaTDc4C4Ss,2828
+oagi/handler/async_pyautogui_action_handler.py,sha256=wfNRBBURZnwQkNTcs9OPMmFJIAPtnXmcqxWbjda_q7I,1863
 oagi/handler/async_screenshot_maker.py,sha256=8QCtUV59ozpOpvkqhUMb8QDI2qje2gsoFT1qB60tfJM,1689
+oagi/handler/capslock_manager.py,sha256=40LzWt1_1wbncF5koUTdbd9V3eo5Ex_mEWwjtEmHAf4,1878
 oagi/handler/pil_image.py,sha256=yUcAoGBL-aZ0PCjSaAmQsDwtyzjldXHqXQp_OYRk6e4,4080
-oagi/handler/pyautogui_action_handler.py,sha256=vxSkD_Xsshxb6cfoFFd_zpAwQm21cYTk4w1BGenKZes,10604
+oagi/handler/pyautogui_action_handler.py,sha256=BVmpKuYAMINJ5Ue_PK_WxFScAqLeyXC64g4NWQUtG_M,10146
 oagi/handler/screenshot_maker.py,sha256=j1jTW-awx3vAnb1N5_FIMBC0Z-rNVQbiBP-S6Gh5dlE,1284
 oagi/server/__init__.py,sha256=uZx8u3vJUb87kkNzwmmVrgAgbqRu0WxyMIQCLSx56kk,452
 oagi/server/agent_wrappers.py,sha256=j8va0A7u80bzOM82nndAplK1uaO_T3kufHWScK6kfWM,3263
 oagi/server/config.py,sha256=AJ1PLKuxrc6pRuur1hm5DwG2g2otxPwOCfKgzIACkSk,1691
 oagi/server/main.py,sha256=jnTxk7Prc5CzlsUnkBNJp4MOoYN-7HN_Be_m1d3COa8,4829
 oagi/server/models.py,sha256=DXjuf5icpCOgCUGMzzoLfRCoreM541KBWKBZnCk5_S0,2688
-oagi/server/session_store.py,sha256=319CDqGT9bnqaHK5JiLCG2mKxJmIbq1eH3BpjhWLxdI,3685
-oagi/server/socketio_server.py,sha256=0JUf8Y6r9Y7gmltznnsGsEeTp1FhT7AxohSHeBuH3R8,14233
+oagi/server/session_store.py,sha256=l7t31rNWuZkIPLnaqrllVusHkJkE8j50PMfyb1di9mI,3750
+oagi/server/socketio_server.py,sha256=8RRf8mAmsArOX2nWylT0g5T5On0gzMod0TWRmk0vrgA,14218
 oagi/task/__init__.py,sha256=g_8_7ZLDLKuCGzyrB42OzY3gSOjd_SxzkJW3_pf-PXs,662
 oagi/task/async_.py,sha256=12BrdE-51bEz2-PZv5X2VW__I_nwq2K1YxGfD3wFxos,3190
 oagi/task/async_short.py,sha256=wVMYpsKGbvqYIe2Ws7cMf8-t7SZKmtrgjW1x_RENMgg,2820
 oagi/task/base.py,sha256=6F_nmJsb2Zw6nUibJyAEW0uQBY_jHiQINUbd_jT5wkQ,5696
 oagi/task/short.py,sha256=D5VX8QGy0o8W7njy74jx95PxU0Rv2Nvoa-2T17aBaZQ,2629
 oagi/task/sync.py,sha256=pKRpIFcetm1n2BgmYGWQeWgV3kKLAQRG9xPlBVQ_pho,3024
-oagi/types/__init__.py,sha256=nhxQBaDssygtscetliQa3AaryvuNZhkVmBYsVcuR-qg,1332
+oagi/types/__init__.py,sha256=_UyzzRnoKvp00BUBjxW9Tv3_xBNf8Lxb2PUC2DkjOkg,1384
 oagi/types/action_handler.py,sha256=NH8E-m5qpGqWcXzTSWfF7W0Xdp8SkzJsbhCmQ0B96cg,1075
 oagi/types/async_action_handler.py,sha256=k1AaqSkFcXlxwW8sn-w0WFHGsIqHFLbcOPrkknmSVug,1116
 oagi/types/async_image_provider.py,sha256=UwDl7VOCA3tiSP5k1fnxK86iEa84Yr57MVaoBSa3hOE,1203
 oagi/types/image.py,sha256=KgPCCTJ6D5vHIaGZdbTE7eQEa1WlT6G9tf59ZuUCV2U,537
 oagi/types/image_provider.py,sha256=IhKEnwCGZ5l_rO3AvJ6xv5RZMTmTDmqsFRynI9h0R_M,1145
 oagi/types/step_observer.py,sha256=wXuChzsof7Rh4azvDTIQ22gAwZAYjMAOVIuL8ZGtw-M,2315
-oagi/types/url.py,sha256=Q-1jf5L_4rad4dxyLTg4MXadGgpkH3w4dcoVrVupW-A,54
+oagi/types/url.py,sha256=145jLl3yecFBVKhJDbrR63C48D3l9_w0kpA_8C_gM78,868
 oagi/types/models/__init__.py,sha256=gnFh4TddritHjT0Chy-4fv3KZIC6bYCUyGmWm_2IuZw,879
 oagi/types/models/action.py,sha256=Q14xfYJrj9IsrqxDpEIzd6iWS-gLmNHfIX6Ef8k0O9E,2497
 oagi/types/models/client.py,sha256=1xIKBgLSheHfqYbcyRKMDOLQJaKijaKQ5l-COc6e7_k,1471
 oagi/types/models/image_config.py,sha256=tl6abVg_-IAPLwpaWprgknXu7wRWriMg-AEVyUX73v0,1567
 oagi/types/models/step.py,sha256=RSI4H_2rrUBq_xyCoWKaq7JHdJWNobtQppaKC1l0aWU,471
-oagi_core-0.10.3.dist-info/METADATA,sha256=XvsZ9dqWB1fDxdazYcT5u8-k9aeKqZBmtmmm_x0JEMo,8269
-oagi_core-0.10.3.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-oagi_core-0.10.3.dist-info/entry_points.txt,sha256=zzgsOSWX6aN3KUB0Z1it8DMxFFBJBqmZVqMVAJRjYuw,44
-oagi_core-0.10.3.dist-info/licenses/LICENSE,sha256=sy5DLA2M29jFT4UfWsuBF9BAr3FnRkYtnAu6oDZiIf8,1075
-oagi_core-0.10.3.dist-info/RECORD,,
+oagi_core-0.11.0.dist-info/METADATA,sha256=y251pGqY3CfcN4umrr21EEMTUTRzvYUQXkruKv6d-e4,9497
+oagi_core-0.11.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+oagi_core-0.11.0.dist-info/entry_points.txt,sha256=zzgsOSWX6aN3KUB0Z1it8DMxFFBJBqmZVqMVAJRjYuw,44
+oagi_core-0.11.0.dist-info/licenses/LICENSE,sha256=sy5DLA2M29jFT4UfWsuBF9BAr3FnRkYtnAu6oDZiIf8,1075
+oagi_core-0.11.0.dist-info/RECORD,,