@everydaydevopsio/pilot 0.6.3 → 0.7.0

package/src/mcp/server.ts

@@ -1,18 +1,12 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { BrowserManager } from '../browser.js';
+import { createDriver } from '../browser/driver/factory.js';
+import type { BrowserDriver, DriverSession } from '../browser/driver/types.js';
 import { ElementRefMap } from '../browser/inspect/element-ref.js';
-import { resetCssState } from '../browser/inspect/styles.js';
 import { DialogQueue } from '../browser/interaction/dialogs.js';
-import { attachDialogHandler } from '../browser/interaction/dialogs.js';
-import {
-  DownloadTracker,
-  enableDownloads,
-  attachDownloadHandler
-} from '../browser/interaction/downloads.js';
+import { DownloadTracker } from '../browser/interaction/downloads.js';
 import { NetworkBuffer } from '../browser/network/network-buffer.js';
-import { attachNetworkMonitor } from '../browser/network/network-monitor.js';
 import { loadConfig } from '../util/config.js';
-import { ConsoleBuffer, type ConsoleMessage } from './console-buffer.js';
+import { ConsoleBuffer } from './console-buffer.js';
 import { registerBrowserTools } from './tools/browser.js';
 import { registerErrorTools } from './tools/errors.js';
 import { registerSnapshotTools } from './tools/snapshot.js';
@@ -24,6 +18,7 @@ import { registerFilesTools } from './tools/files.js';
 import { createTraceState } from '../browser/performance/trace.js';
 import { registerPerformanceTools } from './tools/performance.js';
 import { registerConnectTools } from './tools/connect.js';
+import { withCapabilityGate } from './tools/driver-context.js';
 
 export interface McpConfig {
   bufferSize: number;
@@ -31,17 +26,35 @@ export interface McpConfig {
   cdpHost?: string;
 }
 
-export interface BrowserContext {
-  manager: BrowserManager | null;
-  consoleBuffer: ConsoleBuffer;
-  elementRefMap: ElementRefMap;
-  networkBuffer: NetworkBuffer;
-  dialogQueue: DialogQueue;
-  downloadTracker: DownloadTracker;
-  traceState: ReturnType<typeof createTraceState>;
+export interface BrowserContext extends DriverSession {
+  driver: BrowserDriver | null;
   baseConfig: McpConfig;
 }
 
+export type DriverFactory = () => BrowserDriver;
+
+/**
+ * Register every Pilot tool behind the capability gate, so a tool the active
+ * driver cannot support fails before its handler runs.
+ */
+export function registerAllTools(
+  server: McpServer,
+  context: BrowserContext,
+  makeDriver: DriverFactory
+): void {
+  const gated = withCapabilityGate(server, () => context.driver);
+  registerBrowserTools(gated, context, makeDriver);
+  registerErrorTools(gated, context.consoleBuffer);
+  registerSnapshotTools(gated, context);
+  registerInteractionTools(gated, context);
+  registerNetworkTools(gated, context);
+  registerRuntimeTools(gated, context.consoleBuffer);
+  registerStylesTools(gated, context);
+  registerFilesTools(gated, context);
+  registerPerformanceTools(gated, context);
+  registerConnectTools(gated, context, makeDriver);
+}
+
 export async function createMcpServer(config: McpConfig): Promise<{
   server: McpServer;
   cleanup: () => Promise<void>;
@@ -51,88 +64,32 @@ export async function createMcpServer(config: McpConfig): Promise<{
     version: '0.1.0'
   });
 
-  const consoleBuffer = new ConsoleBuffer(config.bufferSize);
-  const elementRefMap = new ElementRefMap();
-  const networkBuffer = new NetworkBuffer();
-  const dialogQueue = new DialogQueue();
-  const downloadTracker = new DownloadTracker();
-  const traceState = createTraceState();
-
   const context: BrowserContext = {
-    manager: null,
-    consoleBuffer,
-    elementRefMap,
-    networkBuffer,
-    dialogQueue,
-    downloadTracker,
-    traceState,
+    driver: null,
+    consoleBuffer: new ConsoleBuffer(config.bufferSize),
+    elementRefMap: new ElementRefMap(),
+    networkBuffer: new NetworkBuffer(),
+    dialogQueue: new DialogQueue(),
+    downloadTracker: new DownloadTracker(),
+    traceState: createTraceState(),
     baseConfig: config
   };
 
-  function attachEventHandlers(manager: BrowserManager): void {
-    let monitoredClient: unknown = null;
-
-    function ensureMonitors(): void {
-      const client = manager.getClient();
-      if (client && client !== monitoredClient) {
-        attachNetworkMonitor(client, networkBuffer);
-        attachDialogHandler(client, dialogQueue);
-        attachDownloadHandler(client, downloadTracker);
-        void enableDownloads(client).catch(() => {
-          // Download behavior setup may fail in some environments
-        });
-        monitoredClient = client;
-      }
-    }
-
-    manager.setEventCallback((event, data) => {
-      if (event === 'console_message') {
-        consoleBuffer.push(data as ConsoleMessage);
-      }
-      if (event === 'page_navigated') {
-        elementRefMap.invalidate();
-      }
-      if (event === 'browser_connected') {
-        ensureMonitors();
-      }
-      if (event === 'browser_disconnected') {
-        monitoredClient = null;
-        resetCssState();
-        dialogQueue.clear();
-        downloadTracker.clear();
-      }
-      // Reattach after tab switch (new client, no connect event)
-      ensureMonitors();
-    });
-  }
-
-  function makeBrowserManager(): BrowserManager {
-    const browserConfig = loadConfig({
-      cdpPort: config.cdpPort,
-      cdpHost: config.cdpHost
-    });
-    const manager = new BrowserManager(browserConfig);
-    attachEventHandlers(manager);
-    return manager;
-  }
+  const makeDriver: DriverFactory = () =>
+    createDriver(
+      'chrome',
+      loadConfig({ cdpPort: config.cdpPort, cdpHost: config.cdpHost }),
+      context
+    );
 
-  registerBrowserTools(server, context, makeBrowserManager);
-  registerErrorTools(server, consoleBuffer);
-  registerSnapshotTools(server, context);
-  registerInteractionTools(server, context);
-  registerNetworkTools(server, context);
-  registerRuntimeTools(server, consoleBuffer);
-  registerStylesTools(server, context);
-  registerFilesTools(server, context);
-  registerPerformanceTools(server, context);
-  registerConnectTools(server, context, makeBrowserManager);
+  registerAllTools(server, context, makeDriver);
 
   return {
     server,
     cleanup: async () => {
-      if (context.manager) {
-        await context.manager.destroy();
-        context.manager = null;
+      if (context.driver) {
+        await context.driver.destroy();
+        context.driver = null;
       }
     }
   };

package/src/mcp/tools/browser.ts

@@ -1,32 +1,14 @@
 import { z } from 'zod';
 import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import type { Client } from 'chrome-remote-interface';
-import type { BrowserManager } from '../../browser.js';
-import type { BrowserContext } from '../server.js';
+import type { BrowserContext, DriverFactory } from '../server.js';
 import { DEFAULT_STARTUP_TIMEOUT_MS } from '../../browser/chrome-launcher.js';
 import {
   listProfiles,
   pilotDataDir,
   stopPilotBrowsers
 } from '../../browser/sessions.js';
-import { executeScreenshot } from '../../commands/screenshot.js';
-import { executeNavigate } from '../../commands/navigate.js';
-import { executeClick } from '../../commands/click.js';
-import { executeType } from '../../commands/type.js';
-import { executeEvaluate } from '../../commands/evaluate.js';
-import { executeWait } from '../../commands/wait.js';
-import { executePageInfo } from '../../commands/page_info.js';
-import {
-  executeListTabs,
-  executeNewTab,
-  executeCloseTab,
-  executeSwitchTab
-} from '../../commands/tabs.js';
-import {
-  VIEWPORT_PRESETS,
-  applyViewport,
-  type ViewportConfig
-} from '../../viewport.js';
+import { VIEWPORT_PRESETS } from '../../viewport.js';
+import { requireDriver } from './driver-context.js';
 
 // Raw shapes for MCP SDK (expects ZodRawShape, not ZodObject)
 
@@ -248,22 +230,10 @@ const viewportResizeShape = {
     )
 };
 
-function requireClient(context: BrowserContext): {
-  client: Client;
-  manager: BrowserManager;
-} {
-  const manager = context.manager;
-  if (!manager || !manager.isConnected()) {
-    throw new Error('Browser not started. Call browser_start first.');
-  }
-  const client = manager.getClient()!;
-  return { client, manager };
-}
-
 export function registerBrowserTools(
   server: McpServer,
   context: BrowserContext,
-  makeBrowserManager: () => BrowserManager
+  makeDriver: DriverFactory
 ): void {
   server.tool(
     'browser_start',
@@ -280,7 +250,7 @@ export function registerBrowserTools(
       responsive,
       startupTimeoutMs
     }) => {
-      if (context.manager?.isConnected()) {
+      if (context.driver?.isConnected()) {
         return {
           content: [
             {
@@ -291,14 +261,14 @@ export function registerBrowserTools(
         };
       }
 
-      if (context.manager) {
-        await context.manager.destroy();
-        context.manager = null;
+      if (context.driver) {
+        await context.driver.destroy();
+        context.driver = null;
       }
 
-      const manager = makeBrowserManager();
+      const driver = makeDriver();
       const { headless: effectiveHeadless, viewport: effectiveViewport } =
-        await manager.launch({
+        await driver.launch({
           headless,
           chromePath,
           profileName,
@@ -309,7 +279,7 @@ export function registerBrowserTools(
           responsive,
           startupTimeoutMs
         });
-      context.manager = manager;
+      context.driver = driver;
 
       return {
         content: [
@@ -327,7 +297,7 @@ export function registerBrowserTools(
     'Stop the Chrome browser and free all resources.',
     {},
     async () => {
-      if (!context.manager) {
+      if (!context.driver) {
         return {
           content: [
             {
@@ -338,8 +308,8 @@ export function registerBrowserTools(
         };
       }
 
-      await context.manager.destroy();
-      context.manager = null;
+      await context.driver.destroy();
+      context.driver = null;
 
       return {
         content: [{ type: 'text' as const, text: 'Browser stopped.' }]
@@ -353,7 +323,7 @@ export function registerBrowserTools(
     {},
     async () => {
       const status = {
-        session: context.manager?.getSessionInfo() ?? {
+        session: context.driver?.getSessionInfo() ?? {
           mode: 'none',
           connected: false
         },
@@ -374,10 +344,10 @@ export function registerBrowserTools(
     {},
     async () => {
       const lines: string[] = [];
-      if (context.manager) {
-        const info = context.manager.getSessionInfo();
-        await context.manager.destroy();
-        context.manager = null;
+      if (context.driver) {
+        const info = context.driver.getSessionInfo();
+        await context.driver.destroy();
+        context.driver = null;
         if (info.mode === 'launched') {
           lines.push(
             `this session: stopped Chrome pid ${info.pid} (profile "${info.profile}")`
@@ -410,8 +380,7 @@ export function registerBrowserTools(
     'Capture a screenshot of the current browser viewport or full page',
     screenshotShape,
     async ({ format, quality, fullPage }) => {
-      const { client } = requireClient(context);
-      const result = await executeScreenshot(client, {
+      const result = await requireDriver(context).screenshot({
         format,
         quality,
         fullPage
@@ -446,8 +415,7 @@ export function registerBrowserTools(
     'Navigate to a URL and wait for page load',
     navigateShape,
     async ({ url, waitUntil, timeoutMs }) => {
-      const { client, manager } = requireClient(context);
-      const result = await executeNavigate(client, manager, {
+      const result = await requireDriver(context).navigate({
         url,
         waitUntil,
         timeoutMs
@@ -485,8 +453,7 @@ export function registerBrowserTools(
         };
       }
 
-      const { client } = requireClient(context);
-      const result = await executeClick(client, params, context.elementRefMap);
+      const result = await requireDriver(context).click(params);
 
       return {
         content: [
@@ -504,8 +471,7 @@ export function registerBrowserTools(
     'Type text into the focused element, a ref (from browser_snapshot), or a CSS selector. Generates keystroke events (use browser_fill to replace a field value entirely).',
     typeShape,
     async (params) => {
-      const { client } = requireClient(context);
-      await executeType(client, params, context.elementRefMap);
+      await requireDriver(context).type(params);
 
       const target = params.ref ?? params.selector;
       return {
@@ -524,8 +490,7 @@ export function registerBrowserTools(
     'Execute JavaScript in the page context and return the result',
     evaluateShape,
     async ({ expression, awaitPromise, timeoutMs }) => {
-      const { client } = requireClient(context);
-      const result = await executeEvaluate(client, {
+      const result = await requireDriver(context).evaluate({
         expression,
         awaitPromise,
         timeoutMs
@@ -568,8 +533,7 @@ export function registerBrowserTools(
         };
       }
 
-      const { client, manager } = requireClient(context);
-      const result = await executeWait(client, manager, params);
+      const result = await requireDriver(context).wait(params);
 
       return {
         content: [
@@ -587,8 +551,7 @@ export function registerBrowserTools(
     'Get information about the current page (URL, title, ready state)',
     {},
     async () => {
-      const { client } = requireClient(context);
-      const result = await executePageInfo(client);
+      const result = await requireDriver(context).pageInfo();
 
       return {
         content: [
@@ -606,8 +569,7 @@ export function registerBrowserTools(
     'List all open browser tabs with their target IDs, URLs, titles, and active status',
     {},
     async () => {
-      const { manager } = requireClient(context);
-      const tabs = await executeListTabs(manager);
+      const tabs = await requireDriver(context).listTabs();
 
       return {
         content: [
@@ -625,8 +587,7 @@ export function registerBrowserTools(
     'Open a new browser tab, optionally navigating to a URL',
     newTabShape,
     async ({ url }) => {
-      const { manager } = requireClient(context);
-      const result = await executeNewTab(manager, url);
+      const result = await requireDriver(context).newTab(url);
 
       return {
         content: [
@@ -644,8 +605,7 @@ export function registerBrowserTools(
     'Close a browser tab by its target ID. Cannot close the currently active tab.',
     closeTabShape,
     async ({ targetId }) => {
-      const { manager } = requireClient(context);
-      await executeCloseTab(manager, targetId);
+      await requireDriver(context).closeTab(targetId);
 
       return {
         content: [
@@ -663,8 +623,7 @@ export function registerBrowserTools(
     'Switch the active browser tab to the one with the given target ID. All subsequent commands will target this tab.',
     switchTabShape,
     async ({ targetId }) => {
-      const { manager } = requireClient(context);
-      await executeSwitchTab(manager, targetId);
+      await requireDriver(context).switchTab(targetId);
 
       return {
         content: [
@@ -682,22 +641,12 @@ export function registerBrowserTools(
     'Resize the browser viewport to new dimensions. Updates both the window size and the rendering viewport. Disables responsive mode so the viewport stays locked at the specified size.',
     viewportResizeShape,
     async ({ width, height, deviceScaleFactor, mobile }) => {
-      const { client, manager } = requireClient(context);
-
-      const current = manager.getViewportConfig();
-      const effectiveMobile = mobile ?? current?.mobile ?? false;
-      const newConfig: ViewportConfig = {
+      const newConfig = await requireDriver(context).resizeViewport({
         width,
         height,
-        deviceScaleFactor: deviceScaleFactor ?? current?.deviceScaleFactor ?? 1,
-        mobile: effectiveMobile,
-        responsive: false,
-        ...(effectiveMobile &&
-          current?.userAgent && { userAgent: current.userAgent })
-      };
-
-      await applyViewport(client, newConfig);
-      manager.setViewportConfig(newConfig);
+        deviceScaleFactor,
+        mobile
+      });
 
       return {
         content: [
@@ -715,11 +664,11 @@ export function registerBrowserTools(
     'Manage browser tabs. Actions: "list" shows all tabs, "new" opens a tab (optional url), "select" switches to a tab (requires targetId), "close" closes a tab (requires targetId).',
     tabsShape,
     async ({ action, targetId, url }) => {
-      const { manager } = requireClient(context);
+      const driver = requireDriver(context);
 
       switch (action) {
         case 'list': {
-          const tabs = await executeListTabs(manager);
+          const tabs = await driver.listTabs();
           return {
             content: [
               { type: 'text' as const, text: JSON.stringify(tabs, null, 2) }
@@ -728,7 +677,7 @@ export function registerBrowserTools(
         }
 
         case 'new': {
-          const result = await executeNewTab(manager, url);
+          const result = await driver.newTab(url);
           return {
             content: [
               {
@@ -751,7 +700,7 @@ export function registerBrowserTools(
               isError: true
             };
           }
-          await executeSwitchTab(manager, targetId);
+          await driver.switchTab(targetId);
           return {
             content: [
               {
@@ -774,7 +723,7 @@ export function registerBrowserTools(
               isError: true
             };
           }
-          await executeCloseTab(manager, targetId);
+          await driver.closeTab(targetId);
           return {
             content: [
               {

package/src/mcp/tools/connect.ts

@@ -1,7 +1,6 @@
 import { z } from 'zod';
 import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import type { BrowserContext } from '../server.js';
-import type { BrowserManager } from '../../browser/browser-manager.js';
+import type { BrowserContext, DriverFactory } from '../server.js';
 import { executeConnect, formatConnectResult } from '../../commands/connect.js';
 
 const connectShape = {
@@ -21,14 +20,14 @@ const connectShape = {
 export function registerConnectTools(
   server: McpServer,
   context: BrowserContext,
-  makeBrowserManager: () => BrowserManager
+  makeDriver: DriverFactory
 ): void {
   server.tool(
     'browser_connect',
     'Connect to an existing Chrome instance with remote debugging enabled. Start Chrome with --remote-debugging-port=PORT, then use this tool to connect. Lists available tabs after connecting. Use browser_switch_tab to select a specific tab.',
     connectShape,
     async ({ host, port }) => {
-      if (context.manager?.isConnected()) {
+      if (context.driver?.isConnected()) {
         return {
           content: [
             {
@@ -39,22 +38,22 @@ export function registerConnectTools(
         };
       }
 
-      if (context.manager) {
-        await context.manager.destroy();
-        context.manager = null;
+      if (context.driver) {
+        await context.driver.destroy();
+        context.driver = null;
       }
 
-      const manager = makeBrowserManager();
+      const driver = makeDriver();
       try {
-        const result = await executeConnect(manager, { host, port });
-        context.manager = manager;
+        const result = await executeConnect(driver, { host, port });
+        context.driver = driver;
         return {
           content: [
             { type: 'text' as const, text: formatConnectResult(result) }
           ]
         };
       } catch (err) {
-        await manager.destroy();
+        await driver.destroy();
         throw err;
       }
     }

package/src/mcp/tools/driver-context.ts

@@ -0,0 +1,56 @@
+import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import {
+  TOOL_CAPABILITIES,
+  assertToolSupported
+} from '../../browser/driver/capabilities.js';
+import type { BrowserDriver } from '../../browser/driver/types.js';
+import type { ToolName } from './names.js';
+
+/** Return the connected driver or fail with the standard "not started" error. */
+export function requireDriver(context: {
+  driver: BrowserDriver | null;
+}): BrowserDriver {
+  const driver = context.driver;
+  if (!driver || !driver.isConnected()) {
+    throw new Error('Browser not started. Call browser_start first.');
+  }
+  return driver;
+}
+
+function isToolName(name: string): name is ToolName {
+  return Object.prototype.hasOwnProperty.call(TOOL_CAPABILITIES, name);
+}
+
+/**
+ * Wrap an McpServer so every registered tool first checks that the active
+ * driver (if any) has the capabilities the tool declares in TOOL_CAPABILITIES.
+ * Registering a tool without a capability declaration throws, so new tools
+ * cannot skip the check.
+ */
+export function withCapabilityGate(
+  server: McpServer,
+  getDriver: () => BrowserDriver | null
+): McpServer {
+  return new Proxy(server, {
+    get(target, prop, receiver) {
+      if (prop !== 'tool') return Reflect.get(target, prop, receiver);
+      return (name: string, ...rest: unknown[]) => {
+        if (!isToolName(name)) {
+          throw new Error(
+            `Tool ${name} has no entry in TOOL_CAPABILITIES; declare the driver capabilities it needs.`
+          );
+        }
+        const last = rest.length - 1;
+        const handler = rest[last];
+        if (typeof handler === 'function') {
+          rest[last] = async (...args: unknown[]) => {
+            const driver = getDriver();
+            if (driver) assertToolSupported(name, driver);
+            return handler(...args);
+          };
+        }
+        return (target.tool as (...a: unknown[]) => unknown)(name, ...rest);
+      };
+    }
+  });
+}

package/src/mcp/tools/files.ts

@@ -1,8 +1,8 @@
 import { z } from 'zod';
 import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import type { BrowserContext } from '../server.js';
-import { executeDialog, formatDialogResult } from '../../commands/dialog.js';
-import { executeUpload } from '../../commands/upload.js';
+import { formatDialogResult } from '../../commands/dialog.js';
+import { requireDriver } from './driver-context.js';
 import {
   executeDownloads,
   formatDownloadsResult
@@ -49,15 +49,6 @@ const downloadsShape = {
     .describe('Timeout for wait action in milliseconds (default: 30000)')
 };
 
-function requireContext(context: BrowserContext) {
-  const manager = context.manager;
-  if (!manager || !manager.isConnected()) {
-    throw new Error('Browser not started. Call browser_start first.');
-  }
-  const client = manager.getClient()!;
-  return { client };
-}
-
 export function registerFilesTools(
   server: McpServer,
   context: BrowserContext
@@ -67,8 +58,7 @@ export function registerFilesTools(
     'Handle browser dialogs (alert, confirm, prompt). Use "list" to see pending dialogs, "accept" to click OK/Yes, or "dismiss" to click Cancel/No. For prompt dialogs, provide promptText with accept.',
     dialogShape,
     async ({ action, promptText }) => {
-      const { client } = requireContext(context);
-      const result = await executeDialog(client, context.dialogQueue, {
+      const result = await requireDriver(context).dialog({
         action,
         promptText
       });
@@ -83,8 +73,7 @@ export function registerFilesTools(
     'Upload files to a file input element by ref. Files must exist, be regular files, and be under allowed roots (PILOT_UPLOAD_ROOTS env, default: cwd). Use browser_snapshot to find file input refs.',
     uploadShape,
     async ({ ref, files }) => {
-      const { client } = requireContext(context);
-      const result = await executeUpload(client, context.elementRefMap, {
+      const result = await requireDriver(context).upload({
         ref,
         files
       });
@@ -104,7 +93,7 @@ export function registerFilesTools(
     'Track file downloads. Actions: "list" shows tracked downloads with status/progress; "wait" blocks until a download (by GUID) completes; "clear" resets the tracker.',
     downloadsShape,
     async ({ action, guid, timeoutMs }) => {
-      requireContext(context);
+      requireDriver(context);
       const result = await executeDownloads(context.downloadTracker, {
         action,
         guid,