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

Extensions MCP refactor (#12413)

Browse Source
This commit is contained in:
Jacob MacDonald
2025-11-04 07:51:18 -08:00
committed by GitHub
parent 2b77c1ded4
commit da4fa5ad75
28 changed files with 877 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/cli/src/ui/components/Composer.test.tsx
View File

@@ -144,7 +144,10 @@ const createMockConfig = (overrides = {}) => ({
getDebugMode: vi.fn(() => false),
getAccessibility: vi.fn(() => ({})),
getMcpServers: vi.fn(() => ({})),
getBlockedMcpServers: vi.fn(() => []),
getMcpClientManager: vi.fn().mockImplementation(() => ({
getBlockedMcpServers: vi.fn(),
getMcpServers: vi.fn(),
})),
...overrides,
});

6
packages/cli/src/ui/components/Composer.tsx
View File

@@ -101,8 +101,10 @@ export const Composer = () => {
ideContext={uiState.ideContextState}
geminiMdFileCount={uiState.geminiMdFileCount}
contextFileNames={contextFileNames}
mcpServers={config.getMcpServers()}
blockedMcpServers={config.getBlockedMcpServers()}
mcpServers={config.getMcpClientManager()?.getMcpServers() ?? {}}
blockedMcpServers={
config.getMcpClientManager()?.getBlockedMcpServers() ?? []
}
/>
)
)}

10
packages/cli/src/ui/components/ConfigInitDisplay.tsx
View File

@@ -5,15 +5,13 @@
*/
import { useEffect, useState } from 'react';
import { appEvents } from './../../utils/events.js';
import { AppEvent, appEvents } from './../../utils/events.js';
import { Box, Text } from 'ink';
import { useConfig } from '../contexts/ConfigContext.js';
import { type McpClient, MCPServerStatus } from '@google/gemini-cli-core';
import { GeminiSpinner } from './GeminiRespondingSpinner.js';
import { theme } from '../semantic-colors.js';
export const ConfigInitDisplay = () => {
const config = useConfig();
const [message, setMessage] = useState('Initializing...');
useEffect(() => {
@@ -31,11 +29,11 @@ export const ConfigInitDisplay = () => {
setMessage(`Connecting to MCP servers... (${connected}/${clients.size})`);
};
appEvents.on('mcp-client-update', onChange);
appEvents.on(AppEvent.McpClientUpdate, onChange);
return () => {
appEvents.off('mcp-client-update', onChange);
appEvents.off(AppEvent.McpClientUpdate, onChange);
};
}, [config]);
}, []);
return (
<Box marginTop={1}>