修复 AutoContext 中 system 消息混入 inputMessages 的问题

agentscope-extensions/agentscope-extensions-autocontext-memory/src/main/java/io/agentscope/core/memory/autocontext/AutoContextHook.java

@@ -22,9 +22,9 @@
 import io.agentscope.core.hook.PreCallEvent;
 import io.agentscope.core.hook.PreReasoningEvent;
 import io.agentscope.core.memory.Memory;
+import io.agentscope.core.message.ContentBlock;
 import io.agentscope.core.message.Msg;
 import io.agentscope.core.message.MsgRole;
-import io.agentscope.core.message.TextBlock;
 import io.agentscope.core.plan.PlanNotebook;
 import io.agentscope.core.tool.Toolkit;
 import java.util.ArrayList;
@@ -85,6 +85,12 @@ public class AutoContextHook implements Hook {
 
     private static final Logger log = LoggerFactory.getLogger(AutoContextHook.class);
 
+    private static final String CONTEXT_OFFLOAD_INSTRUCTION =
+            "You may see compressed messages containing <!-- CONTEXT_OFFLOAD uuid=... -->.\n"
+                    + "- Use the UUID to call context_reload if you need full details.\n"
+                    + "- NEVER mention, quote, or refer to UUIDs, offload tags, or internal"
+                    + " metadata in your response.";
+
     private final AtomicBoolean registered = new AtomicBoolean(false);
 
     /**
@@ -228,60 +234,40 @@ private Mono<PreReasoningEvent> handlePreReasoning(PreReasoningEvent event) {
                 .compressIfNeededAsync()
                 .map(
                         ignored -> {
-                            event.setInputMessages(buildInputMessages(event, autoContextMemory));
+                            List<Msg> compressedMessages = autoContextMemory.getMessages();
+                            event.setInputMessages(buildInputMessages(compressedMessages));
+                            mergeSystemMessages(event, compressedMessages);
                             return event;
                         })
                 .subscribeOn(Schedulers.boundedElastic());
     }
 
-    private List<Msg> buildInputMessages(
-            PreReasoningEvent event, AutoContextMemory autoContextMemory) {
-        List<Msg> originalInputMessages = event.getInputMessages();
+    private List<Msg> buildInputMessages(List<Msg> messages) {
         List<Msg> newInputMessages = new ArrayList<>();
+        if (messages == null || messages.isEmpty()) {
+            return newInputMessages;
+        }
 
-        if (!originalInputMessages.isEmpty()
-                && originalInputMessages.get(0).getRole() == MsgRole.SYSTEM) {
-            Msg originalSystemMsg = originalInputMessages.get(0);
-            String originalSystemText = originalSystemMsg.getTextContent();
-            String appendedInstruction =
-                    "\n\n"
-                            + "You may see compressed messages containing <!-- CONTEXT_OFFLOAD"
-                            + " uuid=... -->.\n"
-                            + "- Use the UUID to call context_reload if you need full details.\n"
-                            + "- NEVER mention, quote, or refer to UUIDs, offload tags, or internal"
-                            + " metadata in your response.";
-
-            String newSystemText =
-                    originalSystemText != null
-                            ? originalSystemText + appendedInstruction
-                            : appendedInstruction.trim();
-
-            Msg updatedSystemMsg =
-                    Msg.builder()
-                            .role(MsgRole.SYSTEM)
-                            .name(originalSystemMsg.getName())
-                            .content(TextBlock.builder().text(newSystemText).build())
-                            .metadata(originalSystemMsg.getMetadata())
-                            .build();
-
-            newInputMessages.add(updatedSystemMsg);
-        } else {
-            String instruction =
-                    "You may see compressed messages containing <!-- CONTEXT_OFFLOAD uuid=..."
-                            + " -->.\n"
-                            + "- Use the UUID to call context_reload if you need full details.\n"
-                            + "- NEVER mention, quote, or refer to UUIDs, offload tags, or internal"
-                            + " metadata in your response.";
+        for (Msg msg : messages) {
+            if (msg != null && msg.getRole() != MsgRole.SYSTEM) {
+                newInputMessages.add(msg);
+            }
+        }
+        return newInputMessages;
+    }
 
-            newInputMessages.add(
-                    Msg.builder()
-                            .role(MsgRole.SYSTEM)
-                            .name("system")
-                            .content(TextBlock.builder().text(instruction).build())
-                            .build());
+    private void mergeSystemMessages(PreReasoningEvent event, List<Msg> messages) {
+        if (messages != null) {
+            for (Msg msg : messages) {
+                if (msg == null || msg.getRole() != MsgRole.SYSTEM) {
+                    continue;
+                }
+                for (ContentBlock block : msg.getContent()) {
+                    event.appendSystemContent(block);
+                }
+            }
         }
 
-        newInputMessages.addAll(autoContextMemory.getMessages());
-        return newInputMessages;
+        event.appendSystemContent(CONTEXT_OFFLOAD_INSTRUCTION);
     }
 }

agentscope-extensions/agentscope-extensions-autocontext-memory/src/test/java/io/agentscope/core/memory/autocontext/AutoContextHookTest.java

@@ -350,26 +350,28 @@ void testPreReasoningEventTriggersCompression() {
                         + testModel.getCallCount());
 
         // Verify input messages were updated to reflect compressed memory
-        // Note: System prompt may be added if compressed messages exist, so size may be
-        // finalMessages.size() + 1
+        // System prompt is now carried separately on the event, so input messages should only
+        // contain non-system turns.
         List<Msg> updatedInputMessages = result.getInputMessages();
         assertNotNull(updatedInputMessages, "Input messages should not be null");
-        // Check if system prompt was added (first message is SYSTEM)
-        boolean hasSystemPrompt =
-                !updatedInputMessages.isEmpty()
-                        && updatedInputMessages.get(0).getRole() == MsgRole.SYSTEM;
-        int expectedSize = hasSystemPrompt ? finalMessages.size() + 1 : finalMessages.size();
+        assertTrue(
+                updatedInputMessages.stream().noneMatch(msg -> msg.getRole() == MsgRole.SYSTEM),
+                "Input messages should not contain system turns");
         assertEquals(
-                expectedSize,
+                finalMessages.size(),
                 updatedInputMessages.size(),
-                "Input messages should be updated to match compressed memory size (plus system"
-                        + " prompt if added). "
-                        + "Initial: "
+                "Input messages should match compressed memory size when system content is stored"
+                        + " separately. Initial: "
                         + initialCount
                         + ", Final: "
                         + finalMessages.size()
                         + ", Updated: "
                         + updatedInputMessages.size());
+        assertNotNull(result.getSystemMessage(), "System message should be available");
+        assertEquals(MsgRole.SYSTEM, result.getSystemMessage().getRole());
+        assertTrue(
+                result.getSystemMessage().getTextContent().contains("context_reload"),
+                "System message should include compressed-context instructions");
 
         // Verify messages were actually compressed (count should be reduced)
         assertTrue(
@@ -423,19 +425,23 @@ void testPreReasoningEventNoCompression() {
         List<Msg> finalMessages = noCompressionMemory.getMessages();
         assertEquals(initialCount, finalMessages.size(), "Message count should not change");
 
-        // Verify input messages - system prompt is always added, so size will be memory size + 1
+        // Input messages should stay system-free; the system prompt is carried separately.
         List<Msg> resultInputMessages = result.getInputMessages();
-        // System prompt is always added, so expected size is memory size + 1
-        int expectedSize = finalMessages.size() + 1;
+        assertTrue(resultInputMessages.stream().noneMatch(msg -> msg.getRole() == MsgRole.SYSTEM));
         assertEquals(
-                expectedSize,
+                finalMessages.size(),
                 resultInputMessages.size(),
-                "Input messages should include system prompt. Memory size: "
+                "Input messages should match memory size when no system turns are present. Memory"
+                        + " size: "
                         + finalMessages.size()
                         + ", Expected: "
-                        + expectedSize
+                        + finalMessages.size()
                         + ", Actual: "
                         + resultInputMessages.size());
+        assertNotNull(result.getSystemMessage(), "System message should be available");
+        assertTrue(
+                result.getSystemMessage().getTextContent().contains("context_reload"),
+                "System message should include compressed-context instructions");
     }
 
     @Test
@@ -578,14 +584,17 @@ void testPreReasoningEventOnNonBlockingScheduler() {
                 Mono.defer(() -> hook.onEvent(event)).subscribeOn(Schedulers.parallel()).block();
 
         assertNotNull(result);
-        assertEquals(MsgRole.SYSTEM, result.getInputMessages().get(0).getRole());
+        assertNotNull(result.getSystemMessage(), "System message should be available");
+        assertTrue(
+                result.getInputMessages().stream()
+                        .noneMatch(msg -> msg.getRole() == MsgRole.SYSTEM));
         assertTrue(
-                result.getInputMessages().get(0).getTextContent().contains("context_reload"),
-                "System prompt should include compressed-context instructions");
+                result.getSystemMessage().getTextContent().contains("context_reload"),
+                "System message should include compressed-context instructions");
         assertEquals(
-                compressionMemory.getMessages().size() + 1,
+                compressionMemory.getMessages().size(),
                 result.getInputMessages().size(),
-                "Result should include system prompt plus compressed memory messages");
+                "Result should include compressed memory messages only");
     }
 
     @Test
@@ -595,6 +604,12 @@ void testPreReasoningEventPreservesSystemPromptOnNonBlockingScheduler() {
                 new AutoContextMemory(
                         createCompressionConfig(), new TestModel("Compressed summary"));
         populateCompressibleConversation(compressionMemory, 3);
+        compressionMemory.addMessage(
+                Msg.builder()
+                        .role(MsgRole.SYSTEM)
+                        .name("system")
+                        .content(TextBlock.builder().text("Memory system note").build())
+                        .build());
         compressionMemory.addMessage(
                 Msg.builder()
                         .role(MsgRole.USER)
@@ -610,23 +625,32 @@ void testPreReasoningEventPreservesSystemPromptOnNonBlockingScheduler() {
                         .toolkit(toolkit)
                         .build();
 
-        List<Msg> inputMessages = new ArrayList<>();
-        inputMessages.add(
+        List<Msg> inputMessages = new ArrayList<>(compressionMemory.getMessages());
+
+        PreReasoningEvent event = new PreReasoningEvent(agent, "test-model", null, inputMessages);
+        event.setSystemMessage(
                 Msg.builder()
                         .role(MsgRole.SYSTEM)
                         .name("system")
                         .content(TextBlock.builder().text("Base system prompt").build())
                         .build());
-        inputMessages.addAll(compressionMemory.getMessages());
-
-        PreReasoningEvent event = new PreReasoningEvent(agent, "test-model", null, inputMessages);
         PreReasoningEvent result =
                 Mono.defer(() -> hook.onEvent(event)).subscribeOn(Schedulers.parallel()).block();
 
         assertNotNull(result);
-        String updatedSystemPrompt = result.getInputMessages().get(0).getTextContent();
+        assertNotNull(result.getSystemMessage(), "System message should be available");
+        String updatedSystemPrompt = result.getSystemMessage().getTextContent();
         assertTrue(updatedSystemPrompt.startsWith("Base system prompt"));
+        assertTrue(updatedSystemPrompt.contains("Memory system note"));
         assertTrue(updatedSystemPrompt.contains("context_reload"));
+        assertTrue(
+                result.getInputMessages().stream()
+                        .noneMatch(msg -> msg.getRole() == MsgRole.SYSTEM));
+        long expectedNonSystemCount =
+                compressionMemory.getMessages().stream()
+                        .filter(msg -> msg.getRole() != MsgRole.SYSTEM)
+                        .count();
+        assertEquals(expectedNonSystemCount, result.getInputMessages().size());
     }
 
     private AutoContextConfig createCompressionConfig() {