updated

Author: rawatSingh2022

src/agentlib/agent.ts

@@ -56,7 +56,7 @@ class Agent {
 
         this.tools = [
             ...this.tools,
-            ...(mentaionedMCPSTool || []),
+            ...mentaionedMCPSTool||[],
 
         ]
         let mentionedAgents = await task.userMessage.getMentionedAgents();
@@ -155,12 +155,9 @@ class Agent {
 
                                         }
                                         else {
-                                            console.log("Executing tool: ", toolName, toolInput);
                                             const [didUserReject, result] = await this.executeTool(toolName, toolInput);
-                                            console.log("Tool result: ", result);
                                             // toolResults.push(this.getToolResult(toolUseId, result));
                                             let toolResult = this.getToolResult(toolUseId, result)
-                                         
                                             toolResults.push({
                                                 role: "tool",
                                                 tool_call_id: toolResult.tool_call_id,
@@ -223,7 +220,7 @@ class Agent {
                         toolResults.push({
                             role: "tool",
                             tool_call_id: toolResult.tool_call_id,
-                            content: toolResult.content?.trim() ? toolResult.content : "Tool executed successfully.",
+                            content: toolResult.content,
 
                         });
                         if (toolResult.userMessage) {
@@ -285,8 +282,6 @@ class Agent {
 
         try {
             let systemPrompt = await this.systemPrompt.toPromptText();
-                       
-            //TODO: append remix prompt from user
             const aiMessages: Message[] = [
                 { role: "system", content: systemPrompt },
                 ...apiConversationHistory,
@@ -313,14 +308,13 @@ class Agent {
      * @param toolInput - The input parameters for the tool
      * @returns Promise with tuple [userRejected, result]
      */
-    private async executeTool(toolName: string, toolInput: any): Promise<[boolean, any]> {
+    private async executeTool(toolName: string, toolInput: any): Promise<any> {
         //codebolttools--readfile
-        console.log("Executing tool: ", toolName, toolInput);
         const [toolboxName, actualToolName] = toolName.split('--');
         console.log("Toolbox name: ", toolboxName, "Actual tool name: ", actualToolName);
         const {data} = await tools.executeTool(toolboxName, actualToolName, toolInput);
         console.log("Tool result: ", data);
-        return [false, data];
+        return data;
     }
 
     /**
@@ -360,7 +354,6 @@ class Agent {
         try {
             let parsed = JSON.parse(content);
 
-            console.log("Parsed Content: ", parsed);
             if (parsed.payload && parsed.payload.content) {
                 content = `The browser action has been executed. The  screenshot have been captured for your analysis. The tool response is provided in the next user message`
                 // this.apiConversationHistory.push()
@@ -372,7 +365,7 @@ class Agent {
         return {
             role: "tool",
             tool_call_id,
-            content: content === "" ? "tool call success" : (Array.isArray(content) ? content[1] : content),
+            content,
             userMessage
         };
     }

src/agentlib/llmoutputhandler.ts

@@ -424,24 +424,16 @@ class LLMOutputHandler {
      * @param toolInput - The input parameters for the tool
      * @returns Promise with tuple [userRejected, result]
      */
-    private async executeTool(toolName: string, toolInput: any): Promise<[boolean, any]> {
-        console.log("Executing tool: ", toolName, toolInput);
+    private async executeTool(toolName: string, toolInput: any): Promise<any> {
+        //codebolttools--readfile
         const [toolboxName, actualToolName] = toolName.split('--');
         console.log("Toolbox name: ", toolboxName, "Actual tool name: ", actualToolName);
-        const response = await this.codebolt?.mcp.executeTool(toolboxName, actualToolName, toolInput);
-        console.log("Tool result form inner function: ", response);
-        
-        // Handle the response structure
-        if (!response || !response.data) {
-            return [false, "Tool execution failed: No response data"];
-        }
-        
-       
-        
-        // Otherwise, assume success and return the data
-        return  response.data;
+        const data = await this.codebolt?.mcp.executeTool(toolboxName, actualToolName, toolInput);
+        console.log("Tool result: ", data);
+        return data;
     }
 
+
     /**
      * Creates a tool result object from the tool execution response.
      * 

src/core/Codebolt.ts

@@ -133,7 +133,8 @@ class Codebolt {
                             messageId: response.message.messageId,
                             threadId: response.message.threadId,
                             selection: response.message.selection,
-                            remixPrompt:response.message.remixPrompt
+                            remixPrompt:response.message.remixPrompt,
+                            mentionedAgents:response.message.mentionedAgents
                         };
 
                         const result = await handler(userMessage);