@google/gemini-cli-core 0.1.15 → 0.1.16-nightly.250805.99ba2f64
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 +32 -0
- package/dist/google-gemini-cli-core-0.1.16.tgz +0 -0
- package/dist/src/code_assist/converter.d.ts +2 -1
- package/dist/src/code_assist/converter.js +2 -1
- package/dist/src/code_assist/converter.js.map +1 -1
- package/dist/src/code_assist/converter.test.js +13 -10
- package/dist/src/code_assist/converter.test.js.map +1 -1
- package/dist/src/code_assist/server.d.ts +2 -2
- package/dist/src/code_assist/server.js +4 -4
- package/dist/src/code_assist/server.js.map +1 -1
- package/dist/src/code_assist/server.test.js +9 -9
- package/dist/src/code_assist/server.test.js.map +1 -1
- package/dist/src/code_assist/setup.js +1 -1
- package/dist/src/code_assist/setup.js.map +1 -1
- package/dist/src/code_assist/setup.test.js +2 -2
- package/dist/src/code_assist/setup.test.js.map +1 -1
- package/dist/src/config/config.d.ts +19 -7
- package/dist/src/config/config.js +53 -15
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +93 -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 +3 -1
- package/dist/src/core/client.js +74 -23
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +167 -21
- package/dist/src/core/client.test.js.map +1 -1
- package/dist/src/core/contentGenerator.d.ts +2 -2
- package/dist/src/core/contentGenerator.js.map +1 -1
- package/dist/src/core/coreToolScheduler.d.ts +1 -3
- package/dist/src/core/coreToolScheduler.js +25 -16
- 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 +3 -2
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/geminiChat.test.js +2 -2
- package/dist/src/core/geminiChat.test.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/nonInteractiveToolExecutor.js +11 -3
- package/dist/src/core/nonInteractiveToolExecutor.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 +3 -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 +27 -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 +100 -36
- package/dist/src/ide/ide-client.js.map +1 -1
- package/dist/src/ide/ide-installer.d.ts +14 -0
- package/dist/src/ide/ide-installer.js +109 -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 +55 -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 +4 -0
- package/dist/src/index.js +4 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/mcp/oauth-provider.js +3 -3
- package/dist/src/mcp/oauth-provider.js.map +1 -1
- package/dist/src/mcp/oauth-provider.test.js +9 -8
- package/dist/src/mcp/oauth-provider.test.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/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.js +7 -4
- package/dist/src/services/shellExecutionService.js.map +1 -1
- package/dist/src/services/shellExecutionService.test.js +11 -5
- package/dist/src/services/shellExecutionService.test.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.d.ts +4 -2
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +83 -35
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.d.ts +6 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js +19 -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/loggers.test.circular.js +2 -0
- package/dist/src/telemetry/loggers.test.circular.js.map +1 -1
- package/dist/src/telemetry/loggers.test.js +8 -3
- package/dist/src/telemetry/loggers.test.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 +19 -4
- package/dist/src/telemetry/types.js +30 -4
- package/dist/src/telemetry/types.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.test.js +3 -0
- package/dist/src/telemetry/uiTelemetry.test.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 +27 -3
- package/dist/src/tools/edit.js.map +1 -1
- package/dist/src/tools/edit.test.js +104 -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 +25 -2
- 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 +72 -5
- 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 +1 -1
- package/dist/src/tools/mcp-client.js +37 -31
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/mcp-client.test.js +34 -0
- 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/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.js +8 -4
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/shell.test.js +33 -1
- package/dist/src/tools/shell.test.js.map +1 -1
- package/dist/src/tools/tool-error.d.ts +22 -0
- package/dist/src/tools/tool-error.js +27 -0
- package/dist/src/tools/tool-error.js.map +1 -0
- package/dist/src/tools/tool-registry.test.js +8 -0
- package/dist/src/tools/tool-registry.test.js.map +1 -1
- package/dist/src/tools/tools.d.ts +8 -0
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/tools/write-file.js +7 -5
- package/dist/src/tools/write-file.js.map +1 -1
- package/dist/src/tools/write-file.test.js +56 -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 +59 -0
- package/dist/src/utils/bfsFileSearch.test.js.map +1 -1
- package/dist/src/utils/editCorrector.js +2 -2
- package/dist/src/utils/editCorrector.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/memoryDiscovery.d.ts +1 -1
- package/dist/src/utils/memoryDiscovery.js +54 -75
- 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 +3 -23
- 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/paths.d.ts +11 -2
- package/dist/src/utils/paths.js +24 -7
- package/dist/src/utils/paths.js.map +1 -1
- package/dist/src/utils/paths.test.d.ts +6 -0
- package/dist/src/utils/paths.test.js +153 -0
- package/dist/src/utils/paths.test.js.map +1 -0
- 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/secure-browser-launcher.d.ts +23 -0
- package/dist/src/utils/secure-browser-launcher.js +164 -0
- package/dist/src/utils/secure-browser-launcher.js.map +1 -0
- package/dist/src/utils/secure-browser-launcher.test.d.ts +6 -0
- package/dist/src/utils/secure-browser-launcher.test.js +149 -0
- package/dist/src/utils/secure-browser-launcher.test.js.map +1 -0
- package/dist/src/utils/summarizer.js +2 -2
- package/dist/src/utils/summarizer.js.map +1 -1
- 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
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
/**
|
|
7
|
+
* Opens a URL in the default browser using platform-specific commands.
|
|
8
|
+
* This implementation avoids shell injection vulnerabilities by:
|
|
9
|
+
* 1. Validating the URL to ensure it's HTTP/HTTPS only
|
|
10
|
+
* 2. Using execFile instead of exec to avoid shell interpretation
|
|
11
|
+
* 3. Passing the URL as an argument rather than constructing a command string
|
|
12
|
+
*
|
|
13
|
+
* @param url The URL to open
|
|
14
|
+
* @throws Error if the URL is invalid or if opening the browser fails
|
|
15
|
+
*/
|
|
16
|
+
export declare function openBrowserSecurely(url: string): Promise<void>;
|
|
17
|
+
/**
|
|
18
|
+
* Checks if the current environment should attempt to launch a browser.
|
|
19
|
+
* This is the same logic as in browser.ts for consistency.
|
|
20
|
+
*
|
|
21
|
+
* @returns True if the tool should attempt to launch a browser
|
|
22
|
+
*/
|
|
23
|
+
export declare function shouldLaunchBrowser(): boolean;
|
|
@@ -0,0 +1,164 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { execFile } from 'node:child_process';
|
|
7
|
+
import { promisify } from 'node:util';
|
|
8
|
+
import { platform } from 'node:os';
|
|
9
|
+
import { URL } from 'node:url';
|
|
10
|
+
const execFileAsync = promisify(execFile);
|
|
11
|
+
/**
|
|
12
|
+
* Validates that a URL is safe to open in a browser.
|
|
13
|
+
* Only allows HTTP and HTTPS URLs to prevent command injection.
|
|
14
|
+
*
|
|
15
|
+
* @param url The URL to validate
|
|
16
|
+
* @throws Error if the URL is invalid or uses an unsafe protocol
|
|
17
|
+
*/
|
|
18
|
+
function validateUrl(url) {
|
|
19
|
+
let parsedUrl;
|
|
20
|
+
try {
|
|
21
|
+
parsedUrl = new URL(url);
|
|
22
|
+
}
|
|
23
|
+
catch (_error) {
|
|
24
|
+
throw new Error(`Invalid URL: ${url}`);
|
|
25
|
+
}
|
|
26
|
+
// Only allow HTTP and HTTPS protocols
|
|
27
|
+
if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {
|
|
28
|
+
throw new Error(`Unsafe protocol: ${parsedUrl.protocol}. Only HTTP and HTTPS are allowed.`);
|
|
29
|
+
}
|
|
30
|
+
// Additional validation: ensure no newlines or control characters
|
|
31
|
+
// eslint-disable-next-line no-control-regex
|
|
32
|
+
if (/[\r\n\x00-\x1f]/.test(url)) {
|
|
33
|
+
throw new Error('URL contains invalid characters');
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* Opens a URL in the default browser using platform-specific commands.
|
|
38
|
+
* This implementation avoids shell injection vulnerabilities by:
|
|
39
|
+
* 1. Validating the URL to ensure it's HTTP/HTTPS only
|
|
40
|
+
* 2. Using execFile instead of exec to avoid shell interpretation
|
|
41
|
+
* 3. Passing the URL as an argument rather than constructing a command string
|
|
42
|
+
*
|
|
43
|
+
* @param url The URL to open
|
|
44
|
+
* @throws Error if the URL is invalid or if opening the browser fails
|
|
45
|
+
*/
|
|
46
|
+
export async function openBrowserSecurely(url) {
|
|
47
|
+
// Validate the URL first
|
|
48
|
+
validateUrl(url);
|
|
49
|
+
const platformName = platform();
|
|
50
|
+
let command;
|
|
51
|
+
let args;
|
|
52
|
+
switch (platformName) {
|
|
53
|
+
case 'darwin':
|
|
54
|
+
// macOS
|
|
55
|
+
command = 'open';
|
|
56
|
+
args = [url];
|
|
57
|
+
break;
|
|
58
|
+
case 'win32':
|
|
59
|
+
// Windows - use PowerShell with Start-Process
|
|
60
|
+
// This avoids the cmd.exe shell which is vulnerable to injection
|
|
61
|
+
command = 'powershell.exe';
|
|
62
|
+
args = [
|
|
63
|
+
'-NoProfile',
|
|
64
|
+
'-NonInteractive',
|
|
65
|
+
'-WindowStyle',
|
|
66
|
+
'Hidden',
|
|
67
|
+
'-Command',
|
|
68
|
+
`Start-Process '${url.replace(/'/g, "''")}'`,
|
|
69
|
+
];
|
|
70
|
+
break;
|
|
71
|
+
case 'linux':
|
|
72
|
+
case 'freebsd':
|
|
73
|
+
case 'openbsd':
|
|
74
|
+
// Linux and BSD variants
|
|
75
|
+
// Try xdg-open first, fall back to other options
|
|
76
|
+
command = 'xdg-open';
|
|
77
|
+
args = [url];
|
|
78
|
+
break;
|
|
79
|
+
default:
|
|
80
|
+
throw new Error(`Unsupported platform: ${platformName}`);
|
|
81
|
+
}
|
|
82
|
+
const options = {
|
|
83
|
+
// Don't inherit parent's environment to avoid potential issues
|
|
84
|
+
env: {
|
|
85
|
+
...process.env,
|
|
86
|
+
// Ensure we're not in a shell that might interpret special characters
|
|
87
|
+
SHELL: undefined,
|
|
88
|
+
},
|
|
89
|
+
// Detach the browser process so it doesn't block
|
|
90
|
+
detached: true,
|
|
91
|
+
stdio: 'ignore',
|
|
92
|
+
};
|
|
93
|
+
try {
|
|
94
|
+
await execFileAsync(command, args, options);
|
|
95
|
+
}
|
|
96
|
+
catch (error) {
|
|
97
|
+
// For Linux, try fallback commands if xdg-open fails
|
|
98
|
+
if ((platformName === 'linux' ||
|
|
99
|
+
platformName === 'freebsd' ||
|
|
100
|
+
platformName === 'openbsd') &&
|
|
101
|
+
command === 'xdg-open') {
|
|
102
|
+
const fallbackCommands = [
|
|
103
|
+
'gnome-open',
|
|
104
|
+
'kde-open',
|
|
105
|
+
'firefox',
|
|
106
|
+
'chromium',
|
|
107
|
+
'google-chrome',
|
|
108
|
+
];
|
|
109
|
+
for (const fallbackCommand of fallbackCommands) {
|
|
110
|
+
try {
|
|
111
|
+
await execFileAsync(fallbackCommand, [url], options);
|
|
112
|
+
return; // Success!
|
|
113
|
+
}
|
|
114
|
+
catch {
|
|
115
|
+
// Try next command
|
|
116
|
+
continue;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
// Re-throw the error if all attempts failed
|
|
121
|
+
throw new Error(`Failed to open browser: ${error instanceof Error ? error.message : 'Unknown error'}`);
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
/**
|
|
125
|
+
* Checks if the current environment should attempt to launch a browser.
|
|
126
|
+
* This is the same logic as in browser.ts for consistency.
|
|
127
|
+
*
|
|
128
|
+
* @returns True if the tool should attempt to launch a browser
|
|
129
|
+
*/
|
|
130
|
+
export function shouldLaunchBrowser() {
|
|
131
|
+
// A list of browser names that indicate we should not attempt to open a
|
|
132
|
+
// web browser for the user.
|
|
133
|
+
const browserBlocklist = ['www-browser'];
|
|
134
|
+
const browserEnv = process.env.BROWSER;
|
|
135
|
+
if (browserEnv && browserBlocklist.includes(browserEnv)) {
|
|
136
|
+
return false;
|
|
137
|
+
}
|
|
138
|
+
// Common environment variables used in CI/CD or other non-interactive shells.
|
|
139
|
+
if (process.env.CI || process.env.DEBIAN_FRONTEND === 'noninteractive') {
|
|
140
|
+
return false;
|
|
141
|
+
}
|
|
142
|
+
// The presence of SSH_CONNECTION indicates a remote session.
|
|
143
|
+
// We should not attempt to launch a browser unless a display is explicitly available
|
|
144
|
+
// (checked below for Linux).
|
|
145
|
+
const isSSH = !!process.env.SSH_CONNECTION;
|
|
146
|
+
// On Linux, the presence of a display server is a strong indicator of a GUI.
|
|
147
|
+
if (platform() === 'linux') {
|
|
148
|
+
// These are environment variables that can indicate a running compositor on Linux.
|
|
149
|
+
const displayVariables = ['DISPLAY', 'WAYLAND_DISPLAY', 'MIR_SOCKET'];
|
|
150
|
+
const hasDisplay = displayVariables.some((v) => !!process.env[v]);
|
|
151
|
+
if (!hasDisplay) {
|
|
152
|
+
return false;
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
// If in an SSH session on a non-Linux OS (e.g., macOS), don't launch browser.
|
|
156
|
+
// The Linux case is handled above (it's allowed if DISPLAY is set).
|
|
157
|
+
if (isSSH && platform() !== 'linux') {
|
|
158
|
+
return false;
|
|
159
|
+
}
|
|
160
|
+
// For non-Linux OSes, we generally assume a GUI is available
|
|
161
|
+
// unless other signals (like SSH) suggest otherwise.
|
|
162
|
+
return true;
|
|
163
|
+
}
|
|
164
|
+
//# sourceMappingURL=secure-browser-launcher.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"secure-browser-launcher.js","sourceRoot":"","sources":["../../../src/utils/secure-browser-launcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,149 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
|
|
7
|
+
import { openBrowserSecurely } from './secure-browser-launcher.js';
|
|
8
|
+
// Create mock function using vi.hoisted
|
|
9
|
+
const mockExecFile = vi.hoisted(() => vi.fn());
|
|
10
|
+
// Mock modules
|
|
11
|
+
vi.mock('node:child_process');
|
|
12
|
+
vi.mock('node:util', () => ({
|
|
13
|
+
promisify: () => mockExecFile,
|
|
14
|
+
}));
|
|
15
|
+
describe('secure-browser-launcher', () => {
|
|
16
|
+
let originalPlatform;
|
|
17
|
+
beforeEach(() => {
|
|
18
|
+
vi.clearAllMocks();
|
|
19
|
+
mockExecFile.mockResolvedValue({ stdout: '', stderr: '' });
|
|
20
|
+
originalPlatform = Object.getOwnPropertyDescriptor(process, 'platform');
|
|
21
|
+
});
|
|
22
|
+
afterEach(() => {
|
|
23
|
+
if (originalPlatform) {
|
|
24
|
+
Object.defineProperty(process, 'platform', originalPlatform);
|
|
25
|
+
}
|
|
26
|
+
});
|
|
27
|
+
function setPlatform(platform) {
|
|
28
|
+
Object.defineProperty(process, 'platform', {
|
|
29
|
+
value: platform,
|
|
30
|
+
configurable: true,
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
describe('URL validation', () => {
|
|
34
|
+
it('should allow valid HTTP URLs', async () => {
|
|
35
|
+
setPlatform('darwin');
|
|
36
|
+
await openBrowserSecurely('http://example.com');
|
|
37
|
+
expect(mockExecFile).toHaveBeenCalledWith('open', ['http://example.com'], expect.any(Object));
|
|
38
|
+
});
|
|
39
|
+
it('should allow valid HTTPS URLs', async () => {
|
|
40
|
+
setPlatform('darwin');
|
|
41
|
+
await openBrowserSecurely('https://example.com');
|
|
42
|
+
expect(mockExecFile).toHaveBeenCalledWith('open', ['https://example.com'], expect.any(Object));
|
|
43
|
+
});
|
|
44
|
+
it('should reject non-HTTP(S) protocols', async () => {
|
|
45
|
+
await expect(openBrowserSecurely('file:///etc/passwd')).rejects.toThrow('Unsafe protocol');
|
|
46
|
+
await expect(openBrowserSecurely('javascript:alert(1)')).rejects.toThrow('Unsafe protocol');
|
|
47
|
+
await expect(openBrowserSecurely('ftp://example.com')).rejects.toThrow('Unsafe protocol');
|
|
48
|
+
});
|
|
49
|
+
it('should reject invalid URLs', async () => {
|
|
50
|
+
await expect(openBrowserSecurely('not-a-url')).rejects.toThrow('Invalid URL');
|
|
51
|
+
await expect(openBrowserSecurely('')).rejects.toThrow('Invalid URL');
|
|
52
|
+
});
|
|
53
|
+
it('should reject URLs with control characters', async () => {
|
|
54
|
+
await expect(openBrowserSecurely('http://example.com\nmalicious-command')).rejects.toThrow('invalid characters');
|
|
55
|
+
await expect(openBrowserSecurely('http://example.com\rmalicious-command')).rejects.toThrow('invalid characters');
|
|
56
|
+
await expect(openBrowserSecurely('http://example.com\x00')).rejects.toThrow('invalid characters');
|
|
57
|
+
});
|
|
58
|
+
});
|
|
59
|
+
describe('Command injection prevention', () => {
|
|
60
|
+
it('should prevent PowerShell command injection on Windows', async () => {
|
|
61
|
+
setPlatform('win32');
|
|
62
|
+
// The POC from the vulnerability report
|
|
63
|
+
const maliciousUrl = "http://127.0.0.1:8080/?param=example#$(Invoke-Expression([System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String('Y2FsYy5leGU='))))";
|
|
64
|
+
await openBrowserSecurely(maliciousUrl);
|
|
65
|
+
// Verify that execFile was called (not exec) and the URL is passed safely
|
|
66
|
+
expect(mockExecFile).toHaveBeenCalledWith('powershell.exe', [
|
|
67
|
+
'-NoProfile',
|
|
68
|
+
'-NonInteractive',
|
|
69
|
+
'-WindowStyle',
|
|
70
|
+
'Hidden',
|
|
71
|
+
'-Command',
|
|
72
|
+
`Start-Process '${maliciousUrl.replace(/'/g, "''")}'`,
|
|
73
|
+
], expect.any(Object));
|
|
74
|
+
});
|
|
75
|
+
it('should handle URLs with special shell characters safely', async () => {
|
|
76
|
+
setPlatform('darwin');
|
|
77
|
+
const urlsWithSpecialChars = [
|
|
78
|
+
'http://example.com/path?param=value&other=$value',
|
|
79
|
+
'http://example.com/path#fragment;command',
|
|
80
|
+
'http://example.com/$(whoami)',
|
|
81
|
+
'http://example.com/`command`',
|
|
82
|
+
'http://example.com/|pipe',
|
|
83
|
+
'http://example.com/>redirect',
|
|
84
|
+
];
|
|
85
|
+
for (const url of urlsWithSpecialChars) {
|
|
86
|
+
await openBrowserSecurely(url);
|
|
87
|
+
// Verify the URL is passed as an argument, not interpreted by shell
|
|
88
|
+
expect(mockExecFile).toHaveBeenCalledWith('open', [url], expect.any(Object));
|
|
89
|
+
}
|
|
90
|
+
});
|
|
91
|
+
it('should properly escape single quotes in URLs on Windows', async () => {
|
|
92
|
+
setPlatform('win32');
|
|
93
|
+
const urlWithSingleQuotes = "http://example.com/path?name=O'Brien&test='value'";
|
|
94
|
+
await openBrowserSecurely(urlWithSingleQuotes);
|
|
95
|
+
// Verify that single quotes are escaped by doubling them
|
|
96
|
+
expect(mockExecFile).toHaveBeenCalledWith('powershell.exe', [
|
|
97
|
+
'-NoProfile',
|
|
98
|
+
'-NonInteractive',
|
|
99
|
+
'-WindowStyle',
|
|
100
|
+
'Hidden',
|
|
101
|
+
'-Command',
|
|
102
|
+
`Start-Process 'http://example.com/path?name=O''Brien&test=''value'''`,
|
|
103
|
+
], expect.any(Object));
|
|
104
|
+
});
|
|
105
|
+
});
|
|
106
|
+
describe('Platform-specific behavior', () => {
|
|
107
|
+
it('should use correct command on macOS', async () => {
|
|
108
|
+
setPlatform('darwin');
|
|
109
|
+
await openBrowserSecurely('https://example.com');
|
|
110
|
+
expect(mockExecFile).toHaveBeenCalledWith('open', ['https://example.com'], expect.any(Object));
|
|
111
|
+
});
|
|
112
|
+
it('should use PowerShell on Windows', async () => {
|
|
113
|
+
setPlatform('win32');
|
|
114
|
+
await openBrowserSecurely('https://example.com');
|
|
115
|
+
expect(mockExecFile).toHaveBeenCalledWith('powershell.exe', expect.arrayContaining([
|
|
116
|
+
'-Command',
|
|
117
|
+
`Start-Process 'https://example.com'`,
|
|
118
|
+
]), expect.any(Object));
|
|
119
|
+
});
|
|
120
|
+
it('should use xdg-open on Linux', async () => {
|
|
121
|
+
setPlatform('linux');
|
|
122
|
+
await openBrowserSecurely('https://example.com');
|
|
123
|
+
expect(mockExecFile).toHaveBeenCalledWith('xdg-open', ['https://example.com'], expect.any(Object));
|
|
124
|
+
});
|
|
125
|
+
it('should throw on unsupported platforms', async () => {
|
|
126
|
+
setPlatform('aix');
|
|
127
|
+
await expect(openBrowserSecurely('https://example.com')).rejects.toThrow('Unsupported platform');
|
|
128
|
+
});
|
|
129
|
+
});
|
|
130
|
+
describe('Error handling', () => {
|
|
131
|
+
it('should handle browser launch failures gracefully', async () => {
|
|
132
|
+
setPlatform('darwin');
|
|
133
|
+
mockExecFile.mockRejectedValueOnce(new Error('Command not found'));
|
|
134
|
+
await expect(openBrowserSecurely('https://example.com')).rejects.toThrow('Failed to open browser');
|
|
135
|
+
});
|
|
136
|
+
it('should try fallback browsers on Linux', async () => {
|
|
137
|
+
setPlatform('linux');
|
|
138
|
+
// First call to xdg-open fails
|
|
139
|
+
mockExecFile.mockRejectedValueOnce(new Error('Command not found'));
|
|
140
|
+
// Second call to gnome-open succeeds
|
|
141
|
+
mockExecFile.mockResolvedValueOnce({ stdout: '', stderr: '' });
|
|
142
|
+
await openBrowserSecurely('https://example.com');
|
|
143
|
+
expect(mockExecFile).toHaveBeenCalledTimes(2);
|
|
144
|
+
expect(mockExecFile).toHaveBeenNthCalledWith(1, 'xdg-open', ['https://example.com'], expect.any(Object));
|
|
145
|
+
expect(mockExecFile).toHaveBeenNthCalledWith(2, 'gnome-open', ['https://example.com'], expect.any(Object));
|
|
146
|
+
});
|
|
147
|
+
});
|
|
148
|
+
});
|
|
149
|
+
//# sourceMappingURL=secure-browser-launcher.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"secure-browser-launcher.test.js","sourceRoot":"","sources":["../../../src/utils/secure-browser-launcher.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAEnE,wCAAwC;AACxC,MAAM,YAAY,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAE/C,eAAe;AACf,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;AAC9B,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC;IAC1B,SAAS,EAAE,GAAG,EAAE,CAAC,YAAY;CAC9B,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACvC,IAAI,gBAAgD,CAAC;IAErD,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,YAAY,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;QAC3D,gBAAgB,GAAG,MAAM,CAAC,wBAAwB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,gBAAgB,EAAE,CAAC;YACrB,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,SAAS,WAAW,CAAC,QAAgB;QACnC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE;YACzC,KAAK,EAAE,QAAQ;YACf,YAAY,EAAE,IAAI;SACnB,CAAC,CAAC;IACL,CAAC;IAED,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC9B,EAAE,CAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;YAC5C,WAAW,CAAC,QAAQ,CAAC,CAAC;YACtB,MAAM,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;YAChD,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CACvC,MAAM,EACN,CAAC,oBAAoB,CAAC,EACtB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;YAC7C,WAAW,CAAC,QAAQ,CAAC,CAAC;YACtB,MAAM,mBAAmB,CAAC,qBAAqB,CAAC,CAAC;YACjD,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CACvC,MAAM,EACN,CAAC,qBAAqB,CAAC,EACvB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;YACnD,MAAM,MAAM,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CACrE,iBAAiB,CAClB,CAAC;YACF,MAAM,MAAM,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CACtE,iBAAiB,CAClB,CAAC;YACF,MAAM,MAAM,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CACpE,iBAAiB,CAClB,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;YAC1C,MAAM,MAAM,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAC5D,aAAa,CACd,CAAC;YACF,MAAM,MAAM,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QACvE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;YAC1D,MAAM,MAAM,CACV,mBAAmB,CAAC,uCAAuC,CAAC,CAC7D,CAAC,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;YACxC,MAAM,MAAM,CACV,mBAAmB,CAAC,uCAAuC,CAAC,CAC7D,CAAC,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;YACxC,MAAM,MAAM,CACV,mBAAmB,CAAC,wBAAwB,CAAC,CAC9C,CAAC,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,8BAA8B,EAAE,GAAG,EAAE;QAC5C,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;YACtE,WAAW,CAAC,OAAO,CAAC,CAAC;YAErB,wCAAwC;YACxC,MAAM,YAAY,GAChB,uJAAuJ,CAAC;YAE1J,MAAM,mBAAmB,CAAC,YAAY,CAAC,CAAC;YAExC,0EAA0E;YAC1E,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CACvC,gBAAgB,EAChB;gBACE,YAAY;gBACZ,iBAAiB;gBACjB,cAAc;gBACd,QAAQ;gBACR,UAAU;gBACV,kBAAkB,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG;aACtD,EACD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;YACvE,WAAW,CAAC,QAAQ,CAAC,CAAC;YAEtB,MAAM,oBAAoB,GAAG;gBAC3B,kDAAkD;gBAClD,0CAA0C;gBAC1C,8BAA8B;gBAC9B,8BAA8B;gBAC9B,0BAA0B;gBAC1B,8BAA8B;aAC/B,CAAC;YAEF,KAAK,MAAM,GAAG,IAAI,oBAAoB,EAAE,CAAC;gBACvC,MAAM,mBAAmB,CAAC,GAAG,CAAC,CAAC;gBAC/B,oEAAoE;gBACpE,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CACvC,MAAM,EACN,CAAC,GAAG,CAAC,EACL,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;YACvE,WAAW,CAAC,OAAO,CAAC,CAAC;YAErB,MAAM,mBAAmB,GACvB,mDAAmD,CAAC;YACtD,MAAM,mBAAmB,CAAC,mBAAmB,CAAC,CAAC;YAE/C,yDAAyD;YACzD,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CACvC,gBAAgB,EAChB;gBACE,YAAY;gBACZ,iBAAiB;gBACjB,cAAc;gBACd,QAAQ;gBACR,UAAU;gBACV,sEAAsE;aACvE,EACD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;QAC1C,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;YACnD,WAAW,CAAC,QAAQ,CAAC,CAAC;YACtB,MAAM,mBAAmB,CAAC,qBAAqB,CAAC,CAAC;YACjD,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CACvC,MAAM,EACN,CAAC,qBAAqB,CAAC,EACvB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kCAAkC,EAAE,KAAK,IAAI,EAAE;YAChD,WAAW,CAAC,OAAO,CAAC,CAAC;YACrB,MAAM,mBAAmB,CAAC,qBAAqB,CAAC,CAAC;YACjD,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CACvC,gBAAgB,EAChB,MAAM,CAAC,eAAe,CAAC;gBACrB,UAAU;gBACV,qCAAqC;aACtC,CAAC,EACF,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;YAC5C,WAAW,CAAC,OAAO,CAAC,CAAC;YACrB,MAAM,mBAAmB,CAAC,qBAAqB,CAAC,CAAC;YACjD,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CACvC,UAAU,EACV,CAAC,qBAAqB,CAAC,EACvB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;YACrD,WAAW,CAAC,KAAK,CAAC,CAAC;YACnB,MAAM,MAAM,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CACtE,sBAAsB,CACvB,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC9B,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;YAChE,WAAW,CAAC,QAAQ,CAAC,CAAC;YACtB,YAAY,CAAC,qBAAqB,CAAC,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC;YAEnE,MAAM,MAAM,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CACtE,wBAAwB,CACzB,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;YACrD,WAAW,CAAC,OAAO,CAAC,CAAC;YAErB,+BAA+B;YAC/B,YAAY,CAAC,qBAAqB,CAAC,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC;YACnE,qCAAqC;YACrC,YAAY,CAAC,qBAAqB,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;YAE/D,MAAM,mBAAmB,CAAC,qBAAqB,CAAC,CAAC;YAEjD,MAAM,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YAC9C,MAAM,CAAC,YAAY,CAAC,CAAC,uBAAuB,CAC1C,CAAC,EACD,UAAU,EACV,CAAC,qBAAqB,CAAC,EACvB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;YACF,MAAM,CAAC,YAAY,CAAC,CAAC,uBAAuB,CAC1C,CAAC,EACD,YAAY,EACZ,CAAC,qBAAqB,CAAC,EACvB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import {
|
|
6
|
+
import { DEFAULT_GEMINI_FLASH_LITE_MODEL } from '../config/models.js';
|
|
7
7
|
import { getResponseText, partToString } from './partUtils.js';
|
|
8
8
|
/**
|
|
9
9
|
* The default summarizer for tool results.
|
|
@@ -40,7 +40,7 @@ export async function summarizeToolOutput(textToSummarize, geminiClient, abortSi
|
|
|
40
40
|
maxOutputTokens,
|
|
41
41
|
};
|
|
42
42
|
try {
|
|
43
|
-
const parsedResponse = (await geminiClient.generateContent(contents, toolOutputSummarizerConfig, abortSignal,
|
|
43
|
+
const parsedResponse = (await geminiClient.generateContent(contents, toolOutputSummarizerConfig, abortSignal, DEFAULT_GEMINI_FLASH_LITE_MODEL));
|
|
44
44
|
return getResponseText(parsedResponse) || textToSummarize;
|
|
45
45
|
}
|
|
46
46
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"summarizer.js","sourceRoot":"","sources":["../../../src/utils/summarizer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AASH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"summarizer.js","sourceRoot":"","sources":["../../../src/utils/summarizer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AASH,OAAO,EAAE,+BAA+B,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAc/D;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAe,CAC3C,MAAkB,EAClB,aAA2B,EAC3B,YAAyB,EACzB,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;AAExD,MAAM,4BAA4B,GAAG;;;;;;;;;;;;CAYpC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAe,CAAC,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,CAC7E,mBAAmB,CACjB,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC,EAC/B,YAAY,EACZ,WAAW,CACZ,CAAC;AAEJ,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,eAAuB,EACvB,YAA0B,EAC1B,WAAwB,EACxB,kBAA0B,IAAI;IAE9B,8GAA8G;IAC9G,wFAAwF;IACxF,IAAI,CAAC,eAAe,IAAI,eAAe,CAAC,MAAM,GAAG,eAAe,EAAE,CAAC;QACjE,OAAO,eAAe,CAAC;IACzB,CAAC;IACD,MAAM,MAAM,GAAG,4BAA4B,CAAC,OAAO,CACjD,mBAAmB,EACnB,MAAM,CAAC,eAAe,CAAC,CACxB,CAAC,OAAO,CAAC,mBAAmB,EAAE,eAAe,CAAC,CAAC;IAEhD,MAAM,QAAQ,GAAc,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;IAC1E,MAAM,0BAA0B,GAA0B;QACxD,eAAe;KAChB,CAAC;IACF,IAAI,CAAC;QACH,MAAM,cAAc,GAAG,CAAC,MAAM,YAAY,CAAC,eAAe,CACxD,QAAQ,EACR,0BAA0B,EAC1B,WAAW,EACX,+BAA+B,CAChC,CAAuC,CAAC;QACzC,OAAO,eAAe,CAAC,cAAc,CAAC,IAAI,eAAe,CAAC;IAC5D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE,KAAK,CAAC,CAAC;QACzD,OAAO,eAAe,CAAC;IACzB,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
/**
|
|
7
|
+
* WorkspaceContext manages multiple workspace directories and validates paths
|
|
8
|
+
* against them. This allows the CLI to operate on files from multiple directories
|
|
9
|
+
* in a single session.
|
|
10
|
+
*/
|
|
11
|
+
export declare class WorkspaceContext {
|
|
12
|
+
private directories;
|
|
13
|
+
/**
|
|
14
|
+
* Creates a new WorkspaceContext with the given initial directory and optional additional directories.
|
|
15
|
+
* @param initialDirectory The initial working directory (usually cwd)
|
|
16
|
+
* @param additionalDirectories Optional array of additional directories to include
|
|
17
|
+
*/
|
|
18
|
+
constructor(initialDirectory: string, additionalDirectories?: string[]);
|
|
19
|
+
/**
|
|
20
|
+
* Adds a directory to the workspace.
|
|
21
|
+
* @param directory The directory path to add (can be relative or absolute)
|
|
22
|
+
* @param basePath Optional base path for resolving relative paths (defaults to cwd)
|
|
23
|
+
*/
|
|
24
|
+
addDirectory(directory: string, basePath?: string): void;
|
|
25
|
+
/**
|
|
26
|
+
* Internal method to add a directory with validation.
|
|
27
|
+
*/
|
|
28
|
+
private addDirectoryInternal;
|
|
29
|
+
/**
|
|
30
|
+
* Gets a copy of all workspace directories.
|
|
31
|
+
* @returns Array of absolute directory paths
|
|
32
|
+
*/
|
|
33
|
+
getDirectories(): readonly string[];
|
|
34
|
+
/**
|
|
35
|
+
* Checks if a given path is within any of the workspace directories.
|
|
36
|
+
* @param pathToCheck The path to validate
|
|
37
|
+
* @returns True if the path is within the workspace, false otherwise
|
|
38
|
+
*/
|
|
39
|
+
isPathWithinWorkspace(pathToCheck: string): boolean;
|
|
40
|
+
/**
|
|
41
|
+
* Checks if a path is within a given root directory.
|
|
42
|
+
* @param pathToCheck The absolute path to check
|
|
43
|
+
* @param rootDirectory The absolute root directory
|
|
44
|
+
* @returns True if the path is within the root directory, false otherwise
|
|
45
|
+
*/
|
|
46
|
+
private isPathWithinRoot;
|
|
47
|
+
}
|
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import * as fs from 'fs';
|
|
7
|
+
import * as path from 'path';
|
|
8
|
+
/**
|
|
9
|
+
* WorkspaceContext manages multiple workspace directories and validates paths
|
|
10
|
+
* against them. This allows the CLI to operate on files from multiple directories
|
|
11
|
+
* in a single session.
|
|
12
|
+
*/
|
|
13
|
+
export class WorkspaceContext {
|
|
14
|
+
directories;
|
|
15
|
+
/**
|
|
16
|
+
* Creates a new WorkspaceContext with the given initial directory and optional additional directories.
|
|
17
|
+
* @param initialDirectory The initial working directory (usually cwd)
|
|
18
|
+
* @param additionalDirectories Optional array of additional directories to include
|
|
19
|
+
*/
|
|
20
|
+
constructor(initialDirectory, additionalDirectories = []) {
|
|
21
|
+
this.directories = new Set();
|
|
22
|
+
this.addDirectoryInternal(initialDirectory);
|
|
23
|
+
for (const dir of additionalDirectories) {
|
|
24
|
+
this.addDirectoryInternal(dir);
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* Adds a directory to the workspace.
|
|
29
|
+
* @param directory The directory path to add (can be relative or absolute)
|
|
30
|
+
* @param basePath Optional base path for resolving relative paths (defaults to cwd)
|
|
31
|
+
*/
|
|
32
|
+
addDirectory(directory, basePath = process.cwd()) {
|
|
33
|
+
this.addDirectoryInternal(directory, basePath);
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* Internal method to add a directory with validation.
|
|
37
|
+
*/
|
|
38
|
+
addDirectoryInternal(directory, basePath = process.cwd()) {
|
|
39
|
+
const absolutePath = path.isAbsolute(directory)
|
|
40
|
+
? directory
|
|
41
|
+
: path.resolve(basePath, directory);
|
|
42
|
+
if (!fs.existsSync(absolutePath)) {
|
|
43
|
+
throw new Error(`Directory does not exist: ${absolutePath}`);
|
|
44
|
+
}
|
|
45
|
+
const stats = fs.statSync(absolutePath);
|
|
46
|
+
if (!stats.isDirectory()) {
|
|
47
|
+
throw new Error(`Path is not a directory: ${absolutePath}`);
|
|
48
|
+
}
|
|
49
|
+
let realPath;
|
|
50
|
+
try {
|
|
51
|
+
realPath = fs.realpathSync(absolutePath);
|
|
52
|
+
}
|
|
53
|
+
catch (_error) {
|
|
54
|
+
throw new Error(`Failed to resolve path: ${absolutePath}`);
|
|
55
|
+
}
|
|
56
|
+
this.directories.add(realPath);
|
|
57
|
+
}
|
|
58
|
+
/**
|
|
59
|
+
* Gets a copy of all workspace directories.
|
|
60
|
+
* @returns Array of absolute directory paths
|
|
61
|
+
*/
|
|
62
|
+
getDirectories() {
|
|
63
|
+
return Array.from(this.directories);
|
|
64
|
+
}
|
|
65
|
+
/**
|
|
66
|
+
* Checks if a given path is within any of the workspace directories.
|
|
67
|
+
* @param pathToCheck The path to validate
|
|
68
|
+
* @returns True if the path is within the workspace, false otherwise
|
|
69
|
+
*/
|
|
70
|
+
isPathWithinWorkspace(pathToCheck) {
|
|
71
|
+
try {
|
|
72
|
+
const absolutePath = path.resolve(pathToCheck);
|
|
73
|
+
let resolvedPath = absolutePath;
|
|
74
|
+
if (fs.existsSync(absolutePath)) {
|
|
75
|
+
try {
|
|
76
|
+
resolvedPath = fs.realpathSync(absolutePath);
|
|
77
|
+
}
|
|
78
|
+
catch (_error) {
|
|
79
|
+
return false;
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
for (const dir of this.directories) {
|
|
83
|
+
if (this.isPathWithinRoot(resolvedPath, dir)) {
|
|
84
|
+
return true;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
return false;
|
|
88
|
+
}
|
|
89
|
+
catch (_error) {
|
|
90
|
+
return false;
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
/**
|
|
94
|
+
* Checks if a path is within a given root directory.
|
|
95
|
+
* @param pathToCheck The absolute path to check
|
|
96
|
+
* @param rootDirectory The absolute root directory
|
|
97
|
+
* @returns True if the path is within the root directory, false otherwise
|
|
98
|
+
*/
|
|
99
|
+
isPathWithinRoot(pathToCheck, rootDirectory) {
|
|
100
|
+
const relative = path.relative(rootDirectory, pathToCheck);
|
|
101
|
+
return (!relative.startsWith(`..${path.sep}`) &&
|
|
102
|
+
relative !== '..' &&
|
|
103
|
+
!path.isAbsolute(relative));
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
//# sourceMappingURL=workspaceContext.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"workspaceContext.js","sourceRoot":"","sources":["../../../src/utils/workspaceContext.ts"],"names":[],"mappings":"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"}
|