@codebolt/codeboltjs 1.1.91 → 1.1.94

package/src/modules/agentlib/agent.ts

@@ -1,5 +1,5 @@
 import chatlib from "./../chat"
-import mcp from "./../mcp"
+import tools from "./../tools"
 import llm from "./../llm"
 import codeboltAgent from "./../agent"
 import { SystemPrompt } from "./systemprompt";
@@ -16,6 +16,7 @@ interface ToolResult {
     role: 'tool';
     tool_call_id: string;
     content: any;
+    userMessage?: any;
 }
 
 interface ToolDetails {
@@ -31,6 +32,7 @@ class Agent {
     private maxRun: number;
     private systemPrompt: SystemPrompt;
     private userMessage: Message[];
+    private nextUserMessage:any;
 
 
     constructor(tools: any = [], systemPrompt: SystemPrompt, maxRun: number = 0, subAgents: any[] = []) {
@@ -47,6 +49,7 @@ class Agent {
         this.tools = this.tools.concat(subAgents.map(subagent => ({
             ...subagent
         })));
+       
 
 
     }
@@ -112,20 +115,44 @@ class Agent {
 
                                         const agentResponse = await codeboltAgent.startAgent(toolName.replace("subagent--", ''), toolInput.task);
                                         console.log("got sub agent resonse  result", agentResponse);
-                                        const [didUserReject, result] = [false,"tool result is successful"];
-                                       console.log("got sub agent resonse  result", didUserReject, result); 
-                                      
-                                        toolResults.push(this.getToolResult(toolUseId, result));
+                                        const [didUserReject, result] = [false, "tool result is successful"];
+                                        console.log("got sub agent resonse  result", didUserReject, result);
+                                        let toolResult = this.getToolResult(toolUseId, result)
+                                        toolResults.push({
+                                            role: "tool",
+                                            tool_call_id: toolResult.tool_call_id,
+                                            content: toolResult.content,
+
+                                        });
+                                        if (toolResult.userMessage) {
+                                            this.nextUserMessage = {
+                                                role: "user",
+                                                content: toolResult.userMessage
+                                            }
+                                        }
                                         if (didUserReject) {
                                             userRejectedToolUse = true;
                                         }
+
                                     }
                                     else {
                                         console.log("calling tool with params", toolName, toolInput);
                                         const [didUserReject, result] = await this.executeTool(toolName, toolInput);
                                         console.log("tool result", result);
-                                        toolResults.push(this.getToolResult(toolUseId, result));
-
+                                        // toolResults.push(this.getToolResult(toolUseId, result));
+                                        let toolResult = this.getToolResult(toolUseId, result)
+                                        toolResults.push({
+                                            role: "tool",
+                                            tool_call_id: toolResult.tool_call_id,
+                                            content: toolResult.content,
+
+                                        });
+                                        if (toolResult.userMessage) {
+                                            this.nextUserMessage = {
+                                                role: "user",
+                                                content: toolResult.userMessage
+                                            }
+                                        }
                                         if (didUserReject) {
                                             userRejectedToolUse = true;
                                         }
@@ -133,7 +160,21 @@ class Agent {
 
                                 }
                             } else {
-                                toolResults.push(this.getToolResult(toolUseId, "Skipping tool execution due to previous tool user rejection."));
+                                let toolResult = this.getToolResult(toolUseId, "Skipping tool execution due to previous tool user rejection.")
+
+                                toolResults.push({
+                                    role: "tool",
+                                    tool_call_id: toolResult.tool_call_id,
+                                    content: toolResult.content,
+
+                                });
+                                if (toolResult.userMessage) {
+                                    this.nextUserMessage = {
+                                        role: "user",
+                                        content: toolResult.userMessage
+                                    }
+                                }
+
                             }
                         }
                     }
@@ -148,10 +189,26 @@ class Agent {
                             completed = true;
                             result = "The user is satisfied with the result.";
                         }
-                        toolResults.push(this.getToolResult(taskCompletedBlock.id, result));
+                        let toolResult = this.getToolResult(taskCompletedBlock.id, result)
+                        toolResults.push({
+                            role: "tool",
+                            tool_call_id: toolResult.tool_call_id,
+                            content: toolResult.content,
+
+                        });
+                        if (toolResult.userMessage) {
+                            this.nextUserMessage = {
+                                role: "user",
+                                content: toolResult.userMessage
+                            }
+                        }
+
                     }
 
                     this.apiConversationHistory.push(...toolResults);
+                    if (this.nextUserMessage) {
+                        this.apiConversationHistory.push(this.nextUserMessage);
+                    }
                     let nextUserMessage: Message[] = toolResults;
 
                     if (toolResults.length === 0) {
@@ -212,7 +269,9 @@ class Agent {
     }
 
     private async executeTool(toolName: string, toolInput: any): Promise<[boolean, any]> {
-        return mcp.executeTool(toolName, toolInput);
+        //codebolttools--readfile
+        const [toolboxName, actualToolName] = toolName.split('--');
+        return tools.executeTool(toolboxName, actualToolName, toolInput);
     }
     private async startSubAgent(agentName: string, params: any): Promise<[boolean, any]> {
         return codeboltAgent.startAgent(agentName, params.task);
@@ -226,11 +285,24 @@ class Agent {
         };
     }
 
-    private getToolResult(tool_call_id: string, content: any): ToolResult {
+    private getToolResult(tool_call_id: string, content: string): ToolResult {
+        let userMessage=undefined
+        try {
+            let parsed = JSON.parse(content);
+
+            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()
+                userMessage = parsed.payload.content
+            }
+        } catch (error) {
+
+        }
         return {
             role: "tool",
             tool_call_id,
             content,
+            userMessage
         };
     }
 

package/src/modules/agentlib/usermessage.ts

@@ -1,6 +1,6 @@
 import cbfs from "./../fs";
 import project from "./../project";
-import mcp from "./../mcp";
+import mcp from "./../tools";
 import { escape } from "querystring";
 
 
@@ -24,13 +24,13 @@ class UserMessage {
     message: Message;
     promptOverride: boolean;
     userMessages: UserMessageContent[];
-    mentaionedMCPS: string[];
+    mentionedMCPs: string[];
 
     constructor(message: Message, promptOverride: boolean = false) {
         this.message = message;
         this.promptOverride = promptOverride;
         this.userMessages = [];
-        this.mentaionedMCPS = message.mentionedMCPs;
+        this.mentionedMCPs = message.mentionedMCPs || [];
     }
 
     getFiles(): void {
@@ -74,8 +74,8 @@ class UserMessage {
         return this.message.mentionedMCPs || [];
     }
     async getMentionedMcpsTools() {
-        if (this.mentaionedMCPS.length > 0) {
-            let tools = await mcp.getMcpTools(this.mentaionedMCPS)
+        if (this.mentionedMCPs.length > 0) {
+            let tools = await mcp.listToolsFromToolBoxes(this.mentionedMCPs)
             return tools
         }
         else {

package/src/modules/chat.ts

@@ -79,7 +79,8 @@ const cbchat = {
                         eventEmitter.emit("userMessage", response, (message: string) => {
                             console.log("Callback function invoked with message:", message);
                             cbws.getWebsocket.send(JSON.stringify({
-                                "type": "processStoped"
+                                "type": "processStoped",
+                                "message": message
                             }));
                         });
                     }