@google/gemini-cli-core 0.1.22 → 0.2.0-preview.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/code_assist/oauth2.d.ts +1 -0
- package/dist/src/code_assist/oauth2.js +7 -2
- package/dist/src/code_assist/oauth2.js.map +1 -1
- package/dist/src/code_assist/oauth2.test.js +49 -1
- package/dist/src/code_assist/oauth2.test.js.map +1 -1
- package/dist/src/config/config.d.ts +19 -2
- package/dist/src/config/config.js +29 -4
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/core/client.js +5 -2
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +2 -1
- package/dist/src/core/client.test.js.map +1 -1
- package/dist/src/core/coreToolScheduler.d.ts +2 -1
- package/dist/src/core/coreToolScheduler.js +20 -2
- package/dist/src/core/coreToolScheduler.js.map +1 -1
- package/dist/src/core/coreToolScheduler.test.js +190 -12
- package/dist/src/core/coreToolScheduler.test.js.map +1 -1
- package/dist/src/core/geminiChat.js +1 -1
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/loggingContentGenerator.d.ts +1 -5
- package/dist/src/core/loggingContentGenerator.js +4 -6
- package/dist/src/core/loggingContentGenerator.js.map +1 -1
- package/dist/src/core/nonInteractiveToolExecutor.d.ts +2 -2
- package/dist/src/core/nonInteractiveToolExecutor.js +10 -2
- package/dist/src/core/nonInteractiveToolExecutor.js.map +1 -1
- package/dist/src/core/nonInteractiveToolExecutor.test.js +17 -11
- package/dist/src/core/nonInteractiveToolExecutor.test.js.map +1 -1
- package/dist/src/core/subagent.js +5 -5
- package/dist/src/core/subagent.js.map +1 -1
- package/dist/src/core/subagent.test.js +3 -3
- package/dist/src/core/subagent.test.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/generated/git-commit.js.map +1 -1
- package/dist/src/ide/ide-client.d.ts +4 -0
- package/dist/src/ide/ide-client.js +36 -2
- package/dist/src/ide/ide-client.js.map +1 -1
- package/dist/src/ide/ide-installer.js +17 -4
- package/dist/src/ide/ide-installer.js.map +1 -1
- package/dist/src/ide/ide-installer.test.js +6 -4
- package/dist/src/ide/ide-installer.test.js.map +1 -1
- package/dist/src/ide/process-utils.d.ts +10 -5
- package/dist/src/ide/process-utils.js +113 -30
- package/dist/src/ide/process-utils.js.map +1 -1
- package/dist/src/index.d.ts +3 -0
- package/dist/src/index.js +3 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/services/chatRecordingService.d.ts +150 -0
- package/dist/src/services/chatRecordingService.js +318 -0
- package/dist/src/services/chatRecordingService.js.map +1 -0
- package/dist/src/services/chatRecordingService.test.d.ts +6 -0
- package/dist/src/services/chatRecordingService.test.js +288 -0
- package/dist/src/services/chatRecordingService.test.js.map +1 -0
- package/dist/src/services/fileSystemService.d.ts +31 -0
- package/dist/src/services/fileSystemService.js +18 -0
- package/dist/src/services/fileSystemService.js.map +1 -0
- package/dist/src/services/fileSystemService.test.d.ts +6 -0
- package/dist/src/services/fileSystemService.test.js +41 -0
- package/dist/src/services/fileSystemService.test.js.map +1 -0
- package/dist/src/services/shellExecutionService.d.ts +8 -10
- package/dist/src/services/shellExecutionService.js +289 -133
- package/dist/src/services/shellExecutionService.js.map +1 -1
- package/dist/src/services/shellExecutionService.test.js +275 -41
- package/dist/src/services/shellExecutionService.test.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.d.ts +10 -3
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +57 -103
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js +13 -4
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.d.ts +2 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js +2 -0
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js.map +1 -1
- package/dist/src/telemetry/loggers.js +2 -2
- package/dist/src/telemetry/loggers.js.map +1 -1
- package/dist/src/telemetry/loggers.test.js +10 -5
- package/dist/src/telemetry/loggers.test.js.map +1 -1
- package/dist/src/telemetry/metrics.d.ts +1 -1
- package/dist/src/telemetry/metrics.js +2 -1
- package/dist/src/telemetry/metrics.js.map +1 -1
- package/dist/src/telemetry/sdk.js +3 -3
- package/dist/src/telemetry/sdk.js.map +1 -1
- package/dist/src/telemetry/types.d.ts +1 -0
- package/dist/src/telemetry/types.js +6 -0
- package/dist/src/telemetry/types.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.d.ts +4 -0
- package/dist/src/telemetry/uiTelemetry.js +14 -1
- package/dist/src/telemetry/uiTelemetry.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.test.js +45 -9
- package/dist/src/telemetry/uiTelemetry.test.js.map +1 -1
- package/dist/src/test-utils/tools.d.ts +8 -2
- package/dist/src/test-utils/tools.js +2 -3
- package/dist/src/test-utils/tools.js.map +1 -1
- package/dist/src/tools/edit.d.ts +1 -1
- package/dist/src/tools/edit.js +15 -9
- package/dist/src/tools/edit.js.map +1 -1
- package/dist/src/tools/edit.test.js +11 -1
- package/dist/src/tools/edit.test.js.map +1 -1
- package/dist/src/tools/glob.d.ts +1 -1
- package/dist/src/tools/glob.js +8 -8
- package/dist/src/tools/glob.js.map +1 -1
- package/dist/src/tools/glob.test.js +20 -0
- package/dist/src/tools/glob.test.js.map +1 -1
- package/dist/src/tools/grep.d.ts +1 -1
- package/dist/src/tools/grep.js +1 -6
- package/dist/src/tools/grep.js.map +1 -1
- package/dist/src/tools/ls.d.ts +1 -1
- package/dist/src/tools/ls.js +1 -6
- package/dist/src/tools/ls.js.map +1 -1
- package/dist/src/tools/mcp-client-manager.d.ts +38 -0
- package/dist/src/tools/mcp-client-manager.js +74 -0
- package/dist/src/tools/mcp-client-manager.js.map +1 -0
- package/dist/src/tools/mcp-client-manager.test.d.ts +6 -0
- package/dist/src/tools/mcp-client-manager.test.js +39 -0
- package/dist/src/tools/mcp-client-manager.test.js.map +1 -0
- package/dist/src/tools/mcp-client.d.ts +43 -0
- package/dist/src/tools/mcp-client.js +117 -1
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/mcp-client.test.js +58 -302
- package/dist/src/tools/mcp-client.test.js.map +1 -1
- package/dist/src/tools/mcp-tool.test.js +17 -17
- package/dist/src/tools/mcp-tool.test.js.map +1 -1
- package/dist/src/tools/memoryTool.d.ts +1 -1
- package/dist/src/tools/memoryTool.js +1 -6
- package/dist/src/tools/memoryTool.js.map +1 -1
- package/dist/src/tools/read-file.d.ts +1 -1
- package/dist/src/tools/read-file.js +5 -7
- package/dist/src/tools/read-file.js.map +1 -1
- package/dist/src/tools/read-file.test.js +8 -0
- package/dist/src/tools/read-file.test.js.map +1 -1
- package/dist/src/tools/read-many-files.d.ts +0 -1
- package/dist/src/tools/read-many-files.js +16 -11
- package/dist/src/tools/read-many-files.js.map +1 -1
- package/dist/src/tools/read-many-files.test.js +34 -0
- package/dist/src/tools/read-many-files.test.js.map +1 -1
- package/dist/src/tools/shell.d.ts +1 -1
- package/dist/src/tools/shell.js +10 -24
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/shell.test.js +11 -19
- package/dist/src/tools/shell.test.js.map +1 -1
- package/dist/src/tools/tool-registry.d.ts +5 -0
- package/dist/src/tools/tool-registry.js +13 -4
- package/dist/src/tools/tool-registry.js.map +1 -1
- package/dist/src/tools/tool-registry.test.js +9 -21
- package/dist/src/tools/tool-registry.test.js.map +1 -1
- package/dist/src/tools/tools.d.ts +3 -1
- package/dist/src/tools/tools.js +12 -0
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/tools/web-fetch.d.ts +1 -1
- package/dist/src/tools/web-fetch.js +1 -6
- package/dist/src/tools/web-fetch.js.map +1 -1
- package/dist/src/tools/web-search.d.ts +1 -1
- package/dist/src/tools/web-search.js +1 -6
- package/dist/src/tools/web-search.js.map +1 -1
- package/dist/src/tools/write-file.d.ts +1 -1
- package/dist/src/tools/write-file.js +7 -8
- package/dist/src/tools/write-file.js.map +1 -1
- package/dist/src/tools/write-file.test.js +25 -38
- package/dist/src/tools/write-file.test.js.map +1 -1
- package/dist/src/utils/environmentContext.js +2 -2
- package/dist/src/utils/environmentContext.js.map +1 -1
- package/dist/src/utils/environmentContext.test.js +3 -2
- package/dist/src/utils/environmentContext.test.js.map +1 -1
- package/dist/src/utils/fileUtils.d.ts +2 -1
- package/dist/src/utils/fileUtils.js +3 -3
- package/dist/src/utils/fileUtils.js.map +1 -1
- package/dist/src/utils/fileUtils.test.js +18 -17
- package/dist/src/utils/fileUtils.test.js.map +1 -1
- package/dist/src/utils/getPty.d.ts +19 -0
- package/dist/src/utils/getPty.js +23 -0
- package/dist/src/utils/getPty.js.map +1 -0
- package/dist/src/utils/user_account.js +58 -48
- package/dist/src/utils/user_account.js.map +1 -1
- package/dist/src/utils/user_account.test.js +76 -9
- package/dist/src/utils/user_account.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +20 -10
|
@@ -3,30 +3,36 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { afterEach, describe, expect, it, vi
|
|
6
|
+
import { afterEach, describe, expect, it, vi } from 'vitest';
|
|
7
7
|
import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
|
|
8
|
-
import { populateMcpServerCommand, createTransport, isEnabled,
|
|
8
|
+
import { populateMcpServerCommand, createTransport, isEnabled, hasValidTypes, McpClient, } from './mcp-client.js';
|
|
9
9
|
import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
|
|
10
10
|
import * as SdkClientStdioLib from '@modelcontextprotocol/sdk/client/stdio.js';
|
|
11
11
|
import * as ClientLib from '@modelcontextprotocol/sdk/client/index.js';
|
|
12
12
|
import * as GenAiLib from '@google/genai';
|
|
13
13
|
import { GoogleCredentialProvider } from '../mcp/google-auth-provider.js';
|
|
14
14
|
import { AuthProviderType } from '../config/config.js';
|
|
15
|
-
import { DiscoveredMCPTool } from './mcp-tool.js';
|
|
16
|
-
import { pathToFileURL } from 'node:url';
|
|
17
15
|
vi.mock('@modelcontextprotocol/sdk/client/stdio.js');
|
|
18
16
|
vi.mock('@modelcontextprotocol/sdk/client/index.js');
|
|
19
17
|
vi.mock('@google/genai');
|
|
20
18
|
vi.mock('../mcp/oauth-provider.js');
|
|
21
19
|
vi.mock('../mcp/oauth-token-storage.js');
|
|
22
|
-
vi.mock('./mcp-tool.js');
|
|
23
20
|
describe('mcp-client', () => {
|
|
24
21
|
afterEach(() => {
|
|
25
22
|
vi.restoreAllMocks();
|
|
26
23
|
});
|
|
27
|
-
describe('
|
|
24
|
+
describe('McpClient', () => {
|
|
28
25
|
it('should discover tools', async () => {
|
|
29
|
-
const mockedClient = {
|
|
26
|
+
const mockedClient = {
|
|
27
|
+
connect: vi.fn(),
|
|
28
|
+
discover: vi.fn(),
|
|
29
|
+
disconnect: vi.fn(),
|
|
30
|
+
getStatus: vi.fn(),
|
|
31
|
+
registerCapabilities: vi.fn(),
|
|
32
|
+
setRequestHandler: vi.fn(),
|
|
33
|
+
};
|
|
34
|
+
vi.mocked(ClientLib.Client).mockReturnValue(mockedClient);
|
|
35
|
+
vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue({});
|
|
30
36
|
const mockedMcpToTool = vi.mocked(GenAiLib.mcpToTool).mockReturnValue({
|
|
31
37
|
tool: () => ({
|
|
32
38
|
functionDeclarations: [
|
|
@@ -36,45 +42,31 @@ describe('mcp-client', () => {
|
|
|
36
42
|
],
|
|
37
43
|
}),
|
|
38
44
|
});
|
|
39
|
-
const
|
|
40
|
-
|
|
45
|
+
const mockedToolRegistry = {
|
|
46
|
+
registerTool: vi.fn(),
|
|
47
|
+
};
|
|
48
|
+
const client = new McpClient('test-server', {
|
|
49
|
+
command: 'test-command',
|
|
50
|
+
}, mockedToolRegistry, {}, {}, false);
|
|
51
|
+
await client.connect();
|
|
52
|
+
await client.discover();
|
|
41
53
|
expect(mockedMcpToTool).toHaveBeenCalledOnce();
|
|
42
54
|
});
|
|
43
|
-
it('should log an error if there is an error discovering a tool', async () => {
|
|
44
|
-
const mockedClient = {};
|
|
45
|
-
const consoleErrorSpy = vi
|
|
46
|
-
.spyOn(console, 'error')
|
|
47
|
-
.mockImplementation(() => { });
|
|
48
|
-
const testError = new Error('Invalid tool name');
|
|
49
|
-
vi.mocked(DiscoveredMCPTool).mockImplementation((_mcpCallableTool, _serverName, name) => {
|
|
50
|
-
if (name === 'invalid tool name') {
|
|
51
|
-
throw testError;
|
|
52
|
-
}
|
|
53
|
-
return { name: 'validTool' };
|
|
54
|
-
});
|
|
55
|
-
vi.mocked(GenAiLib.mcpToTool).mockReturnValue({
|
|
56
|
-
tool: () => Promise.resolve({
|
|
57
|
-
functionDeclarations: [
|
|
58
|
-
{
|
|
59
|
-
name: 'validTool',
|
|
60
|
-
},
|
|
61
|
-
{
|
|
62
|
-
name: 'invalid tool name', // this will fail validation
|
|
63
|
-
},
|
|
64
|
-
],
|
|
65
|
-
}),
|
|
66
|
-
});
|
|
67
|
-
const tools = await discoverTools('test-server', {}, mockedClient);
|
|
68
|
-
expect(tools.length).toBe(1);
|
|
69
|
-
expect(tools[0].name).toBe('validTool');
|
|
70
|
-
expect(consoleErrorSpy).toHaveBeenCalledOnce();
|
|
71
|
-
expect(consoleErrorSpy).toHaveBeenCalledWith(`Error discovering tool: 'invalid tool name' from MCP server 'test-server': ${testError.message}`);
|
|
72
|
-
});
|
|
73
55
|
it('should skip tools if a parameter is missing a type', async () => {
|
|
74
|
-
const mockedClient = {};
|
|
75
56
|
const consoleWarnSpy = vi
|
|
76
57
|
.spyOn(console, 'warn')
|
|
77
58
|
.mockImplementation(() => { });
|
|
59
|
+
const mockedClient = {
|
|
60
|
+
connect: vi.fn(),
|
|
61
|
+
discover: vi.fn(),
|
|
62
|
+
disconnect: vi.fn(),
|
|
63
|
+
getStatus: vi.fn(),
|
|
64
|
+
registerCapabilities: vi.fn(),
|
|
65
|
+
setRequestHandler: vi.fn(),
|
|
66
|
+
tool: vi.fn(),
|
|
67
|
+
};
|
|
68
|
+
vi.mocked(ClientLib.Client).mockReturnValue(mockedClient);
|
|
69
|
+
vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue({});
|
|
78
70
|
vi.mocked(GenAiLib.mcpToTool).mockReturnValue({
|
|
79
71
|
tool: () => Promise.resolve({
|
|
80
72
|
functionDeclarations: [
|
|
@@ -99,273 +91,45 @@ describe('mcp-client', () => {
|
|
|
99
91
|
],
|
|
100
92
|
}),
|
|
101
93
|
});
|
|
102
|
-
const
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
const mockedClient = {};
|
|
112
|
-
const consoleWarnSpy = vi
|
|
113
|
-
.spyOn(console, 'warn')
|
|
114
|
-
.mockImplementation(() => { });
|
|
115
|
-
vi.mocked(GenAiLib.mcpToTool).mockReturnValue({
|
|
116
|
-
tool: () => Promise.resolve({
|
|
117
|
-
functionDeclarations: [
|
|
118
|
-
{
|
|
119
|
-
name: 'invalidTool',
|
|
120
|
-
parametersJsonSchema: {
|
|
121
|
-
type: 'object',
|
|
122
|
-
properties: {
|
|
123
|
-
param1: {
|
|
124
|
-
type: 'object',
|
|
125
|
-
properties: {
|
|
126
|
-
nestedParam: {
|
|
127
|
-
description: 'a nested param with no type',
|
|
128
|
-
},
|
|
129
|
-
},
|
|
130
|
-
},
|
|
131
|
-
},
|
|
132
|
-
},
|
|
133
|
-
},
|
|
134
|
-
],
|
|
135
|
-
}),
|
|
136
|
-
});
|
|
137
|
-
const tools = await discoverTools('test-server', {}, mockedClient);
|
|
138
|
-
expect(tools.length).toBe(0);
|
|
139
|
-
expect(consoleWarnSpy).toHaveBeenCalledOnce();
|
|
140
|
-
expect(consoleWarnSpy).toHaveBeenCalledWith(`Skipping tool 'invalidTool' from MCP server 'test-server' because it has ` +
|
|
141
|
-
`missing types in its parameter schema. Please file an issue with the owner of the MCP server.`);
|
|
142
|
-
consoleWarnSpy.mockRestore();
|
|
143
|
-
});
|
|
144
|
-
it('should skip tool if an array item is missing a type', async () => {
|
|
145
|
-
const mockedClient = {};
|
|
146
|
-
const consoleWarnSpy = vi
|
|
147
|
-
.spyOn(console, 'warn')
|
|
148
|
-
.mockImplementation(() => { });
|
|
149
|
-
vi.mocked(GenAiLib.mcpToTool).mockReturnValue({
|
|
150
|
-
tool: () => Promise.resolve({
|
|
151
|
-
functionDeclarations: [
|
|
152
|
-
{
|
|
153
|
-
name: 'invalidTool',
|
|
154
|
-
parametersJsonSchema: {
|
|
155
|
-
type: 'object',
|
|
156
|
-
properties: {
|
|
157
|
-
param1: {
|
|
158
|
-
type: 'array',
|
|
159
|
-
items: {
|
|
160
|
-
description: 'an array item with no type',
|
|
161
|
-
},
|
|
162
|
-
},
|
|
163
|
-
},
|
|
164
|
-
},
|
|
165
|
-
},
|
|
166
|
-
],
|
|
167
|
-
}),
|
|
168
|
-
});
|
|
169
|
-
const tools = await discoverTools('test-server', {}, mockedClient);
|
|
170
|
-
expect(tools.length).toBe(0);
|
|
94
|
+
const mockedToolRegistry = {
|
|
95
|
+
registerTool: vi.fn(),
|
|
96
|
+
};
|
|
97
|
+
const client = new McpClient('test-server', {
|
|
98
|
+
command: 'test-command',
|
|
99
|
+
}, mockedToolRegistry, {}, {}, false);
|
|
100
|
+
await client.connect();
|
|
101
|
+
await client.discover();
|
|
102
|
+
expect(mockedToolRegistry.registerTool).toHaveBeenCalledOnce();
|
|
171
103
|
expect(consoleWarnSpy).toHaveBeenCalledOnce();
|
|
172
104
|
expect(consoleWarnSpy).toHaveBeenCalledWith(`Skipping tool 'invalidTool' from MCP server 'test-server' because it has ` +
|
|
173
105
|
`missing types in its parameter schema. Please file an issue with the owner of the MCP server.`);
|
|
174
106
|
consoleWarnSpy.mockRestore();
|
|
175
107
|
});
|
|
176
|
-
it('should
|
|
177
|
-
const
|
|
178
|
-
|
|
179
|
-
.spyOn(console, 'warn')
|
|
180
|
-
.mockImplementation(() => { });
|
|
181
|
-
vi.mocked(GenAiLib.mcpToTool).mockReturnValue({
|
|
182
|
-
tool: () => Promise.resolve({
|
|
183
|
-
functionDeclarations: [
|
|
184
|
-
{
|
|
185
|
-
name: 'validTool',
|
|
186
|
-
parametersJsonSchema: {
|
|
187
|
-
type: 'object',
|
|
188
|
-
},
|
|
189
|
-
},
|
|
190
|
-
],
|
|
191
|
-
}),
|
|
192
|
-
});
|
|
193
|
-
const tools = await discoverTools('test-server', {}, mockedClient);
|
|
194
|
-
expect(tools.length).toBe(1);
|
|
195
|
-
expect(vi.mocked(DiscoveredMCPTool).mock.calls[0][2]).toBe('validTool');
|
|
196
|
-
expect(consoleWarnSpy).not.toHaveBeenCalled();
|
|
197
|
-
consoleWarnSpy.mockRestore();
|
|
198
|
-
});
|
|
199
|
-
it('should discover tool with empty properties object in schema', async () => {
|
|
200
|
-
const mockedClient = {};
|
|
201
|
-
const consoleWarnSpy = vi
|
|
202
|
-
.spyOn(console, 'warn')
|
|
108
|
+
it('should handle errors when discovering prompts', async () => {
|
|
109
|
+
const consoleErrorSpy = vi
|
|
110
|
+
.spyOn(console, 'error')
|
|
203
111
|
.mockImplementation(() => { });
|
|
204
|
-
vi.mocked(GenAiLib.mcpToTool).mockReturnValue({
|
|
205
|
-
tool: () => Promise.resolve({
|
|
206
|
-
functionDeclarations: [
|
|
207
|
-
{
|
|
208
|
-
name: 'validTool',
|
|
209
|
-
parametersJsonSchema: {
|
|
210
|
-
type: 'object',
|
|
211
|
-
properties: {},
|
|
212
|
-
},
|
|
213
|
-
},
|
|
214
|
-
],
|
|
215
|
-
}),
|
|
216
|
-
});
|
|
217
|
-
const tools = await discoverTools('test-server', {}, mockedClient);
|
|
218
|
-
expect(tools.length).toBe(1);
|
|
219
|
-
expect(vi.mocked(DiscoveredMCPTool).mock.calls[0][2]).toBe('validTool');
|
|
220
|
-
expect(consoleWarnSpy).not.toHaveBeenCalled();
|
|
221
|
-
consoleWarnSpy.mockRestore();
|
|
222
|
-
});
|
|
223
|
-
});
|
|
224
|
-
describe('connectToMcpServer', () => {
|
|
225
|
-
it('should send a notification when directories change', async () => {
|
|
226
112
|
const mockedClient = {
|
|
227
|
-
registerCapabilities: vi.fn(),
|
|
228
|
-
setRequestHandler: vi.fn(),
|
|
229
|
-
notification: vi.fn(),
|
|
230
|
-
callTool: vi.fn(),
|
|
231
113
|
connect: vi.fn(),
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
let onDirectoriesChangedCallback = () => { };
|
|
236
|
-
const mockWorkspaceContext = {
|
|
237
|
-
getDirectories: vi
|
|
238
|
-
.fn()
|
|
239
|
-
.mockReturnValue(['/test/dir', '/another/project']),
|
|
240
|
-
onDirectoriesChanged: vi.fn().mockImplementation((callback) => {
|
|
241
|
-
onDirectoriesChangedCallback = callback;
|
|
242
|
-
}),
|
|
243
|
-
};
|
|
244
|
-
await connectToMcpServer('test-server', {
|
|
245
|
-
command: 'test-command',
|
|
246
|
-
}, false, mockWorkspaceContext);
|
|
247
|
-
onDirectoriesChangedCallback();
|
|
248
|
-
expect(mockedClient.notification).toHaveBeenCalledWith({
|
|
249
|
-
method: 'notifications/roots/list_changed',
|
|
250
|
-
});
|
|
251
|
-
});
|
|
252
|
-
it('should register a roots/list handler', async () => {
|
|
253
|
-
const mockedClient = {
|
|
114
|
+
discover: vi.fn(),
|
|
115
|
+
disconnect: vi.fn(),
|
|
116
|
+
getStatus: vi.fn(),
|
|
254
117
|
registerCapabilities: vi.fn(),
|
|
255
118
|
setRequestHandler: vi.fn(),
|
|
256
|
-
|
|
257
|
-
|
|
119
|
+
getServerCapabilities: vi.fn().mockReturnValue({ prompts: {} }),
|
|
120
|
+
request: vi.fn().mockRejectedValue(new Error('Test error')),
|
|
258
121
|
};
|
|
259
122
|
vi.mocked(ClientLib.Client).mockReturnValue(mockedClient);
|
|
260
123
|
vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue({});
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
.fn()
|
|
264
|
-
.mockReturnValue(['/test/dir', '/another/project']),
|
|
265
|
-
onDirectoriesChanged: vi.fn(),
|
|
266
|
-
};
|
|
267
|
-
await connectToMcpServer('test-server', {
|
|
268
|
-
command: 'test-command',
|
|
269
|
-
}, false, mockWorkspaceContext);
|
|
270
|
-
expect(mockedClient.registerCapabilities).toHaveBeenCalledWith({
|
|
271
|
-
roots: {
|
|
272
|
-
listChanged: true,
|
|
273
|
-
},
|
|
274
|
-
});
|
|
275
|
-
expect(mockedClient.setRequestHandler).toHaveBeenCalledOnce();
|
|
276
|
-
const handler = mockedClient.setRequestHandler.mock.calls[0][1];
|
|
277
|
-
const roots = await handler();
|
|
278
|
-
expect(roots).toEqual({
|
|
279
|
-
roots: [
|
|
280
|
-
{
|
|
281
|
-
uri: pathToFileURL('/test/dir').toString(),
|
|
282
|
-
name: 'dir',
|
|
283
|
-
},
|
|
284
|
-
{
|
|
285
|
-
uri: pathToFileURL('/another/project').toString(),
|
|
286
|
-
name: 'project',
|
|
287
|
-
},
|
|
288
|
-
],
|
|
289
|
-
});
|
|
290
|
-
});
|
|
291
|
-
});
|
|
292
|
-
describe('discoverPrompts', () => {
|
|
293
|
-
const mockedPromptRegistry = {
|
|
294
|
-
registerPrompt: vi.fn(),
|
|
295
|
-
};
|
|
296
|
-
it('should discover and log prompts', async () => {
|
|
297
|
-
const mockRequest = vi.fn().mockResolvedValue({
|
|
298
|
-
prompts: [
|
|
299
|
-
{ name: 'prompt1', description: 'desc1' },
|
|
300
|
-
{ name: 'prompt2' },
|
|
301
|
-
],
|
|
302
|
-
});
|
|
303
|
-
const mockGetServerCapabilities = vi.fn().mockReturnValue({
|
|
304
|
-
prompts: {},
|
|
305
|
-
});
|
|
306
|
-
const mockedClient = {
|
|
307
|
-
getServerCapabilities: mockGetServerCapabilities,
|
|
308
|
-
request: mockRequest,
|
|
309
|
-
};
|
|
310
|
-
await discoverPrompts('test-server', mockedClient, mockedPromptRegistry);
|
|
311
|
-
expect(mockGetServerCapabilities).toHaveBeenCalledOnce();
|
|
312
|
-
expect(mockRequest).toHaveBeenCalledWith({ method: 'prompts/list', params: {} }, expect.anything());
|
|
313
|
-
});
|
|
314
|
-
it('should do nothing if no prompts are discovered', async () => {
|
|
315
|
-
const mockRequest = vi.fn().mockResolvedValue({
|
|
316
|
-
prompts: [],
|
|
317
|
-
});
|
|
318
|
-
const mockGetServerCapabilities = vi.fn().mockReturnValue({
|
|
319
|
-
prompts: {},
|
|
320
|
-
});
|
|
321
|
-
const mockedClient = {
|
|
322
|
-
getServerCapabilities: mockGetServerCapabilities,
|
|
323
|
-
request: mockRequest,
|
|
324
|
-
};
|
|
325
|
-
const consoleLogSpy = vi
|
|
326
|
-
.spyOn(console, 'debug')
|
|
327
|
-
.mockImplementation(() => { });
|
|
328
|
-
await discoverPrompts('test-server', mockedClient, mockedPromptRegistry);
|
|
329
|
-
expect(mockGetServerCapabilities).toHaveBeenCalledOnce();
|
|
330
|
-
expect(mockRequest).toHaveBeenCalledOnce();
|
|
331
|
-
expect(consoleLogSpy).not.toHaveBeenCalled();
|
|
332
|
-
consoleLogSpy.mockRestore();
|
|
333
|
-
});
|
|
334
|
-
it('should do nothing if the server has no prompt support', async () => {
|
|
335
|
-
const mockRequest = vi.fn().mockResolvedValue({
|
|
336
|
-
prompts: [],
|
|
337
|
-
});
|
|
338
|
-
const mockGetServerCapabilities = vi.fn().mockReturnValue({});
|
|
339
|
-
const mockedClient = {
|
|
340
|
-
getServerCapabilities: mockGetServerCapabilities,
|
|
341
|
-
request: mockRequest,
|
|
342
|
-
};
|
|
343
|
-
const consoleLogSpy = vi
|
|
344
|
-
.spyOn(console, 'debug')
|
|
345
|
-
.mockImplementation(() => { });
|
|
346
|
-
await discoverPrompts('test-server', mockedClient, mockedPromptRegistry);
|
|
347
|
-
expect(mockGetServerCapabilities).toHaveBeenCalledOnce();
|
|
348
|
-
expect(mockRequest).not.toHaveBeenCalled();
|
|
349
|
-
expect(consoleLogSpy).not.toHaveBeenCalled();
|
|
350
|
-
consoleLogSpy.mockRestore();
|
|
351
|
-
});
|
|
352
|
-
it('should log an error if discovery fails', async () => {
|
|
353
|
-
const testError = new Error('test error');
|
|
354
|
-
testError.message = 'test error';
|
|
355
|
-
const mockRequest = vi.fn().mockRejectedValue(testError);
|
|
356
|
-
const mockGetServerCapabilities = vi.fn().mockReturnValue({
|
|
357
|
-
prompts: {},
|
|
124
|
+
vi.mocked(GenAiLib.mcpToTool).mockReturnValue({
|
|
125
|
+
tool: () => Promise.resolve({ functionDeclarations: [] }),
|
|
358
126
|
});
|
|
359
|
-
const
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
.mockImplementation(() => { });
|
|
366
|
-
await discoverPrompts('test-server', mockedClient, mockedPromptRegistry);
|
|
367
|
-
expect(mockRequest).toHaveBeenCalledOnce();
|
|
368
|
-
expect(consoleErrorSpy).toHaveBeenCalledWith(`Error discovering prompts from test-server: ${testError.message}`);
|
|
127
|
+
const client = new McpClient('test-server', {
|
|
128
|
+
command: 'test-command',
|
|
129
|
+
}, {}, {}, {}, false);
|
|
130
|
+
await client.connect();
|
|
131
|
+
await expect(client.discover()).rejects.toThrow('No prompts or tools found on the server.');
|
|
132
|
+
expect(consoleErrorSpy).toHaveBeenCalledWith(`Error discovering prompts from test-server: Test error`);
|
|
369
133
|
consoleErrorSpy.mockRestore();
|
|
370
134
|
});
|
|
371
135
|
});
|
|
@@ -389,14 +153,6 @@ describe('mcp-client', () => {
|
|
|
389
153
|
});
|
|
390
154
|
});
|
|
391
155
|
describe('createTransport', () => {
|
|
392
|
-
const originalEnv = process.env;
|
|
393
|
-
beforeEach(() => {
|
|
394
|
-
vi.resetModules();
|
|
395
|
-
process.env = {};
|
|
396
|
-
});
|
|
397
|
-
afterEach(() => {
|
|
398
|
-
process.env = originalEnv;
|
|
399
|
-
});
|
|
400
156
|
describe('should connect via httpUrl', () => {
|
|
401
157
|
it('without headers', async () => {
|
|
402
158
|
const transport = await createTransport('test-server', {
|
|
@@ -449,7 +205,7 @@ describe('mcp-client', () => {
|
|
|
449
205
|
command: 'test-command',
|
|
450
206
|
args: ['--foo', 'bar'],
|
|
451
207
|
cwd: 'test/cwd',
|
|
452
|
-
env: { FOO: 'bar' },
|
|
208
|
+
env: { ...process.env, FOO: 'bar' },
|
|
453
209
|
stderr: 'pipe',
|
|
454
210
|
});
|
|
455
211
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-client.test.js","sourceRoot":"","sources":["../../../src/tools/mcp-client.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"mcp-client.test.js","sourceRoot":"","sources":["../../../src/tools/mcp-client.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,7 +54,7 @@ describe('DiscoveredMCPTool', () => {
|
|
|
54
54
|
mockToolMethod.mockClear();
|
|
55
55
|
tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
|
|
56
56
|
// Clear allowlist before each relevant test, especially for shouldConfirmExecute
|
|
57
|
-
const invocation = tool.build({});
|
|
57
|
+
const invocation = tool.build({ param: 'mock' });
|
|
58
58
|
invocation.constructor.allowlist.clear();
|
|
59
59
|
});
|
|
60
60
|
afterEach(() => {
|
|
@@ -185,7 +185,7 @@ describe('DiscoveredMCPTool', () => {
|
|
|
185
185
|
expect(toolResult.returnDisplay).toBe(stringifiedResponseContent);
|
|
186
186
|
});
|
|
187
187
|
it('should handle a simple text response correctly', async () => {
|
|
188
|
-
const params = {
|
|
188
|
+
const params = { param: 'test' };
|
|
189
189
|
const successMessage = 'This is a success message.';
|
|
190
190
|
// Simulate the response from the GenAI SDK, which wraps the MCP
|
|
191
191
|
// response in a functionResponse Part.
|
|
@@ -213,7 +213,7 @@ describe('DiscoveredMCPTool', () => {
|
|
|
213
213
|
]);
|
|
214
214
|
});
|
|
215
215
|
it('should handle an AudioBlock response', async () => {
|
|
216
|
-
const params = {
|
|
216
|
+
const params = { param: 'play' };
|
|
217
217
|
const sdkResponse = [
|
|
218
218
|
{
|
|
219
219
|
functionResponse: {
|
|
@@ -247,7 +247,7 @@ describe('DiscoveredMCPTool', () => {
|
|
|
247
247
|
expect(toolResult.returnDisplay).toBe('[Audio: audio/mp3]');
|
|
248
248
|
});
|
|
249
249
|
it('should handle a ResourceLinkBlock response', async () => {
|
|
250
|
-
const params = {
|
|
250
|
+
const params = { param: 'get' };
|
|
251
251
|
const sdkResponse = [
|
|
252
252
|
{
|
|
253
253
|
functionResponse: {
|
|
@@ -276,7 +276,7 @@ describe('DiscoveredMCPTool', () => {
|
|
|
276
276
|
expect(toolResult.returnDisplay).toBe('[Link to My Resource: file:///path/to/thing]');
|
|
277
277
|
});
|
|
278
278
|
it('should handle an embedded text ResourceBlock response', async () => {
|
|
279
|
-
const params = {
|
|
279
|
+
const params = { param: 'get' };
|
|
280
280
|
const sdkResponse = [
|
|
281
281
|
{
|
|
282
282
|
functionResponse: {
|
|
@@ -305,7 +305,7 @@ describe('DiscoveredMCPTool', () => {
|
|
|
305
305
|
expect(toolResult.returnDisplay).toBe('This is the text content.');
|
|
306
306
|
});
|
|
307
307
|
it('should handle an embedded binary ResourceBlock response', async () => {
|
|
308
|
-
const params = {
|
|
308
|
+
const params = { param: 'get' };
|
|
309
309
|
const sdkResponse = [
|
|
310
310
|
{
|
|
311
311
|
functionResponse: {
|
|
@@ -342,7 +342,7 @@ describe('DiscoveredMCPTool', () => {
|
|
|
342
342
|
expect(toolResult.returnDisplay).toBe('[Embedded Resource: application/octet-stream]');
|
|
343
343
|
});
|
|
344
344
|
it('should handle a mix of content block types', async () => {
|
|
345
|
-
const params = {
|
|
345
|
+
const params = { param: 'complex' };
|
|
346
346
|
const sdkResponse = [
|
|
347
347
|
{
|
|
348
348
|
functionResponse: {
|
|
@@ -380,7 +380,7 @@ describe('DiscoveredMCPTool', () => {
|
|
|
380
380
|
expect(toolResult.returnDisplay).toBe('First part.\n[Image: image/jpeg]\nSecond part.');
|
|
381
381
|
});
|
|
382
382
|
it('should ignore unknown content block types', async () => {
|
|
383
|
-
const params = {
|
|
383
|
+
const params = { param: 'test' };
|
|
384
384
|
const sdkResponse = [
|
|
385
385
|
{
|
|
386
386
|
functionResponse: {
|
|
@@ -401,7 +401,7 @@ describe('DiscoveredMCPTool', () => {
|
|
|
401
401
|
expect(toolResult.returnDisplay).toBe('Valid part.\n[Unknown content type: future_block]');
|
|
402
402
|
});
|
|
403
403
|
it('should handle a complex mix of content block types', async () => {
|
|
404
|
-
const params = {
|
|
404
|
+
const params = { param: 'super-complex' };
|
|
405
405
|
const sdkResponse = [
|
|
406
406
|
{
|
|
407
407
|
functionResponse: {
|
|
@@ -458,22 +458,22 @@ describe('DiscoveredMCPTool', () => {
|
|
|
458
458
|
describe('shouldConfirmExecute', () => {
|
|
459
459
|
it('should return false if trust is true', async () => {
|
|
460
460
|
const trustedTool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema, undefined, true);
|
|
461
|
-
const invocation = trustedTool.build({});
|
|
461
|
+
const invocation = trustedTool.build({ param: 'mock' });
|
|
462
462
|
expect(await invocation.shouldConfirmExecute(new AbortController().signal)).toBe(false);
|
|
463
463
|
});
|
|
464
464
|
it('should return false if server is allowlisted', async () => {
|
|
465
|
-
const invocation = tool.build({});
|
|
465
|
+
const invocation = tool.build({ param: 'mock' });
|
|
466
466
|
invocation.constructor.allowlist.add(serverName);
|
|
467
467
|
expect(await invocation.shouldConfirmExecute(new AbortController().signal)).toBe(false);
|
|
468
468
|
});
|
|
469
469
|
it('should return false if tool is allowlisted', async () => {
|
|
470
470
|
const toolAllowlistKey = `${serverName}.${serverToolName}`;
|
|
471
|
-
const invocation = tool.build({});
|
|
471
|
+
const invocation = tool.build({ param: 'mock' });
|
|
472
472
|
invocation.constructor.allowlist.add(toolAllowlistKey);
|
|
473
473
|
expect(await invocation.shouldConfirmExecute(new AbortController().signal)).toBe(false);
|
|
474
474
|
});
|
|
475
475
|
it('should return confirmation details if not trusted and not allowlisted', async () => {
|
|
476
|
-
const invocation = tool.build({});
|
|
476
|
+
const invocation = tool.build({ param: 'mock' });
|
|
477
477
|
const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
|
|
478
478
|
expect(confirmation).not.toBe(false);
|
|
479
479
|
if (confirmation && confirmation.type === 'mcp') {
|
|
@@ -491,7 +491,7 @@ describe('DiscoveredMCPTool', () => {
|
|
|
491
491
|
}
|
|
492
492
|
});
|
|
493
493
|
it('should add server to allowlist on ProceedAlwaysServer', async () => {
|
|
494
|
-
const invocation = tool.build({});
|
|
494
|
+
const invocation = tool.build({ param: 'mock' });
|
|
495
495
|
const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
|
|
496
496
|
expect(confirmation).not.toBe(false);
|
|
497
497
|
if (confirmation &&
|
|
@@ -507,7 +507,7 @@ describe('DiscoveredMCPTool', () => {
|
|
|
507
507
|
});
|
|
508
508
|
it('should add tool to allowlist on ProceedAlwaysTool', async () => {
|
|
509
509
|
const toolAllowlistKey = `${serverName}.${serverToolName}`;
|
|
510
|
-
const invocation = tool.build({});
|
|
510
|
+
const invocation = tool.build({ param: 'mock' });
|
|
511
511
|
const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
|
|
512
512
|
expect(confirmation).not.toBe(false);
|
|
513
513
|
if (confirmation &&
|
|
@@ -522,7 +522,7 @@ describe('DiscoveredMCPTool', () => {
|
|
|
522
522
|
}
|
|
523
523
|
});
|
|
524
524
|
it('should handle Cancel confirmation outcome', async () => {
|
|
525
|
-
const invocation = tool.build({});
|
|
525
|
+
const invocation = tool.build({ param: 'mock' });
|
|
526
526
|
const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
|
|
527
527
|
expect(confirmation).not.toBe(false);
|
|
528
528
|
if (confirmation &&
|
|
@@ -539,7 +539,7 @@ describe('DiscoveredMCPTool', () => {
|
|
|
539
539
|
}
|
|
540
540
|
});
|
|
541
541
|
it('should handle ProceedOnce confirmation outcome', async () => {
|
|
542
|
-
const invocation = tool.build({});
|
|
542
|
+
const invocation = tool.build({ param: 'mock' });
|
|
543
543
|
const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
|
|
544
544
|
expect(confirmation).not.toBe(false);
|
|
545
545
|
if (confirmation &&
|