Skip to content

Commit 9c77163

Browse files
authored
Merge pull request #339 from konlue/fix/issue270-system-message
fix(agent): pass interceptor-set system message to model requests (issue #270)
2 parents d000463 + 44adcc6 commit 9c77163

2 files changed

Lines changed: 186 additions & 1 deletion

File tree

‎argi-agent/argi-agent-core/src/main/java/io/github/agentic/ai/agent/react/ReActAgent.java‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import io.github.agentic.ai.api.chat.ChatClient;
2424
import io.github.agentic.ai.api.chat.ChatEvent;
2525
import io.github.agentic.ai.api.chat.ChatMessage;
26+
import io.github.agentic.ai.api.chat.ChatRole;
2627
import io.github.agentic.ai.api.chat.ChatRequest;
2728
import io.github.agentic.ai.api.chat.ChatResponse;
2829
import io.github.agentic.ai.api.chat.ToolCall;
@@ -440,11 +441,35 @@ private ToolRegistry effectiveToolSet(ModelRequest request) {
440441
return new ToolRegistry(List.copyOf(effective.values()));
441442
}
442443

444+
/**
445+
* Composes the outgoing message list for a model call. When an interceptor set a
446+
* system message, it becomes the single SYSTEM entry at the head of the request
447+
* and replaces any SYSTEM messages already present in the conversation list (two
448+
* SYSTEM entries would be transmitted verbatim by the Spring/LangChain4j
449+
* adapters and concatenated by the Google ADK adapter); all other messages keep
450+
* their order. The composition is a local copy for this call only — the run-level
451+
* message list is never written back, so nothing accumulates across turns. With
452+
* no interceptor-set system message the incoming list is passed through
453+
* unchanged.
454+
*/
455+
private List<ChatMessage> composeMessages(ModelRequest request) {
456+
ChatMessage systemMessage = request.getSystemMessage();
457+
if (systemMessage == null) {
458+
return request.getMessages();
459+
}
460+
List<ChatMessage> composed = new ArrayList<>(request.getMessages().size() + 1);
461+
composed.add(systemMessage);
462+
request.getMessages().stream()
463+
.filter(message -> message.role() != ChatRole.SYSTEM)
464+
.forEach(composed::add);
465+
return List.copyOf(composed);
466+
}
467+
443468
private ModelResponse invokeModel(ModelRequest request, UsageAccumulator usage,
444469
AtomicReference<ToolRegistry> effectiveTools) {
445470
ToolRegistry effective = effectiveToolSet(request);
446471
effectiveTools.set(effective);
447-
ChatRequest chatRequest = new ChatRequest(request.getMessages(), effective.definitions(),
472+
ChatRequest chatRequest = new ChatRequest(composeMessages(request), effective.definitions(),
448473
request.getOptions(), request.getAttributes());
449474
if (streamModel) {
450475
return ModelResponse.of(collectModelStream(chatRequest, usage));

‎argi-agent/argi-agent-core/src/test/java/io/github/agentic/ai/agent/react/ReActAgentTest.java‎

Lines changed: 160 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import io.github.agentic.ai.api.chat.ChatClientCapabilities;
2424
import io.github.agentic.ai.api.chat.ChatEvent;
2525
import io.github.agentic.ai.api.chat.ChatMessage;
26+
import io.github.agentic.ai.api.chat.ChatRole;
2627
import io.github.agentic.ai.api.chat.ChatRequest;
2728
import io.github.agentic.ai.api.chat.ChatResponse;
2829
import io.github.agentic.ai.api.chat.FinishReason;
@@ -132,6 +133,165 @@ public ModelResponse interceptModel(ModelRequest request, ModelCallHandler next)
132133
assertEquals(2, interceptorCalls.get());
133134
}
134135

136+
// ------------------------------------------------------------------
137+
// issue #270: interceptor-set system message reaches the model request
138+
// ------------------------------------------------------------------
139+
140+
@Test
141+
void interceptorSystemMessageReachesTheModelRequest() throws Exception {
142+
ScriptedClient client = new ScriptedClient(List.of(response(ChatMessage.assistant("answer"), List.of(), 1)));
143+
ModelInterceptor interceptor = new ModelInterceptor() {
144+
public String getName() {
145+
return "policy";
146+
}
147+
148+
public ModelResponse interceptModel(ModelRequest request, ModelCallHandler next) {
149+
return next.call(ModelRequest.builder(request).systemMessage(ChatMessage.system("required-policy")).build());
150+
}
151+
};
152+
ReActAgent agent = ReActAgent.builder(client).interceptors(List.of(interceptor)).build();
153+
154+
agent.invoke(request(), context()).get(3, TimeUnit.SECONDS);
155+
156+
List<ChatMessage> sent = client.requests.get(0).messages();
157+
assertEquals(ChatRole.SYSTEM, sent.get(0).role());
158+
assertEquals("required-policy", sent.get(0).text());
159+
}
160+
161+
@Test
162+
void interceptorSystemMessageReplacesExistingSystemMessagesExactlyOnce() throws Exception {
163+
// A user-provided SYSTEM message in the conversation is replaced by the
164+
// interceptor-set one; exactly one SYSTEM entry is transmitted.
165+
AgentRequest withSystem = AgentRequest.messages(List.of(
166+
ChatMessage.system("user-provided-policy"), ChatMessage.user("hello")));
167+
ScriptedClient client = new ScriptedClient(List.of(response(ChatMessage.assistant("answer"), List.of(), 1)));
168+
ModelInterceptor interceptor = new ModelInterceptor() {
169+
public String getName() {
170+
return "policy";
171+
}
172+
173+
public ModelResponse interceptModel(ModelRequest request, ModelCallHandler next) {
174+
return next.call(ModelRequest.builder(request).systemMessage(ChatMessage.system("interceptor-policy")).build());
175+
}
176+
};
177+
ReActAgent agent = ReActAgent.builder(client).interceptors(List.of(interceptor)).build();
178+
179+
agent.invoke(withSystem, context()).get(3, TimeUnit.SECONDS);
180+
181+
List<ChatMessage> sent = client.requests.get(0).messages();
182+
assertEquals(1, sent.stream().filter(message -> message.role() == ChatRole.SYSTEM).count());
183+
assertEquals("interceptor-policy", sent.get(0).text());
184+
assertTrue(sent.stream().anyMatch(message -> "hello".equals(message.text())));
185+
}
186+
187+
@Test
188+
void withoutInterceptorSystemMessageTheConversationIsUnchanged() throws Exception {
189+
AgentRequest withSystem = AgentRequest.messages(List.of(
190+
ChatMessage.system("user-provided-policy"), ChatMessage.user("hello")));
191+
ScriptedClient client = new ScriptedClient(List.of(response(ChatMessage.assistant("answer"), List.of(), 1)));
192+
ReActAgent agent = ReActAgent.builder(client).build();
193+
194+
agent.invoke(withSystem, context()).get(3, TimeUnit.SECONDS);
195+
196+
List<ChatMessage> sent = client.requests.get(0).messages();
197+
assertEquals("user-provided-policy", sent.get(0).text());
198+
assertEquals("hello", sent.get(1).text());
199+
}
200+
201+
@Test
202+
void systemMessageDoesNotAccumulateAcrossToolCallTurns() throws Exception {
203+
ToolCall call = new ToolCall("call-1", "lookup", "{}");
204+
ScriptedClient client = new ScriptedClient(List.of(response(ChatMessage.assistant("use", List.of(call)),
205+
List.of(call), 1), response(ChatMessage.assistant("done"), List.of(), 1)));
206+
ModelInterceptor interceptor = new ModelInterceptor() {
207+
public String getName() {
208+
return "policy";
209+
}
210+
211+
public ModelResponse interceptModel(ModelRequest request, ModelCallHandler next) {
212+
return next.call(ModelRequest.builder(request).systemMessage(ChatMessage.system("required-policy")).build());
213+
}
214+
};
215+
Tool lookup = tool("lookup", "{}", (ignored, context) ->
216+
CompletableFuture.completedFuture(ToolResult.text("lookup result")));
217+
ReActAgent agent = ReActAgent.builder(client).tools(new ToolRegistry(List.of(lookup)))
218+
.interceptors(List.of(interceptor)).build();
219+
220+
agent.invoke(request(), context()).get(3, TimeUnit.SECONDS);
221+
222+
assertEquals(2, client.requests.size());
223+
for (ChatRequest sent : client.requests) {
224+
assertEquals(1, sent.messages().stream()
225+
.filter(message -> message.role() == ChatRole.SYSTEM).count());
226+
assertEquals("required-policy", sent.messages().get(0).text());
227+
}
228+
}
229+
230+
@Test
231+
void streamingRunAlsoReceivesTheInterceptorSystemMessage() throws Exception {
232+
StreamingClient client = new StreamingClient();
233+
ModelInterceptor interceptor = new ModelInterceptor() {
234+
public String getName() {
235+
return "policy";
236+
}
237+
238+
public ModelResponse interceptModel(ModelRequest request, ModelCallHandler next) {
239+
return next.call(ModelRequest.builder(request).systemMessage(ChatMessage.system("required-policy")).build());
240+
}
241+
};
242+
ReActAgent agent = ReActAgent.builder(client).streamModel(true)
243+
.interceptors(List.of(interceptor)).build();
244+
245+
try (AgentExecutionContext context = context()) {
246+
CompletableFuture<AgentOutcome> outcome = new CompletableFuture<>();
247+
agent.stream(request(), context).subscribe(new Flow.Subscriber<>() {
248+
public void onSubscribe(Flow.Subscription subscription) {
249+
subscription.request(Long.MAX_VALUE);
250+
}
251+
252+
public void onNext(AgentEvent event) {
253+
if (event instanceof AgentEvent.Finished finished) {
254+
outcome.complete(finished.outcome());
255+
}
256+
}
257+
258+
public void onError(Throwable error) {
259+
outcome.completeExceptionally(error);
260+
}
261+
262+
public void onComplete() {
263+
}
264+
});
265+
outcome.get(3, TimeUnit.SECONDS);
266+
}
267+
List<ChatMessage> sent = client.requests.get(0).messages();
268+
assertEquals(ChatRole.SYSTEM, sent.get(0).role());
269+
assertEquals("required-policy", sent.get(0).text());
270+
}
271+
272+
@Test
273+
void nonSystemMessagesKeepTheirOrderAroundTheInjectedSystemMessage() throws Exception {
274+
AgentRequest multi = AgentRequest.messages(List.of(
275+
ChatMessage.user("first"), ChatMessage.assistant("reply"), ChatMessage.user("second")));
276+
ScriptedClient client = new ScriptedClient(List.of(response(ChatMessage.assistant("answer"), List.of(), 1)));
277+
ModelInterceptor interceptor = new ModelInterceptor() {
278+
public String getName() {
279+
return "policy";
280+
}
281+
282+
public ModelResponse interceptModel(ModelRequest request, ModelCallHandler next) {
283+
return next.call(ModelRequest.builder(request).systemMessage(ChatMessage.system("required-policy")).build());
284+
}
285+
};
286+
ReActAgent agent = ReActAgent.builder(client).interceptors(List.of(interceptor)).build();
287+
288+
agent.invoke(multi, context()).get(3, TimeUnit.SECONDS);
289+
290+
List<String> texts = client.requests.get(0).messages().stream()
291+
.map(ChatMessage::text).toList();
292+
assertEquals(List.of("required-policy", "first", "reply", "second"), texts);
293+
}
294+
135295
@Test
136296
void emitsStreamingDeltasAndSupportsDynamicTools() throws Exception {
137297
Tool dynamic = tool("dynamic", "{\"type\":\"object\"}",

0 commit comments

Comments
 (0)