Merge pull request #594 from devoxx/feat-590

Fixed 'broken' user context

Author: stephanj

src/main/java/com/devoxx/genie/service/prompt/memory/ChatMemoryManager.java

@@ -218,26 +218,6 @@ public ChatMemory getChatMemory(String projectHash) {
             throw new MemoryException("Failed to get chat memory", e);
         }
     }
-    
-    /**
-     * Logs the current state of the chat memory for debugging purposes
-     * @param project The project to log memory for
-     */
-    public void logMemoryState(@NotNull Project project) {
-        try {
-            List<ChatMessage> messages = getMessages(project);
-            log.debug("Current memory state for project {}, total messages: {}", project.getName(), messages.size());
-            
-            for (int i = 0; i < messages.size(); i++) {
-                ChatMessage message = messages.get(i);
-                String type = message.getClass().getSimpleName();
-                String content = message.toString();
-                log.debug("Message[{}] - Type: {} - Content: {}", i, type, content);
-            }
-        } catch (Exception e) {
-            log.warn("Failed to log memory state: {}", e.getMessage());
-        }
-    }
 
     /**
      * Restores a conversation from a saved model

src/main/java/com/devoxx/genie/service/prompt/nonstreaming/NonStreamingPromptExecutionService.java

@@ -166,8 +166,7 @@ public void cancelExecutingQuery() {
                         .build();
             }
 
-            // Add extra user message context
-            MessageCreationService.getInstance().addUserMessageToContext(chatMessageContext);
+            // The context is already added in AbstractPromptExecutionStrategy.prepareMemory()
 
             if (chatMessageContext.getUserMessage().hasSingleText()) {
                 String queryResponse = assistant.chat(chatMessageContext.getUserMessage().singleText());

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

@@ -1,6 +1,7 @@
 package com.devoxx.genie.service.prompt.strategy;
 
 import com.devoxx.genie.model.request.ChatMessageContext;
+import com.devoxx.genie.service.MessageCreationService;
 import com.devoxx.genie.service.prompt.error.ExecutionException;
 import com.devoxx.genie.service.prompt.error.PromptErrorHandler;
 import com.devoxx.genie.service.prompt.memory.ChatMemoryManager;
@@ -86,7 +87,13 @@ protected abstract void executeStrategySpecific(
      * @param context The chat message context
      */
     protected void prepareMemory(@NotNull ChatMessageContext context) {
+        // Prepare memory with system message if needed and add user message
+        log.debug("Before memory preparation - context ID: {}", context.getId());
         chatMemoryManager.prepareMemory(context);
+        // Add context information to the user message before adding to memory
+        MessageCreationService.getInstance().addUserMessageToContext(context);
+        // Now add the enriched user message to chat memory
+        chatMemoryManager.addUserMessage(context);
     }
 
     /**

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

@@ -55,16 +55,8 @@ protected void executeStrategySpecific(
             return;
         }
 
-        // Prepare memory with system message if needed and add user message
-        log.debug("Before memory preparation - context ID: {}", context.getId());
-        chatMemoryManager.logMemoryState(context.getProject());
-        
         // Prepare memory and add user message
         prepareMemory(context);
-        chatMemoryManager.addUserMessage(context);
-        
-        log.debug("After memory preparation - context ID: {}", context.getId());
-        chatMemoryManager.logMemoryState(context.getProject());
 
         // Execute the prompt using the centralized thread pool
         threadPoolManager.getPromptExecutionPool().execute(() -> {

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

@@ -51,17 +51,10 @@ protected void executeStrategySpecific(
             return;
         }
 
-        // Prepare memory and add user prompt
-        log.debug("Before memory preparation (streaming) - context ID: {}", context.getId());
-        chatMemoryManager.logMemoryState(context.getProject());
-        
         // Prepare memory and add user message
         prepareMemory(context);
         chatMemoryManager.addUserMessage(context);
-        
-        log.debug("After memory preparation (streaming) - context ID: {}", context.getId());
-        chatMemoryManager.logMemoryState(context.getProject());
-        
+
         // Create the streaming handler that will process chunks of response
         StreamingResponseHandler handler = new StreamingResponseHandler(
             context,