Skip to content

Chrome DevTools for coding agents

refactor: extract config parsing logic in a class (#2861)

Nikolay Vitkove4168d004550
diff --git a/scripts/generate-cli.ts b/scripts/generate-cli.ts
index ea0b04e7..3e3ae7fd 100644
--- a/scripts/generate-cli.ts
+++ b/scripts/generate-cli.ts
@@ -11,7 +11,8 @@ import {
isCategoryOffByDefault,
categoryToFlagName,
} from '../build/src/config/category-options.js';
-import {mcpOptions, parseArguments} from '../build/src/config/mcp-options.js';
+import {mcpOptions} from '../build/src/config/mcp-options.js';
+import {ConfigParser} from '../build/src/config/ConfigParser.js';
import {zod} from '../build/src/third_party/index.js';
import {labels, ToolCategory} from '../build/src/tools/categories.js';
import {createTools} from '../build/src/tools/tools.js';
@@ -65,7 +66,9 @@ function schemaToCLIOptions(schema: JsonSchema): CliOption[] {
}
async function generateCli() {
- const tools = createTools(parseArguments('0.0.0', ['', '', '--viaCli']));
+ const tools = createTools(
+ new ConfigParser('0.0.0', ['', '', '--viaCli']).parse(),
+ );
// Sort tools by name
const sortedTools = tools
diff --git a/scripts/generate-docs.ts b/scripts/generate-docs.ts
index d1064fcb..deda610f 100644
--- a/scripts/generate-docs.ts
+++ b/scripts/generate-docs.ts
@@ -8,14 +8,12 @@ import fs from 'node:fs';
import type {Options as YargsOptions} from 'yargs';
-import {
- mcpOptions,
- type ParsedArguments,
-} from '../build/src/config/mcp-options.js';
+import {mcpOptions} from '../build/src/config/mcp-options.js';
import {
isCategoryOffByDefault,
categoryToFlagName,
} from '../build/src/config/category-options.js';
+import type {ParsedArguments} from '../build/src/config/ConfigParser.js';
import {zod} from '../build/src/third_party/index.js';
import {ToolCategory, labels} from '../build/src/tools/categories.js';
import type {
@@ -46,7 +44,7 @@ interface ToolWithAnnotations {
annotations?: {
title?: string;
category?: ToolCategory;
- conditions?: string[];
+ conditions?: Array<keyof ParsedArguments>;
};
}
@@ -86,7 +84,7 @@ function addCrossLinks(text: string, tools: ToolWithAnnotations[]): string {
function hasOffByDefaultConditions(tool: ToolWithAnnotations): boolean {
for (const condition of tool.annotations?.conditions || []) {
- const option = mcpOptions[condition as keyof typeof mcpOptions];
+ const option = mcpOptions[condition];
if (!option || !('default' in option) || option.default !== true) {
return true;
}
@@ -249,7 +247,7 @@ async function generateReference(
const conditions = tool.annotations?.conditions || [];
for (const condition of conditions) {
- const option = mcpOptions[condition as keyof typeof mcpOptions];
+ const option = mcpOptions[condition];
if (!option || !('default' in option) || option.default !== true) {
requiredFlags.push(`--${condition}=true`);
}
@@ -418,7 +416,7 @@ async function generateToolDocumentation(): Promise<void> {
{
const {toolsWithAnnotations, categories, sortedCategories} =
- getToolsAndCategories(createTools({slim: true} as ParsedArguments));
+ getToolsAndCategories(createTools({slim: true}));
await generateReference(
'Chrome DevTools MCP Slim Tool Reference',
SLIM_OUTPUT_PATH,
diff --git a/scripts/update_metrics.ts b/scripts/update_metrics.ts
index 75037831..320c9d72 100644
--- a/scripts/update_metrics.ts
+++ b/scripts/update_metrics.ts
@@ -7,7 +7,8 @@
import * as fs from 'node:fs';
import * as path from 'node:path';
-import {mcpOptions, parseArguments} from '../build/src/config/mcp-options.js';
+import {mcpOptions} from '../build/src/config/mcp-options.js';
+import {ConfigParser} from '../build/src/config/ConfigParser.js';
import {ErrorCode} from '../build/src/telemetry/errors.js';
import {
getPossibleFlagMetrics,
@@ -36,8 +37,10 @@ function writeToolCallMetricsConfig() {
}
// Avoid 'as ParsedArguments' by using parseArguments
- const fullTools = createTools(parseArguments('0.0.0', ['', '']));
- const slimTools = createTools(parseArguments('0.0.0', ['', '', '--slim']));
+ const fullTools = createTools(new ConfigParser('0.0.0', ['', '']).parse());
+ const slimTools = createTools(
+ new ConfigParser('0.0.0', ['', '', '--slim']).parse(),
+ );
const allTools = [...fullTools, ...slimTools];
diff --git a/src/BrowserManager.ts b/src/BrowserManager.ts
index 699c1613..6c2889f5 100644
--- a/src/BrowserManager.ts
+++ b/src/BrowserManager.ts
@@ -9,7 +9,7 @@ import fs from 'node:fs';
import os from 'node:os';
import path from 'node:path';
-import type {ParsedArguments} from './config/mcp-options.js';
+import type {ParsedArguments} from './config/ConfigParser.js';
import type {
Browser,
ChromeReleaseChannel,
diff --git a/src/McpResponse.ts b/src/McpResponse.ts
index f6e29db9..3f67956f 100644
--- a/src/McpResponse.ts
+++ b/src/McpResponse.ts
@@ -6,7 +6,7 @@
import type {WebMCPTool} from 'puppeteer-core';
-import type {ParsedArguments} from './config/mcp-options.js';
+import type {ParsedArguments} from './config/ConfigParser.js';
import {
CommentFormatter,
type StructuredCommentThread,
diff --git a/src/ToolHandler.ts b/src/ToolHandler.ts
index 832525bf..c07155b7 100644
--- a/src/ToolHandler.ts
+++ b/src/ToolHandler.ts
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-import type {ParsedArguments} from './config/mcp-options.js';
+import type {ParsedArguments} from './config/ConfigParser.js';
import type {McpContext} from './McpContext.js';
import type {McpPage} from './McpPage.js';
import {McpResponse} from './McpResponse.js';
diff --git a/src/bin/chrome-devtools-mcp-main.ts b/src/bin/chrome-devtools-mcp-main.ts
index f0b00454..4342192b 100644
--- a/src/bin/chrome-devtools-mcp-main.ts
+++ b/src/bin/chrome-devtools-mcp-main.ts
@@ -18,13 +18,14 @@ import {logger, saveLogsToFile} from '../utils/logger.js';
import {setupUnhandledRejectionHandler} from '../utils/errorHandling.js';
import {VERSION} from '../version.js';
-import {mcpOptions, parseArguments} from '../config/mcp-options.js';
+import {mcpOptions} from '../config/mcp-options.js';
+import {ConfigParser} from '../config/ConfigParser.js';
await checkForUpdates(
'Run `npm install chrome-devtools-mcp@latest` to update.',
);
-export const args = parseArguments(VERSION);
+export const args = new ConfigParser(VERSION).parse();
const logFile = args.logFile ? saveLogsToFile(args.logFile) : undefined;
diff --git a/src/bin/chrome-devtools.ts b/src/bin/chrome-devtools.ts
index 88a072cf..ca302bea 100644
--- a/src/bin/chrome-devtools.ts
+++ b/src/bin/chrome-devtools.ts
@@ -32,11 +32,8 @@ import {VERSION} from '../version.js';
import {buildCommand} from '../config/cli-commands.js';
import {commands} from '../config/cli-options.js';
-import {
- mcpOptions,
- parseArguments,
- getCliOptions,
-} from '../config/mcp-options.js';
+import {mcpOptions, getCliOptions} from '../config/mcp-options.js';
+import {ConfigParser} from '../config/ConfigParser.js';
await checkForUpdates(
'Run `npm install -g chrome-devtools-mcp@latest` and `chrome-devtools start` to update and restart the daemon.',
@@ -46,11 +43,11 @@ const DEFAULT_CLI_ARGS = ['--viaCli'];
async function start(args: string[], sessionId: string, stopExisting = false) {
const combinedArgs = [...DEFAULT_CLI_ARGS, ...args];
- const parsedArgs = parseArguments(VERSION, [
+ const parsedArgs = new ConfigParser(VERSION, [
process.execPath,
process.argv[1],
...combinedArgs,
- ]);
+ ]).parse();
if (stopExisting && isDaemonRunning(sessionId)) {
await stopDaemon(sessionId);
}
diff --git a/src/config/ConfigParser.ts b/src/config/ConfigParser.ts
new file mode 100644
index 00000000..2e25dfa7
--- /dev/null
+++ b/src/config/ConfigParser.ts
@@ -0,0 +1,236 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type {YargsOptions, InferredOptionTypes} from '../third_party/index.js';
+
+import {yargs, hideBin} from '../third_party/index.js';
+
+import {readFileSync} from 'node:fs';
+
+import {
+ mcpOptions,
+ getMcpOptionsForViaCli,
+ CLI_EXAMPLES,
+ CONFLICTING_ARGS,
+ IMPLICATIONS,
+ DEFAULT_FILESYSTEM_ROOT,
+ withoutDefaults,
+} from './mcp-options.js';
+
+function isPlainObject(value: unknown): value is Record<string, unknown> {
+ return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+
+function getErrorMessage(err: unknown): string {
+ return err instanceof Error ? err.message : String(err);
+}
+
+function stripYargsPositionalArgs<T extends {_?: unknown; $0?: unknown}>(
+ parsed: T,
+): Omit<T, '_' | '$0'> {
+ const {_: _positionals, $0: _scriptName, ...rest} = parsed;
+ return rest;
+}
+
+export type ParsedArguments = InferredOptionTypes<typeof mcpOptions>;
+
+export class ConfigParser {
+ constructor(
+ private version: string,
+ private argv = process.argv,
+ private env = process.env,
+ private exitProcess = true,
+ ) {}
+
+ buildCliParser(options: Record<string, YargsOptions> = mcpOptions) {
+ const yargsInstance = yargs(hideBin(this.argv));
+ return yargsInstance
+ .scriptName('npx chrome-devtools-mcp@latest')
+ .parserConfiguration({
+ 'strip-aliased': true,
+ 'strip-dashed': true,
+ })
+ .options(options)
+ .showHelpOnFail(false, 'Specify --help for available options')
+ .example(CLI_EXAMPLES)
+ .wrap(Math.min(120, yargsInstance.terminalWidth()))
+ .help()
+ .version(this.version);
+ }
+
+ /**
+ * Step 1: parses the CLI flags without applying defaults, so the result only
+ * contains what the user passed. `--help` and `--version` print and exit the
+ * process; parse errors throw.
+ */
+ parseCliArgs(): Partial<ParsedArguments> {
+ const parsed = this.buildCliParser(withoutDefaults(mcpOptions))
+ .fail(false)
+ .parseSync();
+ return stripYargsPositionalArgs(parsed);
+ }
+
+ /**
+ * Step 2: reads the JSON config file and runs it through yargs to reject
+ * unknown keys and apply coercions, without applying defaults.
+ */
+ parseConfigFile(configPath: string): Partial<ParsedArguments> {
+ try {
+ const fileContent: unknown = JSON.parse(
+ readFileSync(configPath, 'utf-8'),
+ );
+ if (!isPlainObject(fileContent)) {
+ throw new Error('Config must be a JSON object');
+ }
+ const parsed = yargs([])
+ .parserConfiguration({
+ 'strip-aliased': true,
+ 'camel-case-expansion': false,
+ })
+ .options(withoutDefaults(mcpOptions))
+ .config(fileContent)
+ .strict()
+ .fail(false)
+ .exitProcess(false)
+ .parseSync([]);
+ return stripYargsPositionalArgs(parsed);
+ } catch (err) {
+ throw new Error(`Invalid JSON config file: ${getErrorMessage(err)}`);
+ }
+ }
+
+ warnUnknownArgs(cliArgs: Partial<ParsedArguments>): void {
+ const allowedArgs = new Set(Object.keys(mcpOptions));
+ const unknownArgs = Object.keys(cliArgs).filter(
+ arg => !allowedArgs.has(arg),
+ );
+ if (unknownArgs.length > 0) {
+ console.error(`Unknown arguments: ${unknownArgs.map(arg => `--${arg}`)}`);
+ }
+ }
+
+ /**
+ * Step 4: rejects mutually exclusive inputs. Only explicit inputs are checked,
+ * so defaults never conflict.
+ */
+ validateConflicts(explicitArgs: Partial<ParsedArguments>): void {
+ const activeArgs = new Set<string>();
+ for (const [key, val] of Object.entries(explicitArgs)) {
+ if (val !== undefined && val !== false) {
+ activeArgs.add(key);
+ }
+ }
+ for (const group of CONFLICTING_ARGS) {
+ const activeInGroup = group.filter(arg => activeArgs.has(arg));
+ if (activeInGroup.length > 1) {
+ const [arg1, arg2] = activeInGroup;
+ throw new Error(
+ `Arguments ${String(arg1)} and ${String(arg2)} are mutually exclusive`,
+ );
+ }
+ }
+ }
+
+ validateImplications(explicitArgs: Partial<ParsedArguments>): void {
+ for (const [key, implied] of IMPLICATIONS) {
+ const isKeySet =
+ explicitArgs[key] !== undefined && explicitArgs[key] !== false;
+ const isImpliedSet =
+ explicitArgs[implied] !== undefined && explicitArgs[implied] !== false;
+ if (isKeySet && !isImpliedSet) {
+ throw new Error(
+ `Implications failed:\n ${String(key)} -> ${String(implied)}`,
+ );
+ }
+ }
+ }
+
+ /**
+ * Step 5: fills in defaults for everything that was not set explicitly.
+ * `viaCli` is an explicit input like any other; it selects which defaults
+ * apply.
+ */
+ applyDefaults(explicitArgs: Partial<ParsedArguments>): ParsedArguments {
+ const isViaCli = explicitArgs.viaCli === true;
+ const baseOptions = isViaCli ? getMcpOptionsForViaCli() : mcpOptions;
+ const resolvedArgs = {...explicitArgs};
+ // `channel` only applies when Chrome is launched by channel. Leaving it
+ // unset otherwise keeps it out of telemetry (computeFlagUsage).
+ const launchesByChannel =
+ !resolvedArgs.browserUrl &&
+ !resolvedArgs.wsEndpoint &&
+ !resolvedArgs.executablePath;
+
+ for (const [key, option] of Object.entries(baseOptions)) {
+ if (key === 'channel' && !launchesByChannel) {
+ continue;
+ }
+ if (
+ resolvedArgs[key as keyof ParsedArguments] === undefined &&
+ 'default' in option
+ ) {
+ resolvedArgs[key as keyof ParsedArguments] = option.default;
+ }
+ }
+
+ if (isViaCli) {
+ if (resolvedArgs.filesystemRoot === DEFAULT_FILESYSTEM_ROOT) {
+ resolvedArgs.allowUnrestrictedPaths = true;
+ resolvedArgs.filesystemRoot = undefined;
+ }
+ const connectsToExistingBrowser =
+ resolvedArgs.autoConnect ||
+ resolvedArgs.browserUrl ||
+ resolvedArgs.wsEndpoint;
+ if (
+ explicitArgs.isolated === undefined &&
+ resolvedArgs.userDataDir === undefined &&
+ !connectsToExistingBrowser
+ ) {
+ resolvedArgs.isolated = true;
+ }
+ if (
+ resolvedArgs.categoryExtensions === undefined &&
+ !connectsToExistingBrowser
+ ) {
+ resolvedArgs.categoryExtensions = true;
+ }
+ }
+
+ if (this.env['CI'] || this.env['CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS']) {
+ console.error(
+ "turning off usage statistics. process.env['CI'] || process.env['CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS'] is set.",
+ );
+ resolvedArgs.usageStatistics = false;
+ }
+
+ // The merge and the default loop lose the static type that yargs infers from
+ // `mcpOptions`. Every value was produced by the same option definitions (CLI
+ // parser, strict config-file parser, option defaults), so the shape matches.
+ return resolvedArgs as unknown as ParsedArguments;
+ }
+
+ parse(): ParsedArguments {
+ try {
+ const cliArgs = this.parseCliArgs();
+ const configPath = cliArgs.config;
+ const configFileArgs =
+ typeof configPath === 'string' ? this.parseConfigFile(configPath) : {};
+ // Step 3: merges the explicit inputs. The CLI wins over the config file.
+ const explicitArgs = {...configFileArgs, ...cliArgs};
+ this.warnUnknownArgs(cliArgs);
+ this.validateConflicts(explicitArgs);
+ this.validateImplications(explicitArgs);
+ return this.applyDefaults(explicitArgs);
+ } catch (error) {
+ if (this.exitProcess) {
+ console.error(getErrorMessage(error));
+ process.exit(1);
+ }
+ throw error;
+ }
+ }
+}
diff --git a/src/config/mcp-options.ts b/src/config/mcp-options.ts
index a5c3b385..62b581e8 100644
--- a/src/config/mcp-options.ts
+++ b/src/config/mcp-options.ts
@@ -5,9 +5,7 @@
*/
import type {YargsOptions} from '../third_party/index.js';
-import {yargs, hideBin} from '../third_party/index.js';
import os from 'node:os';
-import {readFileSync} from 'node:fs';
import path from 'node:path';
export const DEFAULT_FILESYSTEM_ROOT = [os.tmpdir()];
@@ -322,16 +320,6 @@ export const mcpOptions = {
},
} satisfies Record<string, YargsOptions>;
-type RawParsedArguments = ReturnType<
- ReturnType<typeof buildCliParser<typeof mcpOptions>>['parseSync']
->;
-
-export type ParsedArguments = {
- [
- K in keyof RawParsedArguments as K extends '_' | '$0' ? never : K
- ]: RawParsedArguments[K];
-};
-
export function getMcpOptionsForViaCli(): Record<
keyof typeof mcpOptions,
YargsOptions
@@ -390,7 +378,7 @@ export function getCliOptions(): Partial<
return options;
}
-const CLI_EXAMPLES: Array<[string, string]> = [
+export const CLI_EXAMPLES: Array<[string, string]> = [
[
'$0 --browserUrl http://127.0.0.1:9222',
'Connect to an existing browser instance via HTTP',
@@ -452,7 +440,7 @@ const CLI_EXAMPLES: Array<[string, string]> = [
],
];
-const CONFLICTING_ARGS: Array<Array<keyof typeof mcpOptions>> = [
+export const CONFLICTING_ARGS: Array<Array<keyof typeof mcpOptions>> = [
['channel', 'executablePath', 'browserUrl', 'wsEndpoint'],
['userDataDir', 'browserUrl', 'wsEndpoint'],
['userDataDir', 'isolated'],
@@ -466,42 +454,15 @@ const CONFLICTING_ARGS: Array<Array<keyof typeof mcpOptions>> = [
['categoryExtensions', 'browserUrl', 'wsEndpoint'],
];
-const IMPLICATIONS: Array<[keyof typeof mcpOptions, keyof typeof mcpOptions]> =
- [
- ['wsHeaders', 'wsEndpoint'],
- ['experimentalFfmpegPath', 'experimentalScreencast'],
- ['experimentalScreencastFps', 'experimentalScreencast'],
- ];
-
-function isPlainObject(value: unknown): value is Record<string, unknown> {
- return typeof value === 'object' && value !== null && !Array.isArray(value);
-}
-
-function getErrorMessage(err: unknown): string {
- return err instanceof Error ? err.message : String(err);
-}
-
-export function buildCliParser<T extends Record<string, YargsOptions>>(
- version: string,
- argv: string[],
- options: T,
-) {
- const yargsInstance = yargs(hideBin(argv));
- return yargsInstance
- .scriptName('npx chrome-devtools-mcp@latest')
- .parserConfiguration({
- 'strip-aliased': true,
- 'strip-dashed': true,
- })
- .options(options)
- .showHelpOnFail(false, 'Specify --help for available options')
- .example(CLI_EXAMPLES)
- .wrap(Math.min(120, yargsInstance.terminalWidth()))
- .help()
- .version(version);
-}
+export const IMPLICATIONS: Array<
+ [keyof typeof mcpOptions, keyof typeof mcpOptions]
+> = [
+ ['wsHeaders', 'wsEndpoint'],
+ ['experimentalFfmpegPath', 'experimentalScreencast'],
+ ['experimentalScreencastFps', 'experimentalScreencast'],
+];
-function withoutDefaults(
+export function withoutDefaults(
options: Record<string, YargsOptions>,
): Record<string, YargsOptions> {
const result: Record<string, YargsOptions> = {};
@@ -515,188 +476,3 @@ function withoutDefaults(
}
return result;
}
-
-function stripYargsPositionalArgs<T extends {_?: unknown; $0?: unknown}>(
- parsed: T,
-): Omit<T, '_' | '$0'> {
- const {_: _positionals, $0: _scriptName, ...rest} = parsed;
- return rest;
-}
-
-/**
- * Step 1: parses the CLI flags without applying defaults, so the result only
- * contains what the user passed. `--help` and `--version` print and exit the
- * process; parse errors throw.
- */
-export function parseCliArgs(
- version: string,
- argv: string[],
-): Partial<ParsedArguments> {
- const parsed = buildCliParser(version, argv, withoutDefaults(mcpOptions))
- .fail(false)
- .parseSync();
- return stripYargsPositionalArgs(parsed);
-}
-
-/**
- * Step 2: reads the JSON config file and runs it through yargs to reject
- * unknown keys and apply coercions, without applying defaults.
- */
-export function parseConfigFile(configPath: string): Partial<ParsedArguments> {
- try {
- const fileContent: unknown = JSON.parse(readFileSync(configPath, 'utf-8'));
- if (!isPlainObject(fileContent)) {
- throw new Error('Config must be a JSON object');
- }
- const parsed = yargs([])
- .parserConfiguration({
- 'strip-aliased': true,
- 'camel-case-expansion': false,
- })
- .options(withoutDefaults(mcpOptions))
- .config(fileContent)
- .strict()
- .fail(false)
- .exitProcess(false)
- .parseSync([]);
- return stripYargsPositionalArgs(parsed);
- } catch (err) {
- throw new Error(`Invalid JSON config file: ${getErrorMessage(err)}`);
- }
-}
-
-function warnUnknownArgs(cliArgs: Partial<ParsedArguments>): void {
- const allowedArgs = new Set(Object.keys(mcpOptions));
- const unknownArgs = Object.keys(cliArgs).filter(arg => !allowedArgs.has(arg));
- if (unknownArgs.length > 0) {
- console.error(`Unknown arguments: ${unknownArgs.map(arg => `--${arg}`)}`);
- }
-}
-
-/**
- * Step 4: rejects mutually exclusive inputs. Only explicit inputs are checked,
- * so defaults never conflict.
- */
-export function validateConflicts(
- explicitArgs: Partial<ParsedArguments>,
-): void {
- const activeArgs = new Set<string>();
- for (const [key, val] of Object.entries(explicitArgs)) {
- if (val !== undefined && val !== false) {
- activeArgs.add(key);
- }
- }
- for (const group of CONFLICTING_ARGS) {
- const activeInGroup = group.filter(arg => activeArgs.has(arg));
- if (activeInGroup.length > 1) {
- const [arg1, arg2] = activeInGroup;
- throw new Error(`Arguments ${arg1} and ${arg2} are mutually exclusive`);
- }
- }
-}
-
-export function validateImplications(
- explicitArgs: Partial<ParsedArguments>,
-): void {
- for (const [key, implied] of IMPLICATIONS) {
- const isKeySet =
- explicitArgs[key] !== undefined && explicitArgs[key] !== false;
- const isImpliedSet =
- explicitArgs[implied] !== undefined && explicitArgs[implied] !== false;
- if (isKeySet && !isImpliedSet) {
- throw new Error(`Implications failed:\n ${key} -> ${implied}`);
- }
- }
-}
-
-/**
- * Step 5: fills in defaults for everything that was not set explicitly.
- * `viaCli` is an explicit input like any other; it selects which defaults
- * apply.
- */
-export function applyDefaults(
- explicitArgs: Partial<ParsedArguments>,
- env: NodeJS.ProcessEnv,
-): Partial<ParsedArguments> {
- const isViaCli = explicitArgs.viaCli === true;
- const baseOptions = isViaCli ? getMcpOptionsForViaCli() : mcpOptions;
- const resolvedArgs = {...explicitArgs};
- // `channel` only applies when Chrome is launched by channel. Leaving it
- // unset otherwise keeps it out of telemetry (computeFlagUsage).
- const launchesByChannel =
- !explicitArgs.browserUrl &&
- !explicitArgs.wsEndpoint &&
- !explicitArgs.executablePath;
-
- for (const [key, option] of Object.entries(baseOptions)) {
- if (key === 'channel' && !launchesByChannel) {
- continue;
- }
- if (resolvedArgs[key] === undefined && 'default' in option) {
- resolvedArgs[key] = option.default;
- }
- }
-
- if (isViaCli) {
- if (resolvedArgs.filesystemRoot === DEFAULT_FILESYSTEM_ROOT) {
- resolvedArgs.allowUnrestrictedPaths = true;
- resolvedArgs.filesystemRoot = undefined;
- }
- const connectsToExistingBrowser =
- resolvedArgs.autoConnect ||
- resolvedArgs.browserUrl ||
- resolvedArgs.wsEndpoint;
- if (
- explicitArgs.isolated === undefined &&
- resolvedArgs.userDataDir === undefined &&
- !connectsToExistingBrowser
- ) {
- resolvedArgs.isolated = true;
- }
- if (
- resolvedArgs.categoryExtensions === undefined &&
- !connectsToExistingBrowser
- ) {
- resolvedArgs.categoryExtensions = true;
- }
- }
-
- if (env['CI'] || env['CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS']) {
- console.error(
- "turning off usage statistics. process.env['CI'] || process.env['CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS'] is set.",
- );
- resolvedArgs.usageStatistics = false;
- }
-
- return resolvedArgs;
-}
-
-export function parseArguments(
- version: string,
- argv = process.argv,
- env = process.env,
- exitProcess = true,
-): ParsedArguments {
- try {
- const cliArgs = parseCliArgs(version, argv);
- const configFileArgs =
- typeof cliArgs.config === 'string' ? parseConfigFile(cliArgs.config) : {};
- // Step 3: merges the explicit inputs. The CLI wins over the config file.
- const explicitArgs = {...configFileArgs, ...cliArgs};
- warnUnknownArgs(cliArgs);
- validateConflicts(explicitArgs);
- validateImplications(explicitArgs);
- const resolvedArgs = applyDefaults(explicitArgs, env);
-
- // The merge and the default loop lose the static type that yargs infers from
- // `mcpOptions`. Every value was produced by the same option definitions (CLI
- // parser, strict config-file parser, option defaults), so the shape matches.
- return resolvedArgs as ParsedArguments;
- } catch (error) {
- if (exitProcess) {
- console.error(getErrorMessage(error));
- process.exit(1);
- }
- throw error;
- }
-}
diff --git a/src/daemon/daemon.ts b/src/daemon/daemon.ts
index a5836404..67174260 100644
--- a/src/daemon/daemon.ts
+++ b/src/daemon/daemon.ts
@@ -15,7 +15,8 @@ import path from 'node:path';
import process from 'node:process';
import {BrowserManager} from '../BrowserManager.js';
-import {mcpOptions, parseArguments} from '../config/mcp-options.js';
+import {mcpOptions} from '../config/mcp-options.js';
+import {ConfigParser} from '../config/ConfigParser.js';
import {McpServer} from '../index.js';
import {ClearcutLogger} from '../telemetry/ClearcutLogger.js';
import {computeFlagUsage} from '../telemetry/flagUtils.js';
@@ -130,7 +131,7 @@ let server: Server | null = null;
async function setupMCPServer() {
logger?.(`Starting Chrome DevTools MCP Server v${VERSION}`);
- const args = parseArguments(VERSION);
+ const args = new ConfigParser(VERSION).parse();
const logFile = args.logFile ? saveLogsToFile(args.logFile) : undefined;
const browserManager = new BrowserManager(args, {
logFile,
diff --git a/src/index.ts b/src/index.ts
index 0987bc55..47c73e2e 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -9,7 +9,7 @@ import path from 'node:path';
import {pathToFileURL} from 'node:url';
import {BrowserManager} from './BrowserManager.js';
-import {type ParsedArguments} from './config/mcp-options.js';
+import {type ParsedArguments} from './config/ConfigParser.js';
import {loadIssueDescriptions} from './devtools/issueDescriptions.js';
import {McpContext} from './McpContext.js';
import {ClearcutLogger} from './telemetry/ClearcutLogger.js';
diff --git a/src/third_party/index.ts b/src/third_party/index.ts
index c77af2e9..fb20d7c8 100644
--- a/src/third_party/index.ts
+++ b/src/third_party/index.ts
@@ -14,7 +14,7 @@ import {z as zod} from 'zod';
export type {Flags, Result, RunnerResult, OutputMode};
-export type {Options as YargsOptions} from 'yargs';
+export type {Options as YargsOptions, InferredOptionTypes} from 'yargs';
export {default as yargs} from 'yargs';
export {hideBin} from 'yargs/helpers';
export {default as semver} from 'semver';
diff --git a/src/tools/ToolDefinition.ts b/src/tools/ToolDefinition.ts
index 539a6aa6..4027f014 100644
--- a/src/tools/ToolDefinition.ts
+++ b/src/tools/ToolDefinition.ts
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-import type {ParsedArguments} from '../config/mcp-options.js';
+import type {ParsedArguments} from '../config/ConfigParser.js';
import type {
HeapSnapshotAggregateData,
HeapSnapshotClassDiff,
@@ -84,7 +84,7 @@ export interface BaseToolDefinition<
* If true, the tool does not modify its environment.
*/
readOnlyHint: boolean;
- conditions?: string[];
+ conditions?: Array<keyof ParsedArguments>;
};
schema: Schema;
blockedByDialog: boolean;
diff --git a/src/tools/console.ts b/src/tools/console.ts
index decafd02..89522cd6 100644
--- a/src/tools/console.ts
+++ b/src/tools/console.ts
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-import type {ParsedArguments} from '../config/mcp-options.js';
+import type {ParsedArguments} from '../config/ConfigParser.js';
import {zod} from '../third_party/index.js';
import type {ConsoleMessageType} from '../third_party/index.js';
diff --git a/src/tools/lighthouse.ts b/src/tools/lighthouse.ts
index 1d02758c..2e0db9f7 100644
--- a/src/tools/lighthouse.ts
+++ b/src/tools/lighthouse.ts
@@ -6,7 +6,7 @@
import path from 'node:path';
-import type {ParsedArguments} from '../config/mcp-options.js';
+import type {ParsedArguments} from '../config/ConfigParser.js';
import {
lighthouseRunner,
diff --git a/src/tools/pages.ts b/src/tools/pages.ts
index 6f1840c8..50fdcc63 100644
--- a/src/tools/pages.ts
+++ b/src/tools/pages.ts
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-import type {ParsedArguments} from '../config/mcp-options.js';
+import type {ParsedArguments} from '../config/ConfigParser.js';
import type {CdpPage} from '../third_party/index.js';
import {zod} from '../third_party/index.js';
import {logger} from '../utils/logger.js';
diff --git a/src/tools/screencast.ts b/src/tools/screencast.ts
index 82a53bd7..7c29acd6 100644
--- a/src/tools/screencast.ts
+++ b/src/tools/screencast.ts
@@ -8,7 +8,7 @@ import fs from 'node:fs/promises';
import os from 'node:os';
import path from 'node:path';
-import type {ParsedArguments} from '../config/mcp-options.js';
+import type {ParsedArguments} from '../config/ConfigParser.js';
import {zod} from '../third_party/index.js';
import type {ScreenRecorder, VideoFormat} from '../third_party/index.js';
diff --git a/src/tools/screenshot.ts b/src/tools/screenshot.ts
index 030e9587..cf8affb2 100644
--- a/src/tools/screenshot.ts
+++ b/src/tools/screenshot.ts
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-import type {ParsedArguments} from '../config/mcp-options.js';
+import type {ParsedArguments} from '../config/ConfigParser.js';
import {zod} from '../third_party/index.js';
import type {
BoundingBox,
diff --git a/src/tools/script.ts b/src/tools/script.ts
index 50501dac..7d3eed7d 100644
--- a/src/tools/script.ts
+++ b/src/tools/script.ts
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-import type {ParsedArguments} from '../config/mcp-options.js';
+import type {ParsedArguments} from '../config/ConfigParser.js';
import {zod} from '../third_party/index.js';
import type {Frame, JSHandle, Page, WebWorker} from '../third_party/index.js';
import type {ExtensionServiceWorker} from '../types.js';
diff --git a/src/tools/slim/tools.ts b/src/tools/slim/tools.ts
index 29a7879d..7d433ffc 100644
--- a/src/tools/slim/tools.ts
+++ b/src/tools/slim/tools.ts
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-import type {ParsedArguments} from '../../config/mcp-options.js';
+import type {ParsedArguments} from '../../config/ConfigParser.js';
import type {Dialog} from '../../third_party/index.js';
import {zod} from '../../third_party/index.js';
import {ToolCategory} from '../categories.js';
diff --git a/src/tools/tools.ts b/src/tools/tools.ts
index d73adcef..1c8522da 100644
--- a/src/tools/tools.ts
+++ b/src/tools/tools.ts
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-import type {ParsedArguments} from '../config/mcp-options.js';
+import type {ParsedArguments} from '../config/ConfigParser.js';
import * as commentsTools from './comments.js';
import * as consoleTools from './console.js';
diff --git a/tests/McpResponse.test.ts b/tests/McpResponse.test.ts
index 402ac7ce..77c21f08 100644
--- a/tests/McpResponse.test.ts
+++ b/tests/McpResponse.test.ts
@@ -11,7 +11,7 @@ import {describe, it} from 'node:test';
import sinon from 'sinon';
-import type {ParsedArguments} from '../src/config/mcp-options.js';
+import type {ParsedArguments} from '../src/config/ConfigParser.js';
import type {McpContext} from '../src/McpContext.js';
import {McpResponse} from '../src/McpResponse.js';
import {DevTools, type Extension} from '../src/third_party/index.js';
diff --git a/tests/McpServer.test.ts b/tests/McpServer.test.ts
index aeeeb361..ced1cd8b 100644
--- a/tests/McpServer.test.ts
+++ b/tests/McpServer.test.ts
@@ -10,7 +10,7 @@ import {afterEach, describe, it} from 'node:test';
import sinon from 'sinon';
import {BrowserManager} from '../src/BrowserManager.js';
-import {parseArguments} from '../src/config/mcp-options.js';
+import {ConfigParser} from '../src/config/ConfigParser.js';
import {McpServer} from '../src/index.js';
import {McpContext} from '../src/McpContext.js';
import {ClearcutLogger} from '../src/telemetry/ClearcutLogger.js';
@@ -33,9 +33,9 @@ describe('McpServer', () => {
context.getPages.returns([]);
sinon.stub(McpContext, 'from').resolves(context);
- const serverArgs = parseArguments('1.0.0', ['node', 'script.js'], {
+ const serverArgs = new ConfigParser('1.0.0', ['node', 'script.js'], {
CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',
- });
+ }).parse();
const server = await McpServer.from(serverArgs, {browserManager});
return {server, browserManager, context};
}
diff --git a/tests/ToolHandler.test.ts b/tests/ToolHandler.test.ts
index 94ac634e..40965416 100644
--- a/tests/ToolHandler.test.ts
+++ b/tests/ToolHandler.test.ts
@@ -12,7 +12,7 @@ import {pathToFileURL} from 'node:url';
import sinon from 'sinon';
-import {parseArguments} from '../src/config/mcp-options.js';
+import {ConfigParser} from '../src/config/ConfigParser.js';
import {McpContext} from '../src/McpContext.js';
import {McpPage} from '../src/McpPage.js';
import {McpResponse, type DataFormat} from '../src/McpResponse.js';
@@ -39,9 +39,9 @@ describe('ToolHandler', () => {
it('calls getPageById for page scoped tools when pageId is provided', async () => {
let handlerCalled = false;
- const serverArgs = parseArguments('1.0.0', ['node', 'script.js'], {
+ const serverArgs = new ConfigParser('1.0.0', ['node', 'script.js'], {
CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',
- });
+ }).parse();
const tool = definePageTool(() => ({
name: 'page_tool',
description: 'A page scoped tool',
@@ -84,11 +84,11 @@ describe('ToolHandler', () => {
it('calls getSelectedMcpPage for page scoped tools when pageIdRouting is disabled', async () => {
let handlerCalled = false;
- const serverArgs = parseArguments(
+ const serverArgs = new ConfigParser(
'1.0.0',
['node', 'script.js', '--no-page-id-routing'],
{CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true'},
- );
+ ).parse();
const tool = definePageTool(() => ({
name: 'page_tool',
description: 'A page scoped tool',
@@ -151,9 +151,9 @@ describe('ToolHandler', () => {
mockContext.browser = getMockBrowser({process: mockProcess});
const toolMutex = new Mutex();
- const serverArgs = parseArguments('1.0.0', ['node', 'script.js'], {
+ const serverArgs = new ConfigParser('1.0.0', ['node', 'script.js'], {
CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',
- });
+ }).parse();
const toolHandler = new ToolHandler(
tool,
@@ -208,11 +208,11 @@ describe('ToolHandler', () => {
const handleStub = sinon
.stub(McpResponse.prototype, 'handle')
.resolves({content: [], structuredContent: {}});
- const serverArgs = parseArguments(
+ const serverArgs = new ConfigParser(
'1.0.0',
['node', 'script.js', ...argv],
{CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true'},
- );
+ ).parse();
await new ToolHandler(
tool,
@@ -243,9 +243,9 @@ describe('ToolHandler', () => {
},
};
- const serverArgs = parseArguments('1.0.0', ['node', 'script.js'], {
+ const serverArgs = new ConfigParser('1.0.0', ['node', 'script.js'], {
CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',
- });
+ }).parse();
const testCases: Array<{
tool: ToolDefinition | DefinedPageTool;
@@ -336,9 +336,9 @@ describe('ToolHandler', () => {
const mockContext = sinon.createStubInstance(McpContext);
const toolMutex = new Mutex();
- const serverArgs = parseArguments('1.0.0', ['node', 'script.js'], {
+ const serverArgs = new ConfigParser('1.0.0', ['node', 'script.js'], {
CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',
- });
+ }).parse();
const toolHandler = new ToolHandler(
tool,
@@ -390,11 +390,11 @@ describe('ToolHandler', () => {
const mockContext = sinon.createStubInstance(McpContext);
const toolMutex = new Mutex();
- const serverArgs = parseArguments(
+ const serverArgs = new ConfigParser(
'1.0.0',
['node', 'script.js', '--categoryEmulation=false'],
{CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true'},
- );
+ ).parse();
const toolHandler = new ToolHandler(
tool,
@@ -420,9 +420,9 @@ describe('ToolHandler', () => {
const mockContext = sinon.createStubInstance(McpContext);
const toolMutex = new Mutex();
- const defaultServerArgs = parseArguments('1.0.0', ['node', 'script.js'], {
+ const defaultServerArgs = new ConfigParser('1.0.0', ['node', 'script.js'], {
CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',
- });
+ }).parse();
const defaultTool = createTools(defaultServerArgs).find(
t => t.name === 'evaluate_script',
);
@@ -439,11 +439,11 @@ describe('ToolHandler', () => {
);
assert.strictEqual(defaultHandler.disabled, false);
- const disabledServerArgs = parseArguments(
+ const disabledServerArgs = new ConfigParser(
'1.0.0',
['node', 'script.js', '--no-javascript-evaluation'],
{CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true'},
- );
+ ).parse();
const disabledTool = createTools(disabledServerArgs).find(
t => t.name === 'evaluate_script',
);
@@ -469,11 +469,11 @@ describe('ToolHandler', () => {
/Tool evaluate_script requires flag --javascriptEvaluation and is currently disabled/,
);
- const cliServerArgs = parseArguments(
+ const cliServerArgs = new ConfigParser(
'1.0.0',
['node', 'script.js', '--no-javascript-evaluation', '--viaCli'],
{CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true'},
- );
+ ).parse();
const cliTool = createTools(cliServerArgs).find(
t => t.name === 'evaluate_script',
);
@@ -501,11 +501,11 @@ describe('ToolHandler', () => {
const mockContext = sinon.createStubInstance(McpContext);
const toolMutex = new Mutex();
- const defaultServerArgs = parseArguments(
+ const defaultServerArgs = new ConfigParser(
'1.0.0',
['node', 'script.js', '--slim'],
{CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true'},
- );
+ ).parse();
const defaultTool = createTools(defaultServerArgs).find(
t => t.name === 'evaluate',
);
@@ -522,11 +522,11 @@ describe('ToolHandler', () => {
);
assert.strictEqual(defaultHandler.disabled, false);
- const disabledServerArgs = parseArguments(
+ const disabledServerArgs = new ConfigParser(
'1.0.0',
['node', 'script.js', '--slim', '--javascriptEvaluation=false'],
{CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true'},
- );
+ ).parse();
const disabledTool = createTools(disabledServerArgs).find(
t => t.name === 'evaluate',
);
@@ -583,9 +583,9 @@ describe('ToolHandler', () => {
});
const toolMutex = new Mutex();
- const serverArgs = parseArguments('1.0.0', ['node', 'script.js'], {
+ const serverArgs = new ConfigParser('1.0.0', ['node', 'script.js'], {
CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',
- });
+ }).parse();
const toolHandler = new ToolHandler(
tool,
@@ -661,9 +661,9 @@ describe('ToolHandler', () => {
);
const toolMutex = new Mutex();
- const serverArgs = parseArguments('1.0.0', ['node', 'script.js'], {
+ const serverArgs = new ConfigParser('1.0.0', ['node', 'script.js'], {
CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',
- });
+ }).parse();
const toolHandler = new ToolHandler(
tool,
@@ -719,9 +719,9 @@ describe('ToolHandler', () => {
mockContext.validatePath.resolves(canonicalPath);
const toolMutex = new Mutex();
- const serverArgs = parseArguments('1.0.0', ['node', 'script.js'], {
+ const serverArgs = new ConfigParser('1.0.0', ['node', 'script.js'], {
CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',
- });
+ }).parse();
const toolHandler = new ToolHandler(
tool,
@@ -778,9 +778,9 @@ describe('ToolHandler', () => {
mockContext.validatePath.resolves(canonicalBundlePath);
const toolMutex = new Mutex();
- const serverArgs = parseArguments('1.0.0', ['node', 'script.js'], {
+ const serverArgs = new ConfigParser('1.0.0', ['node', 'script.js'], {
CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',
- });
+ }).parse();
const toolHandler = new ToolHandler(
tool,
@@ -840,9 +840,9 @@ describe('ToolHandler', () => {
});
const toolMutex = new Mutex();
- const serverArgs = parseArguments('1.0.0', ['node', 'script.js'], {
+ const serverArgs = new ConfigParser('1.0.0', ['node', 'script.js'], {
CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',
- });
+ }).parse();
const toolHandler = new ToolHandler(
tool,
@@ -892,9 +892,9 @@ describe('ToolHandler', () => {
mockContext.browser = getMockBrowser();
const toolMutex = new Mutex();
- const serverArgs = parseArguments('1.0.0', ['node', 'script.js'], {
+ const serverArgs = new ConfigParser('1.0.0', ['node', 'script.js'], {
CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',
- });
+ }).parse();
const toolHandler = new ToolHandler(
tool,
@@ -942,9 +942,9 @@ describe('ToolHandler', () => {
mockContext.browser = getMockBrowser({process: mockProcess});
const toolMutex = new Mutex();
- const serverArgs = parseArguments('1.0.0', ['node', 'script.js'], {
+ const serverArgs = new ConfigParser('1.0.0', ['node', 'script.js'], {
CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',
- });
+ }).parse();
const toolHandler = new ToolHandler(
tool,
@@ -1000,9 +1000,9 @@ describe('ToolHandler', () => {
mockContext.validatePath.resolves(canonicalOutputPath);
const toolMutex = new Mutex();
- const serverArgs = parseArguments('1.0.0', ['node', 'script.js'], {
+ const serverArgs = new ConfigParser('1.0.0', ['node', 'script.js'], {
CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',
- });
+ }).parse();
const toolHandler = new ToolHandler(
tool,
@@ -1063,9 +1063,9 @@ describe('ToolHandler', () => {
);
const toolMutex = new Mutex();
- const serverArgs = parseArguments('1.0.0', ['node', 'script.js'], {
+ const serverArgs = new ConfigParser('1.0.0', ['node', 'script.js'], {
CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',
- });
+ }).parse();
const toolHandler = new ToolHandler(
tool,
@@ -1112,9 +1112,9 @@ describe('ToolHandler', () => {
};
const toolMutex = new Mutex();
- const serverArgs = parseArguments('1.0.0', ['node', 'script.js'], {
+ const serverArgs = new ConfigParser('1.0.0', ['node', 'script.js'], {
CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',
- });
+ }).parse();
// Remote browser: should validate
const mockRemoteContext = sinon.createStubInstance(McpContext);
@@ -1159,9 +1159,9 @@ describe('ToolHandler', () => {
it('rewrites file paths in params for page scoped tools', async () => {
let receivedParams: Record<string, unknown> | undefined;
- const serverArgs = parseArguments('1.0.0', ['node', 'script.js'], {
+ const serverArgs = new ConfigParser('1.0.0', ['node', 'script.js'], {
CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',
- });
+ }).parse();
const tool = definePageTool(() => ({
name: 'page_file_tool',
description: 'A page scoped tool with file verification',
@@ -1248,9 +1248,9 @@ describe('ToolHandler', () => {
const mockContext = createMockMcpContext();
mockContext.browser = getMockBrowser();
- const serverArgs = parseArguments('1.0.0', ['node', 'script.js'], {
+ const serverArgs = new ConfigParser('1.0.0', ['node', 'script.js'], {
CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',
- });
+ }).parse();
const toolHandler = new ToolHandler(
tool,
@@ -1299,9 +1299,9 @@ describe('ToolHandler', () => {
const forgetBrowserSpy = sinon.spy();
const toolMutex = new Mutex();
- const serverArgs = parseArguments('1.0.0', ['node', 'script.js'], {
+ const serverArgs = new ConfigParser('1.0.0', ['node', 'script.js'], {
CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',
- });
+ }).parse();
const toolHandler = new ToolHandler(
tool,
@@ -1359,9 +1359,9 @@ describe('ToolHandler', () => {
);
const toolMutex = new Mutex();
- const serverArgs = parseArguments('1.0.0', ['node', 'script.js'], {
+ const serverArgs = new ConfigParser('1.0.0', ['node', 'script.js'], {
CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',
- });
+ }).parse();
const toolHandler = new ToolHandler(
tool,
@@ -1410,9 +1410,9 @@ describe('ToolHandler', () => {
const abandonPendingBrowserAttemptSpy = sinon.spy();
const toolMutex = new Mutex();
- const serverArgs = parseArguments('1.0.0', ['node', 'script.js'], {
+ const serverArgs = new ConfigParser('1.0.0', ['node', 'script.js'], {
CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',
- });
+ }).parse();
const toolHandler = new ToolHandler(
tool,
diff --git a/tests/cli.test.ts b/tests/cli.test.ts
index ab31aa9b..e7f68fed 100644
--- a/tests/cli.test.ts
+++ b/tests/cli.test.ts
@@ -8,21 +8,22 @@ import assert from 'node:assert';
import path from 'node:path';
import {describe, it} from 'node:test';
+import {ConfigParser} from '../src/config/ConfigParser.js';
+import {getCliOptions, mcpOptions} from '../src/config/mcp-options.js';
import {buildCommand} from '../src/config/cli-commands.js';
import {commands} from '../src/config/cli-options.js';
-import {
- buildCliParser,
- DEFAULT_FILESYSTEM_ROOT,
- getCliOptions,
- mcpOptions,
- parseArguments as parseArgumentsImpl,
-} from '../src/config/mcp-options.js';
import {computeFlagUsage} from '../src/telemetry/flagUtils.js';
+import {DEFAULT_FILESYSTEM_ROOT} from '../src/config/mcp-options.js';
import {createTempFile} from './utils.js';
-function parseArguments(argv: string[], env: NodeJS.ProcessEnv = {}) {
- return parseArgumentsImpl('0.0.0', ['node', 'main.js', ...argv], env, false);
+function parseConfig(argv: string[], env: NodeJS.ProcessEnv = {}) {
+ return new ConfigParser(
+ '0.0.0',
+ ['node', 'main.js', ...argv],
+ env,
+ false,
+ ).parse();
}
describe('cli args parsing', () => {
@@ -62,7 +63,7 @@ describe('cli args parsing', () => {
};
it('parses with default args', async () => {
- const args = parseArguments([]);
+ const args = parseConfig([]);
assert.deepStrictEqual(args, {
...defaultArgs,
channel: 'stable',
@@ -70,7 +71,7 @@ describe('cli args parsing', () => {
});
it('parses with viaCli args', async () => {
- const args = parseArguments(['--viaCli']);
+ const args = parseConfig(['--viaCli']);
assert.strictEqual(args.allowUnrestrictedPaths, true);
assert.strictEqual(args.headless, true);
assert.strictEqual(args.isolated, true);
@@ -81,7 +82,7 @@ describe('cli args parsing', () => {
});
it('parses with browser url', async () => {
- const args = parseArguments(['--browserUrl', 'http://localhost:3000']);
+ const args = parseConfig(['--browserUrl', 'http://localhost:3000']);
assert.deepStrictEqual(args, {
...defaultArgs,
browserUrl: 'http://localhost:3000',
@@ -95,7 +96,7 @@ describe('cli args parsing', () => {
output += msg;
};
try {
- parseArguments(['--browserURL', 'http://localhost:3000']);
+ parseConfig(['--browserURL', 'http://localhost:3000']);
assert.match(output, /Unknown arguments: --browserURL/);
} finally {
console.error = originalError;
@@ -103,13 +104,13 @@ describe('cli args parsing', () => {
});
it('parses mixed-form option names', async () => {
- const args = parseArguments(['--category-experimentalWebmcp']);
+ const args = parseConfig(['--category-experimentalWebmcp']);
assert.strictEqual(args.categoryExperimentalWebmcp, true);
});
it('parses with user data dir', async () => {
- const args = parseArguments(['--user-data-dir', '/tmp/chrome-profile']);
+ const args = parseConfig(['--user-data-dir', '/tmp/chrome-profile']);
assert.deepStrictEqual(args, {
...defaultArgs,
channel: 'stable',
@@ -118,7 +119,7 @@ describe('cli args parsing', () => {
});
it('parses an empty browser url', async () => {
- const args = parseArguments(['--browserUrl', ''], {});
+ const args = parseConfig(['--browserUrl', ''], {});
assert.deepStrictEqual(args, {
...defaultArgs,
channel: 'stable',
@@ -127,7 +128,7 @@ describe('cli args parsing', () => {
});
it('parses with executable path', async () => {
- const args = parseArguments(['--executablePath', '/tmp/test 123/chrome']);
+ const args = parseConfig(['--executablePath', '/tmp/test 123/chrome']);
assert.deepStrictEqual(args, {
...defaultArgs,
executablePath: '/tmp/test 123/chrome',
@@ -135,7 +136,7 @@ describe('cli args parsing', () => {
});
it('parses viewport', async () => {
- const args = parseArguments(['--viewport', '888x777']);
+ const args = parseConfig(['--viewport', '888x777']);
assert.deepStrictEqual(args, {
...defaultArgs,
channel: 'stable',
@@ -147,7 +148,7 @@ describe('cli args parsing', () => {
});
it('parses chrome args', async () => {
- const args = parseArguments([
+ const args = parseConfig([
`--chrome-arg='--no-sandbox'`,
`--chrome-arg='--disable-setuid-sandbox'`,
]);
@@ -160,7 +161,7 @@ describe('cli args parsing', () => {
describe('filesystem roots', () => {
it('parses filesystem roots', async () => {
- const args = parseArguments([
+ const args = parseConfig([
'--filesystem-root=/tmp/one',
'--filesystem-root=/tmp/two',
]);
@@ -168,7 +169,7 @@ describe('cli args parsing', () => {
});
it('parses workspace as an alias for filesystem roots', async () => {
- const args = parseArguments([
+ const args = parseConfig([
'--workspace=/tmp/one',
'--workspace=/tmp/two',
]);
@@ -176,12 +177,12 @@ describe('cli args parsing', () => {
});
it('still accepts unrestricted paths without an explicit root', async () => {
- const args = parseArguments(['--allow-unrestricted-paths']);
+ const args = parseConfig(['--allow-unrestricted-paths']);
assert.strictEqual(args.allowUnrestrictedPaths, true);
});
it('accepts an explicit unrestricted flag in CLI mode', async () => {
- const args = parseArguments(['--viaCli', '--allow-unrestricted-paths']);
+ const args = parseConfig(['--viaCli', '--allow-unrestricted-paths']);
assert.strictEqual(args.allowUnrestrictedPaths, true);
assert.strictEqual(args.filesystemRoot, undefined);
});
@@ -189,7 +190,7 @@ describe('cli args parsing', () => {
it('rejects unrestricted paths with a CLI workspace', async () => {
assert.throws(
() =>
- parseArguments([
+ parseConfig([
'--viaCli',
'--allow-unrestricted-paths',
'--workspace=/tmp/one',
@@ -201,7 +202,7 @@ describe('cli args parsing', () => {
it('rejects unrestricted paths with a direct filesystem root', async () => {
assert.throws(
() =>
- parseArguments([
+ parseConfig([
'--allow-unrestricted-paths',
'--filesystem-root=/tmp/one',
]),
@@ -216,7 +217,7 @@ describe('cli args parsing', () => {
);
assert.throws(
() =>
- parseArguments([
+ parseConfig([
'--viaCli',
'--config',
testConfig.path,
@@ -233,7 +234,7 @@ describe('cli args parsing', () => {
);
assert.throws(
() =>
- parseArguments([
+ parseConfig([
'--config',
testConfig.path,
'--allow-unrestricted-paths',
@@ -247,7 +248,7 @@ describe('cli args parsing', () => {
JSON.stringify({allowUnrestrictedPaths: true}),
'cd4a.test.config.unrestricted-false.json',
);
- const args = parseArguments([
+ const args = parseConfig([
'--config',
testConfig.path,
'--no-allow-unrestricted-paths',
@@ -258,25 +259,25 @@ describe('cli args parsing', () => {
});
it('lets an explicit workspace override the CLI unrestricted default', async () => {
- const args = parseArguments(['--viaCli', '--workspace=/tmp/one']);
+ const args = parseConfig(['--viaCli', '--workspace=/tmp/one']);
assert.strictEqual(args.allowUnrestrictedPaths, false);
assert.deepStrictEqual(args.filesystemRoot, ['/tmp/one']);
});
it('keeps the CLI unrestricted default when no workspace is set', async () => {
- const args = parseArguments(['--viaCli']);
+ const args = parseConfig(['--viaCli']);
assert.strictEqual(args.allowUnrestrictedPaths, true);
assert.strictEqual(args.filesystemRoot, undefined);
});
it('uses yargs default identity to detect an unset CLI workspace', async () => {
- const args = parseArguments([]);
+ const args = parseConfig([]);
assert.strictEqual(args.filesystemRoot, DEFAULT_FILESYSTEM_ROOT);
});
});
it('parses ignore chrome args', async () => {
- const args = parseArguments([
+ const args = parseConfig([
`--ignore-default-chrome-arg='--disable-extensions'`,
`--ignore-default-chrome-arg='--disable-cancel-all-touches'`,
]);
@@ -291,7 +292,7 @@ describe('cli args parsing', () => {
});
it('parses wsEndpoint with ws:// protocol', async () => {
- const args = parseArguments([
+ const args = parseConfig([
'--wsEndpoint',
'ws://127.0.0.1:9222/devtools/browser/abc123',
]);
@@ -302,7 +303,7 @@ describe('cli args parsing', () => {
});
it('parses wsEndpoint with wss:// protocol', async () => {
- const args = parseArguments([
+ const args = parseConfig([
'--wsEndpoint',
'wss://example.com:9222/devtools/browser/abc123',
]);
@@ -313,7 +314,7 @@ describe('cli args parsing', () => {
});
it('parses wsHeaders with valid JSON', async () => {
- const args = parseArguments([
+ const args = parseConfig([
'--wsEndpoint',
'ws://127.0.0.1:9222/devtools/browser/abc123',
'--wsHeaders',
@@ -326,7 +327,7 @@ describe('cli args parsing', () => {
});
it('parses disabled category', async () => {
- const args = parseArguments(['--no-category-emulation']);
+ const args = parseConfig(['--no-category-emulation']);
assert.deepStrictEqual(args, {
...defaultArgs,
channel: 'stable',
@@ -334,7 +335,7 @@ describe('cli args parsing', () => {
});
});
it('parses auto-connect', async () => {
- const args = parseArguments(['--auto-connect'], {});
+ const args = parseConfig(['--auto-connect'], {});
assert.deepStrictEqual(args, {
...defaultArgs,
channel: 'stable',
@@ -359,76 +360,76 @@ describe('cli args parsing', () => {
it('parses usage statistics flag', async () => {
// Test default (should be true).
- const defaultArgs = parseArguments(['main.js'], {});
+ const defaultArgs = parseConfig(['main.js'], {});
assert.strictEqual(defaultArgs.usageStatistics, true);
// Test enabling it
- const enabledArgs = parseArguments(['--usage-statistics']);
+ const enabledArgs = parseConfig(['--usage-statistics']);
assert.strictEqual(enabledArgs.usageStatistics, true);
// Test disabling it
- const disabledArgs = parseArguments(['--no-usage-statistics']);
+ const disabledArgs = parseConfig(['--no-usage-statistics']);
assert.strictEqual(disabledArgs.usageStatistics, false);
});
it('parses javascript evaluation flag', async () => {
// Test default (should be true).
- const defaultArgs = parseArguments(['main.js'], {});
+ const defaultArgs = parseConfig(['main.js'], {});
assert.strictEqual(defaultArgs.javascriptEvaluation, true);
// Test enabling it
- const enabledArgs = parseArguments(['--javascript-evaluation']);
+ const enabledArgs = parseConfig(['--javascript-evaluation']);
assert.strictEqual(enabledArgs.javascriptEvaluation, true);
// Test disabling it
- const disabledArgs = parseArguments(['--no-javascript-evaluation']);
+ const disabledArgs = parseConfig(['--no-javascript-evaluation']);
assert.strictEqual(disabledArgs.javascriptEvaluation, false);
});
it('respects env variable', async () => {
// Test default (should be true).
- const defaultArgs = parseArguments(['main.js'], {
+ const defaultArgs = parseConfig(['main.js'], {
CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',
});
assert.strictEqual(defaultArgs.usageStatistics, false);
// Test enabling it
- const enabledArgs = parseArguments(['--usage-statistics'], {
+ const enabledArgs = parseConfig(['--usage-statistics'], {
CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',
});
assert.strictEqual(enabledArgs.usageStatistics, false);
// Test disabling it
- const disabledArgs = parseArguments(['--no-usage-statistics'], {
+ const disabledArgs = parseConfig(['--no-usage-statistics'], {
CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',
});
assert.strictEqual(disabledArgs.usageStatistics, false);
});
it('parses performance crux flag', async () => {
- const defaultArgs = parseArguments(['main.js']);
+ const defaultArgs = parseConfig(['main.js']);
assert.strictEqual(defaultArgs.performanceCrux, true);
// force enable
- const enabledArgs = parseArguments(['--performance-crux']);
+ const enabledArgs = parseConfig(['--performance-crux']);
assert.strictEqual(enabledArgs.performanceCrux, true);
- const disabledArgs = parseArguments(['--no-performance-crux']);
+ const disabledArgs = parseConfig(['--no-performance-crux']);
assert.strictEqual(disabledArgs.performanceCrux, false);
});
it('parses blocked-url-pattern flags as array', async () => {
- const defaultArgs = parseArguments(['main.js']);
+ const defaultArgs = parseConfig(['main.js']);
assert.strictEqual(defaultArgs.blockedUrlPattern, undefined);
- const singleArgs = parseArguments([
+ const singleArgs = parseConfig([
'--blocked-url-pattern=https://example.com/*',
]);
assert.deepStrictEqual(singleArgs.blockedUrlPattern, [
'https://example.com/*',
]);
- const repeatedArgs = parseArguments([
+ const repeatedArgs = parseConfig([
'--blocked-url-pattern=https://a.com/*',
'--blocked-url-pattern=https://b.com/*',
]);
@@ -437,7 +438,7 @@ describe('cli args parsing', () => {
'https://b.com/*',
]);
- const spaceSeparatedArgs = parseArguments([
+ const spaceSeparatedArgs = parseConfig([
'--blocked-url-pattern',
'https://a.com/*',
'https://b.com/*',
@@ -449,17 +450,17 @@ describe('cli args parsing', () => {
});
it('parses allowed-url-pattern flags as array', async () => {
- const defaultArgs = parseArguments(['main.js']);
+ const defaultArgs = parseConfig(['main.js']);
assert.strictEqual(defaultArgs.allowedUrlPattern, undefined);
- const singleArgs = parseArguments([
+ const singleArgs = parseConfig([
'--allowed-url-pattern=https://example.com/*',
]);
assert.deepStrictEqual(singleArgs.allowedUrlPattern, [
'https://example.com/*',
]);
- const repeatedArgs = parseArguments([
+ const repeatedArgs = parseConfig([
'--allowed-url-pattern=https://a.com/*',
'--allowed-url-pattern=https://b.com/*',
]);
@@ -468,7 +469,7 @@ describe('cli args parsing', () => {
'https://b.com/*',
]);
- const spaceSeparatedArgs = parseArguments([
+ const spaceSeparatedArgs = parseConfig([
'--allowed-url-pattern',
'https://a.com/*',
'https://b.com/*',
@@ -482,7 +483,7 @@ describe('cli args parsing', () => {
it('rejects a blocked-url-pattern with a regexp group', async () => {
assert.throws(
() =>
- parseArguments([
+ parseConfig([
String.raw`--blocked-url-pattern=*://(127\.\d+\.\d+\.\d+):*/*`,
]),
/Invalid --blockedUrlPattern .*a regexp group is not enforced/,
@@ -490,7 +491,7 @@ describe('cli args parsing', () => {
assert.throws(
() =>
- parseArguments([
+ parseConfig([
'--blocked-url-pattern=https://a.com/*',
String.raw`--blocked-url-pattern=*://example.com/(foo|bar)`,
]),
@@ -501,7 +502,7 @@ describe('cli args parsing', () => {
it('rejects an allowed-url-pattern with a regexp group', async () => {
assert.throws(
() =>
- parseArguments([
+ parseConfig([
String.raw`--allowed-url-pattern=*://(127\.\d+\.\d+\.\d+):*/*`,
]),
/Invalid --allowedUrlPattern .*a regexp group is not enforced/,
@@ -509,7 +510,7 @@ describe('cli args parsing', () => {
assert.throws(
() =>
- parseArguments([
+ parseConfig([
'--allowed-url-pattern=https://a.com/*',
String.raw`--allowed-url-pattern=(http|https)://example.com/*`,
]),
@@ -519,12 +520,12 @@ describe('cli args parsing', () => {
it('rejects a blocked-url-pattern with invalid syntax', async () => {
assert.throws(() =>
- parseArguments(['--blocked-url-pattern=*://example.com/(unterminated']),
+ parseConfig(['--blocked-url-pattern=*://example.com/(unterminated']),
);
});
it('strips an empty blocked-url-pattern', async () => {
- const args = parseArguments(['--blocked-url-pattern']);
+ const args = parseConfig(['--blocked-url-pattern']);
assert.strictEqual(args.blockedUrlPattern, undefined);
});
@@ -533,7 +534,7 @@ describe('cli args parsing', () => {
JSON.stringify({blockedUrlPattern: []}),
'cd4a.test.config.empty-blocked.json',
);
- const args = parseArguments([
+ const args = parseConfig([
'--config',
testConfig.path,
'--allowed-url-pattern',
@@ -545,7 +546,7 @@ describe('cli args parsing', () => {
it('rejects an empty allowed-url-pattern', async () => {
assert.throws(
- () => parseArguments(['--allowed-url-pattern']),
+ () => parseConfig(['--allowed-url-pattern']),
/Invalid --allowedUrlPattern: at least one pattern is required/,
);
});
@@ -556,22 +557,22 @@ describe('cli args parsing', () => {
'cd4a.test.config.empty-allowed.json',
);
assert.throws(
- () => parseArguments(['--config', testConfig.path]),
+ () => parseConfig(['--config', testConfig.path]),
/Invalid JSON config file: Invalid --allowedUrlPattern: at least one pattern is required/,
);
});
it('parses source-maps flag', async () => {
- const defaultParsed = parseArguments(['main.js']);
+ const defaultParsed = parseConfig(['main.js']);
assert.strictEqual(defaultParsed.sourceMaps, true);
- const disabledArgs = parseArguments(['--no-source-maps']);
+ const disabledArgs = parseConfig(['--no-source-maps']);
assert.strictEqual(disabledArgs.sourceMaps, false);
- const explicitFalseArgs = parseArguments(['--source-maps=false']);
+ const explicitFalseArgs = parseConfig(['--source-maps=false']);
assert.strictEqual(explicitFalseArgs.sourceMaps, false);
- const explicitTrueArgs = parseArguments(['--source-maps=true']);
+ const explicitTrueArgs = parseConfig(['--source-maps=true']);
assert.strictEqual(explicitTrueArgs.sourceMaps, true);
});
@@ -584,7 +585,7 @@ describe('cli args parsing', () => {
}),
'cd4a.test.config.json',
);
- const args = parseArguments(['--config', testConfig.path]);
+ const args = parseConfig(['--config', testConfig.path]);
assert.strictEqual(args.config, testConfig.path);
assert.strictEqual(args.headless, true);
assert.strictEqual(args.categoryInput, false);
@@ -599,7 +600,7 @@ describe('cli args parsing', () => {
}),
'cd4a.test.config.mixed.json',
);
- const args = parseArguments([
+ const args = parseConfig([
'--config',
testConfig.path,
'--headless=false',
@@ -621,7 +622,7 @@ describe('cli args parsing', () => {
}),
'cd4a.test.config.coercion.json',
);
- const args = parseArguments(['--config', testConfig.path]);
+ const args = parseConfig(['--config', testConfig.path]);
assert.deepStrictEqual(args.viewport, {width: 1280, height: 720});
assert.deepStrictEqual(args.wsHeaders, {Authorization: 'Bearer token'});
});
@@ -631,7 +632,7 @@ describe('cli args parsing', () => {
JSON.stringify({viewport: '1280x720'}),
'cd4a.test.config.coercion-override.json',
);
- const args = parseArguments([
+ const args = parseConfig([
'--config',
testConfig.path,
'--viewport',
@@ -649,7 +650,7 @@ describe('cli args parsing', () => {
'cd4a.test.config.viacli.json',
);
const relativePath = path.relative(process.cwd(), testConfig.path);
- const args = parseArguments(['--viaCli', '--config', relativePath]);
+ const args = parseConfig(['--viaCli', '--config', relativePath]);
assert.strictEqual(args.config, testConfig.path);
assert.strictEqual(args.userDataDir, '/tmp/custom-profile');
assert.strictEqual(args.isolated, false);
@@ -663,7 +664,7 @@ describe('cli args parsing', () => {
}),
'cd4a.test.config.viacli-isolated.json',
);
- const args = parseArguments(['--viaCli', '--config', testConfig.path]);
+ const args = parseConfig(['--viaCli', '--config', testConfig.path]);
assert.strictEqual(args.isolated, false);
});
@@ -676,7 +677,7 @@ describe('cli args parsing', () => {
'cd4a.test.config.mixed.json',
);
assert.throws(
- () => parseArguments(['--config', testConfig.path]),
+ () => parseConfig(['--config', testConfig.path]),
/Invalid JSON config file: Unknown argument: no-category-memory/,
);
});
@@ -690,7 +691,7 @@ describe('cli args parsing', () => {
'cd4a.test.config.mixed.json',
);
assert.throws(
- () => parseArguments(['--config', testConfig.path]),
+ () => parseConfig(['--config', testConfig.path]),
/Invalid JSON config file: Unknown argument: category-memory/,
);
});
@@ -701,7 +702,7 @@ describe('cli args parsing', () => {
'cd4a.test.config.malformed.json',
);
assert.throws(
- () => parseArguments(['--config', testConfig.path]),
+ () => parseConfig(['--config', testConfig.path]),
/Invalid JSON config file:/,
);
});
@@ -712,14 +713,14 @@ describe('cli args parsing', () => {
'cd4a.test.config.array.json',
);
assert.throws(
- () => parseArguments(['--config', testConfig.path]),
+ () => parseConfig(['--config', testConfig.path]),
/Invalid JSON config file: Config must be a JSON object/,
);
});
it('rejects a missing config file', async () => {
assert.throws(
- () => parseArguments(['--config', 'cd4a.test.config.missing.json']),
+ () => parseConfig(['--config', 'cd4a.test.config.missing.json']),
/Invalid JSON config file: ENOENT/,
);
});
@@ -729,11 +730,7 @@ describe('cli args parsing', () => {
JSON.stringify({chromeArg: ['--a']}),
'cd4a.test.config.array-replace.json',
);
- const args = parseArguments([
- '--config',
- testConfig.path,
- '--chrome-arg=--b',
- ]);
+ const args = parseConfig(['--config', testConfig.path, '--chrome-arg=--b']);
assert.deepStrictEqual(args.chromeArg, ['--b']);
});
@@ -742,19 +739,19 @@ describe('cli args parsing', () => {
JSON.stringify({usageStatistics: true}),
'cd4a.test.config.usage-statistics.json',
);
- const args = parseArguments(['--config', testConfig.path], {CI: 'true'});
+ const args = parseConfig(['--config', testConfig.path], {CI: 'true'});
assert.strictEqual(args.usageStatistics, false);
});
it('lets explicit cli flags override viaCli dynamic defaults', async () => {
- const args = parseArguments(['--viaCli', '--no-headless']);
+ const args = parseConfig(['--viaCli', '--no-headless']);
assert.strictEqual(args.headless, false);
});
describe('viaCli defaults', () => {
for (const flag of ['--viaCli=true', '--via-cli=true']) {
it(`applies viaCli defaults for ${flag}`, async () => {
- const args = parseArguments([flag]);
+ const args = parseConfig([flag]);
assert.strictEqual(args.viaCli, true);
assert.strictEqual(args.headless, true);
assert.strictEqual(args.isolated, true);
@@ -763,7 +760,7 @@ describe('cli args parsing', () => {
}
it('does not apply viaCli defaults for --viaCli false', async () => {
- const args = parseArguments(['--viaCli', 'false']);
+ const args = parseConfig(['--viaCli', 'false']);
assert.strictEqual(args.viaCli, false);
assert.strictEqual(args.headless, false);
assert.strictEqual(args.isolated, false);
@@ -775,7 +772,7 @@ describe('cli args parsing', () => {
JSON.stringify({viaCli: true}),
'cd4a.test.config.via-cli.json',
);
- const args = parseArguments(['--config', testConfig.path]);
+ const args = parseConfig(['--config', testConfig.path]);
assert.strictEqual(args.viaCli, true);
assert.strictEqual(args.headless, true);
assert.strictEqual(args.isolated, true);
@@ -786,11 +783,7 @@ describe('cli args parsing', () => {
JSON.stringify({viaCli: true}),
'cd4a.test.config.via-cli-override.json',
);
- const args = parseArguments([
- '--config',
- testConfig.path,
- '--viaCli=false',
- ]);
+ const args = parseConfig(['--config', testConfig.path, '--viaCli=false']);
assert.strictEqual(args.viaCli, false);
assert.strictEqual(args.headless, false);
assert.strictEqual(args.isolated, false);
@@ -803,7 +796,7 @@ describe('cli args parsing', () => {
['--user-data-dir', '/tmp/chrome-profile'],
]) {
it(`does not default to isolated with ${connectArgs[0]}`, async () => {
- const args = parseArguments(['--viaCli', ...connectArgs]);
+ const args = parseConfig(['--viaCli', ...connectArgs]);
assert.strictEqual(args.isolated, false);
});
}
@@ -813,23 +806,20 @@ describe('cli args parsing', () => {
JSON.stringify({autoConnect: true}),
'cd4a.test.config.via-cli-auto-connect.json',
);
- const args = parseArguments(['--viaCli', '--config', testConfig.path]);
+ const args = parseConfig(['--viaCli', '--config', testConfig.path]);
assert.strictEqual(args.autoConnect, true);
assert.strictEqual(args.isolated, false);
});
});
it('parses with devtoolsComments enabled', async () => {
- const args = parseArguments(['--devtoolsComments']);
+ const args = parseConfig(['--devtoolsComments']);
assert.strictEqual(args.devtoolsComments, true);
});
it('includes usage examples in help output', async () => {
- const help = await buildCliParser(
- '0.0.0',
- ['node', 'main.js'],
- mcpOptions,
- ).getHelp();
+ const parser = new ConfigParser('0.0.0', ['node', 'main.js']);
+ const help = await parser.buildCliParser(mcpOptions).getHelp();
assert.match(help, /Examples:/);
assert.match(help, /--browserUrl http:\/\/127\.0\.0\.1:9222/);
});
@@ -869,18 +859,14 @@ describe('cli args parsing', () => {
it('rejects isolated with userDataDir', async () => {
assert.throws(
() =>
- parseArguments([
- '--isolated',
- '--user-data-dir',
- '/tmp/chrome-profile',
- ]),
+ parseConfig(['--isolated', '--user-data-dir', '/tmp/chrome-profile']),
/Arguments userDataDir and isolated are mutually exclusive/,
);
});
it('rejects isolated with autoConnect', async () => {
assert.throws(
- () => parseArguments(['--isolated', '--auto-connect']),
+ () => parseConfig(['--isolated', '--auto-connect']),
/Arguments autoConnect and isolated are mutually exclusive/,
);
});
@@ -888,14 +874,14 @@ describe('cli args parsing', () => {
it('rejects autoConnect with executablePath', async () => {
assert.throws(
() =>
- parseArguments(['--auto-connect', '--executablePath', '/bin/chrome']),
+ parseConfig(['--auto-connect', '--executablePath', '/bin/chrome']),
/Arguments autoConnect and executablePath are mutually exclusive/,
);
});
it('rejects categoryPwa with autoConnect', async () => {
assert.throws(
- () => parseArguments(['--category-pwa', '--auto-connect']),
+ () => parseConfig(['--category-pwa', '--auto-connect']),
/Arguments categoryPwa and autoConnect are mutually exclusive/,
);
});
@@ -903,7 +889,7 @@ describe('cli args parsing', () => {
it('rejects categoryPwa with browserUrl', async () => {
assert.throws(
() =>
- parseArguments([
+ parseConfig([
'--category-pwa',
'--browserUrl',
'http://localhost:9222',
@@ -915,7 +901,7 @@ describe('cli args parsing', () => {
it('rejects categoryPwa with wsEndpoint', async () => {
assert.throws(
() =>
- parseArguments([
+ parseConfig([
'--category-pwa',
'--wsEndpoint',
'ws://localhost:9222',
@@ -927,7 +913,7 @@ describe('cli args parsing', () => {
it('rejects explicit channel with browserUrl', async () => {
assert.throws(
() =>
- parseArguments([
+ parseConfig([
'--channel=canary',
'--browserUrl',
'http://localhost:9222',
@@ -939,7 +925,7 @@ describe('cli args parsing', () => {
it('rejects explicit channel with wsEndpoint', async () => {
assert.throws(
() =>
- parseArguments([
+ parseConfig([
'--channel',
'canary',
'--wsEndpoint',
@@ -952,7 +938,7 @@ describe('cli args parsing', () => {
it('rejects explicit channel with executablePath', async () => {
assert.throws(
() =>
- parseArguments([
+ parseConfig([
'--channel',
'canary',
'--executablePath',
@@ -965,7 +951,7 @@ describe('cli args parsing', () => {
it('rejects browserUrl with wsEndpoint', async () => {
assert.throws(
() =>
- parseArguments([
+ parseConfig([
'--browserUrl',
'http://localhost:9222',
'--wsEndpoint',
@@ -978,7 +964,7 @@ describe('cli args parsing', () => {
it('rejects executablePath with browserUrl', async () => {
assert.throws(
() =>
- parseArguments([
+ parseConfig([
'--executablePath',
'/bin/chrome',
'--browserUrl',
@@ -991,7 +977,7 @@ describe('cli args parsing', () => {
it('rejects executablePath with wsEndpoint', async () => {
assert.throws(
() =>
- parseArguments([
+ parseConfig([
'--executablePath',
'/bin/chrome',
'--wsEndpoint',
@@ -1004,7 +990,7 @@ describe('cli args parsing', () => {
it('rejects userDataDir with browserUrl', async () => {
assert.throws(
() =>
- parseArguments([
+ parseConfig([
'--user-data-dir',
'/tmp/dir',
'--browserUrl',
@@ -1017,7 +1003,7 @@ describe('cli args parsing', () => {
it('rejects userDataDir with wsEndpoint', async () => {
assert.throws(
() =>
- parseArguments([
+ parseConfig([
'--user-data-dir',
'/tmp/dir',
'--wsEndpoint',
@@ -1030,7 +1016,7 @@ describe('cli args parsing', () => {
it('rejects blockedUrlPattern with allowedUrlPattern', async () => {
assert.throws(
() =>
- parseArguments([
+ parseConfig([
'--blocked-url-pattern',
'https://a.com/*',
'--allowed-url-pattern',
@@ -1047,7 +1033,7 @@ describe('cli args parsing', () => {
);
assert.throws(
() =>
- parseArguments([
+ parseConfig([
'--config',
testConfig.path,
'--browserUrl',
@@ -1063,8 +1049,7 @@ describe('cli args parsing', () => {
'cd4a.test.config.browser-url.json',
);
assert.throws(
- () =>
- parseArguments(['--config', testConfig.path, '--channel', 'canary']),
+ () => parseConfig(['--config', testConfig.path, '--channel', 'canary']),
/Arguments channel and browserUrl are mutually exclusive/,
);
});
@@ -1078,13 +1063,13 @@ describe('cli args parsing', () => {
'cd4a.test.config.conflict.json',
);
assert.throws(
- () => parseArguments(['--config', testConfig.path]),
+ () => parseConfig(['--config', testConfig.path]),
/Arguments browserUrl and wsEndpoint are mutually exclusive/,
);
});
it('allows explicitly disabled isolated with userDataDir', async () => {
- const args = parseArguments([
+ const args = parseConfig([
'--isolated=false',
'--user-data-dir',
'/tmp/chrome-profile',
@@ -1098,7 +1083,7 @@ describe('cli args parsing', () => {
JSON.stringify({autoConnect: false}),
'cd4a.test.config.false-no-conflict.json',
);
- const args = parseArguments([
+ const args = parseConfig([
'--config',
testConfig.path,
'--executablePath',
@@ -1113,7 +1098,7 @@ describe('cli args parsing', () => {
JSON.stringify({autoConnect: true}),
'cd4a.test.config.false-override.json',
);
- const args = parseArguments([
+ const args = parseConfig([
'--config',
testConfig.path,
'--autoConnect=false',
@@ -1126,7 +1111,7 @@ describe('cli args parsing', () => {
it('rejects categoryExtensions with autoConnect', async () => {
assert.throws(
- () => parseArguments(['--category-extensions', '--auto-connect']),
+ () => parseConfig(['--category-extensions', '--auto-connect']),
/Arguments categoryExtensions and autoConnect are mutually exclusive/,
);
});
@@ -1134,7 +1119,7 @@ describe('cli args parsing', () => {
it('rejects categoryExtensions with browserUrl', async () => {
assert.throws(
() =>
- parseArguments([
+ parseConfig([
'--category-extensions',
'--browserUrl',
'http://localhost:9222',
@@ -1146,7 +1131,7 @@ describe('cli args parsing', () => {
it('rejects categoryExtensions with wsEndpoint', async () => {
assert.throws(
() =>
- parseArguments([
+ parseConfig([
'--category-extensions',
'--wsEndpoint',
'ws://localhost:9222',
@@ -1161,7 +1146,7 @@ describe('cli args parsing', () => {
['--executablePath', '/tmp/chrome'],
]) {
it(`does not default channel with ${connectArgs[0]}`, async () => {
- const args = parseArguments(connectArgs);
+ const args = parseConfig(connectArgs);
assert.strictEqual(args.channel, undefined);
});
}
@@ -1172,7 +1157,7 @@ describe('cli args parsing', () => {
['--auto-connect'],
]) {
it(`allows viaCli with ${connectArgs[0]} without enabling extensions`, async () => {
- const args = parseArguments(['--viaCli', ...connectArgs]);
+ const args = parseConfig(['--viaCli', ...connectArgs]);
assert.strictEqual(args.categoryExtensions, undefined);
assert.strictEqual(args.isolated, false);
});
@@ -1181,7 +1166,7 @@ describe('cli args parsing', () => {
it('rejects explicit categoryExtensions with browserUrl in viaCli', async () => {
assert.throws(
() =>
- parseArguments([
+ parseConfig([
'--viaCli',
'--category-extensions',
'--browserUrl',
@@ -1194,7 +1179,7 @@ describe('cli args parsing', () => {
describe('dataFormat', () => {
it('keeps experimentalToonFormat and experimentalDataFormat separate', () => {
- const args = parseArguments(['--experimentalToonFormat']);
+ const args = parseConfig(['--experimentalToonFormat']);
assert.strictEqual(args.experimentalToonFormat, true);
assert.strictEqual(args.experimentalDataFormat, undefined);
});
@@ -1266,7 +1251,7 @@ describe('cli command strings', () => {
describe('flag usage telemetry', () => {
it('reports the stable channel for a default launch', async () => {
- const usage = computeFlagUsage(parseArguments([]), mcpOptions);
+ const usage = computeFlagUsage(parseConfig([]), mcpOptions);
assert.strictEqual(usage.isolated_present, undefined);
assert.strictEqual(usage.channel_present, undefined);
assert.strictEqual(usage.channel, 'CHANNEL_STABLE');
@@ -1278,7 +1263,7 @@ describe('flag usage telemetry', () => {
['--executablePath', '/tmp/chrome'],
]) {
it(`does not report channel with ${connectArgs[0]}`, async () => {
- const usage = computeFlagUsage(parseArguments(connectArgs), mcpOptions);
+ const usage = computeFlagUsage(parseConfig(connectArgs), mcpOptions);
assert.strictEqual(usage.isolated_present, undefined);
assert.strictEqual(usage.channel_present, false);
assert.strictEqual(usage.channel, undefined);
@@ -1287,7 +1272,7 @@ describe('flag usage telemetry', () => {
it('does not report experimentalDataFormat for legacy experimentalToonFormat', async () => {
const usage = computeFlagUsage(
- parseArguments(['--experimentalToonFormat']),
+ parseConfig(['--experimentalToonFormat']),
mcpOptions,
);
assert.strictEqual(usage.experimental_toon_format, true);
diff --git a/tests/config/mcp-options.test.ts b/tests/config/mcp-options.test.ts
index 8b043edc..33976f13 100644
--- a/tests/config/mcp-options.test.ts
+++ b/tests/config/mcp-options.test.ts
@@ -9,22 +9,22 @@ import {afterEach, describe, it} from 'node:test';
import sinon from 'sinon';
-import {
- applyDefaults,
- DEFAULT_FILESYSTEM_ROOT,
- parseCliArgs,
- parseConfigFile,
- validateConflicts,
- validateImplications,
-} from '../../src/config/mcp-options.js';
+import {ConfigParser} from '../../src/config/ConfigParser.js';
+import {DEFAULT_FILESYSTEM_ROOT} from '../../src/config/mcp-options.js';
import {createTempFile} from '../utils.js';
describe('mcp-options steps', () => {
afterEach(() => sinon.restore());
+ const parser = new ConfigParser('0.0.0');
+
describe('parseCliArgs', () => {
it('returns only explicitly passed flags', () => {
- const args = parseCliArgs('0.0.0', ['node', 'main.js', '--headless']);
+ const args = new ConfigParser('0.0.0', [
+ 'node',
+ 'main.js',
+ '--headless',
+ ]).parseCliArgs();
assert.deepStrictEqual(args, {
headless: true,
});
@@ -40,7 +40,7 @@ describe('mcp-options steps', () => {
}),
'cd4a.steps.config.json',
);
- const args = parseConfigFile(configFile.path);
+ const args = parser.parseConfigFile(configFile.path);
assert.strictEqual(args.headless, true);
assert.deepStrictEqual(args.blockedUrlPattern, ['https://a.com/*']);
assert.strictEqual(args.isolated, undefined);
@@ -53,7 +53,7 @@ describe('mcp-options steps', () => {
'cd4a.steps.config.unknown.json',
);
assert.throws(
- () => parseConfigFile(configFile.path),
+ () => parser.parseConfigFile(configFile.path),
/Invalid JSON config file: .*notAnOption/,
);
});
@@ -64,7 +64,7 @@ describe('mcp-options steps', () => {
'cd4a.steps.config.array.json',
);
assert.throws(
- () => parseConfigFile(configFile.path),
+ () => parser.parseConfigFile(configFile.path),
/Invalid JSON config file: Config must be a JSON object/,
);
});
@@ -72,11 +72,11 @@ describe('mcp-options steps', () => {
describe('validateConflicts', () => {
it('accepts a single argument from a conflict group', () => {
- validateConflicts({browserUrl: 'http://localhost:9222'});
+ parser.validateConflicts({browserUrl: 'http://localhost:9222'});
});
it('ignores false and undefined values', () => {
- validateConflicts({
+ parser.validateConflicts({
browserUrl: 'http://localhost:9222',
wsEndpoint: undefined,
categoryExtensions: false,
@@ -86,7 +86,7 @@ describe('mcp-options steps', () => {
it('rejects two arguments from the same group', () => {
assert.throws(
() =>
- validateConflicts({
+ parser.validateConflicts({
browserUrl: 'http://localhost:9222',
channel: 'canary',
}),
@@ -96,11 +96,11 @@ describe('mcp-options steps', () => {
describe('validateImplications', () => {
it('accepts when implying key is not set', () => {
- validateImplications({wsEndpoint: 'ws://localhost:9222'});
+ parser.validateImplications({wsEndpoint: 'ws://localhost:9222'});
});
it('accepts when both implying and implied keys are set', () => {
- validateImplications({
+ parser.validateImplications({
wsHeaders: {Auth: 'token'},
wsEndpoint: 'ws://localhost:9222',
});
@@ -108,7 +108,7 @@ describe('mcp-options steps', () => {
it('rejects when implying key is set but implied key is missing', () => {
assert.throws(
- () => validateImplications({wsHeaders: {Auth: 'token'}}),
+ () => parser.validateImplications({wsHeaders: {Auth: 'token'}}),
/Implications failed:\n {2}wsHeaders -> wsEndpoint/,
);
});
@@ -116,7 +116,7 @@ describe('mcp-options steps', () => {
it('rejects when implying key is set but implied key is negated', () => {
assert.throws(
() =>
- validateImplications({
+ parser.validateImplications({
experimentalFfmpegPath: '/bin/ffmpeg',
experimentalScreencast: false,
}),
@@ -127,7 +127,9 @@ describe('mcp-options steps', () => {
});
describe('applyDefaults', () => {
it('keeps explicit values and fills in defaults', () => {
- const args = applyDefaults({headless: true}, {});
+ const args = new ConfigParser('0.0.0', [], {}).applyDefaults({
+ headless: true,
+ });
assert.strictEqual(args.headless, true);
assert.strictEqual(args.isolated, false);
assert.strictEqual(args.channel, 'stable');
@@ -140,15 +142,18 @@ describe('mcp-options steps', () => {
{executablePath: '/tmp/chrome'},
]) {
it(`does not default channel with ${Object.keys(explicitArgs)[0]}`, () => {
- assert.strictEqual(applyDefaults(explicitArgs, {}).channel, undefined);
+ assert.strictEqual(
+ new ConfigParser('0.0.0', [], {}).applyDefaults(explicitArgs).channel,
+ undefined,
+ );
});
}
it('applies viaCli defaults when launching a browser', () => {
- const args = applyDefaults(
- {viaCli: true, filesystemRoot: DEFAULT_FILESYSTEM_ROOT},
- {},
- );
+ const args = new ConfigParser('0.0.0', [], {}).applyDefaults({
+ viaCli: true,
+ filesystemRoot: DEFAULT_FILESYSTEM_ROOT,
+ });
assert.strictEqual(args.headless, true);
assert.strictEqual(args.isolated, true);
assert.strictEqual(args.categoryExtensions, true);
@@ -157,17 +162,19 @@ describe('mcp-options steps', () => {
});
it('does not enable isolated or extensions for viaCli with browserUrl', () => {
- const args = applyDefaults(
- {viaCli: true, browserUrl: 'http://localhost:9222'},
- {},
- );
+ const args = new ConfigParser('0.0.0', [], {}).applyDefaults({
+ viaCli: true,
+ browserUrl: 'http://localhost:9222',
+ });
assert.strictEqual(args.isolated, false);
assert.strictEqual(args.categoryExtensions, undefined);
});
it('turns off usage statistics in CI', () => {
sinon.stub(console, 'error');
- const args = applyDefaults({usageStatistics: true}, {CI: 'true'});
+ const args = new ConfigParser('0.0.0', [], {CI: 'true'}).applyDefaults({
+ usageStatistics: true,
+ });
assert.strictEqual(args.usageStatistics, false);
});
});
diff --git a/tests/daemon/utils.test.ts b/tests/daemon/utils.test.ts
index 48a505bb..05366cfb 100644
--- a/tests/daemon/utils.test.ts
+++ b/tests/daemon/utils.test.ts
@@ -13,7 +13,7 @@ import path from 'node:path';
import process from 'node:process';
import {afterEach, beforeEach, describe, it} from 'node:test';
-import type {ParsedArguments} from '../../src/config/mcp-options.js';
+import type {ParsedArguments} from '../../src/config/ConfigParser.js';
import {
serializeArgs,
assertValidSessionId,
diff --git a/tests/mocks.ts b/tests/mocks.ts
index a009898d..e4e7fc5f 100644
--- a/tests/mocks.ts
+++ b/tests/mocks.ts
@@ -27,8 +27,8 @@ import sinon from 'sinon';
import {
type ParsedArguments,
- parseArguments,
-} from '../src/config/mcp-options.js';
+ ConfigParser,
+} from '../src/config/ConfigParser.js';
import {McpContext} from '../src/McpContext.js';
import {McpPage} from '../src/McpPage.js';
import {McpResponse} from '../src/McpResponse.js';
@@ -1067,12 +1067,12 @@ export function createMockContextAnalysisResult(): DevTools.HeapSnapshotModel.He
export function createMockParsedArguments(
options: Partial<ParsedArguments> = {},
): ParsedArguments {
- const defaultArgs = parseArguments(
+ const defaultArgs = new ConfigParser(
'0.0.0',
['node', 'main.js'],
process.env,
false,
- );
+ ).parse();
return {...defaultArgs, ...options};
}
diff --git a/tests/tools/console.test.ts b/tests/tools/console.test.ts
index 705d30fb..d1084413 100644
--- a/tests/tools/console.test.ts
+++ b/tests/tools/console.test.ts
@@ -10,7 +10,7 @@ import {before, describe, it} from 'node:test';
import type {Dialog} from 'puppeteer-core';
-import type {ParsedArguments} from '../../src/config/mcp-options.js';
+import type {ParsedArguments} from '../../src/config/ConfigParser.js';
import {loadIssueDescriptions} from '../../src/devtools/issueDescriptions.js';
import {McpResponse} from '../../src/McpResponse.js';
import {TextSnapshot} from '../../src/TextSnapshot.js';
diff --git a/tests/tools/pages.test.ts b/tests/tools/pages.test.ts
index 529c3a5e..d98ebe7a 100644
--- a/tests/tools/pages.test.ts
+++ b/tests/tools/pages.test.ts
@@ -11,7 +11,7 @@ import {afterEach, describe, it} from 'node:test';
import type {Dialog} from 'puppeteer-core';
import sinon from 'sinon';
-import {parseArguments} from '../../src/config/mcp-options.js';
+import {ConfigParser} from '../../src/config/ConfigParser.js';
import {
listPages,
newPage,
@@ -246,11 +246,11 @@ describe('pages', () => {
});
it('throws when navigating to a javascript URL and javascriptEvaluation is false', async () => {
await withMcpContext(async (response, context) => {
- const disabledArgs = parseArguments(
+ const disabledArgs = new ConfigParser(
'1.0.0',
['node', 'script.js', '--no-javascript-evaluation'],
{CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true'},
- );
+ ).parse();
const tool = newPage(disabledArgs);
await assert.rejects(
async () => {
@@ -1102,22 +1102,22 @@ describe('pages', () => {
const defaultTool = navigatePage(createMockParsedArguments());
assert.strictEqual('initScript' in defaultTool.schema, true);
- const disabledArgs = parseArguments(
+ const disabledArgs = new ConfigParser(
'1.0.0',
['node', 'script.js', '--no-javascript-evaluation'],
{CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true'},
- );
+ ).parse();
const disabledTool = navigatePage(disabledArgs);
assert.strictEqual('initScript' in disabledTool.schema, false);
});
it('throws when navigating to a javascript, data, or vbscript URL and javascriptEvaluation is false', async () => {
await withMcpContext(async (response, context) => {
- const disabledArgs = parseArguments(
+ const disabledArgs = new ConfigParser(
'1.0.0',
['node', 'script.js', '--no-javascript-evaluation'],
{CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true'},
- );
+ ).parse();
const tool = navigatePage(disabledArgs);
await assert.rejects(
async () => {
diff --git a/tests/tools/screencast.test.ts b/tests/tools/screencast.test.ts
index 69fca526..43fa1e7c 100644
--- a/tests/tools/screencast.test.ts
+++ b/tests/tools/screencast.test.ts
@@ -12,7 +12,7 @@ import {afterEach, describe, it} from 'node:test';
import sinon from 'sinon';
-import {parseArguments} from '../../src/config/mcp-options.js';
+import {ConfigParser} from '../../src/config/ConfigParser.js';
import {ScreenRecorder} from '../../src/third_party/index.js';
import {startScreencast, stopScreencast} from '../../src/tools/screencast.js';
import {createHandlerMocks} from '../mocks.js';
@@ -234,12 +234,12 @@ describe('screencast', () => {
context.ensureExtension.resolves(filePath);
const experimentalFfmpegPath = '/custom/path/to/ffmpeg';
- const args = parseArguments('test', [
+ const args = new ConfigParser('test', [
'node',
'test',
'--experimental-screencast',
`--experimental-ffmpeg-path=${experimentalFfmpegPath}`,
- ]);
+ ]).parse();
await startScreencast(args).handler(
{params: {filePath}, page},
response,
@@ -268,12 +268,12 @@ describe('screencast', () => {
const filePath: `${string}.mp4` = `${path.join(os.tmpdir(), 'test')}.mp4`;
context.ensureExtension.resolves(filePath);
- const args = parseArguments('test', [
+ const args = new ConfigParser('test', [
'node',
'test',
'--experimental-screencast',
'--experimental-screencast-fps=10',
- ]);
+ ]).parse();
await startScreencast(args).handler(
{params: {filePath}, page},
response,
diff --git a/tests/tools/screenshot.test.ts b/tests/tools/screenshot.test.ts
index 23ba8d81..e69fcd37 100644
--- a/tests/tools/screenshot.test.ts
+++ b/tests/tools/screenshot.test.ts
@@ -11,7 +11,7 @@ import {describe, it, afterEach} from 'node:test';
import sinon from 'sinon';
-import type {ParsedArguments} from '../../src/config/mcp-options.js';
+import type {ParsedArguments} from '../../src/config/ConfigParser.js';
import {TextSnapshot} from '../../src/TextSnapshot.js';
import {screenshot} from '../../src/tools/screenshot.js';
import {resolveCanonicalPath} from '../../src/utils/files.js';
diff --git a/tests/tools/script.test.ts b/tests/tools/script.test.ts
index 831e07c5..b6a91f29 100644
--- a/tests/tools/script.test.ts
+++ b/tests/tools/script.test.ts
@@ -11,7 +11,7 @@ import {afterEach, describe, it} from 'node:test';
import sinon from 'sinon';
-import type {ParsedArguments} from '../../src/config/mcp-options.js';
+import type {ParsedArguments} from '../../src/config/ConfigParser.js';
import {TextSnapshot} from '../../src/TextSnapshot.js';
import {zod} from '../../src/third_party/index.js';
import {installExtension} from '../../src/tools/extensions.js';
diff --git a/tests/tools/slim/tools.test.ts b/tests/tools/slim/tools.test.ts
index 17f1b118..a7d1e6f2 100644
--- a/tests/tools/slim/tools.test.ts
+++ b/tests/tools/slim/tools.test.ts
@@ -11,7 +11,7 @@ import {afterEach, describe, it} from 'node:test';
import sinon from 'sinon';
-import {parseArguments} from '../../../src/config/mcp-options.js';
+import {ConfigParser} from '../../../src/config/ConfigParser.js';
import {evaluate, navigate, screenshot} from '../../../src/tools/slim/tools.js';
import {createHandlerMocks} from '../../mocks.js';
import {screenshots} from '../../snapshot.js';
@@ -89,11 +89,11 @@ describe('slim', () => {
it('disallows javascript, data, and vbscript URLs when javascriptEvaluation is false', async () => {
const {page, context, response} = createHandlerMocks();
- const disabledArgs = parseArguments(
+ const disabledArgs = new ConfigParser(
'1.0.0',
['node', 'script.js', '--slim', '--no-javascript-evaluation'],
{CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true'},
- );
+ ).parse();
const tool = navigate(disabledArgs);
await assert.rejects(
async () => {
diff --git a/tests/tools/thirdPartyDeveloper.test.ts b/tests/tools/thirdPartyDeveloper.test.ts
index 4e155cc7..408cffda 100644
--- a/tests/tools/thirdPartyDeveloper.test.ts
+++ b/tests/tools/thirdPartyDeveloper.test.ts
@@ -9,7 +9,7 @@ import {afterEach, describe, it} from 'node:test';
import sinon from 'sinon';
-import type {ParsedArguments} from '../../src/config/mcp-options.js';
+import type {ParsedArguments} from '../../src/config/ConfigParser.js';
import type {McpContext} from '../../src/McpContext.js';
import type {McpResponse} from '../../src/McpResponse.js';
import {TextSnapshot} from '../../src/TextSnapshot.js';
diff --git a/tests/utils.ts b/tests/utils.ts
index 8af66b8e..2a657a51 100644
--- a/tests/utils.ts
+++ b/tests/utils.ts
@@ -24,7 +24,7 @@ import type {
} from 'puppeteer-core';
import sinon from 'sinon';
-import type {ParsedArguments} from '../src/config/mcp-options.js';
+import type {ParsedArguments} from '../src/config/ConfigParser.js';
import {McpContext} from '../src/McpContext.js';
import {McpResponse} from '../src/McpResponse.js';
import {TextSnapshot} from '../src/TextSnapshot.js';