@jackwener/opencli 0.4.2 → 0.4.3

package/dist/doctor.test.js

@@ -0,0 +1,114 @@
+import { describe, expect, it } from 'vitest';
+import { readTokenFromShellContent, renderBrowserDoctorReport, upsertShellToken, readTomlConfigToken, upsertTomlConfigToken, upsertJsonConfigToken, } from './doctor.js';
+describe('shell token helpers', () => {
+    it('reads token from shell export', () => {
+        expect(readTokenFromShellContent('export PLAYWRIGHT_MCP_EXTENSION_TOKEN="abc123"\n')).toBe('abc123');
+    });
+    it('appends token export when missing', () => {
+        const next = upsertShellToken('export PATH="/usr/bin"\n', 'abc123');
+        expect(next).toContain('export PLAYWRIGHT_MCP_EXTENSION_TOKEN="abc123"');
+    });
+    it('replaces token export when present', () => {
+        const next = upsertShellToken('export PLAYWRIGHT_MCP_EXTENSION_TOKEN="old"\n', 'new');
+        expect(next).toContain('export PLAYWRIGHT_MCP_EXTENSION_TOKEN="new"');
+        expect(next).not.toContain('"old"');
+    });
+});
+describe('toml token helpers', () => {
+    it('reads token from playwright env section', () => {
+        const content = `
+[mcp_servers.playwright.env]
+PLAYWRIGHT_MCP_EXTENSION_TOKEN = "abc123"
+`;
+        expect(readTomlConfigToken(content)).toBe('abc123');
+    });
+    it('updates token inside existing env section', () => {
+        const content = `
+[mcp_servers.playwright.env]
+PLAYWRIGHT_MCP_EXTENSION_TOKEN = "old"
+`;
+        const next = upsertTomlConfigToken(content, 'new');
+        expect(next).toContain('PLAYWRIGHT_MCP_EXTENSION_TOKEN = "new"');
+        expect(next).not.toContain('"old"');
+    });
+    it('creates env section when missing', () => {
+        const content = `
+[mcp_servers.playwright]
+type = "stdio"
+`;
+        const next = upsertTomlConfigToken(content, 'abc123');
+        expect(next).toContain('[mcp_servers.playwright.env]');
+        expect(next).toContain('PLAYWRIGHT_MCP_EXTENSION_TOKEN = "abc123"');
+    });
+});
+describe('json token helpers', () => {
+    it('writes token into standard mcpServers config', () => {
+        const next = upsertJsonConfigToken(JSON.stringify({
+            mcpServers: {
+                playwright: {
+                    command: 'npx',
+                    args: ['-y', '@playwright/mcp@latest', '--extension'],
+                },
+            },
+        }), 'abc123');
+        const parsed = JSON.parse(next);
+        expect(parsed.mcpServers.playwright.env.PLAYWRIGHT_MCP_EXTENSION_TOKEN).toBe('abc123');
+    });
+    it('writes token into opencode mcp config', () => {
+        const next = upsertJsonConfigToken(JSON.stringify({
+            $schema: 'https://opencode.ai/config.json',
+            mcp: {
+                playwright: {
+                    command: ['npx', '-y', '@playwright/mcp@latest', '--extension'],
+                    enabled: true,
+                    type: 'local',
+                },
+            },
+        }), 'abc123');
+        const parsed = JSON.parse(next);
+        expect(parsed.mcp.playwright.env.PLAYWRIGHT_MCP_EXTENSION_TOKEN).toBe('abc123');
+    });
+});
+describe('doctor report rendering', () => {
+    it('renders OK-style report when tokens match', () => {
+        const text = renderBrowserDoctorReport({
+            envToken: 'abc123',
+            envFingerprint: 'fp1',
+            shellFiles: [{ path: '/tmp/.zshrc', exists: true, token: 'abc123', fingerprint: 'fp1' }],
+            configs: [{ path: '/tmp/mcp.json', exists: true, format: 'json', token: 'abc123', fingerprint: 'fp1', writable: true }],
+            remoteDebuggingEnabled: true,
+            remoteDebuggingEndpoint: 'ws://127.0.0.1:9222/devtools/browser/test',
+            cdpEnabled: false,
+            cdpToken: null,
+            cdpFingerprint: null,
+            recommendedToken: 'abc123',
+            recommendedFingerprint: 'fp1',
+            warnings: [],
+            issues: [],
+        });
+        expect(text).toContain('[OK] Chrome remote debugging: enabled');
+        expect(text).toContain('[OK] Environment token: configured (fp1)');
+        expect(text).toContain('[OK] MCP config /tmp/mcp.json: configured (fp1)');
+    });
+    it('renders MISMATCH-style report when fingerprints differ', () => {
+        const text = renderBrowserDoctorReport({
+            envToken: 'abc123',
+            envFingerprint: 'fp1',
+            shellFiles: [{ path: '/tmp/.zshrc', exists: true, token: 'def456', fingerprint: 'fp2' }],
+            configs: [{ path: '/tmp/mcp.json', exists: true, format: 'json', token: 'abc123', fingerprint: 'fp1', writable: true }],
+            remoteDebuggingEnabled: false,
+            remoteDebuggingEndpoint: null,
+            cdpEnabled: false,
+            cdpToken: null,
+            cdpFingerprint: null,
+            recommendedToken: 'abc123',
+            recommendedFingerprint: 'fp1',
+            warnings: ['Chrome remote debugging appears to be disabled or Chrome is not currently exposing a DevTools endpoint.'],
+            issues: ['Detected inconsistent Playwright MCP tokens across env/config files.'],
+        });
+        expect(text).toContain('[WARN] Chrome remote debugging: disabled');
+        expect(text).toContain('[MISMATCH] Environment token: configured (fp1)');
+        expect(text).toContain('[MISMATCH] Shell file /tmp/.zshrc: configured (fp2)');
+        expect(text).toContain('[MISMATCH] Recommended token fingerprint: fp1');
+    });
+});

package/dist/main.js

@@ -24,12 +24,27 @@ await discoverClis(BUILTIN_CLIS, USER_CLIS);
 const program = new Command();
 program.name('opencli').description('Make any website your CLI. Zero setup. AI-powered.').version(PKG_VERSION);
 // ── Built-in commands ──────────────────────────────────────────────────────
-program.command('list').description('List all available CLI commands').option('--json', 'JSON output')
+program.command('list').description('List all available CLI commands').option('-f, --format <fmt>', 'Output format: table, json, yaml, md, csv', 'table').option('--json', 'JSON output (deprecated)')
     .action((opts) => {
     const registry = getRegistry();
     const commands = [...registry.values()].sort((a, b) => fullName(a).localeCompare(fullName(b)));
-    if (opts.json) {
-        console.log(JSON.stringify(commands.map(c => ({ command: fullName(c), site: c.site, name: c.name, description: c.description, strategy: strategyLabel(c), browser: c.browser, args: c.args.map(a => a.name) })), null, 2));
+    const rows = commands.map(c => ({
+        command: fullName(c),
+        site: c.site,
+        name: c.name,
+        description: c.description,
+        strategy: strategyLabel(c),
+        browser: c.browser,
+        args: c.args.map(a => a.name).join(', '),
+    }));
+    const fmt = opts.json && opts.format === 'table' ? 'json' : opts.format;
+    if (fmt !== 'table') {
+        renderOutput(rows, {
+            fmt,
+            columns: ['command', 'site', 'name', 'description', 'strategy', 'browser', 'args'],
+            title: 'opencli/list',
+            source: 'opencli list',
+        });
         return;
     }
     const sites = new Map();
@@ -77,6 +92,31 @@ program.command('cascade').description('Strategy cascade: find simplest working
     });
     console.log(renderCascadeResult(result));
 });
+program.command('doctor')
+    .description('Diagnose Playwright MCP Bridge, token consistency, and Chrome remote debugging')
+    .option('--fix', 'Apply suggested fixes to shell rc and detected MCP configs', false)
+    .option('-y, --yes', 'Skip confirmation prompts when applying fixes', false)
+    .option('--token <token>', 'Override token to write instead of auto-detecting')
+    .option('--shell-rc <path>', 'Shell startup file to update')
+    .option('--mcp-config <paths>', 'Comma-separated MCP config paths to scan/update')
+    .action(async (opts) => {
+    const { runBrowserDoctor, renderBrowserDoctorReport, applyBrowserDoctorFix } = await import('./doctor.js');
+    const configPaths = opts.mcpConfig ? String(opts.mcpConfig).split(',').map((s) => s.trim()).filter(Boolean) : undefined;
+    const report = await runBrowserDoctor({ token: opts.token, shellRc: opts.shellRc, configPaths, cliVersion: PKG_VERSION });
+    console.log(renderBrowserDoctorReport(report));
+    if (opts.fix) {
+        const written = await applyBrowserDoctorFix(report, { fix: true, yes: opts.yes, token: opts.token, shellRc: opts.shellRc, configPaths });
+        console.log();
+        if (written.length > 0) {
+            console.log(chalk.green('Updated files:'));
+            for (const filePath of written)
+                console.log(`- ${filePath}`);
+        }
+        else {
+            console.log(chalk.yellow('No files were changed.'));
+        }
+    }
+});
 // ── Dynamic site commands ──────────────────────────────────────────────────
 const registry = getRegistry();
 const siteGroups = new Map();
@@ -96,7 +136,7 @@ for (const [, cmd] of registry) {
         else
             subCmd.option(flag, arg.help ?? '');
     }
-    subCmd.option('-f, --format <fmt>', 'Output format: table, json, md, csv', 'table').option('-v, --verbose', 'Debug output', false);
+    subCmd.option('-f, --format <fmt>', 'Output format: table, json, yaml, md, csv', 'table').option('-v, --verbose', 'Debug output', false);
     subCmd.action(async (actionOpts) => {
         const startTime = Date.now();
         const kwargs = {};
@@ -108,9 +148,11 @@ for (const [, cmd] of registry) {
                 kwargs[arg.name] = arg.default;
         }
         try {
+            if (actionOpts.verbose)
+                process.env.OPENCLI_VERBOSE = '1';
             let result;
             if (cmd.browser) {
-                result = await browserSession(PlaywrightMCP, async (page) => runWithTimeout(executeCommand(cmd, page, kwargs, actionOpts.verbose), { timeout: cmd.timeoutSeconds ?? DEFAULT_BROWSER_COMMAND_TIMEOUT, label: fullName(cmd) }));
+                result = await browserSession(PlaywrightMCP, async (page) => runWithTimeout(executeCommand(cmd, page, kwargs, actionOpts.verbose), { timeout: cmd.timeoutSeconds ?? DEFAULT_BROWSER_COMMAND_TIMEOUT, label: fullName(cmd) }), { forceExtension: cmd.forceExtension });
             }
             else {
                 result = await executeCommand(cmd, null, kwargs, actionOpts.verbose);

package/dist/output.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/output.test.js

@@ -0,0 +1,20 @@
+import { describe, it, expect, vi, afterEach } from 'vitest';
+import { render } from './output.js';
+afterEach(() => {
+    vi.restoreAllMocks();
+});
+describe('render', () => {
+    it('renders YAML output', () => {
+        const log = vi.spyOn(console, 'log').mockImplementation(() => { });
+        render([{ title: 'Hello', rank: 1 }], { fmt: 'yaml' });
+        expect(log).toHaveBeenCalledOnce();
+        expect(log.mock.calls[0]?.[0]).toContain('- title: Hello');
+        expect(log.mock.calls[0]?.[0]).toContain('rank: 1');
+    });
+    it('renders yml alias as YAML output', () => {
+        const log = vi.spyOn(console, 'log').mockImplementation(() => { });
+        render({ title: 'Hello' }, { fmt: 'yml' });
+        expect(log).toHaveBeenCalledOnce();
+        expect(log.mock.calls[0]?.[0]).toContain('title: Hello');
+    });
+});

package/dist/registry.d.ts

@@ -33,6 +33,8 @@ export interface CliCommand {
     /** Internal: lazy-loaded TS module support */
     _lazy?: boolean;
     _modulePath?: string;
+    /** Force extension bridge mode (bypass CDP), for anti-bot sites */
+    forceExtension?: boolean;
 }
 export interface CliOptions {
     site: string;
@@ -46,6 +48,8 @@ export interface CliOptions {
     func?: (page: IPage | null, kwargs: Record<string, any>, debug?: boolean) => Promise<any>;
     pipeline?: any[];
     timeoutSeconds?: number;
+    /** Force extension bridge mode (bypass CDP), for anti-bot sites */
+    forceExtension?: boolean;
 }
 export declare function cli(opts: CliOptions): CliCommand;
 export declare function getRegistry(): Map<string, CliCommand>;

package/dist/registry.js

@@ -23,6 +23,7 @@ export function cli(opts) {
         func: opts.func,
         pipeline: opts.pipeline,
         timeoutSeconds: opts.timeoutSeconds,
+        forceExtension: opts.forceExtension,
     };
     const key = fullName(cmd);
     _registry.set(key, cmd);

package/dist/runtime.d.ts

@@ -10,4 +10,6 @@ export declare function runWithTimeout<T>(promise: Promise<T>, opts: {
     timeout: number;
     label?: string;
 }): Promise<T>;
-export declare function browserSession<T>(BrowserFactory: new () => any, fn: (page: IPage) => Promise<T>): Promise<T>;
+export declare function browserSession<T>(BrowserFactory: new () => any, fn: (page: IPage) => Promise<T>, opts?: {
+    forceExtension?: boolean;
+}): Promise<T>;

package/dist/runtime.js

@@ -15,10 +15,10 @@ export async function runWithTimeout(promise, opts) {
             .catch((err) => { clearTimeout(timer); reject(err); });
     });
 }
-export async function browserSession(BrowserFactory, fn) {
+export async function browserSession(BrowserFactory, fn, opts) {
     const mcp = new BrowserFactory();
     try {
-        const page = await mcp.connect({ timeout: DEFAULT_BROWSER_CONNECT_TIMEOUT });
+        const page = await mcp.connect({ timeout: DEFAULT_BROWSER_CONNECT_TIMEOUT, forceExtension: opts?.forceExtension });
         return await fn(page);
     }
     finally {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jackwener/opencli",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "publishConfig": {
     "access": "public"
   },
@@ -31,7 +31,7 @@
     "playwright"
   ],
   "author": "jackwener",
-  "license": "MIT",
+  "license": "BSD-3-Clause",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/jackwener/opencli.git"

package/src/browser.test.ts

@@ -0,0 +1,51 @@
+import { describe, expect, it } from 'vitest';
+import { formatBrowserConnectError, getTokenFingerprint } from './browser.js';
+
+describe('getTokenFingerprint', () => {
+  it('returns null for empty token', () => {
+    expect(getTokenFingerprint(undefined)).toBeNull();
+  });
+
+  it('returns stable short fingerprint for token', () => {
+    expect(getTokenFingerprint('abc123')).toBe('6ca13d52');
+  });
+});
+
+describe('formatBrowserConnectError', () => {
+  it('explains missing extension token clearly', () => {
+    const err = formatBrowserConnectError({
+      kind: 'missing-token',
+      mode: 'extension',
+      timeout: 30,
+      hasExtensionToken: false,
+    });
+
+    expect(err.message).toContain('PLAYWRIGHT_MCP_EXTENSION_TOKEN is not set');
+    expect(err.message).toContain('manual approval dialog');
+  });
+
+  it('mentions token mismatch as likely cause for extension timeout', () => {
+    const err = formatBrowserConnectError({
+      kind: 'extension-timeout',
+      mode: 'extension',
+      timeout: 30,
+      hasExtensionToken: true,
+      tokenFingerprint: 'deadbeef',
+    });
+
+    expect(err.message).toContain('does not match the token currently shown by the browser extension');
+    expect(err.message).toContain('deadbeef');
+  });
+
+  it('keeps CDP timeout guidance separate', () => {
+    const err = formatBrowserConnectError({
+      kind: 'cdp-timeout',
+      mode: 'cdp',
+      timeout: 30,
+      hasExtensionToken: false,
+    });
+
+    expect(err.message).toContain('via CDP');
+    expect(err.message).toContain('chrome://inspect#remote-debugging');
+  });
+});