@google/gemini-cli-core 0.1.14 → 0.1.15-nightly.250801.6f7beb41
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/README.md +28 -0
- package/dist/google-gemini-cli-core-0.1.15.tgz +0 -0
- package/dist/src/code_assist/oauth2.test.js +14 -14
- package/dist/src/code_assist/oauth2.test.js.map +1 -1
- package/dist/src/config/config.d.ts +22 -7
- package/dist/src/config/config.js +43 -13
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +33 -0
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/flashFallback.test.js +23 -47
- package/dist/src/config/flashFallback.test.js.map +1 -1
- package/dist/src/config/models.d.ts +1 -0
- package/dist/src/config/models.js +1 -0
- package/dist/src/config/models.js.map +1 -1
- package/dist/src/core/client.d.ts +2 -0
- package/dist/src/core/client.js +61 -20
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +162 -16
- package/dist/src/core/client.test.js.map +1 -1
- package/dist/src/core/coreToolScheduler.d.ts +1 -3
- package/dist/src/core/coreToolScheduler.js +1 -3
- package/dist/src/core/coreToolScheduler.js.map +1 -1
- package/dist/src/core/coreToolScheduler.test.js +76 -1
- package/dist/src/core/coreToolScheduler.test.js.map +1 -1
- package/dist/src/core/geminiChat.js +1 -0
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/logger.d.ts +1 -0
- package/dist/src/core/logger.js +22 -8
- package/dist/src/core/logger.js.map +1 -1
- package/dist/src/core/logger.test.js +60 -9
- package/dist/src/core/logger.test.js.map +1 -1
- package/dist/src/core/prompts.js +1 -1
- package/dist/src/core/tokenLimits.js +1 -0
- package/dist/src/core/tokenLimits.js.map +1 -1
- package/dist/src/core/turn.d.ts +1 -0
- package/dist/src/core/turn.js +3 -0
- package/dist/src/core/turn.js.map +1 -1
- package/dist/src/ide/detect-ide.d.ts +10 -0
- package/dist/src/ide/detect-ide.js +24 -0
- package/dist/src/ide/detect-ide.js.map +1 -0
- package/dist/src/ide/ide-client.d.ts +19 -7
- package/dist/src/ide/ide-client.js +110 -37
- package/dist/src/ide/ide-client.js.map +1 -1
- package/dist/src/ide/ide-installer.d.ts +15 -0
- package/dist/src/ide/ide-installer.js +111 -0
- package/dist/src/ide/ide-installer.js.map +1 -0
- package/dist/src/ide/ide-installer.test.d.ts +6 -0
- package/dist/src/ide/ide-installer.test.js +78 -0
- package/dist/src/ide/ide-installer.test.js.map +1 -0
- package/dist/src/ide/ideContext.d.ts +212 -107
- package/dist/src/ide/ideContext.js +45 -44
- package/dist/src/ide/ideContext.js.map +1 -1
- package/dist/src/ide/ideContext.test.js +254 -100
- package/dist/src/ide/ideContext.test.js.map +1 -1
- package/dist/src/index.d.ts +8 -0
- package/dist/src/index.js +10 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/mcp/oauth-provider.d.ts +5 -1
- package/dist/src/mcp/oauth-provider.js +36 -11
- package/dist/src/mcp/oauth-provider.js.map +1 -1
- package/dist/src/mcp/oauth-provider.test.js +2 -2
- package/dist/src/mcp/oauth-provider.test.js.map +1 -1
- package/dist/src/mcp/oauth-token-storage.d.ts +3 -1
- package/dist/src/mcp/oauth-token-storage.js +3 -1
- package/dist/src/mcp/oauth-token-storage.js.map +1 -1
- package/dist/src/mcp/oauth-utils.js +2 -2
- package/dist/src/mcp/oauth-utils.js.map +1 -1
- package/dist/src/mcp/oauth-utils.test.js +1 -1
- package/dist/src/mcp/oauth-utils.test.js.map +1 -1
- package/dist/src/prompts/mcp-prompts.d.ts +8 -0
- package/dist/src/prompts/mcp-prompts.js +13 -0
- package/dist/src/prompts/mcp-prompts.js.map +1 -0
- package/dist/src/prompts/prompt-registry.d.ts +26 -0
- package/dist/src/prompts/prompt-registry.js +47 -0
- package/dist/src/prompts/prompt-registry.js.map +1 -0
- package/dist/src/services/fileDiscoveryService.test.js +101 -60
- package/dist/src/services/fileDiscoveryService.test.js.map +1 -1
- package/dist/src/services/gitService.test.js +67 -86
- package/dist/src/services/gitService.test.js.map +1 -1
- package/dist/src/services/loopDetectionService.d.ts +3 -0
- package/dist/src/services/loopDetectionService.js +18 -0
- package/dist/src/services/loopDetectionService.js.map +1 -1
- package/dist/src/services/loopDetectionService.test.js +90 -11
- package/dist/src/services/loopDetectionService.test.js.map +1 -1
- package/dist/src/services/shellExecutionService.d.ts +70 -0
- package/dist/src/services/shellExecutionService.js +152 -0
- package/dist/src/services/shellExecutionService.js.map +1 -0
- package/dist/src/services/shellExecutionService.test.d.ts +6 -0
- package/dist/src/services/shellExecutionService.test.js +258 -0
- package/dist/src/services/shellExecutionService.test.js.map +1 -0
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.d.ts +3 -2
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +69 -34
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.d.ts +5 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js +14 -0
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js.map +1 -1
- package/dist/src/telemetry/constants.d.ts +2 -1
- package/dist/src/telemetry/constants.js +2 -1
- package/dist/src/telemetry/constants.js.map +1 -1
- package/dist/src/telemetry/index.d.ts +2 -2
- package/dist/src/telemetry/index.js +2 -2
- package/dist/src/telemetry/index.js.map +1 -1
- package/dist/src/telemetry/loggers.d.ts +3 -2
- package/dist/src/telemetry/loggers.js +21 -5
- package/dist/src/telemetry/loggers.js.map +1 -1
- package/dist/src/telemetry/telemetry.test.js +2 -0
- package/dist/src/telemetry/telemetry.test.js.map +1 -1
- package/dist/src/telemetry/types.d.ts +13 -4
- package/dist/src/telemetry/types.js +19 -3
- package/dist/src/telemetry/types.js.map +1 -1
- package/dist/src/test-utils/mockWorkspaceContext.d.ts +13 -0
- package/dist/src/test-utils/mockWorkspaceContext.js +24 -0
- package/dist/src/test-utils/mockWorkspaceContext.js.map +1 -0
- package/dist/src/tools/edit.js +4 -3
- package/dist/src/tools/edit.js.map +1 -1
- package/dist/src/tools/edit.test.js +25 -1
- package/dist/src/tools/edit.test.js.map +1 -1
- package/dist/src/tools/glob.js +53 -17
- package/dist/src/tools/glob.js.map +1 -1
- package/dist/src/tools/glob.test.js +32 -6
- 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 +81 -29
- package/dist/src/tools/grep.js.map +1 -1
- package/dist/src/tools/grep.test.js +76 -9
- package/dist/src/tools/grep.test.js.map +1 -1
- package/dist/src/tools/ls.js +4 -3
- package/dist/src/tools/ls.js.map +1 -1
- package/dist/src/tools/ls.test.d.ts +6 -0
- package/dist/src/tools/ls.test.js +356 -0
- package/dist/src/tools/ls.test.js.map +1 -0
- package/dist/src/tools/mcp-client.d.ts +26 -2
- package/dist/src/tools/mcp-client.js +72 -24
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/mcp-client.test.js +87 -1
- package/dist/src/tools/mcp-client.test.js.map +1 -1
- package/dist/src/tools/memoryTool.d.ts +17 -2
- package/dist/src/tools/memoryTool.js +130 -13
- package/dist/src/tools/memoryTool.js.map +1 -1
- package/dist/src/tools/memoryTool.test.js +88 -3
- package/dist/src/tools/memoryTool.test.js.map +1 -1
- package/dist/src/tools/modifiable-tool.test.js +51 -62
- package/dist/src/tools/modifiable-tool.test.js.map +1 -1
- package/dist/src/tools/read-file.js +8 -6
- package/dist/src/tools/read-file.js.map +1 -1
- package/dist/src/tools/read-file.test.js +30 -2
- package/dist/src/tools/read-file.test.js.map +1 -1
- package/dist/src/tools/read-many-files.js +22 -12
- package/dist/src/tools/read-many-files.js.map +1 -1
- package/dist/src/tools/read-many-files.test.js +35 -2
- package/dist/src/tools/read-many-files.test.js.map +1 -1
- package/dist/src/tools/shell.d.ts +1 -0
- package/dist/src/tools/shell.js +145 -185
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/shell.test.js +275 -95
- package/dist/src/tools/shell.test.js.map +1 -1
- package/dist/src/tools/tool-registry.js +3 -3
- package/dist/src/tools/tool-registry.js.map +1 -1
- package/dist/src/tools/tool-registry.test.js +10 -2
- package/dist/src/tools/tool-registry.test.js.map +1 -1
- package/dist/src/tools/write-file.js +5 -3
- package/dist/src/tools/write-file.js.map +1 -1
- package/dist/src/tools/write-file.test.js +36 -2
- package/dist/src/tools/write-file.test.js.map +1 -1
- package/dist/src/utils/bfsFileSearch.js +51 -27
- package/dist/src/utils/bfsFileSearch.js.map +1 -1
- package/dist/src/utils/bfsFileSearch.test.js +57 -0
- package/dist/src/utils/bfsFileSearch.test.js.map +1 -1
- package/dist/src/utils/editor.d.ts +1 -1
- package/dist/src/utils/editor.js +9 -0
- package/dist/src/utils/editor.js.map +1 -1
- package/dist/src/utils/editor.test.js +21 -1
- package/dist/src/utils/editor.test.js.map +1 -1
- package/dist/src/utils/fileUtils.js +12 -1
- package/dist/src/utils/fileUtils.js.map +1 -1
- package/dist/src/utils/fileUtils.test.js +29 -1
- package/dist/src/utils/fileUtils.test.js.map +1 -1
- package/dist/src/utils/flashFallback.integration.test.js +8 -0
- package/dist/src/utils/flashFallback.integration.test.js.map +1 -1
- package/dist/src/utils/formatters.d.ts +6 -0
- package/dist/src/utils/formatters.js +16 -0
- package/dist/src/utils/formatters.js.map +1 -0
- package/dist/src/utils/memoryDiscovery.d.ts +1 -1
- package/dist/src/utils/memoryDiscovery.js +8 -8
- package/dist/src/utils/memoryDiscovery.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.test.js +4 -3
- package/dist/src/utils/memoryDiscovery.test.js.map +1 -1
- package/dist/src/utils/memoryImportProcessor.d.ts +19 -12
- package/dist/src/utils/memoryImportProcessor.js +241 -82
- package/dist/src/utils/memoryImportProcessor.js.map +1 -1
- package/dist/src/utils/memoryImportProcessor.test.js +595 -50
- package/dist/src/utils/memoryImportProcessor.test.js.map +1 -1
- package/dist/src/utils/nextSpeakerChecker.js +2 -2
- package/dist/src/utils/nextSpeakerChecker.js.map +1 -1
- package/dist/src/utils/nextSpeakerChecker.test.js +2 -2
- package/dist/src/utils/nextSpeakerChecker.test.js.map +1 -1
- package/dist/src/utils/retry.d.ts +3 -0
- package/dist/src/utils/retry.js.map +1 -1
- package/dist/src/utils/retry.test.js.map +1 -1
- package/dist/src/utils/shell-utils.d.ts +37 -3
- package/dist/src/utils/shell-utils.js +110 -47
- package/dist/src/utils/shell-utils.js.map +1 -1
- package/dist/src/utils/shell-utils.test.js +146 -396
- package/dist/src/utils/shell-utils.test.js.map +1 -1
- package/dist/src/utils/textUtils.d.ts +13 -0
- package/dist/src/utils/textUtils.js +28 -0
- package/dist/src/utils/textUtils.js.map +1 -0
- package/dist/src/utils/workspaceContext.d.ts +47 -0
- package/dist/src/utils/workspaceContext.js +106 -0
- package/dist/src/utils/workspaceContext.js.map +1 -0
- package/dist/src/utils/workspaceContext.test.d.ts +6 -0
- package/dist/src/utils/workspaceContext.test.js +209 -0
- package/dist/src/utils/workspaceContext.test.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -1
- package/dist/google-gemini-cli-core-0.1.13.tgz +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memoryTool.js","sourceRoot":"","sources":["../../../src/tools/memoryTool.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"memoryTool.js","sourceRoot":"","sources":["../../../src/tools/memoryTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ import { MemoryTool, setGeminiMdFilename, getCurrentGeminiMdFilename, getAllGemi
|
|
|
8
8
|
import * as fs from 'fs/promises';
|
|
9
9
|
import * as path from 'path';
|
|
10
10
|
import * as os from 'os';
|
|
11
|
+
import { ToolConfirmationOutcome } from './tools.js';
|
|
11
12
|
// Mock dependencies
|
|
12
13
|
vi.mock('fs/promises');
|
|
13
14
|
vi.mock('os');
|
|
@@ -20,7 +21,7 @@ describe('MemoryTool', () => {
|
|
|
20
21
|
mkdir: vi.fn(),
|
|
21
22
|
};
|
|
22
23
|
beforeEach(() => {
|
|
23
|
-
vi.mocked(os.homedir).mockReturnValue('/mock
|
|
24
|
+
vi.mocked(os.homedir).mockReturnValue(path.join('/mock', 'home'));
|
|
24
25
|
mockFsAdapter.readFile.mockReset();
|
|
25
26
|
mockFsAdapter.writeFile.mockReset().mockResolvedValue(undefined);
|
|
26
27
|
mockFsAdapter.mkdir
|
|
@@ -53,7 +54,10 @@ describe('MemoryTool', () => {
|
|
|
53
54
|
});
|
|
54
55
|
});
|
|
55
56
|
describe('performAddMemoryEntry (static method)', () => {
|
|
56
|
-
|
|
57
|
+
let testFilePath;
|
|
58
|
+
beforeEach(() => {
|
|
59
|
+
testFilePath = path.join(os.homedir(), '.gemini', DEFAULT_CONTEXT_FILENAME);
|
|
60
|
+
});
|
|
57
61
|
it('should create section and save a fact if file does not exist', async () => {
|
|
58
62
|
mockFsAdapter.readFile.mockRejectedValue({ code: 'ENOENT' }); // Simulate file not found
|
|
59
63
|
const fact = 'The sky is blue';
|
|
@@ -145,7 +149,7 @@ describe('MemoryTool', () => {
|
|
|
145
149
|
const params = { fact: 'The sky is blue' };
|
|
146
150
|
const result = await memoryTool.execute(params, mockAbortSignal);
|
|
147
151
|
// Use getCurrentGeminiMdFilename for the default expectation before any setGeminiMdFilename calls in a test
|
|
148
|
-
const expectedFilePath = path.join(
|
|
152
|
+
const expectedFilePath = path.join(os.homedir(), '.gemini', getCurrentGeminiMdFilename());
|
|
149
153
|
// For this test, we expect the actual fs methods to be passed
|
|
150
154
|
const expectedFsArgument = {
|
|
151
155
|
readFile: fs.readFile,
|
|
@@ -177,5 +181,86 @@ describe('MemoryTool', () => {
|
|
|
177
181
|
expect(result.returnDisplay).toBe(`Error saving memory: ${underlyingError.message}`);
|
|
178
182
|
});
|
|
179
183
|
});
|
|
184
|
+
describe('shouldConfirmExecute', () => {
|
|
185
|
+
let memoryTool;
|
|
186
|
+
beforeEach(() => {
|
|
187
|
+
memoryTool = new MemoryTool();
|
|
188
|
+
// Clear the allowlist before each test
|
|
189
|
+
MemoryTool.allowlist.clear();
|
|
190
|
+
// Mock fs.readFile to return empty string (file doesn't exist)
|
|
191
|
+
vi.mocked(fs.readFile).mockResolvedValue('');
|
|
192
|
+
});
|
|
193
|
+
it('should return confirmation details when memory file is not allowlisted', async () => {
|
|
194
|
+
const params = { fact: 'Test fact' };
|
|
195
|
+
const result = await memoryTool.shouldConfirmExecute(params, mockAbortSignal);
|
|
196
|
+
expect(result).toBeDefined();
|
|
197
|
+
expect(result).not.toBe(false);
|
|
198
|
+
if (result && result.type === 'edit') {
|
|
199
|
+
const expectedPath = path.join('~', '.gemini', 'GEMINI.md');
|
|
200
|
+
expect(result.title).toBe(`Confirm Memory Save: ${expectedPath}`);
|
|
201
|
+
expect(result.fileName).toContain(path.join('mock', 'home', '.gemini'));
|
|
202
|
+
expect(result.fileName).toContain('GEMINI.md');
|
|
203
|
+
expect(result.fileDiff).toContain('Index: GEMINI.md');
|
|
204
|
+
expect(result.fileDiff).toContain('+## Gemini Added Memories');
|
|
205
|
+
expect(result.fileDiff).toContain('+- Test fact');
|
|
206
|
+
expect(result.originalContent).toBe('');
|
|
207
|
+
expect(result.newContent).toContain('## Gemini Added Memories');
|
|
208
|
+
expect(result.newContent).toContain('- Test fact');
|
|
209
|
+
}
|
|
210
|
+
});
|
|
211
|
+
it('should return false when memory file is already allowlisted', async () => {
|
|
212
|
+
const params = { fact: 'Test fact' };
|
|
213
|
+
const memoryFilePath = path.join(os.homedir(), '.gemini', getCurrentGeminiMdFilename());
|
|
214
|
+
// Add the memory file to the allowlist
|
|
215
|
+
MemoryTool.allowlist.add(memoryFilePath);
|
|
216
|
+
const result = await memoryTool.shouldConfirmExecute(params, mockAbortSignal);
|
|
217
|
+
expect(result).toBe(false);
|
|
218
|
+
});
|
|
219
|
+
it('should add memory file to allowlist when ProceedAlways is confirmed', async () => {
|
|
220
|
+
const params = { fact: 'Test fact' };
|
|
221
|
+
const memoryFilePath = path.join(os.homedir(), '.gemini', getCurrentGeminiMdFilename());
|
|
222
|
+
const result = await memoryTool.shouldConfirmExecute(params, mockAbortSignal);
|
|
223
|
+
expect(result).toBeDefined();
|
|
224
|
+
expect(result).not.toBe(false);
|
|
225
|
+
if (result && result.type === 'edit') {
|
|
226
|
+
// Simulate the onConfirm callback
|
|
227
|
+
await result.onConfirm(ToolConfirmationOutcome.ProceedAlways);
|
|
228
|
+
// Check that the memory file was added to the allowlist
|
|
229
|
+
expect(MemoryTool.allowlist.has(memoryFilePath)).toBe(true);
|
|
230
|
+
}
|
|
231
|
+
});
|
|
232
|
+
it('should not add memory file to allowlist when other outcomes are confirmed', async () => {
|
|
233
|
+
const params = { fact: 'Test fact' };
|
|
234
|
+
const memoryFilePath = path.join(os.homedir(), '.gemini', getCurrentGeminiMdFilename());
|
|
235
|
+
const result = await memoryTool.shouldConfirmExecute(params, mockAbortSignal);
|
|
236
|
+
expect(result).toBeDefined();
|
|
237
|
+
expect(result).not.toBe(false);
|
|
238
|
+
if (result && result.type === 'edit') {
|
|
239
|
+
// Simulate the onConfirm callback with different outcomes
|
|
240
|
+
await result.onConfirm(ToolConfirmationOutcome.ProceedOnce);
|
|
241
|
+
expect(MemoryTool.allowlist.has(memoryFilePath)).toBe(false);
|
|
242
|
+
await result.onConfirm(ToolConfirmationOutcome.Cancel);
|
|
243
|
+
expect(MemoryTool.allowlist.has(memoryFilePath)).toBe(false);
|
|
244
|
+
}
|
|
245
|
+
});
|
|
246
|
+
it('should handle existing memory file with content', async () => {
|
|
247
|
+
const params = { fact: 'New fact' };
|
|
248
|
+
const existingContent = 'Some existing content.\n\n## Gemini Added Memories\n- Old fact\n';
|
|
249
|
+
// Mock fs.readFile to return existing content
|
|
250
|
+
vi.mocked(fs.readFile).mockResolvedValue(existingContent);
|
|
251
|
+
const result = await memoryTool.shouldConfirmExecute(params, mockAbortSignal);
|
|
252
|
+
expect(result).toBeDefined();
|
|
253
|
+
expect(result).not.toBe(false);
|
|
254
|
+
if (result && result.type === 'edit') {
|
|
255
|
+
const expectedPath = path.join('~', '.gemini', 'GEMINI.md');
|
|
256
|
+
expect(result.title).toBe(`Confirm Memory Save: ${expectedPath}`);
|
|
257
|
+
expect(result.fileDiff).toContain('Index: GEMINI.md');
|
|
258
|
+
expect(result.fileDiff).toContain('+- New fact');
|
|
259
|
+
expect(result.originalContent).toBe(existingContent);
|
|
260
|
+
expect(result.newContent).toContain('- Old fact');
|
|
261
|
+
expect(result.newContent).toContain('- New fact');
|
|
262
|
+
}
|
|
263
|
+
});
|
|
264
|
+
});
|
|
180
265
|
});
|
|
181
266
|
//# sourceMappingURL=memoryTool.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memoryTool.test.js","sourceRoot":"","sources":["../../../src/tools/memoryTool.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"memoryTool.test.js","sourceRoot":"","sources":["../../../src/tools/memoryTool.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,10 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { vi, describe, it, expect, beforeEach, afterEach
|
|
6
|
+
import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
|
|
7
7
|
import { modifyWithEditor, isModifiableTool, } from './modifiable-tool.js';
|
|
8
8
|
import fs from 'fs';
|
|
9
|
+
import fsp from 'fs/promises';
|
|
9
10
|
import os from 'os';
|
|
10
11
|
import * as path from 'path';
|
|
11
12
|
// Mock dependencies
|
|
@@ -17,25 +18,23 @@ vi.mock('../utils/editor.js', () => ({
|
|
|
17
18
|
vi.mock('diff', () => ({
|
|
18
19
|
createPatch: mockCreatePatch,
|
|
19
20
|
}));
|
|
20
|
-
vi.mock('fs');
|
|
21
|
-
vi.mock('os');
|
|
22
21
|
describe('modifyWithEditor', () => {
|
|
23
|
-
let
|
|
22
|
+
let testProjectDir;
|
|
24
23
|
let mockModifyContext;
|
|
25
24
|
let mockParams;
|
|
26
25
|
let currentContent;
|
|
27
26
|
let proposedContent;
|
|
28
27
|
let modifiedContent;
|
|
29
28
|
let abortSignal;
|
|
30
|
-
beforeEach(() => {
|
|
29
|
+
beforeEach(async () => {
|
|
31
30
|
vi.resetAllMocks();
|
|
32
|
-
|
|
31
|
+
testProjectDir = await fsp.mkdtemp(path.join(os.tmpdir(), 'modifiable-tool-test-'));
|
|
33
32
|
abortSignal = new AbortController().signal;
|
|
34
33
|
currentContent = 'original content\nline 2\nline 3';
|
|
35
34
|
proposedContent = 'modified content\nline 2\nline 3';
|
|
36
35
|
modifiedContent = 'user modified content\nline 2\nline 3\nnew line';
|
|
37
36
|
mockParams = {
|
|
38
|
-
filePath: path.join(
|
|
37
|
+
filePath: path.join(testProjectDir, 'test.txt'),
|
|
39
38
|
someOtherParam: 'value',
|
|
40
39
|
};
|
|
41
40
|
mockModifyContext = {
|
|
@@ -50,22 +49,16 @@ describe('modifyWithEditor', () => {
|
|
|
50
49
|
oldContent,
|
|
51
50
|
})),
|
|
52
51
|
};
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
fs.mkdirSync.mockImplementation(() => undefined);
|
|
56
|
-
fs.writeFileSync.mockImplementation(() => { });
|
|
57
|
-
fs.unlinkSync.mockImplementation(() => { });
|
|
58
|
-
fs.readFileSync.mockImplementation((filePath) => {
|
|
59
|
-
if (filePath.includes('-new-')) {
|
|
60
|
-
return modifiedContent;
|
|
61
|
-
}
|
|
62
|
-
return currentContent;
|
|
52
|
+
mockOpenDiff.mockImplementation(async (_oldPath, newPath) => {
|
|
53
|
+
await fsp.writeFile(newPath, modifiedContent, 'utf8');
|
|
63
54
|
});
|
|
64
55
|
mockCreatePatch.mockReturnValue('mock diff content');
|
|
65
|
-
mockOpenDiff.mockResolvedValue(undefined);
|
|
66
56
|
});
|
|
67
|
-
afterEach(() => {
|
|
57
|
+
afterEach(async () => {
|
|
68
58
|
vi.restoreAllMocks();
|
|
59
|
+
await fsp.rm(testProjectDir, { recursive: true, force: true });
|
|
60
|
+
const diffDir = path.join(os.tmpdir(), 'gemini-cli-tool-modify-diffs');
|
|
61
|
+
await fsp.rm(diffDir, { recursive: true, force: true });
|
|
69
62
|
});
|
|
70
63
|
describe('successful modification', () => {
|
|
71
64
|
it('should successfully modify content with VSCode editor', async () => {
|
|
@@ -73,20 +66,16 @@ describe('modifyWithEditor', () => {
|
|
|
73
66
|
expect(mockModifyContext.getCurrentContent).toHaveBeenCalledWith(mockParams);
|
|
74
67
|
expect(mockModifyContext.getProposedContent).toHaveBeenCalledWith(mockParams);
|
|
75
68
|
expect(mockModifyContext.getFilePath).toHaveBeenCalledWith(mockParams);
|
|
76
|
-
expect(
|
|
77
|
-
|
|
78
|
-
expect(fs.writeFileSync).toHaveBeenNthCalledWith(2, expect.stringContaining(path.join(tempDir, 'gemini-cli-tool-modify-diffs')), proposedContent, 'utf8');
|
|
79
|
-
expect(mockOpenDiff).toHaveBeenCalledWith(expect.stringContaining('-old-'), expect.stringContaining('-new-'), 'vscode');
|
|
80
|
-
expect(fs.readFileSync).toHaveBeenCalledWith(expect.stringContaining('-old-'), 'utf8');
|
|
81
|
-
expect(fs.readFileSync).toHaveBeenCalledWith(expect.stringContaining('-new-'), 'utf8');
|
|
69
|
+
expect(mockOpenDiff).toHaveBeenCalledOnce();
|
|
70
|
+
const [oldFilePath, newFilePath] = mockOpenDiff.mock.calls[0];
|
|
82
71
|
expect(mockModifyContext.createUpdatedParams).toHaveBeenCalledWith(currentContent, modifiedContent, mockParams);
|
|
83
72
|
expect(mockCreatePatch).toHaveBeenCalledWith(path.basename(mockParams.filePath), currentContent, modifiedContent, 'Current', 'Proposed', expect.objectContaining({
|
|
84
73
|
context: 3,
|
|
85
74
|
ignoreWhitespace: true,
|
|
86
75
|
}));
|
|
87
|
-
|
|
88
|
-
expect(
|
|
89
|
-
expect(
|
|
76
|
+
// Check that temp files are deleted.
|
|
77
|
+
await expect(fsp.access(oldFilePath)).rejects.toThrow();
|
|
78
|
+
await expect(fsp.access(newFilePath)).rejects.toThrow();
|
|
90
79
|
expect(result).toEqual({
|
|
91
80
|
updatedParams: {
|
|
92
81
|
...mockParams,
|
|
@@ -97,24 +86,25 @@ describe('modifyWithEditor', () => {
|
|
|
97
86
|
});
|
|
98
87
|
});
|
|
99
88
|
it('should create temp directory if it does not exist', async () => {
|
|
100
|
-
|
|
89
|
+
const diffDir = path.join(os.tmpdir(), 'gemini-cli-tool-modify-diffs');
|
|
90
|
+
await fsp.rm(diffDir, { recursive: true, force: true }).catch(() => { });
|
|
101
91
|
await modifyWithEditor(mockParams, mockModifyContext, 'vscode', abortSignal);
|
|
102
|
-
|
|
92
|
+
const stats = await fsp.stat(diffDir);
|
|
93
|
+
expect(stats.isDirectory()).toBe(true);
|
|
103
94
|
});
|
|
104
95
|
it('should not create temp directory if it already exists', async () => {
|
|
105
|
-
|
|
96
|
+
const diffDir = path.join(os.tmpdir(), 'gemini-cli-tool-modify-diffs');
|
|
97
|
+
await fsp.mkdir(diffDir, { recursive: true });
|
|
98
|
+
const mkdirSpy = vi.spyOn(fs, 'mkdirSync');
|
|
106
99
|
await modifyWithEditor(mockParams, mockModifyContext, 'vscode', abortSignal);
|
|
107
|
-
expect(
|
|
100
|
+
expect(mkdirSpy).not.toHaveBeenCalled();
|
|
101
|
+
mkdirSpy.mockRestore();
|
|
108
102
|
});
|
|
109
103
|
});
|
|
110
104
|
it('should handle missing old temp file gracefully', async () => {
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
error.code = 'ENOENT';
|
|
115
|
-
throw error;
|
|
116
|
-
}
|
|
117
|
-
return modifiedContent;
|
|
105
|
+
mockOpenDiff.mockImplementation(async (oldPath, newPath) => {
|
|
106
|
+
await fsp.writeFile(newPath, modifiedContent, 'utf8');
|
|
107
|
+
await fsp.unlink(oldPath);
|
|
118
108
|
});
|
|
119
109
|
const result = await modifyWithEditor(mockParams, mockModifyContext, 'vscode', abortSignal);
|
|
120
110
|
expect(mockCreatePatch).toHaveBeenCalledWith(path.basename(mockParams.filePath), '', modifiedContent, 'Current', 'Proposed', expect.objectContaining({
|
|
@@ -125,13 +115,8 @@ describe('modifyWithEditor', () => {
|
|
|
125
115
|
expect(result.updatedDiff).toBe('mock diff content');
|
|
126
116
|
});
|
|
127
117
|
it('should handle missing new temp file gracefully', async () => {
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
const error = new Error('ENOENT: no such file or directory');
|
|
131
|
-
error.code = 'ENOENT';
|
|
132
|
-
throw error;
|
|
133
|
-
}
|
|
134
|
-
return currentContent;
|
|
118
|
+
mockOpenDiff.mockImplementation(async (_oldPath, newPath) => {
|
|
119
|
+
await fsp.unlink(newPath);
|
|
135
120
|
});
|
|
136
121
|
const result = await modifyWithEditor(mockParams, mockModifyContext, 'vscode', abortSignal);
|
|
137
122
|
expect(mockCreatePatch).toHaveBeenCalledWith(path.basename(mockParams.filePath), currentContent, '', 'Current', 'Proposed', expect.objectContaining({
|
|
@@ -144,14 +129,20 @@ describe('modifyWithEditor', () => {
|
|
|
144
129
|
it('should clean up temp files even if editor fails', async () => {
|
|
145
130
|
const editorError = new Error('Editor failed to open');
|
|
146
131
|
mockOpenDiff.mockRejectedValue(editorError);
|
|
132
|
+
const writeSpy = vi.spyOn(fs, 'writeFileSync');
|
|
147
133
|
await expect(modifyWithEditor(mockParams, mockModifyContext, 'vscode', abortSignal)).rejects.toThrow('Editor failed to open');
|
|
148
|
-
expect(
|
|
134
|
+
expect(writeSpy).toHaveBeenCalledTimes(2);
|
|
135
|
+
const oldFilePath = writeSpy.mock.calls[0][0];
|
|
136
|
+
const newFilePath = writeSpy.mock.calls[1][0];
|
|
137
|
+
await expect(fsp.access(oldFilePath)).rejects.toThrow();
|
|
138
|
+
await expect(fsp.access(newFilePath)).rejects.toThrow();
|
|
139
|
+
writeSpy.mockRestore();
|
|
149
140
|
});
|
|
150
141
|
it('should handle temp file cleanup errors gracefully', async () => {
|
|
151
142
|
const consoleErrorSpy = vi
|
|
152
143
|
.spyOn(console, 'error')
|
|
153
144
|
.mockImplementation(() => { });
|
|
154
|
-
fs
|
|
145
|
+
vi.spyOn(fs, 'unlinkSync').mockImplementation(() => {
|
|
155
146
|
throw new Error('Failed to delete file');
|
|
156
147
|
});
|
|
157
148
|
await modifyWithEditor(mockParams, mockModifyContext, 'vscode', abortSignal);
|
|
@@ -160,30 +151,28 @@ describe('modifyWithEditor', () => {
|
|
|
160
151
|
consoleErrorSpy.mockRestore();
|
|
161
152
|
});
|
|
162
153
|
it('should create temp files with correct naming with extension', async () => {
|
|
163
|
-
const testFilePath = path.join(
|
|
154
|
+
const testFilePath = path.join(testProjectDir, 'subfolder', 'test-file.txt');
|
|
164
155
|
mockModifyContext.getFilePath = vi.fn().mockReturnValue(testFilePath);
|
|
165
156
|
await modifyWithEditor(mockParams, mockModifyContext, 'vscode', abortSignal);
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
const oldFilePath = writeFileCalls[0][0];
|
|
169
|
-
const newFilePath = writeFileCalls[1][0];
|
|
157
|
+
expect(mockOpenDiff).toHaveBeenCalledOnce();
|
|
158
|
+
const [oldFilePath, newFilePath] = mockOpenDiff.mock.calls[0];
|
|
170
159
|
expect(oldFilePath).toMatch(/gemini-cli-modify-test-file-old-\d+\.txt$/);
|
|
171
160
|
expect(newFilePath).toMatch(/gemini-cli-modify-test-file-new-\d+\.txt$/);
|
|
172
|
-
|
|
173
|
-
expect(
|
|
161
|
+
const diffDir = path.join(os.tmpdir(), 'gemini-cli-tool-modify-diffs');
|
|
162
|
+
expect(path.dirname(oldFilePath)).toBe(diffDir);
|
|
163
|
+
expect(path.dirname(newFilePath)).toBe(diffDir);
|
|
174
164
|
});
|
|
175
165
|
it('should create temp files with correct naming without extension', async () => {
|
|
176
|
-
const testFilePath = path.join(
|
|
166
|
+
const testFilePath = path.join(testProjectDir, 'subfolder', 'test-file');
|
|
177
167
|
mockModifyContext.getFilePath = vi.fn().mockReturnValue(testFilePath);
|
|
178
168
|
await modifyWithEditor(mockParams, mockModifyContext, 'vscode', abortSignal);
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
const oldFilePath = writeFileCalls[0][0];
|
|
182
|
-
const newFilePath = writeFileCalls[1][0];
|
|
169
|
+
expect(mockOpenDiff).toHaveBeenCalledOnce();
|
|
170
|
+
const [oldFilePath, newFilePath] = mockOpenDiff.mock.calls[0];
|
|
183
171
|
expect(oldFilePath).toMatch(/gemini-cli-modify-test-file-old-\d+$/);
|
|
184
172
|
expect(newFilePath).toMatch(/gemini-cli-modify-test-file-new-\d+$/);
|
|
185
|
-
|
|
186
|
-
expect(
|
|
173
|
+
const diffDir = path.join(os.tmpdir(), 'gemini-cli-tool-modify-diffs');
|
|
174
|
+
expect(path.dirname(oldFilePath)).toBe(diffDir);
|
|
175
|
+
expect(path.dirname(newFilePath)).toBe(diffDir);
|
|
187
176
|
});
|
|
188
177
|
});
|
|
189
178
|
describe('isModifiableTool', () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modifiable-tool.test.js","sourceRoot":"","sources":["../../../src/tools/modifiable-tool.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"modifiable-tool.test.js","sourceRoot":"","sources":["../../../src/tools/modifiable-tool.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ import { SchemaValidator } from '../utils/schemaValidator.js';
|
|
|
8
8
|
import { makeRelative, shortenPath } from '../utils/paths.js';
|
|
9
9
|
import { BaseTool, Icon } from './tools.js';
|
|
10
10
|
import { Type } from '@google/genai';
|
|
11
|
-
import {
|
|
11
|
+
import { processSingleFileContent, getSpecificMimeType, } from '../utils/fileUtils.js';
|
|
12
12
|
import { recordFileOperationMetric, FileOperation, } from '../telemetry/metrics.js';
|
|
13
13
|
/**
|
|
14
14
|
* Implementation of the ReadFile tool logic
|
|
@@ -46,8 +46,10 @@ export class ReadFileTool extends BaseTool {
|
|
|
46
46
|
if (!path.isAbsolute(filePath)) {
|
|
47
47
|
return `File path must be absolute, but was relative: ${filePath}. You must provide an absolute path.`;
|
|
48
48
|
}
|
|
49
|
-
|
|
50
|
-
|
|
49
|
+
const workspaceContext = this.config.getWorkspaceContext();
|
|
50
|
+
if (!workspaceContext.isPathWithinWorkspace(filePath)) {
|
|
51
|
+
const directories = workspaceContext.getDirectories();
|
|
52
|
+
return `File path must be within one of the workspace directories: ${directories.join(', ')}`;
|
|
51
53
|
}
|
|
52
54
|
if (params.offset !== undefined && params.offset < 0) {
|
|
53
55
|
return 'Offset must be a non-negative number';
|
|
@@ -85,7 +87,7 @@ export class ReadFileTool extends BaseTool {
|
|
|
85
87
|
if (result.error) {
|
|
86
88
|
return {
|
|
87
89
|
llmContent: result.error, // The detailed error for LLM
|
|
88
|
-
returnDisplay: result.returnDisplay, // User-friendly error
|
|
90
|
+
returnDisplay: result.returnDisplay || 'Error reading file', // User-friendly error
|
|
89
91
|
};
|
|
90
92
|
}
|
|
91
93
|
const lines = typeof result.llmContent === 'string'
|
|
@@ -94,8 +96,8 @@ export class ReadFileTool extends BaseTool {
|
|
|
94
96
|
const mimetype = getSpecificMimeType(params.absolute_path);
|
|
95
97
|
recordFileOperationMetric(this.config, FileOperation.READ, lines, mimetype, path.extname(params.absolute_path));
|
|
96
98
|
return {
|
|
97
|
-
llmContent: result.llmContent,
|
|
98
|
-
returnDisplay: result.returnDisplay,
|
|
99
|
+
llmContent: result.llmContent || '',
|
|
100
|
+
returnDisplay: result.returnDisplay || '',
|
|
99
101
|
};
|
|
100
102
|
}
|
|
101
103
|
}
|
|
@@ -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,EAAE,IAAI,EAA4B,MAAM,YAAY,CAAC;AACtE,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"read-file.js","sourceRoot":"","sources":["../../../src/tools/read-file.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ import os from 'os';
|
|
|
10
10
|
import fs from 'fs';
|
|
11
11
|
import fsp from 'fs/promises';
|
|
12
12
|
import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
|
|
13
|
+
import { createMockWorkspaceContext } from '../test-utils/mockWorkspaceContext.js';
|
|
13
14
|
describe('ReadFileTool', () => {
|
|
14
15
|
let tempRootDir;
|
|
15
16
|
let tool;
|
|
@@ -20,6 +21,7 @@ describe('ReadFileTool', () => {
|
|
|
20
21
|
const mockConfigInstance = {
|
|
21
22
|
getFileService: () => new FileDiscoveryService(tempRootDir),
|
|
22
23
|
getTargetDir: () => tempRootDir,
|
|
24
|
+
getWorkspaceContext: () => createMockWorkspaceContext(tempRootDir),
|
|
23
25
|
};
|
|
24
26
|
tool = new ReadFileTool(mockConfigInstance);
|
|
25
27
|
});
|
|
@@ -51,7 +53,8 @@ describe('ReadFileTool', () => {
|
|
|
51
53
|
it('should return error for path outside root', () => {
|
|
52
54
|
const outsidePath = path.resolve(os.tmpdir(), 'outside-root.txt');
|
|
53
55
|
const params = { absolute_path: outsidePath };
|
|
54
|
-
|
|
56
|
+
const error = tool.validateToolParams(params);
|
|
57
|
+
expect(error).toContain('File path must be within one of the workspace directories');
|
|
55
58
|
});
|
|
56
59
|
it('should return error for negative offset', () => {
|
|
57
60
|
const params = {
|
|
@@ -171,7 +174,7 @@ describe('ReadFileTool', () => {
|
|
|
171
174
|
'Line 7',
|
|
172
175
|
'Line 8',
|
|
173
176
|
].join('\n'),
|
|
174
|
-
returnDisplay: '
|
|
177
|
+
returnDisplay: 'Read lines 6-8 of 20 from paginated.txt',
|
|
175
178
|
});
|
|
176
179
|
});
|
|
177
180
|
describe('with .geminiignore', () => {
|
|
@@ -206,5 +209,30 @@ describe('ReadFileTool', () => {
|
|
|
206
209
|
});
|
|
207
210
|
});
|
|
208
211
|
});
|
|
212
|
+
describe('workspace boundary validation', () => {
|
|
213
|
+
it('should validate paths are within workspace root', () => {
|
|
214
|
+
const params = {
|
|
215
|
+
absolute_path: path.join(tempRootDir, 'file.txt'),
|
|
216
|
+
};
|
|
217
|
+
expect(tool.validateToolParams(params)).toBeNull();
|
|
218
|
+
});
|
|
219
|
+
it('should reject paths outside workspace root', () => {
|
|
220
|
+
const params = {
|
|
221
|
+
absolute_path: '/etc/passwd',
|
|
222
|
+
};
|
|
223
|
+
const error = tool.validateToolParams(params);
|
|
224
|
+
expect(error).toContain('File path must be within one of the workspace directories');
|
|
225
|
+
expect(error).toContain(tempRootDir);
|
|
226
|
+
});
|
|
227
|
+
it('should provide clear error message with workspace directories', () => {
|
|
228
|
+
const outsidePath = path.join(os.tmpdir(), 'outside-workspace.txt');
|
|
229
|
+
const params = {
|
|
230
|
+
absolute_path: outsidePath,
|
|
231
|
+
};
|
|
232
|
+
const error = tool.validateToolParams(params);
|
|
233
|
+
expect(error).toContain('File path must be within one of the workspace directories');
|
|
234
|
+
expect(error).toContain(tempRootDir);
|
|
235
|
+
});
|
|
236
|
+
});
|
|
209
237
|
});
|
|
210
238
|
//# sourceMappingURL=read-file.test.js.map
|