@google/gemini-cli-core 0.67.0 → 0.68.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 +18 -24
- package/dist/docs/changelogs/index.md +24 -0
- package/dist/docs/changelogs/latest.md +83 -90
- package/dist/docs/changelogs/preview.md +89 -87
- package/dist/docs/cli/sandbox.md +8 -2
- package/dist/docs/cli/themes.md +6 -3
- package/dist/docs/extensions/releasing.md +32 -0
- package/dist/docs/reference/configuration.md +2 -10
- package/dist/src/availability/autoRoutingFallback.integration.test.js +95 -2
- package/dist/src/availability/autoRoutingFallback.integration.test.js.map +1 -1
- package/dist/src/availability/errorClassification.d.ts +2 -0
- package/dist/src/availability/errorClassification.js +8 -0
- package/dist/src/availability/errorClassification.js.map +1 -1
- package/dist/src/availability/errorClassification.test.d.ts +6 -0
- package/dist/src/availability/errorClassification.test.js +56 -0
- package/dist/src/availability/errorClassification.test.js.map +1 -0
- package/dist/src/availability/policyHelpers.test.js +8 -1
- package/dist/src/availability/policyHelpers.test.js.map +1 -1
- package/dist/src/code_assist/oauth2.test.js +4 -1
- package/dist/src/code_assist/oauth2.test.js.map +1 -1
- package/dist/src/code_assist/server.js +24 -15
- package/dist/src/code_assist/server.js.map +1 -1
- package/dist/src/code_assist/server.test.js +165 -0
- package/dist/src/code_assist/server.test.js.map +1 -1
- package/dist/src/config/config.js +1 -0
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +4 -1
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/defaultModelConfigs.js +1 -7
- package/dist/src/config/defaultModelConfigs.js.map +1 -1
- package/dist/src/config/models.d.ts +2 -1
- package/dist/src/config/models.js +20 -7
- package/dist/src/config/models.js.map +1 -1
- package/dist/src/config/models.test.js +43 -1
- package/dist/src/config/models.test.js.map +1 -1
- package/dist/src/core/baseLlmClient.js +15 -0
- package/dist/src/core/baseLlmClient.js.map +1 -1
- package/dist/src/core/baseLlmClient.test.js +37 -0
- package/dist/src/core/baseLlmClient.test.js.map +1 -1
- package/dist/src/core/client.js +26 -1
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +8 -3
- package/dist/src/core/client.test.js.map +1 -1
- package/dist/src/core/geminiChat.js +29 -4
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/geminiChat.test.js +80 -0
- package/dist/src/core/geminiChat.test.js.map +1 -1
- package/dist/src/fallback/handler.js +13 -5
- package/dist/src/fallback/handler.js.map +1 -1
- package/dist/src/fallback/handler.test.js +30 -2
- 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/ide/process-utils.integration.test.d.ts +6 -0
- package/dist/src/ide/process-utils.integration.test.js +276 -0
- package/dist/src/ide/process-utils.integration.test.js.map +1 -0
- package/dist/src/ide/process-utils.js +69 -20
- package/dist/src/ide/process-utils.js.map +1 -1
- package/dist/src/ide/process-utils.test.js +161 -18
- 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 +14 -0
- package/dist/src/routing/strategies/defaultStrategy.test.js.map +1 -1
- package/dist/src/routing/strategies/fallbackStrategy.js +3 -2
- package/dist/src/routing/strategies/fallbackStrategy.js.map +1 -1
- package/dist/src/routing/strategies/fallbackStrategy.test.js +32 -0
- 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 +11 -0
- package/dist/src/routing/strategies/overrideStrategy.test.js.map +1 -1
- package/dist/src/services/executionLifecycleService.d.ts +7 -1
- package/dist/src/services/executionLifecycleService.js +9 -2
- package/dist/src/services/executionLifecycleService.js.map +1 -1
- package/dist/src/services/executionLifecycleService.test.js +27 -0
- package/dist/src/services/executionLifecycleService.test.js.map +1 -1
- package/dist/src/services/gitService.js +136 -2
- package/dist/src/services/gitService.js.map +1 -1
- package/dist/src/services/gitService.test.js +208 -3
- package/dist/src/services/gitService.test.js.map +1 -1
- package/dist/src/services/modelConfigService.test.js +23 -0
- package/dist/src/services/modelConfigService.test.js.map +1 -1
- package/dist/src/services/sessionSummaryService.js +5 -2
- package/dist/src/services/sessionSummaryService.js.map +1 -1
- package/dist/src/services/sessionSummaryService.test.js +18 -0
- package/dist/src/services/sessionSummaryService.test.js.map +1 -1
- package/dist/src/services/shellExecutionService.d.ts +2 -1
- package/dist/src/services/shellExecutionService.js +15 -5
- package/dist/src/services/shellExecutionService.js.map +1 -1
- package/dist/src/services/shellExecutionService.test.js +22 -2
- package/dist/src/services/shellExecutionService.test.js.map +1 -1
- package/dist/src/tools/ask-user.js +2 -1
- package/dist/src/tools/ask-user.js.map +1 -1
- package/dist/src/tools/ask-user.test.js +28 -0
- package/dist/src/tools/ask-user.test.js.map +1 -1
- package/dist/src/tools/glob.js +19 -4
- package/dist/src/tools/glob.js.map +1 -1
- package/dist/src/tools/glob.test.js +91 -0
- package/dist/src/tools/glob.test.js.map +1 -1
- package/dist/src/tools/shellBackgroundTools.test.js +4 -0
- 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 +18 -0
- 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 +16 -0
- package/dist/src/utils/editCorrector.test.js.map +1 -1
- package/dist/src/utils/events.d.ts +1 -0
- package/dist/src/utils/events.js.map +1 -1
- package/dist/src/utils/fileUtils.js +39 -19
- package/dist/src/utils/fileUtils.js.map +1 -1
- package/dist/src/utils/fileUtils.test.js +284 -0
- package/dist/src/utils/fileUtils.test.js.map +1 -1
- package/dist/src/utils/filesearch/fileSearch.js +36 -5
- package/dist/src/utils/filesearch/fileSearch.js.map +1 -1
- package/dist/src/utils/filesearch/fileSearch.test.js +146 -0
- package/dist/src/utils/filesearch/fileSearch.test.js.map +1 -1
- package/dist/src/utils/ignorePathUtils.js +3 -2
- package/dist/src/utils/ignorePathUtils.js.map +1 -1
- package/dist/src/utils/ignorePathUtils.test.js +20 -1
- package/dist/src/utils/ignorePathUtils.test.js.map +1 -1
- package/dist/src/utils/llm-edit-fixer.js +13 -10
- package/dist/src/utils/llm-edit-fixer.js.map +1 -1
- package/dist/src/utils/llm-edit-fixer.test.js +30 -0
- package/dist/src/utils/llm-edit-fixer.test.js.map +1 -1
- package/dist/src/utils/summarizer.js +7 -3
- package/dist/src/utils/summarizer.js.map +1 -1
- package/dist/src/utils/summarizer.test.js +14 -0
- package/dist/src/utils/summarizer.test.js.map +1 -1
- package/dist/src/utils/textUtils.d.ts +7 -0
- package/dist/src/utils/textUtils.js +157 -0
- package/dist/src/utils/textUtils.js.map +1 -1
- package/dist/src/utils/textUtils.test.js +41 -1
- package/dist/src/utils/textUtils.test.js.map +1 -1
- package/dist/src/voice/whisperModelManager.d.ts +4 -1
- package/dist/src/voice/whisperModelManager.js +175 -8
- package/dist/src/voice/whisperModelManager.js.map +1 -1
- package/dist/src/voice/whisperModelManager.test.d.ts +6 -0
- package/dist/src/voice/whisperModelManager.test.js +514 -0
- package/dist/src/voice/whisperModelManager.test.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -68,13 +68,21 @@ 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
|
-
|
|
71
|
+
// If the user chose a permanent switch ('retry_always'), apply the policy
|
|
72
|
+
// availability transition (e.g. marking manual models terminal).
|
|
73
|
+
// For a turn-scoped retry ('retry_once'), mark the failed model as
|
|
74
|
+
// sticky_retry and consume its turn attempt so it falls back for the
|
|
75
|
+
// remainder of the current turn only and recovers on resetTurn().
|
|
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') {
|
|
76
79
|
applyAvailabilityTransition(getAvailabilityContext, failureKind);
|
|
77
80
|
}
|
|
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
|
+
}
|
|
78
86
|
return await processIntent(config, intent, fallbackModel, failedModel !== activeModel ? failedModel : undefined);
|
|
79
87
|
}
|
|
80
88
|
catch (handlerError) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/fallback/handler.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EACL,mBAAmB,EACnB,mBAAmB,GACpB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EACL,0BAA0B,EAC1B,kBAAkB,EAClB,mBAAmB,EACnB,2BAA2B,GAC5B,MAAM,kCAAkC,CAAC;AAE1C,MAAM,CAAC,MAAM,gBAAgB,GAAG,2CAA2C,CAAC;AAE5E,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,MAAc,EACd,WAAmB,EACnB,QAAiB,EACjB,KAAe;IAEf,MAAM,WAAW,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAE/C,MAAM,KAAK,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;IACzC,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,0BAA0B,CAC7D,KAAK,EACL,WAAW,CACZ,CAAC;IAEF,MAAM,YAAY,GAAG,MAAM,CAAC,2BAA2B,EAAE,CAAC;IAC1D,MAAM,sBAAsB,GAAG,GAAG,EAAE;QAClC,IAAI,CAAC,YAAY;YAAE,OAAO,SAAS,CAAC;QACpC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;IACzD,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,MAAM,CAAC,cAAc,EAAE,CAAC;IAC5C,IAAI,aAAqB,CAAC;IAE1B,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QACvB,IACE,WAAW,KAAK,WAAW;YAC3B,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,SAAS,EAC5C,CAAC;YACD,2BAA2B,CAAC,sBAAsB,EAAE,WAAW,CAAC,CAAC;YACjE,OAAO,aAAa,CAAC,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;QACzE,CAAC;QACD,aAAa,GAAG,WAAW,CAAC;IAC9B,CAAC;SAAM,CAAC;QACN,MAAM,SAAS,GAAG,YAAY,CAAC,oBAAoB,CACjD,UAAU,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CACzC,CAAC;QAEF,MAAM,gBAAgB,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAC1E,MAAM,qBAAqB,GACzB,SAAS,CAAC,aAAa,IAAI,gBAAgB,EAAE,KAAK,CAAC;QACrD,MAAM,cAAc,GAAG,UAAU,CAAC,IAAI,CACpC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,KAAK,qBAAqB,CACnD,CAAC;QAEF,IACE,CAAC,qBAAqB;YACtB,qBAAqB,KAAK,WAAW;YACrC,CAAC,cAAc,EACf,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,aAAa,GAAG,qBAAqB,CAAC;QAEtC,uDAAuD;QACvD,MAAM,MAAM,GAAG,mBAAmB,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QAEhE,IACE,MAAM,KAAK,QAAQ;YACnB,CAAC,aAAa,KAAK,WAAW,IAAI,WAAW,KAAK,WAAW,CAAC,EAC9D,CAAC;YACD,2BAA2B,CAAC,sBAAsB,EAAE,WAAW,CAAC,CAAC;YACjE,kGAAkG;YAClG,4EAA4E;YAC5E,MAAM,mBAAmB,GACvB,WAAW,KAAK,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;YACxD,OAAO,aAAa,CAClB,MAAM,EACN,cAAc,EACd,aAAa,EACb,mBAAmB,CACpB,CAAC;QACJ,CAAC;QAED,mFAAmF;QACnF,MAAM,cAAc,GAA2B;YAC7C,GAAG,SAAS;YACZ,aAAa,EAAE,aAAa;YAC5B,MAAM;YACN,WAAW;YACX,YAAY;YACZ,cAAc;SACf,CAAC;QACF,KAAK,cAAc,CAAC;IACtB,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,uBAAuB,EAAE,CAAC;IACjD,IAAI,OAAO,OAAO,KAAK,UAAU,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,WAAW,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;QAEhE,0EAA0E;QAC1E,
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/fallback/handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -229,11 +229,39 @@ describe('handleFallback', () => {
|
|
|
229
229
|
expect(policyConfig.activateFallbackMode).not.toHaveBeenCalled();
|
|
230
230
|
// TODO: add logging expect statement
|
|
231
231
|
});
|
|
232
|
-
it('does NOT call activateFallbackMode when handler returns "retry_once"', async () => {
|
|
232
|
+
it('does NOT call activateFallbackMode or markTerminal when handler returns "retry_once"', async () => {
|
|
233
233
|
policyHandler.mockResolvedValue('retry_once');
|
|
234
|
-
|
|
234
|
+
vi.mocked(policyConfig.getHasAccessToPreviewModel).mockReturnValue(true);
|
|
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);
|
|
235
245
|
expect(result).toBe(true);
|
|
236
246
|
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);
|
|
237
265
|
});
|
|
238
266
|
});
|
|
239
267
|
});
|
|
@@ -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.
|
|
6
|
+
export declare const GIT_COMMIT_INFO = "6ee817519";
|
|
7
|
+
export declare const CLI_VERSION = "0.68.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.
|
|
8
|
+
export const GIT_COMMIT_INFO = '6ee817519';
|
|
9
|
+
export const CLI_VERSION = '0.68.0';
|
|
10
10
|
//# sourceMappingURL=git-commit.js.map
|
|
@@ -0,0 +1,276 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2026 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
7
|
+
import * as fs from 'node:fs';
|
|
8
|
+
import * as os from 'node:os';
|
|
9
|
+
import * as path from 'node:path';
|
|
10
|
+
import * as http from 'node:http';
|
|
11
|
+
import { randomUUID } from 'node:crypto';
|
|
12
|
+
import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
|
|
13
|
+
import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
|
|
14
|
+
import { isInitializeRequest } from '@modelcontextprotocol/sdk/types.js';
|
|
15
|
+
import { getIdeProcessInfo } from './process-utils.js';
|
|
16
|
+
import { IdeClient, IDEConnectionStatus } from './ide-client.js';
|
|
17
|
+
import { IDE_DEFINITIONS } from './detect-ide.js';
|
|
18
|
+
import { CloseDiffRequestSchema, OpenDiffRequestSchema } from './types.js';
|
|
19
|
+
import { debugLogger } from '../utils/debugLogger.js';
|
|
20
|
+
const platformOverride = vi.hoisted(() => ({
|
|
21
|
+
value: undefined,
|
|
22
|
+
tmpDir: undefined,
|
|
23
|
+
}));
|
|
24
|
+
vi.mock('node:os', async (importOriginal) => {
|
|
25
|
+
const actual = await importOriginal();
|
|
26
|
+
const platform = () => platformOverride.value ?? actual.platform();
|
|
27
|
+
const tmpdir = () => platformOverride.tmpDir ?? actual.tmpdir();
|
|
28
|
+
return {
|
|
29
|
+
...actual,
|
|
30
|
+
platform,
|
|
31
|
+
tmpdir,
|
|
32
|
+
default: {
|
|
33
|
+
...actual,
|
|
34
|
+
platform,
|
|
35
|
+
tmpdir,
|
|
36
|
+
},
|
|
37
|
+
};
|
|
38
|
+
});
|
|
39
|
+
async function startCompanionStandIn(authToken) {
|
|
40
|
+
const transports = new Map();
|
|
41
|
+
let port = 0;
|
|
42
|
+
const server = http.createServer(async (req, res) => {
|
|
43
|
+
const host = req.headers.host ?? '';
|
|
44
|
+
if (![`localhost:${port}`, `127.0.0.1:${port}`].includes(host)) {
|
|
45
|
+
res.writeHead(403).end(JSON.stringify({ error: 'Invalid Host header' }));
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
const authHeader = req.headers.authorization;
|
|
49
|
+
const [scheme, token] = (authHeader ?? '').split(' ');
|
|
50
|
+
if (scheme !== 'Bearer' || token !== authToken) {
|
|
51
|
+
res.writeHead(401).end('Unauthorized');
|
|
52
|
+
return;
|
|
53
|
+
}
|
|
54
|
+
let raw = '';
|
|
55
|
+
if (req.method === 'POST') {
|
|
56
|
+
req.setEncoding('utf8');
|
|
57
|
+
for await (const chunk of req) {
|
|
58
|
+
raw += chunk;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
const body = raw ? JSON.parse(raw) : undefined;
|
|
62
|
+
const sessionId = req.headers['mcp-session-id'];
|
|
63
|
+
let transport = typeof sessionId === 'string' ? transports.get(sessionId) : undefined;
|
|
64
|
+
if (!transport) {
|
|
65
|
+
if (!isInitializeRequest(body)) {
|
|
66
|
+
res.writeHead(400).end('Bad Request');
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
const created = new StreamableHTTPServerTransport({
|
|
70
|
+
sessionIdGenerator: () => randomUUID(),
|
|
71
|
+
onsessioninitialized: (id) => {
|
|
72
|
+
transports.set(id, created);
|
|
73
|
+
},
|
|
74
|
+
});
|
|
75
|
+
transport = created;
|
|
76
|
+
const mcp = new McpServer({ name: 'gemini-cli-companion-mcp-server', version: '1.0.0' }, { capabilities: { logging: {} } });
|
|
77
|
+
mcp.registerTool('openDiff', { description: 'stand-in', inputSchema: OpenDiffRequestSchema.shape }, async () => ({ content: [] }));
|
|
78
|
+
mcp.registerTool('closeDiff', { description: 'stand-in', inputSchema: CloseDiffRequestSchema.shape }, async () => ({ content: [{ type: 'text', text: '{}' }] }));
|
|
79
|
+
await mcp.connect(transport);
|
|
80
|
+
}
|
|
81
|
+
await transport.handleRequest(req, res, body);
|
|
82
|
+
});
|
|
83
|
+
await new Promise((resolve) => server.listen(0, '127.0.0.1', resolve));
|
|
84
|
+
port = server.address().port;
|
|
85
|
+
return {
|
|
86
|
+
port,
|
|
87
|
+
close: async () => {
|
|
88
|
+
await Promise.allSettled([...transports.values()].map((t) => t.close()));
|
|
89
|
+
server.closeAllConnections();
|
|
90
|
+
await new Promise((resolve) => server.close(() => resolve()));
|
|
91
|
+
},
|
|
92
|
+
};
|
|
93
|
+
}
|
|
94
|
+
function writeCrossPlatformExecutable(dir, name, jsBody) {
|
|
95
|
+
const jsPath = path.join(dir, `${name}-script.cjs`);
|
|
96
|
+
fs.writeFileSync(jsPath, jsBody, 'utf8');
|
|
97
|
+
const unixWrapper = path.join(dir, name);
|
|
98
|
+
fs.writeFileSync(unixWrapper, `#!/usr/bin/env node\nrequire(${JSON.stringify(jsPath)});\n`, { mode: 0o755 });
|
|
99
|
+
const winCmdWrapper = path.join(dir, `${name}.cmd`);
|
|
100
|
+
fs.writeFileSync(winCmdWrapper, `@echo off\r\n"${process.execPath}" "${jsPath}" %*\r\n`, 'utf8');
|
|
101
|
+
}
|
|
102
|
+
async function freshIdeClient() {
|
|
103
|
+
IdeClient.instancePromise = null;
|
|
104
|
+
return IdeClient.getInstance();
|
|
105
|
+
}
|
|
106
|
+
describe('process-utils and IDE detection integration', () => {
|
|
107
|
+
afterEach(() => {
|
|
108
|
+
platformOverride.value = undefined;
|
|
109
|
+
platformOverride.tmpDir = undefined;
|
|
110
|
+
vi.restoreAllMocks();
|
|
111
|
+
vi.unstubAllEnvs();
|
|
112
|
+
});
|
|
113
|
+
it('resolves real process info on the current host OS without mocks', async () => {
|
|
114
|
+
vi.stubEnv('GEMINI_CLI_IDE_PID', '');
|
|
115
|
+
const info = await getIdeProcessInfo();
|
|
116
|
+
expect(info.pid).toBeGreaterThan(0);
|
|
117
|
+
expect(typeof info.command).toBe('string');
|
|
118
|
+
expect(info.command.length).toBeGreaterThan(0);
|
|
119
|
+
});
|
|
120
|
+
describe('simulated Windows (win32) real child_process.exec fallback integration', () => {
|
|
121
|
+
let tempRoot;
|
|
122
|
+
let fakeBinDir;
|
|
123
|
+
let fakeTmpDir;
|
|
124
|
+
let callsLogPath;
|
|
125
|
+
let companion;
|
|
126
|
+
let client;
|
|
127
|
+
beforeEach(() => {
|
|
128
|
+
vi.spyOn(debugLogger, 'warn').mockImplementation(() => { });
|
|
129
|
+
tempRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'process-utils-win-int-'));
|
|
130
|
+
fakeBinDir = path.join(tempRoot, 'bin');
|
|
131
|
+
fakeTmpDir = path.join(tempRoot, 'tmp');
|
|
132
|
+
fs.mkdirSync(fakeBinDir, { recursive: true });
|
|
133
|
+
fs.mkdirSync(fakeTmpDir, { recursive: true });
|
|
134
|
+
callsLogPath = path.join(tempRoot, 'exec-calls.jsonl');
|
|
135
|
+
// Simulate Windows where `ps` does not exist and fails if invoked.
|
|
136
|
+
writeCrossPlatformExecutable(fakeBinDir, 'ps', `
|
|
137
|
+
const fs = require('node:fs');
|
|
138
|
+
fs.appendFileSync(${JSON.stringify(callsLogPath)}, JSON.stringify({ bin: 'ps', args: process.argv.slice(2) }) + '\\n');
|
|
139
|
+
process.stderr.write("'ps' is not recognized as an internal or external command.\\n");
|
|
140
|
+
process.exit(1);
|
|
141
|
+
`);
|
|
142
|
+
// Simulate Windows PowerShell where full Win32_Process snapshot fails,
|
|
143
|
+
// while single-PID filtered CIM query can succeed or fail per test mode.
|
|
144
|
+
writeCrossPlatformExecutable(fakeBinDir, 'powershell', `
|
|
145
|
+
const fs = require('node:fs');
|
|
146
|
+
const args = process.argv.slice(2);
|
|
147
|
+
fs.appendFileSync(${JSON.stringify(callsLogPath)}, JSON.stringify({ bin: 'powershell', args }) + '\\n');
|
|
148
|
+
const mode = process.env.FAKE_POWERSHELL_MODE || 'snapshot-fails-single-succeeds';
|
|
149
|
+
const cmdIndex = args.indexOf('-Command');
|
|
150
|
+
const psCmd = cmdIndex !== -1 ? (args[cmdIndex + 1] || '') : args.join(' ');
|
|
151
|
+
|
|
152
|
+
if (mode === 'all-fail') {
|
|
153
|
+
process.stderr.write('Get-CimInstance: WMI service unavailable\\n');
|
|
154
|
+
process.exit(1);
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
const filterMatch = psCmd.match(/ProcessId\\s*=\\s*(\\d+)/);
|
|
158
|
+
if (!filterMatch) {
|
|
159
|
+
// Unfiltered process-table snapshot fails (simulating timeout / maxBuffer / CIM failure)
|
|
160
|
+
process.stderr.write('Get-CimInstance: Operation timed out\\n');
|
|
161
|
+
process.exit(1);
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
const pid = Number(filterMatch[1]);
|
|
165
|
+
const singleCommand = process.env.FAKE_POWERSHELL_SINGLE_CMD || 'C:\\\\Program Files\\\\Microsoft VS Code\\\\Code.exe';
|
|
166
|
+
const singleName = process.env.FAKE_POWERSHELL_SINGLE_NAME || 'Code.exe';
|
|
167
|
+
process.stdout.write(JSON.stringify({
|
|
168
|
+
ProcessId: pid,
|
|
169
|
+
ParentProcessId: 0,
|
|
170
|
+
Name: singleName,
|
|
171
|
+
CommandLine: singleCommand,
|
|
172
|
+
}));
|
|
173
|
+
`);
|
|
174
|
+
platformOverride.value = 'win32';
|
|
175
|
+
platformOverride.tmpDir = fakeTmpDir;
|
|
176
|
+
vi.stubEnv('PATH', `${fakeBinDir}${path.delimiter}${process.env['PATH'] ?? ''}`);
|
|
177
|
+
for (const envName of [
|
|
178
|
+
'GEMINI_CLI_IDE_PID',
|
|
179
|
+
'ANTIGRAVITY_CLI_ALIAS',
|
|
180
|
+
'TERM_PROGRAM',
|
|
181
|
+
'CURSOR_TRACE_ID',
|
|
182
|
+
'CODESPACES',
|
|
183
|
+
'EDITOR_IN_CLOUD_SHELL',
|
|
184
|
+
'CLOUD_SHELL',
|
|
185
|
+
'TERM_PRODUCT',
|
|
186
|
+
'MONOSPACE_ENV',
|
|
187
|
+
'REPLIT_USER',
|
|
188
|
+
'POSITRON',
|
|
189
|
+
'__COG_BASHRC_SOURCED',
|
|
190
|
+
'TERMINAL_EMULATOR',
|
|
191
|
+
'ZED_SESSION_ID',
|
|
192
|
+
'XCODE_VERSION_ACTUAL',
|
|
193
|
+
'SANDBOX',
|
|
194
|
+
'GEMINI_CLI_IDE_SERVER_PORT',
|
|
195
|
+
'GEMINI_CLI_IDE_SERVER_STDIO_COMMAND',
|
|
196
|
+
'GEMINI_CLI_IDE_SERVER_STDIO_ARGS',
|
|
197
|
+
'GEMINI_CLI_IDE_AUTH_TOKEN',
|
|
198
|
+
'GEMINI_CLI_IDE_WORKSPACE_PATH',
|
|
199
|
+
'NO_PROXY',
|
|
200
|
+
'HTTP_PROXY',
|
|
201
|
+
'HTTPS_PROXY',
|
|
202
|
+
]) {
|
|
203
|
+
vi.stubEnv(envName, '');
|
|
204
|
+
}
|
|
205
|
+
});
|
|
206
|
+
afterEach(async () => {
|
|
207
|
+
await client?.disconnect();
|
|
208
|
+
client = undefined;
|
|
209
|
+
await companion?.close();
|
|
210
|
+
companion = undefined;
|
|
211
|
+
fs.rmSync(tempRoot, { recursive: true, force: true });
|
|
212
|
+
});
|
|
213
|
+
function readRecordedCalls() {
|
|
214
|
+
if (!fs.existsSync(callsLogPath)) {
|
|
215
|
+
return [];
|
|
216
|
+
}
|
|
217
|
+
return fs
|
|
218
|
+
.readFileSync(callsLogPath, 'utf8')
|
|
219
|
+
.trim()
|
|
220
|
+
.split('\n')
|
|
221
|
+
.filter(Boolean)
|
|
222
|
+
.map((line) => JSON.parse(line));
|
|
223
|
+
}
|
|
224
|
+
it('recovers process command via single-PID PowerShell CIM fallback, detects IDE accurately, and connects IdeClient without invoking ps', async () => {
|
|
225
|
+
const authToken = 'win-fallback-test-token';
|
|
226
|
+
companion = await startCompanionStandIn(authToken);
|
|
227
|
+
const ideDir = path.join(fakeTmpDir, 'gemini', 'ide');
|
|
228
|
+
fs.mkdirSync(ideDir, { recursive: true });
|
|
229
|
+
fs.writeFileSync(path.join(ideDir, `gemini-ide-server-${process.pid}-${companion.port}.json`), JSON.stringify({
|
|
230
|
+
port: companion.port,
|
|
231
|
+
workspacePath: process.cwd(),
|
|
232
|
+
authToken,
|
|
233
|
+
}), 'utf8');
|
|
234
|
+
vi.stubEnv('FAKE_POWERSHELL_MODE', 'snapshot-fails-single-succeeds');
|
|
235
|
+
vi.stubEnv('FAKE_POWERSHELL_SINGLE_CMD', 'C:\\Users\\dev\\AppData\\Local\\Programs\\Windsurf\\Windsurf.exe');
|
|
236
|
+
vi.stubEnv('FAKE_POWERSHELL_SINGLE_NAME', 'Windsurf.exe');
|
|
237
|
+
vi.stubEnv('TERM_PROGRAM', 'vscode');
|
|
238
|
+
client = await freshIdeClient();
|
|
239
|
+
await client.connect({ logToConsole: false });
|
|
240
|
+
// Because command was recovered ('Windsurf.exe', which does not contain 'code'),
|
|
241
|
+
// detectIde() accurately identifies it as a VS Code fork ('IDE') rather than
|
|
242
|
+
// silently degrading to empty command '' (which misidentifies forks as 'VS Code').
|
|
243
|
+
expect(client.getCurrentIde()).toEqual(IDE_DEFINITIONS.vscodefork);
|
|
244
|
+
expect(client.getConnectionStatus().status).toBe(IDEConnectionStatus.Connected);
|
|
245
|
+
expect(client.isDiffingEnabled()).toBe(true);
|
|
246
|
+
const calls = readRecordedCalls();
|
|
247
|
+
expect(calls.filter((c) => c.bin === 'ps')).toEqual([]);
|
|
248
|
+
expect(calls.filter((c) => c.bin === 'powershell')).toHaveLength(2);
|
|
249
|
+
expect(calls[1]?.args.join(' ')).toContain(`ProcessId=${process.pid}`);
|
|
250
|
+
expect(debugLogger.warn).toHaveBeenCalled();
|
|
251
|
+
});
|
|
252
|
+
it('detects specific JetBrains IDE on Windows via single-PID CIM fallback when snapshot fails', async () => {
|
|
253
|
+
vi.stubEnv('FAKE_POWERSHELL_MODE', 'snapshot-fails-single-succeeds');
|
|
254
|
+
vi.stubEnv('FAKE_POWERSHELL_SINGLE_CMD', 'C:\\Program Files\\JetBrains\\IntelliJ IDEA\\bin\\idea64.exe');
|
|
255
|
+
vi.stubEnv('FAKE_POWERSHELL_SINGLE_NAME', 'idea64.exe');
|
|
256
|
+
vi.stubEnv('TERMINAL_EMULATOR', 'JetBrains-JediTerm');
|
|
257
|
+
client = await freshIdeClient();
|
|
258
|
+
expect(client.getCurrentIde()).toEqual(IDE_DEFINITIONS.intellijidea);
|
|
259
|
+
const calls = readRecordedCalls();
|
|
260
|
+
expect(calls.filter((c) => c.bin === 'ps')).toEqual([]);
|
|
261
|
+
expect(calls.filter((c) => c.bin === 'powershell')).toHaveLength(2);
|
|
262
|
+
expect(debugLogger.warn).toHaveBeenCalled();
|
|
263
|
+
});
|
|
264
|
+
it('degrades gracefully with debugLogger.warn and never invokes ps when both snapshot and CIM fallback fail', async () => {
|
|
265
|
+
vi.stubEnv('FAKE_POWERSHELL_MODE', 'all-fail');
|
|
266
|
+
vi.stubEnv('TERM_PROGRAM', 'vscode');
|
|
267
|
+
const info = await getIdeProcessInfo();
|
|
268
|
+
expect(info).toEqual({ pid: process.pid, command: '' });
|
|
269
|
+
const calls = readRecordedCalls();
|
|
270
|
+
expect(calls.filter((c) => c.bin === 'ps')).toEqual([]);
|
|
271
|
+
expect(calls.filter((c) => c.bin === 'powershell')).toHaveLength(2);
|
|
272
|
+
expect(debugLogger.warn).toHaveBeenCalled();
|
|
273
|
+
});
|
|
274
|
+
});
|
|
275
|
+
});
|
|
276
|
+
//# sourceMappingURL=process-utils.integration.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"process-utils.integration.test.js","sourceRoot":"","sources":["../../../src/ide/process-utils.integration.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,12 @@ 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';
|
|
10
11
|
const execAsync = promisify(exec);
|
|
11
12
|
const MAX_TRAVERSAL_DEPTH = 32;
|
|
13
|
+
function isRawProcessInfo(value) {
|
|
14
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
15
|
+
}
|
|
12
16
|
/**
|
|
13
17
|
* Fetches the entire process table on Windows.
|
|
14
18
|
*/
|
|
@@ -27,33 +31,69 @@ async function getProcessTableWindows() {
|
|
|
27
31
|
if (!stdout.trim()) {
|
|
28
32
|
return processMap;
|
|
29
33
|
}
|
|
30
|
-
let
|
|
34
|
+
let parsed;
|
|
31
35
|
try {
|
|
32
|
-
|
|
33
|
-
processes = JSON.parse(stdout);
|
|
36
|
+
parsed = JSON.parse(stdout);
|
|
34
37
|
}
|
|
35
|
-
catch {
|
|
38
|
+
catch (error) {
|
|
39
|
+
debugLogger.warn('Failed to parse Windows process table snapshot JSON:', error);
|
|
36
40
|
return processMap;
|
|
37
41
|
}
|
|
38
|
-
|
|
39
|
-
processes = [processes];
|
|
40
|
-
}
|
|
42
|
+
const processes = Array.isArray(parsed) ? parsed : [parsed];
|
|
41
43
|
for (const p of processes) {
|
|
42
|
-
if (p && typeof p.ProcessId === 'number') {
|
|
44
|
+
if (isRawProcessInfo(p) && typeof p.ProcessId === 'number') {
|
|
45
|
+
const name = typeof p.Name === 'string' ? p.Name : '';
|
|
46
|
+
const command = typeof p.CommandLine === 'string' && p.CommandLine
|
|
47
|
+
? p.CommandLine
|
|
48
|
+
: name;
|
|
43
49
|
processMap.set(p.ProcessId, {
|
|
44
50
|
pid: p.ProcessId,
|
|
45
|
-
parentPid: p.ParentProcessId
|
|
46
|
-
name
|
|
47
|
-
command
|
|
51
|
+
parentPid: typeof p.ParentProcessId === 'number' ? p.ParentProcessId : 0,
|
|
52
|
+
name,
|
|
53
|
+
command,
|
|
48
54
|
});
|
|
49
55
|
}
|
|
50
56
|
}
|
|
51
57
|
}
|
|
52
|
-
catch {
|
|
53
|
-
|
|
58
|
+
catch (error) {
|
|
59
|
+
debugLogger.warn('Failed to fetch Windows process table snapshot:', error);
|
|
54
60
|
}
|
|
55
61
|
return processMap;
|
|
56
62
|
}
|
|
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
|
+
}
|
|
57
97
|
/**
|
|
58
98
|
* Fetches the parent process ID, name, and command for a given process ID on Unix.
|
|
59
99
|
*
|
|
@@ -138,8 +178,9 @@ async function getIdeProcessInfoForWindows() {
|
|
|
138
178
|
const myPid = process.pid;
|
|
139
179
|
const myProc = processMap.get(myPid);
|
|
140
180
|
if (!myProc) {
|
|
181
|
+
debugLogger.warn(`Current process (PID ${myPid}) not found in Windows process table snapshot; falling back to single-PID CIM query.`);
|
|
141
182
|
// Fallback: try to get info for current process directly if snapshot fails
|
|
142
|
-
const { command } = await
|
|
183
|
+
const { command } = await getProcessInfoWindows(myPid);
|
|
143
184
|
return { pid: myPid, command };
|
|
144
185
|
}
|
|
145
186
|
// Perform tree traversal in memory.
|
|
@@ -155,13 +196,22 @@ async function getIdeProcessInfoForWindows() {
|
|
|
155
196
|
}
|
|
156
197
|
if (ancestors.length >= 3) {
|
|
157
198
|
const target = ancestors[ancestors.length - 3];
|
|
158
|
-
return {
|
|
199
|
+
return {
|
|
200
|
+
pid: target.pid,
|
|
201
|
+
command: target.command || target.name || 'unknown',
|
|
202
|
+
};
|
|
159
203
|
}
|
|
160
204
|
else if (ancestors.length > 0) {
|
|
161
205
|
const target = ancestors[ancestors.length - 1];
|
|
162
|
-
return {
|
|
206
|
+
return {
|
|
207
|
+
pid: target.pid,
|
|
208
|
+
command: target.command || target.name || 'unknown',
|
|
209
|
+
};
|
|
163
210
|
}
|
|
164
|
-
return {
|
|
211
|
+
return {
|
|
212
|
+
pid: myPid,
|
|
213
|
+
command: myProc.command || myProc.name || 'unknown',
|
|
214
|
+
};
|
|
165
215
|
}
|
|
166
216
|
/**
|
|
167
217
|
* Traverses up the process tree to find the process ID and command of the IDE.
|
|
@@ -188,9 +238,8 @@ export async function getIdeProcessInfo() {
|
|
|
188
238
|
const idePid = parseInt(process.env['GEMINI_CLI_IDE_PID'], 10);
|
|
189
239
|
if (!isNaN(idePid) && idePid > 0) {
|
|
190
240
|
if (platform === 'win32') {
|
|
191
|
-
const
|
|
192
|
-
|
|
193
|
-
return { pid: idePid, command: proc?.command || '' };
|
|
241
|
+
const { command } = await getProcessInfoWindows(idePid);
|
|
242
|
+
return { pid: idePid, command };
|
|
194
243
|
}
|
|
195
244
|
const { command } = await getProcessInfo(idePid);
|
|
196
245
|
return { pid: idePid, command };
|