The agent that grows with you
Python aiai-agentai-agentsanthropicchatgptclaudeclaude-codecodexhermeshermes-agentllmnous-researchopenai
fix(memory): roll back a prefetch registry entry whose thread never started
kshitijk4poor44aab837ce47
diff --git a/agent/memory_manager.py b/agent/memory_manager.pyindex 2663496e310..dd92e45a509 100644--- a/agent/memory_manager.py+++ b/agent/memory_manager.py@@ -335,7 +335,15 @@ class MemoryManager:logger.debug("Memory provider '%s' prefetch is still stuck; skipping this turn", provider.name)return ""inflight[thread] = now + self._external_prefetch_timeout- thread.start()+ try:+ thread.start()+ except RuntimeError:+ # Never started, so its finally never runs: drop the entry or it would gate the+ # provider forever once its deadline passes.+ inflight.pop(thread, None)+ if not inflight:+ self._EXTERNAL_PREFETCH_THREADS.pop(key, None)+ raisethread.join(self._external_prefetch_timeout)if thread.is_alive():diff --git a/tests/agent/test_memory_provider.py b/tests/agent/test_memory_provider.pyindex 95ab84948b9..77f34989b50 100644--- a/tests/agent/test_memory_provider.py+++ b/tests/agent/test_memory_provider.py@@ -588,6 +588,32 @@ class TestMemoryManager:for gate in provider.gates:gate.set()+ def test_failed_prefetch_thread_start_leaves_no_registry_entry(self, monkeypatch):+ """A thread that never started can't clear its own entry; it must not gate the provider."""+ import agent.memory_manager as mm_mod++ provider = FakeMemoryProvider("start-fails")+ provider._prefetch_result = "recovered"+ mgr = MemoryManager(external_prefetch_timeout=0.01)+ mgr.add_provider(provider)+ real_spawn = mm_mod.spawn_context_thread++ def failing_spawn(*args, **kwargs):+ thread = real_spawn(*args, **kwargs)+ def boom():+ raise RuntimeError("can't start new thread")+ thread.start = boom+ return thread++ monkeypatch.setattr(mm_mod, "spawn_context_thread", failing_spawn)+ with pytest.raises(RuntimeError):+ mgr._prefetch_provider(provider, "q", session_id="s")+ assert (mgr._home_key, provider.name) not in MemoryManager._EXTERNAL_PREFETCH_THREADS+ monkeypatch.setattr(mm_mod, "spawn_context_thread", real_spawn)+ mgr = MemoryManager(external_prefetch_timeout=1.0)+ mgr.add_provider(provider)+ assert mgr._prefetch_provider(provider, "q", session_id="s") == "recovered"+def test_stuck_prefetch_registry_is_scoped_per_hermes_home(self, tmp_path):"""Two profiles served by one process may configure a same-named provideragainst different backends; a hung call in one must not suppress the other.