addressing greptile comments

Author: Kylejeong2

src/mcp/resources.ts

@@ -46,36 +46,6 @@ export function clearAllScreenshots() {
   sessionIdToScreenshotNames.clear();
 }
 
-/**
- * Retry wrapper for clearing screenshots for a session. Uses exponential backoff.
- * This protects against transient failures in any consumer of the map.
- */
-export async function retryClearScreenshotsForSession(
-  sessionId: string,
-  options: { retries?: number; initialDelayMs?: number } = {},
-): Promise<void> {
-  const retries = options.retries ?? 3;
-  const initialDelayMs = options.initialDelayMs ?? 50;
-
-  let attempt = 0;
-  let delay = initialDelayMs;
-  // Attempt at least once
-  while (true) {
-    try {
-      clearScreenshotsForSession(sessionId);
-      return;
-    } catch (err) {
-      if (attempt >= retries) {
-        // Give up
-        throw err instanceof Error ? err : new Error(String(err));
-      }
-      await new Promise((r) => setTimeout(r, delay));
-      attempt += 1;
-      delay = Math.min(delay * 2, 1000);
-    }
-  }
-}
-
 /**
  * Handle listing resources request
  * @returns A list of available resources including screenshots

src/sessionManager.ts

@@ -2,7 +2,7 @@ import { Page, BrowserContext } from "@browserbasehq/stagehand";
 import type { Config } from "../config.d.ts";
 import type { Cookie } from "playwright-core";
 import { createStagehandInstance } from "./stagehandStore.js";
-import { retryClearScreenshotsForSession } from "./mcp/resources.js";
+import { clearScreenshotsForSession } from "./mcp/resources.js";
 import type { BrowserSession } from "./types/types.js";
 
 // Global state for managing browser sessions
@@ -134,10 +134,18 @@ export async function createNewBrowserSession(
       }
 
       // Purge any screenshots associated with both internal and Browserbase IDs
-      retryClearScreenshotsForSession(newSessionId).catch(() => {});
-      const bbId = browserbaseSessionId;
-      if (bbId) {
-        retryClearScreenshotsForSession(bbId).catch(() => {});
+      try {
+        clearScreenshotsForSession(newSessionId);
+        const bbId = browserbaseSessionId;
+        if (bbId) {
+          clearScreenshotsForSession(bbId);
+        }
+      } catch (err) {
+        process.stderr.write(
+          `[SessionManager] WARN - Failed to clear screenshots on disconnect for ${newSessionId}: ${
+            err instanceof Error ? err.message : String(err)
+          }\n`,
+        );
       }
     });
 
@@ -201,10 +209,18 @@ async function closeBrowserGracefully(
         `[SessionManager] Successfully closed Stagehand and browser for session: ${sessionIdToLog}\n`,
       );
       // After close, purge any screenshots associated with both internal and Browserbase IDs
-      retryClearScreenshotsForSession(sessionIdToLog).catch(() => {});
-      const bbId = session?.stagehand?.browserbaseSessionID;
-      if (bbId) {
-        retryClearScreenshotsForSession(bbId).catch(() => {});
+      try {
+        clearScreenshotsForSession(sessionIdToLog);
+        const bbId = session?.stagehand?.browserbaseSessionID;
+        if (bbId) {
+          clearScreenshotsForSession(bbId);
+        }
+      } catch (err) {
+        process.stderr.write(
+          `[SessionManager] WARN - Failed to clear screenshots after close for ${sessionIdToLog}: ${
+            err instanceof Error ? err.message : String(err)
+          }\n`,
+        );
       }
     } catch (closeError) {
       process.stderr.write(
@@ -350,7 +366,15 @@ export async function cleanupSession(sessionId: string): Promise<void> {
   browsers.delete(sessionId);
 
   // Always purge screenshots for this (internal) session id
-  await retryClearScreenshotsForSession(sessionId).catch(() => {});
+  try {
+    clearScreenshotsForSession(sessionId);
+  } catch (err) {
+    process.stderr.write(
+      `[SessionManager] WARN - Failed to clear screenshots during cleanup for ${sessionId}: ${
+        err instanceof Error ? err.message : String(err)
+      }\n`,
+    );
+  }
 
   // Clear default session reference if this was the default
   if (sessionId === defaultSessionId && defaultBrowserSession) {

src/stagehandStore.ts

@@ -2,7 +2,7 @@ import { randomUUID } from "crypto";
 import { Stagehand, Page } from "@browserbasehq/stagehand";
 import { StagehandSession, CreateSessionParams } from "./types/types.js";
 import type { Config } from "../config.d.ts";
-import { retryClearScreenshotsForSession } from "./mcp/resources.js";
+import { clearScreenshotsForSession } from "./mcp/resources.js";
 
 // Store for all active sessions
 const store = new Map<string, StagehandSession>();
@@ -112,10 +112,16 @@ export const create = async (
     process.stderr.write(`[StagehandStore] Session disconnected: ${id}\n`);
     store.delete(id);
     // Purge by internal store ID and Browserbase session ID
-    retryClearScreenshotsForSession(id).catch(() => {});
-    const bbId = session.metadata?.bbSessionId;
-    if (bbId) {
-      retryClearScreenshotsForSession(bbId).catch(() => {});
+    try {
+      clearScreenshotsForSession(id);
+      const bbId = session.metadata?.bbSessionId;
+      if (bbId) {
+        clearScreenshotsForSession(bbId);
+      }
+    } catch {
+      process.stderr.write(
+        `[StagehandStore] Error clearing screenshots for session ${id}\n`,
+      );
     }
   };
 
@@ -166,10 +172,16 @@ export const remove = async (id: string): Promise<void> => {
     await session.stagehand.close();
     process.stderr.write(`[StagehandStore] Session closed: ${id}\n`);
     // Purge by internal store ID and Browserbase session ID
-    await retryClearScreenshotsForSession(id).catch(() => {});
-    const bbId = session.metadata?.bbSessionId;
-    if (bbId) {
-      await retryClearScreenshotsForSession(bbId).catch(() => {});
+    try {
+      clearScreenshotsForSession(id);
+      const bbId = session.metadata?.bbSessionId;
+      if (bbId) {
+        clearScreenshotsForSession(bbId);
+      }
+    } catch {
+      process.stderr.write(
+        `[StagehandStore] Error clearing screenshots for session ${id}\n`,
+      );
     }
   } catch (error) {
     process.stderr.write(