@google/gemini-cli-core 0.67.0-nightly.20261104.g89e9d25d6 → 0.67.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/README.md +24 -18
- package/dist/docs/changelogs/index.md +0 -24
- package/dist/docs/changelogs/latest.md +90 -83
- package/dist/docs/changelogs/preview.md +87 -89
- package/dist/docs/cli/sandbox.md +2 -8
- package/dist/docs/cli/themes.md +3 -6
- package/dist/docs/extensions/releasing.md +0 -32
- package/dist/docs/reference/configuration.md +10 -2
- package/dist/src/availability/autoRoutingFallback.integration.test.js +2 -95
- package/dist/src/availability/autoRoutingFallback.integration.test.js.map +1 -1
- package/dist/src/availability/errorClassification.d.ts +0 -2
- package/dist/src/availability/errorClassification.js +0 -8
- package/dist/src/availability/errorClassification.js.map +1 -1
- package/dist/src/availability/policyHelpers.test.js +1 -8
- package/dist/src/availability/policyHelpers.test.js.map +1 -1
- package/dist/src/code_assist/oauth2.test.js +1 -4
- package/dist/src/code_assist/oauth2.test.js.map +1 -1
- package/dist/src/code_assist/server.js +15 -24
- package/dist/src/code_assist/server.js.map +1 -1
- package/dist/src/code_assist/server.test.js +0 -165
- package/dist/src/code_assist/server.test.js.map +1 -1
- package/dist/src/config/config.js +0 -1
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +1 -4
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/defaultModelConfigs.js +7 -1
- package/dist/src/config/defaultModelConfigs.js.map +1 -1
- package/dist/src/config/models.d.ts +1 -2
- package/dist/src/config/models.js +7 -20
- package/dist/src/config/models.js.map +1 -1
- package/dist/src/config/models.test.js +1 -43
- package/dist/src/config/models.test.js.map +1 -1
- package/dist/src/core/baseLlmClient.js +0 -15
- package/dist/src/core/baseLlmClient.js.map +1 -1
- package/dist/src/core/baseLlmClient.test.js +0 -37
- package/dist/src/core/baseLlmClient.test.js.map +1 -1
- package/dist/src/core/client.js +1 -26
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +3 -8
- package/dist/src/core/client.test.js.map +1 -1
- package/dist/src/core/geminiChat.js +4 -29
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/geminiChat.test.js +0 -80
- package/dist/src/core/geminiChat.test.js.map +1 -1
- package/dist/src/fallback/handler.js +5 -13
- package/dist/src/fallback/handler.js.map +1 -1
- package/dist/src/fallback/handler.test.js +2 -30
- package/dist/src/fallback/handler.test.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/generated/git-commit.js.map +1 -1
- package/dist/src/ide/process-utils.js +20 -69
- package/dist/src/ide/process-utils.js.map +1 -1
- package/dist/src/ide/process-utils.test.js +18 -161
- package/dist/src/ide/process-utils.test.js.map +1 -1
- package/dist/src/routing/strategies/defaultStrategy.js +1 -1
- package/dist/src/routing/strategies/defaultStrategy.js.map +1 -1
- package/dist/src/routing/strategies/defaultStrategy.test.js +0 -14
- package/dist/src/routing/strategies/defaultStrategy.test.js.map +1 -1
- package/dist/src/routing/strategies/fallbackStrategy.js +2 -3
- package/dist/src/routing/strategies/fallbackStrategy.js.map +1 -1
- package/dist/src/routing/strategies/fallbackStrategy.test.js +0 -32
- package/dist/src/routing/strategies/fallbackStrategy.test.js.map +1 -1
- package/dist/src/routing/strategies/overrideStrategy.js +1 -1
- package/dist/src/routing/strategies/overrideStrategy.js.map +1 -1
- package/dist/src/routing/strategies/overrideStrategy.test.js +0 -11
- package/dist/src/routing/strategies/overrideStrategy.test.js.map +1 -1
- package/dist/src/services/executionLifecycleService.d.ts +1 -7
- package/dist/src/services/executionLifecycleService.js +2 -9
- package/dist/src/services/executionLifecycleService.js.map +1 -1
- package/dist/src/services/executionLifecycleService.test.js +0 -27
- package/dist/src/services/executionLifecycleService.test.js.map +1 -1
- package/dist/src/services/gitService.js +2 -136
- package/dist/src/services/gitService.js.map +1 -1
- package/dist/src/services/gitService.test.js +3 -208
- package/dist/src/services/gitService.test.js.map +1 -1
- package/dist/src/services/modelConfigService.test.js +0 -23
- package/dist/src/services/modelConfigService.test.js.map +1 -1
- package/dist/src/services/sessionSummaryService.js +2 -5
- package/dist/src/services/sessionSummaryService.js.map +1 -1
- package/dist/src/services/sessionSummaryService.test.js +0 -18
- package/dist/src/services/sessionSummaryService.test.js.map +1 -1
- package/dist/src/services/shellExecutionService.d.ts +1 -2
- package/dist/src/services/shellExecutionService.js +5 -15
- package/dist/src/services/shellExecutionService.js.map +1 -1
- package/dist/src/services/shellExecutionService.test.js +2 -22
- package/dist/src/services/shellExecutionService.test.js.map +1 -1
- package/dist/src/tools/ask-user.js +1 -2
- package/dist/src/tools/ask-user.js.map +1 -1
- package/dist/src/tools/ask-user.test.js +0 -28
- package/dist/src/tools/ask-user.test.js.map +1 -1
- package/dist/src/tools/glob.js +4 -19
- package/dist/src/tools/glob.js.map +1 -1
- package/dist/src/tools/glob.test.js +0 -91
- package/dist/src/tools/glob.test.js.map +1 -1
- package/dist/src/tools/shellBackgroundTools.test.js +0 -4
- package/dist/src/tools/shellBackgroundTools.test.js.map +1 -1
- package/dist/src/tools/write-file.js +1 -1
- package/dist/src/tools/write-file.js.map +1 -1
- package/dist/src/tools/write-file.test.js +0 -18
- package/dist/src/tools/write-file.test.js.map +1 -1
- package/dist/src/utils/editCorrector.js +12 -12
- package/dist/src/utils/editCorrector.js.map +1 -1
- package/dist/src/utils/editCorrector.test.js +0 -16
- package/dist/src/utils/editCorrector.test.js.map +1 -1
- package/dist/src/utils/events.d.ts +0 -1
- package/dist/src/utils/events.js.map +1 -1
- package/dist/src/utils/fileUtils.js +19 -39
- package/dist/src/utils/fileUtils.js.map +1 -1
- package/dist/src/utils/fileUtils.test.js +0 -284
- package/dist/src/utils/fileUtils.test.js.map +1 -1
- package/dist/src/utils/filesearch/fileSearch.js +5 -36
- package/dist/src/utils/filesearch/fileSearch.js.map +1 -1
- package/dist/src/utils/filesearch/fileSearch.test.js +0 -146
- package/dist/src/utils/filesearch/fileSearch.test.js.map +1 -1
- package/dist/src/utils/ignorePathUtils.js +2 -3
- package/dist/src/utils/ignorePathUtils.js.map +1 -1
- package/dist/src/utils/ignorePathUtils.test.js +1 -20
- package/dist/src/utils/ignorePathUtils.test.js.map +1 -1
- package/dist/src/utils/llm-edit-fixer.js +10 -13
- package/dist/src/utils/llm-edit-fixer.js.map +1 -1
- package/dist/src/utils/llm-edit-fixer.test.js +0 -30
- package/dist/src/utils/llm-edit-fixer.test.js.map +1 -1
- package/dist/src/utils/summarizer.js +3 -7
- package/dist/src/utils/summarizer.js.map +1 -1
- package/dist/src/utils/summarizer.test.js +0 -14
- package/dist/src/utils/summarizer.test.js.map +1 -1
- package/dist/src/utils/textUtils.d.ts +0 -7
- package/dist/src/utils/textUtils.js +0 -157
- package/dist/src/utils/textUtils.js.map +1 -1
- package/dist/src/utils/textUtils.test.js +1 -41
- package/dist/src/utils/textUtils.test.js.map +1 -1
- package/dist/src/voice/whisperModelManager.d.ts +1 -4
- package/dist/src/voice/whisperModelManager.js +8 -175
- package/dist/src/voice/whisperModelManager.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/dist/google-gemini-cli-core-0.67.0-nightly.20261020.gb041de017.tgz +0 -0
- package/dist/src/availability/errorClassification.test.d.ts +0 -6
- package/dist/src/availability/errorClassification.test.js +0 -56
- package/dist/src/availability/errorClassification.test.js.map +0 -1
- package/dist/src/ide/process-utils.integration.test.d.ts +0 -6
- package/dist/src/ide/process-utils.integration.test.js +0 -276
- package/dist/src/ide/process-utils.integration.test.js.map +0 -1
- package/dist/src/voice/whisperModelManager.test.d.ts +0 -6
- package/dist/src/voice/whisperModelManager.test.js +0 -514
- package/dist/src/voice/whisperModelManager.test.js.map +0 -1
|
@@ -68,21 +68,13 @@ export async function handleFallback(config, failedModel, authType, error) {
|
|
|
68
68
|
}
|
|
69
69
|
try {
|
|
70
70
|
const intent = await handler(failedModel, fallbackModel, error);
|
|
71
|
-
// If the user chose
|
|
72
|
-
//
|
|
73
|
-
//
|
|
74
|
-
//
|
|
75
|
-
|
|
76
|
-
// We DO NOT apply any transition if the user chose 'stop' or 'retry_later',
|
|
77
|
-
// allowing them to try again later with the same model state.
|
|
78
|
-
if (intent === 'retry_always') {
|
|
71
|
+
// If the user chose to switch/retry, we apply the availability transition
|
|
72
|
+
// to the failed model (e.g. marking it terminal if it had a quota error).
|
|
73
|
+
// We DO NOT apply it if the user chose 'stop' or 'retry_later', allowing
|
|
74
|
+
// them to try again later with the same model state.
|
|
75
|
+
if (intent === 'retry_always' || intent === 'retry_once') {
|
|
79
76
|
applyAvailabilityTransition(getAvailabilityContext, failureKind);
|
|
80
77
|
}
|
|
81
|
-
else if (intent === 'retry_once' && fallbackModel !== failedModel) {
|
|
82
|
-
const targetModel = failedPolicy?.model ?? failedModel;
|
|
83
|
-
availability.markRetryOncePerTurn(targetModel, failedPolicy?.maxAttempts);
|
|
84
|
-
availability.consumeStickyAttempt(targetModel);
|
|
85
|
-
}
|
|
86
78
|
return await processIntent(config, intent, fallbackModel, failedModel !== activeModel ? failedModel : undefined);
|
|
87
79
|
}
|
|
88
80
|
catch (handlerError) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/fallback/handler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/fallback/handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -229,39 +229,11 @@ describe('handleFallback', () => {
|
|
|
229
229
|
expect(policyConfig.activateFallbackMode).not.toHaveBeenCalled();
|
|
230
230
|
// TODO: add logging expect statement
|
|
231
231
|
});
|
|
232
|
-
it('does NOT call activateFallbackMode
|
|
232
|
+
it('does NOT call activateFallbackMode when handler returns "retry_once"', async () => {
|
|
233
233
|
policyHandler.mockResolvedValue('retry_once');
|
|
234
|
-
|
|
235
|
-
vi.mocked(policyConfig.getModel).mockReturnValue('gemini-3.1-pro-preview-customtools');
|
|
236
|
-
vi.mocked(policyConfig.getActiveModel).mockReturnValue('gemini-3.1-pro-preview-customtools');
|
|
237
|
-
policyConfig.getGemini31LaunchedSync = vi.fn(() => true);
|
|
238
|
-
policyConfig.getUseCustomToolModelSync = vi.fn(() => true);
|
|
239
|
-
vi.mocked(availability.selectFirstAvailable).mockReturnValue({
|
|
240
|
-
selectedModel: PREVIEW_GEMINI_FLASH_MODEL,
|
|
241
|
-
skipped: [],
|
|
242
|
-
});
|
|
243
|
-
const capacityError = new TerminalQuotaError('No capacity available', { code: 429, message: 'No capacity available', details: [] }, 5, 'MODEL_CAPACITY_EXHAUSTED');
|
|
244
|
-
const result = await handleFallback(policyConfig, 'gemini-3.1-pro-preview-customtools', AuthType.USE_GEMINI, capacityError);
|
|
234
|
+
const result = await handleFallback(policyConfig, MOCK_PRO_MODEL, AUTH_OAUTH);
|
|
245
235
|
expect(result).toBe(true);
|
|
246
236
|
expect(policyConfig.activateFallbackMode).not.toHaveBeenCalled();
|
|
247
|
-
expect(availability.markTerminal).not.toHaveBeenCalled();
|
|
248
|
-
expect(availability.markRetryOncePerTurn).toHaveBeenCalledWith('gemini-3.1-pro-preview-customtools', undefined);
|
|
249
|
-
expect(availability.consumeStickyAttempt).toHaveBeenCalledWith('gemini-3.1-pro-preview-customtools');
|
|
250
|
-
});
|
|
251
|
-
it('marks capacity TerminalQuotaError with reason "capacity" when handler returns "retry_always" on manual model', async () => {
|
|
252
|
-
policyHandler.mockResolvedValue('retry_always');
|
|
253
|
-
vi.mocked(policyConfig.getHasAccessToPreviewModel).mockReturnValue(true);
|
|
254
|
-
vi.mocked(policyConfig.getModel).mockReturnValue(PREVIEW_GEMINI_MODEL);
|
|
255
|
-
vi.mocked(policyConfig.getActiveModel).mockReturnValue(PREVIEW_GEMINI_MODEL);
|
|
256
|
-
vi.mocked(availability.selectFirstAvailable).mockReturnValue({
|
|
257
|
-
selectedModel: PREVIEW_GEMINI_FLASH_MODEL,
|
|
258
|
-
skipped: [],
|
|
259
|
-
});
|
|
260
|
-
const capacityError = new TerminalQuotaError('No capacity available', { code: 429, message: 'No capacity available', details: [] }, 5, 'MODEL_CAPACITY_EXHAUSTED');
|
|
261
|
-
const result = await handleFallback(policyConfig, PREVIEW_GEMINI_MODEL, AUTH_OAUTH, capacityError);
|
|
262
|
-
expect(result).toBe(true);
|
|
263
|
-
expect(availability.markTerminal).toHaveBeenCalledWith(PREVIEW_GEMINI_MODEL, 'capacity');
|
|
264
|
-
expect(policyConfig.activateFallbackMode).toHaveBeenCalledWith(PREVIEW_GEMINI_FLASH_MODEL, undefined);
|
|
265
237
|
});
|
|
266
238
|
});
|
|
267
239
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.test.js","sourceRoot":"","sources":["../../../src/fallback/handler.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"handler.test.js","sourceRoot":"","sources":["../../../src/fallback/handler.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,5 +3,5 @@
|
|
|
3
3
|
* Copyright 2026 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
export declare const GIT_COMMIT_INFO = "
|
|
7
|
-
export declare const CLI_VERSION = "0.67.0
|
|
6
|
+
export declare const GIT_COMMIT_INFO = "b367c7296";
|
|
7
|
+
export declare const CLI_VERSION = "0.67.0";
|
|
@@ -5,6 +5,6 @@
|
|
|
5
5
|
*/
|
|
6
6
|
// This file is auto-generated by the build script (scripts/generate-git-commit-info.js)
|
|
7
7
|
// Do not edit this file manually.
|
|
8
|
-
export const GIT_COMMIT_INFO = '
|
|
9
|
-
export const CLI_VERSION = '0.67.0
|
|
8
|
+
export const GIT_COMMIT_INFO = 'b367c7296';
|
|
9
|
+
export const CLI_VERSION = '0.67.0';
|
|
10
10
|
//# sourceMappingURL=git-commit.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-commit.js","sourceRoot":"","sources":["../../../src/generated/git-commit.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,wFAAwF;AACxF,kCAAkC;AAClC,MAAM,CAAC,MAAM,eAAe,GAAG,WAAW,CAAC;AAC3C,MAAM,CAAC,MAAM,WAAW,GAAG,
|
|
1
|
+
{"version":3,"file":"git-commit.js","sourceRoot":"","sources":["../../../src/generated/git-commit.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,wFAAwF;AACxF,kCAAkC;AAClC,MAAM,CAAC,MAAM,eAAe,GAAG,WAAW,CAAC;AAC3C,MAAM,CAAC,MAAM,WAAW,GAAG,QAAQ,CAAC"}
|
|
@@ -7,12 +7,8 @@ import { exec } from 'node:child_process';
|
|
|
7
7
|
import { promisify } from 'node:util';
|
|
8
8
|
import os from 'node:os';
|
|
9
9
|
import path from 'node:path';
|
|
10
|
-
import { debugLogger } from '../utils/debugLogger.js';
|
|
11
10
|
const execAsync = promisify(exec);
|
|
12
11
|
const MAX_TRAVERSAL_DEPTH = 32;
|
|
13
|
-
function isRawProcessInfo(value) {
|
|
14
|
-
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
15
|
-
}
|
|
16
12
|
/**
|
|
17
13
|
* Fetches the entire process table on Windows.
|
|
18
14
|
*/
|
|
@@ -31,69 +27,33 @@ async function getProcessTableWindows() {
|
|
|
31
27
|
if (!stdout.trim()) {
|
|
32
28
|
return processMap;
|
|
33
29
|
}
|
|
34
|
-
let
|
|
30
|
+
let processes;
|
|
35
31
|
try {
|
|
36
|
-
|
|
32
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
|
33
|
+
processes = JSON.parse(stdout);
|
|
37
34
|
}
|
|
38
|
-
catch
|
|
39
|
-
debugLogger.warn('Failed to parse Windows process table snapshot JSON:', error);
|
|
35
|
+
catch {
|
|
40
36
|
return processMap;
|
|
41
37
|
}
|
|
42
|
-
|
|
38
|
+
if (!Array.isArray(processes)) {
|
|
39
|
+
processes = [processes];
|
|
40
|
+
}
|
|
43
41
|
for (const p of processes) {
|
|
44
|
-
if (
|
|
45
|
-
const name = typeof p.Name === 'string' ? p.Name : '';
|
|
46
|
-
const command = typeof p.CommandLine === 'string' && p.CommandLine
|
|
47
|
-
? p.CommandLine
|
|
48
|
-
: name;
|
|
42
|
+
if (p && typeof p.ProcessId === 'number') {
|
|
49
43
|
processMap.set(p.ProcessId, {
|
|
50
44
|
pid: p.ProcessId,
|
|
51
|
-
parentPid:
|
|
52
|
-
name,
|
|
53
|
-
command,
|
|
45
|
+
parentPid: p.ParentProcessId || 0,
|
|
46
|
+
name: p.Name || '',
|
|
47
|
+
command: p.CommandLine || '',
|
|
54
48
|
});
|
|
55
49
|
}
|
|
56
50
|
}
|
|
57
51
|
}
|
|
58
|
-
catch
|
|
59
|
-
|
|
52
|
+
catch {
|
|
53
|
+
// Fallback or error handling if PowerShell fails
|
|
60
54
|
}
|
|
61
55
|
return processMap;
|
|
62
56
|
}
|
|
63
|
-
/**
|
|
64
|
-
* Fetches the parent process ID, name, and command for a single process ID on
|
|
65
|
-
* Windows via PowerShell CIM.
|
|
66
|
-
*
|
|
67
|
-
* @param pid The process ID to inspect.
|
|
68
|
-
* @returns A promise that resolves to the parent's PID, name, and command.
|
|
69
|
-
*/
|
|
70
|
-
async function getProcessInfoWindows(pid) {
|
|
71
|
-
if (!Number.isInteger(pid) || pid <= 0) {
|
|
72
|
-
return { parentPid: 0, name: '', command: '' };
|
|
73
|
-
}
|
|
74
|
-
try {
|
|
75
|
-
const powershellCommand = `Get-CimInstance Win32_Process -Filter 'ProcessId=${pid}' -ErrorAction SilentlyContinue | Select-Object ProcessId,ParentProcessId,Name,CommandLine | ConvertTo-Json -Compress`;
|
|
76
|
-
const { stdout } = await execAsync(`powershell -NoProfile -NonInteractive -Command "${powershellCommand}"`, { timeout: 3000 });
|
|
77
|
-
const trimmedStdout = stdout.trim();
|
|
78
|
-
if (!trimmedStdout) {
|
|
79
|
-
return { parentPid: 0, name: '', command: '' };
|
|
80
|
-
}
|
|
81
|
-
const parsed = JSON.parse(trimmedStdout);
|
|
82
|
-
const proc = Array.isArray(parsed) ? parsed[0] : parsed;
|
|
83
|
-
if (!isRawProcessInfo(proc)) {
|
|
84
|
-
return { parentPid: 0, name: '', command: '' };
|
|
85
|
-
}
|
|
86
|
-
return {
|
|
87
|
-
parentPid: typeof proc.ParentProcessId === 'number' ? proc.ParentProcessId : 0,
|
|
88
|
-
name: typeof proc.Name === 'string' ? proc.Name : '',
|
|
89
|
-
command: typeof proc.CommandLine === 'string' ? proc.CommandLine : '',
|
|
90
|
-
};
|
|
91
|
-
}
|
|
92
|
-
catch (error) {
|
|
93
|
-
debugLogger.warn(`Failed to fetch Windows process info for PID ${pid}:`, error);
|
|
94
|
-
return { parentPid: 0, name: '', command: '' };
|
|
95
|
-
}
|
|
96
|
-
}
|
|
97
57
|
/**
|
|
98
58
|
* Fetches the parent process ID, name, and command for a given process ID on Unix.
|
|
99
59
|
*
|
|
@@ -178,9 +138,8 @@ async function getIdeProcessInfoForWindows() {
|
|
|
178
138
|
const myPid = process.pid;
|
|
179
139
|
const myProc = processMap.get(myPid);
|
|
180
140
|
if (!myProc) {
|
|
181
|
-
debugLogger.warn(`Current process (PID ${myPid}) not found in Windows process table snapshot; falling back to single-PID CIM query.`);
|
|
182
141
|
// Fallback: try to get info for current process directly if snapshot fails
|
|
183
|
-
const { command } = await
|
|
142
|
+
const { command } = await getProcessInfo(myPid);
|
|
184
143
|
return { pid: myPid, command };
|
|
185
144
|
}
|
|
186
145
|
// Perform tree traversal in memory.
|
|
@@ -196,22 +155,13 @@ async function getIdeProcessInfoForWindows() {
|
|
|
196
155
|
}
|
|
197
156
|
if (ancestors.length >= 3) {
|
|
198
157
|
const target = ancestors[ancestors.length - 3];
|
|
199
|
-
return {
|
|
200
|
-
pid: target.pid,
|
|
201
|
-
command: target.command || target.name || 'unknown',
|
|
202
|
-
};
|
|
158
|
+
return { pid: target.pid, command: target.command };
|
|
203
159
|
}
|
|
204
160
|
else if (ancestors.length > 0) {
|
|
205
161
|
const target = ancestors[ancestors.length - 1];
|
|
206
|
-
return {
|
|
207
|
-
pid: target.pid,
|
|
208
|
-
command: target.command || target.name || 'unknown',
|
|
209
|
-
};
|
|
162
|
+
return { pid: target.pid, command: target.command };
|
|
210
163
|
}
|
|
211
|
-
return {
|
|
212
|
-
pid: myPid,
|
|
213
|
-
command: myProc.command || myProc.name || 'unknown',
|
|
214
|
-
};
|
|
164
|
+
return { pid: myPid, command: myProc.command };
|
|
215
165
|
}
|
|
216
166
|
/**
|
|
217
167
|
* Traverses up the process tree to find the process ID and command of the IDE.
|
|
@@ -238,8 +188,9 @@ export async function getIdeProcessInfo() {
|
|
|
238
188
|
const idePid = parseInt(process.env['GEMINI_CLI_IDE_PID'], 10);
|
|
239
189
|
if (!isNaN(idePid) && idePid > 0) {
|
|
240
190
|
if (platform === 'win32') {
|
|
241
|
-
const
|
|
242
|
-
|
|
191
|
+
const processMap = await getProcessTableWindows();
|
|
192
|
+
const proc = processMap.get(idePid);
|
|
193
|
+
return { pid: idePid, command: proc?.command || '' };
|
|
243
194
|
}
|
|
244
195
|
const { command } = await getProcessInfo(idePid);
|
|
245
196
|
return { pid: idePid, command };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-utils.js","sourceRoot":"","sources":["../../../src/ide/process-utils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"process-utils.js","sourceRoot":"","sources":["../../../src/ide/process-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,33 +5,22 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { describe, it, expect, vi, afterEach, beforeEach, } from 'vitest';
|
|
7
7
|
import { getIdeProcessInfo } from './process-utils.js';
|
|
8
|
-
import { debugLogger } from '../utils/debugLogger.js';
|
|
9
8
|
import os from 'node:os';
|
|
10
9
|
const mockedExec = vi.hoisted(() => vi.fn());
|
|
11
|
-
vi.mock('node:util',
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
...actual,
|
|
15
|
-
promisify: vi.fn().mockReturnValue(mockedExec),
|
|
16
|
-
};
|
|
17
|
-
});
|
|
10
|
+
vi.mock('node:util', () => ({
|
|
11
|
+
promisify: vi.fn().mockReturnValue(mockedExec),
|
|
12
|
+
}));
|
|
18
13
|
vi.mock('node:os', () => ({
|
|
19
14
|
default: {
|
|
20
15
|
platform: vi.fn(),
|
|
21
16
|
},
|
|
22
17
|
}));
|
|
23
18
|
describe('getIdeProcessInfo', () => {
|
|
24
|
-
let originalPidDescriptor;
|
|
25
19
|
beforeEach(() => {
|
|
26
|
-
originalPidDescriptor = Object.getOwnPropertyDescriptor(process, 'pid');
|
|
27
20
|
Object.defineProperty(process, 'pid', { value: 1000, configurable: true });
|
|
28
21
|
mockedExec.mockReset();
|
|
29
|
-
vi.spyOn(debugLogger, 'warn').mockImplementation(() => { });
|
|
30
22
|
});
|
|
31
23
|
afterEach(() => {
|
|
32
|
-
if (originalPidDescriptor) {
|
|
33
|
-
Object.defineProperty(process, 'pid', originalPidDescriptor);
|
|
34
|
-
}
|
|
35
24
|
vi.restoreAllMocks();
|
|
36
25
|
vi.unstubAllEnvs();
|
|
37
26
|
});
|
|
@@ -44,39 +33,24 @@ describe('getIdeProcessInfo', () => {
|
|
|
44
33
|
expect(result).toEqual({ pid: 12345, command: 'my-ide-command' });
|
|
45
34
|
expect(mockedExec).toHaveBeenCalledWith(expect.stringContaining('ps -o ppid=,command= -p 12345'), { timeout: 3000 });
|
|
46
35
|
});
|
|
47
|
-
it('should use GEMINI_CLI_IDE_PID and fetch command on Windows
|
|
36
|
+
it('should use GEMINI_CLI_IDE_PID and fetch command on Windows', async () => {
|
|
48
37
|
os.platform.mockReturnValue('win32');
|
|
49
38
|
vi.stubEnv('GEMINI_CLI_IDE_PID', '54321');
|
|
50
|
-
|
|
51
|
-
|
|
39
|
+
const processes = [
|
|
40
|
+
{
|
|
52
41
|
ProcessId: 54321,
|
|
53
42
|
ParentProcessId: 0,
|
|
54
43
|
Name: 'Code.exe',
|
|
55
44
|
CommandLine: 'C:\\Program Files\\VSCode\\Code.exe',
|
|
56
|
-
}
|
|
57
|
-
|
|
45
|
+
},
|
|
46
|
+
];
|
|
47
|
+
mockedExec.mockResolvedValueOnce({ stdout: JSON.stringify(processes) });
|
|
58
48
|
const result = await getIdeProcessInfo();
|
|
59
49
|
expect(result).toEqual({
|
|
60
50
|
pid: 54321,
|
|
61
51
|
command: 'C:\\Program Files\\VSCode\\Code.exe',
|
|
62
52
|
});
|
|
63
|
-
expect(mockedExec).
|
|
64
|
-
expect(mockedExec).toHaveBeenCalledWith(expect.stringContaining("Get-CimInstance Win32_Process -Filter 'ProcessId=54321'"), { timeout: 3000 });
|
|
65
|
-
expect(mockedExec).not.toHaveBeenCalledWith(expect.stringContaining('ps '), expect.anything());
|
|
66
|
-
});
|
|
67
|
-
it('should handle failure gracefully when single-PID CIM query fails for GEMINI_CLI_IDE_PID on Windows', async () => {
|
|
68
|
-
os.platform.mockReturnValue('win32');
|
|
69
|
-
vi.stubEnv('GEMINI_CLI_IDE_PID', '54321');
|
|
70
|
-
mockedExec.mockRejectedValueOnce(new Error('CIM query failed'));
|
|
71
|
-
const result = await getIdeProcessInfo();
|
|
72
|
-
expect(result).toEqual({
|
|
73
|
-
pid: 54321,
|
|
74
|
-
command: '',
|
|
75
|
-
});
|
|
76
|
-
expect(mockedExec).toHaveBeenCalledTimes(1);
|
|
77
|
-
expect(mockedExec).toHaveBeenCalledWith(expect.stringContaining("Get-CimInstance Win32_Process -Filter 'ProcessId=54321'"), { timeout: 3000 });
|
|
78
|
-
expect(mockedExec).not.toHaveBeenCalledWith(expect.stringContaining('ps '), expect.anything());
|
|
79
|
-
expect(debugLogger.warn).toHaveBeenCalled();
|
|
53
|
+
expect(mockedExec).toHaveBeenCalledWith(expect.stringContaining('Get-CimInstance Win32_Process | Select-Object ProcessId,ParentProcessId,Name,CommandLine'), expect.anything());
|
|
80
54
|
});
|
|
81
55
|
});
|
|
82
56
|
describe('on Unix', () => {
|
|
@@ -148,7 +122,6 @@ describe('getIdeProcessInfo', () => {
|
|
|
148
122
|
const result = await getIdeProcessInfo();
|
|
149
123
|
expect(result).toEqual({ pid: 900, command: 'powershell.exe' });
|
|
150
124
|
expect(mockedExec).toHaveBeenCalledWith(expect.stringContaining('Get-CimInstance Win32_Process'), expect.anything());
|
|
151
|
-
expect(debugLogger.warn).not.toHaveBeenCalled();
|
|
152
125
|
});
|
|
153
126
|
it('should handle short process chains', async () => {
|
|
154
127
|
os.platform.mockReturnValue('win32');
|
|
@@ -165,137 +138,21 @@ describe('getIdeProcessInfo', () => {
|
|
|
165
138
|
const result = await getIdeProcessInfo();
|
|
166
139
|
expect(result).toEqual({ pid: 1000, command: 'node.exe' });
|
|
167
140
|
});
|
|
168
|
-
it('should
|
|
169
|
-
os.platform.mockReturnValue('win32');
|
|
170
|
-
mockedExec
|
|
171
|
-
.mockRejectedValueOnce(new Error('PowerShell snapshot timed out'))
|
|
172
|
-
.mockResolvedValueOnce({
|
|
173
|
-
stdout: JSON.stringify({
|
|
174
|
-
ProcessId: 1000,
|
|
175
|
-
ParentProcessId: 900,
|
|
176
|
-
Name: 'node.exe',
|
|
177
|
-
CommandLine: 'C:\\Program Files\\nodejs\\node.exe gemini.js',
|
|
178
|
-
}),
|
|
179
|
-
});
|
|
180
|
-
const result = await getIdeProcessInfo();
|
|
181
|
-
expect(result).toEqual({
|
|
182
|
-
pid: 1000,
|
|
183
|
-
command: 'C:\\Program Files\\nodejs\\node.exe gemini.js',
|
|
184
|
-
});
|
|
185
|
-
expect(mockedExec).toHaveBeenCalledTimes(2);
|
|
186
|
-
expect(mockedExec).toHaveBeenNthCalledWith(2, expect.stringContaining("Get-CimInstance Win32_Process -Filter 'ProcessId=1000'"), { timeout: 3000 });
|
|
187
|
-
expect(mockedExec).not.toHaveBeenCalledWith(expect.stringContaining('ps '), expect.anything());
|
|
188
|
-
expect(debugLogger.warn).toHaveBeenCalled();
|
|
189
|
-
});
|
|
190
|
-
it('should fall back to single-PID PowerShell CIM query when snapshot omits current PID', async () => {
|
|
191
|
-
os.platform.mockReturnValue('win32');
|
|
192
|
-
const otherProcesses = [
|
|
193
|
-
{
|
|
194
|
-
ProcessId: 2000,
|
|
195
|
-
ParentProcessId: 0,
|
|
196
|
-
Name: 'explorer.exe',
|
|
197
|
-
CommandLine: 'C:\\Windows\\explorer.exe',
|
|
198
|
-
},
|
|
199
|
-
];
|
|
200
|
-
mockedExec
|
|
201
|
-
.mockResolvedValueOnce({ stdout: JSON.stringify(otherProcesses) })
|
|
202
|
-
.mockResolvedValueOnce({
|
|
203
|
-
stdout: JSON.stringify({
|
|
204
|
-
ProcessId: 1000,
|
|
205
|
-
ParentProcessId: 900,
|
|
206
|
-
Name: 'node.exe',
|
|
207
|
-
CommandLine: 'node.exe cli.js',
|
|
208
|
-
}),
|
|
209
|
-
});
|
|
210
|
-
const result = await getIdeProcessInfo();
|
|
211
|
-
expect(result).toEqual({ pid: 1000, command: 'node.exe cli.js' });
|
|
212
|
-
expect(mockedExec).toHaveBeenNthCalledWith(2, expect.stringContaining("Get-CimInstance Win32_Process -Filter 'ProcessId=1000'"), { timeout: 3000 });
|
|
213
|
-
expect(mockedExec).not.toHaveBeenCalledWith(expect.stringContaining('ps '), expect.anything());
|
|
214
|
-
expect(debugLogger.warn).toHaveBeenCalled();
|
|
215
|
-
});
|
|
216
|
-
it('should handle PowerShell failure gracefully when both snapshot and CIM fallback fail', async () => {
|
|
141
|
+
it('should handle PowerShell failure gracefully', async () => {
|
|
217
142
|
os.platform.mockReturnValue('win32');
|
|
218
|
-
mockedExec
|
|
219
|
-
|
|
220
|
-
|
|
143
|
+
mockedExec.mockRejectedValueOnce(new Error('PowerShell failed'));
|
|
144
|
+
// Fallback to getProcessInfo for current PID
|
|
145
|
+
mockedExec.mockResolvedValueOnce({ stdout: '' }); // ps command fails on windows
|
|
221
146
|
const result = await getIdeProcessInfo();
|
|
222
147
|
expect(result).toEqual({ pid: 1000, command: '' });
|
|
223
|
-
expect(mockedExec).not.toHaveBeenCalledWith(expect.stringContaining('ps '), expect.anything());
|
|
224
|
-
expect(debugLogger.warn).toHaveBeenCalled();
|
|
225
148
|
});
|
|
226
|
-
it('should handle malformed JSON output
|
|
149
|
+
it('should handle malformed JSON output gracefully', async () => {
|
|
227
150
|
os.platform.mockReturnValue('win32');
|
|
228
|
-
mockedExec
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
stdout: JSON.stringify({
|
|
232
|
-
ProcessId: 1000,
|
|
233
|
-
ParentProcessId: 0,
|
|
234
|
-
Name: 'node.exe',
|
|
235
|
-
CommandLine: 'node.exe',
|
|
236
|
-
}),
|
|
237
|
-
});
|
|
238
|
-
const result = await getIdeProcessInfo();
|
|
239
|
-
expect(result).toEqual({ pid: 1000, command: 'node.exe' });
|
|
240
|
-
expect(mockedExec).not.toHaveBeenCalledWith(expect.stringContaining('ps '), expect.anything());
|
|
241
|
-
expect(debugLogger.warn).toHaveBeenCalled();
|
|
242
|
-
});
|
|
243
|
-
it('should handle empty or null CommandLine output in single-PID CIM fallback gracefully', async () => {
|
|
244
|
-
os.platform.mockReturnValue('win32');
|
|
245
|
-
mockedExec.mockResolvedValueOnce({ stdout: '' }).mockResolvedValueOnce({
|
|
246
|
-
stdout: JSON.stringify({
|
|
247
|
-
ProcessId: 1000,
|
|
248
|
-
ParentProcessId: 0,
|
|
249
|
-
Name: 'node.exe',
|
|
250
|
-
CommandLine: null,
|
|
251
|
-
}),
|
|
252
|
-
});
|
|
151
|
+
mockedExec.mockResolvedValueOnce({ stdout: '{"invalid":json}' });
|
|
152
|
+
// Fallback to getProcessInfo for current PID
|
|
153
|
+
mockedExec.mockResolvedValueOnce({ stdout: '' });
|
|
253
154
|
const result = await getIdeProcessInfo();
|
|
254
155
|
expect(result).toEqual({ pid: 1000, command: '' });
|
|
255
|
-
expect(mockedExec).not.toHaveBeenCalledWith(expect.stringContaining('ps '), expect.anything());
|
|
256
|
-
expect(debugLogger.warn).toHaveBeenCalled();
|
|
257
|
-
});
|
|
258
|
-
it('should handle empty stdout, null JSON, array JSON, and malformed JSON in single-PID CIM fallback', async () => {
|
|
259
|
-
os.platform.mockReturnValue('win32');
|
|
260
|
-
// Empty stdout on fallback (e.g. process exited)
|
|
261
|
-
mockedExec
|
|
262
|
-
.mockResolvedValueOnce({ stdout: '' })
|
|
263
|
-
.mockResolvedValueOnce({ stdout: ' ' });
|
|
264
|
-
await expect(getIdeProcessInfo()).resolves.toEqual({
|
|
265
|
-
pid: 1000,
|
|
266
|
-
command: '',
|
|
267
|
-
});
|
|
268
|
-
// Literal JSON null on fallback
|
|
269
|
-
mockedExec
|
|
270
|
-
.mockResolvedValueOnce({ stdout: '' })
|
|
271
|
-
.mockResolvedValueOnce({ stdout: 'null' });
|
|
272
|
-
await expect(getIdeProcessInfo()).resolves.toEqual({
|
|
273
|
-
pid: 1000,
|
|
274
|
-
command: '',
|
|
275
|
-
});
|
|
276
|
-
// Array JSON output on fallback
|
|
277
|
-
mockedExec.mockResolvedValueOnce({ stdout: '' }).mockResolvedValueOnce({
|
|
278
|
-
stdout: JSON.stringify([
|
|
279
|
-
{
|
|
280
|
-
ProcessId: 1000,
|
|
281
|
-
ParentProcessId: 0,
|
|
282
|
-
Name: 'node.exe',
|
|
283
|
-
CommandLine: 'node.exe --array',
|
|
284
|
-
},
|
|
285
|
-
]),
|
|
286
|
-
});
|
|
287
|
-
await expect(getIdeProcessInfo()).resolves.toEqual({
|
|
288
|
-
pid: 1000,
|
|
289
|
-
command: 'node.exe --array',
|
|
290
|
-
});
|
|
291
|
-
// Malformed JSON on fallback
|
|
292
|
-
mockedExec
|
|
293
|
-
.mockResolvedValueOnce({ stdout: '' })
|
|
294
|
-
.mockResolvedValueOnce({ stdout: '{bad-json' });
|
|
295
|
-
await expect(getIdeProcessInfo()).resolves.toEqual({
|
|
296
|
-
pid: 1000,
|
|
297
|
-
command: '',
|
|
298
|
-
});
|
|
299
156
|
});
|
|
300
157
|
it('should handle single process output from ConvertTo-Json', async () => {
|
|
301
158
|
os.platform.mockReturnValue('win32');
|