Grayscale/nanobot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "fix: preserve pending message runtime context"

Browse Source 
This reverts commit cad368f585.
This commit is contained in:
chengyongru
2026-07-24 14:47:50 +08:00
parent 9957de5226
commit 9aab94c766
2 changed files with 1 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nanobot/agent/loop.py
-14
View File
@@ -862,20 +862,6 @@ class AgentLoop:
content, media = self._prepare_message_media(content, media)
media = media or None
user_content = self.context._build_user_content(content, media)
scope = self.workspace_scopes.for_message(
pending_msg,
session.metadata if session is not None else None,
)
extra = goal_state_runtime_lines(session.metadata if session is not None else None)
extra.extend(agent_context.runtime_lines(self, pending_msg, scope.project_path))
runtime_ctx = self.context._build_runtime_context(
pending_msg.channel,
self._runtime_chat_id(pending_msg),
self.context.timezone,
sender_id=pending_msg.sender_id,
supplemental_lines=extra or None,
)
user_content = self.context._merge_message_content(user_content, runtime_ctx)
row: dict[str, Any] = {"role": "user", "content": user_content}
metadata = pending_msg.metadata if isinstance(pending_msg.metadata, dict) else {}
if (
tests/agent/test_runner_injections.py
+1 -56
View File
@@ -466,60 +466,6 @@ async def test_loop_injected_followup_preserves_image_media(tmp_path):
for block in injected_user_messages[-1]["content"]
if isinstance(block, dict)
)
assert any(
block.get("type") == "text" and "Sender ID: u" in block.get("text", "")
for block in injected_user_messages[-1]["content"]
if isinstance(block, dict)
)
@pytest.mark.asyncio
async def test_pending_injection_includes_runtime_context(tmp_path):
from nanobot.agent.loop import AgentLoop
from nanobot.bus.events import InboundMessage
from nanobot.bus.queue import MessageBus
bus = MessageBus()
provider = MagicMock()
provider.get_default_model.return_value = "test-model"
captured_messages: list[list[dict]] = []
call_count = {"n": 0}
async def chat_with_retry(*, messages, **kwargs):
call_count["n"] += 1
captured_messages.append(list(messages))
if call_count["n"] == 1:
return LLMResponse(content="first answer", tool_calls=[], usage={})
return LLMResponse(content="second answer", tool_calls=[], usage={})
provider.chat_with_retry = chat_with_retry
loop = AgentLoop(bus=bus, provider=provider, workspace=tmp_path, model="test-model")
loop.tools.get_definitions = MagicMock(return_value=[])
pending_queue = asyncio.Queue()
await pending_queue.put(InboundMessage(
channel="discord",
sender_id="user-2",
chat_id="room-7",
content="follow-up",
))
final_content, _, _, _, had_injections = await loop._run_agent_loop(
[{"role": "user", "content": "hello"}],
channel="discord",
chat_id="room-7",
pending_queue=pending_queue,
)
assert final_content == "second answer"
assert had_injections is True
assert call_count["n"] == 2
injected = captured_messages[-1][-1]
assert injected["role"] == "user"
assert "follow-up" in injected["content"]
assert "Channel: discord" in injected["content"]
assert "Chat ID: room-7" in injected["content"]
assert "Sender ID: user-2" in injected["content"]
@pytest.mark.asyncio
@@ -577,8 +523,7 @@ async def test_subagent_pending_injection_is_hidden_history_and_not_merged(tmp_p
assert had_injections is True
assert call_count["n"] == 2
injected_users = [message for message in all_msgs if message.get("role") == "user"][-2:]
assert "visible follow-up" in injected_users[0]["content"]
assert payload in injected_users[1]["content"]
assert [message["content"] for message in injected_users] == ["visible follow-up", payload]
assert injected_users[1][HIDDEN_HISTORY_META] == {
"kind": "subagent_result",
"subagent_task_id": "sub-1",