From ba8df66b0fd2bcbc5fd5fd18785fecbee86ad1bb Mon Sep 17 00:00:00 2001
From: Mariozada <abouzeidmoe3@gmail.com>
Date: Thu, 30 Apr 2026 20:15:28 +1000
Subject: [PATCH] fix: apply same manual-paste retry to OpenAI and Anthropic
 OAuth flows

---
 .../agent/utils/oauth/anthropic_oauth_llm.py  | 48 +++++++++++++------
 .../agent/utils/oauth/openai_oauth_llm.py     | 48 +++++++++++++------
 2 files changed, 68 insertions(+), 28 deletions(-)

diff --git a/mobilerun/agent/utils/oauth/anthropic_oauth_llm.py b/mobilerun/agent/utils/oauth/anthropic_oauth_llm.py
index a5fa1b3..14a3ac8 100644
--- a/mobilerun/agent/utils/oauth/anthropic_oauth_llm.py
+++ b/mobilerun/agent/utils/oauth/anthropic_oauth_llm.py
@@ -409,6 +409,7 @@ class AnthropicOAuthLLM(CustomLLM):
     ) -> str:
         result: Dict[str, Optional[str]] = {"code": None, "state": None, "error": None}
         manual_code: Dict[str, Optional[str]] = {"code": None}
+        manual_failed = threading.Event()
         done = threading.Event()
 
         code_verifier, code_challenge = _pkce_pair()
@@ -487,20 +488,36 @@ class AnthropicOAuthLLM(CustomLLM):
             )
             if enable_manual:
                 def _read_manual() -> None:
-                    try:
-                        raw = str(input("Or paste the redirect URL / authorization code: "))
-                    except Exception:
-                        return
-                    if done.is_set() or not raw.strip():
-                        return
-                    try:
-                        code = _normalize_manual_code(raw, state)
-                    except Exception as e:  # noqa: BLE001
-                        print(f"Invalid paste: {e}")
-                        return
-                    if code:
-                        manual_code["code"] = code
-                        done.set()
+                    for attempt in range(2):
+                        if done.is_set():
+                            return
+                        try:
+                            raw = str(input("Or paste the redirect URL / authorization code: "))
+                        except Exception:
+                            return
+                        if done.is_set():
+                            return
+                        if not raw.strip():
+                            if attempt == 0:
+                                print("Invalid paste. Try again.")
+                                continue
+                            manual_failed.set()
+                            done.set()
+                            return
+                        try:
+                            code = _normalize_manual_code(raw, state)
+                        except Exception:  # noqa: BLE001
+                            if attempt == 0:
+                                print("Invalid paste. Try again.")
+                                continue
+                            print("Invalid paste.")
+                            manual_failed.set()
+                            done.set()
+                            return
+                        if code:
+                            manual_code["code"] = code
+                            done.set()
+                            return
 
                 manual_thread = threading.Thread(target=_read_manual, daemon=True)
                 manual_thread.start()
@@ -508,6 +525,9 @@ class AnthropicOAuthLLM(CustomLLM):
             if not done.wait(timeout=timeout_seconds):
                 raise TimeoutError("OAuth login timed out before callback was received.")
 
+            if manual_failed.is_set():
+                raise RuntimeError("Login failed.")
+
             if manual_code["code"]:
                 code_to_exchange = manual_code["code"]
             else:
diff --git a/mobilerun/agent/utils/oauth/openai_oauth_llm.py b/mobilerun/agent/utils/oauth/openai_oauth_llm.py
index e2ce362..9fd757c 100644
--- a/mobilerun/agent/utils/oauth/openai_oauth_llm.py
+++ b/mobilerun/agent/utils/oauth/openai_oauth_llm.py
@@ -569,6 +569,7 @@ class OpenAIOAuth(OpenAI):
 
         result: Dict[str, Optional[str]] = {"code": None, "state": None, "error": None}
         manual_code: Dict[str, Optional[str]] = {"code": None}
+        manual_failed = threading.Event()
         done = threading.Event()
         code_verifier, code_challenge = _pkce_pair()
         state = _b64_no_pad(secrets.token_bytes(32))
@@ -648,20 +649,36 @@ class OpenAIOAuth(OpenAI):
             )
             if enable_manual:
                 def _read_manual() -> None:
-                    try:
-                        raw = str(input("Or paste the redirect URL / authorization code: "))
-                    except Exception:
-                        return
-                    if done.is_set() or not raw.strip():
-                        return
-                    try:
-                        code = _normalize_manual_code(raw, state)
-                    except Exception as e:  # noqa: BLE001
-                        print(f"Invalid paste: {e}")
-                        return
-                    if code:
-                        manual_code["code"] = code
-                        done.set()
+                    for attempt in range(2):
+                        if done.is_set():
+                            return
+                        try:
+                            raw = str(input("Or paste the redirect URL / authorization code: "))
+                        except Exception:
+                            return
+                        if done.is_set():
+                            return
+                        if not raw.strip():
+                            if attempt == 0:
+                                print("Invalid paste. Try again.")
+                                continue
+                            manual_failed.set()
+                            done.set()
+                            return
+                        try:
+                            code = _normalize_manual_code(raw, state)
+                        except Exception:  # noqa: BLE001
+                            if attempt == 0:
+                                print("Invalid paste. Try again.")
+                                continue
+                            print("Invalid paste.")
+                            manual_failed.set()
+                            done.set()
+                            return
+                        if code:
+                            manual_code["code"] = code
+                            done.set()
+                            return
 
                 manual_thread = threading.Thread(target=_read_manual, daemon=True)
                 manual_thread.start()
@@ -669,6 +686,9 @@ class OpenAIOAuth(OpenAI):
             if not done.wait(timeout=timeout_seconds):
                 raise TimeoutError("OAuth login timed out before callback was received.")
 
+            if manual_failed.is_set():
+                raise RuntimeError("Login failed.")
+
             if manual_code["code"]:
                 code_to_exchange = manual_code["code"]
             else: