Add support for additional Claude accounts

Author: sjarmak

configs/_common.sh

@@ -18,6 +18,8 @@
 import time
 from pathlib import Path
 
+from account_health import collect_account_status, discover_account_homes
+
 REAL_HOME = os.environ.get("HOME", os.path.expanduser("~"))
 
 
@@ -75,7 +77,7 @@ def try_refresh_token(creds_file: Path) -> dict | None:
     return {"expires_in": expires_in, "remaining_min": expires_in // 60}
 
 
-def check_oauth_token(home_dir: str | None = None) -> dict:
+def check_oauth_token(home_dir: str | None = None, allow_refresh: bool = False) -> dict:
     """Check OAuth token validity and time remaining."""
     home = home_dir or REAL_HOME
     creds_file = Path(home) / ".claude" / ".credentials.json"
@@ -107,8 +109,8 @@ def check_oauth_token(home_dir: str | None = None) -> dict:
     has_refresh = bool(oauth.get("refreshToken"))
 
     if remaining_s <= 0:
-        # Access token expired — try to refresh it
-        if has_refresh:
+        if has_refresh and allow_refresh:
+            # Access token expired — optional refresh path
             refresh_result = try_refresh_token(creds_file)
             if refresh_result:
                 return {
@@ -128,12 +130,14 @@ def check_oauth_token(home_dir: str | None = None) -> dict:
                     "has_refresh_token": has_refresh,
                     "home": home,
                 }
+        status = "WARN" if has_refresh else "FAIL"
+        action = "refresh/login recommended" if has_refresh else "Run: claude login"
         return {
             "check": "oauth_token",
-            "status": "FAIL",
-            "message": f"Token EXPIRED ({abs(remaining_min)} min ago), no refresh token. Run: claude login",
+            "status": status,
+            "message": f"Token EXPIRED ({abs(remaining_min)} min ago), {action}",
             "remaining_minutes": remaining_min,
-            "has_refresh_token": False,
+            "has_refresh_token": has_refresh,
             "home": home,
         }
     elif remaining_s < 1800:  # < 30 min
@@ -156,32 +160,29 @@ def check_oauth_token(home_dir: str | None = None) -> dict:
         }
 
 
-def check_multi_account_tokens() -> list[dict]:
+def check_multi_account_tokens(allow_refresh: bool = False) -> list[dict]:
     """Check tokens for all accounts under ~/.claude-homes/."""
-    results = []
-    homes_dir = Path(REAL_HOME) / ".claude-homes"
-
-    if not homes_dir.is_dir():
-        # Single account mode
-        results.append(check_oauth_token())
-        return results
-
-    account_num = 1
-    found_any = False
-    while True:
-        account_home = homes_dir / f"account{account_num}"
-        creds = account_home / ".claude" / ".credentials.json"
-        if creds.is_file():
-            found_any = True
-            results.append(check_oauth_token(str(account_home)))
-            account_num += 1
-        else:
-            break
+    real_home_path = Path(REAL_HOME)
+    return [
+        check_oauth_token(
+            None if home == real_home_path else str(home),
+            allow_refresh=allow_refresh,
+        )
+        for home in discover_account_homes(real_home_path)
+    ]
 
-    if not found_any:
-        results.append(check_oauth_token())
 
-    return results
+def check_account_readiness() -> dict:
+    """Summarize launch-safe accounts using deterministic local signals."""
+    report = collect_account_status()
+    summary = report["summary"]
+    action = report["recommended_action"]
+    status = "OK" if report["ok_to_launch"] else "FAIL"
+    return {
+        "check": "account_readiness",
+        "status": status,
+        "message": f"{summary}; action={action}",
+    }
 
 
 def check_env_local() -> dict:
@@ -380,7 +381,7 @@ def format_table(results: list[dict]) -> str:
     elif warns:
         lines.append(f"\033[93mREADY with {warns} warning(s). Runs may partially fail.\033[0m")
     else:
-        lines.append(f"\033[92mALL CLEAR: Infrastructure ready for benchmark runs.\033[0m")
+        lines.append("\033[92mALL CLEAR: Infrastructure ready for benchmark runs.\033[0m")
 
     return "\n".join(lines)
 
@@ -390,12 +391,18 @@ def main():
         description="Check infrastructure readiness before benchmark runs."
     )
     parser.add_argument("--format", choices=["table", "json"], default="table")
+    parser.add_argument(
+        "--refresh-tokens",
+        action="store_true",
+        help="Allow OAuth token refresh during infra check.",
+    )
     args = parser.parse_args()
 
     results = []
 
     # Token checks (handles multi-account)
-    results.extend(check_multi_account_tokens())
+    results.extend(check_multi_account_tokens(allow_refresh=args.refresh_tokens))
+    results.append(check_account_readiness())
 
     # Environment
     results.append(check_env_local())

scripts/account_health.py

@@ -1613,7 +1613,7 @@ def main() -> int:
             log.error("DAYTONA_API_KEY required. Set in env or ~/.config/daytona/env.sh")
             return 1
         if not creds.get("oauth_creds"):
-            log.error("OAuth credentials required. Check ~/.claude-homes/account1/.claude/.credentials.json")
+            log.error("OAuth credentials required. Check ~/.claude-homes/accountN/.claude/.credentials.json")
             return 1
 
     # Dispatch to appropriate mode

scripts/check_infra.py

@@ -24,6 +24,7 @@
 import argparse
 import json
 import os
+import re
 import sys
 import time
 import urllib.request
@@ -85,6 +86,7 @@ def load_src_access_token():
 OAUTH_CLIENT_ID = "9d1c250a-e61b-44d9-88ed-5944d1962f5e"  # Official Claude Code CLI client ID
 OAUTH_TOKEN_URL = "https://console.anthropic.com/api/oauth/token"
 REFRESH_MARGIN = 1800  # 30 minutes — refresh if token expires within this window
+ACCOUNT_NAME_RE = re.compile(r"account(\d+)$")
 
 
 def _account_creds_path(account_num):
@@ -97,19 +99,39 @@ def _account_home(account_num):
     return Path.home() / ".claude-homes" / f"account{account_num}"
 
 
+def _discover_account_numbers():
+    """Return configured account numbers under ~/.claude-homes/accountN."""
+    homes_dir = Path.home() / ".claude-homes"
+    if not homes_dir.is_dir():
+        return []
+
+    account_numbers = []
+    for path in homes_dir.iterdir():
+        if not path.is_dir():
+            continue
+        match = ACCOUNT_NAME_RE.fullmatch(path.name)
+        if match:
+            account_numbers.append(int(match.group(1)))
+    return sorted(account_numbers)
+
+
 def list_oauth_accounts():
     """List available OAuth accounts and their token status."""
     accounts = []
-    num = 1
-    while True:
+    for num in _discover_account_numbers():
         creds_path = _account_creds_path(num)
         if not creds_path.exists():
             # Also try without leading dot
             alt_path = creds_path.parent / "credentials.json"
             if alt_path.exists():
                 creds_path = alt_path
             else:
-                break
+                accounts.append({
+                    "num": num,
+                    "path": str(creds_path),
+                    "error": "missing credentials",
+                })
+                continue
         try:
             creds = json.loads(creds_path.read_text())
             oauth = creds.get("claudeAiOauth", {})
@@ -126,7 +148,6 @@ def list_oauth_accounts():
             })
         except Exception as e:
             accounts.append({"num": num, "path": str(creds_path), "error": str(e)})
-        num += 1
     return accounts
 
 
@@ -551,7 +572,7 @@ def main():
     )
     parser.add_argument(
         "--account", type=int, default=1,
-        help="OAuth account number (1-3). Used with --auth oauth. Default: 1",
+        help="OAuth account number under ~/.claude-homes/accountN. Default: 1",
     )
     parser.add_argument(
         "--list-accounts", action="store_true",
@@ -566,7 +587,7 @@ def main():
             print("No OAuth accounts found at ~/.claude-homes/accountN/.claude/.credentials.json")
             print("\nTo set up accounts, create the directory structure:")
             print("  mkdir -p ~/.claude-homes/account1/.claude")
-            print("  # Then run: HOME=~/.claude-homes/account1 claude  (to login via browser)")
+            print("  # Or run: python3 scripts/headless_login.py --account 1")
         else:
             print(f"Found {len(accounts)} OAuth account(s):\n")
             for a in accounts:
@@ -598,8 +619,7 @@ def main():
             print(f"ERROR: Failed to load OAuth credentials for account {args.account}: {e}")
             print("\nTo set up OAuth accounts:")
             print(f"  mkdir -p ~/.claude-homes/account{args.account}/.claude")
-            print(f"  HOME=~/.claude-homes/account{args.account} claude")
-            print("  # Complete browser login, then credentials are saved automatically")
+            print(f"  python3 scripts/headless_login.py --account {args.account}")
             sys.exit(1)
     else:
         anthropic_key = load_anthropic_api_key()

scripts/daytona_curator_runner.py

@@ -27,6 +27,7 @@
 import json
 import logging
 import os
+import re
 import sys
 import time
 import urllib.error
@@ -66,6 +67,7 @@
 }
 
 MCP_CONFIGS = {"mcp-remote-direct", "mcp-remote-artifact"}
+ACCOUNT_NAME_RE = re.compile(r"account(\d+)$")
 
 
 def resolve_dockerfile_name(task: "TaskSpec", config_name: str) -> str:
@@ -134,17 +136,36 @@ def _account_creds_path(account_num: int) -> Path:
     return Path.home() / ".claude-homes" / f"account{account_num}" / ".claude" / ".credentials.json"
 
 
+def _discover_account_numbers() -> List[int]:
+    homes_dir = Path.home() / ".claude-homes"
+    if not homes_dir.is_dir():
+        return []
+
+    account_numbers: List[int] = []
+    for path in homes_dir.iterdir():
+        if not path.is_dir():
+            continue
+        match = ACCOUNT_NAME_RE.fullmatch(path.name)
+        if match:
+            account_numbers.append(int(match.group(1)))
+    return sorted(account_numbers)
+
+
 def list_oauth_accounts() -> List[dict]:
     accounts = []
-    num = 1
-    while True:
+    for num in _discover_account_numbers():
         creds_path = _account_creds_path(num)
         if not creds_path.exists():
             alt_path = creds_path.parent / "credentials.json"
             if alt_path.exists():
                 creds_path = alt_path
             else:
-                break
+                accounts.append({
+                    "num": num,
+                    "path": str(creds_path),
+                    "error": "missing credentials",
+                })
+                continue
         try:
             creds = json.loads(creds_path.read_text())
             oauth = creds.get("claudeAiOauth", {})
@@ -159,7 +180,6 @@ def list_oauth_accounts() -> List[dict]:
             })
         except Exception as e:
             accounts.append({"num": num, "path": str(creds_path), "error": str(e)})
-        num += 1
     return accounts