n8n-nodes-simple 2.4.13 → 2.5.0

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

@@ -1,102 +1,100 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runModel = runModel;
-exports.runModelWithFallback = runModelWithFallback;
+const n8n_workflow_1 = require("n8n-workflow");
 const structuredOutput_1 = require("../request/structuredOutput");
 const setup_1 = require("../tools/setup");
 const body_1 = require("../request/body");
 const executor_1 = require("../tools/executor");
 const outputData_1 = require("./outputData");
 const io_1 = require("../memory/io");
-async function runModel(executeFunctions, params, messages, index, modelToUse, memory, primaryError) {
-    var _a, _b, _c, _d, _e;
+const validation_1 = require("../request/validation");
+const errors_1 = require("./errors");
+const retryHandler_1 = require("./retryHandler");
+async function runModel(executeFunctions, params, messages, index, modelToUse, memory) {
+    var _a, _b, _c, _d;
     let responseFormat = (0, structuredOutput_1.prepareResponseFormatField)(params.responseFormat, params.outputJsonSchemaDefinition, params.structuredOutputName, params.structuredOutputDescription, params.structuredOutputProperties, params.structuredOutputIsArray, params.structuredOutputArrayName, params.structuredOutputArrayDescription);
     const { tools, invokableTools, tool_choice, structuredOutputTool } = await (0, setup_1.prepareTools)(executeFunctions, params.structuredOutputToolsMode, params.maxToolsIterations, responseFormat);
     if (params.structuredOutputToolsMode) {
         responseFormat = undefined;
     }
     ;
-    const body = (0, body_1.prepareRequestBody)(modelToUse, messages, tools, tool_choice, responseFormat, params.options, params.customParameters);
-    const { response, structuredOutputToolResponse } = await (0, executor_1.processToolCalls)(executeFunctions, body, messages, invokableTools, params.maxToolsIterations, structuredOutputTool, params.abortSignal);
-    let output;
-    try {
-        output = JSON.parse(structuredOutputToolResponse)
-            || (params.responseFormat === "plainText"
-                ? (_a = response === null || response === void 0 ? void 0 : response.choices[0]) === null || _a === void 0 ? void 0 : _a.message.content
-                : JSON.parse((_b = response === null || response === void 0 ? void 0 : response.choices[0]) === null || _b === void 0 ? void 0 : _b.message.content));
-    }
-    catch (error) {
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        const showValue = (val) => {
-            if (val === null)
-                return 'null';
-            if (val === undefined)
-                return 'undefined';
-            if (val === '')
-                return '<empty string>';
-            return String(val);
-        };
-        let detailedError = `JSON parse error: ${errorMessage}.`;
-        detailedError += ` | Assistant message content: ${showValue((_e = (_d = (_c = response === null || response === void 0 ? void 0 : response.choices) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.message) === null || _e === void 0 ? void 0 : _e.content)}`;
-        detailedError += ` | Structured output tool response: ${showValue(structuredOutputToolResponse)}`;
-        detailedError += ` | Full response: ${JSON.stringify(response, null, 2)}`;
-        throw new Error(detailedError);
-    }
-    const outputData = await (0, outputData_1.prepareOutputData)(response, output, messages, params.addToOutput, executeFunctions, index, body, primaryError);
-    if (memory) {
-        await (0, io_1.saveToMemory)(messages, output, params.saveToolCallsInChatMemory, memory);
-    }
-    return outputData;
-}
-function extractErrorInfo(error) {
-    const message = error instanceof Error ? error.message : String(error);
-    const description = error.description;
-    const requestBody = error.requestBody;
-    const httpCode = error.httpCode;
-    return { message, description, requestBody, httpCode };
-}
-async function runModelWithFallback(executeFunctions, params, messages, index, memory) {
-    var _a, _b;
-    try {
-        const item = await runModel(executeFunctions, params, messages, index, params.model, memory);
-        if (!item || item.length === 0) {
-            throw new Error(`Model returned no data: ${JSON.stringify(item)}`);
+    const shouldValidate = params.tenacityMaxRetries > 0 &&
+        (params.responseFormat === 'structuredOutputSchema' || params.responseFormat === 'structuredOutputVisual');
+    let validationSchema;
+    if (shouldValidate) {
+        if (params.structuredOutputToolsMode && structuredOutputTool) {
+            validationSchema = (_a = structuredOutputTool.function) === null || _a === void 0 ? void 0 : _a.parameters;
         }
-        if (!((_a = item[0].json) === null || _a === void 0 ? void 0 : _a.output)) {
-            throw new Error(`Model returned invalid output: ${JSON.stringify((_b = item[0].json) === null || _b === void 0 ? void 0 : _b.output)}`);
+        else if (responseFormat === null || responseFormat === void 0 ? void 0 : responseFormat.json_schema) {
+            validationSchema = (_b = responseFormat.json_schema) === null || _b === void 0 ? void 0 : _b.schema;
         }
-        return item;
     }
-    catch (error) {
-        if (params.fallbackModel) {
-            const primaryErrorInfo = extractErrorInfo(error);
-            let primaryErrorMessage = primaryErrorInfo.message;
-            if (primaryErrorInfo.description) {
-                primaryErrorMessage += ` (${primaryErrorInfo.description})`;
+    let retryState = {
+        retriesRemaining: params.tenacityMaxRetries,
+        attemptNumber: 1,
+    };
+    let messagesBeforeRetries = messages.length;
+    let currentIteration = 1;
+    while (true) {
+        const body = (0, body_1.prepareRequestBody)(modelToUse, messages, tools, tool_choice, responseFormat, params.options, params.customParameters);
+        const { response, structuredOutputToolResponse, finalIteration } = await (0, executor_1.processToolCalls)(executeFunctions, body, messages, invokableTools, params.maxToolsIterations, structuredOutputTool, params.abortSignal, currentIteration);
+        currentIteration = finalIteration;
+        body.messages = messages;
+        if (retryState.attemptNumber === 1) {
+            messagesBeforeRetries = messages.length;
+        }
+        let output;
+        let parseError = null;
+        try {
+            output = JSON.parse(structuredOutputToolResponse)
+                || (params.responseFormat === "plainText"
+                    ? (_c = response === null || response === void 0 ? void 0 : response.choices[0]) === null || _c === void 0 ? void 0 : _c.message.content
+                    : JSON.parse((_d = response === null || response === void 0 ? void 0 : response.choices[0]) === null || _d === void 0 ? void 0 : _d.message.content));
+        }
+        catch (error) {
+            const simpleErrorMessage = error instanceof Error ? error.message : String(error);
+            if (shouldValidate && retryState.retriesRemaining > 0) {
+                parseError = simpleErrorMessage;
             }
-            try {
-                console.error('Running fallback model');
-                return await runModel(executeFunctions, params, messages, index, params.fallbackModel, memory, primaryErrorMessage);
+            else {
+                const errorData = (0, errors_1.buildDetailedParseError)(simpleErrorMessage, response, structuredOutputToolResponse, body);
+                throw new n8n_workflow_1.NodeOperationError(executeFunctions.getNode(), errorData.message, {
+                    description: errorData.description,
+                    itemIndex: index,
+                });
             }
-            catch (fallbackError) {
-                console.error(`Fallback model ${params.fallbackModel} also failed:`, fallbackError);
-                const fallbackErrorInfo = extractErrorInfo(fallbackError);
-                let primaryFullError = primaryErrorInfo.message;
-                if (primaryErrorInfo.description) {
-                    primaryFullError += ` (${primaryErrorInfo.description})`;
-                }
-                let fallbackFullError = fallbackErrorInfo.message;
-                if (fallbackErrorInfo.description) {
-                    fallbackFullError += ` (${fallbackErrorInfo.description})`;
+        }
+        if (parseError) {
+            const shouldRetry = await (0, retryHandler_1.handleParseError)(parseError, response, messages, retryState, params.structuredOutputToolsMode, structuredOutputTool, params.structuredOutputName, tools);
+            if (shouldRetry) {
+                retryState = (0, retryHandler_1.updateRetryState)(retryState);
+                continue;
+            }
+        }
+        if (shouldValidate) {
+            const validationResult = (0, validation_1.validateStructuredOutput)(validationSchema, output);
+            if (!validationResult.isValid) {
+                const validationError = validationResult.error || 'Unknown validation error';
+                const shouldRetry = await (0, retryHandler_1.handleValidationError)(validationError, output, response, messages, retryState, params.structuredOutputToolsMode, structuredOutputTool, params.structuredOutputName);
+                if (shouldRetry) {
+                    retryState = (0, retryHandler_1.updateRetryState)(retryState);
+                    continue;
                 }
-                const combinedError = new Error(`● [Primary] ${primaryErrorInfo.httpCode} ${primaryFullError} ● [Fallback] ${fallbackErrorInfo.httpCode} ${fallbackFullError}`);
-                if (primaryErrorInfo.requestBody || fallbackErrorInfo.requestBody) {
-                    combinedError.description = `Primary Request Body: ${primaryErrorInfo.requestBody}`;
+                else {
+                    const errorData = (0, errors_1.buildValidationError)(params.tenacityMaxRetries, validationError, output, body, response);
+                    throw new n8n_workflow_1.NodeOperationError(executeFunctions.getNode(), errorData.message, {
+                        description: errorData.description,
+                        itemIndex: index,
+                    });
                 }
-                throw combinedError;
             }
         }
-        throw error;
+        const outputData = await (0, outputData_1.prepareOutputData)(response, output, messages, messagesBeforeRetries, params.addToOutput, executeFunctions, index, body);
+        if (memory) {
+            await (0, io_1.saveToMemory)(messages, output, params.saveToolCallsInChatMemory, memory);
+        }
+        return outputData;
     }
 }
 //# sourceMappingURL=executor.js.map

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

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

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

@@ -9,6 +9,6 @@ async function execute(i) {
     const params = (0, parameters_1.extractParameters)(this, i);
     const memory = await (0, io_1.getOptionalMemory)(this);
     const messages = await (0, chatHistory_1.unpackChatHistoryAndMemory)(params.rawMessagesToSend, params.loadToolCallsFromChatMemory, memory);
-    return await (0, executor_1.runModelWithFallback)(this, params, messages, i, memory);
+    return await (0, executor_1.runModel)(this, params, messages, i, params.model, memory);
 }
 //# sourceMappingURL=messageOperation.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"messageOperation.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/messageOperation.ts"],"names":[],"mappings":";;AAUA,0BAyBC;AAjCD,wDAA4D;AAC5D,qCAAiD;AACjD,yDAAqE;AACrE,yCAAkD;AAK3C,KAAK,UAAU,OAAO,CAE5B,CAAS;IAGT,MAAM,MAAM,GAAG,IAAA,8BAAiB,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAG1C,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAiB,EAAC,IAAI,CAAC,CAAC;IAG7C,MAAM,QAAQ,GAAG,MAAM,IAAA,wCAA0B,EAChD,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,2BAA2B,EAClC,MAAM,CACN,CAAC;IAGF,OAAO,MAAM,IAAA,+BAAoB,EAChC,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,CAAC,EACD,MAAM,CACN,CAAC;AACH,CAAC"}
+{"version":3,"file":"messageOperation.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/messageOperation.ts"],"names":[],"mappings":";;AAUA,0BA0BC;AAlCD,wDAA4D;AAC5D,qCAAiD;AACjD,yDAAqE;AACrE,yCAAsC;AAK/B,KAAK,UAAU,OAAO,CAE5B,CAAS;IAGT,MAAM,MAAM,GAAG,IAAA,8BAAiB,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAG1C,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAiB,EAAC,IAAI,CAAC,CAAC;IAG7C,MAAM,QAAQ,GAAG,MAAM,IAAA,wCAA0B,EAChD,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,2BAA2B,EAClC,MAAM,CACN,CAAC;IAGF,OAAO,MAAM,IAAA,mBAAQ,EACpB,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,CAAC,EACD,MAAM,CAAC,KAAK,EACZ,MAAM,CACN,CAAC;AACH,CAAC"}

package/dist/nodes/shared/core/execution/outputData.d.ts

@@ -1,4 +1,4 @@
 import type { IExecuteFunctions, INodeExecutionData, IDataObject } from 'n8n-workflow';
 import type { ChatCompletion } from '../../api/types';
-export declare function prepareOutputData(response: ChatCompletion, output: any, messages: IDataObject[], addToOutput: string[], executeFunctions: IExecuteFunctions, index: number, body: IDataObject, primaryError?: string): Promise<INodeExecutionData[]>;
+export declare function prepareOutputData(response: ChatCompletion, output: any, messages: IDataObject[], messagesBeforeRetries: number, addToOutput: string[], executeFunctions: IExecuteFunctions, index: number, body: IDataObject): Promise<INodeExecutionData[]>;
 export declare function reorderOutputFields(outputData: INodeExecutionData[]): void;

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

@@ -2,56 +2,42 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareOutputData = prepareOutputData;
 exports.reorderOutputFields = reorderOutputFields;
-const messageExtractor_1 = require("../tools/messageExtractor");
-async function prepareOutputData(response, output, messages, addToOutput, executeFunctions, index, body, primaryError) {
+async function prepareOutputData(response, output, messages, messagesBeforeRetries, addToOutput, executeFunctions, index, body) {
     const outputData = [];
     outputData.push({ json: { output: output }, pairedItem: { item: index } });
-    if (primaryError) {
-        outputData.forEach((item) => {
-            item.json.error = primaryError;
-        });
-    }
     if (addToOutput.includes('fullResponse')) {
         outputData.forEach((item) => {
             item.json.response = response;
         });
     }
-    const newMessages = (i => i === -1 ? [] : messages.slice(i + 1))(messages.map(o => o.role).lastIndexOf("user"));
-    if (addToOutput.includes('toolCalls')) {
-        outputData.forEach((item) => {
-            item.json.tool_calls = (0, messageExtractor_1.extractToolMessages)(newMessages);
-        });
-    }
     if (addToOutput.includes('chatHistory')) {
-        const includeToolCallsInChatHistory = executeFunctions.getNodeParameter('includeToolCallsInChatHistory', index, true);
-        const includeSystemMessagesInChatHistory = executeFunctions.getNodeParameter('includeSystemMessagesInChatHistory', index, true);
-        const includeReasoningInChatHistory = executeFunctions.getNodeParameter('includeReasoningInChatHistory', index, true);
-        let chatHistoryMessages = structuredClone(messages);
-        if (!includeToolCallsInChatHistory) {
+        const includeInChatHistory = executeFunctions.getNodeParameter('includeInChatHistory', index, []);
+        const includeToolCalls = includeInChatHistory.includes('toolCalls');
+        const includeSystemMessages = includeInChatHistory.includes('systemMessages');
+        const includeReasoning = includeInChatHistory.includes('reasoning');
+        let chatHistoryMessages = structuredClone(messages.slice(0, messagesBeforeRetries));
+        if (!includeToolCalls) {
             chatHistoryMessages = chatHistoryMessages
                 .filter((msg) => msg.content !== null && msg.content !== '' && msg.role !== 'tool')
                 .map(({ role, content }) => ({ role, content }));
         }
-        if (!includeSystemMessagesInChatHistory) {
+        if (!includeSystemMessages) {
             chatHistoryMessages = chatHistoryMessages.filter((msg) => msg.role !== 'system');
         }
         const finalMessage = response === null || response === void 0 ? void 0 : response.choices[0].message;
         if (finalMessage) {
-            let rootMessage = includeReasoningInChatHistory
-                ? {
-                    ...finalMessage,
-                    content: typeof output === 'string' ? output : JSON.stringify(output)
-                }
-                : {
-                    role: finalMessage.role,
-                    content: typeof output === 'string' ? output : JSON.stringify(output)
-                };
+            let rootMessage = {
+                role: finalMessage.role,
+                content: typeof output === 'string' ? output : JSON.stringify(output),
+                reasoning: finalMessage.reasoning,
+                reasoning_details: finalMessage.reasoning_details,
+            };
             chatHistoryMessages.push(rootMessage);
         }
         for (const msg of chatHistoryMessages) {
-            if (!includeReasoningInChatHistory && msg.role === 'assistant') {
-                delete msg.reasoning_details;
+            if (!includeReasoning && msg.role === 'assistant') {
                 delete msg.reasoning;
+                delete msg.reasoning_details;
             }
         }
         outputData.forEach((item) => {
@@ -72,7 +58,6 @@ function reorderOutputFields(outputData) {
             output: item.json.output,
             error: item.json.error,
             request: item.json.request,
-            tool_calls: item.json.tool_calls,
             response: item.json.response,
             chat_history: item.json.chat_history,
         };

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

@@ -1 +1 @@
-{"version":3,"file":"outputData.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/outputData.ts"],"names":[],"mappings":";;AAYA,8CA+GC;AAMD,kDAgBC;AA3ID,gEAAgE;AAMzD,KAAK,UAAU,iBAAiB,CACtC,QAAwB,EACxB,MAAW,EACX,QAAuB,EACvB,WAAqB,EACrB,gBAAmC,EACnC,KAAa,EACb,IAAiB,EACjB,YAAqB;IAErB,MAAM,UAAU,GAAyB,EAAE,CAAC;IAG5C,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IAG3E,IAAI,YAAY,EAAE,CAAC;QAClB,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC3B,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC;QAChC,CAAC,CAAC,CAAC;IACJ,CAAC;IAGD,IAAI,WAAW,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;QAC1C,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC3B,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAC/B,CAAC,CAAC,CAAC;IACJ,CAAC;IAGD,MAAM,WAAW,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;IAGhH,IAAI,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QACvC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC3B,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,IAAA,sCAAmB,EAAC,WAAwB,CAAC,CAAC;QACtE,CAAC,CAAC,CAAC;IACJ,CAAC;IAGD,IAAI,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QACzC,MAAM,6BAA6B,GAAG,gBAAgB,CAAC,gBAAgB,CACtE,+BAA+B,EAC/B,KAAK,EACL,IAAI,CACO,CAAC;QACb,MAAM,kCAAkC,GAAG,gBAAgB,CAAC,gBAAgB,CAC3E,oCAAoC,EACpC,KAAK,EACL,IAAI,CACO,CAAC;QACb,MAAM,6BAA6B,GAAG,gBAAgB,CAAC,gBAAgB,CACtE,+BAA+B,EAC/B,KAAK,EACL,IAAI,CACO,CAAC;QAEb,IAAI,mBAAmB,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;QAEpD,IAAI,CAAC,6BAA6B,EAAE,CAAC;YAEpC,mBAAmB,GAAG,mBAAmB;iBACvC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,KAAK,IAAI,IAAI,GAAG,CAAC,OAAO,KAAK,EAAE,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,CAAC;iBAClF,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QACnD,CAAC;QAED,IAAI,CAAC,kCAAkC,EAAE,CAAC;YAEzC,mBAAmB,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;QAClF,CAAC;QAGD,MAAM,YAAY,GAAG,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC;QACjD,IAAI,YAAY,EAAE,CAAC;YAClB,IAAI,WAAW,GAAQ,6BAA6B;gBACnD,CAAC,CAAC;oBACD,GAAG,YAAY;oBACf,OAAO,EAAE,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;iBACrE;gBACD,CAAC,CAAC;oBACD,IAAI,EAAE,YAAY,CAAC,IAAI;oBACvB,OAAO,EAAE,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;iBACrE,CAAC;YACH,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACvC,CAAC;QAGF,KAAK,MAAM,GAAG,IAAI,mBAAmB,EAAE,CAAC;YACvC,IAAI,CAAC,6BAA6B,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;gBAChE,OAAO,GAAG,CAAC,iBAAiB,CAAC;gBAC7B,OAAO,GAAG,CAAC,SAAS,CAAC;YACtB,CAAC;QACF,CAAC;QAGD,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC3B,IAAI,CAAC,IAAI,CAAC,YAAY,GAAG,mBAAmB,CAAC;QAC9C,CAAC,CAAC,CAAC;IACJ,CAAC;IAGD,IAAI,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QACrC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC3B,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QAC1B,CAAC,CAAC,CAAC;IACJ,CAAC;IAGD,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAEhC,OAAO,UAAU,CAAC;AACnB,CAAC;AAMD,SAAgB,mBAAmB,CAAC,UAAgC;IACnE,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC3B,MAAM,SAAS,GAAG;YACjB,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;YACxB,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK;YACtB,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;YAC1B,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU;YAChC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ;YAC5B,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY;SACpC,CAAC;QAGF,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,WAAW,CAC7B,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CACrE,CAAC;IACH,CAAC,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"outputData.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/outputData.ts"],"names":[],"mappings":"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"}

package/dist/nodes/shared/core/execution/retryHandler.d.ts

@@ -0,0 +1,9 @@
+import type { IDataObject } from 'n8n-workflow';
+export interface RetryState {
+    retriesRemaining: number;
+    attemptNumber: number;
+}
+export declare function waitBeforeRetry(delayMs?: number): Promise<void>;
+export declare function updateRetryState(state: RetryState): RetryState;
+export declare function handleParseError(parseError: string, response: any, messages: IDataObject[], retryState: RetryState, structuredOutputToolsMode: boolean, structuredOutputTool: IDataObject | null | undefined, structuredOutputName: string | undefined, tools: any[]): Promise<boolean>;
+export declare function handleValidationError(validationError: string, output: any, response: any, messages: IDataObject[], retryState: RetryState, structuredOutputToolsMode: boolean, structuredOutputTool: IDataObject | null | undefined, structuredOutputName?: string): Promise<boolean>;

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

@@ -0,0 +1,89 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.waitBeforeRetry = waitBeforeRetry;
+exports.updateRetryState = updateRetryState;
+exports.handleParseError = handleParseError;
+exports.handleValidationError = handleValidationError;
+const validation_1 = require("../request/validation");
+async function waitBeforeRetry(delayMs = 3000) {
+    await new Promise(resolve => setTimeout(resolve, delayMs));
+}
+function updateRetryState(state) {
+    return {
+        retriesRemaining: state.retriesRemaining - 1,
+        attemptNumber: state.attemptNumber + 1,
+    };
+}
+function isAssistantMessageEmpty(assistantMessage) {
+    const content = assistantMessage === null || assistantMessage === void 0 ? void 0 : assistantMessage.content;
+    const hasContent = content !== null && content !== undefined && content !== '';
+    const hasToolCalls = (assistantMessage === null || assistantMessage === void 0 ? void 0 : assistantMessage.tool_calls) && assistantMessage.tool_calls.length > 0;
+    return !hasContent && !hasToolCalls;
+}
+async function handleParseError(parseError, response, messages, retryState, structuredOutputToolsMode, structuredOutputTool, structuredOutputName, tools) {
+    var _a, _b, _c, _d, _e, _f;
+    if (retryState.retriesRemaining === 0) {
+        return false;
+    }
+    const assistantMessage = (_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;
+    if (isAssistantMessageEmpty(assistantMessage)) {
+        await waitBeforeRetry();
+        return true;
+    }
+    if (structuredOutputToolsMode) {
+        messages.push({
+            role: 'assistant',
+            content: ((_e = (_d = (_c = response === null || response === void 0 ? void 0 : response.choices) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.message) === null || _e === void 0 ? void 0 : _e.content) || '',
+        });
+    }
+    else {
+        messages.push(response.choices[0].message);
+    }
+    const schemaName = structuredOutputTool ? (_f = structuredOutputTool.function) === null || _f === void 0 ? void 0 : _f.name : structuredOutputName || 'final_response';
+    const toolNames = tools.map(tool => { var _a; return ((_a = tool.function) === null || _a === void 0 ? void 0 : _a.name) || 'unknown'; }).join(', ');
+    let errorMessage = `Your previous response (attempt ${retryState.attemptNumber})`;
+    if (structuredOutputToolsMode) {
+        errorMessage += ` did not correctly call a tool.\n\nYou MUST call one of the available tools: ${toolNames}`;
+    }
+    else if (tools.length > 0) {
+        errorMessage += ` had an invalid format.\n\nYou MUST either respond with valid JSON that strictly follows the \`${schemaName}\` schema, or call one of the available tools: ${toolNames}`;
+    }
+    else {
+        errorMessage += ` had an invalid format.\n\nYou MUST respond with valid JSON that strictly follows the \`${schemaName}\` schema.`;
+    }
+    messages.push({
+        role: 'system',
+        content: errorMessage,
+    });
+    await waitBeforeRetry();
+    return true;
+}
+async function handleValidationError(validationError, output, response, messages, retryState, structuredOutputToolsMode, structuredOutputTool, structuredOutputName) {
+    var _a, _b, _c;
+    if (retryState.retriesRemaining === 0) {
+        return false;
+    }
+    const assistantMessage = (_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;
+    if (isAssistantMessageEmpty(assistantMessage)) {
+        await waitBeforeRetry();
+        return true;
+    }
+    if (structuredOutputToolsMode) {
+        messages.push({
+            role: 'assistant',
+            content: JSON.stringify(output),
+        });
+    }
+    else {
+        messages.push(response.choices[0].message);
+    }
+    const schemaName = structuredOutputTool ? (_c = structuredOutputTool.function) === null || _c === void 0 ? void 0 : _c.name : structuredOutputName;
+    const errorMessage = (0, validation_1.formatValidationErrorMessage)(validationError, retryState.attemptNumber, structuredOutputToolsMode, schemaName);
+    messages.push({
+        role: 'system',
+        content: errorMessage,
+    });
+    await waitBeforeRetry();
+    return true;
+}
+//# sourceMappingURL=retryHandler.js.map

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

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

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

@@ -36,16 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.router = router;
 const n8n_workflow_1 = require("n8n-workflow");
 const messageOperation = __importStar(require("./messageOperation"));
-const errorHandling_1 = require("../../api/errorHandling");
-function isNodeApiError(error) {
-    return error instanceof n8n_workflow_1.NodeApiError || error.name === 'NodeApiError';
-}
-function normalizeError(error) {
-    if (error instanceof Error) {
-        return error;
-    }
-    return new Error(String(error));
-}
+const errors_1 = require("./errors");
 function initializeRouter(executeFunctions) {
     return {
         returnData: [],
@@ -57,8 +48,7 @@ async function executeItem(execute, executeFunctions, itemIndex) {
     return await execute.call(executeFunctions, itemIndex);
 }
 function handleError(error, executeFunctions, itemIndex, continueOnFail, returnData) {
-    var _a, _b, _c;
-    const normalizedError = normalizeError(error);
+    const normalizedError = (0, errors_1.normalizeError)(error);
     if (continueOnFail) {
         returnData.push({
             json: { error: normalizedError.message },
@@ -66,18 +56,8 @@ function handleError(error, executeFunctions, itemIndex, continueOnFail, returnD
         });
         return returnData;
     }
-    if (isNodeApiError(normalizedError)) {
-        const nodeApiError = normalizedError;
-        const errorCode = (_c = (_b = (_a = nodeApiError.cause) === null || _a === void 0 ? void 0 : _a.error) === null || _b === void 0 ? void 0 : _b.error) === null || _c === void 0 ? void 0 : _c.code;
-        if (errorCode) {
-            const customErrorMessage = (0, errorHandling_1.getCustomErrorMessage)(errorCode);
-            if (customErrorMessage) {
-                nodeApiError.message = customErrorMessage;
-            }
-        }
-        if (nodeApiError.requestBody) {
-            nodeApiError.description += ` | Request Body: ${nodeApiError.requestBody}`;
-        }
+    if ((0, errors_1.isNodeApiError)(normalizedError)) {
+        const nodeApiError = (0, errors_1.customizeNodeApiError)(normalizedError);
         nodeApiError.context = {
             itemIndex,
             description: nodeApiError.description,

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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsHA,wBASC;AA9HD,+CAIsB;AAEtB,qEAAuD;AACvD,qCAAiF;AAKjF,SAAS,gBAAgB,CAAC,gBAAmC;IAC5D,OAAO;QACN,UAAU,EAAE,EAA0B;QACtC,KAAK,EAAE,gBAAgB,CAAC,YAAY,EAAE;QACtC,OAAO,EAAE,gBAAgB,CAAC,OAAO;KACjC,CAAC;AACH,CAAC;AAKD,KAAK,UAAU,WAAW,CACzB,OAAwC,EACxC,gBAAmC,EACnC,SAAiB;IAEjB,OAAO,MAAM,OAAO,CAAC,IAAI,CACxB,gBAAgB,EAChB,SAAS,CACT,CAAC;AACH,CAAC;AAKD,SAAS,WAAW,CACnB,KAAc,EACd,gBAAmC,EACnC,SAAiB,EACjB,cAAuB,EACvB,UAAgC;IAGhC,MAAM,eAAe,GAAG,IAAA,uBAAc,EAAC,KAAK,CAAC,CAAC;IAE9C,IAAI,cAAc,EAAE,CAAC;QACpB,UAAU,CAAC,IAAI,CAAC;YACf,IAAI,EAAE,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,EAAE;YACxC,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;SAC/B,CAAC,CAAC;QACH,OAAO,UAAU,CAAC;IACnB,CAAC;IAED,IAAI,IAAA,uBAAc,EAAC,eAAe,CAAC,EAAE,CAAC;QAErC,MAAM,YAAY,GAAG,IAAA,8BAAqB,EAAC,eAAe,CAAC,CAAC;QAE5D,YAAY,CAAC,OAAO,GAAG;YACtB,SAAS;YACT,WAAW,EAAG,YAAoB,CAAC,WAAW;SAC9C,CAAC;QAEF,MAAM,YAAY,CAAC;IACpB,CAAC;IAGD,MAAM,IAAI,iCAAkB,CAAC,gBAAgB,CAAC,OAAO,EAAE,EAAE,eAAe,EAAE;QACzE,SAAS;QACT,WAAW,EAAG,eAAuB,CAAC,WAAW;KACjD,CAAC,CAAC;AACJ,CAAC;AAKD,KAAK,UAAU,YAAY,CAC1B,MAA2C,EAC3C,gBAAmC;IAEnC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAE9C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACvC,IAAI,CAAC;YACJ,MAAM,YAAY,GAAG,MAAM,WAAW,CACrC,OAAO,EACP,gBAAgB,EAChB,CAAC,CACD,CAAC;YACF,UAAU,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,CAAC;QAClC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,MAAM,GAAG,WAAW,CACzB,KAAK,EACL,gBAAgB,EAChB,CAAC,EACD,gBAAgB,CAAC,cAAc,EAAE,EACjC,UAAU,CACV,CAAC;YAEF,IAAI,MAAM,EAAE,CAAC;gBAEZ,OAAO,CAAC,GAAG,CACV,kCAAkC,CAAC,uBAAuB,KAAK,CAAC,MAAM,SAAS,CAC/E,CAAC;gBACF,SAAS;YACV,CAAC;QAEF,CAAC;IACF,CAAC;IAED,OAAO,UAAU,CAAC;AACnB,CAAC;AAKM,KAAK,UAAU,MAAM;IAG3B,MAAM,MAAM,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,aAAa,GAAG,MAAM,YAAY,CACvC,MAAM,EACN,IAAI,CACJ,CAAC;IACF,OAAO,CAAC,aAAa,CAAC,CAAC;AACxB,CAAC"}

package/dist/nodes/shared/core/request/body.d.ts

@@ -1,2 +1,2 @@
 import type { IDataObject } from 'n8n-workflow';
-export declare function prepareRequestBody(model: string, messages: IDataObject[], tools: any[], tool_choice: string | undefined, response_format: IDataObject | undefined, options: IDataObject, customParameters: string | IDataObject): IDataObject;
+export declare function prepareRequestBody(model: string, messages: IDataObject[], tools: any[], tool_choice: string | IDataObject | undefined, response_format: IDataObject | undefined, options: IDataObject, customParameters: string | IDataObject): IDataObject;

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

@@ -25,21 +25,15 @@ function prepareRequestBody(model, messages, tools, tool_choice, response_format
     }
     const cleanOptions = (0, omit_1.default)(options, [
         'customParameters',
-        'fallbackModelId',
         'maxToolsIterations',
-        'reasoning_effort',
+        'tenacityMaxRetries'
     ]);
-    const reasoningEffort = options.reasoning_effort;
-    const reasoning = reasoningEffort && reasoningEffort !== ''
-        ? { reasoning: { effort: reasoningEffort } }
-        : undefined;
     const body = {
         model,
         messages,
         ...(tools.length > 0 ? { tools } : {}),
         tool_choice,
         response_format,
-        ...reasoning,
         ...cleanOptions,
         ...customParamsObj,
     };

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":";;;;;AAOA,gDAwDC;AA9DD,uDAAgC;AAChC,6CAAqD;AAKrD,SAAgB,kBAAkB,CACjC,KAAa,EACb,QAAuB,EACvB,KAAY,EACZ,WAA+B,EAC/B,eAAwC,EACxC,OAAoB,EACpB,gBAAsC;IAGtC,IAAA,wBAAgB,EAAC,QAAQ,CAAC,CAAC;IAG3B,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAQ,EAAE,EAAE,CACvC,GAAG,CAAC,OAAO,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,WAAW,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAC/F,CAAC;IAEF,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;QACpB,kBAAkB;KAClB,CAAC,CAAC;IAGH,MAAM,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;IACjD,MAAM,SAAS,GAAG,eAAe,IAAI,eAAe,KAAK,EAAE;QAC1D,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE;QAC5C,CAAC,CAAC,SAAS,CAAC;IAEb,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,SAAS;QACZ,GAAG,YAAY;QACf,GAAG,eAAe;KAClB,CAAC;IAEF,OAAO,IAAI,CAAC;AACb,CAAC"}
+{"version":3,"file":"body.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/request/body.ts"],"names":[],"mappings":";;;;;AAOA,gDAgDC;AAtDD,uDAAgC;AAChC,6CAAqD;AAKrD,SAAgB,kBAAkB,CACjC,KAAa,EACb,QAAuB,EACvB,KAAY,EACZ,WAA6C,EAC7C,eAAwC,EACxC,OAAoB,EACpB,gBAAsC;IAGtC,IAAA,wBAAgB,EAAC,QAAQ,CAAC,CAAC;IAG3B,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAQ,EAAE,EAAE,CACvC,GAAG,CAAC,OAAO,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,WAAW,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAC/F,CAAC;IAEF,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,oBAAoB;QACpB,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;IAEF,OAAO,IAAI,CAAC;AACb,CAAC"}

package/dist/nodes/shared/core/request/validation.d.ts

@@ -0,0 +1,11 @@
+import type { IDataObject } from 'n8n-workflow';
+export type ValidationResult = {
+    isValid: boolean;
+    error?: string;
+    errors?: Array<{
+        path: string;
+        message: string;
+    }>;
+};
+export declare function validateStructuredOutput(jsonSchema: IDataObject | undefined, output: any): ValidationResult;
+export declare function formatValidationErrorMessage(validationError: string, attemptNumber: number, structuredOutputToolsMode?: boolean, schemaName?: string): string;

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

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateStructuredOutput = validateStructuredOutput;
+exports.formatValidationErrorMessage = formatValidationErrorMessage;
+const schemaGenerator_1 = require("../tools/schemaGenerator");
+function validateStructuredOutput(jsonSchema, output) {
+    if (!jsonSchema) {
+        return { isValid: true };
+    }
+    try {
+        const zodSchema = (0, schemaGenerator_1.convertJsonSchemaToZod)(jsonSchema);
+        const result = zodSchema.safeParse(output);
+        if (result.success) {
+            return { isValid: true };
+        }
+        else {
+            const errors = result.error.errors.map((err) => ({
+                path: err.path.join('.'),
+                message: err.message,
+            }));
+            const errorMessage = errors
+                .map((err) => `  - ${err.path ? `${err.path}: ` : ''}${err.message}`)
+                .join('\n');
+            return {
+                isValid: false,
+                error: `Validation failed:\n${errorMessage}`,
+                errors,
+            };
+        }
+    }
+    catch (error) {
+        return {
+            isValid: false,
+            error: `Schema validation error: ${error instanceof Error ? error.message : String(error)}`,
+        };
+    }
+}
+function formatValidationErrorMessage(validationError, attemptNumber, structuredOutputToolsMode = false, schemaName) {
+    const baseMessage = `Your previous response (attempt ${attemptNumber}) did not conform to the required JSON schema. Please correct the following validation errors and try again:\n\n${validationError}\n\n`;
+    if (structuredOutputToolsMode && schemaName) {
+        return baseMessage + `You MUST call the \`${schemaName}\` tool with corrected arguments that strictly follow the required schema.`;
+    }
+    else {
+        return baseMessage + 'Ensure your response strictly follows the schema requirements.';
+    }
+}
+//# sourceMappingURL=validation.js.map