@copilotkit/core 1.63.3-canary.rc-1 → 1.64.0

package/dist/index.umd.js

@@ -2120,22 +2120,35 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 			const agentId = agent.agentId;
 			let needsFollowUp = false;
 			if (executeFrontendTools) {
-				for (const message of newMessages) if (message.role === "assistant") {
-					for (const toolCall of message.toolCalls || []) if (newMessages.findIndex((m) => m.role === "tool" && m.toolCallId === toolCall.id) === -1) {
-						const tool = this.getTool({
-							toolName: toolCall.function.name,
+				for (const message of newMessages) if (message.role === "assistant") for (const toolCall of message.toolCalls || []) {
+					const tool = this.getTool({
+						toolName: toolCall.function.name,
+						agentId: agent.agentId
+					});
+					let wildcardTool;
+					const getWildcardTool = () => {
+						if (tool || wildcardTool) return wildcardTool;
+						wildcardTool = this.getTool({
+							toolName: "*",
 							agentId: agent.agentId
 						});
-						if (tool) {
-							if (await this.executeSpecificTool(tool, toolCall, message, agent, agentId)) needsFollowUp = true;
-						} else {
-							const wildcardTool = this.getTool({
-								toolName: "*",
-								agentId: agent.agentId
-							});
-							if (wildcardTool) {
-								if (await this.executeWildcardTool(wildcardTool, toolCall, message, agent, agentId)) needsFollowUp = true;
-							}
+						return wildcardTool;
+					};
+					let existingResultIndex = newMessages.findIndex((m) => m.role === "tool" && m.toolCallId === toolCall.id);
+					const existingResult = existingResultIndex === -1 ? void 0 : newMessages[existingResultIndex];
+					const executableTool = tool !== null && tool !== void 0 ? tool : getWildcardTool();
+					if (existingResult && (executableTool === null || executableTool === void 0 ? void 0 : executableTool.handler) && this.isFrontendPlaceholderResult(existingResult)) {
+						newMessages.splice(existingResultIndex, 1);
+						existingResultIndex = -1;
+						const agentMsgIdx = agent.messages.findIndex((m) => m.role === "tool" && m.toolCallId === toolCall.id);
+						if (agentMsgIdx !== -1) agent.messages.splice(agentMsgIdx, 1);
+					}
+					if (existingResultIndex === -1) if (tool) {
+						if (await this.executeSpecificTool(tool, toolCall, message, agent, agentId)) needsFollowUp = true;
+					} else {
+						const fallbackTool = getWildcardTool();
+						if (fallbackTool) {
+							if (await this.executeWildcardTool(fallbackTool, toolCall, message, agent, agentId)) needsFollowUp = true;
 						}
 					}
 				}
@@ -2148,6 +2161,23 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 			this._internal.suggestionEngine.reloadSuggestions(agentId);
 			return runAgentResult;
 		}
+		isFrontendPlaceholderResult(message) {
+			if (message.role !== "tool") return false;
+			return this.normalizeToolResultContent(message.content) === "Forwarded to client";
+		}
+		normalizeToolResultContent(content) {
+			if (typeof content === "string") return content.trim();
+			if (Array.isArray(content)) {
+				const text = content.flatMap((part) => {
+					if (typeof part === "string") return [part];
+					if (part && typeof part === "object" && "text" in part && typeof part.text === "string") return [part.text];
+					return [];
+				}).join("").trim();
+				return text.length > 0 ? text : null;
+			}
+			if (content && typeof content === "object" && "text" in content && typeof content.text === "string") return content.text.trim();
+			return null;
+		}
 		/**
 		* Shared handler execution logic used by executeSpecificTool, executeWildcardTool, and runTool.
 		* Handles arg parsing, subscriber notifications, handler invocation, result stringification,
@@ -2251,15 +2281,18 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 				messageId: message.id
 			});
 			{
+				var _agent$messages$inser;
 				const messageIndex = agent.messages.findIndex((m) => m.id === message.id);
 				if (messageIndex === -1) return false;
+				let insertAt = messageIndex + 1;
+				while (insertAt < agent.messages.length && ((_agent$messages$inser = agent.messages[insertAt]) === null || _agent$messages$inser === void 0 ? void 0 : _agent$messages$inser.role) === "tool") insertAt++;
 				const toolMessage = {
 					id: (0, _copilotkit_shared.randomUUID)(),
 					role: "tool",
 					toolCallId: toolCall.id,
 					content: handlerResult.result
 				};
-				agent.messages.splice(messageIndex + 1, 0, toolMessage);
+				agent.messages.splice(insertAt, 0, toolMessage);
 				if (!handlerResult.error && (tool === null || tool === void 0 ? void 0 : tool.followUp) !== false) return true;
 			}
 			return false;
@@ -2346,15 +2379,18 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 				}, "Subscriber onToolExecutionEnd error:");
 			}
 			{
+				var _agent$messages$inser2;
 				const messageIndex = agent.messages.findIndex((m) => m.id === message.id);
 				if (messageIndex === -1) return false;
+				let insertAt = messageIndex + 1;
+				while (insertAt < agent.messages.length && ((_agent$messages$inser2 = agent.messages[insertAt]) === null || _agent$messages$inser2 === void 0 ? void 0 : _agent$messages$inser2.role) === "tool") insertAt++;
 				const toolMessage = {
 					id: (0, _copilotkit_shared.randomUUID)(),
 					role: "tool",
 					toolCallId: toolCall.id,
 					content: toolCallResult
 				};
-				agent.messages.splice(messageIndex + 1, 0, toolMessage);
+				agent.messages.splice(insertAt, 0, toolMessage);
 				if (!errorMessage && (wildcardTool === null || wildcardTool === void 0 ? void 0 : wildcardTool.followUp) !== false) return true;
 			}
 			return false;