Your lightweight open-source personal agent.
Python agent-frameworkai-agentai-agentschatbotchatopsdiscord-botllm-agentsllmslocal-llmmcpmodel-context-protocolmulti-agentopenai-compatibleopenclawpersonal-ai-assistantpythonself-hostedtelegram-bot-ai-assistantwebuiworkflow-automation
fix(cron): defer timer rearming while jobs execute
Kuang-xianxin02ca8f65586a
diff --git a/nanobot/cron/service.py b/nanobot/cron/service.pyindex bb8057d31..7bbee6645 100644--- a/nanobot/cron/service.py+++ b/nanobot/cron/service.py@@ -519,6 +519,11 @@ class CronService:def _arm_timer(self) -> None:"""Schedule the next timer tick."""+ # The timer task also owns the agent callback. Store edits during a+ # callback must not cancel it or start another tick for the same due+ # job. The final execution rearms after persisting its result.+ if self._active_executions:+ returnif self._timer_task:self._timer_task.cancel()diff --git a/tests/cron/test_cron_active_rearm.py b/tests/cron/test_cron_active_rearm.pynew file mode 100644index 000000000..a433b2bab--- /dev/null+++ b/tests/cron/test_cron_active_rearm.py@@ -0,0 +1,88 @@+"""Job-store edits must not cancel the timer task executing an agent turn."""++import asyncio+from pathlib import Path++import pytest++from nanobot.cron.service import CronService+from nanobot.cron.types import CronJob, CronSchedule++[email protected]("action", ["add", "update", "remove", "disable"])[email protected]("edit_from_callback", [True, False])+async def test_edit_during_timer_execution_preserves_turn(+ tmp_path: Path, action: str, edit_from_callback: bool,+) -> None:+ entered = asyncio.Event()+ release = asyncio.Event()+ settled = asyncio.Event()+ outcomes: list[str] = []++ def add_job(name: str) -> CronJob:+ return service.add_job(+ name=name,+ schedule=CronSchedule(kind="every", every_ms=3_600_000),+ message=name,+ session_key=f"websocket:{name}",+ origin_channel="websocket",+ origin_chat_id=name,+ )++ def edit_store() -> None:+ if action == "add":+ add_job("new-job")+ elif action == "update":+ service.update_job(other.id, message="updated")+ elif action == "remove":+ service.remove_job(other.id)+ else:+ service.enable_job(other.id, False)++ async def on_job(job: CronJob) -> None:+ entered.set()+ try:+ if edit_from_callback:+ edit_store()+ await release.wait()+ outcomes.append("completed")+ except asyncio.CancelledError:+ outcomes.append("cancelled")+ raise+ finally:+ settled.set()++ service = CronService(tmp_path / "cron" / "jobs.json", on_job=on_job)+ await service.start()+ try:+ other = add_job("other")+ active = add_job("active")+ active.state.next_run_at_ms = 1+ service._save_store()+ service._arm_timer()+ async with asyncio.timeout(2):+ await entered.wait()+ if not edit_from_callback:+ edit_store()+ release.set()+ await settled.wait()+ assert outcomes == ["completed"]++ async with asyncio.timeout(2):+ while service._active_executions:+ await asyncio.sleep(0)+ restored = CronService(service.store_path).get_job(active.id)+ assert restored is not None+ assert restored.state.last_status == "ok"+ assert len(restored.state.run_history) == 1+ assert restored.state.next_run_at_ms is not None+ assert restored.state.last_run_at_ms is not None+ assert restored.state.next_run_at_ms > restored.state.last_run_at_ms+ assert service._timer_task is not None+ assert not service._timer_task.done()+ finally:+ timer = service._timer_task+ service.stop()+ if timer is not None:+ await asyncio.gather(timer, return_exceptions=True)