@jackwener/opencli 0.4.2 → 0.4.4

package/dist/browser.js

@@ -1,13 +1,76 @@
 /**
- * Browser interaction via Playwright MCP Bridge extension.
- * Connects to an existing Chrome browser through the extension's stdio JSON-RPC.
+ * Browser interaction via Chrome DevTools Protocol.
+ * Connects to an existing Chrome browser through CDP auto-discovery or extension bridge.
  */
 import { spawn, execSync } from 'node:child_process';
+import { createHash } from 'node:crypto';
+import * as net from 'node:net';
 import { fileURLToPath } from 'node:url';
 import * as fs from 'node:fs';
 import * as os from 'node:os';
 import * as path from 'node:path';
 import { formatSnapshot } from './snapshotFormatter.js';
+/**
+ * Chrome 144+ auto-discovery: read DevToolsActivePort file to get CDP endpoint.
+ *
+ * Starting with Chrome 144, users can enable remote debugging from
+ * chrome://inspect#remote-debugging without any command-line flags.
+ * Chrome writes the active port and browser GUID to a DevToolsActivePort file
+ * in the user data directory, which we read to construct the WebSocket endpoint.
+ *
+ * Priority: OPENCLI_CDP_ENDPOINT env > DevToolsActivePort auto-discovery > --extension fallback
+ */
+/** Quick TCP port probe to verify Chrome is actually listening */
+function isPortReachable(port, host = '127.0.0.1', timeoutMs = 800) {
+    return new Promise(resolve => {
+        const sock = net.createConnection({ port, host });
+        sock.setTimeout(timeoutMs);
+        sock.on('connect', () => { sock.destroy(); resolve(true); });
+        sock.on('error', () => resolve(false));
+        sock.on('timeout', () => { sock.destroy(); resolve(false); });
+    });
+}
+export async function discoverChromeEndpoint() {
+    const candidates = [];
+    // User-specified Chrome data dir takes highest priority
+    if (process.env.CHROME_USER_DATA_DIR) {
+        candidates.push(path.join(process.env.CHROME_USER_DATA_DIR, 'DevToolsActivePort'));
+    }
+    // Standard Chrome/Edge user data dirs per platform
+    if (process.platform === 'win32') {
+        const localAppData = process.env.LOCALAPPDATA ?? path.join(os.homedir(), 'AppData', 'Local');
+        candidates.push(path.join(localAppData, 'Google', 'Chrome', 'User Data', 'DevToolsActivePort'));
+        candidates.push(path.join(localAppData, 'Microsoft', 'Edge', 'User Data', 'DevToolsActivePort'));
+    }
+    else if (process.platform === 'darwin') {
+        candidates.push(path.join(os.homedir(), 'Library', 'Application Support', 'Google', 'Chrome', 'DevToolsActivePort'));
+        candidates.push(path.join(os.homedir(), 'Library', 'Application Support', 'Microsoft Edge', 'DevToolsActivePort'));
+    }
+    else {
+        candidates.push(path.join(os.homedir(), '.config', 'google-chrome', 'DevToolsActivePort'));
+        candidates.push(path.join(os.homedir(), '.config', 'chromium', 'DevToolsActivePort'));
+        candidates.push(path.join(os.homedir(), '.config', 'microsoft-edge', 'DevToolsActivePort'));
+    }
+    for (const filePath of candidates) {
+        try {
+            const content = fs.readFileSync(filePath, 'utf-8').trim();
+            const lines = content.split('\n');
+            if (lines.length >= 2) {
+                const port = parseInt(lines[0], 10);
+                const browserPath = lines[1]; // e.g. /devtools/browser/<GUID>
+                if (port > 0 && browserPath.startsWith('/devtools/browser/')) {
+                    const endpoint = `ws://127.0.0.1:${port}${browserPath}`;
+                    // Verify the port is actually reachable (Chrome may have closed, leaving a stale file)
+                    if (await isPortReachable(port)) {
+                        return endpoint;
+                    }
+                }
+            }
+        }
+        catch { }
+    }
+    return null;
+}
 // Read version from package.json (single source of truth)
 const __browser_dirname = path.dirname(fileURLToPath(import.meta.url));
 const PKG_VERSION = (() => { try {
@@ -16,28 +79,90 @@ const PKG_VERSION = (() => { try {
 catch {
     return '0.0.0';
 } })();
-const EXTENSION_LOCK_TIMEOUT = parseInt(process.env.OPENCLI_EXTENSION_LOCK_TIMEOUT ?? '120', 10);
-const EXTENSION_LOCK_POLL = parseInt(process.env.OPENCLI_EXTENSION_LOCK_POLL_INTERVAL ?? '1', 10);
 const CONNECT_TIMEOUT = parseInt(process.env.OPENCLI_BROWSER_CONNECT_TIMEOUT ?? '30', 10);
-const LOCK_DIR = path.join(os.tmpdir(), 'opencli-mcp-lock');
+const STDERR_BUFFER_LIMIT = 16 * 1024;
+const TAB_CLEANUP_TIMEOUT_MS = 2000;
+let _cachedMcpServerPath;
+export function getTokenFingerprint(token) {
+    if (!token)
+        return null;
+    return createHash('sha256').update(token).digest('hex').slice(0, 8);
+}
+export function formatBrowserConnectError(input) {
+    const stderr = input.stderr?.trim();
+    const suffix = stderr ? `\n\nMCP stderr:\n${stderr}` : '';
+    const tokenHint = input.tokenFingerprint ? ` Token fingerprint: ${input.tokenFingerprint}.` : '';
+    if (input.mode === 'extension') {
+        if (input.kind === 'missing-token') {
+            return new Error('Failed to connect to Playwright MCP Bridge: PLAYWRIGHT_MCP_EXTENSION_TOKEN is not set.\n\n' +
+                'Without this token, Chrome will show a manual approval dialog for every new MCP connection. ' +
+                'Copy the token from the Playwright MCP Bridge extension and set it in BOTH your shell environment and MCP client config.' +
+                suffix);
+        }
+        if (input.kind === 'extension-not-installed') {
+            return new Error('Failed to connect to Playwright MCP Bridge: the browser extension did not attach.\n\n' +
+                'Make sure Chrome is running and the "Playwright MCP Bridge" extension is installed and enabled. ' +
+                'If Chrome shows an approval dialog, click Allow.' +
+                suffix);
+        }
+        if (input.kind === 'extension-timeout') {
+            const likelyCause = input.hasExtensionToken
+                ? `The most likely cause is that PLAYWRIGHT_MCP_EXTENSION_TOKEN does not match the token currently shown by the browser extension.${tokenHint} Re-copy the token from the extension and update BOTH your shell environment and MCP client config.`
+                : 'PLAYWRIGHT_MCP_EXTENSION_TOKEN is not configured, so the extension may be waiting for manual approval.';
+            return new Error(`Timed out connecting to Playwright MCP Bridge (${input.timeout}s).\n\n` +
+                `${likelyCause} If a browser prompt is visible, click Allow. You can also switch to Chrome remote debugging mode with OPENCLI_USE_CDP=1 as a fallback.` +
+                suffix);
+        }
+    }
+    if (input.mode === 'cdp' && input.kind === 'cdp-timeout') {
+        return new Error(`Timed out connecting to browser via CDP (${input.timeout}s).\n\n` +
+            'Make sure Chrome is running and remote debugging is enabled at chrome://inspect#remote-debugging, or set OPENCLI_CDP_ENDPOINT explicitly.' +
+            suffix);
+    }
+    if (input.kind === 'mcp-init') {
+        return new Error(`Failed to initialize Playwright MCP: ${input.rawMessage ?? 'unknown error'}${suffix}`);
+    }
+    if (input.kind === 'process-exit') {
+        return new Error(`Playwright MCP process exited before the browser connection was established${input.exitCode == null ? '' : ` (code ${input.exitCode})`}.` +
+            suffix);
+    }
+    return new Error(input.rawMessage ?? 'Failed to connect to browser');
+}
+function inferConnectFailureKind(args) {
+    const haystack = `${args.rawMessage ?? ''}\n${args.stderr}`.toLowerCase();
+    if (args.mode === 'extension' && !args.hasExtensionToken)
+        return 'missing-token';
+    if (haystack.includes('extension connection timeout') || haystack.includes('playwright mcp bridge'))
+        return 'extension-not-installed';
+    if (args.rawMessage?.startsWith('MCP init failed:'))
+        return 'mcp-init';
+    if (args.exited)
+        return 'process-exit';
+    if (args.mode === 'extension')
+        return 'extension-timeout';
+    if (args.mode === 'cdp')
+        return 'cdp-timeout';
+    return 'unknown';
+}
 // JSON-RPC helpers
 let _nextId = 1;
-function jsonRpcRequest(method, params = {}) {
-    return JSON.stringify({ jsonrpc: '2.0', id: _nextId++, method, params }) + '\n';
+function createJsonRpcRequest(method, params = {}) {
+    const id = _nextId++;
+    return {
+        id,
+        message: JSON.stringify({ jsonrpc: '2.0', id, method, params }) + '\n',
+    };
 }
 /**
  * Page abstraction wrapping JSON-RPC calls to Playwright MCP.
  */
 export class Page {
-    _send;
-    _recv;
-    constructor(_send, _recv) {
-        this._send = _send;
-        this._recv = _recv;
+    _request;
+    constructor(_request) {
+        this._request = _request;
     }
     async call(method, params = {}) {
-        this._send(jsonRpcRequest(method, params));
-        const resp = await this._recv();
+        const resp = await this._request(method, params);
         if (resp.error)
             throw new Error(`page.${method}: ${resp.error.message ?? JSON.stringify(resp.error)}`);
         // Extract text content from MCP result
@@ -227,34 +352,172 @@ export class Page {
  * Playwright MCP process manager.
  */
 export class PlaywrightMCP {
+    static _activeInsts = new Set();
+    static _cleanupRegistered = false;
+    static _registerGlobalCleanup() {
+        if (this._cleanupRegistered)
+            return;
+        this._cleanupRegistered = true;
+        const cleanup = () => {
+            for (const inst of this._activeInsts) {
+                if (inst._proc && !inst._proc.killed) {
+                    try {
+                        inst._proc.kill('SIGKILL');
+                    }
+                    catch { }
+                }
+            }
+        };
+        process.on('exit', cleanup);
+        process.on('SIGINT', () => { cleanup(); process.exit(130); });
+        process.on('SIGTERM', () => { cleanup(); process.exit(143); });
+    }
     _proc = null;
     _buffer = '';
-    _waiters = [];
-    _lockAcquired = false;
-    _initialTabCount = 0;
+    _pending = new Map();
+    _initialTabIdentities = [];
+    _closingPromise = null;
+    _state = 'idle';
     _page = null;
+    get state() {
+        return this._state;
+    }
+    _sendRequest(method, params = {}) {
+        return new Promise((resolve, reject) => {
+            if (!this._proc?.stdin?.writable) {
+                reject(new Error('Playwright MCP process is not writable'));
+                return;
+            }
+            const { id, message } = createJsonRpcRequest(method, params);
+            this._pending.set(id, { resolve, reject });
+            this._proc.stdin.write(message, (err) => {
+                if (!err)
+                    return;
+                this._pending.delete(id);
+                reject(err);
+            });
+        });
+    }
+    _rejectPendingRequests(error) {
+        const pending = [...this._pending.values()];
+        this._pending.clear();
+        for (const waiter of pending)
+            waiter.reject(error);
+    }
+    _resetAfterFailedConnect() {
+        const proc = this._proc;
+        this._page = null;
+        this._proc = null;
+        this._buffer = '';
+        this._initialTabIdentities = [];
+        this._rejectPendingRequests(new Error('Playwright MCP connect failed'));
+        PlaywrightMCP._activeInsts.delete(this);
+        if (proc && !proc.killed) {
+            try {
+                proc.kill('SIGKILL');
+            }
+            catch { }
+        }
+    }
     async connect(opts = {}) {
-        await this._acquireLock();
-        const timeout = opts.timeout ?? CONNECT_TIMEOUT;
+        if (this._state === 'connected' && this._page)
+            return this._page;
+        if (this._state === 'connecting')
+            throw new Error('Playwright MCP is already connecting');
+        if (this._state === 'closing')
+            throw new Error('Playwright MCP is closing');
+        if (this._state === 'closed')
+            throw new Error('Playwright MCP session is closed');
         const mcpPath = findMcpServerPath();
         if (!mcpPath)
             throw new Error('Playwright MCP server not found. Install: npm install -D @playwright/mcp');
+        PlaywrightMCP._registerGlobalCleanup();
+        PlaywrightMCP._activeInsts.add(this);
+        this._state = 'connecting';
+        const timeout = opts.timeout ?? CONNECT_TIMEOUT;
+        // Connection priority:
+        // 1. OPENCLI_CDP_ENDPOINT env var → explicit CDP endpoint
+        // 2. OPENCLI_USE_CDP=1 → auto-discover via DevToolsActivePort
+        // 3. Default → --extension mode (Playwright MCP Bridge)
+        // Some anti-bot sites (e.g. BOSS Zhipin) detect CDP — use forceExtension to bypass.
+        const forceExt = opts.forceExtension || process.env.OPENCLI_FORCE_EXTENSION === '1';
+        let cdpEndpoint = null;
+        if (!forceExt) {
+            if (process.env.OPENCLI_CDP_ENDPOINT) {
+                cdpEndpoint = process.env.OPENCLI_CDP_ENDPOINT;
+            }
+            else if (process.env.OPENCLI_USE_CDP === '1') {
+                cdpEndpoint = await discoverChromeEndpoint();
+            }
+        }
         return new Promise((resolve, reject) => {
-            const timer = setTimeout(() => reject(new Error(`Timed out connecting to browser (${timeout}s)`)), timeout * 1000);
-            const mcpArgs = [mcpPath, '--extension'];
+            const isDebug = process.env.DEBUG?.includes('opencli:mcp');
+            const debugLog = (msg) => isDebug && console.error(`[opencli:mcp] ${msg}`);
+            const mode = cdpEndpoint ? 'cdp' : 'extension';
+            const extensionToken = process.env.PLAYWRIGHT_MCP_EXTENSION_TOKEN;
+            const tokenFingerprint = getTokenFingerprint(extensionToken);
+            let stderrBuffer = '';
+            let settled = false;
+            const settleError = (kind, extra = {}) => {
+                if (settled)
+                    return;
+                settled = true;
+                this._state = 'idle';
+                clearTimeout(timer);
+                this._resetAfterFailedConnect();
+                reject(formatBrowserConnectError({
+                    kind,
+                    mode,
+                    timeout,
+                    hasExtensionToken: !!extensionToken,
+                    tokenFingerprint,
+                    stderr: stderrBuffer,
+                    exitCode: extra.exitCode,
+                    rawMessage: extra.rawMessage,
+                }));
+            };
+            const settleSuccess = (pageToResolve) => {
+                if (settled)
+                    return;
+                settled = true;
+                this._state = 'connected';
+                clearTimeout(timer);
+                resolve(pageToResolve);
+            };
+            const timer = setTimeout(() => {
+                debugLog('Connection timed out');
+                settleError(inferConnectFailureKind({
+                    mode,
+                    hasExtensionToken: !!extensionToken,
+                    stderr: stderrBuffer,
+                }));
+            }, timeout * 1000);
+            const mcpArgs = [mcpPath];
+            if (cdpEndpoint) {
+                mcpArgs.push('--cdp-endpoint', cdpEndpoint);
+            }
+            else {
+                mcpArgs.push('--extension');
+            }
+            if (process.env.OPENCLI_VERBOSE) {
+                console.error(`[opencli] CDP mode: ${cdpEndpoint ? `auto-discovered ${cdpEndpoint}` : 'fallback to --extension'}`);
+                if (mode === 'extension') {
+                    console.error(`[opencli] Extension token: ${extensionToken ? `configured (fingerprint ${tokenFingerprint})` : 'missing'}`);
+                }
+            }
             if (process.env.OPENCLI_BROWSER_EXECUTABLE_PATH) {
                 mcpArgs.push('--executablePath', process.env.OPENCLI_BROWSER_EXECUTABLE_PATH);
             }
+            debugLog(`Spawning node ${mcpArgs.join(' ')}`);
             this._proc = spawn('node', mcpArgs, {
                 stdio: ['pipe', 'pipe', 'pipe'],
-                env: { ...process.env, ...(process.env.PLAYWRIGHT_MCP_EXTENSION_TOKEN ? { PLAYWRIGHT_MCP_EXTENSION_TOKEN: process.env.PLAYWRIGHT_MCP_EXTENSION_TOKEN } : {}) },
+                env: { ...process.env },
             });
             // Increase max listeners to avoid warnings
             this._proc.setMaxListeners(20);
             if (this._proc.stdout)
                 this._proc.stdout.setMaxListeners(20);
-            const page = new Page((msg) => { if (this._proc?.stdin?.writable)
-                this._proc.stdin.write(msg); }, () => new Promise((res) => { this._waiters.push(res); }));
+            const page = new Page((method, params = {}) => this._sendRequest(method, params));
             this._page = page;
             this._proc.stdout?.on('data', (chunk) => {
                 this._buffer += chunk.toString();
@@ -263,122 +526,232 @@ export class PlaywrightMCP {
                 for (const line of lines) {
                     if (!line.trim())
                         continue;
+                    debugLog(`RECV: ${line}`);
                     try {
                         const parsed = JSON.parse(line);
-                        const waiter = this._waiters.shift();
-                        if (waiter)
-                            waiter(parsed);
+                        if (typeof parsed?.id === 'number') {
+                            const waiter = this._pending.get(parsed.id);
+                            if (waiter) {
+                                this._pending.delete(parsed.id);
+                                waiter.resolve(parsed);
+                            }
+                        }
+                    }
+                    catch (e) {
+                        debugLog(`Parse error: ${e}`);
                     }
-                    catch { }
                 }
             });
-            this._proc.stderr?.on('data', () => { });
-            this._proc.on('error', (err) => { clearTimeout(timer); reject(err); });
+            this._proc.stderr?.on('data', (chunk) => {
+                const text = chunk.toString();
+                stderrBuffer = appendLimited(stderrBuffer, text, STDERR_BUFFER_LIMIT);
+                debugLog(`STDERR: ${text}`);
+            });
+            this._proc.on('error', (err) => {
+                debugLog(`Subprocess error: ${err.message}`);
+                this._rejectPendingRequests(new Error(`Playwright MCP process error: ${err.message}`));
+                settleError('process-exit', { rawMessage: err.message });
+            });
+            this._proc.on('close', (code) => {
+                debugLog(`Subprocess closed with code ${code}`);
+                this._rejectPendingRequests(new Error(`Playwright MCP process exited before response${code == null ? '' : ` (code ${code})`}`));
+                if (!settled) {
+                    settleError(inferConnectFailureKind({
+                        mode,
+                        hasExtensionToken: !!extensionToken,
+                        stderr: stderrBuffer,
+                        exited: true,
+                    }), { exitCode: code });
+                }
+            });
             // Initialize: send initialize request
-            const initMsg = jsonRpcRequest('initialize', {
+            debugLog('Waiting for initialize response...');
+            this._sendRequest('initialize', {
                 protocolVersion: '2024-11-05',
                 capabilities: {},
                 clientInfo: { name: 'opencli', version: PKG_VERSION },
-            });
-            this._proc.stdin?.write(initMsg);
-            // Wait for initialize response, then send initialized notification
-            const origRecv = () => new Promise((res) => { this._waiters.push(res); });
-            origRecv().then((resp) => {
+            }).then((resp) => {
+                debugLog('Got initialize response');
                 if (resp.error) {
-                    clearTimeout(timer);
-                    reject(new Error(`MCP init failed: ${resp.error.message}`));
+                    settleError(inferConnectFailureKind({
+                        mode,
+                        hasExtensionToken: !!extensionToken,
+                        stderr: stderrBuffer,
+                        rawMessage: `MCP init failed: ${resp.error.message}`,
+                    }), { rawMessage: resp.error.message });
                     return;
                 }
-                this._proc?.stdin?.write(JSON.stringify({ jsonrpc: '2.0', method: 'notifications/initialized' }) + '\n');
+                const initializedMsg = JSON.stringify({ jsonrpc: '2.0', method: 'notifications/initialized' }) + '\n';
+                debugLog(`SEND: ${initializedMsg.trim()}`);
+                this._proc?.stdin?.write(initializedMsg);
                 // Get initial tab count for cleanup
+                debugLog('Fetching initial tabs count...');
                 page.tabs().then((tabs) => {
-                    if (typeof tabs === 'string') {
-                        this._initialTabCount = (tabs.match(/Tab \d+/g) || []).length;
-                    }
-                    else if (Array.isArray(tabs)) {
-                        this._initialTabCount = tabs.length;
-                    }
-                    clearTimeout(timer);
-                    resolve(page);
-                }).catch(() => { clearTimeout(timer); resolve(page); });
-            }).catch((err) => { clearTimeout(timer); reject(err); });
+                    debugLog(`Tabs response: ${typeof tabs === 'string' ? tabs : JSON.stringify(tabs)}`);
+                    this._initialTabIdentities = extractTabIdentities(tabs);
+                    settleSuccess(page);
+                }).catch((err) => {
+                    debugLog(`Tabs fetch error: ${err.message}`);
+                    settleSuccess(page);
+                });
+            }).catch((err) => {
+                debugLog(`Init promise rejected: ${err.message}`);
+                settleError('mcp-init', { rawMessage: err.message });
+            });
         });
     }
     async close() {
-        try {
-            // Close tabs opened during this session (site tabs + extension tabs)
-            if (this._page && this._proc && !this._proc.killed) {
-                try {
-                    const tabs = await this._page.tabs();
-                    const tabStr = typeof tabs === 'string' ? tabs : JSON.stringify(tabs);
-                    const allTabs = tabStr.match(/Tab (\d+)/g) || [];
-                    const currentTabCount = allTabs.length;
-                    // Close tabs in reverse order to avoid index shifting issues
-                    // Keep the original tabs that existed before the command started
-                    if (currentTabCount > this._initialTabCount && this._initialTabCount > 0) {
-                        for (let i = currentTabCount - 1; i >= this._initialTabCount; i--) {
+        if (this._closingPromise)
+            return this._closingPromise;
+        if (this._state === 'closed')
+            return;
+        this._state = 'closing';
+        this._closingPromise = (async () => {
+            try {
+                // Close tabs opened during this session (site tabs + extension tabs)
+                if (this._page && this._proc && !this._proc.killed) {
+                    try {
+                        const tabs = await withTimeout(this._page.tabs(), TAB_CLEANUP_TIMEOUT_MS, 'Timed out fetching tabs during cleanup');
+                        const tabEntries = extractTabEntries(tabs);
+                        const tabsToClose = diffTabIndexes(this._initialTabIdentities, tabEntries);
+                        for (const index of tabsToClose) {
                             try {
-                                await this._page.closeTab(i);
+                                await this._page.closeTab(index);
                             }
                             catch { }
                         }
                     }
+                    catch { }
                 }
-                catch { }
-            }
-            if (this._proc && !this._proc.killed) {
-                this._proc.kill('SIGTERM');
-                await new Promise((res) => { this._proc?.on('exit', () => res()); setTimeout(res, 3000); });
-            }
-        }
-        finally {
-            this._page = null;
-            this._releaseLock();
-        }
-    }
-    async _acquireLock() {
-        const start = Date.now();
-        while (true) {
-            try {
-                fs.mkdirSync(LOCK_DIR, { recursive: false });
-                this._lockAcquired = true;
-                return;
-            }
-            catch (e) {
-                if (e.code !== 'EEXIST')
-                    throw e;
-                if ((Date.now() - start) / 1000 > EXTENSION_LOCK_TIMEOUT) {
-                    // Force remove stale lock
-                    try {
-                        fs.rmdirSync(LOCK_DIR);
+                if (this._proc && !this._proc.killed) {
+                    this._proc.kill('SIGTERM');
+                    const exited = await new Promise((res) => {
+                        let done = false;
+                        const finish = (value) => {
+                            if (done)
+                                return;
+                            done = true;
+                            res(value);
+                        };
+                        this._proc?.once('exit', () => finish(true));
+                        setTimeout(() => finish(false), 3000);
+                    });
+                    if (!exited && this._proc && !this._proc.killed) {
+                        try {
+                            this._proc.kill('SIGKILL');
+                        }
+                        catch { }
                     }
-                    catch { }
-                    continue;
                 }
-                await new Promise(r => setTimeout(r, EXTENSION_LOCK_POLL * 1000));
             }
-        }
-    }
-    _releaseLock() {
-        if (this._lockAcquired) {
-            try {
-                fs.rmdirSync(LOCK_DIR);
+            finally {
+                this._rejectPendingRequests(new Error('Playwright MCP session closed'));
+                this._page = null;
+                this._proc = null;
+                this._state = 'closed';
+                PlaywrightMCP._activeInsts.delete(this);
             }
-            catch { }
-            this._lockAcquired = false;
+        })();
+        return this._closingPromise;
+    }
+}
+function extractTabEntries(raw) {
+    if (Array.isArray(raw)) {
+        return raw.map((tab, index) => ({
+            index,
+            identity: [
+                tab?.id ?? '',
+                tab?.url ?? '',
+                tab?.title ?? '',
+                tab?.name ?? '',
+            ].join('|'),
+        }));
+    }
+    if (typeof raw === 'string') {
+        return raw
+            .split('\n')
+            .map(line => line.trim())
+            .filter(Boolean)
+            .map(line => {
+            const match = line.match(/Tab\s+(\d+)\s*(.*)$/);
+            if (!match)
+                return null;
+            return {
+                index: parseInt(match[1], 10),
+                identity: match[2].trim() || `tab-${match[1]}`,
+            };
+        })
+            .filter((entry) => entry !== null);
+    }
+    return [];
+}
+function extractTabIdentities(raw) {
+    return extractTabEntries(raw).map(tab => tab.identity);
+}
+function diffTabIndexes(initialIdentities, currentTabs) {
+    if (initialIdentities.length === 0 || currentTabs.length === 0)
+        return [];
+    const remaining = new Map();
+    for (const identity of initialIdentities) {
+        remaining.set(identity, (remaining.get(identity) ?? 0) + 1);
+    }
+    const tabsToClose = [];
+    for (const tab of currentTabs) {
+        const count = remaining.get(tab.identity) ?? 0;
+        if (count > 0) {
+            remaining.set(tab.identity, count - 1);
+            continue;
         }
+        tabsToClose.push(tab.index);
     }
+    return tabsToClose.sort((a, b) => b - a);
+}
+function appendLimited(current, chunk, limit) {
+    const next = current + chunk;
+    if (next.length <= limit)
+        return next;
+    return next.slice(-limit);
 }
+function withTimeout(promise, timeoutMs, message) {
+    return new Promise((resolve, reject) => {
+        const timer = setTimeout(() => reject(new Error(message)), timeoutMs);
+        promise.then((value) => {
+            clearTimeout(timer);
+            resolve(value);
+        }, (error) => {
+            clearTimeout(timer);
+            reject(error);
+        });
+    });
+}
+export const __test__ = {
+    createJsonRpcRequest,
+    extractTabEntries,
+    diffTabIndexes,
+    appendLimited,
+    withTimeout,
+};
 function findMcpServerPath() {
+    if (_cachedMcpServerPath !== undefined)
+        return _cachedMcpServerPath;
+    const envMcp = process.env.OPENCLI_MCP_SERVER_PATH;
+    if (envMcp && fs.existsSync(envMcp)) {
+        _cachedMcpServerPath = envMcp;
+        return _cachedMcpServerPath;
+    }
     // Check local node_modules first (@playwright/mcp is the modern package)
     const localMcp = path.resolve('node_modules', '@playwright', 'mcp', 'cli.js');
-    if (fs.existsSync(localMcp))
-        return localMcp;
+    if (fs.existsSync(localMcp)) {
+        _cachedMcpServerPath = localMcp;
+        return _cachedMcpServerPath;
+    }
     // Check project-relative path
     const __dirname2 = path.dirname(fileURLToPath(import.meta.url));
     const projectMcp = path.resolve(__dirname2, '..', 'node_modules', '@playwright', 'mcp', 'cli.js');
-    if (fs.existsSync(projectMcp))
-        return projectMcp;
+    if (fs.existsSync(projectMcp)) {
+        _cachedMcpServerPath = projectMcp;
+        return _cachedMcpServerPath;
+    }
     // Check common locations
     const candidates = [
         path.join(os.homedir(), '.npm', '_npx'),
@@ -388,15 +761,19 @@ function findMcpServerPath() {
     // Try npx resolution (legacy package name)
     try {
         const result = execSync('npx -y --package=@playwright/mcp which mcp-server-playwright 2>/dev/null', { encoding: 'utf-8', timeout: 10000 }).trim();
-        if (result && fs.existsSync(result))
-            return result;
+        if (result && fs.existsSync(result)) {
+            _cachedMcpServerPath = result;
+            return _cachedMcpServerPath;
+        }
     }
     catch { }
     // Try which
     try {
         const result = execSync('which mcp-server-playwright 2>/dev/null', { encoding: 'utf-8', timeout: 5000 }).trim();
-        if (result && fs.existsSync(result))
-            return result;
+        if (result && fs.existsSync(result)) {
+            _cachedMcpServerPath = result;
+            return _cachedMcpServerPath;
+        }
     }
     catch { }
     // Search in common npx cache
@@ -405,10 +782,13 @@ function findMcpServerPath() {
             continue;
         try {
             const found = execSync(`find "${base}" -name "cli.js" -path "*playwright*mcp*" 2>/dev/null | head -1`, { encoding: 'utf-8', timeout: 5000 }).trim();
-            if (found)
-                return found;
+            if (found) {
+                _cachedMcpServerPath = found;
+                return _cachedMcpServerPath;
+            }
         }
         catch { }
     }
-    return null;
+    _cachedMcpServerPath = null;
+    return _cachedMcpServerPath;
 }