Merge branch 'main' into feature/OpenAI-Function

# Conflicts: # packages/server/marketplaces/chatflows/API Agent OpenAI.json # packages/server/marketplaces/chatflows/Conversational Retrieval Agent.json # packages/server/marketplaces/chatflows/OpenAI Agent.json
2026-06-29 01:01:11 +03:00 · 2023-11-29 00:26:36 +00:00
parent 464a23e0f4 9d64ebb72a
commit 8dec825c2d
43 changed files with 554 additions and 723 deletions
@@ -82,6 +82,8 @@ class ConversationalRetrievalAgent_Agents implements INode {
        if (executor.memory) {
            ;(executor.memory as any).memoryKey = 'chat_history'
            ;(executor.memory as any).outputKey = 'output'
+            ;(executor.memory as any).returnMessages = true
+
            const chatHistoryClassName = (executor.memory as any).chatHistory.constructor.name
            // Only replace when its In-Memory
            if (chatHistoryClassName && chatHistoryClassName === 'ChatMessageHistory') {