MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-03-10 22:21:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix: add missing type field to MCPServerConfig (#15465)

Browse Source
This commit is contained in:
Jack Wotherspoon
2025-12-23 11:59:32 -05:00
committed by GitHub
parent 308aa70718
commit e9a601c1fe
3 changed files with 68 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
packages/cli/src/config/settings-validation.test.ts
View File

@@ -219,6 +219,60 @@ describe('settings-validation', () => {
}
});
it('should validate mcpServers with type field for all transport types', () => {
const validSettings = {
mcpServers: {
'sse-server': {
url: 'https://example.com/sse',
type: 'sse',
headers: { 'X-API-Key': 'key' },
},
'http-server': {
url: 'https://example.com/mcp',
type: 'http',
},
'stdio-server': {
command: '/usr/bin/mcp-server',
type: 'stdio',
},
},
};
const result = validateSettings(validSettings);
expect(result.success).toBe(true);
});
it('should reject invalid type values in mcpServers', () => {
const invalidSettings = {
mcpServers: {
'bad-server': {
url: 'https://example.com/mcp',
type: 'invalid-type',
},
},
};
const result = validateSettings(invalidSettings);
expect(result.success).toBe(false);
});
it('should validate mcpServers without type field', () => {
const validSettings = {
mcpServers: {
'stdio-server': {
command: '/usr/bin/mcp-server',
args: ['--port', '8080'],
},
'url-server': {
url: 'https://example.com/mcp',
},
},
};
const result = validateSettings(validSettings);
expect(result.success).toBe(true);
});
it('should validate complex nested customThemes configuration', () => {
const invalidSettings = {
ui: {

9
packages/cli/src/config/settingsSchema.ts
View File

@@ -1704,7 +1704,8 @@ export const SETTINGS_SCHEMA_DEFINITIONS: Record<
},
url: {
type: 'string',
description: 'SSE transport URL.',
description:
'URL for SSE or HTTP transport. Use with "type" field to specify transport type.',
},
httpUrl: {
type: 'string',
@@ -1719,6 +1720,12 @@ export const SETTINGS_SCHEMA_DEFINITIONS: Record<
type: 'string',
description: 'TCP address for websocket transport.',
},
type: {
type: 'string',
description:
'Transport type. Use "stdio" for local command, "sse" for Server-Sent Events, or "http" for Streamable HTTP.',
enum: ['stdio', 'sse', 'http'],
},
timeout: {
type: 'number',
description: 'Timeout in milliseconds for MCP requests.',

7
schemas/settings.schema.json
View File

@@ -1599,7 +1599,7 @@
},
"url": {
"type": "string",
"description": "SSE transport URL."
"description": "URL for SSE or HTTP transport. Use with \"type\" field to specify transport type."
},
"httpUrl": {
"type": "string",
@@ -1616,6 +1616,11 @@
"type": "string",
"description": "TCP address for websocket transport."
},
"type": {
"type": "string",
"description": "Transport type. Use \"stdio\" for local command, \"sse\" for Server-Sent Events, or \"http\" for Streamable HTTP.",
"enum": ["stdio", "sse", "http"]
},
"timeout": {
"type": "number",
"description": "Timeout in milliseconds for MCP requests."