From 58fd1ec325996da87a7d41f2f56db3ce547619f6 Mon Sep 17 00:00:00 2001
From: Benjamin Schroth <68321970+schrothbn@users.noreply.github.com>
Date: Thu, 3 Jul 2025 09:48:44 +0200
Subject: [PATCH] fix(AI Agent Node): Fix tool-usage with fallback mechanism
 (#16898)

---
 .../Agent/agents/ToolsAgent/V2/execute.ts     | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/V2/execute.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/V2/execute.ts
index 441ede5d1a..bb2be6e04b 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/V2/execute.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/V2/execute.ts
@@ -1,7 +1,11 @@
 import type { BaseChatModel } from '@langchain/core/language_models/chat_models';
 import type { ChatPromptTemplate } from '@langchain/core/prompts';
 import { RunnableSequence } from '@langchain/core/runnables';
-import { AgentExecutor, createToolCallingAgent } from 'langchain/agents';
+import {
+	AgentExecutor,
+	type AgentRunnableSequence,
+	createToolCallingAgent,
+} from 'langchain/agents';
 import type { BaseChatMemory } from 'langchain/memory';
 import type { DynamicStructuredTool, Tool } from 'langchain/tools';
 import omit from 'lodash/omit';
@@ -38,16 +42,24 @@ function createAgentExecutor(
 	memory?: BaseChatMemory,
 	fallbackModel?: BaseChatModel | null,
 ) {
-	const modelWithFallback = fallbackModel ? model.withFallbacks([fallbackModel]) : model;
 	const agent = createToolCallingAgent({
-		llm: modelWithFallback,
+		llm: model,
 		tools,
 		prompt,
 		streamRunnable: false,
 	});
 
+	let fallbackAgent: AgentRunnableSequence | undefined;
+	if (fallbackModel) {
+		fallbackAgent = createToolCallingAgent({
+			llm: fallbackModel,
+			tools,
+			prompt,
+			streamRunnable: false,
+		});
+	}
 	const runnableAgent = RunnableSequence.from([
-		agent,
+		fallbackAgent ? agent.withFallbacks([fallbackAgent]) : agent,
 		getAgentStepsParser(outputParser, memory),
 		fixEmptyContentMessage,
 	]);