fix: adopt agentId, sessionId and shellId

Author: bhouston

.vscode/settings.json

@@ -44,6 +44,7 @@
     "threeify",
     "transpiling",
     "triggerdef",
+    "uuidv",
     "vinxi"
   ],
 

packages/agent/src/core/toolAgent/__tests__/statusUpdates.test.ts

@@ -65,14 +65,14 @@ describe('Status Updates', () => {
     const context = {
       agentTracker: {
         getAgents: vi.fn().mockReturnValue([
-          { id: 'agent1', goal: 'Task 1', status: AgentStatus.RUNNING },
-          { id: 'agent2', goal: 'Task 2', status: AgentStatus.RUNNING },
+          { agentId: 'agent1', goal: 'Task 1', status: AgentStatus.RUNNING },
+          { agentId: 'agent2', goal: 'Task 2', status: AgentStatus.RUNNING },
         ]),
       },
       shellTracker: {
         getShells: vi.fn().mockReturnValue([
           {
-            id: 'shell1',
+            shellId: 'shell1',
             status: ShellStatus.RUNNING,
             metadata: { command: 'npm test' },
           },
@@ -81,7 +81,7 @@ describe('Status Updates', () => {
       browserTracker: {
         getSessionsByStatus: vi.fn().mockReturnValue([
           {
-            id: 'session1',
+            sessionId: 'session1',
             status: SessionStatus.RUNNING,
             metadata: { url: 'https://example.com' },
           },

packages/agent/src/core/toolAgent/statusUpdates.ts

@@ -24,16 +24,24 @@ export function generateStatusUpdate(
     : undefined;
 
   // Get active sub-agents
-  const activeAgents = context.agentTracker ? getActiveAgents(context) : [];
+  const activeAgents = context.agentTracker
+    ? context.agentTracker.getAgents(AgentStatus.RUNNING)
+    : [];
 
   // Get active shell processes
-  const activeShells = context.shellTracker ? getActiveShells(context) : [];
+  const activeShells = context.shellTracker
+    ? context.shellTracker.getShells(ShellStatus.RUNNING)
+    : [];
+
+  console.log('activeShells', activeShells);
 
   // Get active browser sessions
   const activeSessions = context.browserTracker
-    ? getActiveSessions(context)
+    ? context.browserTracker.getSessionsByStatus(SessionStatus.RUNNING)
     : [];
 
+  console.log('activeSessions', activeSessions);
+
   // Format the status message
   const statusContent = [
     `--- STATUS UPDATE ---`,
@@ -43,13 +51,13 @@ export function generateStatusUpdate(
     `Cost So Far: ${tokenTracker.getTotalCost()}`,
     ``,
     `Active Sub-Agents: ${activeAgents.length}`,
-    ...activeAgents.map((a) => `- ${a.id}: ${a.description}`),
+    ...activeAgents.map((a) => `- ${a.agentId}: ${a.goal}`),
     ``,
     `Active Shell Processes: ${activeShells.length}`,
-    ...activeShells.map((s) => `- ${s.id}: ${s.description}`),
+    ...activeShells.map((s) => `- ${s.shellId}: ${s.metadata.command}`),
     ``,
     `Active Browser Sessions: ${activeSessions.length}`,
-    ...activeSessions.map((s) => `- ${s.id}: ${s.description}`),
+    ...activeSessions.map((s) => `- ${s.sessionId}: ${s.metadata.url ?? ''}`),
     ``,
     usagePercentage !== undefined &&
       (usagePercentage >= 50
@@ -70,41 +78,3 @@ export function generateStatusUpdate(
 function formatNumber(num: number): string {
   return num.toLocaleString();
 }
-
-/**
- * Get active agents from the agent tracker
- */
-function getActiveAgents(context: ToolContext) {
-  const agents = context.agentTracker.getAgents(AgentStatus.RUNNING);
-  return agents.map((agent) => ({
-    id: agent.id,
-    description: agent.goal,
-    status: agent.status,
-  }));
-}
-
-/**
- * Get active shells from the shell tracker
- */
-function getActiveShells(context: ToolContext) {
-  const shells = context.shellTracker.getShells(ShellStatus.RUNNING);
-  return shells.map((shell) => ({
-    id: shell.id,
-    description: shell.metadata.command,
-    status: shell.status,
-  }));
-}
-
-/**
- * Get active browser sessions from the session tracker
- */
-function getActiveSessions(context: ToolContext) {
-  const sessions = context.browserTracker.getSessionsByStatus(
-    SessionStatus.RUNNING,
-  );
-  return sessions.map((session) => ({
-    id: session.id,
-    description: session.metadata.url || 'No URL',
-    status: session.status,
-  }));
-}

packages/agent/src/core/toolAgent/toolAgentCore.ts

@@ -1,5 +1,6 @@
 import { zodToJsonSchema } from 'zod-to-json-schema';
 
+import { userMessages } from '../../tools/interaction/userMessage.js';
 import { utilityTools } from '../../tools/utility/index.js';
 import { generateText } from '../llm/core.js';
 import { createProvider } from '../llm/provider.js';
@@ -104,11 +105,6 @@ export const toolAgent = async (
     // Check for messages from user (for main agent only)
     // Import this at the top of the file
     try {
-      // Dynamic import to avoid circular dependencies
-      const { userMessages } = await import(
-        '../../tools/interaction/userMessage.js'
-      );
-
       if (userMessages && userMessages.length > 0) {
         // Get all user messages and clear the queue
         const pendingUserMessages = [...userMessages];

packages/agent/src/tools/agent/AgentTracker.ts

@@ -11,7 +11,7 @@ export enum AgentStatus {
 }
 
 export interface Agent {
-  id: string;
+  agentId: string;
   status: AgentStatus;
   startTime: Date;
   endTime?: Date;
@@ -22,7 +22,7 @@ export interface Agent {
 
 // Internal agent state tracking (similar to existing agentStates)
 export interface AgentState {
-  id: string;
+  agentId: string;
   goal: string;
   prompt: string;
   output: string;
@@ -45,32 +45,32 @@ export class AgentTracker {
 
   // Register a new agent
   public registerAgent(goal: string): string {
-    const id = uuidv4();
+    const agentId = uuidv4();
 
     // Create agent tracking entry
     const agent: Agent = {
-      id,
+      agentId: agentId,
       status: AgentStatus.RUNNING,
       startTime: new Date(),
       goal,
     };
 
-    this.agents.set(id, agent);
-    return id;
+    this.agents.set(agentId, agent);
+    return agentId;
   }
 
   // Register agent state
-  public registerAgentState(id: string, state: AgentState): void {
-    this.agentStates.set(id, state);
+  public registerAgentState(agentId: string, state: AgentState): void {
+    this.agentStates.set(agentId, state);
   }
 
   // Update agent status
   public updateAgentStatus(
-    id: string,
+    agentId: string,
     status: AgentStatus,
     metadata?: { result?: string; error?: string },
   ): boolean {
-    const agent = this.agents.get(id);
+    const agent = this.agents.get(agentId);
     if (!agent) {
       return false;
     }
@@ -94,13 +94,13 @@ export class AgentTracker {
   }
 
   // Get a specific agent state
-  public getAgentState(id: string): AgentState | undefined {
-    return this.agentStates.get(id);
+  public getAgentState(agentId: string): AgentState | undefined {
+    return this.agentStates.get(agentId);
   }
 
   // Get a specific agent tracking info
-  public getAgent(id: string): Agent | undefined {
-    return this.agents.get(id);
+  public getAgent(agentId: string): Agent | undefined {
+    return this.agents.get(agentId);
   }
 
   // Get all agents with optional filtering
@@ -118,12 +118,12 @@ export class AgentTracker {
    * Get list of active agents with their descriptions
    */
   public getActiveAgents(): Array<{
-    id: string;
+    agentId: string;
     description: string;
     status: AgentStatus;
   }> {
     return this.getAgents(AgentStatus.RUNNING).map((agent) => ({
-      id: agent.id,
+      agentId: agent.agentId,
       description: agent.goal,
       status: agent.status,
     }));
@@ -134,14 +134,14 @@ export class AgentTracker {
     const runningAgents = this.getAgents(AgentStatus.RUNNING);
 
     await Promise.all(
-      runningAgents.map((agent) => this.terminateAgent(agent.id)),
+      runningAgents.map((agent) => this.terminateAgent(agent.agentId)),
     );
   }
 
   // Terminate a specific agent
-  public async terminateAgent(id: string): Promise<void> {
+  public async terminateAgent(agentId: string): Promise<void> {
     try {
-      const agentState = this.agentStates.get(id);
+      const agentState = this.agentStates.get(agentId);
       if (agentState && !agentState.aborted) {
         // Set the agent as aborted and completed
         agentState.aborted = true;
@@ -152,9 +152,9 @@ export class AgentTracker {
         await agentState.context.shellTracker.cleanup();
         await agentState.context.browserTracker.cleanup();
       }
-      this.updateAgentStatus(id, AgentStatus.TERMINATED);
+      this.updateAgentStatus(agentId, AgentStatus.TERMINATED);
     } catch (error) {
-      this.updateAgentStatus(id, AgentStatus.ERROR, {
+      this.updateAgentStatus(agentId, AgentStatus.ERROR, {
         error: error instanceof Error ? error.message : String(error),
       });
     }

packages/agent/src/tools/agent/__tests__/logCapture.test.ts

@@ -46,7 +46,7 @@ describe('Log Capture in AgentTracker', () => {
     );
 
     // Get the agent state
-    const agentState = agentTracker.getAgentState(startResult.instanceId);
+    const agentState = agentTracker.getAgentState(startResult.agentId);
     expect(agentState).toBeDefined();
 
     if (!agentState) return; // TypeScript guard
@@ -90,7 +90,7 @@ describe('Log Capture in AgentTracker', () => {
     // Get the agent message output
     const messageResult = await agentMessageTool.execute(
       {
-        instanceId: startResult.instanceId,
+        agentId: startResult.agentId,
         description: 'Get agent output',
       },
       context,
@@ -126,7 +126,7 @@ describe('Log Capture in AgentTracker', () => {
     // Get the agent message output without any logs
     const messageResult = await agentMessageTool.execute(
       {
-        instanceId: startResult.instanceId,
+        agentId: startResult.agentId,
         description: 'Get agent output',
       },
       context,

packages/agent/src/tools/agent/agentMessage.ts

@@ -6,7 +6,7 @@ import { Tool } from '../../core/types.js';
 import { agentStates } from './agentStart.js';
 
 const parameterSchema = z.object({
-  instanceId: z.string().describe('The ID returned by agentStart'),
+  agentId: z.string().describe('The ID returned by agentStart'),
   guidance: z
     .string()
     .optional()
@@ -57,17 +57,17 @@ export const agentMessageTool: Tool<Parameters, ReturnType> = {
   returnsJsonSchema: zodToJsonSchema(returnSchema),
 
   execute: async (
-    { instanceId, guidance, terminate },
+    { agentId, guidance, terminate },
     { logger, ..._ },
   ): Promise<ReturnType> => {
     logger.debug(
-      `Interacting with sub-agent ${instanceId}${guidance ? ' with guidance' : ''}${terminate ? ' with termination request' : ''}`,
+      `Interacting with sub-agent ${agentId}${guidance ? ' with guidance' : ''}${terminate ? ' with termination request' : ''}`,
     );
 
     try {
-      const agentState = agentStates.get(instanceId);
+      const agentState = agentStates.get(agentId);
       if (!agentState) {
-        throw new Error(`No sub-agent found with ID ${instanceId}`);
+        throw new Error(`No sub-agent found with ID ${agentId}`);
       }
 
       // Check if the agent was already terminated
@@ -98,13 +98,13 @@ export const agentMessageTool: Tool<Parameters, ReturnType> = {
       // Add guidance to the agent state's parentMessages array
       // The sub-agent will check for these messages on each iteration
       if (guidance) {
-        logger.log(`Guidance provided to sub-agent ${instanceId}: ${guidance}`);
+        logger.log(`Guidance provided to sub-agent ${agentId}: ${guidance}`);
 
         // Add the guidance to the parentMessages array
         agentState.parentMessages.push(guidance);
 
         logger.debug(
-          `Added message to sub-agent ${instanceId}'s parentMessages queue. Total messages: ${agentState.parentMessages.length}`,
+          `Added message to sub-agent ${agentId}'s parentMessages queue. Total messages: ${agentState.parentMessages.length}`,
         );
       }
 
@@ -121,7 +121,7 @@ export const agentMessageTool: Tool<Parameters, ReturnType> = {
 
           // Log that we're returning captured logs
           logger.debug(
-            `Returning ${agentState.capturedLogs.length} captured log messages for agent ${instanceId}`,
+            `Returning ${agentState.capturedLogs.length} captured log messages for agent ${agentId}`,
           );
         }
         // Clear the captured logs after retrieving them
@@ -167,7 +167,7 @@ export const agentMessageTool: Tool<Parameters, ReturnType> = {
 
   logParameters: (input, { logger }) => {
     logger.log(
-      `Interacting with sub-agent ${input.instanceId}, ${input.description}${input.terminate ? ' (terminating)' : ''}`,
+      `Interacting with sub-agent ${input.agentId}, ${input.description}${input.terminate ? ' (terminating)' : ''}`,
     );
   },
   logReturns: (output, { logger }) => {