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(agent): finalize stopped turns without checkpoints (NAN-211)
chengyongru421bd6b593d5
diff --git a/nanobot/agent/loop.py b/nanobot/agent/loop.pyindex ae1d56e99..a456fceda 100644--- a/nanobot/agent/loop.py+++ b/nanobot/agent/loop.py@@ -1721,16 +1721,12 @@ class AgentLoop:try:key = self._effective_session_key(msg)session = await self.sessions.state.get(key)- if restore_runtime_checkpoint(session):- self._clear_pending_user_turn(session)- await self.sessions.state.restore_interruption(session)- logger.info(- "Restored partial context for cancelled session {}",- key,- )+ restore_runtime_checkpoint(session)+ await self.sessions.state.finish_turn(session)+ logger.info("Saved cancelled turn for session {}", key)except Exception:logger.opt(exception=log_content).debug(- "Could not restore checkpoint for cancelled session {}",+ "Could not finalize cancelled turn for session {}",session_key,)raisediff --git a/tests/agent/test_loop_recovery.py b/tests/agent/test_loop_recovery.pyindex 681467363..279ffd1ec 100644--- a/tests/agent/test_loop_recovery.py+++ b/tests/agent/test_loop_recovery.py@@ -15,8 +15,10 @@ from nanobot.bus.queue import MessageBusfrom nanobot.providers.base import GenerationSettings, LLMProvider, LLMResponse, ToolCallRequestfrom nanobot.session.manager import SessionManagerfrom nanobot.session.recovery import (+ PENDING_USER_TURN_KEY,RECOVERY_METADATA_KEY,REQUEST_ORIGIN_METADATA_KEY,+ RUNTIME_CHECKPOINT_KEY,)from nanobot.session.turn_continuation import INTERNAL_CONTINUATION_METAfrom nanobot.session.webui_turns import WebuiTurnCoordinator, WebuiTurnRoutePolicy@@ -277,3 +279,80 @@ async def test_recovery_preserves_turn_origin_until_the_next_user_turn(}finally:await loop.aclose()++[email protected]("with_tools", [False, True], ids=["before_response", "after_tools"])[email protected]("gateway_shutdown", [False, True], ids=["explicit_stop", "gateway_shutdown"])+async def test_recovery_distinguishes_explicit_stop_from_gateway_shutdown(+ tmp_path: Path, with_tools: bool, gateway_shutdown: bool,+) -> None:+ bus = MessageBus()+ sessions = SessionManager(tmp_path)+ recovery = RecoveryCoordinator(sessions, bus)+ provider = MagicMock(aclose=AsyncMock())+ provider.get_default_model.return_value = "test-model"+ provider.generation = GenerationSettings()+ provider.can_resume_conversation_state.return_value = False+ entered = asyncio.Event()+ requests = 0+ note = tmp_path / "note.txt"+ note.write_text("saved evidence", encoding="utf-8")++ async def respond(**kwargs):+ nonlocal requests+ requests += 1+ if with_tools and requests == 1:+ return LLMResponse(content=None, tool_calls=[ToolCallRequest(+ "read-once", "read_file", {"path": str(note)},+ )])+ entered.set()+ await asyncio.Event().wait()++ provider.chat_stream_with_retry = AsyncMock(side_effect=respond)+ loop = AgentLoop(+ bus=bus, provider=provider, workspace=tmp_path, model="test-model",+ session_manager=sessions, recovery_admission=recovery,+ turn_delivery_factory=TurnDeliveryFactory(bus, WebuiTurnRoutePolicy(sessions)),+ )+ coordinator = WebuiTurnCoordinator(bus, sessions, loop.schedule_background, recovery=recovery)+ request = InboundMessage(+ channel="websocket", sender_id="user", chat_id="chat", content="Read the note and summarize",+ metadata={"webui": True, "webui_turn_id": "request-1"},+ )+ try:+ with coordinator.connected():+ await loop._dispatch_inbound(request)+ await asyncio.wait_for(entered.wait(), 5)+ if gateway_shutdown:+ loop.preserve_inflight_turns_on_shutdown()+ else:+ await loop._dispatch_inbound(InboundMessage(+ channel="websocket", sender_id="user", chat_id="chat", content="/stop",+ metadata={"webui": True},+ ))+ outbound = [bus.outbound.get_nowait() for _ in range(bus.outbound.qsize())]+ assert any(message.content == "Stopped 1 task(s)." for message in outbound)+ finally:+ await loop.aclose()++ restarted = SessionManager(tmp_path)+ try:+ saved = await restarted.state.get(request.session_key)+ assert bool(saved.metadata.get(PENDING_USER_TURN_KEY)) is gateway_shutdown+ assert (RUNTIME_CHECKPOINT_KEY in saved.metadata) is (gateway_shutdown and with_tools)+ if with_tools and not gateway_shutdown:+ assert any(+ row.get("role") == "tool" and "saved evidence" in row["content"]+ for row in saved.messages+ )++ await RecoveryCoordinator(restarted, MessageBus()).scan()+ restored = await restarted.state.get(request.session_key)+ if gateway_shutdown:+ assert restored.metadata[RECOVERY_METADATA_KEY]["status"] == "awaiting_user"+ assert restored.metadata[RECOVERY_METADATA_KEY]["reason"] == "restart_requires_confirmation"+ else:+ assert RECOVERY_METADATA_KEY not in restored.metadata+ finally:+ await restarted.state.aclose()diff --git a/tests/agent/test_stop_preserves_context.py b/tests/agent/test_stop_preserves_context.pyindex e3a28da36..d9b1ddb7e 100644--- a/tests/agent/test_stop_preserves_context.py+++ b/tests/agent/test_stop_preserves_context.py@@ -112,7 +112,7 @@ async def test_dispatch_cancellation_restores_checkpoint():)assert checkpoint_key not in session.metadata, \"Checkpoint metadata should be cleared after restore"- assert loop.sessions.state.restore_interruption.await_count == 1, \+ assert loop.sessions.state.finish_turn.await_count == 1, \"Session should be persisted so the restored state survives process restart"