fix(context): restore turn cap and serialize content parts for llm compression

Author: Foolllll-J

astrbot/core/agent/context/compressor.py

@@ -1,6 +1,6 @@
 from typing import TYPE_CHECKING, Protocol, runtime_checkable
 
-from ..message import Message
+from ..message import ContentPart, Message
 
 if TYPE_CHECKING:
     from astrbot import logger
@@ -100,7 +100,15 @@ def _message_to_dict(msg: Message) -> dict:
     """Convert a Message to a plain dict suitable for round splitting."""
     d = {"role": msg.role}
     if msg.content is not None:
-        d["content"] = msg.content
+        if isinstance(msg.content, list):
+            d["content"] = [
+                part.model_dump_for_context()
+                if isinstance(part, ContentPart)
+                else part
+                for part in msg.content
+            ]
+        else:
+            d["content"] = msg.content
     if getattr(msg, "tool_calls", None):
         d["tool_calls"] = msg.tool_calls
     if getattr(msg, "tool_call_id", None):

astrbot/core/astr_main_agent.py

@@ -1534,6 +1534,7 @@ async def build_main_agent(
         llm_compress_keep_recent=config.llm_compress_keep_recent,
         llm_compress_provider=_get_compress_provider(config, plugin_context, event),
         truncate_turns=config.dequeue_context_length,
+        enforce_max_turns=config.max_context_length,
         tool_schema_mode=config.tool_schema_mode,
         fallback_providers=fallback_providers,
         tool_result_overflow_dir=(

tests/agent/test_context_manager.py

@@ -113,6 +113,27 @@ async def test_llm_compressor_keeps_history_when_summary_is_empty(self):
             "LLM context compression returned an empty summary."
         )
 
+    @pytest.mark.asyncio
+    async def test_llm_compressor_handles_textpart_content(self):
+        from astrbot.core.agent.context.compressor import LLMSummaryCompressor
+
+        provider = MockProvider()
+        compressor = LLMSummaryCompressor(provider=provider, keep_recent=1)  # type: ignore[arg-type]
+        messages = [
+            Message(role="user", content=[TextPart(text="Hello")]),
+            Message(role="assistant", content=[TextPart(text="Hi there")]),
+            Message(role="user", content=[TextPart(text="Summarize our work")]),
+            Message(role="assistant", content=[TextPart(text="Sure")]),
+        ]
+
+        result = await compressor(messages)
+
+        assert len(result) == 4
+        assert result[0].role == "user"
+        assert isinstance(result[0].content, str)
+        assert "previous history conversation summary" in result[0].content
+        assert result[-1].content == [TextPart(text="Sure")]
+
     # ==================== Empty and Edge Cases ====================
 
     @pytest.mark.asyncio

tests/unit/test_astr_main_agent.py

@@ -985,6 +985,38 @@ async def test_build_main_agent_basic(
         assert result is not None
         assert isinstance(result, module.MainAgentBuildResult)
 
+    @pytest.mark.asyncio
+    async def test_build_main_agent_passes_max_context_length_to_runner(
+        self, mock_event, mock_context, mock_provider
+    ):
+        module = ama
+        mock_context.get_provider_by_id.return_value = None
+        mock_context.get_using_provider.return_value = mock_provider
+        mock_context.get_config.return_value = {}
+
+        conv_mgr = mock_context.conversation_manager
+        _setup_conversation_for_build(conv_mgr)
+
+        with (
+            patch("astrbot.core.astr_main_agent.AgentRunner") as mock_runner_cls,
+            patch("astrbot.core.astr_main_agent.AstrAgentContext"),
+        ):
+            mock_runner = MagicMock()
+            mock_runner.reset = AsyncMock()
+            mock_runner_cls.return_value = mock_runner
+
+            result = await module.build_main_agent(
+                event=mock_event,
+                plugin_context=mock_context,
+                config=module.MainAgentBuildConfig(
+                    tool_call_timeout=60,
+                    max_context_length=7,
+                ),
+            )
+
+        assert result is not None
+        assert mock_runner.reset.await_args.kwargs["enforce_max_turns"] == 7
+
     @pytest.mark.asyncio
     async def test_build_main_agent_no_provider(self, mock_event, mock_context):
         """Test building main agent when no provider is available."""