@machina.ai/cell-cli-core 1.36.0-rc1 → 1.38.1-rc2

package/dist/src/agents/browser/browserAgentFactory.js

@@ -13,6 +13,8 @@ import { createAnalyzeScreenshotTool } from './analyzeScreenshot.js';
 import { injectAutomationOverlay } from './automationOverlay.js';
 import { injectInputBlocker } from './inputBlocker.js';
 import { debugLogger } from '../../utils/debugLogger.js';
+import { recordBrowserAgentToolDiscovery } from '../../telemetry/metrics.js';
+import { logBrowserAgentVisionStatus, logBrowserAgentCleanup, } from '../../telemetry/loggers.js';
 import { PolicyDecision, PRIORITY_SUBAGENT_TOOL, } from '../../policy/types.js';
 /**
  * Creates a browser agent definition with MCP tools configured.
@@ -26,161 +28,201 @@ import { PolicyDecision, PRIORITY_SUBAGENT_TOOL, } from '../../policy/types.js';
  * @param printOutput Optional callback for progress messages
  * @returns Fully configured LocalAgentDefinition with MCP tools
  */
-export async function createBrowserAgentDefinition(config, messageBus, printOutput) {
+export async function createBrowserAgentDefinition(config, messageBus, _printOutput) {
     debugLogger.log('Creating browser agent definition with isolated MCP tools...');
-    // Create and initialize browser manager with isolated MCP client
-    const browserManager = new BrowserManager(config);
-    await browserManager.ensureConnection();
-    if (printOutput) {
-        printOutput('Browser connected with isolated MCP client.');
-    }
-    // Determine if input blocker should be active (non-headless + enabled)
-    const shouldDisableInput = config.shouldDisableBrowserUserInput();
-    // Inject automation overlay and input blocker if not in headless mode
-    const browserConfig = config.getBrowserAgentConfig();
-    if (!browserConfig?.customConfig?.headless) {
-        if (printOutput) {
-            printOutput('Injecting automation overlay...');
+    // Get or create browser manager singleton for this session mode/profile
+    const browserManager = BrowserManager.getInstance(config);
+    browserManager.acquire();
+    try {
+        await browserManager.ensureConnection();
+        debugLogger.log('Browser connected with isolated MCP client.');
+        // Determine if input blocker should be active (non-headless + enabled)
+        const shouldDisableInput = config.shouldDisableBrowserUserInput();
+        // Inject automation overlay and input blocker if not in headless mode
+        const browserConfig = config.getBrowserAgentConfig();
+        if (!browserConfig?.customConfig?.headless) {
+            debugLogger.log('Injecting automation overlay...');
+            await injectAutomationOverlay(browserManager);
+            if (shouldDisableInput) {
+                debugLogger.log('Injecting input blocker...');
+                await injectInputBlocker(browserManager);
+            }
         }
-        await injectAutomationOverlay(browserManager);
-        if (shouldDisableInput) {
-            if (printOutput) {
-                printOutput('Injecting input blocker...');
+        // Create declarative tools from dynamically discovered MCP tools
+        // These tools dispatch to browserManager's isolated client
+        const mcpTools = await createMcpDeclarativeTools(browserManager, messageBus, shouldDisableInput, browserConfig.customConfig.blockFileUploads);
+        const availableToolNames = mcpTools.map((t) => t.name);
+        // Register high-priority policy rules for sensitive actions which is not
+        // able to be overwrite by YOLO mode.
+        const policyEngine = config.getPolicyEngine();
+        if (policyEngine) {
+            const existingRules = policyEngine.getRules();
+            const restrictedTools = ['fill', 'fill_form'];
+            // ASK_USER for upload_file and evaluate_script when sensitive action
+            // need confirmation.
+            if (browserConfig.customConfig.confirmSensitiveActions) {
+                restrictedTools.push('upload_file', 'evaluate_script');
+            }
+            for (const toolName of restrictedTools) {
+                const rule = generateAskUserRules(toolName);
+                if (!existingRules.some((r) => isRuleEqual(r, rule))) {
+                    policyEngine.addRule(rule);
+                }
+            }
+            // Reduce noise for read-only tools in default mode
+            const readOnlyTools = (await browserManager.getDiscoveredTools())
+                .filter((t) => !!t.annotations?.readOnlyHint)
+                .map((t) => t.name);
+            const allowlistedReadonlyTools = ['take_snapshot', 'take_screenshot'];
+            for (const toolName of [...readOnlyTools, ...allowlistedReadonlyTools]) {
+                if (availableToolNames.includes(toolName)) {
+                    const rule = generateAllowRules(toolName);
+                    if (!existingRules.some((r) => isRuleEqual(r, rule))) {
+                        policyEngine.addRule(rule);
+                    }
+                }
             }
-            await injectInputBlocker(browserManager);
         }
-    }
-    // Create declarative tools from dynamically discovered MCP tools
-    // These tools dispatch to browserManager's isolated client
-    const mcpTools = await createMcpDeclarativeTools(browserManager, messageBus, shouldDisableInput, browserConfig.customConfig.blockFileUploads);
-    const availableToolNames = mcpTools.map((t) => t.name);
-    // Register high-priority policy rules for sensitive actions which is not
-    // able to be overwrite by YOLO mode.
-    const policyEngine = config.getPolicyEngine();
-    if (policyEngine) {
-        const existingRules = policyEngine.getRules();
-        const restrictedTools = ['fill', 'fill_form'];
-        // ASK_USER for upload_file and evaluate_script when sensitive action
-        // need confirmation.
-        if (browserConfig.customConfig.confirmSensitiveActions) {
-            restrictedTools.push('upload_file', 'evaluate_script');
+        function generateAskUserRules(toolName) {
+            return {
+                toolName: `${MCP_TOOL_PREFIX}${BROWSER_AGENT_NAME}_${toolName}`,
+                decision: PolicyDecision.ASK_USER,
+                priority: 999,
+                source: 'BrowserAgent (Sensitive Actions)',
+                mcpName: BROWSER_AGENT_NAME,
+            };
         }
-        for (const toolName of restrictedTools) {
-            const rule = generateAskUserRules(toolName);
-            if (!existingRules.some((r) => isRuleEqual(r, rule))) {
-                policyEngine.addRule(rule);
-            }
+        function generateAllowRules(toolName) {
+            return {
+                toolName: `${MCP_TOOL_PREFIX}${BROWSER_AGENT_NAME}_${toolName}`,
+                decision: PolicyDecision.ALLOW,
+                priority: PRIORITY_SUBAGENT_TOOL,
+                source: 'BrowserAgent (Read-Only)',
+                mcpName: BROWSER_AGENT_NAME,
+            };
+        }
+        // Check if policy rule the same in all the attributes that we care about
+        function isRuleEqual(rule1, rule2) {
+            return (rule1.toolName === rule2.toolName &&
+                rule1.decision === rule2.decision &&
+                rule1.priority === rule2.priority &&
+                rule1.mcpName === rule2.mcpName);
         }
-        // Reduce noise for read-only tools in default mode
-        const readOnlyTools = [
+        // Validate required semantic tools are available
+        const requiredSemanticTools = [
+            'click',
+            'fill',
+            'navigate_page',
             'take_snapshot',
-            'take_screenshot',
-            'list_pages',
-            'list_network_requests',
         ];
-        for (const toolName of readOnlyTools) {
-            if (availableToolNames.includes(toolName)) {
-                const rule = generateAllowRules(toolName);
-                if (!existingRules.some((r) => isRuleEqual(r, rule))) {
-                    policyEngine.addRule(rule);
-                }
+        const missingSemanticTools = requiredSemanticTools.filter((t) => !availableToolNames.includes(t));
+        const rawSessionMode = browserConfig?.customConfig?.sessionMode;
+        const sessionMode = rawSessionMode === 'isolated' || rawSessionMode === 'existing'
+            ? rawSessionMode
+            : 'persistent';
+        recordBrowserAgentToolDiscovery(config, mcpTools.length, missingSemanticTools, sessionMode);
+        if (missingSemanticTools.length > 0) {
+            debugLogger.warn(`Semantic tools missing (${missingSemanticTools.join(', ')}). ` +
+                'Some browser interactions may not work correctly.');
+        }
+        // Only click_at is strictly required — text input can use press_key or fill.
+        const requiredVisualTools = ['click_at'];
+        const missingVisualTools = requiredVisualTools.filter((t) => !availableToolNames.includes(t));
+        // Check whether vision can be enabled; returns structured type with code and message.
+        function getVisionDisabledReason() {
+            const browserConfig = config.getBrowserAgentConfig();
+            if (!browserConfig.customConfig.visualModel) {
+                return {
+                    code: 'no_visual_model',
+                    message: 'No visualModel configured.',
+                };
+            }
+            if (missingVisualTools.length > 0) {
+                return {
+                    code: 'missing_visual_tools',
+                    message: `Visual tools missing (${missingVisualTools.join(', ')}). ` +
+                        `The installed chrome-devtools-mcp version may be too old.`,
+                };
+            }
+            const authType = config.getContentGeneratorConfig()?.authType;
+            const blockedAuthTypes = new Set([
+                AuthType.LOGIN_WITH_GOOGLE,
+                AuthType.LEGACY_CLOUD_SHELL,
+                AuthType.COMPUTE_ADC,
+            ]);
+            if (authType && blockedAuthTypes.has(authType)) {
+                return {
+                    code: 'blocked_auth_type',
+                    message: 'Visual agent model not available for current auth type.',
+                };
             }
+            return undefined;
         }
-    }
-    function generateAskUserRules(toolName) {
-        return {
-            toolName: `${MCP_TOOL_PREFIX}${BROWSER_AGENT_NAME}_${toolName}`,
-            decision: PolicyDecision.ASK_USER,
-            priority: 999,
-            source: 'BrowserAgent (Sensitive Actions)',
-            mcpName: BROWSER_AGENT_NAME,
+        const allTools = [...mcpTools];
+        const visionDisabledReason = getVisionDisabledReason();
+        logBrowserAgentVisionStatus(config, {
+            enabled: !visionDisabledReason,
+            disabled_reason: visionDisabledReason?.code,
+        });
+        if (visionDisabledReason) {
+            debugLogger.log(`Vision disabled: ${visionDisabledReason.message}`);
+        }
+        else {
+            allTools.push(createAnalyzeScreenshotTool(browserManager, config, messageBus));
+        }
+        debugLogger.log(`Created ${allTools.length} tools for browser agent: ` +
+            allTools.map((t) => t.name).join(', '));
+        // Create configured definition with tools
+        // BrowserAgentDefinition is a factory function - call it with config
+        const baseDefinition = BrowserAgentDefinition(config, !visionDisabledReason);
+        const definition = {
+            ...baseDefinition,
+            toolConfig: {
+                tools: allTools,
+            },
         };
-    }
-    function generateAllowRules(toolName) {
         return {
-            toolName: `${MCP_TOOL_PREFIX}${BROWSER_AGENT_NAME}_${toolName}`,
-            decision: PolicyDecision.ALLOW,
-            priority: PRIORITY_SUBAGENT_TOOL,
-            source: 'BrowserAgent (Read-Only)',
-            mcpName: BROWSER_AGENT_NAME,
+            definition,
+            browserManager,
+            visionEnabled: !visionDisabledReason,
+            sessionMode,
         };
     }
-    // Check if policy rule the same in all the attributes that we care about
-    function isRuleEqual(rule1, rule2) {
-        return (rule1.toolName === rule2.toolName &&
-            rule1.decision === rule2.decision &&
-            rule1.priority === rule2.priority &&
-            rule1.mcpName === rule2.mcpName);
-    }
-    // Validate required semantic tools are available
-    const requiredSemanticTools = [
-        'click',
-        'fill',
-        'navigate_page',
-        'take_snapshot',
-    ];
-    const missingSemanticTools = requiredSemanticTools.filter((t) => !availableToolNames.includes(t));
-    if (missingSemanticTools.length > 0) {
-        debugLogger.warn(`Semantic tools missing (${missingSemanticTools.join(', ')}). ` +
-            'Some browser interactions may not work correctly.');
-    }
-    // Only click_at is strictly required — text input can use press_key or fill.
-    const requiredVisualTools = ['click_at'];
-    const missingVisualTools = requiredVisualTools.filter((t) => !availableToolNames.includes(t));
-    // Check whether vision can be enabled; returns undefined if all gates pass.
-    function getVisionDisabledReason() {
-        const browserConfig = config.getBrowserAgentConfig();
-        if (!browserConfig.customConfig.visualModel) {
-            return 'No visualModel configured.';
-        }
-        if (missingVisualTools.length > 0) {
-            return (`Visual tools missing (${missingVisualTools.join(', ')}). ` +
-                `The installed chrome-devtools-mcp version may be too old.`);
-        }
-        const authType = config.getContentGeneratorConfig()?.authType;
-        const blockedAuthTypes = new Set([
-            AuthType.LOGIN_WITH_GOOGLE,
-            AuthType.LEGACY_CLOUD_SHELL,
-            AuthType.COMPUTE_ADC,
-        ]);
-        if (authType && blockedAuthTypes.has(authType)) {
-            return 'Visual agent model not available for current auth type.';
-        }
-        return undefined;
-    }
-    const allTools = [...mcpTools];
-    const visionDisabledReason = getVisionDisabledReason();
-    if (visionDisabledReason) {
-        debugLogger.log(`Vision disabled: ${visionDisabledReason}`);
-    }
-    else {
-        allTools.push(createAnalyzeScreenshotTool(browserManager, config, messageBus));
+    catch (error) {
+        // Release the browser manager if setup fails, so concurrent tasks can try again.
+        browserManager.release();
+        throw error;
     }
-    debugLogger.log(`Created ${allTools.length} tools for browser agent: ` +
-        allTools.map((t) => t.name).join(', '));
-    // Create configured definition with tools
-    // BrowserAgentDefinition is a factory function - call it with config
-    const baseDefinition = BrowserAgentDefinition(config, !visionDisabledReason);
-    const definition = {
-        ...baseDefinition,
-        toolConfig: {
-            tools: allTools,
-        },
-    };
-    return { definition, browserManager };
 }
 /**
- * Cleans up browser resources after agent execution.
+ * Closes all persistent browser sessions and cleans up resources.
  *
  * @param browserManager The browser manager to clean up
+ * @param config Runtime configuration
+ * @param sessionMode The browser session mode
  */
-export async function cleanupBrowserAgent(browserManager) {
+export async function cleanupBrowserAgent(browserManager, config, sessionMode) {
+    const startMs = Date.now();
     try {
         await browserManager.close();
+        logBrowserAgentCleanup(config, Date.now() - startMs, {
+            session_mode: sessionMode,
+            success: true,
+        });
         debugLogger.log('Browser agent cleanup complete');
     }
     catch (error) {
+        logBrowserAgentCleanup(config, Date.now() - startMs, {
+            session_mode: sessionMode,
+            success: false,
+        });
         debugLogger.error(`Error during browser cleanup: ${error instanceof Error ? error.message : String(error)}`);
     }
 }
+/**
+ * Call this on /clear commands and CLI exit to reset browser state.
+ */
+export async function resetBrowserSession() {
+    await BrowserManager.resetAll();
+}
 //# sourceMappingURL=browserAgentFactory.js.map

package/dist/src/agents/browser/browserAgentFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"browserAgentFactory.js","sourceRoot":"","sources":["../../../../src/agents/browser/browserAgentFactory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"browserAgentFactory.js","sourceRoot":"","sources":["../../../../src/agents/browser/browserAgentFactory.ts"],"names":[],"mappings":"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"}

package/dist/src/agents/browser/browserAgentFactory.test.js

@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { createBrowserAgentDefinition, cleanupBrowserAgent, } from './browserAgentFactory.js';
+import { createBrowserAgentDefinition, cleanupBrowserAgent, resetBrowserSession, } from './browserAgentFactory.js';
 import { injectAutomationOverlay } from './automationOverlay.js';
 import { makeFakeConfig } from '../../test-utils/config.js';
 import { PolicyDecision, PRIORITY_SUBAGENT_TOOL } from '../../policy/types.js';
+import { recordBrowserAgentToolDiscovery, recordBrowserAgentVisionStatus, recordBrowserAgentCleanup, } from '../../telemetry/metrics.js';
 // Create mock browser manager
 const mockBrowserManager = {
     ensureConnection: vi.fn().mockResolvedValue(undefined),
@@ -23,11 +24,21 @@ const mockBrowserManager = {
     ]),
     callTool: vi.fn().mockResolvedValue({ content: [] }),
     close: vi.fn().mockResolvedValue(undefined),
+    acquire: vi.fn(),
+    release: vi.fn(),
 };
 // Mock dependencies
-vi.mock('./browserManager.js', () => ({
-    BrowserManager: vi.fn(() => mockBrowserManager),
-}));
+vi.mock('./browserManager.js', () => {
+    const instancesMap = new Map();
+    const MockBrowserManager = vi.fn();
+    // Add static methods — use mockImplementation for lazy eval (hoisting-safe)
+    MockBrowserManager['getInstance'] = vi.fn();
+    MockBrowserManager['resetAll'] = vi.fn().mockResolvedValue(undefined);
+    MockBrowserManager['instances'] = instancesMap;
+    return {
+        BrowserManager: MockBrowserManager,
+    };
+});
 vi.mock('./automationOverlay.js', () => ({
     injectAutomationOverlay: vi.fn().mockResolvedValue(undefined),
 }));
@@ -38,12 +49,21 @@ vi.mock('../../utils/debugLogger.js', () => ({
         error: vi.fn(),
     },
 }));
+vi.mock('../../telemetry/metrics.js', () => ({
+    recordBrowserAgentToolDiscovery: vi.fn(),
+    recordBrowserAgentVisionStatus: vi.fn(),
+    recordBrowserAgentCleanup: vi.fn(),
+}));
 import { buildBrowserSystemPrompt, BROWSER_AGENT_NAME, } from './browserAgentDefinition.js';
 describe('browserAgentFactory', () => {
     let mockConfig;
     let mockMessageBus;
-    beforeEach(() => {
+    beforeEach(async () => {
         vi.clearAllMocks();
+        // Set up getInstance to return mockBrowserManager
+        // (Can't do this in vi.mock factory due to hoisting)
+        const { BrowserManager: MockBM } = await import('./browserManager.js');
+        MockBM['getInstance'].mockReturnValue(mockBrowserManager);
         vi.mocked(injectAutomationOverlay).mockClear();
         // Reset mock implementations
         mockBrowserManager.ensureConnection.mockResolvedValue(undefined);
@@ -76,7 +96,7 @@ describe('browserAgentFactory', () => {
             unsubscribe: vi.fn(),
         };
     });
-    afterEach(() => {
+    afterEach(async () => {
         vi.restoreAllMocks();
     });
     describe('createBrowserAgentDefinition', () => {
@@ -114,10 +134,10 @@ describe('browserAgentFactory', () => {
             const { browserManager } = await createBrowserAgentDefinition(mockConfig, mockMessageBus);
             expect(browserManager).toBeDefined();
         });
-        it('should call printOutput when provided', async () => {
+        it('should not call printOutput for internal setup messages', async () => {
             const printOutput = vi.fn();
             await createBrowserAgentDefinition(mockConfig, mockMessageBus, printOutput);
-            expect(printOutput).toHaveBeenCalled();
+            expect(printOutput).not.toHaveBeenCalled();
         });
         it('should create definition with correct structure', async () => {
             const { definition } = await createBrowserAgentDefinition(mockConfig, mockMessageBus);
@@ -150,6 +170,7 @@ describe('browserAgentFactory', () => {
             const systemPrompt = definition.promptConfig?.systemPrompt ?? '';
             expect(systemPrompt).toContain('analyze_screenshot');
             expect(systemPrompt).toContain('VISUAL IDENTIFICATION');
+            expect(recordBrowserAgentVisionStatus).toHaveBeenCalledWith(configWithVision, { enabled: true, disabled_reason: undefined });
         });
         it('should include analyze_screenshot tool when visualModel is configured', async () => {
             const configWithVision = makeFakeConfig({
@@ -215,6 +236,40 @@ describe('browserAgentFactory', () => {
             // Total: 9 MCP + 1 type_text (no analyze_screenshot without visualModel)
             expect(definition.toolConfig?.tools).toHaveLength(10);
         });
+        it('should trigger telemetry recording for tool discovery', async () => {
+            const configWithVision = makeFakeConfig({
+                agents: {
+                    overrides: { browser_agent: { enabled: true } },
+                    browser: { headless: false, visualModel: 'gemini-2.5-flash-preview' },
+                },
+            });
+            await createBrowserAgentDefinition(configWithVision, mockMessageBus);
+            expect(recordBrowserAgentToolDiscovery).toHaveBeenCalledWith(configWithVision, 6, // 6 mock tools from getDiscoveredTools
+            [], // Empty because all required semantic tools present
+            'persistent');
+        });
+        it('should trigger telemetry recording for missing semantic tools', async () => {
+            mockBrowserManager.getDiscoveredTools.mockResolvedValueOnce([
+                { name: 'take_snapshot', description: 'Take snapshot' },
+                // 'click', 'fill', 'navigate_page' are missing
+            ]);
+            const configWithVision = makeFakeConfig({
+                agents: {
+                    overrides: { browser_agent: { enabled: true } },
+                    browser: { headless: false, visualModel: 'gemini-2.5-flash-preview' },
+                },
+            });
+            await createBrowserAgentDefinition(configWithVision, mockMessageBus);
+            expect(recordBrowserAgentToolDiscovery).toHaveBeenCalledWith(configWithVision, 1, // 1 mock tool from getDiscoveredTools
+            ['click', 'fill', 'navigate_page'], 'persistent');
+        });
+    });
+    describe('resetBrowserSession', () => {
+        it('should delegate to BrowserManager.resetAll', async () => {
+            const { BrowserManager: MockBrowserManager } = await import('./browserManager.js');
+            await resetBrowserSession();
+            expect(MockBrowserManager['resetAll']).toHaveBeenCalled();
+        });
     });
     describe('Policy Registration', () => {
         let mockPolicyEngine;
@@ -264,9 +319,19 @@ describe('browserAgentFactory', () => {
         });
         it('should register ALLOW rules for read-only tools', async () => {
             mockBrowserManager.getDiscoveredTools.mockResolvedValue([
-                { name: 'take_snapshot', description: 'Take snapshot' },
-                { name: 'take_screenshot', description: 'Take screenshot' },
-                { name: 'list_pages', description: 'list all pages' },
+                {
+                    name: 'take_snapshot',
+                    description: 'Take snapshot',
+                },
+                {
+                    name: 'take_screenshot',
+                    description: 'Take screenshot',
+                },
+                {
+                    name: 'list_pages',
+                    description: 'list all pages',
+                    annotations: { readOnlyHint: true },
+                },
             ]);
             await createBrowserAgentDefinition(mockConfig, mockMessageBus);
             expect(mockPolicyEngine.addRule).toHaveBeenCalledWith(expect.objectContaining({
@@ -288,15 +353,35 @@ describe('browserAgentFactory', () => {
     });
     describe('cleanupBrowserAgent', () => {
         it('should call close on browser manager', async () => {
-            await cleanupBrowserAgent(mockBrowserManager);
+            const mockConfig = makeFakeConfig({});
+            await cleanupBrowserAgent(mockBrowserManager, mockConfig, 'persistent');
             expect(mockBrowserManager.close).toHaveBeenCalled();
         });
         it('should handle errors during cleanup gracefully', async () => {
             const errorManager = {
                 close: vi.fn().mockRejectedValue(new Error('Close failed')),
             };
+            const mockConfig = makeFakeConfig({});
             // Should not throw
-            await expect(cleanupBrowserAgent(errorManager)).resolves.toBeUndefined();
+            await expect(cleanupBrowserAgent(errorManager, mockConfig, 'persistent')).resolves.toBeUndefined();
+        });
+        it('should record successful cleanup metrics', async () => {
+            const mockConfig = makeFakeConfig({});
+            await cleanupBrowserAgent(mockBrowserManager, mockConfig, 'isolated');
+            expect(mockBrowserManager.close).toHaveBeenCalled();
+            expect(recordBrowserAgentCleanup).toHaveBeenCalledWith(mockConfig, expect.any(Number), {
+                session_mode: 'isolated',
+                success: true,
+            });
+        });
+        it('should record failed cleanup metrics when browserManager.close() throws', async () => {
+            const mockConfig = makeFakeConfig({});
+            mockBrowserManager.close.mockRejectedValueOnce(new Error('Failed to close'));
+            await cleanupBrowserAgent(mockBrowserManager, mockConfig, 'existing');
+            expect(recordBrowserAgentCleanup).toHaveBeenCalledWith(mockConfig, expect.any(Number), {
+                session_mode: 'existing',
+                success: false,
+            });
         });
     });
 });
@@ -332,6 +417,7 @@ describe('buildBrowserSystemPrompt', () => {
         expect(prompt).toContain('SECURITY DOMAIN RESTRICTION - CRITICAL:');
         expect(prompt).toContain('- github.com');
         expect(prompt).toContain('- *.google.com');
+        expect(prompt).toContain('Do NOT use proxy services');
     });
     it('should exclude allowed domains restriction when not provided or empty', () => {
         let prompt = buildBrowserSystemPrompt(false);