venombrowser 4.1.0 → 4.1.2

package/bin/venombrowser-agent.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 /**
  * VenomBrowser Agent — CLI entry point (Kimi-style)
  *

package/bin/venombrowser-chat.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 /**
  * VenomBrowser Interactive Chat Agent — CLI entry point (Kimi-style)
  *

package/bin/venombrowser-cli.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 /**
  * VenomBrowser CLI — Unified command dispatcher
  *
@@ -37,6 +37,8 @@ Commands:
   setup           Run the interactive setup wizard
   start           Start the bridge daemon
   status          Check daemon & extension connection status
+  stop            Stop the bridge daemon (releases port)
+  restart         Restart the bridge daemon
   connect         Auto-register MCP server with known agents
   uninstall       Remove MCP entries, stop daemon (does NOT npm uninstall)
   agent "<task>"  Run a one-shot browser automation task
@@ -153,6 +155,35 @@ function runChat() {
   child.on('exit', (code) => process.exit(code || 0));
 }
 
+function runStop() {
+  const { BrowserBridge } = require('../src/bridge-client');
+  const bridge = new BrowserBridge({ port: BRIDGE_PORT, session: 'cli', apiKey: process.env.REST_API_KEY });
+  bridge.stopServer()
+    .then(() => console.log('✅ Sent stop signal to bridge daemon. It will shut down gracefully.'))
+    .catch(err => {
+      if (err.message.includes('fetch failed') || err.message.includes('ECONNREFUSED')) {
+        console.log('✅ Daemon is already stopped.');
+      } else {
+        console.error('❌ Failed to stop daemon:', err.message);
+      }
+    });
+}
+
+function runRestart() {
+  console.log('🔄 Restarting VenomBrowser daemon...');
+  const { BrowserBridge } = require('../src/bridge-client');
+  const bridge = new BrowserBridge({ port: BRIDGE_PORT, session: 'cli', apiKey: process.env.REST_API_KEY });
+  bridge.stopServer()
+    .then(() => {
+      console.log('✅ Daemon stopped.');
+      setTimeout(() => runStart(), 1000);
+    })
+    .catch(err => {
+      console.log('✅ Daemon was not running.');
+      runStart();
+    });
+}
+
 // ─── Dispatch ───────────────────────────────────────────────────────────────
 
 const command = process.argv[2];
@@ -167,6 +198,12 @@ switch (command) {
   case 'status':
     runStatus();
     break;
+  case 'stop':
+    runStop();
+    break;
+  case 'restart':
+    runRestart();
+    break;
   case 'connect':
     runConnect();
     break;

package/bin/venombrowser-mcp.js

@@ -1,30 +1,153 @@
-#!/usr/bin/env node
-/**
- * VenomBrowser MCP Server — CLI entry point
- * Starts the MCP server in stdio mode for agent integration.
- *
- * Usage: node bin/venombrowser-mcp.js
- * Or:    npm run mcp
- *
- * Agent configuration example (Claude Code):
- *   {
- *     "mcpServers": {
- *       "venombrowser": {
- *         "command": "node",
- *         "args": ["C:/path/to/VenomBrowser/server/bin/venombrowser-mcp.js"],
- *         "env": { "REST_API_KEY": "your-bridge-api-key" }
- *       }
- *     }
- *   }
- */
-
-// Load .env for default config — agents can also pass env vars directly
-require('dotenv').config({ path: require('path').join(__dirname, '..', '.env') });
-
-const VenomBrowserMcpServer = require('../src/mcp-server');
-
-const server = new VenomBrowserMcpServer();
-server.start().catch(err => {
-  console.error('[VenomBrowser MCP] Failed to start:', err.message);
-  process.exit(1);
-});
+#!/usr/bin/env node
+/**
+ * VenomBrowser MCP Server — CLI entry point
+ * Starts the MCP server in stdio mode for agent integration.
+ *
+ * Kimi-style: Auto-starts the bridge daemon if it's not already running.
+ * The agent just configures this MCP entry — no manual `venombrowser start` needed.
+ *
+ * Usage: node bin/venombrowser-mcp.js
+ * Or:    npm run mcp
+ *
+ * Agent configuration example (Claude Code / Cursor):
+ *   {
+ *     "mcpServers": {
+ *       "venombrowser": {
+ *         "command": "venombrowser-mcp",
+ *         "env": { "BRIDGE_PORT": "10086" }
+ *       }
+ *     }
+ *   }
+ *
+ * Agent configuration example (OpenCode):
+ *   {
+ *     "mcp": {
+ *       "venombrowser": {
+ *         "type": "local",
+ *         "command": ["venombrowser-mcp"],
+ *         "environment": { "BRIDGE_PORT": "10086" }
+ *       }
+ *     }
+ *   }
+ */
+
+// Load .env for default config — agents can also pass env vars directly
+require('dotenv').config({ path: require('path').join(__dirname, '..', '.env') });
+
+const path = require('path');
+const http = require('http');
+const { spawn } = require('child_process');
+const fs = require('fs');
+
+const BRIDGE_PORT = parseInt(process.env.BRIDGE_PORT || '10086', 10);
+const BRIDGE_HOST = process.env.BRIDGE_HOST || '127.0.0.1';
+const MAX_WAIT_ATTEMPTS = 30;       // 30 × 500ms = 15 seconds max wait
+const POLL_INTERVAL_MS = 500;
+
+// ─── Health check ─────────────────────────────────────────────────────────
+function checkBridgeHealth() {
+  return new Promise((resolve) => {
+    const req = http.get(
+      `http://${BRIDGE_HOST}:${BRIDGE_PORT}/health`,
+      { timeout: 2000 },
+      (res) => {
+        let body = '';
+        res.on('data', (chunk) => { body += chunk; });
+        res.on('end', () => {
+          try {
+            const data = JSON.parse(body);
+            resolve(data.server === 'ok');
+          } catch {
+            resolve(false);
+          }
+        });
+      }
+    );
+    req.on('error', () => resolve(false));
+    req.on('timeout', () => { req.destroy(); resolve(false); });
+  });
+}
+
+// ─── Wait for bridge to become ready ──────────────────────────────────────
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+async function waitForBridge() {
+  for (let i = 0; i < MAX_WAIT_ATTEMPTS; i++) {
+    if (await checkBridgeHealth()) return true;
+    await sleep(POLL_INTERVAL_MS);
+  }
+  return false;
+}
+
+// ─── Auto-start the bridge daemon ─────────────────────────────────────────
+async function ensureBridgeRunning() {
+  // Already running? Great, nothing to do.
+  if (await checkBridgeHealth()) {
+    console.error('[VenomBrowser MCP] Bridge daemon already running on port ' + BRIDGE_PORT);
+    return true;
+  }
+
+  console.error('[VenomBrowser MCP] Bridge daemon not running — auto-starting...');
+
+  const serverScript = path.join(__dirname, 'venombrowser-server.js');
+  const serverCwd = path.join(__dirname, '..');
+
+  // Create a log file for the daemon's output
+  const logDir = path.join(serverCwd, 'logs');
+  if (!fs.existsSync(logDir)) fs.mkdirSync(logDir, { recursive: true });
+  const logFile = path.join(logDir, 'bridge-daemon.log');
+
+  // Spawn the bridge server as a fully detached background process.
+  // This means: when the MCP process exits, the bridge stays alive.
+  // The bridge maintains the WebSocket connection with the Chrome extension.
+  const logFd = fs.openSync(logFile, 'a');
+  const child = spawn(process.execPath, [serverScript], {
+    detached: true,
+    stdio: ['ignore', logFd, logFd],
+    env: { ...process.env },
+    cwd: serverCwd,
+    windowsHide: true
+  });
+
+  // Unref so the MCP process can exit independently
+  child.unref();
+
+  console.error(`[VenomBrowser MCP] Spawned bridge daemon (PID ${child.pid}), waiting for ready...`);
+  console.error(`[VenomBrowser MCP] Daemon logs: ${logFile}`);
+
+  // Wait for the bridge to be ready
+  const ready = await waitForBridge();
+
+  if (ready) {
+    console.error('[VenomBrowser MCP] Bridge daemon is ready!');
+    return true;
+  } else {
+    console.error('[VenomBrowser MCP] WARNING: Bridge daemon did not become ready within 15s.');
+    console.error('[VenomBrowser MCP] Check logs at: ' + logFile);
+    console.error('[VenomBrowser MCP] Continuing anyway — commands will fail if daemon is not running.');
+    return false;
+  }
+}
+
+// ─── Main ─────────────────────────────────────────────────────────────────
+async function main() {
+  // Step 1: Ensure the bridge daemon is running (Kimi-style auto-start)
+  await ensureBridgeRunning();
+
+  const VenomBrowserMcpServer = require('../src/mcp-server');
+  const server = new VenomBrowserMcpServer({
+    onBeforeCommand: async (toolName) => {
+      // Don't auto-start if the agent is explicitly trying to stop the server
+      if (toolName === 'stop_server') return;
+      await ensureBridgeRunning();
+    }
+  });
+  await server.start();
+}
+
+main().catch(err => {
+  console.error('[VenomBrowser MCP] Failed to start:', err.message);
+  process.exit(1);
+});

package/bin/venombrowser-server.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 /**
  * VenomBrowser Bridge Server — CLI entry point
  * Starts the WebSocket + REST API bridge server.

package/bin/venombrowser-setup.js

@@ -1,183 +1,145 @@
-#!/usr/bin/env node
-/**
- * VenomBrowser Setup — Interactive setup wizard
- *
- * Helps users (and agents) configure VenomBrowser by:
- * 1. Creating/updating .env from .env.example
- * 2. Generating a REST_API_KEY if missing
- * 3. Prompting for WS_AUTH_TOKEN (from extension popup)
- * 4. Configuring the LLM provider
- *
- * Usage:
- *   node bin/venombrowser-setup.js
- *   node bin/venombrowser-setup.js --auto          # Non-interactive: generate keys, use defaults
- *   node bin/venombrowser-setup.js --token=<tok>   # Set the WS_AUTH_TOKEN directly
- */
-
-const fs = require('fs');
-const path = require('path');
-const crypto = require('crypto');
-const readline = require('readline');
-
-const ENV_PATH = path.join(__dirname, '..', '.env');
-const EXAMPLE_PATH = path.join(__dirname, '..', '.env.example');
-
-function generateKey(length = 32) {
-  return crypto.randomBytes(length).toString('hex');
-}
-
-function parseEnv(content) {
-  const vars = {};
-  for (const line of content.split('\n')) {
-    const trimmed = line.trim();
-    if (!trimmed || trimmed.startsWith('#')) continue;
-    const eqIndex = trimmed.indexOf('=');
-    if (eqIndex === -1) continue;
-    const key = trimmed.slice(0, eqIndex).trim();
-    const val = trimmed.slice(eqIndex + 1).trim();
-    vars[key] = val;
-  }
-  return vars;
-}
-
-function updateEnvFile(updates) {
-  let content;
-  if (fs.existsSync(ENV_PATH)) {
-    content = fs.readFileSync(ENV_PATH, 'utf8');
-  } else if (fs.existsSync(EXAMPLE_PATH)) {
-    content = fs.readFileSync(EXAMPLE_PATH, 'utf8');
-  } else {
-    // Build minimal .env
-    content = Object.entries(updates).map(([k, v]) => `${k}=${v}`).join('\n') + '\n';
-    fs.writeFileSync(ENV_PATH, content);
-    return;
-  }
-
-  for (const [key, value] of Object.entries(updates)) {
-    // Replace existing key= lines, or append
-    const regex = new RegExp(`^${key}=.*$`, 'm');
-    if (regex.test(content)) {
-      content = content.replace(regex, `${key}=${value}`);
-    } else {
-      content += `\n${key}=${value}\n`;
-    }
-  }
-
-  fs.writeFileSync(ENV_PATH, content);
-}
-
-function ask(rl, question) {
-  return new Promise(resolve => rl.question(question, resolve));
-}
-
-async function main() {
-  const args = process.argv.slice(2);
-  const isAuto = args.includes('--auto');
-  const tokenArg = args.find(a => a.startsWith('--token='));
-  const tokenValue = tokenArg ? tokenArg.split('=').slice(1).join('=') : null;
-
-  console.log('🕷️ VenomBrowser Bridge Setup');
-  console.log('═'.repeat(50));
-
-  // Load existing env
-  let existing = {};
-  if (fs.existsSync(ENV_PATH)) {
-    existing = parseEnv(fs.readFileSync(ENV_PATH, 'utf8'));
-    console.log('📄 Found existing .env file');
-  } else {
-    console.log('📄 No .env file found — will create one');
-  }
-
-  const updates = {};
-
-  // ── REST_API_KEY ─────────────────────────────────────────────────────────
-  if (!existing.REST_API_KEY || existing.REST_API_KEY.includes('pick-any') || existing.REST_API_KEY.includes('your')) {
-    const key = generateKey();
-    updates.REST_API_KEY = key;
-    console.log(`🔑 Generated REST_API_KEY: ${key}`);
-  } else {
-    console.log(`🔑 REST_API_KEY: ${existing.REST_API_KEY.slice(0, 8)}...`);
-  }
-
-  // ── WS_AUTH_TOKEN ────────────────────────────────────────────────────────
-  if (tokenValue) {
-    updates.WS_AUTH_TOKEN = tokenValue;
-    console.log(`🔐 WS_AUTH_TOKEN set from --token flag`);
-  } else if (isAuto) {
-    if (!existing.WS_AUTH_TOKEN || existing.WS_AUTH_TOKEN.includes('paste')) {
-      console.log('⚠️  WS_AUTH_TOKEN not set. After loading the extension, run:');
-      console.log('   node bin/venombrowser-setup.js --token=<paste-token-from-extension-popup>');
-    }
-  } else {
-    // Interactive
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-
-    if (!existing.WS_AUTH_TOKEN || existing.WS_AUTH_TOKEN.includes('paste')) {
-      console.log();
-      console.log('📋 To get your WS_AUTH_TOKEN:');
-      console.log('   1. Load the extension/ folder in chrome://extensions/');
-      console.log('   2. Click the VenomBrowser Bridge icon in your toolbar');
-      console.log('   3. Click the auth token to copy it');
-      console.log();
-      const token = await ask(rl, '🔐 Paste your Auth Token (or press Enter to skip): ');
-      if (token.trim()) {
-        updates.WS_AUTH_TOKEN = token.trim();
-        console.log('✅ WS_AUTH_TOKEN saved!');
-      } else {
-        console.log('⏭️  Skipped — you can set it later with: node bin/venombrowser-setup.js --token=<token>');
-      }
-    } else {
-      console.log(`🔐 WS_AUTH_TOKEN: ${existing.WS_AUTH_TOKEN.slice(0, 8)}...`);
-    }
-
-    rl.close();
-  }
-
-  // ── Save ──────────────────────────────────────────────────────────────────
-  if (Object.keys(updates).length > 0) {
-    updateEnvFile(updates);
-    console.log();
-    console.log('💾 Configuration saved to server/.env');
-  } else {
-    console.log();
-    console.log('✅ Configuration is already up to date');
-  }
-
-  // ── Final summary ─────────────────────────────────────────────────────────
-  const final = { ...existing, ...updates };
-  console.log();
-  console.log('🚀 Next steps:');
-  if (!final.WS_AUTH_TOKEN || final.WS_AUTH_TOKEN.includes('paste')) {
-    console.log('   1. Set your WS_AUTH_TOKEN (see instructions above)');
-    console.log('   2. venombrowser start     — start the bridge server');
-  } else {
-    console.log('   1. venombrowser start     — start the bridge server');
-  }
-  console.log('   2. venombrowser chat      — start interactive chat');
-  console.log('   3. venombrowser agent "task" — run a one-shot task');
-  console.log();
-
-  // ── Auto-register with agents ────────────────────────────────────────────
-  try {
-    const { connect } = require('../src/connect');
-    connect();
-  } catch (err) {
-    console.log('ℹ️  Auto-registration skipped:', err.message);
-    // Still print manual instructions as fallback
-    const absPath = path.resolve(__dirname, 'venombrowser-mcp.js').replace(/\\/g, '/');
-    console.log('🔌 To connect Claude Code or other MCP agents, add this to your MCP config:');
-    console.log(JSON.stringify({
-      "venombrowser": {
-        command: "node",
-        args: [absPath],
-        env: {
-          REST_API_KEY: final.REST_API_KEY || updates.REST_API_KEY || 'your-key'
-        }
-      }
-    }, null, 2));
-    console.log();
-  }
-}
-
-main().catch(console.error);
-
+#!/usr/bin/env node
+/**
+ * VenomBrowser Setup — Interactive setup wizard
+ *
+ * Helps users (and agents) configure VenomBrowser by:
+ * 1. Creating/updating .env from .env.example
+ * 2. Configuring the LLM provider (optional)
+ *
+ * Usage:
+ *   node bin/venombrowser-setup.js
+ *   node bin/venombrowser-setup.js --auto          # Non-interactive: use defaults
+ */
+
+const fs = require('fs');
+const path = require('path');
+const readline = require('readline');
+
+const ENV_PATH = path.join(__dirname, '..', '.env');
+const EXAMPLE_PATH = path.join(__dirname, '..', '.env.example');
+
+function parseEnv(content) {
+  const vars = {};
+  for (const line of content.split('\n')) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith('#')) continue;
+    const eqIndex = trimmed.indexOf('=');
+    if (eqIndex === -1) continue;
+    const key = trimmed.slice(0, eqIndex).trim();
+    const val = trimmed.slice(eqIndex + 1).trim();
+    vars[key] = val;
+  }
+  return vars;
+}
+
+function updateEnvFile(updates) {
+  let content;
+  if (fs.existsSync(ENV_PATH)) {
+    content = fs.readFileSync(ENV_PATH, 'utf8');
+  } else if (fs.existsSync(EXAMPLE_PATH)) {
+    content = fs.readFileSync(EXAMPLE_PATH, 'utf8');
+  } else {
+    // Build minimal .env
+    content = Object.entries(updates).map(([k, v]) => `${k}=${v}`).join('\n') + '\n';
+    fs.writeFileSync(ENV_PATH, content);
+    return;
+  }
+
+  for (const [key, value] of Object.entries(updates)) {
+    // Replace existing key= lines, or append
+    const regex = new RegExp(`^${key}=.*$`, 'm');
+    if (regex.test(content)) {
+      content = content.replace(regex, `${key}=${value}`);
+    } else {
+      content += `\n${key}=${value}\n`;
+    }
+  }
+
+  fs.writeFileSync(ENV_PATH, content);
+}
+
+function ask(rl, question) {
+  return new Promise(resolve => rl.question(question, resolve));
+}
+
+async function main() {
+  console.log('🕷️ VenomBrowser Bridge Setup');
+  console.log('═'.repeat(50));
+
+  // Load existing env
+  let existing = {};
+  if (fs.existsSync(ENV_PATH)) {
+    existing = parseEnv(fs.readFileSync(ENV_PATH, 'utf8'));
+    console.log('📄 Found existing .env file');
+  } else {
+    console.log('📄 No .env file found — will create one');
+  }
+
+  const crypto = require('crypto');
+  const updates = {};
+  
+  // ── Auto-generate security tokens if missing ──────────────────────────────
+  if (!existing.REST_API_KEY) {
+    updates.REST_API_KEY = crypto.randomBytes(32).toString('hex');
+    console.log('🔑 Generated new REST_API_KEY');
+  }
+  if (!existing.WS_AUTH_TOKEN) {
+    updates.WS_AUTH_TOKEN = crypto.randomUUID();
+    console.log('🔑 Generated new WS_AUTH_TOKEN');
+  }
+  
+  const finalWsToken = updates.WS_AUTH_TOKEN || existing.WS_AUTH_TOKEN;
+
+  // ── Inject token into extension ───────────────────────────────────────────
+  const bgPath = path.join(__dirname, '..', '..', 'extension', 'background.js');
+  if (fs.existsSync(bgPath)) {
+    let bgContent = fs.readFileSync(bgPath, 'utf8');
+    // Look for INJECTED_TOKEN = '__WS_AUTH_TOKEN__' or an already injected token
+    bgContent = bgContent.replace(/const INJECTED_TOKEN = '.*?';/, `const INJECTED_TOKEN = '${finalWsToken}';`);
+    fs.writeFileSync(bgPath, bgContent);
+    console.log('💉 Injected WS_AUTH_TOKEN into extension/background.js');
+  }
+
+  // ── Save ──────────────────────────────────────────────────────────────────
+  if (Object.keys(updates).length > 0) {
+    updateEnvFile(updates);
+    console.log();
+    console.log('💾 Configuration saved to server/.env');
+  } else {
+    console.log();
+    console.log('✅ Configuration is already up to date');
+  }
+
+  // ── Final summary ─────────────────────────────────────────────────────────
+  console.log();
+  console.log('🚀 Next steps:');
+  console.log('   1. IMPORTANT: Go to chrome://extensions and click the "Reload" icon on the VenomBrowser extension');
+  console.log('      (This is required to apply the newly generated security token)');
+  console.log('   2. Start using your AI agent (the bridge daemon will auto-start)');
+  console.log('   3. venombrowser chat      — start interactive chat');
+  console.log('   4. venombrowser agent "task" — run a one-shot task');
+  console.log();
+
+  // ── Auto-register with agents ────────────────────────────────────────────
+  try {
+    const { connect } = require('../src/connect');
+    connect();
+  } catch (err) {
+    console.log('ℹ️  Auto-registration skipped:', err.message);
+    // Still print manual instructions as fallback
+    const absPath = path.resolve(__dirname, 'venombrowser-mcp.js').replace(/\\/g, '/');
+    console.log('🔌 To connect Claude Code or other MCP agents, add this to your MCP config:');
+    console.log(JSON.stringify({
+      "venombrowser": {
+        command: "node",
+        args: [absPath],
+        env: {
+          BRIDGE_PORT: "10086"
+        }
+      }
+    }, null, 2));
+    console.log();
+  }
+}
+
+main().catch(console.error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "venombrowser",
-  "version": "4.1.0",
+  "version": "4.1.2",
   "description": "Agent-agnostic browser automation platform — give any AI agent eyes and hands in your real Chrome browser",
   "author": "TechVenom",
   "main": "src/bridge-server.js",