changes

Author: rawatSingh2022

modules/agentlib/agent.d.ts

@@ -2,13 +2,12 @@ import { SystemPrompt } from "./systemprompt";
 import { TaskInstruction } from "./taskInstruction";
 declare class Agent {
     private tools;
-    private subAgents;
     private apiConversationHistory;
     private maxRun;
     private systemPrompt;
     private userMessage;
     private nextUserMessage;
-    constructor(tools: any, systemPrompt: SystemPrompt, maxRun?: number, subAgents?: any[]);
+    constructor(tools: any, systemPrompt: SystemPrompt, maxRun?: number);
     run(task: TaskInstruction, successCondition?: () => boolean): Promise<{
         success: boolean;
         error: string | null;

modules/agentlib/agent.js

@@ -9,28 +9,42 @@ const tools_1 = __importDefault(require("./../tools"));
 const llm_1 = __importDefault(require("./../llm"));
 const agent_1 = __importDefault(require("./../agent"));
 class Agent {
-    constructor(tools = [], systemPrompt, maxRun = 0, subAgents = []) {
+    constructor(tools = [], systemPrompt, maxRun = 0) {
         this.tools = tools;
         this.userMessage = [];
         this.apiConversationHistory = [];
         this.maxRun = maxRun;
         this.systemPrompt = systemPrompt;
-        this.subAgents = subAgents;
-        this.subAgents = subAgents.map(subagent => {
-            subagent.function.name = `subagent--${subagent.function.name}`;
-            return subagent;
-        });
-        this.tools = this.tools.concat(subAgents.map(subagent => ({
-            ...subagent
-        })));
     }
     async run(task, successCondition = () => true) {
         var _a, _b;
         let mentaionedMCPSTool = await task.userMessage.getMentionedMcpsTools();
         this.tools = [
             ...this.tools,
-            ...mentaionedMCPSTool
+            ...mentaionedMCPSTool,
         ];
+        let mentionedAgents = await task.userMessage.getMentionedAgents();
+        // Transform agents into tool format
+        const agentTools = mentionedAgents.map(agent => {
+            return {
+                type: "function",
+                function: {
+                    name: `subagent--${agent.unique_id}`,
+                    description: agent.longDescription || agent.description,
+                    parameters: {
+                        type: "object",
+                        properties: {
+                            task: {
+                                type: "string",
+                                description: "The task to be executed by the tool."
+                            }
+                        },
+                        required: ["task"]
+                    }
+                }
+            };
+        });
+        this.tools = this.tools.concat(agentTools);
         let completed = false;
         let userMessages = await task.toPrompt();
         this.apiConversationHistory.push({ role: "user", content: userMessages });

modules/agentlib/usermessage.d.ts

@@ -1,7 +1,16 @@
+interface agent {
+    description: string;
+    title: string;
+    id: number;
+    agent_id: string;
+    unique_id: string;
+    longDescription: string;
+}
 interface Message {
     userMessage: string;
     mentionedFiles?: string[];
     mentionedMCPs: string[];
+    mentionedAgents: agent[];
 }
 export interface UserMessageContent {
     type: string;
@@ -15,6 +24,7 @@ declare class UserMessage {
     constructor(message: Message, promptOverride?: boolean);
     getFiles(): void;
     toPrompt(bAttachFiles?: boolean, bAttachImages?: boolean, bAttachEnvironment?: boolean): Promise<UserMessageContent[]>;
+    getMentionedAgents(): agent[];
     getMentionedMcps(): string[];
     getMentionedMcpsTools(): Promise<any>;
     private getEnvironmentDetail;

modules/agentlib/usermessage.js

@@ -54,6 +54,10 @@ class UserMessage {
         }
         return this.userMessages;
     }
+    getMentionedAgents() {
+        //TODO : get config in tool format if neede
+        return this.message.mentionedAgents || [];
+    }
     getMentionedMcps() {
         return this.message.mentionedMCPs || [];
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codebolt/codeboltjs",
-  "version": "1.1.94",
+  "version": "1.1.95",
   "description": "",
   "keywords": [],
   "author": "",

src/modules/agentlib/agent.ts

@@ -27,41 +27,57 @@ interface ToolDetails {
 
 class Agent {
     private tools: any[];
-    private subAgents: any[];
+    // private subAgents: any[];
     private apiConversationHistory: Message[];
     private maxRun: number;
     private systemPrompt: SystemPrompt;
     private userMessage: Message[];
     private nextUserMessage:any;
 
 
-    constructor(tools: any = [], systemPrompt: SystemPrompt, maxRun: number = 0, subAgents: any[] = []) {
+    constructor(tools: any = [], systemPrompt: SystemPrompt, maxRun: number = 0) {
         this.tools = tools;
         this.userMessage = [];
         this.apiConversationHistory = [];
         this.maxRun = maxRun;
         this.systemPrompt = systemPrompt;
-        this.subAgents = subAgents;
-        this.subAgents = subAgents.map(subagent => {
-            subagent.function.name = `subagent--${subagent.function.name}`;
-            return subagent;
-        });
-        this.tools = this.tools.concat(subAgents.map(subagent => ({
-            ...subagent
-        })));
-       
-
 
     }
 
     async run(task: TaskInstruction, successCondition: () => boolean = () => true): Promise<{ success: boolean; error: string | null, message: string | null }> {
 
 
         let mentaionedMCPSTool: any[] = await task.userMessage.getMentionedMcpsTools();
+
         this.tools = [
             ...this.tools,
-            ...mentaionedMCPSTool
+            ...mentaionedMCPSTool,
+    
         ]
+        let mentionedAgents = await task.userMessage.getMentionedAgents();
+
+        // Transform agents into tool format
+        const agentTools = mentionedAgents.map(agent => {
+            return {
+                type: "function",
+                function: {
+                    name: `subagent--${agent.unique_id}`,
+                    description: agent.longDescription || agent.description,
+                    parameters: {
+                        type: "object",
+                        properties: {
+                            task: {
+                                type: "string",
+                                description: "The task to be executed by the tool."
+                            }
+                        },
+                        required: ["task"]
+                    }
+                }
+            };
+        });
+        
+        this.tools = this.tools.concat(agentTools);
 
 
         let completed = false;

src/modules/agentlib/usermessage.ts

@@ -1,13 +1,21 @@
 import cbfs from "./../fs";
 import project from "./../project";
 import mcp from "./../tools";
-import { escape } from "querystring";
-
-
+interface agent {
+  
+        description: string;
+        title: string;
+        id: number;
+        agent_id: string;
+        unique_id: string;
+        longDescription: string;
+    
+}
 interface Message {
     userMessage: string;
     mentionedFiles?: string[];
     mentionedMCPs: string[];
+    mentionedAgents: agent[];
 }
 
 export interface UserMessageContent {
@@ -70,8 +78,13 @@ class UserMessage {
         return this.userMessages;
     }
 
-    getMentionedMcps(): string[] {
-        return this.message.mentionedMCPs || [];
+    getMentionedAgents() {
+        //TODO : get config in tool format if neede
+        return this.message.mentionedAgents || [];
+    }
+
+    getMentionedMcps() {
+      return this.message.mentionedMCPs || [];
     }
     async getMentionedMcpsTools() {
         if (this.mentionedMCPs.length > 0) {