From 39c35e7d61329dccf2058d9823fa4b7aca19a148 Mon Sep 17 00:00:00 2001 From: Jack Wotherspoon Date: Tue, 2 Sep 2025 18:09:28 -0600 Subject: [PATCH] chore: improve inclusive-language (#7558) --- docs/cli/configuration-v1.md | 2 +- docs/cli/configuration.md | 6 +++--- docs/tools/mcp-server.md | 6 +++--- packages/cli/src/config/settingsSchema.ts | 4 ++-- packages/core/src/tools/shell.test.ts | 4 ++-- packages/core/src/tools/shell.ts | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/cli/configuration-v1.md b/docs/cli/configuration-v1.md index cc8267b59c..c3be399619 100644 --- a/docs/cli/configuration-v1.md +++ b/docs/cli/configuration-v1.md @@ -173,7 +173,7 @@ If you are experiencing performance issues with file searching (e.g., with `@` c - `timeout` (number, optional): Timeout in milliseconds for requests to this MCP server. - `trust` (boolean, optional): Trust this server and bypass all tool call confirmations. - `description` (string, optional): A brief description of the server, which may be used for display purposes. - - `includeTools` (array of strings, optional): List of tool names to include from this MCP server. When specified, only the tools listed here will be available from this server (whitelist behavior). If not specified, all tools from the server are enabled by default. + - `includeTools` (array of strings, optional): List of tool names to include from this MCP server. When specified, only the tools listed here will be available from this server (allowlist behavior). If not specified, all tools from the server are enabled by default. - `excludeTools` (array of strings, optional): List of tool names to exclude from this MCP server. Tools listed here will not be available to the model, even if they are exposed by the server. **Note:** `excludeTools` takes precedence over `includeTools` - if a tool is in both lists, it will be excluded. - **Example:** ```json diff --git a/docs/cli/configuration.md b/docs/cli/configuration.md index ffc07c9b93..0c41a94db7 100644 --- a/docs/cli/configuration.md +++ b/docs/cli/configuration.md @@ -223,11 +223,11 @@ Settings are organized into categories. All settings should be placed within the - **Default:** `undefined` - **`mcp.allowed`** (array of strings): - - **Description:** A whitelist of MCP servers to allow. + - **Description:** An allowlist of MCP servers to allow. - **Default:** `undefined` - **`mcp.excluded`** (array of strings): - - **Description:** A blacklist of MCP servers to exclude. + - **Description:** A denylist of MCP servers to exclude. - **Default:** `undefined` #### `security` @@ -281,7 +281,7 @@ The following settings remain at the top level of the `settings.json` file. - `timeout` (number, optional): Timeout in milliseconds for requests to this MCP server. - `trust` (boolean, optional): Trust this server and bypass all tool call confirmations. - `description` (string, optional): A brief description of the server, which may be used for display purposes. - - `includeTools` (array of strings, optional): List of tool names to include from this MCP server. When specified, only the tools listed here will be available from this server (whitelist behavior). If not specified, all tools from the server are enabled by default. + - `includeTools` (array of strings, optional): List of tool names to include from this MCP server. When specified, only the tools listed here will be available from this server (allowlist behavior). If not specified, all tools from the server are enabled by default. - `excludeTools` (array of strings, optional): List of tool names to exclude from this MCP server. Tools listed here will not be available to the model, even if they are exposed by the server. **Note:** `excludeTools` takes precedence over `includeTools` - if a tool is in both lists, it will be excluded. - **`telemetry`** (object) diff --git a/docs/tools/mcp-server.md b/docs/tools/mcp-server.md index 9aa7a84799..e6542d2fc7 100644 --- a/docs/tools/mcp-server.md +++ b/docs/tools/mcp-server.md @@ -58,8 +58,8 @@ You can configure MCP servers in your `settings.json` file in two main ways: thr The `mcp` object in your `settings.json` allows you to define global rules for all MCP servers. - **`mcp.serverCommand`** (string): A global command to start an MCP server. -- **`mcp.allowed`** (array of strings): A whitelist of MCP server names to allow. If this is set, only servers from this list (matching the keys in the `mcpServers` object) will be connected to. -- **`mcp.excluded`** (array of strings): A blacklist of MCP server names to exclude. Servers in this list will not be connected to. +- **`mcp.allowed`** (array of strings): A list of MCP server names to allow. If this is set, only servers from this list (matching the keys in the `mcpServers` object) will be connected to. +- **`mcp.excluded`** (array of strings): A list of MCP server names to exclude. Servers in this list will not be connected to. **Example:** @@ -115,7 +115,7 @@ Each server configuration supports the following properties: - **`cwd`** (string): Working directory for Stdio transport - **`timeout`** (number): Request timeout in milliseconds (default: 600,000ms = 10 minutes) - **`trust`** (boolean): When `true`, bypasses all tool call confirmations for this server (default: `false`) -- **`includeTools`** (string[]): List of tool names to include from this MCP server. When specified, only the tools listed here will be available from this server (whitelist behavior). If not specified, all tools from the server are enabled by default. +- **`includeTools`** (string[]): List of tool names to include from this MCP server. When specified, only the tools listed here will be available from this server (allowlist behavior). If not specified, all tools from the server are enabled by default. - **`excludeTools`** (string[]): List of tool names to exclude from this MCP server. Tools listed here will not be available to the model, even if they are exposed by the server. **Note:** `excludeTools` takes precedence over `includeTools` - if a tool is in both lists, it will be excluded. ### OAuth Support for Remote MCP Servers diff --git a/packages/cli/src/config/settingsSchema.ts b/packages/cli/src/config/settingsSchema.ts index ac86d3a316..238f18179a 100644 --- a/packages/cli/src/config/settingsSchema.ts +++ b/packages/cli/src/config/settingsSchema.ts @@ -648,7 +648,7 @@ export const SETTINGS_SCHEMA = { category: 'MCP', requiresRestart: true, default: undefined as string[] | undefined, - description: 'A whitelist of MCP servers to allow.', + description: 'A list of MCP servers to allow.', showInDialog: false, }, excluded: { @@ -657,7 +657,7 @@ export const SETTINGS_SCHEMA = { category: 'MCP', requiresRestart: true, default: undefined as string[] | undefined, - description: 'A blacklist of MCP servers to exclude.', + description: 'A list of MCP servers to exclude.', showInDialog: false, }, }, diff --git a/packages/core/src/tools/shell.test.ts b/packages/core/src/tools/shell.test.ts index e3ac637216..e1874aaa42 100644 --- a/packages/core/src/tools/shell.test.ts +++ b/packages/core/src/tools/shell.test.ts @@ -380,7 +380,7 @@ describe('ShellTool', () => { }); describe('shouldConfirmExecute', () => { - it('should request confirmation for a new command and whitelist it on "Always"', async () => { + it('should request confirmation for a new command and allowlist it on "Always"', async () => { const params = { command: 'npm install' }; const invocation = shellTool.build(params); const confirmation = await invocation.shouldConfirmExecute( @@ -395,7 +395,7 @@ describe('ShellTool', () => { ToolConfirmationOutcome.ProceedAlways, ); - // Should now be whitelisted + // Should now be allowlisted const secondInvocation = shellTool.build({ command: 'npm test' }); const secondConfirmation = await secondInvocation.shouldConfirmExecute( new AbortController().signal, diff --git a/packages/core/src/tools/shell.ts b/packages/core/src/tools/shell.ts index fae55b5c11..f7275161fc 100644 --- a/packages/core/src/tools/shell.ts +++ b/packages/core/src/tools/shell.ts @@ -77,7 +77,7 @@ class ShellToolInvocation extends BaseToolInvocation< ); if (commandsToConfirm.length === 0) { - return false; // already approved and whitelisted + return false; // already approved and allowlisted } const confirmationDetails: ToolExecuteConfirmationDetails = {