chore: get tabid tool

Author: OrKoN

src/McpResponse.ts

@@ -57,11 +57,16 @@ export class McpResponse implements Response {
     includePreservedMessages?: boolean;
   };
   #devToolsData?: DevToolsData;
+  #tabId?: string;
 
   attachDevToolsData(data: DevToolsData): void {
     this.#devToolsData = data;
   }
 
+  setTabId(tabId: string): void {
+    this.#tabId = tabId;
+  }
+
   setIncludePages(value: boolean): void {
     this.#includePages = value;
   }
@@ -398,8 +403,13 @@ Call ${handleDialog.name} to handle it before continuing.`);
     const structuredContent: {
       snapshot?: object;
       snapshotFilePath?: string;
+      tabId?: string;
     } = {};
 
+    if (this.#tabId) {
+      structuredContent.tabId = this.#tabId;
+    }
+
     if (data.snapshot) {
       if (typeof data.snapshot === 'string') {
         response.push(`Saved snapshot to ${data.snapshot}.`);

src/tools/ToolDefinition.ts

@@ -77,6 +77,7 @@ export interface Response {
   attachConsoleMessage(msgid: number): void;
   // Allows re-using DevTools data queried by some tools.
   attachDevToolsData(data: DevToolsData): void;
+  setTabId(tabId: string): void;
 }
 
 /**

src/tools/pages.ts

@@ -289,6 +289,6 @@ export const getTabId = defineTool({
     const page = context.getPageById(request.params.pageId);
     // @ts-expect-error _tabId is internal.
     const tabId = page._tabId;
-    response.appendResponseLine(tabId);
+    response.setTabId(tabId);
   },
 });

tests/index.test.ts

@@ -102,7 +102,9 @@ describe('e2e', () => {
               continue;
             }
             if (
-              maybeTool.annotations?.conditions?.includes('experimentalInteropTools')
+              maybeTool.annotations?.conditions?.includes(
+                'experimentalInteropTools',
+              )
             ) {
               continue;
             }
@@ -126,7 +128,6 @@ describe('e2e', () => {
     );
   });
 
-
   it('has experimental interop tools', async () => {
     await withClient(
       async client => {

tests/tools/pages.test.ts

@@ -329,9 +329,18 @@ describe('pages', () => {
       await withMcpContext(async (response, context) => {
         const page = context.getSelectedPage();
         // @ts-expect-error _tabId is internal.
+        assert.ok(typeof page._tabId === 'string');
+        // @ts-expect-error _tabId is internal.
         page._tabId = 'test-tab-id';
-        await getTabId.handler({params: {pageId: 1}}, response, context);
-        assert.ok(response.responseLines.includes('test-tab-id'));
+        await getTabId.handler(
+          {params: {pageId: 1}},
+          response,
+          context,
+        );
+        const result = await response.handle('get_tab_id', context);
+        // @ts-expect-error _tabId is internal.
+        assert.strictEqual(result.structuredContent.tabId, 'test-tab-id');
+        assert.deepStrictEqual(response.responseLines, []);
       });
     });
   });