more reorganization of the tools

Author: bhouston

packages/agent/src/core/types.ts

@@ -2,7 +2,7 @@ import { z } from 'zod';
 import { JsonSchema7Type } from 'zod-to-json-schema';
 
 import { AgentTracker } from '../tools/agent/AgentTracker.js';
-import { BrowserTracker } from '../tools/browser/browserTracker.js';
+import { SessionTracker } from '../tools/session/SessionTracker.js';
 import { ShellTracker } from '../tools/shell/ShellTracker.js';
 import { Logger } from '../utils/logger.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

@@ -13,14 +13,14 @@ 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/agent/AgentTracker.js';
 // Tools - Interaction

packages/agent/src/tools/agent/agentExecute.test.ts

@@ -3,7 +3,7 @@ import { describe, expect, it, vi } from 'vitest';
 import { TokenTracker } from '../../core/tokens.js';
 import { ToolContext } from '../../core/types.js';
 import { MockLogger } from '../../utils/mockLogger.js';
-import { BrowserTracker } from '../browser/browserTracker.js';
+import { SessionTracker } from '../session/SessionTracker.js';
 import { ShellTracker } from '../shell/ShellTracker.js';
 
 import { agentExecuteTool } from './agentExecute.js';
@@ -37,7 +37,7 @@ const mockContext: ToolContext = {
   temperature: 0.7,
   agentTracker: new AgentTracker('test'),
   shellTracker: new ShellTracker('test'),
-  browserTracker: new BrowserTracker('test'),
+  browserTracker: new SessionTracker('test'),
 };
 
 describe('agentExecuteTool', () => {

packages/agent/src/tools/agent/agentExecute.ts

@@ -7,8 +7,8 @@ import {
 } from '../../core/toolAgent/config.js';
 import { toolAgent } from '../../core/toolAgent/toolAgentCore.js';
 import { Tool, ToolContext } from '../../core/types.js';
-import { BrowserTracker } from '../browser/browserTracker.js';
 import { getTools } from '../getTools.js';
+import { SessionTracker } from '../session/SessionTracker.js';
 import { ShellTracker } from '../shell/ShellTracker.js';
 
 import { AgentTracker } from './AgentTracker.js';
@@ -89,7 +89,7 @@ export const agentExecuteTool: Tool<Parameters, ReturnType> = {
       workingDirectory: workingDirectory ?? context.workingDirectory,
       agentTracker: new AgentTracker(subAgentId),
       shellTracker: new ShellTracker(subAgentId),
-      browserTracker: new BrowserTracker(subAgentId),
+      browserTracker: new SessionTracker(subAgentId),
     };
 
     // Construct a well-structured prompt

packages/agent/src/tools/agent/agentTools.test.ts

@@ -3,7 +3,7 @@ import { describe, expect, it, vi } from 'vitest';
 import { TokenTracker } from '../../core/tokens.js';
 import { ToolContext } from '../../core/types.js';
 import { MockLogger } from '../../utils/mockLogger.js';
-import { BrowserTracker } from '../browser/browserTracker.js';
+import { SessionTracker } from '../session/SessionTracker.js';
 import { ShellTracker } from '../shell/ShellTracker.js';
 
 import { agentMessageTool } from './agentMessage.js';
@@ -33,7 +33,7 @@ const mockContext: ToolContext = {
   temperature: 0.7,
   agentTracker: new AgentTracker('test'),
   shellTracker: new ShellTracker('test'),
-  browserTracker: new BrowserTracker('test'),
+  browserTracker: new SessionTracker('test'),
 };
 
 describe('Agent Tools', () => {

packages/agent/src/tools/getTools.test.ts

@@ -5,8 +5,8 @@ import { ToolContext } from '../core/types.js';
 import { MockLogger } from '../utils/mockLogger.js';
 
 import { AgentTracker } from './agent/AgentTracker.js';
-import { BrowserTracker } from './browser/browserTracker.js';
 import { getTools } from './getTools.js';
+import { SessionTracker } from './session/SessionTracker.js';
 import { ShellTracker } from './shell/ShellTracker.js';
 
 // Mock context
@@ -24,7 +24,7 @@ export const getMockToolContext = (): ToolContext => ({
   temperature: 0.7,
   agentTracker: new AgentTracker('test'),
   shellTracker: new ShellTracker('test'),
-  browserTracker: new BrowserTracker('test'),
+  browserTracker: new SessionTracker('test'),
 });
 
 describe('getTools', () => {

packages/agent/src/tools/getTools.ts

@@ -5,13 +5,13 @@ import { Tool } from '../core/types.js';
 import { agentDoneTool } from './agent/agentDone.js';
 import { agentExecuteTool } from './agent/agentExecute.js';
 import { listAgentsTool } from './agent/listAgents.js';
-import { browseMessageTool } from './browser/browseMessage.js';
-import { browseStartTool } from './browser/browseStart.js';
-import { listBrowsersTool } from './browser/listBrowsers.js';
 import { userPromptTool } from './interaction/userPrompt.js';
 import { fetchTool } from './io/fetch.js';
 import { textEditorTool } from './io/textEditor.js';
 import { createMcpTool } from './mcp.js';
+import { listSessionsTool } from './session/listSessions.js';
+import { sessionMessageTool } from './session/sessionMessage.js';
+import { sessionStartTool } from './session/sessionStart.js';
 import { listShellsTool } from './shell/listShells.js';
 import { shellMessageTool } from './shell/shellMessage.js';
 import { shellStartTool } from './shell/shellStart.js';
@@ -32,15 +32,15 @@ export function getTools(options?: GetToolsOptions): Tool[] {
   const tools: Tool[] = [
     textEditorTool as unknown as Tool,
     agentExecuteTool as unknown as Tool,
-    listBrowsersTool as unknown as Tool,
+    listSessionsTool as unknown as Tool,
     /*agentStartTool as unknown as Tool,
     agentMessageTool as unknown as Tool,*/
     agentDoneTool as unknown as Tool,
     fetchTool as unknown as Tool,
     shellStartTool as unknown as Tool,
     shellMessageTool as unknown as Tool,
-    browseStartTool as unknown as Tool,
-    browseMessageTool as unknown as Tool,
+    sessionStartTool as unknown as Tool,
+    sessionMessageTool as unknown as Tool,
     //respawnTool as unknown as Tool,  this is a confusing tool for now.
     sleepTool as unknown as Tool,
     listShellsTool as unknown as Tool,

packages/agent/src/tools/browser/browserTracker.ts renamed to packages/agent/src/tools/session/SessionTracker.ts

@@ -1,20 +1,20 @@
 import { v4 as uuidv4 } from 'uuid';
 
-import { BrowserManager } from './BrowserManager.js';
-import { browserSessions } from './types.js';
+import { SessionManager } from './lib/SessionManager.js';
+import { browserSessions } from './lib/types.js';
 
 // Status of a browser session
-export enum BrowserSessionStatus {
+export enum SessionStatus {
   RUNNING = 'running',
   COMPLETED = 'completed',
   ERROR = 'error',
   TERMINATED = 'terminated',
 }
 
 // Browser session tracking data
-export interface BrowserSessionInfo {
+export interface SessionInfo {
   id: string;
-  status: BrowserSessionStatus;
+  status: SessionStatus;
   startTime: Date;
   endTime?: Date;
   metadata: {
@@ -29,17 +29,17 @@ export interface BrowserSessionInfo {
 /**
  * Registry to keep track of browser sessions
  */
-export class BrowserTracker {
-  private sessions: Map<string, BrowserSessionInfo> = new Map();
+export class SessionTracker {
+  private sessions: Map<string, SessionInfo> = new Map();
 
   constructor(public ownerAgentId: string | undefined) {}
 
   // Register a new browser session
   public registerBrowser(url?: string): string {
     const id = uuidv4();
-    const session: BrowserSessionInfo = {
+    const session: SessionInfo = {
       id,
-      status: BrowserSessionStatus.RUNNING,
+      status: SessionStatus.RUNNING,
       startTime: new Date(),
       metadata: {
         url,
@@ -52,7 +52,7 @@ export class BrowserTracker {
   // Update the status of a browser session
   public updateSessionStatus(
     id: string,
-    status: BrowserSessionStatus,
+    status: SessionStatus,
     metadata?: Record<string, any>,
   ): boolean {
     const session = this.sessions.get(id);
@@ -63,9 +63,9 @@ export class BrowserTracker {
     session.status = status;
 
     if (
-      status === BrowserSessionStatus.COMPLETED ||
-      status === BrowserSessionStatus.ERROR ||
-      status === BrowserSessionStatus.TERMINATED
+      status === SessionStatus.COMPLETED ||
+      status === SessionStatus.ERROR ||
+      status === SessionStatus.TERMINATED
     ) {
       session.endTime = new Date();
     }
@@ -78,19 +78,17 @@ export class BrowserTracker {
   }
 
   // Get all browser sessions
-  public getSessions(): BrowserSessionInfo[] {
+  public getSessions(): SessionInfo[] {
     return Array.from(this.sessions.values());
   }
 
   // Get a specific browser session by ID
-  public getSessionById(id: string): BrowserSessionInfo | undefined {
+  public getSessionById(id: string): SessionInfo | undefined {
     return this.sessions.get(id);
   }
 
   // Filter sessions by status
-  public getSessionsByStatus(
-    status: BrowserSessionStatus,
-  ): BrowserSessionInfo[] {
+  public getSessionsByStatus(status: SessionStatus): SessionInfo[] {
     return this.getSessions().filter((session) => session.status === status);
   }
 
@@ -99,11 +97,11 @@ export class BrowserTracker {
    * @returns A promise that resolves when cleanup is complete
    */
   public async cleanup(): Promise<void> {
-    const sessions = this.getSessionsByStatus(BrowserSessionStatus.RUNNING);
+    const sessions = this.getSessionsByStatus(SessionStatus.RUNNING);
 
     // Create cleanup promises for each session
     const cleanupPromises = sessions.map((session) =>
-      this.cleanupBrowserSession(session),
+      this.cleanupSession(session),
     );
 
     // Wait for all cleanup operations to complete in parallel
@@ -114,18 +112,16 @@ export class BrowserTracker {
    * Cleans up a browser session
    * @param session The browser session to clean up
    */
-  private async cleanupBrowserSession(
-    session: BrowserSessionInfo,
-  ): Promise<void> {
+  private async cleanupSession(session: SessionInfo): Promise<void> {
     try {
       const browserManager = (
-        globalThis as unknown as { __BROWSER_MANAGER__?: BrowserManager }
+        globalThis as unknown as { __BROWSER_MANAGER__?: SessionManager }
       ).__BROWSER_MANAGER__;
 
       if (browserManager) {
         await browserManager.closeSession(session.id);
       } else {
-        // Fallback to closing via browserSessions if BrowserManager is not available
+        // Fallback to closing via browserSessions if SessionManager is not available
         const browserSession = browserSessions.get(session.id);
         if (browserSession) {
           await browserSession.page.context().close();
@@ -134,9 +130,9 @@ export class BrowserTracker {
         }
       }
 
-      this.updateSessionStatus(session.id, BrowserSessionStatus.COMPLETED);
+      this.updateSessionStatus(session.id, SessionStatus.COMPLETED);
     } catch (error) {
-      this.updateSessionStatus(session.id, BrowserSessionStatus.ERROR, {
+      this.updateSessionStatus(session.id, SessionStatus.ERROR, {
         error: error instanceof Error ? error.message : String(error),
       });
     }

packages/agent/src/tools/browser/BrowserAutomation.ts renamed to packages/agent/src/tools/session/lib/BrowserAutomation.ts

@@ -1,12 +1,12 @@
-import { BrowserManager } from './BrowserManager.js';
 import { PageController } from './PageController.js';
+import { SessionManager } from './SessionManager.js';
 
 export class BrowserAutomation {
   private static instance: BrowserAutomation;
-  private browserManager: BrowserManager;
+  private browserManager: SessionManager;
 
   private constructor() {
-    this.browserManager = new BrowserManager();
+    this.browserManager = new SessionManager();
   }
 
   static getInstance(): BrowserAutomation {

packages/agent/src/tools/browser/PageController.ts renamed to packages/agent/src/tools/session/lib/PageController.ts

@@ -1,6 +1,6 @@
 import { Page } from '@playwright/test';
 
-import { errorToString } from '../../utils/errorToString.js';
+import { errorToString } from '../../../utils/errorToString.js';
 
 import {
   SelectorType,