@jackwener/opencli 0.9.8 → 1.0.0

package/src/main.ts

@@ -119,36 +119,19 @@ program.command('cascade').description('Strategy cascade: find simplest working
   });
 
 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')
+  .description('Diagnose opencli browser bridge connectivity')
   .option('--live', 'Test browser connectivity (requires Chrome running)', false)
-  .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: string) => s.trim()).filter(Boolean) : undefined;
-    const report = await runBrowserDoctor({ token: opts.token, live: opts.live, shellRc: opts.shellRc, configPaths, cliVersion: PKG_VERSION });
+    const { runBrowserDoctor, renderBrowserDoctorReport } = await import('./doctor.js');
+    const report = await runBrowserDoctor({ live: opts.live, 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.'));
-      }
-    }
   });
 
 program.command('setup')
-  .description('Interactive setup: configure Playwright MCP token across all detected tools')
-  .option('--token <token>', 'Provide token directly instead of auto-detecting')
-  .action(async (opts) => {
+  .description('Interactive setup: verify browser bridge connectivity')
+  .action(async () => {
     const { runSetup } = await import('./setup.js');
-    await runSetup({ cliVersion: PKG_VERSION, token: opts.token });
+    await runSetup({ cliVersion: PKG_VERSION });
   });
 
 program.command('completion')

package/src/pipeline/executor.test.ts

@@ -26,6 +26,7 @@ function createMockPage(overrides: Partial<IPage> = {}): IPage {
     autoScroll: vi.fn(),
     installInterceptor: vi.fn(),
     getInterceptedRequests: vi.fn().mockResolvedValue([]),
+    screenshot: vi.fn().mockResolvedValue(''),
     ...overrides,
   };
 }

package/src/pipeline/steps/browser.ts

@@ -4,7 +4,7 @@
  */
 
 import type { IPage } from '../../types.js';
-import { render, normalizeEvaluateSource } from '../template.js';
+import { render } from '../template.js';
 
 export async function stepNavigate(page: IPage | null, params: any, data: any, args: Record<string, any>): Promise<any> {
   const url = render(params, { args, data });
@@ -52,7 +52,7 @@ export async function stepSnapshot(page: IPage | null, params: any, _data: any,
 
 export async function stepEvaluate(page: IPage | null, params: any, data: any, args: Record<string, any>): Promise<any> {
   const js = String(render(params, { args, data }));
-  let result = await page!.evaluate(normalizeEvaluateSource(js));
+  let result = await page!.evaluate(js);
   // MCP may return JSON as a string — auto-parse it
   if (typeof result === 'string') {
     const trimmed = result.trim();

package/src/pipeline/steps/intercept.ts

@@ -3,7 +3,7 @@
  */
 
 import type { IPage } from '../../types.js';
-import { render } from '../template.js';
+import { render, normalizeEvaluateSource } from '../template.js';
 import { generateInterceptorJs, generateReadInterceptedJs } from '../../interceptor.js';
 
 export async function stepIntercept(page: IPage | null, params: any, data: any, args: Record<string, any>): Promise<any> {
@@ -24,7 +24,6 @@ export async function stepIntercept(page: IPage | null, params: any, data: any,
     await page!.goto(String(url));
   } else if (trigger.startsWith('evaluate:')) {
     const js = trigger.slice('evaluate:'.length);
-    const { normalizeEvaluateSource } = await import('../template.js');
     await page!.evaluate(normalizeEvaluateSource(render(js, { args, data }) as string));
   } else if (trigger.startsWith('click:')) {
     const ref = render(trigger.slice('click:'.length), { args, data });

package/src/setup.ts

@@ -1,205 +1,69 @@
 /**
- * setup.ts — Interactive Playwright MCP token setup
+ * setup.ts — Interactive browser setup for opencli
  *
- * Discovers the extension token, shows an interactive checkbox
- * for selecting which config files to update, and applies changes.
+ * Simplified for daemon-based architecture. No more token management.
+ * Just verifies daemon + extension connectivity.
  */
-import * as fs from 'node:fs';
+
 import chalk from 'chalk';
-import { createInterface } from 'node:readline/promises';
-import { stdin as input, stdout as output } from 'node:process';
-import {
-  type DoctorReport,
-  PLAYWRIGHT_TOKEN_ENV,
-  checkExtensionInstalled,
-  checkTokenConnectivity,
-  discoverExtensionToken,
-  fileExists,
-  getDefaultShellRcPath,
-  runBrowserDoctor,
-  shortenPath,
-  toolName,
-  upsertJsonConfigToken,
-  upsertShellToken,
-  upsertTomlConfigToken,
-  writeFileWithMkdir,
-} from './doctor.js';
-import { getTokenFingerprint } from './browser/index.js';
-import { type CheckboxItem, checkboxPrompt } from './tui.js';
+import { checkDaemonStatus } from './browser/discover.js';
+import { checkConnectivity } from './doctor.js';
+import { PlaywrightMCP } from './browser/index.js';
 
 export async function runSetup(opts: { cliVersion?: string; token?: string } = {}) {
   console.log();
-  console.log(chalk.bold('  opencli setup') + chalk.dim(' — Playwright MCP token configuration'));
+  console.log(chalk.bold('  opencli setup') + chalk.dim(' — browser bridge configuration'));
   console.log();
 
-  // Step 1: Discover token
-  let token = opts.token ?? null;
-
-  if (!token) {
-    const extensionToken = discoverExtensionToken();
-    const envToken = process.env[PLAYWRIGHT_TOKEN_ENV] ?? null;
+  // Step 1: Check daemon
+  console.log(chalk.dim('  Checking daemon status...'));
+  const status = await checkDaemonStatus();
 
-    if (extensionToken && envToken && extensionToken === envToken) {
-      token = extensionToken;
-      console.log(`  ${chalk.green('✓')} Token auto-discovered from Chrome extension`);
-      console.log(`    Fingerprint: ${chalk.bold(getTokenFingerprint(token) ?? 'unknown')}`);
-    } else if (extensionToken) {
-      token = extensionToken;
-      console.log(`  ${chalk.green('✓')} Token discovered from Chrome extension ` +
-        chalk.dim(`(${getTokenFingerprint(token)})`));
-      if (envToken && envToken !== extensionToken) {
-        console.log(`  ${chalk.yellow('!')} Environment has different token ` +
-          chalk.dim(`(${getTokenFingerprint(envToken)})`));
-      }
-    } else if (envToken) {
-      token = envToken;
-      console.log(`  ${chalk.green('✓')} Token from environment variable ` +
-        chalk.dim(`(${getTokenFingerprint(token)})`));
-    }
+  if (status.running) {
+    console.log(`  ${chalk.green('✓')} Daemon is running on port 19825`);
   } else {
-    console.log(`  ${chalk.green('✓')} Using provided token ` +
-      chalk.dim(`(${getTokenFingerprint(token)})`));
+    console.log(`  ${chalk.yellow('!')} Daemon is not running`);
+    console.log(chalk.dim('    The daemon starts automatically when you run a browser command.'));
+    console.log(chalk.dim('    Starting daemon now...'));
+
+    // Try to spawn daemon
+    const mcp = new PlaywrightMCP();
+    try {
+      await mcp.connect({ timeout: 5 });
+      await mcp.close();
+      console.log(`  ${chalk.green('✓')} Daemon started successfully`);
+    } catch {
+      console.log(`  ${chalk.yellow('!')} Could not start daemon automatically`);
+    }
   }
 
-  if (!token) {
-    // Give precise diagnosis of why token scan failed
-    const extInstall = checkExtensionInstalled();
-
-    console.log(`  ${chalk.red('✗')} Browser token scan failed\n`);
-    if (!extInstall.installed) {
-      console.log(chalk.dim('  Cause: Playwright MCP Bridge extension is not installed'));
-      console.log(chalk.dim('  Fix:   Install from https://chromewebstore.google.com/detail/'));
-      console.log(chalk.dim('         playwright-mcp-bridge/mmlmfjhmonkocbjadbfplnigmagldckm'));
-    } else {
-      console.log(chalk.dim(`  Cause: Extension is installed (${extInstall.browsers.join(', ')}) but token not found in LevelDB`));
-      console.log(chalk.dim('  Fix:   1) Open the extension popup and verify the token is generated'));
-      console.log(chalk.dim('         2) Close Chrome completely, then re-run setup'));
-    }
+  // Step 2: Check extension
+  const statusAfter = await checkDaemonStatus();
+  if (statusAfter.extensionConnected) {
+    console.log(`  ${chalk.green('✓')} Chrome extension connected`);
+  } else {
+    console.log(`  ${chalk.red('✗')} Chrome extension not connected`);
     console.log();
-    console.log(`  You can enter the token manually, or fix the above and re-run ${chalk.bold('opencli setup')}.`);
+    console.log(chalk.dim('  To install the opencli Browser Bridge extension:'));
+    console.log(chalk.dim('    1. Download from GitHub Releases'));
+    console.log(chalk.dim('    2. Open chrome://extensions/ → Enable Developer Mode'));
+    console.log(chalk.dim('    3. Click "Load unpacked" → select the extension folder'));
+    console.log(chalk.dim('    4. Make sure Chrome is running'));
     console.log();
-    const rl = createInterface({ input, output });
-    const answer = await rl.question('  Token (press Enter to abort): ');
-    rl.close();
-    token = answer.trim();
-    if (!token) {
-      console.log(chalk.red('\n  No token provided. Aborting.\n'));
-      return;
-    }
-  }
-
-  const fingerprint = getTokenFingerprint(token) ?? 'unknown';
-  console.log();
-
-  // Step 2: Scan all config locations
-  const report = await runBrowserDoctor({ token, cliVersion: opts.cliVersion });
-
-  // Step 3: Build checkbox items
-  const items: CheckboxItem[] = [];
-
-  // Shell file
-  const shellPath = report.shellFiles[0]?.path ?? getDefaultShellRcPath();
-  const shellStatus = report.shellFiles[0];
-  const shellFp = shellStatus?.fingerprint;
-  const shellOk = shellFp === fingerprint;
-  const shellTool = toolName(shellPath) || 'Shell';
-  items.push({
-    label: padRight(shortenPath(shellPath), 50) + chalk.dim(` [${shellTool}]`),
-    value: `shell:${shellPath}`,
-    checked: !shellOk,
-    status: shellOk ? `configured (${shellFp})` : shellFp ? `mismatch (${shellFp})` : 'missing',
-    statusColor: shellOk ? 'green' : shellFp ? 'yellow' : 'red',
-  });
-
-  // Config files
-  for (const config of report.configs) {
-    const fp = config.fingerprint;
-    const ok = fp === fingerprint;
-    const tool = toolName(config.path);
-    items.push({
-      label: padRight(shortenPath(config.path), 50) + chalk.dim(tool ? ` [${tool}]` : ''),
-      value: `config:${config.path}`,
-      checked: false,  // let user explicitly select which tools to configure
-      status: ok ? `configured (${fp})` : !config.exists ? 'will create' : fp ? `mismatch (${fp})` : 'missing',
-      statusColor: ok ? 'green' : 'yellow',
-    });
-  }
-
-  // Step 4: Show interactive checkbox
-  console.clear();
-  const selected = await checkboxPrompt(items, {
-    title: `  ${chalk.bold('opencli setup')} — token ${chalk.cyan(fingerprint)}`,
-  });
-
-  if (selected.length === 0) {
-    console.log(chalk.dim('  No changes made.\n'));
     return;
   }
 
-  // Step 5: Apply changes
-  const written: string[] = [];
-  let wroteShell = false;
-
-  for (const sel of selected) {
-    if (sel.startsWith('shell:')) {
-      const p = sel.slice('shell:'.length);
-      const before = fileExists(p) ? fs.readFileSync(p, 'utf-8') : '';
-      writeFileWithMkdir(p, upsertShellToken(before, token, p));
-      written.push(p);
-      wroteShell = true;
-    } else if (sel.startsWith('config:')) {
-      const p = sel.slice('config:'.length);
-      const config = report.configs.find(c => c.path === p);
-      if (config && config.parseError) continue;
-      const before = fileExists(p) ? fs.readFileSync(p, 'utf-8') : '';
-      const format = config?.format ?? (p.endsWith('.toml') ? 'toml' : 'json');
-      const next = format === 'toml' ? upsertTomlConfigToken(before, token) : upsertJsonConfigToken(before, token, p);
-      writeFileWithMkdir(p, next);
-      written.push(p);
-    }
-  }
-
-  process.env[PLAYWRIGHT_TOKEN_ENV] = token;
-
-  // Step 6: Summary
-  if (written.length > 0) {
-    console.log(chalk.green.bold(`  ✓ Updated ${written.length} file(s):`));
-    for (const p of written) {
-      const tool = toolName(p);
-      console.log(`    ${chalk.dim('•')} ${shortenPath(p)}${tool ? chalk.dim(` [${tool}]`) : ''}`);
-    }
-    if (wroteShell) {
-      console.log();
-      console.log(chalk.cyan(`  💡 Run ${chalk.bold(`source ${shortenPath(shellPath)}`)} to apply token to current shell.`));
-    }
-  } else {
-    console.log(chalk.yellow('  No files were changed.'));
-  }
+  // Step 3: Test connectivity
   console.log();
-
-  // Step 7: Auto-verify browser connectivity
-  console.log(chalk.dim('  Verifying browser connectivity...'));
-  try {
-    const result = await checkTokenConnectivity({ timeout: 5 });
-    if (result.ok) {
-      console.log(`  ${chalk.green('✓')} Browser connected in ${(result.durationMs / 1000).toFixed(1)}s`);
-    } else {
-      console.log(`  ${chalk.green('✓')} Token saved successfully.`);
-      console.log(`  ${chalk.yellow('!')} Browser connectivity test failed: ${result.error ?? 'unknown'}`);
-      console.log(chalk.dim('    Token configuration is complete. To use opencli, make sure Chrome'));
-      console.log(chalk.dim('    is running with the Playwright MCP Bridge extension enabled.'));
-      console.log(chalk.dim(`    Run ${chalk.bold('opencli doctor --live')} to re-test connectivity.`));
-    }
-  } catch {
-    console.log(`  ${chalk.green('✓')} Token saved successfully.`);
-    console.log(`  ${chalk.yellow('!')} Browser connectivity test skipped (Chrome may not be running).`);
-    console.log(chalk.dim('    Token configuration is complete. Start Chrome to begin using opencli.'));
-    console.log(chalk.dim(`    Run ${chalk.bold('opencli doctor --live')} to re-test connectivity.`));
+  console.log(chalk.dim('  Testing browser connectivity...'));
+  const conn = await checkConnectivity({ timeout: 5 });
+  if (conn.ok) {
+    console.log(`  ${chalk.green('✓')} Browser connected in ${(conn.durationMs / 1000).toFixed(1)}s`);
+    console.log();
+    console.log(chalk.green.bold('  ✓ Setup complete! You can now use opencli browser commands.'));
+  } else {
+    console.log(`  ${chalk.yellow('!')} Connectivity test failed: ${conn.error ?? 'unknown'}`);
+    console.log(chalk.dim(`    Run ${chalk.bold('opencli doctor --live')} to diagnose.`));
   }
   console.log();
 }
-
-function padRight(s: string, n: number): string {
-  const visible = s.replace(/\x1b\[[0-9;]*m/g, '');
-  return visible.length >= n ? s : s + ' '.repeat(n - visible.length);
-}

package/src/types.ts

@@ -23,4 +23,5 @@ export interface IPage {
   autoScroll(options?: { times?: number; delayMs?: number }): Promise<void>;
   installInterceptor(pattern: string): Promise<void>;
   getInterceptedRequests(): Promise<any[]>;
+  screenshot(options?: { format?: 'png' | 'jpeg'; quality?: number; fullPage?: boolean; path?: string }): Promise<string>;
 }