Merge pull request #310 from drivecore/refactor/remove-global-agent-states

refactor: remove global agentStates in favor of agentTracker

Author: bhouston

docs/tools/agent-tools.md

@@ -2,15 +2,15 @@
 
 The agent tools provide ways to create and interact with sub-agents. There are two approaches available:
 
-1. The original `subAgent` tool (synchronous, blocking)
+1. The original `agentExecute` tool (synchronous, blocking)
 2. The new `agentStart` and `agentMessage` tools (asynchronous, non-blocking)
 
-## subAgent Tool
+## agentExecute Tool
 
-The `subAgent` tool creates a sub-agent that runs synchronously until completion. The parent agent waits for the sub-agent to complete before continuing.
+The `agentExecute` tool creates a sub-agent that runs synchronously until completion. The parent agent waits for the sub-agent to complete before continuing.
 
 ```typescript
-subAgent({
+agentExecute({
   description: "A brief description of the sub-agent's purpose",
   goal: 'The main objective that the sub-agent needs to achieve',
   projectContext: 'Context about the problem or environment',
@@ -123,7 +123,7 @@ while (!agent1Completed || !agent2Completed) {
 
 ## Choosing Between Approaches
 
-- Use `subAgent` for simpler tasks where blocking execution is acceptable
+- Use `agentExecute` for simpler tasks where blocking execution is acceptable
 - Use `agentStart` and `agentMessage` for:
   - Parallel execution of multiple sub-agents
   - Tasks where you need to monitor progress

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

@@ -146,7 +146,7 @@ export function getDefaultSystemPrompt(toolContext: ToolContext): string {
     githubModeInstructions,
     '',
     'You prefer to call tools in parallel when possible because it leads to faster execution and less resource usage.',
-    'When done, call the sequenceComplete tool with your results to indicate that the sequence has completed.',
+    'When done, call the agentDone tool with your results to indicate that the sequence has completed.',
     '',
     'For coding tasks:',
     '0. Try to break large tasks into smaller sub-tasks that can be completed and verified sequentially.',

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

@@ -13,7 +13,7 @@ describe('toolAgentCore empty response detection', () => {
         content: [
           {
             type: 'text',
-            text: 'I notice you sent an empty response. If you are done with your tasks, please call the sequenceComplete tool with your results. If you are waiting for other tools to complete, you can use the sleep tool to wait before checking again.',
+            text: 'I notice you sent an empty response. If you are done with your tasks, please call the agentDone tool with your results. If you are waiting for other tools to complete, you can use the sleep tool to wait before checking again.',
           },
         ],
       });

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

@@ -100,7 +100,7 @@ export const toolAgent = async (
       messages.push({
         role: 'user',
         content:
-          'I notice you sent an empty response. If you are done with your tasks, please call the sequenceComplete tool with your results. If you are waiting for other tools to complete, you can use the sleep tool to wait before checking again.',
+          'I notice you sent an empty response. If you are done with your tasks, please call the agentDone tool with your results. If you are waiting for other tools to complete, you can use the sleep tool to wait before checking again.',
       });
       continue;
     }
@@ -129,8 +129,12 @@ export const toolAgent = async (
       );
 
       // Execute the tools and get results
-      const { sequenceCompleted, completionResult, respawn } =
-        await executeTools(toolCalls, tools, messages, localContext);
+      const { agentDoned, completionResult, respawn } = await executeTools(
+        toolCalls,
+        tools,
+        messages,
+        localContext,
+      );
 
       if (respawn) {
         logger.info('Respawning agent with new context');
@@ -143,7 +147,7 @@ export const toolAgent = async (
         continue;
       }
 
-      if (sequenceCompleted) {
+      if (agentDoned) {
         const result: ToolAgentResult = {
           result: completionResult ?? 'Sequence explicitly completed',
           interactions,

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

@@ -32,7 +32,7 @@ export async function executeTools(
   context: ToolContext,
 ): Promise<ToolCallResult> {
   if (toolCalls.length === 0) {
-    return { sequenceCompleted: false, toolResults: [] };
+    return { agentDoned: false, toolResults: [] };
   }
 
   const { logger } = context;
@@ -46,7 +46,7 @@ export async function executeTools(
     addToolResultToMessages(messages, respawnCall.id, { success: true }, false);
 
     return {
-      sequenceCompleted: false,
+      agentDoned: false,
       toolResults: [
         {
           toolCallId: respawnCall.id,
@@ -97,19 +97,17 @@ export async function executeTools(
     }),
   );
 
-  const sequenceCompletedTool = toolResults.find(
-    (r) => r.toolName === 'sequenceComplete',
-  );
-  const completionResult = sequenceCompletedTool
-    ? (sequenceCompletedTool.result as { result: string }).result
+  const agentDonedTool = toolResults.find((r) => r.toolName === 'agentDone');
+  const completionResult = agentDonedTool
+    ? (agentDonedTool.result as { result: string }).result
     : undefined;
 
-  if (sequenceCompletedTool) {
+  if (agentDonedTool) {
     logger.verbose('Sequence completed', { completionResult });
   }
 
   return {
-    sequenceCompleted: sequenceCompletedTool !== undefined,
+    agentDoned: agentDonedTool !== undefined,
     completionResult,
     toolResults,
   };

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

@@ -7,7 +7,7 @@ export interface ToolAgentResult {
 }
 
 export interface ToolCallResult {
-  sequenceCompleted: boolean;
+  agentDoned: boolean;
   completionResult?: string;
   toolResults: unknown[];
   respawn?: { context: string };

packages/agent/src/core/types.ts

@@ -1,9 +1,9 @@
 import { z } from 'zod';
 import { JsonSchema7Type } from 'zod-to-json-schema';
 
-import { BrowserTracker } from '../tools/browser/browserTracker.js';
-import { AgentTracker } from '../tools/interaction/agentTracker.js';
-import { ShellTracker } from '../tools/system/shellTracker.js';
+import { AgentTracker } from '../tools/agent/AgentTracker.js';
+import { SessionTracker } from '../tools/session/SessionTracker.js';
+import { ShellTracker } from '../tools/shell/ShellTracker.js';
 import { Logger } from '../utils/logger.js';
 
 import { TokenTracker } from './tokens.js';
@@ -34,7 +34,7 @@ export type ToolContext = {
   temperature: number;
   agentTracker: AgentTracker;
   shellTracker: ShellTracker;
-  browserTracker: BrowserTracker;
+  browserTracker: SessionTracker;
 };
 
 export type Tool<TParams = Record<string, any>, TReturn = any> = {

packages/agent/src/index.ts

@@ -3,28 +3,28 @@
 export * from './tools/io/fetch.js';
 
 // Tools - System
-export * from './tools/system/shellStart.js';
+export * from './tools/shell/shellStart.js';
 export * from './tools/system/sleep.js';
 export * from './tools/system/respawn.js';
-export * from './tools/system/sequenceComplete.js';
-export * from './tools/system/shellMessage.js';
-export * from './tools/system/shellExecute.js';
-export * from './tools/system/listShells.js';
-export * from './tools/system/shellTracker.js';
+export * from './tools/agent/agentDone.js';
+export * from './tools/shell/shellMessage.js';
+export * from './tools/shell/shellExecute.js';
+export * from './tools/shell/listShells.js';
+export * from './tools/shell/ShellTracker.js';
 
 // Tools - Browser
-export * from './tools/browser/BrowserManager.js';
-export * from './tools/browser/types.js';
-export * from './tools/browser/browseMessage.js';
-export * from './tools/browser/browseStart.js';
-export * from './tools/browser/PageController.js';
-export * from './tools/browser/BrowserAutomation.js';
-export * from './tools/browser/listBrowsers.js';
-export * from './tools/browser/browserTracker.js';
+export * from './tools/session/lib/SessionManager.js';
+export * from './tools/session/lib/types.js';
+export * from './tools/session/sessionMessage.js';
+export * from './tools/session/sessionStart.js';
+export * from './tools/session/lib/PageController.js';
+export * from './tools/session/lib/BrowserAutomation.js';
+export * from './tools/session/listSessions.js';
+export * from './tools/session/SessionTracker.js';
 
-export * from './tools/interaction/agentTracker.js';
+export * from './tools/agent/AgentTracker.js';
 // Tools - Interaction
-export * from './tools/interaction/subAgent.js';
+export * from './tools/agent/agentExecute.js';
 export * from './tools/interaction/userPrompt.js';
 
 // Core

packages/agent/src/tools/interaction/agentTracker.ts renamed to packages/agent/src/tools/agent/AgentTracker.ts

@@ -16,8 +16,8 @@ const returnSchema = z.object({
 type Parameters = z.infer<typeof parameterSchema>;
 type ReturnType = z.infer<typeof returnSchema>;
 
-export const sequenceCompleteTool: Tool<Parameters, ReturnType> = {
-  name: 'sequenceComplete',
+export const agentDoneTool: Tool<Parameters, ReturnType> = {
+  name: 'agentDone',
   description: 'Completes the tool use sequence and returns the final result',
   logPrefix: '✅',
   parameters: parameterSchema,