feat: add MCP client support with /mcp command #20

chindris-mihai-alexandru · 2026-01-03T20:37:20Z

Summary

Adds Model Context Protocol (MCP) client support, allowing groq-code-cli to connect to external MCP servers and use their tools alongside built-in tools.

New Features

`/mcp` Slash Command

Command	Description
`/mcp list`	Show configured and connected MCP servers
`/mcp add <name> <type> <command\|url>`	Add a stdio or SSE server
`/mcp remove <name>`	Remove server configuration
`/mcp connect [name]`	Connect to configured servers
`/mcp disconnect [name]`	Disconnect from servers
`/mcp tools [server]`	List available tools from connected servers

Example Usage

# Add a filesystem MCP server
/mcp add fs stdio npx -y @modelcontextprotocol/server-filesystem /path/to/dir

# Connect to all configured servers
/mcp connect

# List available tools
/mcp tools

# The AI can now use MCP tools like mcp_fs_read_file, mcp_fs_write_file, etc.

Implementation Details

MCPManager singleton (src/mcp/client.ts) - Handles connections, config persistence, and tool execution
Config persistence - Stored in .groq/mcp.json
Tool naming convention - MCP tools are exposed as mcp_<server>_<tool> (e.g., mcp_fs_read_file)
Security - MCP tools require user approval before execution (external tools)

Edge Case Handling

Connection timeout (30s) and tool execution timeout (2min)
spawn ENOENT detection with helpful PATH error messages
Invalid URL validation for SSE transport
Server health checks and dead connection cleanup
Graceful disconnect and resource cleanup

Files Changed

File	Description
`src/mcp/types.ts`	Type definitions for MCP config and tools
`src/mcp/client.ts`	MCP client manager implementation
`src/commands/definitions/mcp.ts`	`/mcp` slash command handler
`src/commands/base.ts`	Added `commandString` to command context
`src/commands/index.ts`	Registered mcp command
`src/core/agent.ts`	Integrated MCP tools with agent
`src/tools/schema-types.ts`	Shared ToolSchema interface
`src/tools/tool-schemas.ts`	Re-export ToolSchema
`package.json`	Added `@modelcontextprotocol/sdk` dependency

Testing

Verified build compiles successfully
Tested connection to @modelcontextprotocol/server-filesystem
Verified tool listing (14 tools discovered)
Tested tool execution (read_file tool)
Ran comprehensive edge case tests (16/16 passed)

Copilot

Pull request overview

This PR adds Model Context Protocol (MCP) client support to groq-code-cli, enabling integration with external MCP servers to extend the tool capabilities available to the AI assistant.

Key Changes:

Implements MCP client manager with connection pooling and timeout handling
Adds /mcp slash command with subcommands for server management (add, remove, connect, disconnect, list, tools)
Integrates MCP tools into the existing tool execution framework with required user approval
Persists MCP server configurations in .groq/mcp.json

Reviewed changes

Copilot reviewed 9 out of 10 changed files in this pull request and generated 10 comments.

Show a summary per file

File	Description
`src/mcp/types.ts`	Defines TypeScript interfaces for MCP server configurations, tools, and results
`src/mcp/client.ts`	Implements singleton MCPClientManager for managing server connections and tool execution
`src/commands/definitions/mcp.ts`	Implements `/mcp` command handler with argument parsing and subcommand routing
`src/commands/base.ts`	Adds optional `commandString` field to CommandContext for accessing full command text
`src/commands/index.ts`	Registers mcp command and passes commandString to handlers
`src/core/agent.ts`	Integrates MCP tools into agent's tool execution flow with approval requirements
`src/tools/tool-schemas.ts`	Extracts ToolSchema interface to separate file and references new environment tool
`src/tools/schema-types.ts`	Defines shared ToolSchema interface for reuse across codebase
`package.json`	Adds `@modelcontextprotocol/sdk` ^1.0.0 dependency
`package-lock.json`	Locks MCP SDK and transitive dependencies

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-01-03T20:41:06Z

src/tools/tool-schemas.ts

-    };
-  };
-}
+import { GET_ENV_INFO_SCHEMA } from './environment-schemas.js';


This import references a non-existent file 'environment-schemas.js'. The file 'src/tools/environment-schemas.ts' doesn't exist in the repository, which will cause a runtime error when this code is executed. Either the file needs to be created with the GET_ENV_INFO_SCHEMA export, or this import and the references to GET_ENV_INFO_SCHEMA should be removed.

Suggested change

import { GET_ENV_INFO_SCHEMA } from './environment-schemas.js';

Copilot · 2026-01-03T20:41:07Z

src/commands/index.ts

 import { initCommand } from './definitions/init.js';
 import { reasoningCommand } from './definitions/reasoning.js';
 import { statsCommand } from './definitions/stats.js';
+import { contextCommand } from './definitions/context.js';


This import references a non-existent file 'context.js'. The file 'src/commands/definitions/context.ts' doesn't exist in the repository, which will cause a runtime error. Either the file needs to be created or this import should be removed.

Copilot · 2026-01-03T20:41:07Z

src/tools/tool-schemas.ts

  'create_tasks',
-  'update_tasks'
+  'update_tasks',
+  'get_env_info' 


Trailing whitespace detected at the end of this line. This should be removed to maintain code quality and consistency.

Suggested change

'get_env_info'

'get_env_info'

Copilot · 2026-01-03T20:41:07Z

src/mcp/client.ts

+      const timeoutPromise = new Promise<never>((_, reject) => {
+        setTimeout(() => reject(new Error(`Connection timeout after ${CONNECTION_TIMEOUT / 1000}s`)), CONNECTION_TIMEOUT);
+      });


The setTimeout is not cleared when the Promise.race resolves with the connectPromise. This creates a potential memory leak as the timeout timer continues running even after the connection succeeds. Consider storing the timeout ID and clearing it after the race completes using clearTimeout.

Copilot · 2026-01-03T20:41:08Z

src/tools/tool-schemas.ts

  UPDATE_TASKS_SCHEMA,
-  EXECUTE_COMMAND_SCHEMA
+  EXECUTE_COMMAND_SCHEMA,
+  GET_ENV_INFO_SCHEMA


The GET_ENV_INFO_SCHEMA constant is referenced here but is imported from a non-existent file. This will cause a runtime error. This reference should be removed until the GET_ENV_INFO_SCHEMA is properly defined.

Copilot · 2026-01-03T20:41:08Z

src/tools/tool-schemas.ts

  'create_tasks',
-  'update_tasks'
+  'update_tasks',
+  'get_env_info' 


The 'get_env_info' tool is listed as a safe tool, but the corresponding GET_ENV_INFO_SCHEMA is imported from a non-existent file. This entry should be removed until the schema is properly defined.

Copilot · 2026-01-03T20:41:08Z

src/commands/index.ts

  initCommand,
  reasoningCommand,
  statsCommand,
+  contextCommand,


The contextCommand is being registered but is imported from a non-existent file. This will cause a runtime error. This registration should be removed until the context command is properly defined.

Copilot · 2026-01-03T20:41:08Z

src/mcp/client.ts

+      const listTimeoutPromise = new Promise<never>((_, reject) => {
+        setTimeout(() => reject(new Error('Timeout listing tools')), CONNECTION_TIMEOUT);
+      });


The setTimeout is not cleared when the Promise.race resolves with the listToolsPromise. This creates a potential memory leak as the timeout timer continues running even after the tools are listed successfully. Consider storing the timeout ID and clearing it after the race completes using clearTimeout.

Copilot · 2026-01-03T20:41:09Z

src/mcp/client.ts

+          const timeoutPromise = new Promise<never>((_, reject) => {
+            setTimeout(
+              () => reject(new Error(`Tool execution timeout after ${TOOL_EXECUTION_TIMEOUT / 1000}s`)),
+              TOOL_EXECUTION_TIMEOUT
+            );
+          });


The setTimeout is not cleared when the Promise.race resolves with the executePromise. This creates a potential memory leak as the timeout timer continues running even after the tool executes successfully. Consider storing the timeout ID and clearing it after the race completes using clearTimeout.

Copilot · 2026-01-03T20:41:09Z

src/mcp/client.ts

+      const timeoutPromise = new Promise<never>((_, reject) => {
+        setTimeout(() => reject(new Error('Health check timeout')), 5000);
+      });


The setTimeout is not cleared when the Promise.race resolves with the healthCheckPromise. This creates a potential memory leak as the timeout timer continues running even after the health check succeeds. Consider storing the timeout ID and clearing it after the race completes using clearTimeout.

Add Model Context Protocol (MCP) client support allowing groq-code-cli to connect to external MCP servers and use their tools alongside built-in tools. New features: - /mcp list - Show configured and connected MCP servers - /mcp add <name> <type> <command|url> - Add stdio or SSE server - /mcp remove <name> - Remove server configuration - /mcp connect [name] - Connect to configured servers - /mcp disconnect [name] - Disconnect from servers - /mcp tools [server] - List available tools from connected servers Implementation details: - MCPManager singleton handles connections, config persistence, and tool execution - Config stored in .groq/mcp.json - MCP tools integrated into agent with 'mcp_<server>_<tool>' naming convention - MCP tools require user approval (external execution) Edge case handling: - Connection timeout (30s) and tool execution timeout (2min) - spawn ENOENT detection with helpful PATH error messages - Invalid URL validation for SSE transport - Server health checks and dead connection cleanup - Graceful disconnect and resource cleanup

chindris-mihai-alexandru · 2026-01-03T20:55:00Z

Addressed Copilot Review Comments

All issues raised by Copilot's automated review have been fixed in the force-pushed commit 63f9990:

Fixed Issues

Comment	Resolution
Non-existent `environment-schemas.js` import	Removed import and all `GET_ENV_INFO_SCHEMA` references from `tool-schemas.ts`
Non-existent `context.js` import	Removed import and `contextCommand` registration from `index.ts`
Trailing whitespace on `'get_env_info'` line	Fixed (line was removed entirely with the schema cleanup)
Timeout memory leaks (4 locations)	Created reusable `withTimeout()` helper that properly clears timers using `try/finally` with `clearTimeout()`

The `withTimeout()` Helper

Instead of fixing each timeout individually, I extracted a clean utility function that:

Wraps any promise with a configurable timeout
Uses try/finally to ensure clearTimeout() is always called
Reduces code duplication (was 4 separate timeout implementations)
Follows the DRY principle

async function withTimeout<T>(promise: Promise<T>, ms: number, message: string): Promise<T> {
  let timeoutId: NodeJS.Timeout;
  const timeoutPromise = new Promise<never>((_, reject) => {
    timeoutId = setTimeout(() => reject(new Error(message)), ms);
  });
  try {
    return await Promise.race([promise, timeoutPromise]);
  } finally {
    clearTimeout(timeoutId!);
  }
}

Build Verification

npm run build passes with no errors
All MCP functionality verified working

Copilot AI review requested due to automatic review settings January 3, 2026 20:37

Copilot started reviewing on behalf of chindris-mihai-alexandru January 3, 2026 20:37 View session

Copilot AI reviewed Jan 3, 2026

View reviewed changes

chindris-mihai-alexandru force-pushed the feature/mcp-client-support branch from c2b49a0 to 63f9990 Compare January 3, 2026 20:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat: add MCP client support with /mcp command #20

feat: add MCP client support with /mcp command #20

Uh oh!

chindris-mihai-alexandru commented Jan 3, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Jan 3, 2026

Uh oh!

Copilot AI Jan 3, 2026

Uh oh!

Copilot AI Jan 3, 2026

Uh oh!

Copilot AI Jan 3, 2026

Uh oh!

Copilot AI Jan 3, 2026

Uh oh!

Copilot AI Jan 3, 2026

Uh oh!

Copilot AI Jan 3, 2026

Uh oh!

Copilot AI Jan 3, 2026

Uh oh!

Copilot AI Jan 3, 2026

Uh oh!

Copilot AI Jan 3, 2026

Uh oh!

chindris-mihai-alexandru commented Jan 3, 2026 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

1 participant

feat: add MCP client support with /mcp command #20

Are you sure you want to change the base?

feat: add MCP client support with /mcp command #20

Uh oh!

Conversation

chindris-mihai-alexandru commented Jan 3, 2026

Summary

New Features

/mcp Slash Command

Example Usage

Implementation Details

Edge Case Handling

Files Changed

Testing

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Jan 3, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 3, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 3, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 3, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 3, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 3, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 3, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 3, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 3, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 3, 2026

Choose a reason for hiding this comment

Uh oh!

chindris-mihai-alexandru commented Jan 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Addressed Copilot Review Comments

Fixed Issues

The withTimeout() Helper

Build Verification

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

1 participant

`/mcp` Slash Command

chindris-mihai-alexandru commented Jan 3, 2026 •

edited

Loading

The `withTimeout()` Helper