Merge branch 'main' into messageAction

CHANGELOG.md

@@ -3,15 +3,23 @@
 Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## Unreleased
+
 ### Features
+
 ### Enhancements
+
 - feat: Hide navigate to discover button if alert is not from visual editor monitor([#368](https://github.com/opensearch-project/dashboards-assistant/pull/368))
 - Add flags in the config to control trace view and feedback buttons in message bubbles ([#379](https://github.com/opensearch-project/dashboards-assistant/pull/379))
 
 ### Bug Fixes
+
 - Optimize the response of AI agent APIs ([#373](https://github.com/opensearch-project/dashboards-assistant/pull/373))
+- fixed incorrect message id field used ([#378](https://github.com/opensearch-project/dashboards-assistant/pull/378))
 
 ### Infrastructure
+
 ### Documentation
+
 ### Maintenance
+
 ### Refactoring

server/services/chat/olly_chat_service.ts

@@ -19,7 +19,7 @@ interface AgentRunPayload {
 }
 
 const MEMORY_ID_FIELD = 'memory_id';
-const INTERACTION_ID_FIELD = 'parent_interaction_id';
+const INTERACTION_ID_FIELDS = ['parent_message_id', 'parent_interaction_id'];
 
 export class OllyChatService implements ChatService {
   static abortControllers: Map<string, AbortController> = new Map();
@@ -67,7 +67,9 @@ export class OllyChatService implements ChatService {
       }>;
       const outputBody = agentFrameworkResponse.body.inference_results?.[0]?.output;
       const conversationIdItem = outputBody?.find((item) => item.name === MEMORY_ID_FIELD);
-      const interactionIdItem = outputBody?.find((item) => item.name === INTERACTION_ID_FIELD);
+      const interactionIdItem = outputBody?.find((item) =>
+        INTERACTION_ID_FIELDS.includes(item.name)
+      );
       return {
         /**
          * Interactions will be stored in Agent framework,