Merge pull request #601 from devoxx/issue-587

Fix #587 - Escape {{ }} prompt content

Author: stephanj

build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "com.devoxx.genie"
-version = "0.5.3"
+version = "0.5.4"
 
 repositories {
     mavenCentral()

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

@@ -7,6 +7,7 @@
 import com.devoxx.genie.service.prompt.error.MemoryException;
 import com.devoxx.genie.ui.settings.DevoxxGenieStateService;
 import com.devoxx.genie.util.ChatMessageContextUtil;
+import com.devoxx.genie.util.TemplateVariableEscaper;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
 import dev.langchain4j.data.message.AiMessage;
@@ -146,12 +147,14 @@ public void addUserMessage(@NotNull ChatMessageContext context) {
         try {
             if (context.getUserMessage() == null && context.getUserPrompt() != null) {
                 // Create user message if not already set
-                context.setUserMessage(UserMessage.from(context.getUserPrompt()));
+                context.setUserMessage(UserMessage.from(TemplateVariableEscaper.escape(context.getUserPrompt())));
             }
 
             if (context.getUserMessage() != null) {
                 log.debug("Adding user message to memory for context ID: {}", context.getId());
-                chatMemoryService.addMessage(context.getProject(), context.getUserMessage());
+                UserMessage userMessage = context.getUserMessage();
+                String cleanValue = TemplateVariableEscaper.escape(userMessage.singleText());
+                chatMemoryService.addMessage(context.getProject(), UserMessage.from(cleanValue));
                 log.debug("Successfully added user message to memory");
             } else {
                 log.warn("Attempted to add null user message to memory for context ID: {}", context.getId());

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

@@ -12,9 +12,11 @@
 import com.devoxx.genie.ui.settings.DevoxxGenieStateService;
 import com.devoxx.genie.ui.util.NotificationUtil;
 import com.devoxx.genie.util.ClipboardUtil;
+import com.devoxx.genie.util.TemplateVariableEscaper;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
 import dev.langchain4j.data.message.AiMessage;
+import dev.langchain4j.data.message.UserMessage;
 import dev.langchain4j.memory.ChatMemory;
 import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.chat.response.ChatResponse;
@@ -166,12 +168,15 @@ public void cancelExecutingQuery() {
             }
 
             if (chatMessageContext.getUserMessage().hasSingleText()) {
-                String queryResponse = assistant.chat(chatMessageContext.getUserMessage().singleText());
+                String cleanText = TemplateVariableEscaper.escape(chatMessageContext.getUserMessage().singleText());
+                String queryResponse = assistant.chat(cleanText);
                 return ChatResponse.builder()
                         .aiMessage(AiMessage.aiMessage(queryResponse))
                         .build();
             } else {
-                return chatLanguageModel.chat(chatMessageContext.getUserMessage());
+                UserMessage originalUserMessage = chatMessageContext.getUserMessage();
+                String cleanText = TemplateVariableEscaper.escape(originalUserMessage.singleText());
+                return chatLanguageModel.chat(UserMessage.from(cleanText));
             }
 
         } catch (Exception e) {

src/main/java/com/devoxx/genie/util/TemplateVariableEscaper.java

@@ -0,0 +1,27 @@
+package com.devoxx.genie.util;
+
+/**
+ * Utility class to escape LangChain4j template variables.
+ * LangChain4j uses the syntax {{variable_name}} for template variables,
+ * which can conflict with other template systems like Angular.
+ */
+public class TemplateVariableEscaper {
+
+    private TemplateVariableEscaper() {
+        // Utility class, no instantiation
+    }
+
+    /**
+     * Escapes LangChain4j template variables by replacing {{ with \\{{ and }} with \\}}
+     * This prevents LangChain4j from attempting to substitute variables that aren't meant for it.
+     *
+     * @param text The text containing template variables to escape
+     * @return The text with escaped template variables
+     */
+    public static String escape(String text) {
+        if (text == null) {
+            return null;
+        }
+        return text.replace("{{", "\\{\\{").replace("}}", "\\}\\}");
+    }
+}

src/main/resources/META-INF/plugin.xml

@@ -35,6 +35,11 @@
     ]]></description>
 
     <change-notes><![CDATA[
+        <h2>v0.5.4</h2>
+        <UL>
+            <LI>Feat: Show MCP Ai Message in chat output panel by @stephanj</LI>
+            <LI>Fix #587 : Escape template variables by @stephanj</LI>
+        </UL>
         <h2>v0.5.3</h2>
         <UL>
             <Li>Feat #586 : Added Gemini 2.5 Pro model by @stephanj</LI>

src/main/resources/application.properties

@@ -1 +1 @@
-version=0.5.3
+version=0.5.4