Merge pull request #748 from fchill/731-duplicated-user-message

[Issue 731] Fix duplicated user message in streaming mode

Author: stephanj

src/main/java/com/devoxx/genie/service/prompt/strategy/StreamingPromptStrategy.java

@@ -14,6 +14,7 @@
 import com.devoxx.genie.ui.panel.PromptOutputPanel;
 import com.devoxx.genie.ui.util.NotificationUtil;
 import com.devoxx.genie.ui.webview.ConversationWebViewController;
+import com.devoxx.genie.util.TemplateVariableEscaper;
 import com.intellij.openapi.project.Project;
 import dev.langchain4j.memory.ChatMemory;
 import dev.langchain4j.model.chat.StreamingChatLanguageModel;
@@ -80,9 +81,6 @@ protected void executeStrategySpecific(
         // Prepare memory which already adds the user message
         prepareMemory(context);
 
-        // We need to add this to chat memory when streaming response
-        chatMemoryManager.addUserMessage(context);
-
         // Create the streaming handler that will process chunks of response
         StreamingResponseHandler streamingResponseHandler;
 
@@ -181,7 +179,10 @@ protected void executeStrategySpecific(
                             .build();
                 }
 
-                TokenStream chat = assistant.chat(context.getUserPrompt());
+                String userMessage = context.getUserMessage().singleText();
+                String cleanText = TemplateVariableEscaper.escape(userMessage);
+
+                TokenStream chat = assistant.chat(cleanText);
 
                 chat.onPartialResponse(streamingResponseHandler::onPartialResponse)
                     .onToolExecuted(ToolExecution::request)

src/test/java/com/devoxx/genie/service/prompt/PromptMessageFlowIntegrationTest.java

@@ -35,7 +35,7 @@ public class PromptMessageFlowIntegrationTest extends AbstractLightPlatformTestC
 
     @Spy
     @InjectMocks
-    private MessageCreationService messageCreationService;
+    private MessageCreationService spyMessageCreationService;
 
     @Captor
     private ArgumentCaptor<ChatMessageContext> contextCaptor;
@@ -59,15 +59,15 @@ public void setUp() throws Exception {
                     .thenReturn(mockChatMemoryManager);
 
             messageCreationServiceStaticMock.when(MessageCreationService::getInstance)
-                    .thenReturn(messageCreationService);
+                    .thenReturn(spyMessageCreationService);
         }
 
         // Set up a strategy with mocked dependencies using anonymous class for test
         strategy = new NonStreamingPromptStrategy(mockProject) {
             {
                 // Manually inject mocked dependencies
                 this.chatMemoryManager = mockChatMemoryManager;
-                this.messageCreationService = messageCreationService;
+                this.messageCreationService = spyMessageCreationService;
                 // For this test we don't need to mock ThreadPoolManager or PromptExecutionService
                 // since we're only testing prepareMemory
             }
@@ -117,7 +117,7 @@ public void testVerifyCorrectMessageEnrichmentFlow() {
         verify(mockChatMemoryManager).prepareMemory(testContext);
 
         // Verify MessageCreationService.addUserMessageToContext was called
-        verify(messageCreationService).addUserMessageToContext(testContext);
+        verify(spyMessageCreationService).addUserMessageToContext(testContext);
 
         // Verify addUserMessage was called after context enrichment
         verify(mockChatMemoryManager).addUserMessage(testContext);
@@ -142,7 +142,7 @@ public void testVerifyDuplicateCallsToAddUserMessageToContextAreIdempotent() {
         testContext.setUserMessage(existingMessage);
 
         // Act - call the context enrichment method directly
-        messageCreationService.addUserMessageToContext(testContext);
+        spyMessageCreationService.addUserMessageToContext(testContext);
 
         // Assert - verify the existing message wasn't changed
         assertSame(String.valueOf(existingMessage), testContext.getUserMessage(),