Merge branch 'main' into OrKoN-patch-2

Author: OrKoN

docs/cli.md

@@ -91,3 +91,11 @@ For more verbose logs, set the `DEBUG` environment variable:
 ```sh
 DEBUG=* chrome-devtools list_pages
 ```
+
+## CLI generation
+
+Implemented in `scripts/generate-cli.ts`. Some commands are excluded from CLI
+generation such as `wait_for` and `fill_form`.
+
+`chrome-devtools-mcp` args are also filtered in `src/bin/chrome-devtools.ts`
+because not all args make sense in a CLI interface.

scripts/generate-cli.ts

@@ -102,8 +102,23 @@ function schemaToCLIOptions(schema: JsonSchema): CliOption[] {
 
 async function generateCli() {
   const tools = await fetchTools();
+
   // Sort tools by name
-  const sortedTools = tools.sort((a, b) => a.name.localeCompare(b.name));
+  const sortedTools = tools
+    .sort((a, b) => a.name.localeCompare(b.name))
+    .filter(tool => {
+      // Skipping fill_form because it is not relevant in shell scripts
+      // and CLI does not handle array/JSON args well.
+      if (tool.name === 'fill_form') {
+        return false;
+      }
+      // Skipping wait_for because CLI does not handle array/JSON args well
+      // and shell scripts have many mechanisms for waiting.
+      if (tool.name === 'wait_for') {
+        return false;
+      }
+      return true;
+    });
 
   const staticTools = createTools(parseArguments());
   const toolNameToCategory = new Map<string, string>();

src/bin/chrome-devtools.ts

@@ -114,10 +114,12 @@ y.command('status', 'Checks if chrome-devtools-mcp is running', async () => {
         socketPath: string;
         startDate: string;
         version: string;
+        args: string[];
       };
       console.log(
         `pid=${data.pid} socket=${data.socketPath} start-date=${data.startDate} version=${data.version}`,
       );
+      console.log(`args=${JSON.stringify(data.args)}`);
     } else {
       console.error('Error:', response.error);
       process.exit(1);

src/bin/cliDefinitions.ts

@@ -184,25 +184,6 @@ export const commands: Commands = {
       },
     },
   },
-  fill_form: {
-    description: 'Fill out multiple form elements at once',
-    category: 'Input automation',
-    args: {
-      elements: {
-        name: 'elements',
-        type: 'array',
-        description: 'Elements from snapshot to fill out.',
-        required: true,
-      },
-      includeSnapshot: {
-        name: 'includeSnapshot',
-        type: 'boolean',
-        description:
-          'Whether to include a snapshot in the response. Default is false.',
-        required: false,
-      },
-    },
-  },
   get_console_message: {
     description:
       'Gets a console message by its ID. You can get all messages by calling list_console_messages.',
@@ -722,24 +703,4 @@ export const commands: Commands = {
       },
     },
   },
-  wait_for: {
-    description: 'Wait for the specified text to appear on the selected page.',
-    category: 'Navigation automation',
-    args: {
-      text: {
-        name: 'text',
-        type: 'array',
-        description:
-          'Non-empty list of texts. Resolves when any value appears on the page.',
-        required: true,
-      },
-      timeout: {
-        name: 'timeout',
-        type: 'integer',
-        description:
-          'Maximum wait time in milliseconds. If set to 0, the default timeout will be used.',
-        required: false,
-      },
-    },
-  },
 } as const;

src/daemon/client.ts

@@ -85,6 +85,7 @@ export async function startDaemon(mcpArgs: string[] = []) {
     stdio: 'ignore',
     env: process.env,
     cwd: process.cwd(),
+    windowsHide: true,
   });
   child.unref();
 

src/daemon/daemon.ts

@@ -44,6 +44,7 @@ logger(`Writing ${process.pid.toString()} to ${pidFilePath}`);
 const socketPath = getSocketPath();
 
 const startDate = new Date();
+const mcpServerArgs = process.argv.slice(2);
 
 let mcpClient: Client | null = null;
 let mcpTransport: StdioClientTransport | null = null;
@@ -52,11 +53,10 @@ let server: Server | null = null;
 async function setupMCPClient() {
   console.log('Setting up MCP client connection...');
 
-  const args = process.argv.slice(2);
   // Create stdio transport for chrome-devtools-mcp
   mcpTransport = new StdioClientTransport({
     command: process.execPath,
-    args: [INDEX_SCRIPT_PATH, ...args],
+    args: [INDEX_SCRIPT_PATH, ...mcpServerArgs],
     env: process.env as Record<string, string>,
   });
   mcpClient = new Client(
@@ -118,6 +118,7 @@ async function handleRequest(msg: DaemonMessage) {
           socketPath,
           startDate: startDate.toISOString(),
           version: VERSION,
+          args: mcpServerArgs,
         }),
       };
     }

tests/tools/pages.test.ts

@@ -162,13 +162,18 @@ describe('pages', () => {
 
           assert.ok(extensionId);
 
-          const _sidePanelPage = await context.newPage();
-          await _sidePanelPage.pptrPage.goto(
+          const sidePanelPage = await context.newPage();
+          await sidePanelPage.pptrPage.goto(
             `chrome-extension://${extensionId}/sidepanel.html`,
           );
 
           await context.waitForTextOnPage(['Side Panel']);
 
+          // Wait for service worker used in the snapshot.
+          await context.browser.waitForTarget(
+            target => target.type() === 'service_worker',
+          );
+
           const listPageDef = listPages({
             categoryExtensions: true,
           } as ParsedArguments);