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): require subagent consolidator at construction
chengyongrub7abbcd70b9d
diff --git a/nanobot/agent/subagent.py b/nanobot/agent/subagent.pyindex 29c042d46..d2f693a0a 100644--- a/nanobot/agent/subagent.py+++ b/nanobot/agent/subagent.py@@ -11,7 +11,7 @@ from collections.abc import Mappingfrom dataclasses import dataclass, fieldfrom functools import partialfrom pathlib import Path-from typing import TYPE_CHECKING, Any, NotRequired, TypedDict+from typing import TYPE_CHECKING, Any, NotRequired, TypedDict, castfrom loguru import logger@@ -111,8 +111,11 @@ class SubagentManager:disabled_skills: list[str] | None = None,max_iterations: int | None = None,max_concurrent_subagents: int | None = None,- consolidator: Consolidator | None = None,+ *,+ consolidator: Consolidator,):+ if cast(object, consolidator) is None:+ raise TypeError("SubagentManager requires a consolidator")if workspace is None:raise TypeError("SubagentManager.__init__() missing required argument: 'workspace'")if bus is None:@@ -433,27 +436,19 @@ class SubagentManager:token = bind_workspace_scope(workspace_scope) if workspace_scope is not None else Nonetry:tool_definitions = tools.get_definitions()- consolidate_history = (- partial(- self.consolidator.summarize_transcript,- runtime=runtime,- session_key=f"subagent:{task_id}",- tools=tool_definitions,- persist=False,- )- if self.consolidator is not None- else None+ consolidate_history = partial(+ self.consolidator.summarize_transcript,+ runtime=runtime,+ session_key=f"subagent:{task_id}",+ tools=tool_definitions,+ persist=False,)- consolidate_provider_compaction = (- partial(- self.consolidator.summarize_provider_compaction,- runtime=runtime,- session_key=f"subagent:{task_id}",- tools=tool_definitions,- persist=False,- )- if self.consolidator is not None- else None+ consolidate_provider_compaction = partial(+ self.consolidator.summarize_provider_compaction,+ runtime=runtime,+ session_key=f"subagent:{task_id}",+ tools=tool_definitions,+ persist=False,)result = await self.runner.run(AgentRunSpec(initial_messages=messages,diff --git a/tests/agent/test_subagent.py b/tests/agent/test_subagent.pyindex 22f1bada3..9b36a959f 100644--- a/tests/agent/test_subagent.py+++ b/tests/agent/test_subagent.py@@ -6,6 +6,7 @@ from unittest.mock import AsyncMock, MagicMockimport pytest+from nanobot.agent.memory import Consolidatorfrom nanobot.agent.runner import AgentRunResultfrom nanobot.agent.subagent import SubagentManager, SubagentStatusfrom nanobot.agent.tools.filesystem import FileToolsConfig@@ -31,6 +32,7 @@ async def test_subagent_uses_tool_loader():workspace=Path("/tmp"),bus=MessageBus(),max_tool_result_chars=16_000,+ consolidator=MagicMock(spec=Consolidator),)tools = sm._build_tools()assert tools.has("read_file")@@ -49,6 +51,7 @@ async def test_subagent_build_tools_isolates_file_read_state(tmp_path):workspace=tmp_path,bus=MessageBus(),max_tool_result_chars=16_000,+ consolidator=MagicMock(spec=Consolidator),)first_read = sm._build_tools().get("read_file")@@ -68,6 +71,7 @@ def test_subagent_respects_file_tool_toggle(tmp_path):workspace=tmp_path,bus=MessageBus(),max_tool_result_chars=16_000,+ consolidator=MagicMock(spec=Consolidator),tools_config=ToolsConfig(file=FileToolsConfig(enable=False)),)@@ -98,6 +102,7 @@ def test_subagent_prompt_keeps_agent_paths_for_selected_project(tmp_path):workspace=agent_workspace,bus=MessageBus(),max_tool_result_chars=16_000,+ consolidator=MagicMock(spec=Consolidator),)prompt = manager._build_subagent_prompt(workspace=project)@@ -119,6 +124,7 @@ def test_subagent_prompt_uses_relative_paths_in_agent_workspace(tmp_path):workspace=tmp_path,bus=MessageBus(),max_tool_result_chars=16_000,+ consolidator=MagicMock(spec=Consolidator),)prompt = manager._build_subagent_prompt()@@ -140,6 +146,7 @@ async def test_subagent_keeps_project_runtime_scope_with_agent_owned_tools(tmp_pworkspace=agent_workspace,bus=MessageBus(),max_tool_result_chars=16_000,+ consolidator=MagicMock(spec=Consolidator),)manager.runner.run = AsyncMock(return_value=AgentRunResult(final_content="ok", messages=[], stop_reason="completed")@@ -270,6 +277,7 @@ async def test_spawned_subagent_inherits_llm_usage_source(tmp_path):workspace=tmp_path,bus=MessageBus(),max_tool_result_chars=16_000,+ consolidator=MagicMock(spec=Consolidator),)sm.runner.run = AsyncMock(return_value=AgentRunResult(final_content="ok", messages=[], stop_reason="completed")diff --git a/tests/agent/test_subagent_consolidator_contract.py b/tests/agent/test_subagent_consolidator_contract.pynew file mode 100644index 000000000..95b49d201--- /dev/null+++ b/tests/agent/test_subagent_consolidator_contract.py@@ -0,0 +1,123 @@+"""Public construction and execution contracts for subagent consolidation."""++import asyncio+import hashlib+import json+from pathlib import Path++import pytest++from nanobot.agent.memory import Consolidator, MemoryStore+from nanobot.agent.subagent import SubagentManager+from nanobot.bus.queue import MessageBus+from nanobot.providers.base import GenerationSettings, LLMProvider, LLMResponse, ToolCallRequest+from nanobot.session.manager import SessionManager+from nanobot.utils.helpers import estimate_prompt_tokens_chain+from nanobot.utils.llm_runtime import LLMRuntime+++def test_subagent_requires_consolidator_at_construction(tmp_path):+ with pytest.raises(TypeError, match="consolidator"):+ SubagentManager(workspace=tmp_path, bus=MessageBus(), max_tool_result_chars=16_000)+++def test_subagent_rejects_explicit_none_consolidator(tmp_path):+ with pytest.raises(TypeError, match="consolidator"):+ SubagentManager(+ workspace=tmp_path,+ bus=MessageBus(),+ max_tool_result_chars=16_000,+ consolidator=None,+ )+++class _EvidenceProvider(LLMProvider):+ """Model protocol fixture; all execution and consolidation machinery is real."""++ def __init__(self):+ super().__init__(provider_name="test")+ self.generation = GenerationSettings(max_tokens=2048)+ self.reads = 0+ self.summaries = 0++ def get_default_model(self):+ return "test"++ def estimate_prompt_tokens(self, messages, tools, model):+ # Deterministic provider counter; no tokenizer cache or network dependency.+ return len(json.dumps([messages, tools])) // 2, "test-provider"++ async def chat(self, messages, tools=None, **kwargs):+ text = json.dumps(messages)+ tokens, _ = estimate_prompt_tokens_chain(self, "test", messages, tools)+ assert tokens <= 21_952+ if self.reads:+ assert "EARLY_EVIDENCE_78291" in text+ if messages[-1].get("content", "").startswith("Create a compact replacement checkpoint"):+ self.summaries += 1+ return LLMResponse(content="- [ephemeral] Preserve EARLY_EVIDENCE_78291.")+ if self.reads == 8:+ return LLMResponse(content="Completed: EARLY_EVIDENCE_78291")+ index = self.reads+ self.reads += 1+ return LLMResponse(content=None, tool_calls=[ToolCallRequest(+ id=f"read-{index}",+ name="read_file",+ arguments={"path": f"evidence-{index}.txt"},+ )])+++def _files(root: Path):+ return {+ str(path.relative_to(root)): hashlib.sha256(path.read_bytes()).hexdigest()+ for path in root.rglob("*") if path.is_file()+ }++[email protected]("background", [False, True])+async def test_sdk_preserves_evidence_across_transient_compaction(tmp_path, background):+ workspace = tmp_path / "workspace"+ workspace.mkdir()+ for index in range(8):+ lines = ["EARLY_EVIDENCE_78291" if index == 0 else f"EVIDENCE_{index}"]+ lines += [+ f"{n:04d} " + hashlib.sha256(f"{index}/{n}".encode()).hexdigest()[:32]+ for n in range(330)+ ]+ (workspace / f"evidence-{index}.txt").write_text("\n".join(lines), encoding="utf-8")+ sessions = SessionManager(workspace, sessions_root=tmp_path / "sessions")+ consolidator = Consolidator(+ MemoryStore(workspace), sessions, lambda **kwargs: [], lambda: [],+ )+ bus = MessageBus()+ provider = _EvidenceProvider()+ runtime = LLMRuntime.capture(provider, "test", context_window_tokens=24_000)+ manager = SubagentManager(+ workspace=workspace,+ bus=bus,+ max_tool_result_chars=16_000,+ max_iterations=12,+ restrict_to_workspace=True,+ consolidator=consolidator,+ )+ before = _files(tmp_path)+ try:+ kwargs = {+ "task": "Read evidence-0.txt through evidence-7.txt and retain the early identifier.",+ "session_key": "test:parent",+ "runtime": runtime,+ }+ if background:+ await manager.spawn(**kwargs)+ event = await asyncio.wait_for(bus.consume_inbound(), timeout=15)+ assert event.session_key_override == "test:parent"+ assert event.metadata["injected_event"] == "subagent_result"+ result = event.content+ else:+ result = await asyncio.wait_for(manager.run_inline(**kwargs), timeout=15)+ assert "Completed: EARLY_EVIDENCE_78291" in result+ assert provider.reads == 8+ assert provider.summaries >= 2+ assert _files(tmp_path) == before+ finally:+ await manager.close()diff --git a/tests/agent/test_subagent_lifecycle.py b/tests/agent/test_subagent_lifecycle.pyindex d230aa6b1..04da1e767 100644--- a/tests/agent/test_subagent_lifecycle.py+++ b/tests/agent/test_subagent_lifecycle.py@@ -9,6 +9,7 @@ import pytestfrom nanobot.agent import SubagentManagerfrom nanobot.agent.hook import AgentHookContext+from nanobot.agent.memory import Consolidatorfrom nanobot.agent.runner import AgentRunResultfrom nanobot.agent.subagent import (SubagentStatus,@@ -28,6 +29,7 @@ def _manager(tmp_path: Path, **kw) -> SubagentManager:workspace=tmp_path,bus=MessageBus(),max_tool_result_chars=16_000,+ consolidator=MagicMock(spec=Consolidator),)defaults.update(kw)return SubagentManager(**defaults)@@ -114,6 +116,7 @@ class TestLegacyCompatibility:MessageBus(),16_000,"legacy-model",+ consolidator=MagicMock(spec=Consolidator),)assert sm.workspace == tmp_path@@ -130,6 +133,7 @@ class TestLegacyCompatibility:bus=MessageBus(),max_tool_result_chars=16_000,model="legacy-model",+ consolidator=MagicMock(spec=Consolidator),)sm.runner.run = AsyncMock(return_value=AgentRunResult(final_content="done", messages=[], stop_reason="completed",diff --git a/tests/agent/test_task_cancel.py b/tests/agent/test_task_cancel.pyindex f3f118555..b998066f8 100644--- a/tests/agent/test_task_cancel.py+++ b/tests/agent/test_task_cancel.py@@ -10,6 +10,7 @@ from unittest.mock import AsyncMock, MagicMock, patchimport pytestfrom agent.session_helpers import run_session+from nanobot.agent.memory import Consolidatorfrom nanobot.bus.outbound_events import StreamDeltaEvent, StreamEndEventfrom nanobot.config.schema import AgentDefaultsfrom nanobot.providers.base import GenerationSettings@@ -463,6 +464,7 @@ class TestSubagentCancellation:workspace=MagicMock(),bus=bus,max_tool_result_chars=_MAX_TOOL_RESULT_CHARS,+ consolidator=MagicMock(spec=Consolidator),)cancelled = asyncio.Event()@@ -493,6 +495,7 @@ class TestSubagentCancellation:workspace=MagicMock(),bus=bus,max_tool_result_chars=_MAX_TOOL_RESULT_CHARS,+ consolidator=MagicMock(spec=Consolidator),)assert await mgr.cancel_by_session("nonexistent") == 0@@ -507,6 +510,7 @@ class TestSubagentCancellation:workspace=MagicMock(),bus=bus,max_tool_result_chars=_MAX_TOOL_RESULT_CHARS,+ consolidator=MagicMock(spec=Consolidator),)# Replace the real exec session manager with a mockmock_exec_mgr = AsyncMock(spec=ExecSessionManager)@@ -588,6 +592,7 @@ class TestSubagentCancellation:workspace=tmp_path,bus=bus,max_tool_result_chars=_MAX_TOOL_RESULT_CHARS,+ consolidator=MagicMock(spec=Consolidator),tools_config=ToolsConfig(exec=ExecToolConfig(enable=False)),)mgr._announce_result = AsyncMock()@@ -746,6 +751,7 @@ class TestSubagentAnnounceSessionKey:workspace=MagicMock(),bus=bus,max_tool_result_chars=_MAX_TOOL_RESULT_CHARS,+ consolidator=MagicMock(spec=Consolidator),)return mgr, busdiff --git a/tests/agent/tools/test_subagent_tools.py b/tests/agent/tools/test_subagent_tools.pyindex 9ee375399..582b83fa1 100644--- a/tests/agent/tools/test_subagent_tools.py+++ b/tests/agent/tools/test_subagent_tools.py@@ -8,6 +8,7 @@ from unittest.mock import AsyncMock, MagicMock, patchimport pytestfrom nanobot.agent.context import TranscriptInput+from nanobot.agent.memory import Consolidatorfrom nanobot.agent.tools.context import RequestContextfrom nanobot.config.schema import AgentDefaultsfrom nanobot.providers.base import GenerationSettings@@ -29,6 +30,7 @@ async def test_run_inline_returns_result_without_announcement(tmp_path):provider = MagicMock()manager = SubagentManager(+ consolidator=MagicMock(spec=Consolidator),workspace=tmp_path,bus=MessageBus(),max_tool_result_chars=_MAX_TOOL_RESULT_CHARS,@@ -62,6 +64,7 @@ async def test_run_inline_returns_structured_error(tmp_path):from nanobot.bus.queue import MessageBusmanager = SubagentManager(+ consolidator=MagicMock(spec=Consolidator),workspace=tmp_path,bus=MessageBus(),max_tool_result_chars=_MAX_TOOL_RESULT_CHARS,@@ -97,6 +100,7 @@ async def test_subagent_exec_tool_receives_allowed_env_keys(tmp_path):provider = MagicMock()provider.get_default_model.return_value = "test-model"mgr = SubagentManager(+ consolidator=MagicMock(spec=Consolidator),workspace=tmp_path,bus=bus,max_tool_result_chars=_MAX_TOOL_RESULT_CHARS,@@ -142,6 +146,7 @@ async def test_subagent_uses_configured_max_iterations(tmp_path):provider = MagicMock()provider.get_default_model.return_value = "test-model"mgr = SubagentManager(+ consolidator=MagicMock(spec=Consolidator),workspace=tmp_path,bus=bus,max_tool_result_chars=_MAX_TOOL_RESULT_CHARS,@@ -185,6 +190,7 @@ async def test_spawn_forwards_temperature_to_run_spec(tmp_path):provider = MagicMock()provider.get_default_model.return_value = "test-model"mgr = SubagentManager(+ consolidator=MagicMock(spec=Consolidator),workspace=tmp_path,bus=bus,max_tool_result_chars=_MAX_TOOL_RESULT_CHARS,@@ -222,6 +228,7 @@ async def test_background_spawn_waits_for_concurrency_capacity(tmp_path):provider = MagicMock()provider.get_default_model.return_value = "test-model"mgr = SubagentManager(+ consolidator=MagicMock(spec=Consolidator),workspace=tmp_path,bus=bus,max_tool_result_chars=_MAX_TOOL_RESULT_CHARS,@@ -322,6 +329,7 @@ async def test_inline_spawn_waits_for_concurrency_capacity(tmp_path):from nanobot.bus.queue import MessageBusmanager = SubagentManager(+ consolidator=MagicMock(spec=Consolidator),workspace=tmp_path,bus=MessageBus(),max_tool_result_chars=_MAX_TOOL_RESULT_CHARS,@@ -387,6 +395,7 @@ async def test_runner_executes_inline_spawn_batch_concurrently(tmp_path):from nanobot.providers.base import ToolCallRequestmanager = SubagentManager(+ consolidator=MagicMock(spec=Consolidator),workspace=tmp_path,bus=MessageBus(),max_tool_result_chars=_MAX_TOOL_RESULT_CHARS,@@ -456,6 +465,7 @@ async def test_cancel_by_session_cancels_inline_subagent(tmp_path):from nanobot.bus.queue import MessageBusmanager = SubagentManager(+ consolidator=MagicMock(spec=Consolidator),workspace=tmp_path,bus=MessageBus(),max_tool_result_chars=_MAX_TOOL_RESULT_CHARS,@@ -489,6 +499,7 @@ def test_subagent_default_max_concurrent_matches_agent_defaults(tmp_path):bus = MessageBus()mgr = SubagentManager(+ consolidator=MagicMock(spec=Consolidator),workspace=tmp_path,bus=bus,max_tool_result_chars=_MAX_TOOL_RESULT_CHARS,@@ -505,6 +516,7 @@ def test_subagent_default_max_iterations_matches_agent_defaults(tmp_path):bus = MessageBus()mgr = SubagentManager(+ consolidator=MagicMock(spec=Consolidator),workspace=tmp_path,bus=bus,max_tool_result_chars=_MAX_TOOL_RESULT_CHARS,diff --git a/tests/tools/test_search_tools.py b/tests/tools/test_search_tools.pyindex 192938680..e4d249a95 100644--- a/tests/tools/test_search_tools.py+++ b/tests/tools/test_search_tools.py@@ -14,6 +14,7 @@ from unittest.mock import AsyncMock, MagicMockimport pytestfrom nanobot.agent.loop import AgentLoop+from nanobot.agent.memory import Consolidatorfrom nanobot.agent.subagent import SubagentManager, SubagentStatusfrom nanobot.agent.tools.registry import is_tool_error_resultfrom nanobot.agent.tools.search import FindFilesTool, GrepTool@@ -781,6 +782,7 @@ async def test_subagent_registers_search_backend(tmp_path: Path, monkeypatch, usprovider.get_default_model.return_value = "test-model"provider.generation = GenerationSettings()mgr = SubagentManager(+ consolidator=MagicMock(spec=Consolidator),workspace=tmp_path,bus=bus,max_tool_result_chars=4096,@@ -823,6 +825,7 @@ def test_subagent_prompt_respects_disabled_skills(tmp_path: Path) -> None:(skills_dir / "beta" / "SKILL.md").write_text("# Beta\n\nshown\n", encoding="utf-8")mgr = SubagentManager(+ consolidator=MagicMock(spec=Consolidator),workspace=tmp_path,bus=bus,max_tool_result_chars=4096,