chore: test list tabs (#208)

src/context.ts

@@ -119,7 +119,10 @@ export class Context {
   async run(tool: Tool, params: Record<string, unknown> | undefined) {
     // Tab management is done outside of the action() call.
     const toolResult = await tool.handle(this, params);
-    const { code, action, waitForNetwork, captureSnapshot } = toolResult;
+    const { code, action, waitForNetwork, captureSnapshot, resultOverride } = toolResult;
+
+    if (resultOverride)
+      return resultOverride;
 
     if (!this._currentTab) {
       return {
@@ -132,12 +135,12 @@ export class Context {
 
     const tab = this.currentTabOrDie();
     // TODO: race against modal dialogs to resolve clicks.
-    let actionResult: { content?: (ImageContent | TextContent)[] };
+    let actionResult: { content?: (ImageContent | TextContent)[] } | undefined;
     try {
       if (waitForNetwork)
-        actionResult = await waitForCompletion(tab.page, () => action()) ?? undefined;
+        actionResult = await waitForCompletion(tab.page, async () => action?.()) ?? undefined;
       else
-        actionResult = await action();
+        actionResult = await action?.() ?? undefined;
     } finally {
       if (captureSnapshot)
         await tab.captureSnapshot();
@@ -163,11 +166,16 @@ ${code.join('\n')}
     if (this.tabs().length > 1)
       result.push(await this.listTabsMarkdown(), '');
 
-    if (tab.hasSnapshot()) {
+    if (this.tabs().length > 1)
-      if (this.tabs().length > 1)
+      result.push('### Current tab');
-        result.push('### Current tab');
+
+    result.push(
+        `- Page URL: ${tab.page.url()}`,
+        `- Page Title: ${await tab.page.title()}`
+    );
+
+    if (captureSnapshot && tab.hasSnapshot())
       result.push(tab.snapshotOrDie().text());
-    }
 
     const content = actionResult?.content ?? [];
 
@@ -338,19 +346,12 @@ class PageSnapshot {
 
   private async _build(page: playwright.Page) {
     const yamlDocument = await this._snapshotFrame(page);
-    const lines = [];
+    this._text = [
-    lines.push(
+      `- Page Snapshot`,
-        `- Page URL: ${page.url()}`,
+      '```yaml',
-        `- Page Title: ${await page.title()}`
+      yamlDocument.toString({ indentSeq: false }).trim(),
-    );
+      '```',
-    lines.push(
+    ].join('\n');
-        `- Page Snapshot`,
-        '```yaml',
-        yamlDocument.toString().trim(),
-        '```',
-        ''
-    );
-    this._text = lines.join('\n');
   }
 
   private async _snapshotFrame(frame: playwright.Page | playwright.FrameLocator) {

src/tools/common.ts

@@ -37,7 +37,6 @@ const wait: ToolFactory = captureSnapshot => ({
     await new Promise(f => setTimeout(f, Math.min(10000, validatedParams.time * 1000)));
     return {
       code: [`// Waited for ${validatedParams.time} seconds`],
-      action: async () => ({}),
       captureSnapshot,
       waitForNetwork: false,
     };
@@ -59,7 +58,6 @@ const close: Tool = {
     await context.close();
     return {
       code: [`// Internal to close the page`],
-      action: async () => ({}),
       captureSnapshot: false,
       waitForNetwork: false,
     };
@@ -91,7 +89,6 @@ const resize: ToolFactory = captureSnapshot => ({
 
     const action = async () => {
       await tab.page.setViewportSize({ width: validatedParams.width, height: validatedParams.height });
-      return {};
     };
 
     return {

src/tools/files.ts

@@ -45,7 +45,6 @@ const uploadFile: ToolFactory = captureSnapshot => ({
     const action = async () => {
       await modalState.fileChooser.setFiles(validatedParams.paths);
       context.clearModalState(modalState);
-      return {};
     };
 
     return {

src/tools/install.ts

@@ -49,7 +49,6 @@ const install: Tool = {
     });
     return {
       code: [`// Browser ${channel} installed`],
-      action: async () => ({}),
       captureSnapshot: false,
       waitForNetwork: false,
     };

src/tools/keyboard.ts

@@ -41,7 +41,7 @@ const pressKey: ToolFactory = captureSnapshot => ({
       `await page.keyboard.press('${validatedParams.key}');`,
     ];
 
-    const action = () => tab.page.keyboard.press(validatedParams.key).then(() => ({}));
+    const action = () => tab.page.keyboard.press(validatedParams.key);
 
     return {
       code,

src/tools/navigate.ts

@@ -44,7 +44,6 @@ const navigate: ToolFactory = captureSnapshot => ({
 
     return {
       code,
-      action: async () => ({}),
       captureSnapshot,
       waitForNetwork: false,
     };
@@ -71,7 +70,6 @@ const goBack: ToolFactory = captureSnapshot => ({
 
     return {
       code,
-      action: async () => ({}),
       captureSnapshot,
       waitForNetwork: false,
     };
@@ -96,7 +94,6 @@ const goForward: ToolFactory = captureSnapshot => ({
     ];
     return {
       code,
-      action: async () => ({}),
       captureSnapshot,
       waitForNetwork: false,
     };

src/tools/pdf.ts

@@ -47,7 +47,7 @@ const pdf: Tool = {
 
     return {
       code,
-      action: async () => tab.page.pdf({ path: fileName }).then(() => ({})),
+      action: async () => tab.page.pdf({ path: fileName }).then(() => {}),
       captureSnapshot: false,
       waitForNetwork: false,
     };

src/tools/screen.ts

@@ -77,7 +77,7 @@ const moveMouse: Tool = {
       `// Move mouse to (${validatedParams.x}, ${validatedParams.y})`,
       `await page.mouse.move(${validatedParams.x}, ${validatedParams.y});`,
     ];
-    const action = () => tab.page.mouse.move(validatedParams.x, validatedParams.y).then(() => ({}));
+    const action = () => tab.page.mouse.move(validatedParams.x, validatedParams.y);
     return {
       code,
       action,
@@ -113,7 +113,6 @@ const click: Tool = {
       await tab.page.mouse.move(validatedParams.x, validatedParams.y);
       await tab.page.mouse.down();
       await tab.page.mouse.up();
-      return {};
     };
     return {
       code,
@@ -157,7 +156,6 @@ const drag: Tool = {
       await tab.page.mouse.down();
       await tab.page.mouse.move(validatedParams.endX, validatedParams.endY);
       await tab.page.mouse.up();
-      return {};
     };
 
     return {
@@ -196,7 +194,6 @@ const type: Tool = {
       await tab.page.keyboard.type(validatedParams.text);
       if (validatedParams.submit)
         await tab.page.keyboard.press('Enter');
-      return {};
     };
 
     if (validatedParams.submit) {

src/tools/snapshot.ts

@@ -40,7 +40,6 @@ const snapshot: Tool = {
 
     return {
       code: [`// <internal code to capture accessibility snapshot>`],
-      action: async () => ({}),
       captureSnapshot: true,
       waitForNetwork: false,
     };
@@ -72,7 +71,7 @@ const click: Tool = {
 
     return {
       code,
-      action: () => locator.click().then(() => ({})),
+      action: () => locator.click(),
       captureSnapshot: true,
       waitForNetwork: true,
     };
@@ -107,7 +106,7 @@ const drag: Tool = {
 
     return {
       code,
-      action: () => startLocator.dragTo(endLocator).then(() => ({})),
+      action: () => startLocator.dragTo(endLocator),
       captureSnapshot: true,
       waitForNetwork: true,
     };
@@ -134,7 +133,7 @@ const hover: Tool = {
 
     return {
       code,
-      action: () => locator.hover().then(() => ({})),
+      action: () => locator.hover(),
       captureSnapshot: true,
       waitForNetwork: true,
     };
@@ -181,7 +180,7 @@ const type: Tool = {
 
     return {
       code,
-      action: () => steps.reduce((acc, step) => acc.then(step), Promise.resolve()).then(() => ({})),
+      action: () => steps.reduce((acc, step) => acc.then(step), Promise.resolve()),
       captureSnapshot: true,
       waitForNetwork: true,
     };
@@ -212,7 +211,7 @@ const selectOption: Tool = {
 
     return {
       code,
-      action: () => locator.selectOption(validatedParams.values).then(() => ({})),
+      action: () => locator.selectOption(validatedParams.values).then(() => {}),
       captureSnapshot: true,
       waitForNetwork: true,
     };

src/tools/tabs.ts

@@ -28,12 +28,18 @@ const listTabs: Tool = {
     inputSchema: zodToJsonSchema(z.object({})),
   },
 
-  handle: async () => {
+  handle: async context => {
+    await context.ensureTab();
     return {
       code: [`// <internal code to list tabs>`],
-      action: async () => ({}),
       captureSnapshot: false,
       waitForNetwork: false,
+      resultOverride: {
+        content: [{
+          type: 'text',
+          text: await context.listTabsMarkdown(),
+        }],
+      },
     };
   },
 };
@@ -60,7 +66,6 @@ const selectTab: ToolFactory = captureSnapshot => ({
 
     return {
       code,
-      action: async () => ({}),
       captureSnapshot,
       waitForNetwork: false
     };
@@ -91,7 +96,6 @@ const newTab: ToolFactory = captureSnapshot => ({
     ];
     return {
       code,
-      action: async () => ({}),
       captureSnapshot,
       waitForNetwork: false
     };
@@ -119,7 +123,6 @@ const closeTab: ToolFactory = captureSnapshot => ({
     ];
     return {
       code,
-      action: async () => ({}),
       captureSnapshot,
       waitForNetwork: false
     };

src/tools/tool.ts

@@ -36,9 +36,10 @@ export type ModalState = FileUploadModalState;
 
 export type ToolResult = {
   code: string[];
-  action: () => Promise<{ content?: (ImageContent | TextContent)[] }>;
+  action?: () => Promise<{ content?: (ImageContent | TextContent)[] } | undefined | void>;
   captureSnapshot: boolean;
   waitForNetwork: boolean;
+  resultOverride?: { content?: (ImageContent | TextContent)[] };
 };
 
 export type Tool = {

tests/core.spec.ts

@@ -96,8 +96,8 @@ await page.getByRole('combobox').selectOption(['bar']);
 - Page Snapshot
 \`\`\`yaml
 - combobox [ref=s2e3]:
-    - option "Foo" [ref=s2e4]
+  - option "Foo" [ref=s2e4]
-    - option "Bar" [selected] [ref=s2e5]
+  - option "Bar" [selected] [ref=s2e5]
 \`\`\`
 `);
 });
@@ -129,9 +129,9 @@ await page.getByRole('listbox').selectOption(['bar', 'baz']);
 - Page Snapshot
 \`\`\`yaml
 - listbox [ref=s2e3]:
-    - option "Foo" [ref=s2e4]
+  - option "Foo" [ref=s2e4]
-    - option "Bar" [selected] [ref=s2e5]
+  - option "Bar" [selected] [ref=s2e5]
-    - option "Baz" [selected] [ref=s2e6]
+  - option "Baz" [selected] [ref=s2e6]
 \`\`\`
 `);
 });

tests/iframes.spec.ts

@@ -26,12 +26,11 @@ test('stitched aria frames', async ({ client }) => {
 \`\`\`yaml
 - heading "Hello" [level=1] [ref=s1e3]
 - iframe [ref=s1e4]:
-    - button "World" [ref=f1s1e3]
+  - button "World" [ref=f1s1e3]
-    - main [ref=f1s1e4]:
+  - main [ref=f1s1e4]:
-        - iframe [ref=f1s1e5]:
+    - iframe [ref=f1s1e5]:
-            - paragraph [ref=f2s1e3]: Nested
+      - paragraph [ref=f2s1e3]: Nested
-\`\`\`
+\`\`\``);
-`);
 
   expect(await client.callTool({
     name: 'browser_click',

tests/tabs.spec.ts

@@ -29,6 +29,22 @@ async function createTab(client: Client, title: string, body: string) {
   });
 }
 
+test('list initial tabs', async ({ client }) => {
+  expect(await client.callTool({
+    name: 'browser_tab_list',
+  })).toHaveTextContent(`### Open tabs
+- 1: (current) [] (about:blank)`);
+});
+
+test('list first tab', async ({ client }) => {
+  await createTab(client, 'Tab one', 'Body one');
+  expect(await client.callTool({
+    name: 'browser_tab_list',
+  })).toHaveTextContent(`### Open tabs
+- 1: [] (about:blank)
+- 2: (current) [Tab one] (data:text/html,<title>Tab one</title><body>Body one</body>)`);
+});
+
 test('create new tab', async ({ client }) => {
   expect(await createTab(client, 'Tab one', 'Body one')).toHaveTextContent(`
 - Ran Playwright code: