chore: fix arg forwarding

Author: OrKoN

src/bin/chrome-devtools.ts

@@ -44,7 +44,14 @@ const y = yargs(argv)
 y.command(
   'start',
   'Start or restart chrome-devtools-mcp',
-  y => y.help(false), // Disable help for start command to avoid parsing issues with passed args
+  y =>
+    y
+      .help(false) // Disable help for start command to avoid parsing issues with passed args.
+      .example(
+        '$0 start --port 8080 --url http://localhost:8080',
+        'Start the server on port 8080 with a specific URL',
+      )
+      .strict(false), // Don't validate arguments for start, as they are passed through to the daemon.
   async () => {
     if (isDaemonRunning()) {
       await stopDaemon();
@@ -54,13 +61,14 @@ y.command(
     const args = startIndex !== -1 ? process.argv.slice(startIndex + 1) : [];
     await startDaemon([...args, ...defaultArgs]);
   },
-);
+).strict(); // Re-enable strict validation for other commands; this is applied to the yargs instance itself
 
 y.command('status', 'Checks if chrome-devtools-mcp is running', async () => {
   if (isDaemonRunning()) {
     console.log('chrome-devtools-mcp daemon is running.');
   } else {
-    console.log('chrome-devtools-mcp daemon is not running');
+    console.log('chrome-devtools-mcp daemon is not running.');
+    process.exit(0);
   }
 });
 

src/daemon/client.ts

@@ -22,24 +22,41 @@ import {
 } from './utils.js';
 
 /**
- * Waits for a file to be created and populated.
+ * Waits for a file to be created and populated (removed = false) or removed (removed = true).
  */
-function waitForFile(filePath: string, timeout = 5000) {
+function waitForFile(filePath: string, removed = false, timeout = 5000) {
   return new Promise<void>((resolve, reject) => {
-    if (fs.existsSync(filePath) && fs.statSync(filePath).size > 0) {
+    const check = () => {
+      const exists = fs.existsSync(filePath);
+      if (removed) {
+        return !exists;
+      }
+      if (!exists) {
+        return false;
+      }
+      try {
+        return fs.statSync(filePath).size > 0;
+      } catch {
+        return false;
+      }
+    };
+
+    if (check()) {
       resolve();
       return;
     }
 
     const timer = setTimeout(() => {
       fs.unwatchFile(filePath);
       reject(
-        new Error(`Timeout: file ${filePath} not found within ${timeout}ms`),
+        new Error(
+          `Timeout: file ${filePath} ${removed ? 'not removed' : 'not found'} within ${timeout}ms`,
+        ),
       );
     }, timeout);
 
-    fs.watchFile(filePath, {interval: 500}, curr => {
-      if (curr.size > 0) {
+    fs.watchFile(filePath, {interval: 500}, () => {
+      if (check()) {
         clearTimeout(timer);
         fs.unwatchFile(filePath); // Always clean up your listeners!
         resolve();
@@ -135,7 +152,11 @@ export async function stopDaemon() {
     return;
   }
 
+  const pidFilePath = getPidFilePath();
+
   await sendCommand({method: 'stop'});
+
+  await waitForFile(pidFilePath, /*removed=*/ true);
 }
 
 export function handleResponse(

tests/daemon/client.test.ts

@@ -5,7 +5,7 @@
  */
 
 import assert from 'node:assert';
-import {describe, it, afterEach} from 'node:test';
+import {describe, it, afterEach, beforeEach} from 'node:test';
 
 import {
   handleResponse,
@@ -16,12 +16,12 @@ import {isDaemonRunning} from '../../src/daemon/utils.js';
 
 describe('daemon client', () => {
   describe('start/stop', () => {
+    beforeEach(async () => {
+      await stopDaemon();
+    });
+
     afterEach(async () => {
-      if (isDaemonRunning()) {
-        await stopDaemon();
-        // Wait a bit for the daemon to fully terminate and clean up its files.
-        await new Promise(resolve => setTimeout(resolve, 1000));
-      }
+      await stopDaemon();
     });
 
     it('should start and stop daemon', async () => {

tests/e2e/chrome-devtools.test.ts

@@ -0,0 +1,121 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'node:assert';
+import {spawnSync} from 'node:child_process';
+import path from 'node:path';
+import {describe, it, afterEach, beforeEach} from 'node:test';
+
+const CLI_PATH = path.resolve('build/src/bin/chrome-devtools.js');
+
+describe('chrome-devtools', () => {
+  const START_ARGS = ['--headless', '--isolated'];
+
+  beforeEach(() => {
+    spawnSync('node', [CLI_PATH, 'stop']);
+  });
+
+  afterEach(() => {
+    spawnSync('node', [CLI_PATH, 'stop']);
+  });
+
+  it('reports daemon status correctly', () => {
+    let result = spawnSync('node', [CLI_PATH, 'status']);
+    assert.strictEqual(
+      result.stdout.toString(),
+      'chrome-devtools-mcp daemon is not running.\n',
+    );
+
+    spawnSync('node', [CLI_PATH, 'start', ...START_ARGS]);
+
+    result = spawnSync('node', [CLI_PATH, 'status']);
+    assert.strictEqual(
+      result.stdout.toString(),
+      'chrome-devtools-mcp daemon is running.\n',
+    );
+  });
+
+  it('can start and stop the daemon', () => {
+    let result = spawnSync('node', [CLI_PATH, 'status']);
+    assert.strictEqual(
+      result.stdout.toString(),
+      'chrome-devtools-mcp daemon is not running.\n',
+    );
+
+    const startResult = spawnSync('node', [CLI_PATH, 'start', ...START_ARGS]);
+    assert.strictEqual(
+      startResult.status,
+      0,
+      `start command failed: ${startResult.stderr.toString()}`,
+    );
+
+    result = spawnSync('node', [CLI_PATH, 'status']);
+    assert.strictEqual(
+      result.stdout.toString(),
+      'chrome-devtools-mcp daemon is running.\n',
+    );
+
+    const stopResult = spawnSync('node', [CLI_PATH, 'stop']);
+    assert.strictEqual(
+      stopResult.status,
+      0,
+      `stop command failed: ${stopResult.stderr.toString()}`,
+    );
+
+    result = spawnSync('node', [CLI_PATH, 'status']);
+    assert.strictEqual(
+      result.stdout.toString(),
+      'chrome-devtools-mcp daemon is not running.\n',
+    );
+  });
+
+  it('can invoke list_pages', async () => {
+    // Daemon should not be running.
+    let result = spawnSync('node', [CLI_PATH, 'status']);
+    assert.strictEqual(
+      result.stdout.toString(),
+      'chrome-devtools-mcp daemon is not running.\n',
+    );
+
+    const startResult = spawnSync('node', [CLI_PATH, 'start', ...START_ARGS]);
+    assert.strictEqual(
+      startResult.status,
+      0,
+      `start command failed: ${startResult.stderr.toString()}`,
+    );
+
+    const listPagesResult = spawnSync('node', [CLI_PATH, 'list_pages']);
+    assert.strictEqual(
+      listPagesResult.status,
+      0,
+      `list_pages command failed: ${listPagesResult.stderr.toString()}`,
+    );
+    assert(
+      listPagesResult.stdout.toString().includes('about:blank'),
+      'list_pages output is unexpected',
+    );
+
+    // Daemon should now be running.
+    result = spawnSync('node', [CLI_PATH, 'status']);
+    assert.strictEqual(
+      result.stdout.toString(),
+      'chrome-devtools-mcp daemon is running.\n',
+    );
+  });
+
+  it('forwards disclaimers to stderr on start', () => {
+    const result = spawnSync('node', [CLI_PATH, 'start', ...START_ARGS]);
+    assert.strictEqual(
+      result.status,
+      0,
+      `start command failed: ${result.stderr.toString()}`,
+    );
+    assert(
+      result.stderr.toString().includes('chrome-devtools-mcp exposes content'),
+      'Disclaimer not found in stderr on start',
+    );
+  });
+});