@google/gemini-cli-core 0.39.0-preview.2 → 0.40.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/docs/changelogs/index.md +21 -0
- package/dist/docs/changelogs/latest.md +253 -407
- package/dist/docs/changelogs/preview.md +236 -247
- package/dist/docs/cli/auto-memory.md +143 -0
- package/dist/docs/cli/enterprise.md +1 -1
- package/dist/docs/cli/plan-mode.md +3 -1
- package/dist/docs/cli/settings.md +29 -25
- package/dist/docs/cli/system-prompt.md +6 -6
- package/dist/docs/cli/telemetry.md +18 -11
- package/dist/docs/cli/tutorials/memory-management.md +2 -0
- package/dist/docs/get-started/{authentication.md → authentication.mdx} +139 -93
- package/dist/docs/get-started/index.md +3 -2
- package/dist/docs/get-started/installation.mdx +201 -0
- package/dist/docs/index.md +2 -2
- package/dist/docs/reference/configuration.md +88 -12
- package/dist/docs/reference/policy-engine.md +18 -12
- package/dist/docs/reference/tools.md +22 -0
- package/dist/docs/sidebar.json +13 -1
- package/dist/docs/tools/mcp-resources.md +44 -0
- package/dist/docs/tools/mcp-server.md +2 -1
- package/dist/docs/tools/tracker.md +61 -0
- package/dist/src/agents/agent-tool.js +1 -0
- package/dist/src/agents/agent-tool.js.map +1 -1
- package/dist/src/agents/agentLoader.d.ts +4 -4
- package/dist/src/agents/generalist-agent.js +3 -2
- package/dist/src/agents/generalist-agent.js.map +1 -1
- package/dist/src/agents/local-executor.js +4 -1
- package/dist/src/agents/local-executor.js.map +1 -1
- package/dist/src/agents/registry.js +0 -8
- package/dist/src/agents/registry.js.map +1 -1
- package/dist/src/agents/skill-extraction-agent.d.ts +3 -2
- package/dist/src/agents/skill-extraction-agent.js +72 -67
- package/dist/src/agents/skill-extraction-agent.js.map +1 -1
- package/dist/src/agents/skill-extraction-agent.test.js +54 -0
- package/dist/src/agents/skill-extraction-agent.test.js.map +1 -0
- package/dist/src/config/config.d.ts +21 -6
- package/dist/src/config/config.js +103 -19
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +262 -6
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/constants.d.ts +1 -0
- package/dist/src/config/constants.js +2 -0
- package/dist/src/config/constants.js.map +1 -1
- package/dist/src/config/memory.js +1 -1
- package/dist/src/config/memory.js.map +1 -1
- package/dist/src/config/path-validation.test.js +15 -6
- package/dist/src/config/path-validation.test.js.map +1 -1
- package/dist/src/config/projectRegistry.js +113 -32
- package/dist/src/config/projectRegistry.js.map +1 -1
- package/dist/src/config/projectRegistry.test.js +51 -0
- package/dist/src/config/projectRegistry.test.js.map +1 -1
- package/dist/src/config/storage.d.ts +3 -1
- package/dist/src/config/storage.js +6 -0
- package/dist/src/config/storage.js.map +1 -1
- package/dist/src/config/storage.test.js +12 -0
- package/dist/src/config/storage.test.js.map +1 -1
- package/dist/src/core/contentGenerator.d.ts +8 -1
- package/dist/src/core/contentGenerator.js +46 -4
- package/dist/src/core/contentGenerator.js.map +1 -1
- package/dist/src/core/contentGenerator.test.js +174 -8
- package/dist/src/core/contentGenerator.test.js.map +1 -1
- package/dist/src/core/geminiChat.test.js +1 -0
- package/dist/src/core/geminiChat.test.js.map +1 -1
- package/dist/src/core/geminiChat_network_retry.test.js +42 -0
- package/dist/src/core/geminiChat_network_retry.test.js.map +1 -1
- package/dist/src/core/localLiteRtLmClient.js +2 -0
- package/dist/src/core/localLiteRtLmClient.js.map +1 -1
- package/dist/src/core/localLiteRtLmClient.test.js +7 -0
- package/dist/src/core/localLiteRtLmClient.test.js.map +1 -1
- package/dist/src/core/loggingContentGenerator.js +3 -0
- package/dist/src/core/loggingContentGenerator.js.map +1 -1
- package/dist/src/core/loggingContentGenerator.test.js +1 -0
- package/dist/src/core/loggingContentGenerator.test.js.map +1 -1
- package/dist/src/core/prompts.d.ts +1 -1
- package/dist/src/core/prompts.js +2 -2
- package/dist/src/core/prompts.js.map +1 -1
- package/dist/src/core/prompts.test.js +2 -2
- package/dist/src/core/prompts.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/ide/ide-client.js +3 -4
- package/dist/src/ide/ide-client.js.map +1 -1
- package/dist/src/policy/policies/read-only.toml +4 -1
- package/dist/src/policy/policy-engine.js +4 -0
- package/dist/src/policy/policy-engine.js.map +1 -1
- package/dist/src/policy/policy-engine.test.js +25 -0
- package/dist/src/policy/policy-engine.test.js.map +1 -1
- package/dist/src/policy/toml-loader.test.js +5 -0
- package/dist/src/policy/toml-loader.test.js.map +1 -1
- package/dist/src/prompts/promptProvider.d.ts +1 -1
- package/dist/src/prompts/promptProvider.js +15 -7
- package/dist/src/prompts/promptProvider.js.map +1 -1
- package/dist/src/prompts/promptProvider.test.js +31 -1
- package/dist/src/prompts/promptProvider.test.js.map +1 -1
- package/dist/src/prompts/snippets-memory-v2.test.js +94 -0
- package/dist/src/prompts/snippets-memory-v2.test.js.map +1 -0
- package/dist/src/prompts/snippets.d.ts +19 -1
- package/dist/src/prompts/snippets.js +24 -3
- package/dist/src/prompts/snippets.js.map +1 -1
- package/dist/src/prompts/snippets.legacy.d.ts +6 -1
- package/dist/src/prompts/snippets.legacy.js +10 -3
- package/dist/src/prompts/snippets.legacy.js.map +1 -1
- package/dist/src/sandbox/linux/LinuxSandboxManager.js +16 -2
- package/dist/src/sandbox/linux/LinuxSandboxManager.js.map +1 -1
- package/dist/src/sandbox/linux/bwrapArgsBuilder.js +64 -36
- package/dist/src/sandbox/linux/bwrapArgsBuilder.js.map +1 -1
- package/dist/src/sandbox/linux/bwrapArgsBuilder.test.js +3 -3
- package/dist/src/sandbox/linux/bwrapArgsBuilder.test.js.map +1 -1
- package/dist/src/sandbox/macos/MacOsSandboxManager.js +13 -1
- package/dist/src/sandbox/macos/MacOsSandboxManager.js.map +1 -1
- package/dist/src/sandbox/macos/seatbeltArgsBuilder.js +61 -42
- package/dist/src/sandbox/macos/seatbeltArgsBuilder.js.map +1 -1
- package/dist/src/sandbox/windows/WindowsSandboxManager.js +12 -1
- package/dist/src/sandbox/windows/WindowsSandboxManager.js.map +1 -1
- package/dist/src/scheduler/policy.js +1 -2
- package/dist/src/scheduler/policy.js.map +1 -1
- package/dist/src/scheduler/policy.test.js +35 -2
- package/dist/src/scheduler/policy.test.js.map +1 -1
- package/dist/src/scheduler/scheduler.js +1 -0
- package/dist/src/scheduler/scheduler.js.map +1 -1
- package/dist/src/scheduler/scheduler.test.js +2 -0
- package/dist/src/scheduler/scheduler.test.js.map +1 -1
- package/dist/src/scheduler/scheduler_hooks.test.js +1 -0
- package/dist/src/scheduler/scheduler_hooks.test.js.map +1 -1
- package/dist/src/scheduler/scheduler_parallel.test.js +1 -0
- package/dist/src/scheduler/scheduler_parallel.test.js.map +1 -1
- package/dist/src/scheduler/tool-executor.js +1 -0
- package/dist/src/scheduler/tool-executor.js.map +1 -1
- package/dist/src/services/chatRecordingService.d.ts +1 -0
- package/dist/src/services/chatRecordingService.js +48 -19
- package/dist/src/services/chatRecordingService.js.map +1 -1
- package/dist/src/services/memoryService.d.ts +15 -1
- package/dist/src/services/memoryService.js +276 -57
- package/dist/src/services/memoryService.js.map +1 -1
- package/dist/src/services/memoryService.test.js +296 -2
- package/dist/src/services/memoryService.test.js.map +1 -1
- package/dist/src/services/sandboxManager.integration.test.js +204 -0
- package/dist/src/services/sandboxManager.integration.test.js.map +1 -1
- package/dist/src/services/sandboxManager.js +16 -0
- package/dist/src/services/sandboxManager.js.map +1 -1
- package/dist/src/services/sessionSummaryUtils.d.ts +1 -1
- package/dist/src/services/sessionSummaryUtils.js +111 -38
- package/dist/src/services/sessionSummaryUtils.js.map +1 -1
- package/dist/src/services/sessionSummaryUtils.test.js +204 -51
- package/dist/src/services/sessionSummaryUtils.test.js.map +1 -1
- package/dist/src/services/shellExecutionService.js +7 -1
- package/dist/src/services/shellExecutionService.js.map +1 -1
- package/dist/src/telemetry/config.js +3 -0
- package/dist/src/telemetry/config.js.map +1 -1
- package/dist/src/telemetry/conseca-logger.test.js +1 -0
- package/dist/src/telemetry/conseca-logger.test.js.map +1 -1
- package/dist/src/telemetry/loggers.test.js +72 -4
- package/dist/src/telemetry/loggers.test.js.map +1 -1
- package/dist/src/telemetry/memory-monitor.d.ts +1 -0
- package/dist/src/telemetry/memory-monitor.js +8 -1
- package/dist/src/telemetry/memory-monitor.js.map +1 -1
- package/dist/src/telemetry/memory-monitor.test.js +6 -1
- package/dist/src/telemetry/memory-monitor.test.js.map +1 -1
- package/dist/src/telemetry/trace.d.ts +1 -0
- package/dist/src/telemetry/trace.js +33 -13
- package/dist/src/telemetry/trace.js.map +1 -1
- package/dist/src/telemetry/trace.test.js +50 -10
- package/dist/src/telemetry/trace.test.js.map +1 -1
- package/dist/src/telemetry/types.js +11 -4
- package/dist/src/telemetry/types.js.map +1 -1
- package/dist/src/tools/definitions/base-declarations.d.ts +2 -0
- package/dist/src/tools/definitions/base-declarations.js +3 -0
- package/dist/src/tools/definitions/base-declarations.js.map +1 -1
- package/dist/src/tools/definitions/coreTools.d.ts +3 -1
- package/dist/src/tools/definitions/coreTools.js +13 -1
- package/dist/src/tools/definitions/coreTools.js.map +1 -1
- package/dist/src/tools/definitions/model-family-sets/default-legacy.js +29 -1
- package/dist/src/tools/definitions/model-family-sets/default-legacy.js.map +1 -1
- package/dist/src/tools/definitions/model-family-sets/gemini-3.js +29 -1
- package/dist/src/tools/definitions/model-family-sets/gemini-3.js.map +1 -1
- package/dist/src/tools/definitions/types.d.ts +2 -0
- package/dist/src/tools/get-internal-docs.js +5 -2
- package/dist/src/tools/get-internal-docs.js.map +1 -1
- package/dist/src/tools/list-mcp-resources.d.ts +24 -0
- package/dist/src/tools/list-mcp-resources.js +74 -0
- package/dist/src/tools/list-mcp-resources.js.map +1 -0
- package/dist/src/tools/list-mcp-resources.test.d.ts +6 -0
- package/dist/src/tools/list-mcp-resources.test.js +79 -0
- package/dist/src/tools/list-mcp-resources.test.js.map +1 -0
- package/dist/src/tools/mcp-client-manager.d.ts +3 -1
- package/dist/src/tools/mcp-client-manager.js +24 -1
- package/dist/src/tools/mcp-client-manager.js.map +1 -1
- package/dist/src/tools/mcp-client-manager.test.js +43 -0
- package/dist/src/tools/mcp-client-manager.test.js.map +1 -1
- package/dist/src/tools/memoryTool.d.ts +2 -1
- package/dist/src/tools/memoryTool.js +42 -13
- package/dist/src/tools/memoryTool.js.map +1 -1
- package/dist/src/tools/memoryTool.test.js +23 -3
- package/dist/src/tools/memoryTool.test.js.map +1 -1
- package/dist/src/tools/read-mcp-resource.d.ts +25 -0
- package/dist/src/tools/read-mcp-resource.js +120 -0
- package/dist/src/tools/read-mcp-resource.js.map +1 -0
- package/dist/src/tools/read-mcp-resource.test.d.ts +6 -0
- package/dist/src/tools/read-mcp-resource.test.js +110 -0
- package/dist/src/tools/read-mcp-resource.test.js.map +1 -0
- package/dist/src/tools/ripGrep.d.ts +3 -2
- package/dist/src/tools/ripGrep.js +25 -54
- package/dist/src/tools/ripGrep.js.map +1 -1
- package/dist/src/tools/ripGrep.test.js +73 -131
- package/dist/src/tools/ripGrep.test.js.map +1 -1
- package/dist/src/tools/shell.js +38 -12
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/shell.test.js +410 -25
- package/dist/src/tools/shell.test.js.map +1 -1
- package/dist/src/tools/tool-error.d.ts +1 -0
- package/dist/src/tools/tool-error.js +1 -0
- package/dist/src/tools/tool-error.js.map +1 -1
- package/dist/src/tools/tool-names.d.ts +4 -4
- package/dist/src/tools/tool-names.js +6 -2
- package/dist/src/tools/tool-names.js.map +1 -1
- package/dist/src/tools/tool-registry.js +8 -1
- package/dist/src/tools/tool-registry.js.map +1 -1
- package/dist/src/utils/filesearch/fileSearch.d.ts +2 -0
- package/dist/src/utils/filesearch/fileSearch.js +97 -6
- package/dist/src/utils/filesearch/fileSearch.js.map +1 -1
- package/dist/src/utils/filesearch/fileSearch.test.js +54 -0
- package/dist/src/utils/filesearch/fileSearch.test.js.map +1 -1
- package/dist/src/utils/filesearch/fileWatcher.d.ts +25 -0
- package/dist/src/utils/filesearch/fileWatcher.js +86 -0
- package/dist/src/utils/filesearch/fileWatcher.js.map +1 -0
- package/dist/src/utils/filesearch/fileWatcher.test.d.ts +6 -0
- package/dist/src/utils/filesearch/fileWatcher.test.js +142 -0
- package/dist/src/utils/filesearch/fileWatcher.test.js.map +1 -0
- package/dist/src/utils/gitIgnoreParser.js +1 -1
- package/dist/src/utils/gitIgnoreParser.js.map +1 -1
- package/dist/src/utils/ignoreFileParser.js +1 -1
- package/dist/src/utils/ignoreFileParser.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.js +15 -5
- package/dist/src/utils/memoryDiscovery.js.map +1 -1
- package/dist/src/utils/retry.js +18 -6
- package/dist/src/utils/retry.js.map +1 -1
- package/dist/src/utils/retry.test.js +30 -0
- package/dist/src/utils/retry.test.js.map +1 -1
- package/dist/src/utils/shell-utils.d.ts +1 -0
- package/dist/src/utils/shell-utils.js +106 -0
- package/dist/src/utils/shell-utils.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +5 -3
- package/vendor/ripgrep/rg-darwin-arm64 +0 -0
- package/vendor/ripgrep/rg-darwin-x64 +0 -0
- package/vendor/ripgrep/rg-linux-arm64 +0 -0
- package/vendor/ripgrep/rg-linux-x64 +0 -0
- package/vendor/ripgrep/rg-win32-x64.exe +0 -0
- package/dist/docs/get-started/installation.md +0 -181
- package/dist/google-gemini-cli-core-0.39.0-preview.1.tgz +0 -0
- package/dist/src/agents/memory-manager-agent.d.ts +0 -25
- package/dist/src/agents/memory-manager-agent.js +0 -138
- package/dist/src/agents/memory-manager-agent.js.map +0 -1
- package/dist/src/agents/memory-manager-agent.test.js +0 -123
- package/dist/src/agents/memory-manager-agent.test.js.map +0 -1
- package/dist/src/prompts/snippets-memory-manager.test.js +0 -31
- package/dist/src/prompts/snippets-memory-manager.test.js.map +0 -1
- /package/dist/src/agents/{memory-manager-agent.test.d.ts → skill-extraction-agent.test.d.ts} +0 -0
- /package/dist/src/prompts/{snippets-memory-manager.test.d.ts → snippets-memory-v2.test.d.ts} +0 -0
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2026 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { describe, it, expect, beforeEach, vi } from 'vitest';
|
|
7
|
+
import { ReadMcpResourceTool } from './read-mcp-resource.js';
|
|
8
|
+
import { ToolErrorType } from './tool-error.js';
|
|
9
|
+
import { createMockMessageBus } from '../test-utils/mock-message-bus.js';
|
|
10
|
+
describe('ReadMcpResourceTool', () => {
|
|
11
|
+
let tool;
|
|
12
|
+
let mockContext;
|
|
13
|
+
let mockMcpManager;
|
|
14
|
+
const abortSignal = new AbortController().signal;
|
|
15
|
+
beforeEach(() => {
|
|
16
|
+
mockMcpManager = {
|
|
17
|
+
findResourceByUri: vi.fn(),
|
|
18
|
+
getClient: vi.fn(),
|
|
19
|
+
};
|
|
20
|
+
mockContext = {
|
|
21
|
+
config: {
|
|
22
|
+
getMcpClientManager: vi.fn().mockReturnValue(mockMcpManager),
|
|
23
|
+
},
|
|
24
|
+
};
|
|
25
|
+
tool = new ReadMcpResourceTool(mockContext, createMockMessageBus());
|
|
26
|
+
});
|
|
27
|
+
it('should successfully read a resource', async () => {
|
|
28
|
+
const uri = 'protocol://resource';
|
|
29
|
+
const serverName = 'test-server';
|
|
30
|
+
const resourceName = 'Test Resource';
|
|
31
|
+
const resourceContent = 'Resource Content';
|
|
32
|
+
mockMcpManager.findResourceByUri.mockReturnValue({
|
|
33
|
+
uri,
|
|
34
|
+
serverName,
|
|
35
|
+
name: resourceName,
|
|
36
|
+
});
|
|
37
|
+
const mockClient = {
|
|
38
|
+
readResource: vi.fn().mockResolvedValue({
|
|
39
|
+
contents: [{ text: resourceContent }],
|
|
40
|
+
}),
|
|
41
|
+
};
|
|
42
|
+
mockMcpManager.getClient.mockReturnValue(mockClient);
|
|
43
|
+
const invocation = tool.createInvocation({ uri });
|
|
44
|
+
// Verify description
|
|
45
|
+
expect(invocation.getDescription()).toBe(`Read MCP resource "${resourceName}" from server "${serverName}"`);
|
|
46
|
+
const result = (await invocation.execute({ abortSignal }));
|
|
47
|
+
expect(mockMcpManager.findResourceByUri).toHaveBeenCalledWith(uri);
|
|
48
|
+
expect(mockMcpManager.getClient).toHaveBeenCalledWith(serverName);
|
|
49
|
+
expect(mockClient.readResource).toHaveBeenCalledWith(uri);
|
|
50
|
+
expect(result).toEqual({
|
|
51
|
+
llmContent: resourceContent + '\n',
|
|
52
|
+
returnDisplay: `Successfully read resource "${resourceName}" from server "${serverName}"`,
|
|
53
|
+
});
|
|
54
|
+
});
|
|
55
|
+
it('should pass raw URI to client when using qualified URI', async () => {
|
|
56
|
+
const qualifiedUri = 'test-server:protocol://resource';
|
|
57
|
+
const rawUri = 'protocol://resource';
|
|
58
|
+
const serverName = 'test-server';
|
|
59
|
+
const resourceName = 'Test Resource';
|
|
60
|
+
const resourceContent = 'Resource Content';
|
|
61
|
+
mockMcpManager.findResourceByUri.mockReturnValue({
|
|
62
|
+
uri: rawUri,
|
|
63
|
+
serverName,
|
|
64
|
+
name: resourceName,
|
|
65
|
+
});
|
|
66
|
+
const mockClient = {
|
|
67
|
+
readResource: vi.fn().mockResolvedValue({
|
|
68
|
+
contents: [{ text: resourceContent }],
|
|
69
|
+
}),
|
|
70
|
+
};
|
|
71
|
+
mockMcpManager.getClient.mockReturnValue(mockClient);
|
|
72
|
+
const invocation = tool.createInvocation({ uri: qualifiedUri });
|
|
73
|
+
const result = (await invocation.execute({ abortSignal }));
|
|
74
|
+
expect(mockMcpManager.findResourceByUri).toHaveBeenCalledWith(qualifiedUri);
|
|
75
|
+
expect(mockMcpManager.getClient).toHaveBeenCalledWith(serverName);
|
|
76
|
+
expect(mockClient.readResource).toHaveBeenCalledWith(rawUri);
|
|
77
|
+
expect(result.llmContent).toBe(resourceContent + '\n');
|
|
78
|
+
});
|
|
79
|
+
it('should return error if MCP Client Manager not available', async () => {
|
|
80
|
+
mockContext.config.getMcpClientManager.mockReturnValue(undefined);
|
|
81
|
+
const invocation = tool.createInvocation({ uri: 'uri' });
|
|
82
|
+
const result = (await invocation.execute({ abortSignal }));
|
|
83
|
+
expect(result.error?.type).toBe(ToolErrorType.EXECUTION_FAILED);
|
|
84
|
+
expect(result.error?.message).toContain('MCP Client Manager not available');
|
|
85
|
+
});
|
|
86
|
+
it('should return error if resource not found', async () => {
|
|
87
|
+
mockMcpManager.findResourceByUri.mockReturnValue(undefined);
|
|
88
|
+
const invocation = tool.createInvocation({ uri: 'uri' });
|
|
89
|
+
const result = (await invocation.execute({ abortSignal }));
|
|
90
|
+
expect(result.error?.type).toBe(ToolErrorType.MCP_RESOURCE_NOT_FOUND);
|
|
91
|
+
expect(result.error?.message).toContain('Resource not found');
|
|
92
|
+
});
|
|
93
|
+
it('should return error if reading fails', async () => {
|
|
94
|
+
const uri = 'protocol://resource';
|
|
95
|
+
const serverName = 'test-server';
|
|
96
|
+
mockMcpManager.findResourceByUri.mockReturnValue({
|
|
97
|
+
uri,
|
|
98
|
+
serverName,
|
|
99
|
+
});
|
|
100
|
+
const mockClient = {
|
|
101
|
+
readResource: vi.fn().mockRejectedValue(new Error('Failed to read')),
|
|
102
|
+
};
|
|
103
|
+
mockMcpManager.getClient.mockReturnValue(mockClient);
|
|
104
|
+
const invocation = tool.createInvocation({ uri });
|
|
105
|
+
const result = (await invocation.execute({ abortSignal }));
|
|
106
|
+
expect(result.error?.type).toBe(ToolErrorType.MCP_TOOL_ERROR);
|
|
107
|
+
expect(result.error?.message).toContain('Failed to read resource');
|
|
108
|
+
});
|
|
109
|
+
});
|
|
110
|
+
//# sourceMappingURL=read-mcp-resource.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"read-mcp-resource.test.js","sourceRoot":"","sources":["../../../src/tools/read-mcp-resource.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,12 +6,13 @@
|
|
|
6
6
|
import type { MessageBus } from '../confirmation-bus/message-bus.js';
|
|
7
7
|
import { BaseDeclarativeTool, type ToolInvocation, type ToolResult } from './tools.js';
|
|
8
8
|
import type { Config } from '../config/config.js';
|
|
9
|
+
export declare function getRipgrepPath(): Promise<string | null>;
|
|
9
10
|
/**
|
|
10
|
-
* Checks if `rg` exists
|
|
11
|
+
* Checks if `rg` exists in the bundled vendor directory.
|
|
11
12
|
*/
|
|
12
13
|
export declare function canUseRipgrep(): Promise<boolean>;
|
|
13
14
|
/**
|
|
14
|
-
* Ensures `rg` is
|
|
15
|
+
* Ensures `rg` is available, or throws.
|
|
15
16
|
*/
|
|
16
17
|
export declare function ensureRgPath(): Promise<string>;
|
|
17
18
|
/**
|
|
@@ -6,13 +6,13 @@
|
|
|
6
6
|
import fs from 'node:fs';
|
|
7
7
|
import fsPromises from 'node:fs/promises';
|
|
8
8
|
import path from 'node:path';
|
|
9
|
-
import
|
|
9
|
+
import os from 'node:os';
|
|
10
|
+
import { fileURLToPath } from 'node:url';
|
|
10
11
|
import { BaseDeclarativeTool, BaseToolInvocation, Kind, } from './tools.js';
|
|
11
12
|
import { ToolErrorType } from './tool-error.js';
|
|
12
13
|
import { makeRelative, shortenPath } from '../utils/paths.js';
|
|
13
14
|
import { getErrorMessage, isNodeError } from '../utils/errors.js';
|
|
14
15
|
import { fileExists } from '../utils/fileUtils.js';
|
|
15
|
-
import { Storage } from '../config/storage.js';
|
|
16
16
|
import { GREP_TOOL_NAME } from './tool-names.js';
|
|
17
17
|
import { debugLogger } from '../utils/debugLogger.js';
|
|
18
18
|
import { FileExclusions, COMMON_DIRECTORY_EXCLUDES, } from '../utils/ignorePatterns.js';
|
|
@@ -22,70 +22,41 @@ import { DEFAULT_TOTAL_MAX_MATCHES, DEFAULT_SEARCH_TIMEOUT_MS, } from './constan
|
|
|
22
22
|
import { RIP_GREP_DEFINITION } from './definitions/coreTools.js';
|
|
23
23
|
import { resolveToolDeclaration } from './definitions/resolver.js';
|
|
24
24
|
import { formatGrepResults } from './grep-utils.js';
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
25
|
+
const __dirname = path.dirname(fileURLToPath(import.meta.url));
|
|
26
|
+
export async function getRipgrepPath() {
|
|
27
|
+
const platform = os.platform();
|
|
28
|
+
const arch = os.arch();
|
|
29
|
+
// Map to the correct bundled binary
|
|
30
|
+
const binName = `rg-${platform}-${arch}${platform === 'win32' ? '.exe' : ''}`;
|
|
31
|
+
const candidatePaths = [
|
|
32
|
+
// 1. SEA runtime layout: everything is flattened into the root dir
|
|
33
|
+
path.resolve(__dirname, 'vendor/ripgrep', binName),
|
|
34
|
+
// 2. Dev/Dist layout: packages/core/dist/tools/ripGrep.js -> packages/core/vendor/ripgrep
|
|
35
|
+
path.resolve(__dirname, '../../vendor/ripgrep', binName),
|
|
36
|
+
];
|
|
37
|
+
for (const candidate of candidatePaths) {
|
|
38
|
+
if (await fileExists(candidate)) {
|
|
39
|
+
return candidate;
|
|
34
40
|
}
|
|
35
41
|
}
|
|
36
42
|
return null;
|
|
37
43
|
}
|
|
38
|
-
let ripgrepAcquisitionPromise = null;
|
|
39
|
-
/**
|
|
40
|
-
* Ensures a ripgrep binary is available.
|
|
41
|
-
*
|
|
42
|
-
* NOTE:
|
|
43
|
-
* - The Gemini CLI currently prefers a managed ripgrep binary downloaded
|
|
44
|
-
* into its global bin directory.
|
|
45
|
-
* - Even if ripgrep is available on the system PATH, it is intentionally
|
|
46
|
-
* not used at this time.
|
|
47
|
-
*
|
|
48
|
-
* Preference for system-installed ripgrep is blocked on:
|
|
49
|
-
* - checksum verification of external binaries
|
|
50
|
-
* - internalization of the get-ripgrep dependency
|
|
51
|
-
*
|
|
52
|
-
* See:
|
|
53
|
-
* - feat(core): Prefer rg in system path (#11847)
|
|
54
|
-
* - Move get-ripgrep to third_party (#12099)
|
|
55
|
-
*/
|
|
56
|
-
async function ensureRipgrepAvailable() {
|
|
57
|
-
const existingPath = await resolveExistingRgPath();
|
|
58
|
-
if (existingPath) {
|
|
59
|
-
return existingPath;
|
|
60
|
-
}
|
|
61
|
-
if (!ripgrepAcquisitionPromise) {
|
|
62
|
-
ripgrepAcquisitionPromise = (async () => {
|
|
63
|
-
try {
|
|
64
|
-
await downloadRipGrep(Storage.getGlobalBinDir());
|
|
65
|
-
return await resolveExistingRgPath();
|
|
66
|
-
}
|
|
67
|
-
finally {
|
|
68
|
-
ripgrepAcquisitionPromise = null;
|
|
69
|
-
}
|
|
70
|
-
})();
|
|
71
|
-
}
|
|
72
|
-
return ripgrepAcquisitionPromise;
|
|
73
|
-
}
|
|
74
44
|
/**
|
|
75
|
-
* Checks if `rg` exists
|
|
45
|
+
* Checks if `rg` exists in the bundled vendor directory.
|
|
76
46
|
*/
|
|
77
47
|
export async function canUseRipgrep() {
|
|
78
|
-
|
|
48
|
+
const binPath = await getRipgrepPath();
|
|
49
|
+
return binPath !== null;
|
|
79
50
|
}
|
|
80
51
|
/**
|
|
81
|
-
* Ensures `rg` is
|
|
52
|
+
* Ensures `rg` is available, or throws.
|
|
82
53
|
*/
|
|
83
54
|
export async function ensureRgPath() {
|
|
84
|
-
const
|
|
85
|
-
if (
|
|
86
|
-
return
|
|
55
|
+
const binPath = await getRipgrepPath();
|
|
56
|
+
if (binPath !== null) {
|
|
57
|
+
return binPath;
|
|
87
58
|
}
|
|
88
|
-
throw new Error(
|
|
59
|
+
throw new Error(`Cannot find bundled ripgrep binary.`);
|
|
89
60
|
}
|
|
90
61
|
class GrepToolInvocation extends BaseToolInvocation {
|
|
91
62
|
config;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ripGrep.js","sourceRoot":"","sources":["../../../src/tools/ripGrep.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ripGrep.js","sourceRoot":"","sources":["../../../src/tools/ripGrep.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,145 +3,58 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { describe, it, expect, beforeEach, afterEach,
|
|
7
|
-
import { canUseRipgrep, RipGrepTool, ensureRgPath, } from './ripGrep.js';
|
|
6
|
+
import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
|
|
7
|
+
import { canUseRipgrep, RipGrepTool, ensureRgPath, getRipgrepPath, } from './ripGrep.js';
|
|
8
8
|
import path from 'node:path';
|
|
9
9
|
import { isSubpath } from '../utils/paths.js';
|
|
10
10
|
import fs from 'node:fs/promises';
|
|
11
11
|
import os from 'node:os';
|
|
12
|
-
import { Storage } from '../config/storage.js';
|
|
13
12
|
import { GEMINI_IGNORE_FILE_NAME } from '../config/constants.js';
|
|
14
13
|
import { createMockWorkspaceContext } from '../test-utils/mockWorkspaceContext.js';
|
|
15
14
|
import { spawn } from 'node:child_process';
|
|
16
15
|
import { PassThrough, Readable } from 'node:stream';
|
|
17
16
|
import EventEmitter from 'node:events';
|
|
18
|
-
import { downloadRipGrep } from '@joshua.litt/get-ripgrep';
|
|
19
17
|
import { createMockMessageBus } from '../test-utils/mock-message-bus.js';
|
|
20
|
-
|
|
21
|
-
vi.mock('
|
|
22
|
-
|
|
23
|
-
|
|
18
|
+
import { fileExists } from '../utils/fileUtils.js';
|
|
19
|
+
vi.mock('../utils/fileUtils.js', async (importOriginal) => {
|
|
20
|
+
const actual = await importOriginal();
|
|
21
|
+
return {
|
|
22
|
+
...actual,
|
|
23
|
+
fileExists: vi.fn(),
|
|
24
|
+
};
|
|
25
|
+
});
|
|
24
26
|
// Mock child_process for ripgrep calls
|
|
25
27
|
vi.mock('child_process', () => ({
|
|
26
28
|
spawn: vi.fn(),
|
|
27
29
|
}));
|
|
28
30
|
const mockSpawn = vi.mocked(spawn);
|
|
29
|
-
const downloadRipGrepMock = vi.mocked(downloadRipGrep);
|
|
30
|
-
const originalGetGlobalBinDir = Storage.getGlobalBinDir.bind(Storage);
|
|
31
|
-
const storageSpy = vi.spyOn(Storage, 'getGlobalBinDir');
|
|
32
|
-
function getRipgrepBinaryName() {
|
|
33
|
-
return process.platform === 'win32' ? 'rg.exe' : 'rg';
|
|
34
|
-
}
|
|
35
31
|
describe('canUseRipgrep', () => {
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
beforeEach(async () => {
|
|
39
|
-
downloadRipGrepMock.mockReset();
|
|
40
|
-
downloadRipGrepMock.mockResolvedValue(undefined);
|
|
41
|
-
tempRootDir = await fs.mkdtemp(path.join(os.tmpdir(), 'ripgrep-bin-'));
|
|
42
|
-
binDir = path.join(tempRootDir, 'bin');
|
|
43
|
-
await fs.mkdir(binDir, { recursive: true });
|
|
44
|
-
storageSpy.mockImplementation(() => binDir);
|
|
45
|
-
});
|
|
46
|
-
afterEach(async () => {
|
|
47
|
-
storageSpy.mockImplementation(() => originalGetGlobalBinDir());
|
|
48
|
-
await fs.rm(tempRootDir, { recursive: true, force: true });
|
|
32
|
+
beforeEach(() => {
|
|
33
|
+
vi.mocked(fileExists).mockReset();
|
|
49
34
|
});
|
|
50
35
|
it('should return true if ripgrep already exists', async () => {
|
|
51
|
-
|
|
52
|
-
await fs.writeFile(existingPath, '');
|
|
36
|
+
vi.mocked(fileExists).mockResolvedValue(true);
|
|
53
37
|
const result = await canUseRipgrep();
|
|
54
38
|
expect(result).toBe(true);
|
|
55
|
-
expect(downloadRipGrepMock).not.toHaveBeenCalled();
|
|
56
39
|
});
|
|
57
|
-
it('should
|
|
58
|
-
|
|
59
|
-
downloadRipGrepMock.mockImplementation(async () => {
|
|
60
|
-
await fs.writeFile(expectedPath, '');
|
|
61
|
-
});
|
|
62
|
-
const result = await canUseRipgrep();
|
|
63
|
-
expect(result).toBe(true);
|
|
64
|
-
expect(downloadRipGrep).toHaveBeenCalledWith(binDir);
|
|
65
|
-
await expect(fs.access(expectedPath)).resolves.toBeUndefined();
|
|
66
|
-
});
|
|
67
|
-
it('should return false if download fails and file does not exist', async () => {
|
|
40
|
+
it('should return false if file does not exist', async () => {
|
|
41
|
+
vi.mocked(fileExists).mockResolvedValue(false);
|
|
68
42
|
const result = await canUseRipgrep();
|
|
69
43
|
expect(result).toBe(false);
|
|
70
|
-
expect(downloadRipGrep).toHaveBeenCalledWith(binDir);
|
|
71
|
-
});
|
|
72
|
-
it('should propagate errors from downloadRipGrep', async () => {
|
|
73
|
-
const error = new Error('Download failed');
|
|
74
|
-
downloadRipGrepMock.mockRejectedValue(error);
|
|
75
|
-
await expect(canUseRipgrep()).rejects.toThrow(error);
|
|
76
|
-
expect(downloadRipGrep).toHaveBeenCalledWith(binDir);
|
|
77
|
-
});
|
|
78
|
-
it('should only download once when called concurrently', async () => {
|
|
79
|
-
const expectedPath = path.join(binDir, getRipgrepBinaryName());
|
|
80
|
-
downloadRipGrepMock.mockImplementation(() => new Promise((resolve, reject) => {
|
|
81
|
-
setTimeout(() => {
|
|
82
|
-
fs.writeFile(expectedPath, '')
|
|
83
|
-
.then(() => resolve())
|
|
84
|
-
.catch(reject);
|
|
85
|
-
}, 0);
|
|
86
|
-
}));
|
|
87
|
-
const firstCall = ensureRgPath();
|
|
88
|
-
const secondCall = ensureRgPath();
|
|
89
|
-
const [pathOne, pathTwo] = await Promise.all([firstCall, secondCall]);
|
|
90
|
-
expect(pathOne).toBe(expectedPath);
|
|
91
|
-
expect(pathTwo).toBe(expectedPath);
|
|
92
|
-
expect(downloadRipGrepMock).toHaveBeenCalledTimes(1);
|
|
93
|
-
await expect(fs.access(expectedPath)).resolves.toBeUndefined();
|
|
94
44
|
});
|
|
95
45
|
});
|
|
96
46
|
describe('ensureRgPath', () => {
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
beforeEach(async () => {
|
|
100
|
-
downloadRipGrepMock.mockReset();
|
|
101
|
-
downloadRipGrepMock.mockResolvedValue(undefined);
|
|
102
|
-
tempRootDir = await fs.mkdtemp(path.join(os.tmpdir(), 'ripgrep-bin-'));
|
|
103
|
-
binDir = path.join(tempRootDir, 'bin');
|
|
104
|
-
await fs.mkdir(binDir, { recursive: true });
|
|
105
|
-
storageSpy.mockImplementation(() => binDir);
|
|
106
|
-
});
|
|
107
|
-
afterEach(async () => {
|
|
108
|
-
storageSpy.mockImplementation(() => originalGetGlobalBinDir());
|
|
109
|
-
await fs.rm(tempRootDir, { recursive: true, force: true });
|
|
47
|
+
beforeEach(() => {
|
|
48
|
+
vi.mocked(fileExists).mockReset();
|
|
110
49
|
});
|
|
111
50
|
it('should return rg path if ripgrep already exists', async () => {
|
|
112
|
-
|
|
113
|
-
await fs.writeFile(existingPath, '');
|
|
51
|
+
vi.mocked(fileExists).mockResolvedValue(true);
|
|
114
52
|
const rgPath = await ensureRgPath();
|
|
115
|
-
expect(rgPath).toBe(
|
|
116
|
-
expect(downloadRipGrep).not.toHaveBeenCalled();
|
|
117
|
-
});
|
|
118
|
-
it('should return rg path if ripgrep is downloaded successfully', async () => {
|
|
119
|
-
const expectedPath = path.join(binDir, getRipgrepBinaryName());
|
|
120
|
-
downloadRipGrepMock.mockImplementation(async () => {
|
|
121
|
-
await fs.writeFile(expectedPath, '');
|
|
122
|
-
});
|
|
123
|
-
const rgPath = await ensureRgPath();
|
|
124
|
-
expect(rgPath).toBe(expectedPath);
|
|
125
|
-
expect(downloadRipGrep).toHaveBeenCalledTimes(1);
|
|
126
|
-
await expect(fs.access(expectedPath)).resolves.toBeUndefined();
|
|
127
|
-
});
|
|
128
|
-
it('should throw an error if ripgrep cannot be used after download attempt', async () => {
|
|
129
|
-
await expect(ensureRgPath()).rejects.toThrow('Cannot use ripgrep.');
|
|
130
|
-
expect(downloadRipGrep).toHaveBeenCalledTimes(1);
|
|
53
|
+
expect(rgPath).toBe(await getRipgrepPath());
|
|
131
54
|
});
|
|
132
|
-
it('should
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
await expect(ensureRgPath()).rejects.toThrow(error);
|
|
136
|
-
expect(downloadRipGrep).toHaveBeenCalledWith(binDir);
|
|
137
|
-
});
|
|
138
|
-
it.runIf(process.platform === 'win32')('should detect ripgrep when only rg.exe exists on Windows', async () => {
|
|
139
|
-
const expectedRgExePath = path.join(binDir, 'rg.exe');
|
|
140
|
-
await fs.writeFile(expectedRgExePath, '');
|
|
141
|
-
const rgPath = await ensureRgPath();
|
|
142
|
-
expect(rgPath).toBe(expectedRgExePath);
|
|
143
|
-
expect(downloadRipGrep).not.toHaveBeenCalled();
|
|
144
|
-
await expect(fs.access(expectedRgExePath)).resolves.toBeUndefined();
|
|
55
|
+
it('should throw an error if ripgrep cannot be used', async () => {
|
|
56
|
+
vi.mocked(fileExists).mockResolvedValue(false);
|
|
57
|
+
await expect(ensureRgPath()).rejects.toThrow(/Cannot find bundled ripgrep binary/);
|
|
145
58
|
});
|
|
146
59
|
});
|
|
147
60
|
// Helper function to create mock spawn implementations
|
|
@@ -179,9 +92,6 @@ function createMockSpawn(options = {}) {
|
|
|
179
92
|
}
|
|
180
93
|
describe('RipGrepTool', () => {
|
|
181
94
|
let tempRootDir;
|
|
182
|
-
let tempBinRoot;
|
|
183
|
-
let binDir;
|
|
184
|
-
let ripgrepBinaryPath;
|
|
185
95
|
let grepTool;
|
|
186
96
|
const abortSignal = new AbortController().signal;
|
|
187
97
|
let mockConfig = {
|
|
@@ -196,18 +106,10 @@ describe('RipGrepTool', () => {
|
|
|
196
106
|
}),
|
|
197
107
|
};
|
|
198
108
|
beforeEach(async () => {
|
|
199
|
-
downloadRipGrepMock.mockReset();
|
|
200
|
-
downloadRipGrepMock.mockResolvedValue(undefined);
|
|
201
109
|
mockSpawn.mockReset();
|
|
202
110
|
mockSpawn.mockImplementation(createMockSpawn());
|
|
203
|
-
tempBinRoot = await fs.mkdtemp(path.join(os.tmpdir(), 'ripgrep-bin-'));
|
|
204
|
-
binDir = path.join(tempBinRoot, 'bin');
|
|
205
|
-
await fs.mkdir(binDir, { recursive: true });
|
|
206
|
-
const binaryName = process.platform === 'win32' ? 'rg.exe' : 'rg';
|
|
207
|
-
ripgrepBinaryPath = path.join(binDir, binaryName);
|
|
208
|
-
await fs.writeFile(ripgrepBinaryPath, '');
|
|
209
|
-
storageSpy.mockImplementation(() => binDir);
|
|
210
111
|
tempRootDir = await fs.mkdtemp(path.join(os.tmpdir(), 'grep-tool-root-'));
|
|
112
|
+
vi.mocked(fileExists).mockResolvedValue(true);
|
|
211
113
|
mockConfig = {
|
|
212
114
|
getTargetDir: () => tempRootDir,
|
|
213
115
|
getWorkspaceContext: () => createMockWorkspaceContext(tempRootDir),
|
|
@@ -247,9 +149,7 @@ describe('RipGrepTool', () => {
|
|
|
247
149
|
await fs.writeFile(path.join(tempRootDir, 'sub', 'fileD.md'), '# Markdown file\nThis is a test.');
|
|
248
150
|
});
|
|
249
151
|
afterEach(async () => {
|
|
250
|
-
storageSpy.mockImplementation(() => originalGetGlobalBinDir());
|
|
251
152
|
await fs.rm(tempRootDir, { recursive: true, force: true });
|
|
252
|
-
await fs.rm(tempBinRoot, { recursive: true, force: true });
|
|
253
153
|
});
|
|
254
154
|
describe('validateToolParams', () => {
|
|
255
155
|
it.each([
|
|
@@ -622,14 +522,13 @@ describe('RipGrepTool', () => {
|
|
|
622
522
|
expect(() => grepTool.build(params)).toThrow(/params must have required property 'pattern'/);
|
|
623
523
|
});
|
|
624
524
|
it('should throw an error if ripgrep is not available', async () => {
|
|
625
|
-
|
|
626
|
-
downloadRipGrepMock.mockResolvedValue(undefined);
|
|
525
|
+
vi.mocked(fileExists).mockResolvedValue(false);
|
|
627
526
|
const params = { pattern: 'world' };
|
|
628
527
|
const invocation = grepTool.build(params);
|
|
629
|
-
|
|
630
|
-
|
|
631
|
-
|
|
632
|
-
|
|
528
|
+
const result = await invocation.execute({ abortSignal });
|
|
529
|
+
expect(result.llmContent).toContain('Cannot find bundled ripgrep binary');
|
|
530
|
+
// restore the mock for subsequent tests
|
|
531
|
+
vi.mocked(fileExists).mockResolvedValue(true);
|
|
633
532
|
});
|
|
634
533
|
});
|
|
635
534
|
describe('multi-directory workspace', () => {
|
|
@@ -1575,7 +1474,50 @@ describe('RipGrepTool', () => {
|
|
|
1575
1474
|
});
|
|
1576
1475
|
});
|
|
1577
1476
|
});
|
|
1578
|
-
|
|
1579
|
-
|
|
1477
|
+
describe('getRipgrepPath', () => {
|
|
1478
|
+
afterEach(() => {
|
|
1479
|
+
vi.restoreAllMocks();
|
|
1480
|
+
});
|
|
1481
|
+
describe('OS/Architecture Resolution', () => {
|
|
1482
|
+
it.each([
|
|
1483
|
+
{ platform: 'darwin', arch: 'arm64', expectedBin: 'rg-darwin-arm64' },
|
|
1484
|
+
{ platform: 'darwin', arch: 'x64', expectedBin: 'rg-darwin-x64' },
|
|
1485
|
+
{ platform: 'linux', arch: 'arm64', expectedBin: 'rg-linux-arm64' },
|
|
1486
|
+
{ platform: 'linux', arch: 'x64', expectedBin: 'rg-linux-x64' },
|
|
1487
|
+
{ platform: 'win32', arch: 'x64', expectedBin: 'rg-win32-x64.exe' },
|
|
1488
|
+
])('should map $platform $arch to $expectedBin', async ({ platform, arch, expectedBin }) => {
|
|
1489
|
+
vi.spyOn(os, 'platform').mockReturnValue(platform);
|
|
1490
|
+
vi.spyOn(os, 'arch').mockReturnValue(arch);
|
|
1491
|
+
vi.mocked(fileExists).mockImplementation(async (checkPath) => checkPath.endsWith(expectedBin));
|
|
1492
|
+
const resolvedPath = await getRipgrepPath();
|
|
1493
|
+
expect(resolvedPath).not.toBeNull();
|
|
1494
|
+
expect(resolvedPath?.endsWith(expectedBin)).toBe(true);
|
|
1495
|
+
});
|
|
1496
|
+
});
|
|
1497
|
+
describe('Path Fallback Logic', () => {
|
|
1498
|
+
beforeEach(() => {
|
|
1499
|
+
vi.spyOn(os, 'platform').mockReturnValue('linux');
|
|
1500
|
+
vi.spyOn(os, 'arch').mockReturnValue('x64');
|
|
1501
|
+
});
|
|
1502
|
+
it('should resolve the SEA (flattened) path first', async () => {
|
|
1503
|
+
vi.mocked(fileExists).mockImplementation(async (checkPath) => checkPath.includes(path.normalize('tools/vendor/ripgrep')));
|
|
1504
|
+
const resolvedPath = await getRipgrepPath();
|
|
1505
|
+
expect(resolvedPath).not.toBeNull();
|
|
1506
|
+
expect(resolvedPath).toContain(path.normalize('tools/vendor/ripgrep'));
|
|
1507
|
+
});
|
|
1508
|
+
it('should fall back to the Dev path if SEA path is missing', async () => {
|
|
1509
|
+
vi.mocked(fileExists).mockImplementation(async (checkPath) => checkPath.includes(path.normalize('core/vendor/ripgrep')) &&
|
|
1510
|
+
!checkPath.includes('tools'));
|
|
1511
|
+
const resolvedPath = await getRipgrepPath();
|
|
1512
|
+
expect(resolvedPath).not.toBeNull();
|
|
1513
|
+
expect(resolvedPath).toContain(path.normalize('core/vendor/ripgrep'));
|
|
1514
|
+
expect(resolvedPath).not.toContain('tools');
|
|
1515
|
+
});
|
|
1516
|
+
it('should return null if binary is missing from both paths', async () => {
|
|
1517
|
+
vi.mocked(fileExists).mockResolvedValue(false);
|
|
1518
|
+
const resolvedPath = await getRipgrepPath();
|
|
1519
|
+
expect(resolvedPath).toBeNull();
|
|
1520
|
+
});
|
|
1521
|
+
});
|
|
1580
1522
|
});
|
|
1581
1523
|
//# sourceMappingURL=ripGrep.test.js.map
|