Self-improving AI Employees for everyone
Python ai-agentsai-employeeai-employeesassistantautonomous-agentsco-employeescompanygrok-botinstinctloop-agentsmuseown-your-datapersonalself-hosted
fix(claude_code_agent): pin the CLI version and single-flight the login
trohitg63b3714e352f
diff --git a/server/config/ai_cli_providers.json b/server/config/ai_cli_providers.jsonindex 78b391f1..af595c55 100644--- a/server/config/ai_cli_providers.json+++ b/server/config/ai_cli_providers.json@@ -1,6 +1,7 @@{"claude": {"package_name": "@anthropic-ai/claude-code",+ "package_version": "2.1.258","binary_name": "claude","login_argv": ["claude", "login"],"auth_status_argv": ["claude", "--print", "-p", "ok"],diff --git a/server/nodes/agent/claude_code_agent/_handlers.py b/server/nodes/agent/claude_code_agent/_handlers.pyindex ec5b079f..0e9b8d3c 100644--- a/server/nodes/agent/claude_code_agent/_handlers.py+++ b/server/nodes/agent/claude_code_agent/_handlers.py@@ -60,6 +60,18 @@ logger = get_logger(__name__)_CATALOGUE_KEY = "claude_code"+# The in-flight login task. Single-flight: a second click while a login+# is running must not spawn a second ``claude auth login`` (each one parks+# for up to LOGIN_TIMEOUT_SECONDS waiting on the browser callback, and on+# a headless box they simply pile up — GitHub issue #129). Holding the+# reference here also keeps the task alive; a bare ``create_task`` result+# is eligible for garbage collection mid-flight.+_login_task: asyncio.Task[None] | None = None+++def _login_in_progress() -> bool:+ return _login_task is not None and not _login_task.done()+async def _finalize_claude_login() -> None:"""Run ``claude auth login`` to completion, then store user info +@@ -130,9 +142,18 @@ async def handle_claude_code_login("message": "Already authenticated; refreshed status.",}- asyncio.create_task(_finalize_claude_login(), name="claude_code_login")+ global _login_task+ if _login_in_progress():+ return {+ "success": True,+ "pending": True,+ "message": "A Claude sign-in is already in progress; finish it in the browser window the CLI opened.",+ }++ _login_task = asyncio.create_task(_finalize_claude_login(), name="claude_code_login")return {"success": True,+ "pending": True,"message": "Claude is opening your browser to authenticate.",}diff --git a/server/nodes/agent/claude_code_agent/_oauth.py b/server/nodes/agent/claude_code_agent/_oauth.pyindex 3b7b6e33..152b6722 100644--- a/server/nodes/agent/claude_code_agent/_oauth.py+++ b/server/nodes/agent/claude_code_agent/_oauth.py@@ -97,7 +97,18 @@ def claude_binary_path() -> str:if bin_path.exists():return str(bin_path)- logger.info("Installing Claude Code CLI into shared tree %s", OPENCOMPANY_NPM_ROOT)+ # Pinned spec from ``config/ai_cli_providers.json`` (``package_name`` ++ # ``package_version``), the vercel / cloudflare idiom: an unpinned+ # install makes cold installs non-reproducible and lets a CLI release+ # change the stream-json contract underneath a working deployment.+ from services.cli_agent.config import get_provider_config++ cfg = get_provider_config("claude")+ npm_spec = cfg.package_name if cfg else "@anthropic-ai/claude-code"+ if cfg and cfg.package_version:+ npm_spec = f"{npm_spec}@{cfg.package_version}"++ logger.info("Installing %s into shared tree %s", npm_spec, OPENCOMPANY_NPM_ROOT)OPENCOMPANY_NPM_ROOT.mkdir(parents=True, exist_ok=True)npm_cmd = shutil.which("npm")@@ -105,13 +116,13 @@ def claude_binary_path() -> str:raise FileNotFoundError("npm not found on PATH")result = subprocess.run(- [npm_cmd, "install", "@anthropic-ai/claude-code", "--prefix", str(OPENCOMPANY_NPM_ROOT)],+ [npm_cmd, "install", npm_spec, "--prefix", str(OPENCOMPANY_NPM_ROOT), "--no-audit", "--no-fund"],capture_output=True,text=True,)if result.returncode != 0:- logger.error(f"npm install failed: {result.stderr}")- raise RuntimeError(f"Failed to install claude-code: {result.stderr}")+ logger.error(f"npm install {npm_spec} failed: {result.stderr}")+ raise RuntimeError(f"Failed to install {npm_spec}: {result.stderr}")if not bin_path.exists():raise FileNotFoundError(f"Claude CLI not found at {bin_path} after install")diff --git a/server/services/cli_agent/config.py b/server/services/cli_agent/config.pyindex a79e98f8..8426054f 100644--- a/server/services/cli_agent/config.py+++ b/server/services/cli_agent/config.py@@ -31,6 +31,10 @@ class CliProviderConfig:name: strpackage_name: str+ # Exact npm version the cold install pins (``<package_name>@<version>``).+ # Empty means unpinned. Bump deliberately: the stream-json wire contract+ # and flag surface are verified against this version only.+ package_version: strbinary_name: strlogin_argv: Tuple[str, ...]auth_status_argv: Optional[Tuple[str, ...]]@@ -81,6 +85,7 @@ def _build_configs() -> Dict[str, CliProviderConfig]:configs[name] = CliProviderConfig(name=name,package_name=prov.get("package_name", ""),+ package_version=str(prov.get("package_version", "") or ""),binary_name=prov.get("binary_name", name),login_argv=tuple(prov.get("login_argv", [])),auth_status_argv=(tuple(prov["auth_status_argv"]) if prov.get("auth_status_argv") else None),diff --git a/server/tests/services/cli_agent/test_claude_login_handlers.py b/server/tests/services/cli_agent/test_claude_login_handlers.pynew file mode 100644index 00000000..20754caf--- /dev/null+++ b/server/tests/services/cli_agent/test_claude_login_handlers.py@@ -0,0 +1,59 @@+"""``claude_code_login`` is single-flight: one ``claude auth login`` at a+time, and the in-flight task is held by a strong reference (GitHub #129)."""++from __future__ import annotations++import asyncio++from unittest.mock import AsyncMock++import pytest++from nodes.agent.claude_code_agent import _handlers as handlers++[email protected](autouse=True)+def _logged_out(monkeypatch):+ monkeypatch.setattr(handlers, "claude_auth_status_info", AsyncMock(return_value={"loggedIn": False}))+ monkeypatch.setattr(handlers, "_login_task", None)+++async def test_second_click_does_not_spawn_second_login(monkeypatch):+ started = 0+ release = asyncio.Event()++ async def fake_finalize():+ nonlocal started+ started += 1+ await release.wait()++ monkeypatch.setattr(handlers, "_finalize_claude_login", fake_finalize)++ first = await handlers.handle_claude_code_login({}, None)+ await asyncio.sleep(0)+ second = await handlers.handle_claude_code_login({}, None)++ assert first["success"] is True and first["pending"] is True+ assert second["pending"] is True+ assert started == 1+ assert handlers._login_in_progress() is True++ release.set()+ await handlers._login_task+ assert handlers._login_in_progress() is False+++async def test_new_login_allowed_after_previous_finishes(monkeypatch):+ calls = 0++ async def fake_finalize():+ nonlocal calls+ calls += 1++ monkeypatch.setattr(handlers, "_finalize_claude_login", fake_finalize)++ await handlers.handle_claude_code_login({}, None)+ await handlers._login_task+ await handlers.handle_claude_code_login({}, None)+ await handlers._login_task+ assert calls == 2