fix(browser): reset action counter for each agent session and let it ignore internal actions (#24228)

packages/core/src/agents/browser/automationOverlay.ts

@@ -94,6 +94,7 @@ export async function injectAutomationOverlay(
       'evaluate_script',
       { function: buildInjectionScript() },
       signal,
+      true,
     );
 
     if (result.isError) {
@@ -120,6 +121,7 @@ export async function removeAutomationOverlay(
       'evaluate_script',
       { function: buildRemovalScript() },
       signal,
+      true,
     );
 
     if (result.isError) {

packages/core/src/agents/browser/browserManager.test.ts

@@ -980,5 +980,29 @@ describe('BrowserManager', () => {
         /maximum action limit \(3\)/,
       );
     });
+
+    it('should NOT increment action counter when shouldCount is false', async () => {
+      const limitedConfig = makeFakeConfig({
+        agents: {
+          browser: {
+            maxActionsPerTask: 1,
+          },
+        },
+      });
+      const manager = new BrowserManager(limitedConfig);
+
+      // Multiple calls with isInternal: true should NOT exhaust the limit
+      await manager.callTool('evaluate_script', {}, undefined, true);
+      await manager.callTool('evaluate_script', {}, undefined, true);
+      await manager.callTool('evaluate_script', {}, undefined, true);
+
+      // This should still work
+      await manager.callTool('take_snapshot', {});
+
+      // Next one should throw (limit 1 allows exactly 1 call with >= check)
+      await expect(manager.callTool('take_snapshot', {})).rejects.toThrow(
+        /maximum action limit \(1\)/,
+      );
+    });
   });
 });

packages/core/src/agents/browser/browserManager.ts

@@ -215,26 +215,30 @@ export class BrowserManager {
    * @param toolName The name of the tool to call
    * @param args Arguments to pass to the tool
    * @param signal Optional AbortSignal to cancel the call
+   * @param isInternal Determine if the tool is for internal execution
    * @returns The result from the MCP server
    */
   async callTool(
     toolName: string,
     args: Record<string, unknown>,
     signal?: AbortSignal,
+    isInternal: boolean = false,
   ): Promise<McpToolCallResult> {
     if (signal?.aborted) {
       throw signal.reason ?? new Error('Operation cancelled');
     }
 
     // Hard enforcement of per-action rate limit
-    if (this.actionCounter > this.maxActionsPerTask) {
+    if (!isInternal) {
-      const error = new Error(
+      if (this.actionCounter >= this.maxActionsPerTask) {
-        `Browser agent reached maximum action limit (${this.maxActionsPerTask}). ` +
+        const error = new Error(
-          `Task terminated to prevent runaway execution. To config the limit, use maxActionsPerTask in the settings.`,
+          `Browser agent reached maximum action limit (${this.maxActionsPerTask}). ` +
-      );
+            `Task terminated to prevent runaway execution. To config the limit, use maxActionsPerTask in the settings.`,
-      throw error;
+        );
+        throw error;
+      }
+      this.actionCounter++;
     }
-    this.actionCounter++;
 
     const errorMessage = this.checkNavigationRestrictions(toolName, args);
     if (errorMessage) {
@@ -588,6 +592,8 @@ export class BrowserManager {
           debugLogger.log('MCP client connected to chrome-devtools-mcp');
           await this.discoverTools();
           this.registerInputBlockerHandler();
+          // clear the action counter for each connection
+          this.actionCounter = 0;
         })(),
         new Promise<never>((_, reject) => {
           timeoutId = setTimeout(

packages/core/src/agents/browser/inputBlocker.test.ts

@@ -34,6 +34,7 @@ describe('inputBlocker', () => {
           function: expect.stringContaining('__gemini_input_blocker'),
         },
         undefined,
+        true,
       );
     });
 
@@ -96,6 +97,7 @@ describe('inputBlocker', () => {
           function: expect.stringContaining('__gemini_input_blocker'),
         }),
         undefined,
+        true,
       );
       expect(mockBrowserManager.callTool).toHaveBeenNthCalledWith(
         2,
@@ -104,6 +106,7 @@ describe('inputBlocker', () => {
           function: expect.stringContaining('__gemini_input_blocker'),
         }),
         undefined,
+        true,
       );
     });
   });
@@ -118,6 +121,7 @@ describe('inputBlocker', () => {
           function: expect.stringContaining('__gemini_input_blocker'),
         },
         undefined,
+        true,
       );
     });
 
@@ -163,6 +167,7 @@ describe('inputBlocker', () => {
           function: expect.stringContaining('__gemini_input_blocker'),
         }),
         undefined,
+        true,
       );
       expect(mockBrowserManager.callTool).toHaveBeenNthCalledWith(
         2,
@@ -171,6 +176,7 @@ describe('inputBlocker', () => {
           function: expect.stringContaining('__gemini_input_blocker'),
         }),
         undefined,
+        true,
       );
     });
   });

packages/core/src/agents/browser/inputBlocker.ts

@@ -205,6 +205,7 @@ export async function injectInputBlocker(
       'evaluate_script',
       { function: INPUT_BLOCKER_FUNCTION },
       signal,
+      true,
     );
     debugLogger.log('Input blocker injected successfully');
   } catch (error) {
@@ -232,6 +233,7 @@ export async function removeInputBlocker(
       'evaluate_script',
       { function: REMOVE_BLOCKER_FUNCTION },
       signal,
+      true,
     );
     debugLogger.log('Input blocker removed successfully');
   } catch (error) {
@@ -257,6 +259,7 @@ export async function suspendInputBlocker(
       'evaluate_script',
       { function: SUSPEND_BLOCKER_FUNCTION },
       signal,
+      true,
     );
   } catch {
     // Non-critical — tool call will still attempt to proceed
@@ -276,6 +279,7 @@ export async function resumeInputBlocker(
       'evaluate_script',
       { function: RESUME_BLOCKER_FUNCTION },
       signal,
+      true,
     );
   } catch {
     // Non-critical

packages/core/src/agents/browser/mcpToolWrapper.test.ts

@@ -225,6 +225,7 @@ describe('mcpToolWrapper', () => {
           function: expect.stringContaining('__gemini_input_blocker'),
         }),
         expect.any(AbortSignal),
+        true,
       );
 
       // Second call: click
@@ -243,6 +244,7 @@ describe('mcpToolWrapper', () => {
           function: expect.stringContaining('__gemini_input_blocker'),
         }),
         expect.any(AbortSignal),
+        true,
       );
     });