clean up readonly functions

Author: Kylejeong2

stagehand/src/context.ts

@@ -13,7 +13,6 @@ import {
 } from "./logging.js";
 import { 
   getSession, 
-  getSessionReadOnly, 
   defaultSessionId, 
   type BrowserSession 
 } from "./sessionManager.js";
@@ -84,7 +83,6 @@ export class Context {
       this.stagehands.delete(sessionId);
     }
   }
-
   public async getActivePage(): Promise<BrowserSession["page"] | null> {
     // Try to get page from Stagehand first (if available for this session)
     const stagehand = this.stagehands.get(this.currentSessionId);
@@ -94,79 +92,21 @@ export class Context {
 
     // Fallback to session manager
     const session = await getSession(this.currentSessionId, this.config);
-    if (!session || !session.page || session.page.isClosed()) {
-      try {
-        const currentSession = await getSession(
-          this.currentSessionId,
-          this.config
-        );
-        if (
-          !currentSession ||
-          !currentSession.page ||
-          currentSession.page.isClosed()
-        ) {
-          return null;
-        }
-        return currentSession.page;
-      } catch (refreshError) {
-        return null;
-      }
-    }
-    return session.page;
-  }
-
-  // Will create a new default session if one doesn't exist
-  public async getActiveBrowser(): Promise<BrowserSession["browser"] | null> {
-    const session = await getSession(this.currentSessionId, this.config);
-    if (!session || !session.browser || !session.browser.isConnected()) {
-      try {
-        const currentSession = await getSession(
-          this.currentSessionId,
-          this.config
-        );
-        if (
-          !currentSession ||
-          !currentSession.browser ||
-          !currentSession.browser.isConnected()
-        ) {
-          return null;
-        }
-        return currentSession.browser;
-      } catch (refreshError) {
-        return null;
-      }
+    if (session && session.page && !session.page.isClosed()) {
+      return session.page;
     }
-    return session.browser;
+    
+    return null;
   }
 
-  /**
-   * Get the active browser without triggering session creation.
-   * This is a read-only operation used when we need to check for an existing browser
-   * without side effects (e.g., during close operations).
-   * @returns The browser if it exists and is connected, null otherwise
-   */
-  public getActiveBrowserReadOnly(): BrowserSession["browser"] | null {
-    const session = getSessionReadOnly(this.currentSessionId);
+  public async getActiveBrowser(createIfMissing: boolean = true): Promise<BrowserSession["browser"] | null> {
+    const session = await getSession(this.currentSessionId, this.config, createIfMissing);
     if (!session || !session.browser || !session.browser.isConnected()) {
       return null;
     }
     return session.browser;
   }
 
-  /**
-   * Get the active page without triggering session creation.
-   * This is a read-only operation used when we need to check for an existing page
-   * without side effects.
-   * @returns The page if it exists and is not closed, null otherwise
-   */
-  public getActivePageReadOnly(): BrowserSession["page"] | null {
-    const session = getSessionReadOnly(this.currentSessionId);
-    if (!session || !session.page || session.page.isClosed()) {
-      return null;
-    }
-    return session.page;
-  }
-
   async run(tool: any, args: any): Promise<CallToolResult> {
     try {
       log(`Executing tool: ${tool.schema.name} with args: ${JSON.stringify(args)}`, 'info');
@@ -203,6 +143,10 @@ export class Context {
     }
   }
 
+  /**
+   * List resources
+   * Documentation: https://modelcontextprotocol.io/docs/concepts/resources
+   */
   listResources() {
     return listResources();
   }

stagehand/src/sessionManager.ts

@@ -22,7 +22,7 @@ const browsers = new Map<string, BrowserSession>();
 let defaultBrowserSession: BrowserSession | null = null;
 
 // Define a specific ID for the default session
-export const defaultSessionId = "browserbase_session_main";
+export const defaultSessionId = `browserbase_session_main_${Date.now()}`;
 
 // Keep track of the active session ID. Defaults to the main session.
 let activeSessionId: string = defaultSessionId;
@@ -277,9 +277,10 @@ export async function ensureDefaultSessionInternal(
 // Get a specific session by ID
 export async function getSession(
   sessionId: string,
-  config: Config
+  config: Config,
+  createIfMissing: boolean = true
 ): Promise<BrowserSession | null> {
-  if (sessionId === defaultSessionId) {
+  if (sessionId === defaultSessionId && createIfMissing) {
     try {
       return await ensureDefaultSessionInternal(config);
     } catch (error) {
@@ -324,37 +325,6 @@ export async function getSession(
   return sessionObj;
 }
 
-/**
- * Get a session by ID without creating new sessions.
- * This is a read-only operation that never triggers session creation.
- * Used for operations like closing sessions where we don't want side effects.
- * @param sessionId The session ID to retrieve
- * @returns The session if it exists and is valid, null otherwise
- */
-export function getSessionReadOnly(sessionId: string): BrowserSession | null {
-  // Check if it's the default session
-  if (sessionId === defaultSessionId && defaultBrowserSession) {
-    // Only return if it's actually connected and valid
-    if (defaultBrowserSession.browser.isConnected() && !defaultBrowserSession.page.isClosed()) {
-      return defaultBrowserSession;
-    }
-    return null;
-  }
-
-  // For non-default sessions, check the browsers map
-  const sessionObj = browsers.get(sessionId);
-  if (!sessionObj) {
-    return null;
-  }
-
-  // Validate the session is still active
-  if (!sessionObj.browser.isConnected() || sessionObj.page.isClosed()) {
-    return null;
-  }
-
-  return sessionObj;
-}
-
 /**
  * Clean up a session by removing it from tracking.
  * This is called after a browser is closed to ensure proper cleanup.

stagehand/src/tools/session.ts

@@ -144,7 +144,7 @@ async function handleCloseSession(
     // Step 1: Attempt to get the active browser instance WITHOUT creating a new one
     try {
       // Use read-only version to avoid creating new sessions
-      browser = context.getActiveBrowserReadOnly();
+      browser = await context.getActiveBrowser(false);
     } catch (error: any) {
       process.stderr.write(
         `[tool.closeSession] Error retrieving active browser (session ID was ${previousSessionId || 'default/unknown'}): ${error.message || String(error)}`