@google/gemini-cli-core 0.1.0-development.1 → 0.1.2
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/google-gemini-cli-core-0.1.0.tgz +0 -0
- package/dist/google-gemini-cli-core-0.1.1.tgz +0 -0
- package/dist/google-gemini-cli-core-0.1.2.tgz +0 -0
- package/dist/src/code_assist/codeAssist.d.ts +1 -1
- package/dist/src/code_assist/codeAssist.js +5 -5
- package/dist/src/code_assist/codeAssist.js.map +1 -1
- package/dist/src/code_assist/converter.d.ts +1 -2
- package/dist/src/code_assist/converter.js +3 -4
- package/dist/src/code_assist/converter.js.map +1 -1
- package/dist/src/code_assist/converter.test.js +0 -24
- package/dist/src/code_assist/converter.test.js.map +1 -1
- package/dist/src/code_assist/oauth2.d.ts +1 -9
- package/dist/src/code_assist/oauth2.js +5 -115
- package/dist/src/code_assist/oauth2.js.map +1 -1
- package/dist/src/code_assist/oauth2.test.js +10 -102
- package/dist/src/code_assist/oauth2.test.js.map +1 -1
- package/dist/src/code_assist/server.d.ts +8 -13
- package/dist/src/code_assist/server.js +17 -41
- package/dist/src/code_assist/server.js.map +1 -1
- package/dist/src/code_assist/server.test.js +21 -21
- package/dist/src/code_assist/server.test.js.map +1 -1
- package/dist/src/code_assist/setup.d.ts +1 -4
- package/dist/src/code_assist/setup.js +20 -39
- package/dist/src/code_assist/setup.js.map +1 -1
- package/dist/src/code_assist/types.d.ts +1 -9
- package/dist/src/code_assist/types.js +1 -1
- package/dist/src/config/config.d.ts +2 -10
- package/dist/src/config/config.js +58 -72
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +0 -25
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/core/client.d.ts +3 -3
- package/dist/src/core/client.js +62 -56
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +5 -304
- package/dist/src/core/client.test.js.map +1 -1
- package/dist/src/core/contentGenerator.d.ts +7 -5
- package/dist/src/core/contentGenerator.js +16 -11
- package/dist/src/core/contentGenerator.js.map +1 -1
- package/dist/src/core/contentGenerator.test.js +1 -1
- package/dist/src/core/contentGenerator.test.js.map +1 -1
- package/dist/src/core/coreToolScheduler.d.ts +2 -9
- package/dist/src/core/coreToolScheduler.js +2 -28
- package/dist/src/core/coreToolScheduler.js.map +1 -1
- package/dist/src/core/coreToolScheduler.test.js +2 -79
- package/dist/src/core/coreToolScheduler.test.js.map +1 -1
- package/dist/src/core/geminiChat.d.ts +2 -1
- package/dist/src/core/geminiChat.js +19 -24
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/geminiChat.test.js +16 -18
- package/dist/src/core/geminiChat.test.js.map +1 -1
- package/dist/src/core/logger.d.ts +4 -3
- package/dist/src/core/logger.js +12 -8
- package/dist/src/core/logger.js.map +1 -1
- package/dist/src/core/logger.test.js +15 -6
- package/dist/src/core/logger.test.js.map +1 -1
- package/dist/src/core/prompts.d.ts +0 -6
- package/dist/src/core/prompts.js +9 -73
- package/dist/src/core/prompts.js.map +1 -1
- package/dist/src/core/turn.d.ts +11 -2
- package/dist/src/core/turn.js +19 -1
- package/dist/src/core/turn.js.map +1 -1
- package/dist/src/core/turn.test.js +45 -0
- package/dist/src/core/turn.test.js.map +1 -1
- package/dist/src/index.d.ts +0 -2
- package/dist/src/index.js +0 -2
- package/dist/src/index.js.map +1 -1
- package/dist/src/services/fileDiscoveryService.d.ts +0 -4
- package/dist/src/services/fileDiscoveryService.js +0 -13
- package/dist/src/services/fileDiscoveryService.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +16 -45
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
- package/dist/src/telemetry/index.d.ts +0 -1
- package/dist/src/telemetry/index.js +0 -1
- package/dist/src/telemetry/index.js.map +1 -1
- package/dist/src/telemetry/loggers.js +0 -19
- package/dist/src/telemetry/loggers.js.map +1 -1
- package/dist/src/telemetry/loggers.test.js +0 -41
- package/dist/src/telemetry/loggers.test.js.map +1 -1
- package/dist/src/telemetry/types.d.ts +0 -1
- package/dist/src/telemetry/types.js +0 -2
- package/dist/src/telemetry/types.js.map +1 -1
- package/dist/src/tools/edit.d.ts +2 -5
- package/dist/src/tools/edit.js +10 -17
- package/dist/src/tools/edit.js.map +1 -1
- package/dist/src/tools/edit.test.js +12 -48
- package/dist/src/tools/edit.test.js.map +1 -1
- package/dist/src/tools/glob.d.ts +1 -5
- package/dist/src/tools/glob.js +1 -5
- package/dist/src/tools/glob.js.map +1 -1
- package/dist/src/tools/grep.js +2 -4
- package/dist/src/tools/grep.js.map +1 -1
- package/dist/src/tools/grep.test.js +10 -10
- package/dist/src/tools/grep.test.js.map +1 -1
- package/dist/src/tools/mcp-client.d.ts +2 -0
- package/dist/src/tools/mcp-client.js +25 -38
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/mcp-client.test.js +14 -170
- package/dist/src/tools/mcp-client.test.js.map +1 -1
- package/dist/src/tools/modifiable-tool.js +4 -5
- package/dist/src/tools/modifiable-tool.js.map +1 -1
- package/dist/src/tools/modifiable-tool.test.js +3 -16
- package/dist/src/tools/modifiable-tool.test.js.map +1 -1
- package/dist/src/tools/read-file.js +2 -1
- package/dist/src/tools/read-file.js.map +1 -1
- package/dist/src/tools/read-many-files.js +1 -1
- package/dist/src/tools/read-many-files.test.js +2 -27
- package/dist/src/tools/read-many-files.test.js.map +1 -1
- package/dist/src/tools/shell.d.ts +0 -20
- package/dist/src/tools/shell.js +22 -128
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/shell.json +18 -0
- package/dist/src/tools/shell.md +16 -0
- package/dist/src/tools/tool-registry.d.ts +2 -16
- package/dist/src/tools/tool-registry.js +19 -150
- package/dist/src/tools/tool-registry.js.map +1 -1
- package/dist/src/tools/tool-registry.test.js +73 -184
- package/dist/src/tools/tool-registry.test.js.map +1 -1
- package/dist/src/tools/tools.d.ts +1 -4
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/tools/web-fetch.js.map +1 -1
- package/dist/src/tools/web-search.d.ts +1 -6
- package/dist/src/tools/web-search.js +2 -7
- package/dist/src/tools/web-search.js.map +1 -1
- package/dist/src/tools/write-file.d.ts +1 -11
- package/dist/src/tools/write-file.js +10 -23
- package/dist/src/tools/write-file.js.map +1 -1
- package/dist/src/tools/write-file.test.js +4 -39
- package/dist/src/tools/write-file.test.js.map +1 -1
- package/dist/src/utils/editCorrector.d.ts +1 -1
- package/dist/src/utils/editCorrector.js +2 -106
- package/dist/src/utils/editCorrector.js.map +1 -1
- package/dist/src/utils/editCorrector.test.js +19 -65
- package/dist/src/utils/editCorrector.test.js.map +1 -1
- package/dist/src/utils/editor.d.ts +2 -2
- package/dist/src/utils/editor.js +7 -20
- package/dist/src/utils/editor.js.map +1 -1
- package/dist/src/utils/editor.test.js +27 -60
- package/dist/src/utils/editor.test.js.map +1 -1
- package/dist/src/utils/fileUtils.d.ts +2 -2
- package/dist/src/utils/fileUtils.js +8 -47
- package/dist/src/utils/fileUtils.js.map +1 -1
- package/dist/src/utils/fileUtils.test.js +0 -39
- package/dist/src/utils/fileUtils.test.js.map +1 -1
- package/dist/src/utils/flashFallback.integration.test.js +9 -8
- package/dist/src/utils/flashFallback.integration.test.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.js +2 -5
- package/dist/src/utils/memoryDiscovery.js.map +1 -1
- package/dist/src/utils/messageInspectors.d.ts +0 -1
- package/dist/src/utils/messageInspectors.js +0 -5
- package/dist/src/utils/messageInspectors.js.map +1 -1
- package/dist/src/utils/nextSpeakerChecker.js +1 -1
- package/dist/src/utils/nextSpeakerChecker.js.map +1 -1
- package/dist/src/utils/nextSpeakerChecker.test.js +1 -0
- package/dist/src/utils/nextSpeakerChecker.test.js.map +1 -1
- package/dist/src/utils/retry.js +21 -21
- package/dist/src/utils/retry.js.map +1 -1
- package/dist/src/utils/retry.test.js +26 -2
- package/dist/src/utils/retry.test.js.map +1 -1
- package/dist/src/utils/user_id.d.ts +3 -9
- package/dist/src/utils/user_id.js +16 -37
- package/dist/src/utils/user_id.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +13 -12
- package/LICENSE +0 -202
- package/README.md +0 -156
- package/dist/src/telemetry/uiTelemetry.d.ts +0 -67
- package/dist/src/telemetry/uiTelemetry.js +0 -131
- package/dist/src/telemetry/uiTelemetry.js.map +0 -1
- package/dist/src/telemetry/uiTelemetry.test.d.ts +0 -6
- package/dist/src/telemetry/uiTelemetry.test.js +0 -411
- package/dist/src/telemetry/uiTelemetry.test.js.map +0 -1
- package/dist/src/tools/shell.test.d.ts +0 -6
- package/dist/src/tools/shell.test.js +0 -321
- package/dist/src/tools/shell.test.js.map +0 -1
- package/dist/src/utils/memoryImportProcessor.d.ts +0 -35
- package/dist/src/utils/memoryImportProcessor.js +0 -141
- package/dist/src/utils/memoryImportProcessor.js.map +0 -1
- package/dist/src/utils/memoryImportProcessor.test.d.ts +0 -6
- package/dist/src/utils/memoryImportProcessor.test.js +0 -170
- package/dist/src/utils/memoryImportProcessor.test.js.map +0 -1
- package/dist/src/utils/user_id.test.d.ts +0 -6
- package/dist/src/utils/user_id.test.js +0 -42
- package/dist/src/utils/user_id.test.js.map +0 -1
|
@@ -5,14 +5,12 @@
|
|
|
5
5
|
*/
|
|
6
6
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
7
7
|
import { describe, it, expect, vi, beforeEach, afterEach, } from 'vitest';
|
|
8
|
-
import { discoverMcpTools } from './mcp-client.js';
|
|
9
|
-
import { sanitizeParameters } from './tool-registry.js';
|
|
8
|
+
import { discoverMcpTools, sanatizeParameters } from './mcp-client.js';
|
|
10
9
|
import { Type } from '@google/genai';
|
|
11
10
|
import { DiscoveredMCPTool } from './mcp-tool.js';
|
|
12
11
|
import { Client } from '@modelcontextprotocol/sdk/client/index.js';
|
|
13
12
|
import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
|
|
14
13
|
import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
|
|
15
|
-
import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
|
|
16
14
|
import { parse } from 'shell-quote';
|
|
17
15
|
// Mock dependencies
|
|
18
16
|
vi.mock('shell-quote');
|
|
@@ -48,13 +46,6 @@ vi.mock('@modelcontextprotocol/sdk/client/sse.js', () => {
|
|
|
48
46
|
});
|
|
49
47
|
return { SSEClientTransport: MockedSSETransport };
|
|
50
48
|
});
|
|
51
|
-
vi.mock('@modelcontextprotocol/sdk/client/streamableHttp.js', () => {
|
|
52
|
-
const MockedStreamableHTTPTransport = vi.fn().mockImplementation(function () {
|
|
53
|
-
this.close = vi.fn().mockResolvedValue(undefined); // Add mock close method
|
|
54
|
-
return this;
|
|
55
|
-
});
|
|
56
|
-
return { StreamableHTTPClientTransport: MockedStreamableHTTPTransport };
|
|
57
|
-
});
|
|
58
49
|
const mockToolRegistryInstance = {
|
|
59
50
|
registerTool: vi.fn(),
|
|
60
51
|
getToolsByServer: vi.fn().mockReturnValue([]), // Default to empty array
|
|
@@ -64,14 +55,9 @@ const mockToolRegistryInstance = {
|
|
|
64
55
|
getFunctionDeclarations: vi.fn().mockReturnValue([]),
|
|
65
56
|
discoverTools: vi.fn().mockResolvedValue(undefined),
|
|
66
57
|
};
|
|
67
|
-
vi.mock('./tool-registry.js',
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
...actual,
|
|
71
|
-
ToolRegistry: vi.fn(() => mockToolRegistryInstance),
|
|
72
|
-
sanitizeParameters: actual.sanitizeParameters,
|
|
73
|
-
};
|
|
74
|
-
});
|
|
58
|
+
vi.mock('./tool-registry.js', () => ({
|
|
59
|
+
ToolRegistry: vi.fn(() => mockToolRegistryInstance),
|
|
60
|
+
}));
|
|
75
61
|
describe('discoverMcpTools', () => {
|
|
76
62
|
let mockConfig;
|
|
77
63
|
// Use the instance from the module mock
|
|
@@ -115,12 +101,6 @@ describe('discoverMcpTools', () => {
|
|
|
115
101
|
this.close = vi.fn().mockResolvedValue(undefined);
|
|
116
102
|
return this;
|
|
117
103
|
});
|
|
118
|
-
vi.mocked(StreamableHTTPClientTransport).mockClear();
|
|
119
|
-
// Ensure the StreamableHTTPClientTransport mock constructor returns an object with a close method
|
|
120
|
-
vi.mocked(StreamableHTTPClientTransport).mockImplementation(function () {
|
|
121
|
-
this.close = vi.fn().mockResolvedValue(undefined);
|
|
122
|
-
return this;
|
|
123
|
-
});
|
|
124
104
|
});
|
|
125
105
|
afterEach(() => {
|
|
126
106
|
vi.restoreAllMocks();
|
|
@@ -219,74 +199,6 @@ describe('discoverMcpTools', () => {
|
|
|
219
199
|
.calls[0][0];
|
|
220
200
|
expect(registeredTool.name).toBe('tool-sse');
|
|
221
201
|
});
|
|
222
|
-
it('should discover tools via mcpServers config (streamable http)', async () => {
|
|
223
|
-
const serverConfig = {
|
|
224
|
-
httpUrl: 'http://localhost:3000/mcp',
|
|
225
|
-
};
|
|
226
|
-
mockConfig.getMcpServers.mockReturnValue({ 'http-server': serverConfig });
|
|
227
|
-
const mockTool = {
|
|
228
|
-
name: 'tool-http',
|
|
229
|
-
description: 'desc-http',
|
|
230
|
-
inputSchema: { type: 'object', properties: {} },
|
|
231
|
-
};
|
|
232
|
-
vi.mocked(Client.prototype.listTools).mockResolvedValue({
|
|
233
|
-
tools: [mockTool],
|
|
234
|
-
});
|
|
235
|
-
mockToolRegistry.getToolsByServer.mockReturnValueOnce([
|
|
236
|
-
expect.any(DiscoveredMCPTool),
|
|
237
|
-
]);
|
|
238
|
-
await discoverMcpTools(mockConfig.getMcpServers() ?? {}, mockConfig.getMcpServerCommand(), mockToolRegistry);
|
|
239
|
-
expect(StreamableHTTPClientTransport).toHaveBeenCalledWith(new URL(serverConfig.httpUrl), {});
|
|
240
|
-
expect(mockToolRegistry.registerTool).toHaveBeenCalledWith(expect.any(DiscoveredMCPTool));
|
|
241
|
-
const registeredTool = mockToolRegistry.registerTool.mock
|
|
242
|
-
.calls[0][0];
|
|
243
|
-
expect(registeredTool.name).toBe('tool-http');
|
|
244
|
-
});
|
|
245
|
-
describe('StreamableHTTPClientTransport headers', () => {
|
|
246
|
-
const setupHttpTest = async (headers) => {
|
|
247
|
-
const serverConfig = {
|
|
248
|
-
httpUrl: 'http://localhost:3000/mcp',
|
|
249
|
-
...(headers && { headers }),
|
|
250
|
-
};
|
|
251
|
-
const serverName = headers
|
|
252
|
-
? 'http-server-with-headers'
|
|
253
|
-
: 'http-server-no-headers';
|
|
254
|
-
const toolName = headers ? 'tool-http-headers' : 'tool-http-no-headers';
|
|
255
|
-
mockConfig.getMcpServers.mockReturnValue({ [serverName]: serverConfig });
|
|
256
|
-
const mockTool = {
|
|
257
|
-
name: toolName,
|
|
258
|
-
description: `desc-${toolName}`,
|
|
259
|
-
inputSchema: { type: 'object', properties: {} },
|
|
260
|
-
};
|
|
261
|
-
vi.mocked(Client.prototype.listTools).mockResolvedValue({
|
|
262
|
-
tools: [mockTool],
|
|
263
|
-
});
|
|
264
|
-
mockToolRegistry.getToolsByServer.mockReturnValueOnce([
|
|
265
|
-
expect.any(DiscoveredMCPTool),
|
|
266
|
-
]);
|
|
267
|
-
await discoverMcpTools(mockConfig.getMcpServers() ?? {}, mockConfig.getMcpServerCommand(), mockToolRegistry);
|
|
268
|
-
return { serverConfig };
|
|
269
|
-
};
|
|
270
|
-
it('should pass headers when provided', async () => {
|
|
271
|
-
const headers = {
|
|
272
|
-
Authorization: 'Bearer test-token',
|
|
273
|
-
'X-Custom-Header': 'custom-value',
|
|
274
|
-
};
|
|
275
|
-
const { serverConfig } = await setupHttpTest(headers);
|
|
276
|
-
expect(StreamableHTTPClientTransport).toHaveBeenCalledWith(new URL(serverConfig.httpUrl), { requestInit: { headers } });
|
|
277
|
-
});
|
|
278
|
-
it('should work without headers (backwards compatibility)', async () => {
|
|
279
|
-
const { serverConfig } = await setupHttpTest();
|
|
280
|
-
expect(StreamableHTTPClientTransport).toHaveBeenCalledWith(new URL(serverConfig.httpUrl), {});
|
|
281
|
-
});
|
|
282
|
-
it('should pass oauth token when provided', async () => {
|
|
283
|
-
const headers = {
|
|
284
|
-
Authorization: 'Bearer test-token',
|
|
285
|
-
};
|
|
286
|
-
const { serverConfig } = await setupHttpTest(headers);
|
|
287
|
-
expect(StreamableHTTPClientTransport).toHaveBeenCalledWith(new URL(serverConfig.httpUrl), { requestInit: { headers } });
|
|
288
|
-
});
|
|
289
|
-
});
|
|
290
202
|
it('should prefix tool names if multiple MCP servers are configured', async () => {
|
|
291
203
|
const serverConfig1 = { command: './mcp1' };
|
|
292
204
|
const serverConfig2 = { url: 'http://mcp2/sse' };
|
|
@@ -459,89 +371,21 @@ describe('discoverMcpTools', () => {
|
|
|
459
371
|
const lastClientInstance = clientInstances[clientInstances.length - 1]?.value;
|
|
460
372
|
expect(lastClientInstance?.onerror).toEqual(expect.any(Function));
|
|
461
373
|
});
|
|
462
|
-
describe('Tool Filtering', () => {
|
|
463
|
-
const mockTools = [
|
|
464
|
-
{
|
|
465
|
-
name: 'toolA',
|
|
466
|
-
description: 'descA',
|
|
467
|
-
inputSchema: { type: 'object', properties: {} },
|
|
468
|
-
},
|
|
469
|
-
{
|
|
470
|
-
name: 'toolB',
|
|
471
|
-
description: 'descB',
|
|
472
|
-
inputSchema: { type: 'object', properties: {} },
|
|
473
|
-
},
|
|
474
|
-
{
|
|
475
|
-
name: 'toolC',
|
|
476
|
-
description: 'descC',
|
|
477
|
-
inputSchema: { type: 'object', properties: {} },
|
|
478
|
-
},
|
|
479
|
-
];
|
|
480
|
-
beforeEach(() => {
|
|
481
|
-
vi.mocked(Client.prototype.listTools).mockResolvedValue({
|
|
482
|
-
tools: mockTools,
|
|
483
|
-
});
|
|
484
|
-
mockToolRegistry.getToolsByServer.mockReturnValue([
|
|
485
|
-
expect.any(DiscoveredMCPTool),
|
|
486
|
-
]);
|
|
487
|
-
});
|
|
488
|
-
it('should only include specified tools with includeTools', async () => {
|
|
489
|
-
const serverConfig = {
|
|
490
|
-
command: './mcp-include',
|
|
491
|
-
includeTools: ['toolA', 'toolC'],
|
|
492
|
-
};
|
|
493
|
-
mockConfig.getMcpServers.mockReturnValue({
|
|
494
|
-
'include-server': serverConfig,
|
|
495
|
-
});
|
|
496
|
-
await discoverMcpTools(mockConfig.getMcpServers() ?? {}, mockConfig.getMcpServerCommand(), mockToolRegistry);
|
|
497
|
-
expect(mockToolRegistry.registerTool).toHaveBeenCalledTimes(2);
|
|
498
|
-
expect(mockToolRegistry.registerTool).toHaveBeenCalledWith(expect.objectContaining({ serverToolName: 'toolA' }));
|
|
499
|
-
expect(mockToolRegistry.registerTool).toHaveBeenCalledWith(expect.objectContaining({ serverToolName: 'toolC' }));
|
|
500
|
-
expect(mockToolRegistry.registerTool).not.toHaveBeenCalledWith(expect.objectContaining({ serverToolName: 'toolB' }));
|
|
501
|
-
});
|
|
502
|
-
it('should exclude specified tools with excludeTools', async () => {
|
|
503
|
-
const serverConfig = {
|
|
504
|
-
command: './mcp-exclude',
|
|
505
|
-
excludeTools: ['toolB'],
|
|
506
|
-
};
|
|
507
|
-
mockConfig.getMcpServers.mockReturnValue({
|
|
508
|
-
'exclude-server': serverConfig,
|
|
509
|
-
});
|
|
510
|
-
await discoverMcpTools(mockConfig.getMcpServers() ?? {}, mockConfig.getMcpServerCommand(), mockToolRegistry);
|
|
511
|
-
expect(mockToolRegistry.registerTool).toHaveBeenCalledTimes(2);
|
|
512
|
-
expect(mockToolRegistry.registerTool).toHaveBeenCalledWith(expect.objectContaining({ serverToolName: 'toolA' }));
|
|
513
|
-
expect(mockToolRegistry.registerTool).toHaveBeenCalledWith(expect.objectContaining({ serverToolName: 'toolC' }));
|
|
514
|
-
expect(mockToolRegistry.registerTool).not.toHaveBeenCalledWith(expect.objectContaining({ serverToolName: 'toolB' }));
|
|
515
|
-
});
|
|
516
|
-
it('should handle both includeTools and excludeTools', async () => {
|
|
517
|
-
const serverConfig = {
|
|
518
|
-
command: './mcp-both',
|
|
519
|
-
includeTools: ['toolA', 'toolB'],
|
|
520
|
-
excludeTools: ['toolB'],
|
|
521
|
-
};
|
|
522
|
-
mockConfig.getMcpServers.mockReturnValue({ 'both-server': serverConfig });
|
|
523
|
-
await discoverMcpTools(mockConfig.getMcpServers() ?? {}, mockConfig.getMcpServerCommand(), mockToolRegistry);
|
|
524
|
-
expect(mockToolRegistry.registerTool).toHaveBeenCalledTimes(1);
|
|
525
|
-
expect(mockToolRegistry.registerTool).toHaveBeenCalledWith(expect.objectContaining({ serverToolName: 'toolA' }));
|
|
526
|
-
expect(mockToolRegistry.registerTool).not.toHaveBeenCalledWith(expect.objectContaining({ serverToolName: 'toolB' }));
|
|
527
|
-
expect(mockToolRegistry.registerTool).not.toHaveBeenCalledWith(expect.objectContaining({ serverToolName: 'toolC' }));
|
|
528
|
-
});
|
|
529
|
-
});
|
|
530
374
|
});
|
|
531
|
-
describe('
|
|
375
|
+
describe('sanatizeParameters', () => {
|
|
532
376
|
it('should do nothing for an undefined schema', () => {
|
|
533
377
|
const schema = undefined;
|
|
534
|
-
|
|
378
|
+
sanatizeParameters(schema);
|
|
535
379
|
});
|
|
536
380
|
it('should remove default when anyOf is present', () => {
|
|
537
381
|
const schema = {
|
|
538
382
|
anyOf: [{ type: Type.STRING }, { type: Type.NUMBER }],
|
|
539
383
|
default: 'hello',
|
|
540
384
|
};
|
|
541
|
-
|
|
385
|
+
sanatizeParameters(schema);
|
|
542
386
|
expect(schema.default).toBeUndefined();
|
|
543
387
|
});
|
|
544
|
-
it('should recursively
|
|
388
|
+
it('should recursively sanatize items in anyOf', () => {
|
|
545
389
|
const schema = {
|
|
546
390
|
anyOf: [
|
|
547
391
|
{
|
|
@@ -551,20 +395,20 @@ describe('sanitizeParameters', () => {
|
|
|
551
395
|
{ type: Type.NUMBER },
|
|
552
396
|
],
|
|
553
397
|
};
|
|
554
|
-
|
|
398
|
+
sanatizeParameters(schema);
|
|
555
399
|
expect(schema.anyOf[0].default).toBeUndefined();
|
|
556
400
|
});
|
|
557
|
-
it('should recursively
|
|
401
|
+
it('should recursively sanatize items in items', () => {
|
|
558
402
|
const schema = {
|
|
559
403
|
items: {
|
|
560
404
|
anyOf: [{ type: Type.STRING }],
|
|
561
405
|
default: 'world',
|
|
562
406
|
},
|
|
563
407
|
};
|
|
564
|
-
|
|
408
|
+
sanatizeParameters(schema);
|
|
565
409
|
expect(schema.items.default).toBeUndefined();
|
|
566
410
|
});
|
|
567
|
-
it('should recursively
|
|
411
|
+
it('should recursively sanatize items in properties', () => {
|
|
568
412
|
const schema = {
|
|
569
413
|
properties: {
|
|
570
414
|
prop1: {
|
|
@@ -573,7 +417,7 @@ describe('sanitizeParameters', () => {
|
|
|
573
417
|
},
|
|
574
418
|
},
|
|
575
419
|
};
|
|
576
|
-
|
|
420
|
+
sanatizeParameters(schema);
|
|
577
421
|
expect(schema.properties.prop1.default).toBeUndefined();
|
|
578
422
|
});
|
|
579
423
|
it('should handle complex nested schemas', () => {
|
|
@@ -599,7 +443,7 @@ describe('sanitizeParameters', () => {
|
|
|
599
443
|
},
|
|
600
444
|
},
|
|
601
445
|
};
|
|
602
|
-
|
|
446
|
+
sanatizeParameters(schema);
|
|
603
447
|
expect(schema.properties.prop1.items.default).toBeUndefined();
|
|
604
448
|
const nestedProp = schema.properties.prop2.anyOf[0].properties.nestedProp;
|
|
605
449
|
expect(nestedProp?.default).toBeUndefined();
|
|
@@ -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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"}
|
|
@@ -3,11 +3,11 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { openDiff } from '../utils/editor.js';
|
|
7
6
|
import os from 'os';
|
|
8
7
|
import path from 'path';
|
|
9
8
|
import fs from 'fs';
|
|
10
9
|
import * as Diff from 'diff';
|
|
10
|
+
import { openDiff } from '../utils/editor.js';
|
|
11
11
|
import { DEFAULT_DIFF_OPTIONS } from './diffOptions.js';
|
|
12
12
|
import { isNodeError } from '../utils/errors.js';
|
|
13
13
|
export function isModifiableTool(tool) {
|
|
@@ -19,11 +19,10 @@ function createTempFilesForModify(currentContent, proposedContent, file_path) {
|
|
|
19
19
|
if (!fs.existsSync(diffDir)) {
|
|
20
20
|
fs.mkdirSync(diffDir, { recursive: true });
|
|
21
21
|
}
|
|
22
|
-
const
|
|
23
|
-
const fileName = path.basename(file_path, ext);
|
|
22
|
+
const fileName = path.basename(file_path);
|
|
24
23
|
const timestamp = Date.now();
|
|
25
|
-
const tempOldPath = path.join(diffDir, `gemini-cli-modify-${fileName}-old-${timestamp}
|
|
26
|
-
const tempNewPath = path.join(diffDir, `gemini-cli-modify-${fileName}-new-${timestamp}
|
|
24
|
+
const tempOldPath = path.join(diffDir, `gemini-cli-modify-${fileName}-old-${timestamp}`);
|
|
25
|
+
const tempNewPath = path.join(diffDir, `gemini-cli-modify-${fileName}-new-${timestamp}`);
|
|
27
26
|
fs.writeFileSync(tempOldPath, currentContent, 'utf8');
|
|
28
27
|
fs.writeFileSync(tempNewPath, proposedContent, 'utf8');
|
|
29
28
|
return { oldPath: tempOldPath, newPath: tempNewPath };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modifiable-tool.js","sourceRoot":"","sources":["../../../src/tools/modifiable-tool.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"modifiable-tool.js","sourceRoot":"","sources":["../../../src/tools/modifiable-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -159,7 +159,7 @@ describe('modifyWithEditor', () => {
|
|
|
159
159
|
expect(consoleErrorSpy).toHaveBeenCalledWith(expect.stringContaining('Error deleting temp diff file:'));
|
|
160
160
|
consoleErrorSpy.mockRestore();
|
|
161
161
|
});
|
|
162
|
-
it('should create temp files with correct naming
|
|
162
|
+
it('should create temp files with correct naming', async () => {
|
|
163
163
|
const testFilePath = path.join(tempDir, 'subfolder', 'test-file.txt');
|
|
164
164
|
mockModifyContext.getFilePath = vi.fn().mockReturnValue(testFilePath);
|
|
165
165
|
await modifyWithEditor(mockParams, mockModifyContext, 'vscode', abortSignal);
|
|
@@ -167,21 +167,8 @@ describe('modifyWithEditor', () => {
|
|
|
167
167
|
expect(writeFileCalls).toHaveLength(2);
|
|
168
168
|
const oldFilePath = writeFileCalls[0][0];
|
|
169
169
|
const newFilePath = writeFileCalls[1][0];
|
|
170
|
-
expect(oldFilePath).toMatch(/gemini-cli-modify-test-file-old-\d
|
|
171
|
-
expect(newFilePath).toMatch(/gemini-cli-modify-test-file-new-\d
|
|
172
|
-
expect(oldFilePath).toContain(`${tempDir}/gemini-cli-tool-modify-diffs/`);
|
|
173
|
-
expect(newFilePath).toContain(`${tempDir}/gemini-cli-tool-modify-diffs/`);
|
|
174
|
-
});
|
|
175
|
-
it('should create temp files with correct naming without extension', async () => {
|
|
176
|
-
const testFilePath = path.join(tempDir, 'subfolder', 'test-file');
|
|
177
|
-
mockModifyContext.getFilePath = vi.fn().mockReturnValue(testFilePath);
|
|
178
|
-
await modifyWithEditor(mockParams, mockModifyContext, 'vscode', abortSignal);
|
|
179
|
-
const writeFileCalls = fs.writeFileSync.mock.calls;
|
|
180
|
-
expect(writeFileCalls).toHaveLength(2);
|
|
181
|
-
const oldFilePath = writeFileCalls[0][0];
|
|
182
|
-
const newFilePath = writeFileCalls[1][0];
|
|
183
|
-
expect(oldFilePath).toMatch(/gemini-cli-modify-test-file-old-\d+$/);
|
|
184
|
-
expect(newFilePath).toMatch(/gemini-cli-modify-test-file-new-\d+$/);
|
|
170
|
+
expect(oldFilePath).toMatch(/gemini-cli-modify-test-file\.txt-old-\d+$/);
|
|
171
|
+
expect(newFilePath).toMatch(/gemini-cli-modify-test-file\.txt-new-\d+$/);
|
|
185
172
|
expect(oldFilePath).toContain(`${tempDir}/gemini-cli-tool-modify-diffs/`);
|
|
186
173
|
expect(newFilePath).toContain(`${tempDir}/gemini-cli-tool-modify-diffs/`);
|
|
187
174
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modifiable-tool.test.js","sourceRoot":"","sources":["../../../src/tools/modifiable-tool.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,EAAE,EACF,QAAQ,EACR,EAAE,EACF,MAAM,EACN,UAAU,EACV,SAAS,GAEV,MAAM,QAAQ,CAAC;AAChB,OAAO,EACL,gBAAgB,EAGhB,gBAAgB,GACjB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,oBAAoB;AACpB,MAAM,YAAY,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAC/C,MAAM,eAAe,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAElD,EAAE,CAAC,IAAI,CAAC,oBAAoB,EAAE,GAAG,EAAE,CAAC,CAAC;IACnC,QAAQ,EAAE,YAAY;CACvB,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IACrB,WAAW,EAAE,eAAe;CAC7B,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACd,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAQd,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,IAAI,OAAe,CAAC;IACpB,IAAI,iBAA4C,CAAC;IACjD,IAAI,UAAsB,CAAC;IAC3B,IAAI,cAAsB,CAAC;IAC3B,IAAI,eAAuB,CAAC;IAC5B,IAAI,eAAuB,CAAC;IAC5B,IAAI,WAAwB,CAAC;IAE7B,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;QAEnB,OAAO,GAAG,eAAe,CAAC;QAC1B,WAAW,GAAG,IAAI,eAAe,EAAE,CAAC,MAAM,CAAC;QAE3C,cAAc,GAAG,kCAAkC,CAAC;QACpD,eAAe,GAAG,kCAAkC,CAAC;QACrD,eAAe,GAAG,iDAAiD,CAAC;QACpE,UAAU,GAAG;YACX,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC;YACxC,cAAc,EAAE,OAAO;SACxB,CAAC;QAEF,iBAAiB,GAAG;YAClB,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,UAAU,CAAC,QAAQ,CAAC;YACzD,iBAAiB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,cAAc,CAAC;YAC5D,kBAAkB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC;YAC9D,mBAAmB,EAAE,EAAE;iBACpB,EAAE,EAAE;iBACJ,kBAAkB,CAAC,CAAC,UAAU,EAAE,eAAe,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC;gBACpE,GAAG,cAAc;gBACjB,eAAe;gBACf,UAAU;aACX,CAAC,CAAC;SACN,CAAC;QAED,EAAE,CAAC,MAAe,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAE5C,EAAE,CAAC,UAAmB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAC7C,EAAE,CAAC,SAAkB,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QAC1D,EAAE,CAAC,aAAsB,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACvD,EAAE,CAAC,UAAmB,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAEpD,EAAE,CAAC,YAAqB,CAAC,kBAAkB,CAAC,CAAC,QAAgB,EAAE,EAAE;YAChE,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC/B,OAAO,eAAe,CAAC;YACzB,CAAC;YACD,OAAO,cAAc,CAAC;QACxB,CAAC,CAAC,CAAC;QAEH,eAAe,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC;QACrD,YAAY,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACvC,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;YACrE,MAAM,MAAM,GAAG,MAAM,gBAAgB,CACnC,UAAU,EACV,iBAAiB,EACjB,QAAsB,EACtB,WAAW,CACZ,CAAC;YAEF,MAAM,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC,oBAAoB,CAC9D,UAAU,CACX,CAAC;YACF,MAAM,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC,oBAAoB,CAC/D,UAAU,CACX,CAAC;YACF,MAAM,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;YAEvE,MAAM,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YAClD,MAAM,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,uBAAuB,CAC9C,CAAC,EACD,MAAM,CAAC,gBAAgB,CACrB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,8BAA8B,CAAC,CACnD,EACD,cAAc,EACd,MAAM,CACP,CAAC;YACF,MAAM,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,uBAAuB,CAC9C,CAAC,EACD,MAAM,CAAC,gBAAgB,CACrB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,8BAA8B,CAAC,CACnD,EACD,eAAe,EACf,MAAM,CACP,CAAC;YAEF,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CACvC,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAChC,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAChC,QAAQ,CACT,CAAC;YAEF,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAC1C,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAChC,MAAM,CACP,CAAC;YACF,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAC1C,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAChC,MAAM,CACP,CAAC;YAEF,MAAM,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,CAAC,oBAAoB,CAChE,cAAc,EACd,eAAe,EACf,UAAU,CACX,CAAC;YAEF,MAAM,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAC1C,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,EAClC,cAAc,EACd,eAAe,EACf,SAAS,EACT,UAAU,EACV,MAAM,CAAC,gBAAgB,CAAC;gBACtB,OAAO,EAAE,CAAC;gBACV,gBAAgB,EAAE,IAAI;aACvB,CAAC,CACH,CAAC;YAEF,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YAC/C,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,uBAAuB,CAC3C,CAAC,EACD,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,CACjC,CAAC;YACF,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,uBAAuB,CAC3C,CAAC,EACD,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,CACjC,CAAC;YAEF,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;gBACrB,aAAa,EAAE;oBACb,GAAG,UAAU;oBACb,eAAe;oBACf,UAAU,EAAE,cAAc;iBAC3B;gBACD,WAAW,EAAE,mBAAmB;aACjC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;YAChE,EAAE,CAAC,UAAmB,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YAE/C,MAAM,gBAAgB,CACpB,UAAU,EACV,iBAAiB,EACjB,QAAsB,EACtB,WAAW,CACZ,CAAC;YAEF,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,oBAAoB,CACvC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,8BAA8B,CAAC,EAClD,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;YACpE,EAAE,CAAC,UAAmB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YAE9C,MAAM,gBAAgB,CACpB,UAAU,EACV,iBAAiB,EACjB,QAAsB,EACtB,WAAW,CACZ,CAAC;YAEF,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAC9C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAC7D,EAAE,CAAC,YAAqB,CAAC,kBAAkB,CAAC,CAAC,QAAgB,EAAE,EAAE;YAChE,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC/B,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;gBAC5D,KAA+B,CAAC,IAAI,GAAG,QAAQ,CAAC;gBACjD,MAAM,KAAK,CAAC;YACd,CAAC;YACD,OAAO,eAAe,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,gBAAgB,CACnC,UAAU,EACV,iBAAiB,EACjB,QAAsB,EACtB,WAAW,CACZ,CAAC;QAEF,MAAM,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAC1C,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,EAClC,EAAE,EACF,eAAe,EACf,SAAS,EACT,UAAU,EACV,MAAM,CAAC,gBAAgB,CAAC;YACtB,OAAO,EAAE,CAAC;YACV,gBAAgB,EAAE,IAAI;SACvB,CAAC,CACH,CAAC;QAEF,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAC7D,EAAE,CAAC,YAAqB,CAAC,kBAAkB,CAAC,CAAC,QAAgB,EAAE,EAAE;YAChE,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC/B,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;gBAC5D,KAA+B,CAAC,IAAI,GAAG,QAAQ,CAAC;gBACjD,MAAM,KAAK,CAAC;YACd,CAAC;YACD,OAAO,cAAc,CAAC;QACxB,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,gBAAgB,CACnC,UAAU,EACV,iBAAiB,EACjB,QAAsB,EACtB,WAAW,CACZ,CAAC;QAEF,MAAM,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAC1C,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,EAClC,cAAc,EACd,EAAE,EACF,SAAS,EACT,UAAU,EACV,MAAM,CAAC,gBAAgB,CAAC;YACtB,OAAO,EAAE,CAAC;YACV,gBAAgB,EAAE,IAAI;SACvB,CAAC,CACH,CAAC;QAEF,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;QAC/D,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QACvD,YAAY,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAE5C,MAAM,MAAM,CACV,gBAAgB,CACd,UAAU,EACV,iBAAiB,EACjB,QAAsB,EACtB,WAAW,CACZ,CACF,CAAC,OAAO,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;QAE3C,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;QACjE,MAAM,eAAe,GAAG,EAAE;aACvB,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC;aACvB,kBAAkB,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC/B,EAAE,CAAC,UAAmB,CAAC,kBAAkB,CAAC,CAAC,SAAiB,EAAE,EAAE;YAC/D,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,MAAM,gBAAgB,CACpB,UAAU,EACV,iBAAiB,EACjB,QAAsB,EACtB,WAAW,CACZ,CAAC;QAEF,MAAM,CAAC,eAAe,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACjD,MAAM,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAC1C,MAAM,CAAC,gBAAgB,CAAC,gCAAgC,CAAC,CAC1D,CAAC;QAEF,eAAe,CAAC,WAAW,EAAE,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"modifiable-tool.test.js","sourceRoot":"","sources":["../../../src/tools/modifiable-tool.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,8 @@ import path from 'path';
|
|
|
7
7
|
import { SchemaValidator } from '../utils/schemaValidator.js';
|
|
8
8
|
import { makeRelative, shortenPath } from '../utils/paths.js';
|
|
9
9
|
import { BaseTool } from './tools.js';
|
|
10
|
-
import { isWithinRoot, processSingleFileContent
|
|
10
|
+
import { isWithinRoot, processSingleFileContent } from '../utils/fileUtils.js';
|
|
11
|
+
import { getSpecificMimeType } from '../utils/fileUtils.js';
|
|
11
12
|
import { recordFileOperationMetric, FileOperation, } from '../telemetry/metrics.js';
|
|
12
13
|
/**
|
|
13
14
|
* Implementation of the ReadFile tool logic
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-file.js","sourceRoot":"","sources":["../../../src/tools/read-file.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAc,MAAM,YAAY,CAAC;AAClD,OAAO,
|
|
1
|
+
{"version":3,"file":"read-file.js","sourceRoot":"","sources":["../../../src/tools/read-file.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ import { recordFileOperationMetric, FileOperation, } from '../telemetry/metrics.
|
|
|
14
14
|
/**
|
|
15
15
|
* Default exclusion patterns for commonly ignored directories and binary file types.
|
|
16
16
|
* These are compatible with glob ignore patterns.
|
|
17
|
-
* TODO(adh): Consider making this configurable or extendable through a command line
|
|
17
|
+
* TODO(adh): Consider making this configurable or extendable through a command line arguement.
|
|
18
18
|
* TODO(adh): Look into sharing this list with the glob tool.
|
|
19
19
|
*/
|
|
20
20
|
const DEFAULT_EXCLUDES = [
|
|
@@ -3,39 +3,14 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { vi
|
|
6
|
+
import { vi } from 'vitest';
|
|
7
|
+
import { describe, it, expect, beforeEach, afterEach } from 'vitest';
|
|
7
8
|
import { mockControl } from '../__mocks__/fs/promises.js';
|
|
8
9
|
import { ReadManyFilesTool } from './read-many-files.js';
|
|
9
10
|
import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
|
|
10
11
|
import path from 'path';
|
|
11
12
|
import fs from 'fs'; // Actual fs for setup
|
|
12
13
|
import os from 'os';
|
|
13
|
-
vi.mock('mime-types', () => {
|
|
14
|
-
const lookup = (filename) => {
|
|
15
|
-
if (filename.endsWith('.ts') || filename.endsWith('.js')) {
|
|
16
|
-
return 'text/plain';
|
|
17
|
-
}
|
|
18
|
-
if (filename.endsWith('.png')) {
|
|
19
|
-
return 'image/png';
|
|
20
|
-
}
|
|
21
|
-
if (filename.endsWith('.pdf')) {
|
|
22
|
-
return 'application/pdf';
|
|
23
|
-
}
|
|
24
|
-
if (filename.endsWith('.mp3') || filename.endsWith('.wav')) {
|
|
25
|
-
return 'audio/mpeg';
|
|
26
|
-
}
|
|
27
|
-
if (filename.endsWith('.mp4') || filename.endsWith('.mov')) {
|
|
28
|
-
return 'video/mp4';
|
|
29
|
-
}
|
|
30
|
-
return false;
|
|
31
|
-
};
|
|
32
|
-
return {
|
|
33
|
-
default: {
|
|
34
|
-
lookup,
|
|
35
|
-
},
|
|
36
|
-
lookup,
|
|
37
|
-
};
|
|
38
|
-
});
|
|
39
14
|
describe('ReadManyFilesTool', () => {
|
|
40
15
|
let tool;
|
|
41
16
|
let tempRootDir;
|