chore: convert console resource to tool (#193)

src/context.ts

@@ -111,18 +111,21 @@ export class Context {
 
     if (this._currentTab === tab)
       this._currentTab = this._tabs[Math.min(index, this._tabs.length - 1)];
-    const browser = this._browser;
-    if (this._browserContext && !this._tabs.length) {
-      void this._browserContext.close().then(() => browser?.close()).catch(() => {});
-      this._browser = undefined;
-      this._browserContext = undefined;
-    }
+    if (this._browserContext && !this._tabs.length)
+      void this.close();
   }
 
   async close() {
     if (!this._browserContext)
       return;
-    await this._browserContext.close();
+    const browserContext = this._browserContext;
+    const browser = this._browser;
+    this._browserContext = undefined;
+    this._browser = undefined;
+
+    await browserContext?.close().then(async () => {
+      await browser?.close();
+    }).catch(() => {});
   }
 
   private async _ensureBrowserContext() {

src/index.ts

@@ -20,6 +20,7 @@ import fs from 'fs';
 
 import { createServerWithTools } from './server';
 import common from './tools/common';
+import console from './tools/console';
 import files from './tools/files';
 import install from './tools/install';
 import keyboard from './tools/keyboard';
@@ -28,15 +29,14 @@ import pdf from './tools/pdf';
 import snapshot from './tools/snapshot';
 import tabs from './tools/tabs';
 import screen from './tools/screen';
-import { console as consoleResource } from './resources/console';
 
 import type { Tool, ToolCapability } from './tools/tool';
-import type { Resource } from './resources/resource';
 import type { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import type { LaunchOptions } from 'playwright';
 
 const snapshotTools: Tool[] = [
   ...common(true),
+  ...console,
   ...files(true),
   ...install,
   ...keyboard(true),
@@ -48,6 +48,7 @@ const snapshotTools: Tool[] = [
 
 const screenshotTools: Tool[] = [
   ...common(false),
+  ...console,
   ...files(false),
   ...install,
   ...keyboard(false),
@@ -57,10 +58,6 @@ const screenshotTools: Tool[] = [
   ...tabs(false),
 ];
 
-const resources: Resource[] = [
-  consoleResource,
-];
-
 type Options = {
   browser?: string;
   userDataDir?: string;
@@ -115,7 +112,7 @@ export async function createServer(options?: Options): Promise<Server> {
     name: 'Playwright',
     version: packageJSON.version,
     tools,
-    resources,
+    resources: [],
     browserName,
     userDataDir,
     launchOptions,

src/tools/console.ts

@@ -14,22 +14,32 @@
  * limitations under the License.
  */
 
-import type { Resource } from './resource';
+import { z } from 'zod';
+import { zodToJsonSchema } from 'zod-to-json-schema';
 
-export const console: Resource = {
+import type { Tool } from './tool';
+
+const consoleSchema = z.object({});
+
+const console: Tool = {
+  capability: 'core',
   schema: {
-    uri: 'browser://console',
-    name: 'Page console',
-    mimeType: 'text/plain',
+    name: 'browser_console_messages',
+    description: 'Returns all console messages',
+    inputSchema: zodToJsonSchema(consoleSchema),
   },
-
-  read: async (context, uri) => {
+  handle: async context => {
     const messages = await context.currentTab().console();
     const log = messages.map(message => `[${message.type().toUpperCase()}] ${message.text()}`).join('\n');
-    return [{
-      uri,
-      mimeType: 'text/plain',
-      text: log
-    }];
+    return {
+      content: [{
+        type: 'text',
+        text: log
+      }],
+    };
   },
 };
+
+export default [
+  console,
+];