n8n-nodes-simple 2.2.15 → 2.4.0

package/dist/nodes/shared/core/execution/router.js

@@ -53,8 +53,8 @@ function initializeRouter(executeFunctions) {
         execute: messageOperation.execute,
     };
 }
-async function executeItem(execute, executeFunctions, itemIndex, parentMessageContentStr = '', parentMessageContentObj = {}) {
-    return await execute.call(executeFunctions, itemIndex, parentMessageContentStr, parentMessageContentObj);
+async function executeItem(execute, executeFunctions, itemIndex) {
+    return await execute.call(executeFunctions, itemIndex);
 }
 function handleNodeApiError(error, itemIndex) {
     var _a, _b, _c;
@@ -92,11 +92,11 @@ function handleError(error, executeFunctions, itemIndex, continueOnFail, returnD
     }
     return handleGenericError(normalizedError, executeFunctions, itemIndex);
 }
-async function processItems(config, executeFunctions, parentMessageContentStr = '', parentMessageContentObj = {}) {
+async function processItems(config, executeFunctions) {
     const { returnData, items, execute } = config;
     for (let i = 0; i < items.length; i++) {
         try {
-            const responseData = await executeItem(execute, executeFunctions, i, parentMessageContentStr, parentMessageContentObj);
+            const responseData = await executeItem(execute, executeFunctions, i);
             returnData.push(...responseData);
         }
         catch (error) {
@@ -109,9 +109,9 @@ async function processItems(config, executeFunctions, parentMessageContentStr =
     }
     return returnData;
 }
-async function router(parentMessageContentStr = '', parentMessageContentObj = {}) {
+async function router() {
     const config = initializeRouter(this);
-    const processedData = await processItems(config, this, parentMessageContentStr, parentMessageContentObj);
+    const processedData = await processItems(config, this);
     return [processedData];
 }
 //# sourceMappingURL=router.js.map

package/dist/nodes/shared/core/execution/router.js.map

@@ -1 +1 @@
-{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/router.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/router.ts"],"names":[],"mappings":"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"}

package/dist/nodes/shared/core/memory/index.d.ts

@@ -1,2 +1 @@
 export * from './io';
-export * from './optimizer';

package/dist/nodes/shared/core/memory/index.js

@@ -15,5 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./io"), exports);
-__exportStar(require("./optimizer"), exports);
 //# sourceMappingURL=index.js.map

package/dist/nodes/shared/core/memory/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/memory/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,uCAAqB;AACrB,8CAA4B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/memory/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,uCAAqB"}

package/dist/nodes/shared/core/memory/io.d.ts

@@ -1,5 +1,4 @@
-import type { IExecuteFunctions, IDataObject } from 'n8n-workflow';
-import type { BaseChatMemory } from 'langchain/memory';
-import type { ChatCompletion } from '../../api/types';
-export declare function getMemoryFromInput(executeFunctions: IExecuteFunctions): Promise<BaseChatMemory | undefined>;
-export declare function saveToMemory(memory: BaseChatMemory | undefined, messages: IDataObject[], response: ChatCompletion, outputStringified: string, saveToolCallsInChatMemory: boolean, originalMessagesLength?: number): Promise<void>;
+import type { IExecuteFunctions, ISupplyDataFunctions, IDataObject } from 'n8n-workflow';
+import type { BufferWindowMemory } from 'langchain/memory';
+export declare function getOptionalMemory(ctx: IExecuteFunctions | ISupplyDataFunctions): Promise<BufferWindowMemory | undefined>;
+export declare function saveToMemory(messages: IDataObject[], output: any, saveToolCallsInChatMemory: boolean, memory: BufferWindowMemory): Promise<void>;

package/dist/nodes/shared/core/memory/io.js

@@ -1,96 +1,63 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMemoryFromInput = getMemoryFromInput;
+exports.getOptionalMemory = getOptionalMemory;
 exports.saveToMemory = saveToMemory;
 const messages_1 = require("@langchain/core/messages");
-const converter_1 = require("../messages/converter");
-async function getMemoryFromInput(executeFunctions) {
-    let memoryInput;
-    try {
-        memoryInput = (await executeFunctions.getInputConnectionData('ai_memory', 0, undefined));
+const n8n_workflow_1 = require("n8n-workflow");
+async function getOptionalMemory(ctx) {
+    return (await ctx.getInputConnectionData(n8n_workflow_1.NodeConnectionTypes.AiMemory, 0));
+}
+function extractMessages(messages) {
+    if (!Array.isArray(messages) || messages.length === 0) {
+        return { lastUser: null, messagesAfter: [] };
+    }
+    let lastUserIndex = -1;
+    for (let i = messages.length - 1; i >= 0; i--) {
+        if (messages[i].role === "user") {
+            lastUserIndex = i;
+            break;
+        }
     }
-    catch (error) {
-        memoryInput = undefined;
+    if (lastUserIndex === -1) {
+        return { lastUser: null, messagesAfter: [] };
     }
-    return Array.isArray(memoryInput) ? memoryInput[0] : memoryInput;
+    const messagesAfter = messages.slice(lastUserIndex + 1);
+    return {
+        lastUser: messages[lastUserIndex],
+        messagesAfter
+    };
 }
-async function saveToMemory(memory, messages, response, outputStringified, saveToolCallsInChatMemory, originalMessagesLength = 0) {
-    var _a, _b, _c, _d, _e;
-    if (!memory || !((_b = (_a = response === null || response === void 0 ? void 0 : response.choices) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.message)) {
+async function saveToMemory(messages, output, saveToolCallsInChatMemory, memory) {
+    var _a;
+    const extractedMessages = extractMessages(messages);
+    const input = (_a = extractedMessages.lastUser) === null || _a === void 0 ? void 0 : _a.content;
+    if (!input) {
+        console.log('No user message found; no messages will be stored in the Chat Memory sub-node.');
         return;
     }
+    const stringifiedOutput = (typeof output === 'string' || typeof output === null) ? output : JSON.stringify(output);
     if (!saveToolCallsInChatMemory) {
-        const lastUserMessageContent = ((_c = [...messages].reverse().find((msg) => msg.role === 'user')) === null || _c === void 0 ? void 0 : _c.content) || '';
-        let assistantContent = outputStringified;
-        if (!assistantContent || assistantContent === 'null' || assistantContent === 'undefined') {
-            assistantContent = response.choices[0].message.content || '';
-            if (!assistantContent && ((_d = response.choices[0].message.tool_calls) === null || _d === void 0 ? void 0 : _d.length)) {
-                assistantContent =
-                    'Used tools: ' +
-                        response.choices[0].message.tool_calls.map((tc) => tc.function.name).join(', ');
-            }
-            else if (!assistantContent) {
-                assistantContent = '[No response content available]';
-            }
-        }
-        if (typeof assistantContent !== 'string') {
-            assistantContent = JSON.stringify(assistantContent);
-        }
-        try {
-            await memory.saveContext({ input: lastUserMessageContent }, { output: assistantContent });
-        }
-        catch (error) {
-            console.error('Error saving messages to memory:', error);
-        }
+        await memory.saveContext({ input: input }, { output: stringifiedOutput });
     }
     else {
-        try {
-            const lastUserMessage = [...messages].reverse().find((msg) => msg.role === 'user');
-            if (lastUserMessage === null || lastUserMessage === void 0 ? void 0 : lastUserMessage.content) {
-                const humanMessage = new messages_1.HumanMessage(lastUserMessage.content);
-                await memory.chatHistory.addMessage(humanMessage);
-            }
-            const conversationMessages = [];
-            for (let i = originalMessagesLength; i < messages.length; i++) {
-                const msg = messages[i];
-                if (msg.role === 'assistant' || msg.role === 'tool') {
-                    const messageToSave = {
-                        role: msg.role,
-                        content: msg.content || '',
-                        ...(msg.tool_calls && Array.isArray(msg.tool_calls) && msg.tool_calls.length > 0 && { tool_calls: msg.tool_calls }),
-                        ...(msg.tool_call_id && { tool_call_id: msg.tool_call_id }),
-                        ...(msg.refusal && { refusal: msg.refusal }),
-                    };
-                    conversationMessages.push(messageToSave);
-                }
-            }
-            let finalContent = outputStringified;
-            if (!finalContent || finalContent === 'null' || finalContent === 'undefined') {
-                finalContent = response.choices[0].message.content || '';
-                if (!finalContent && ((_e = response.choices[0].message.tool_calls) === null || _e === void 0 ? void 0 : _e.length)) {
-                    finalContent =
-                        'Used tools: ' +
-                            response.choices[0].message.tool_calls.map((tc) => tc.function.name).join(', ');
-                }
-                else if (!finalContent) {
-                    finalContent = '[No response content available]';
-                }
-            }
-            if (typeof finalContent !== 'string') {
-                finalContent = JSON.stringify(finalContent);
-            }
-            const sanitizedConversationMessages = conversationMessages.map(converter_1.sanitizeMessage);
-            const aiMessage = new messages_1.AIMessage({
-                content: finalContent,
-                ...(sanitizedConversationMessages.length > 0 && { tool_calls: sanitizedConversationMessages }),
-                additional_kwargs: {},
-                response_metadata: {},
-            });
-            await memory.chatHistory.addMessage(aiMessage);
-        }
-        catch (error) {
-            console.error('Error saving messages with tool calls to memory:', error);
-        }
+        const humanMessage = new messages_1.HumanMessage(input);
+        await memory.chatHistory.addMessage(humanMessage);
+        const tool_calls = extractedMessages.messagesAfter
+            .filter(msg => msg.role === 'assistant' || msg.role === 'tool')
+            .map(msg => ({
+            role: msg.role,
+            content: msg.content || null,
+            ...(msg.tool_calls && { tool_calls: msg.tool_calls }),
+            ...(msg.tool_call_id && { tool_call_id: msg.tool_call_id }),
+            ...(msg.refusal && { refusal: msg.refusal }),
+        }));
+        const aiMessage = new messages_1.AIMessage({
+            content: stringifiedOutput,
+            tool_calls: tool_calls,
+            additional_kwargs: {},
+            response_metadata: {},
+        });
+        await memory.chatHistory.addMessage(aiMessage);
     }
 }
 //# sourceMappingURL=io.js.map

package/dist/nodes/shared/core/memory/io.js.map

@@ -1 +1 @@
-{"version":3,"file":"io.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/memory/io.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"io.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/memory/io.ts"],"names":[],"mappings":"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"}

package/dist/nodes/shared/core/messages/chatHistory.d.ts

@@ -1,2 +1,3 @@
 import { Message, RawMessage } from './types';
-export declare function unpackChatHistoryAndMemory(rawMessagesToSend: RawMessage[], memory?: any, loadToolCallsFromChatMemory?: boolean): Promise<Message[]>;
+import type { BufferWindowMemory } from 'langchain/memory';
+export declare function unpackChatHistoryAndMemory(rawMessagesToSend: RawMessage[], loadToolCallsFromChatMemory?: boolean, memory?: BufferWindowMemory): Promise<Message[]>;

package/dist/nodes/shared/core/messages/chatHistory.js

@@ -1,63 +1,42 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unpackChatHistoryAndMemory = unpackChatHistoryAndMemory;
-const optimizer_1 = require("../memory/optimizer");
 const converter_1 = require("./converter");
-async function unpackChatHistoryAndMemory(rawMessagesToSend, memory, loadToolCallsFromChatMemory = true) {
+async function getChatMessages(memory) {
+    return (await memory.loadMemoryVariables({}))[memory.memoryKey];
+}
+async function unpackChatHistoryAndMemory(rawMessagesToSend, loadToolCallsFromChatMemory = true, memory) {
     const processedMessages = [];
     for (const rawMessage of rawMessagesToSend) {
-        if (rawMessage.role !== 'chatHistoryRole' && rawMessage.role !== 'chatMemoryRole') {
-            processedMessages.push(rawMessage);
-        }
-        else if (rawMessage.role === 'chatHistoryRole') {
-            try {
-                let chatHistory;
-                if (typeof rawMessage.chatHistoryJson === 'string') {
-                    chatHistory = JSON.parse(rawMessage.chatHistoryJson || '[]');
-                }
-                else {
-                    chatHistory = rawMessage.chatHistoryJson;
-                }
-                if (Array.isArray(chatHistory)) {
-                    processedMessages.push(...chatHistory);
-                }
-                else {
-                    processedMessages.push({
-                        role: 'user',
-                        content: JSON.stringify(rawMessage.chatHistoryJson),
-                    });
-                }
+        if (rawMessage.role === 'chatHistoryRole') {
+            let chatHistory;
+            if (typeof rawMessage.chatHistoryJson === 'string') {
+                chatHistory = JSON.parse(rawMessage.chatHistoryJson || '[]');
+            }
+            else {
+                chatHistory = rawMessage.chatHistoryJson;
             }
-            catch (error) {
+            if (Array.isArray(chatHistory)) {
+                processedMessages.push(...chatHistory);
+            }
+            else {
                 processedMessages.push({
                     role: 'user',
                     content: JSON.stringify(rawMessage.chatHistoryJson),
                 });
             }
         }
-        else if (rawMessage.role === 'chatMemoryRole' && memory && memory.chatHistory) {
-            try {
-                let k = memory.k;
-                if (k === 0 || !memory.k) {
-                }
-                else {
-                    if (k > 0 && k < 1) {
-                        k = 1;
-                    }
-                    const rawMemoryMessages = await (0, optimizer_1.getLastKMessages)(memory, k);
-                    if (rawMemoryMessages.length === 0) {
-                    }
-                    else {
-                        const memoryMessages = (0, converter_1.convertMessages)(rawMemoryMessages, loadToolCallsFromChatMemory);
-                        processedMessages.push(...memoryMessages);
-                    }
-                }
-            }
-            catch (error) {
-                console.error('Error retrieving messages from memory:', error);
+        else if (rawMessage.role === 'chatMemoryRole' && memory) {
+            const rawMemoryMessages = await getChatMessages(memory);
+            if (rawMemoryMessages.length > 0) {
+                const memoryMessages = (0, converter_1.convertMessages)(rawMemoryMessages, loadToolCallsFromChatMemory);
+                processedMessages.push(...memoryMessages);
             }
         }
+        else {
+            processedMessages.push(rawMessage);
+        }
     }
-    return (0, converter_1.expandToolCallsInMessages)(processedMessages, loadToolCallsFromChatMemory);
+    return processedMessages;
 }
 //# sourceMappingURL=chatHistory.js.map

package/dist/nodes/shared/core/messages/chatHistory.js.map

@@ -1 +1 @@
-{"version":3,"file":"chatHistory.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/messages/chatHistory.ts"],"names":[],"mappings":";;AAYA,gEA2EC;AArFD,mDAAuD;AACvD,2CAAyE;AASlE,KAAK,UAAU,0BAA0B,CAC/C,iBAA+B,EAC/B,MAAY,EACZ,8BAAuC,IAAI;IAE3C,MAAM,iBAAiB,GAAc,EAAE,CAAC;IAExC,KAAK,MAAM,UAAU,IAAI,iBAAiB,EAAE,CAAC;QAC5C,IAAI,UAAU,CAAC,IAAI,KAAK,iBAAiB,IAAI,UAAU,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;YAEnF,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACpC,CAAC;aAAM,IAAI,UAAU,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;YAClD,IAAI,CAAC;gBAEJ,IAAI,WAAW,CAAC;gBAChB,IAAI,OAAO,UAAU,CAAC,eAAe,KAAK,QAAQ,EAAE,CAAC;oBACpD,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,eAAe,IAAI,IAAI,CAAC,CAAC;gBAC9D,CAAC;qBAAM,CAAC;oBACP,WAAW,GAAG,UAAU,CAAC,eAAe,CAAC;gBAC1C,CAAC;gBAED,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;oBAEhC,iBAAiB,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;gBACxC,CAAC;qBAAM,CAAC;oBAEP,iBAAiB,CAAC,IAAI,CAAC;wBACtB,IAAI,EAAE,MAAM;wBACZ,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,eAAe,CAAC;qBACnD,CAAC,CAAC;gBACJ,CAAC;YACF,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBAErB,iBAAiB,CAAC,IAAI,CAAC;oBACtB,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,eAAe,CAAC;iBACnD,CAAC,CAAC;YACJ,CAAC;QACF,CAAC;aAAM,IAAI,UAAU,CAAC,IAAI,KAAK,gBAAgB,IAAI,MAAM,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YACjF,IAAI,CAAC;gBAEJ,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC;gBAEjB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;gBAG3B,CAAC;qBAAM,CAAC;oBAEP,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;wBACpB,CAAC,GAAG,CAAC,CAAC;oBACP,CAAC;oBAGD,MAAM,iBAAiB,GAAkB,MAAM,IAAA,4BAAgB,EAAC,MAAM,EAAE,CAAC,CAAC,CAAC;oBAG3E,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAErC,CAAC;yBAAM,CAAC;wBAEP,MAAM,cAAc,GAAc,IAAA,2BAAe,EAChD,iBAAiB,EACjB,2BAA2B,CAC3B,CAAC;wBACF,iBAAiB,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,CAAC;oBAC3C,CAAC;gBACF,CAAC;YACF,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,OAAO,CAAC,KAAK,CAAC,wCAAwC,EAAE,KAAK,CAAC,CAAC;YAChE,CAAC;QACF,CAAC;IACF,CAAC;IAGD,OAAO,IAAA,qCAAyB,EAAC,iBAAiB,EAAE,2BAA2B,CAAC,CAAC;AAClF,CAAC"}
+{"version":3,"file":"chatHistory.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/messages/chatHistory.ts"],"names":[],"mappings":";;AAgBA,gEAiDC;AA9DD,2CAA8C;AAE9C,KAAK,UAAU,eAAe,CAAC,MAA0B;IACxD,OAAO,CAAC,MAAM,MAAM,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAkB,CAAC;AAClF,CAAC;AASM,KAAK,UAAU,0BAA0B,CAC/C,iBAA+B,EAC/B,8BAAuC,IAAI,EAC3C,MAA2B;IAE3B,MAAM,iBAAiB,GAAc,EAAE,CAAC;IAExC,KAAK,MAAM,UAAU,IAAI,iBAAiB,EAAE,CAAC;QAC5C,IAAI,UAAU,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;YAG3C,IAAI,WAAW,CAAC;YAChB,IAAI,OAAO,UAAU,CAAC,eAAe,KAAK,QAAQ,EAAE,CAAC;gBACpD,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,eAAe,IAAI,IAAI,CAAC,CAAC;YAC9D,CAAC;iBAAM,CAAC;gBACP,WAAW,GAAG,UAAU,CAAC,eAAe,CAAC;YAC1C,CAAC;YAED,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;gBAEhC,iBAAiB,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;YACxC,CAAC;iBAAM,CAAC;gBAEP,iBAAiB,CAAC,IAAI,CAAC;oBACtB,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,eAAe,CAAC;iBACnD,CAAC,CAAC;YACJ,CAAC;QAEF,CAAC;aAAM,IAAI,UAAU,CAAC,IAAI,KAAK,gBAAgB,IAAI,MAAM,EAAE,CAAC;YAG3D,MAAM,iBAAiB,GAAkB,MAAM,eAAe,CAAC,MAAM,CAAC,CAAA;YAEtE,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAElC,MAAM,cAAc,GAAc,IAAA,2BAAe,EAChD,iBAAiB,EACjB,2BAA2B,CAC3B,CAAC;gBACF,iBAAiB,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,CAAC;YAC3C,CAAC;QACF,CAAC;aAAM,CAAC;YAEP,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACpC,CAAC;IACF,CAAC;IAED,OAAO,iBAAiB,CAAC;AAC1B,CAAC"}

package/dist/nodes/shared/core/messages/converter.d.ts

@@ -1,5 +1,3 @@
 import { Message } from './types';
 import { BaseMessage } from '@langchain/core/dist/messages/base';
 export declare function convertMessages(messages: BaseMessage[], loadToolCalls?: boolean): Message[];
-export declare function expandToolCallsInMessages(messages: Message[], loadToolCalls?: boolean): Message[];
-export declare function sanitizeMessage(message: any): any;

package/dist/nodes/shared/core/messages/converter.js

@@ -1,20 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertMessages = convertMessages;
-exports.expandToolCallsInMessages = expandToolCallsInMessages;
-exports.sanitizeMessage = sanitizeMessage;
-const n8n_workflow_1 = require("n8n-workflow");
 function convertMessages(messages, loadToolCalls = true) {
     const result = [];
     for (const message of messages) {
         const role = message.constructor.name === 'AIMessage' ? 'assistant' : 'user';
-        const content = typeof message.content === 'string' ? message.content : JSON.stringify(message.content);
+        const content = typeof message.content === 'string' ? message.content
+            : typeof message.content === null ? ''
+                : JSON.stringify(message.content);
         const toolCalls = message.tool_calls;
-        if (role === 'assistant' &&
-            toolCalls &&
-            Array.isArray(toolCalls) &&
-            toolCalls.length > 0 &&
-            loadToolCalls) {
+        if (loadToolCalls &&
+            role === 'assistant' &&
+            Array.isArray(toolCalls)) {
             result.push(...toolCalls);
             result.push({
                 role: 'assistant',
@@ -30,62 +27,4 @@ function convertMessages(messages, loadToolCalls = true) {
     }
     return result;
 }
-function expandToolCallsInMessages(messages, loadToolCalls = true) {
-    var _a;
-    const result = [];
-    for (const message of messages) {
-        if (message.role !== 'assistant' || !((_a = message.tool_calls) === null || _a === void 0 ? void 0 : _a.length)) {
-            const messageCopy = { ...message };
-            if (messageCopy.tool_calls)
-                delete messageCopy.tool_calls;
-            result.push(messageCopy);
-            continue;
-        }
-        if (!loadToolCalls) {
-            result.push({
-                role: 'assistant',
-                content: message.content,
-            });
-            continue;
-        }
-        result.push(...message.tool_calls);
-        result.push({
-            role: 'assistant',
-            content: message.content,
-        });
-    }
-    return result;
-}
-function sanitizeMessage(message) {
-    const hasToolCalls = message.tool_calls && Array.isArray(message.tool_calls);
-    const isEmptyToolCalls = hasToolCalls && message.tool_calls.length === 0;
-    n8n_workflow_1.LoggerProxy.debug('Sanitizing message', {
-        messageRole: message.role,
-        hasToolCalls,
-        toolCallsLength: hasToolCalls ? message.tool_calls.length : 'N/A',
-        isEmptyToolCalls,
-        messageId: message.id || 'no-id'
-    });
-    const sanitized = { ...message };
-    if (sanitized.tool_calls && Array.isArray(sanitized.tool_calls)) {
-        sanitized.tool_calls = [...sanitized.tool_calls];
-        if (sanitized.tool_calls.length === 0) {
-            n8n_workflow_1.LoggerProxy.debug('Removing empty tool_calls array during sanitization', {
-                messageRole: sanitized.role,
-                originalToolCallsLength: message.tool_calls.length,
-                messageId: message.id || 'no-id'
-            });
-            delete sanitized.tool_calls;
-        }
-    }
-    const sanitizedHasToolCalls = sanitized.tool_calls && Array.isArray(sanitized.tool_calls);
-    n8n_workflow_1.LoggerProxy.debug('Message sanitization complete', {
-        messageRole: sanitized.role,
-        originalHadToolCalls: hasToolCalls,
-        sanitizedHasToolCalls,
-        removedEmptyToolCalls: hasToolCalls && !sanitizedHasToolCalls,
-        messageId: message.id || 'no-id'
-    });
-    return sanitized;
-}
 //# sourceMappingURL=converter.js.map

package/dist/nodes/shared/core/messages/converter.js.map

@@ -1 +1 @@
-{"version":3,"file":"converter.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/messages/converter.ts"],"names":[],"mappings":";;AAgBA,0CAmCC;AASD,8DAoCC;AASD,0CAuCC;AA9ID,+CAAqD;AAcrD,SAAgB,eAAe,CAAC,QAAuB,EAAE,gBAAyB,IAAI;IACrF,MAAM,MAAM,GAAc,EAAE,CAAC;IAE7B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAChC,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC;QAC7E,MAAM,OAAO,GACZ,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAGzF,MAAM,SAAS,GAAI,OAAe,CAAC,UAAU,CAAC;QAC9C,IACC,IAAI,KAAK,WAAW;YACpB,SAAS;YACT,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC;YACxB,SAAS,CAAC,MAAM,GAAG,CAAC;YACpB,aAAa,EACZ,CAAC;YAEF,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;YAG1B,MAAM,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,OAAO;aAChB,CAAC,CAAC;QACJ,CAAC;aAAM,CAAC;YAEP,MAAM,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,IAAI;gBACV,OAAO,EAAE,OAAO;aAChB,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IAED,OAAO,MAAM,CAAC;AACf,CAAC;AASD,SAAgB,yBAAyB,CACxC,QAAmB,EACnB,gBAAyB,IAAI;;IAE7B,MAAM,MAAM,GAAc,EAAE,CAAC;IAE7B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAEhC,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,IAAI,CAAC,CAAA,MAAA,OAAO,CAAC,UAAU,0CAAE,MAAM,CAAA,EAAE,CAAC;YAEjE,MAAM,WAAW,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;YACnC,IAAI,WAAW,CAAC,UAAU;gBAAE,OAAO,WAAW,CAAC,UAAU,CAAC;YAC1D,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACzB,SAAS;QACV,CAAC;QAGD,IAAI,CAAC,aAAa,EAAE,CAAC;YACpB,MAAM,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,OAAO,CAAC,OAAO;aACxB,CAAC,CAAC;YACH,SAAS;QACV,CAAC;QAGD,MAAM,CAAC,IAAI,CAAC,GAAI,OAAO,CAAC,UAA+B,CAAC,CAAC;QAGzD,MAAM,CAAC,IAAI,CAAC;YACX,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,OAAO,CAAC,OAAO;SACxB,CAAC,CAAC;IACJ,CAAC;IAED,OAAO,MAAM,CAAC;AACf,CAAC;AASD,SAAgB,eAAe,CAAC,OAAY;IAC3C,MAAM,YAAY,GAAG,OAAO,CAAC,UAAU,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC7E,MAAM,gBAAgB,GAAG,YAAY,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC;IAEzE,0BAAM,CAAC,KAAK,CAAC,oBAAoB,EAAE;QAClC,WAAW,EAAE,OAAO,CAAC,IAAI;QACzB,YAAY;QACZ,eAAe,EAAE,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK;QACjE,gBAAgB;QAChB,SAAS,EAAE,OAAO,CAAC,EAAE,IAAI,OAAO;KAChC,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;IAGjC,IAAI,SAAS,CAAC,UAAU,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC;QACjE,SAAS,CAAC,UAAU,GAAG,CAAC,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;QAGjD,IAAI,SAAS,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvC,0BAAM,CAAC,KAAK,CAAC,qDAAqD,EAAE;gBACnE,WAAW,EAAE,SAAS,CAAC,IAAI;gBAC3B,uBAAuB,EAAE,OAAO,CAAC,UAAU,CAAC,MAAM;gBAClD,SAAS,EAAE,OAAO,CAAC,EAAE,IAAI,OAAO;aAChC,CAAC,CAAC;YACH,OAAO,SAAS,CAAC,UAAU,CAAC;QAC7B,CAAC;IACF,CAAC;IAED,MAAM,qBAAqB,GAAG,SAAS,CAAC,UAAU,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAC1F,0BAAM,CAAC,KAAK,CAAC,+BAA+B,EAAE;QAC7C,WAAW,EAAE,SAAS,CAAC,IAAI;QAC3B,oBAAoB,EAAE,YAAY;QAClC,qBAAqB;QACrB,qBAAqB,EAAE,YAAY,IAAI,CAAC,qBAAqB;QAC7D,SAAS,EAAE,OAAO,CAAC,EAAE,IAAI,OAAO;KAChC,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC;AAClB,CAAC"}
+{"version":3,"file":"converter.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/messages/converter.ts"],"names":[],"mappings":";;AAeA,0CAkCC;AAlCD,SAAgB,eAAe,CAAC,QAAuB,EAAE,gBAAyB,IAAI;IACrF,MAAM,MAAM,GAAc,EAAE,CAAC;IAE7B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAChC,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC;QAC7E,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO;YACpE,CAAC,CAAC,OAAO,OAAO,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE;gBACtC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAGnC,MAAM,SAAS,GAAI,OAAe,CAAC,UAAU,CAAC;QAC9C,IACC,aAAa;YACb,IAAI,KAAK,WAAW;YACpB,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EACvB,CAAC;YAEF,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;YAG1B,MAAM,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,OAAO;aAChB,CAAC,CAAC;QACJ,CAAC;aAAM,CAAC;YAEP,MAAM,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,IAAI;gBACV,OAAO,EAAE,OAAO;aAChB,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IAED,OAAO,MAAM,CAAC;AACf,CAAC"}

package/dist/nodes/shared/core/messages/processor.d.ts

@@ -1,4 +1,4 @@
 import type { IDataObject } from 'n8n-workflow';
-import type { BaseChatMemory } from 'langchain/memory';
+import type { BufferWindowMemory } from 'langchain/memory';
 import { Message } from './types';
-export declare function processMessages(rawMessagesToSend: Message[], memory: BaseChatMemory | undefined, parentMessageContentStr: string, parentMessageContentObj: object, loadToolCallsFromChatMemory?: boolean): Promise<IDataObject[]>;
+export declare function processMessages(rawMessagesToSend: Message[], loadToolCallsFromChatMemory?: boolean, memory?: BufferWindowMemory): Promise<IDataObject[]>;

package/dist/nodes/shared/core/messages/processor.js

@@ -1,61 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processMessages = processMessages;
-const n8n_workflow_1 = require("n8n-workflow");
 const chatHistory_1 = require("./chatHistory");
-const converter_1 = require("./converter");
-async function processMessages(rawMessagesToSend, memory, parentMessageContentStr, parentMessageContentObj, loadToolCallsFromChatMemory = true) {
-    n8n_workflow_1.LoggerProxy.debug('Message processor: Starting with raw messages', {
-        rawMessageCount: rawMessagesToSend.length,
-        rawMessagesWithToolCalls: rawMessagesToSend.filter(m => m.tool_calls).length,
-        rawMessagesWithEmptyToolCalls: rawMessagesToSend.filter(m => m.tool_calls && Array.isArray(m.tool_calls) && m.tool_calls.length === 0).length,
-        loadToolCallsFromChatMemory,
-    });
-    let messages = (await (0, chatHistory_1.unpackChatHistoryAndMemory)(rawMessagesToSend, memory, loadToolCallsFromChatMemory));
-    n8n_workflow_1.LoggerProxy.debug('Message processor: After unpacking chat history and memory', {
-        messageCount: messages.length,
-        messagesWithToolCalls: messages.filter(m => m.tool_calls).length,
-        messagesWithEmptyToolCalls: messages.filter(m => m.tool_calls && Array.isArray(m.tool_calls) && m.tool_calls.length === 0).length,
-    });
-    messages = messages
-        .map((item) => ({
-        ...item,
-        content: typeof item.content === 'string' ? item.content.trim() : item.content,
-    }))
-        .filter((item) => {
-        var _a;
-        return item.content !== '' ||
-            (item.role === 'assistant' && ((_a = item.tool_calls) === null || _a === void 0 ? void 0 : _a.length) > 0) ||
-            item.role === 'tool';
-    });
-    n8n_workflow_1.LoggerProxy.debug('Message processor: After filtering and trimming', {
-        messageCount: messages.length,
-        messagesWithToolCalls: messages.filter(m => m.tool_calls).length,
-        messagesWithEmptyToolCalls: messages.filter(m => m.tool_calls && Array.isArray(m.tool_calls) && m.tool_calls.length === 0).length,
-    });
-    if (parentMessageContentStr !== '') {
-        messages.push({ role: 'user', content: parentMessageContentStr });
-    }
-    else if (Object.keys(parentMessageContentObj).length !== 0) {
-        messages.push({ role: 'user', content: JSON.stringify(parentMessageContentObj) });
-    }
-    n8n_workflow_1.LoggerProxy.debug('Message processor: Before final sanitization', {
-        messageCount: messages.length,
-        messagesWithToolCalls: messages.filter(m => m.tool_calls).length,
-        messagesWithEmptyToolCalls: messages.filter(m => m.tool_calls && Array.isArray(m.tool_calls) && m.tool_calls.length === 0).length,
-    });
-    messages = messages.map(converter_1.sanitizeMessage);
-    n8n_workflow_1.LoggerProxy.debug('Message processor: After final sanitization - FINAL OUTPUT', {
-        messageCount: messages.length,
-        messagesWithToolCalls: messages.filter(m => m.tool_calls).length,
-        messagesWithEmptyToolCalls: messages.filter(m => m.tool_calls && Array.isArray(m.tool_calls) && m.tool_calls.length === 0).length,
-        messageStructures: messages.map((m, i) => ({
-            index: i,
-            role: m.role,
-            hasToolCalls: !!m.tool_calls,
-            toolCallsLength: Array.isArray(m.tool_calls) ? m.tool_calls.length : 'N/A'
-        }))
-    });
+async function processMessages(rawMessagesToSend, loadToolCallsFromChatMemory = true, memory) {
+    let messages = (await (0, chatHistory_1.unpackChatHistoryAndMemory)(rawMessagesToSend, loadToolCallsFromChatMemory, memory));
     return messages;
 }
 //# sourceMappingURL=processor.js.map

package/dist/nodes/shared/core/messages/processor.js.map

@@ -1 +1 @@
-{"version":3,"file":"processor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/messages/processor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"processor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/messages/processor.ts"],"names":[],"mappings":";;AAQA,0CAaC;AAlBD,+CAA2D;AAKpD,KAAK,UAAU,eAAe,CACpC,iBAA4B,EAC5B,8BAAuC,IAAI,EAC3C,MAA2B;IAG3B,IAAI,QAAQ,GAAG,CAAC,MAAM,IAAA,wCAA0B,EAC/C,iBAAiB,EACjB,2BAA2B,EAC3B,MAAM,CACN,CAAkB,CAAC;IAEpB,OAAO,QAAQ,CAAC;AACjB,CAAC"}

package/dist/nodes/shared/core/request/body.js

@@ -4,10 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareRequestBody = prepareRequestBody;
-const n8n_workflow_1 = require("n8n-workflow");
 const omit_1 = __importDefault(require("lodash/omit"));
 const types_1 = require("../messages/types");
-const converter_1 = require("../messages/converter");
 function prepareRequestBody(model, messages, tools, tool_choice, response_format, options, customParameters) {
     let customParamsObj = {};
     if (customParameters) {
@@ -40,27 +38,6 @@ function prepareRequestBody(model, messages, tools, tool_choice, response_format
     if (!Array.isArray(messages) || !messages.every(types_1.isValidMessage)) {
         throw new Error("Invalid or missing 'messages' in the request body.");
     }
-    n8n_workflow_1.LoggerProxy.debug('Request body preparation: Before sanitization', {
-        messageCount: messages.length,
-        messagesWithToolCalls: messages.filter(m => m.tool_calls).length,
-        messagesWithEmptyToolCalls: messages.filter(m => m.tool_calls && Array.isArray(m.tool_calls) && m.tool_calls.length === 0).length,
-        model,
-        toolsCount: tools.length
-    });
-    body.messages = messages.map(converter_1.sanitizeMessage);
-    n8n_workflow_1.LoggerProxy.debug('Request body preparation: After sanitization - FINAL REQUEST BODY', {
-        messageCount: body.messages.length,
-        messagesWithToolCalls: body.messages.filter((m) => m.tool_calls).length,
-        messagesWithEmptyToolCalls: body.messages.filter((m) => m.tool_calls && Array.isArray(m.tool_calls) && m.tool_calls.length === 0).length,
-        model,
-        toolsCount: tools.length,
-        messageStructures: body.messages.map((m, i) => ({
-            index: i,
-            role: m.role,
-            hasToolCalls: !!m.tool_calls,
-            toolCallsLength: Array.isArray(m.tool_calls) ? m.tool_calls.length : 'N/A'
-        }))
-    });
     return body;
 }
 //# sourceMappingURL=body.js.map

package/dist/nodes/shared/core/request/body.js.map

@@ -1 +1 @@
-{"version":3,"file":"body.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/request/body.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"body.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/request/body.ts"],"names":[],"mappings":";;;;;AAOA,gDA6CC;AAnDD,uDAAgC;AAChC,6CAAmD;AAKnD,SAAgB,kBAAkB,CACjC,KAAa,EACb,QAAuB,EACvB,KAAY,EACZ,WAA+B,EAC/B,eAAwC,EACxC,OAAoB,EACpB,gBAAsC;IAEtC,IAAI,eAAe,GAAgB,EAAE,CAAC;IACtC,IAAI,gBAAgB,EAAE,CAAC;QACtB,IAAI,OAAO,gBAAgB,KAAK,QAAQ,IAAI,gBAAgB,CAAC,IAAI,EAAE,EAAE,CAAC;YACrE,IAAI,CAAC;gBACJ,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;YAChD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;YACrD,CAAC;QACF,CAAC;aAAM,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE,CAAC;YACjD,eAAe,GAAG,gBAAgB,CAAC;QACpC,CAAC;IACF,CAAC;IAGD,MAAM,YAAY,GAAG,IAAA,cAAK,EAAC,OAAO,EAAE;QACnC,kBAAkB;QAClB,iBAAiB;QACjB,oBAAoB;KACpB,CAAC,CAAC;IAEH,MAAM,IAAI,GAAgB;QACzB,KAAK;QACL,QAAQ;QACR,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACtC,WAAW;QACX,eAAe;QACf,GAAG,YAAY;QACf,GAAG,eAAe;KAClB,CAAC;IAGF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,sBAAc,CAAC,EAAE,CAAC;QACjE,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;IACvE,CAAC;IAED,OAAO,IAAI,CAAC;AACb,CAAC"}

package/dist/nodes/shared/core/tools/executor.d.ts

@@ -1,6 +1,6 @@
 import type { IExecuteFunctions, IDataObject } from 'n8n-workflow';
 import type { ChatCompletion } from '../../api/types';
-export declare function processToolCalls(executeFunctions: IExecuteFunctions, body: IDataObject, messages: IDataObject[], invokableTools: any[], structuredOutputTool: IDataObject | undefined, maxToolsIterations: number, abortSignal: AbortSignal | undefined): Promise<{
+export declare function processToolCalls(executeFunctions: IExecuteFunctions, body: IDataObject, messages: IDataObject[], invokableTools: any[], maxToolsIterations: number, responseFormat: string, structuredOutputTool?: IDataObject, abortSignal?: AbortSignal): Promise<{
     response: ChatCompletion;
     output: any;
 }>;