Merge pull request #1830 from patriot1burke/immediate-improvement

Add tool result messages to chat memory after tool calls

Author: geoand

core/runtime/src/main/java/io/quarkiverse/langchain4j/runtime/aiservice/AiServiceMethodImplementationSupport.java

@@ -435,6 +435,7 @@ private List<ChatMessage> messagesToSend(UserMessage augmentedUserMessage,
 
             boolean immediateToolReturn = true;
             List<ToolExecution> toolExecutions = new ArrayList<>();
+            List<ToolExecutionResultMessage> toolResults = new ArrayList<>();
             for (ToolExecutionRequest toolExecutionRequest : aiMessage.toolExecutionRequests()) {
                 log.debugv("Attempting to execute tool {0}", toolExecutionRequest);
                 ToolExecutor toolExecutor = toolExecutors.get(toolExecutionRequest.name());
@@ -450,13 +451,16 @@ private List<ChatMessage> messagesToSend(UserMessage augmentedUserMessage,
                         .result(ToolExecutionResult.builder().resultText(toolExecutionResultMessage.text()).build())
                         .build();
                 toolExecutions.add(toolExecution);
+                toolResults.add(toolExecutionResultMessage);
                 if (toolExecutor instanceof QuarkusToolExecutor) {
                     immediateToolReturn = ((QuarkusToolExecutor) toolExecutor).returnBehavior() == ReturnBehavior.IMMEDIATE;
                 } else {
                     immediateToolReturn = false;
                 }
 
-                committableChatMemory.add(toolExecutionResultMessage);
+            }
+            for (ToolExecutionResultMessage toolResult : toolResults) {
+                committableChatMemory.add(toolResult);
             }
             if (immediateToolReturn) {
                 if (!TypeUtil.isResult(returnType)) {