Personal AI, On Personal Devices
Python
fix: prevent race on rapid Run Now clicks, auto-recover error-state agents, fix immediate messages
Jon Saad-Falconf85ee81d532e
diff --git a/src/openjarvis/server/agent_manager_routes.py b/src/openjarvis/server/agent_manager_routes.pyindex 45a93f1a..544ee707 100644--- a/src/openjarvis/server/agent_manager_routes.py+++ b/src/openjarvis/server/agent_manager_routes.py@@ -287,8 +287,18 @@ def create_agent_manager_router(raise HTTPException(status_code=404, detail="Agent not found")if agent["status"] == "archived":raise HTTPException(status_code=400, detail="Agent is archived")- if agent["status"] == "running":- raise HTTPException(status_code=409, detail="Agent is already running")++ # Auto-recover from error/needs_attention state+ if agent["status"] in ("error", "needs_attention"):+ manager.update_agent(agent_id, status="idle")++ # Acquire tick BEFORE spawning thread — prevents race+ try:+ manager.start_tick(agent_id)+ except ValueError:+ raise HTTPException(+ status_code=409, detail="Agent is already running"+ )def _run_tick():try:@@ -303,6 +313,7 @@ def create_agent_manager_router(system = SystemBuilder().build()executor.set_system(system)except Exception as build_err:+ manager.end_tick(agent_id)manager.update_agent(agent_id, status="error")manager.update_summary_memory(agent_id,@@ -400,6 +411,14 @@ def create_agent_manager_router(@agents_router.post("/{agent_id}/messages")def send_message(agent_id: str, req: SendMessageRequest):+ agent = manager.get_agent(agent_id)+ if not agent:+ raise HTTPException(status_code=404, detail="Agent not found")++ # Auto-recover error-state agents on immediate messages+ if req.mode == "immediate" and agent["status"] in ("error", "needs_attention"):+ manager.update_agent(agent_id, status="idle")+msg = manager.send_message(agent_id, req.content, mode=req.mode)return msgdiff --git a/tests/server/test_agent_manager_routes.py b/tests/server/test_agent_manager_routes.pyindex b694edd5..80e78b6f 100644--- a/tests/server/test_agent_manager_routes.py+++ b/tests/server/test_agent_manager_routes.py@@ -191,3 +191,21 @@ class TestAgentManagerRoutes:assert "channels" in stateassert "messages" in stateassert "checkpoint" in state+++def test_run_agent_concurrent_returns_409(tmp_path):+ """Rapid Run Now clicks should not spawn multiple ticks."""+ from openjarvis.agents.manager import AgentManager++ mgr = AgentManager(db_path=str(tmp_path / "test.db"))+ agent = mgr.create_agent("Test", config={"schedule_type": "manual"})+ aid = agent["id"]++ # Simulate first click acquiring the tick+ mgr.start_tick(aid)++ # Second click should fail+ with pytest.raises(ValueError, match="already executing a tick"):+ mgr.start_tick(aid)++ mgr.end_tick(aid)