@google/gemini-cli 0.18.0-nightly.20251120.2231497b1 → 0.18.0-preview.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/package.json +3 -3
- package/dist/src/commands/extensions/disable.test.js +19 -13
- package/dist/src/commands/extensions/disable.test.js.map +1 -1
- package/dist/src/commands/extensions/enable.test.js +16 -9
- package/dist/src/commands/extensions/enable.test.js.map +1 -1
- package/dist/src/commands/extensions/link.test.js +18 -11
- package/dist/src/commands/extensions/link.test.js.map +1 -1
- package/dist/src/commands/extensions/list.test.js +20 -13
- package/dist/src/commands/extensions/list.test.js.map +1 -1
- package/dist/src/commands/extensions/uninstall.test.js +26 -18
- package/dist/src/commands/extensions/uninstall.test.js.map +1 -1
- package/dist/src/commands/extensions/update.test.js +20 -13
- package/dist/src/commands/extensions/update.test.js.map +1 -1
- package/dist/src/commands/mcp/add.test.js +8 -3
- package/dist/src/commands/mcp/add.test.js.map +1 -1
- package/dist/src/commands/mcp/list.test.js +1 -6
- package/dist/src/commands/mcp/list.test.js.map +1 -1
- package/dist/src/commands/mcp/remove.test.js +23 -12
- package/dist/src/commands/mcp/remove.test.js.map +1 -1
- package/dist/src/config/config.js +36 -13
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +50 -10
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/extension.test.js +131 -125
- package/dist/src/config/extension.test.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +1 -1
- package/dist/src/config/settingsSchema.js +2 -2
- package/dist/src/config/settingsSchema.js.map +1 -1
- package/dist/src/config/settingsSchema.test.js +1 -1
- package/dist/src/config/settingsSchema.test.js.map +1 -1
- package/dist/src/gemini.js +65 -7
- package/dist/src/gemini.js.map +1 -1
- package/dist/src/gemini.test.js +55 -15
- package/dist/src/gemini.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/nonInteractiveCli.js +4 -1
- package/dist/src/nonInteractiveCli.js.map +1 -1
- package/dist/src/nonInteractiveCli.test.js +2 -2
- package/dist/src/nonInteractiveCli.test.js.map +1 -1
- package/dist/src/services/CommandService.test.js +3 -2
- package/dist/src/services/CommandService.test.js.map +1 -1
- package/dist/src/test-utils/render.d.ts +19 -0
- package/dist/src/test-utils/render.js +32 -1
- package/dist/src/test-utils/render.js.map +1 -1
- package/dist/src/ui/AppContainer.js +42 -26
- package/dist/src/ui/AppContainer.js.map +1 -1
- package/dist/src/ui/AppContainer.test.js +91 -19
- package/dist/src/ui/AppContainer.test.js.map +1 -1
- package/dist/src/ui/auth/AuthDialog.test.js +2 -2
- package/dist/src/ui/auth/AuthDialog.test.js.map +1 -1
- package/dist/src/ui/commands/aboutCommand.js +8 -1
- package/dist/src/ui/commands/aboutCommand.js.map +1 -1
- package/dist/src/ui/commands/aboutCommand.test.js +4 -0
- package/dist/src/ui/commands/aboutCommand.test.js.map +1 -1
- package/dist/src/ui/commands/memoryCommand.js +1 -0
- package/dist/src/ui/commands/memoryCommand.js.map +1 -1
- package/dist/src/ui/commands/memoryCommand.test.js +3 -0
- package/dist/src/ui/commands/memoryCommand.test.js.map +1 -1
- package/dist/src/ui/commands/setupGithubCommand.d.ts +1 -0
- package/dist/src/ui/commands/setupGithubCommand.js +82 -45
- package/dist/src/ui/commands/setupGithubCommand.js.map +1 -1
- package/dist/src/ui/commands/setupGithubCommand.test.js +35 -5
- package/dist/src/ui/commands/setupGithubCommand.test.js.map +1 -1
- package/dist/src/ui/components/AboutBox.d.ts +1 -0
- package/dist/src/ui/components/AboutBox.js +1 -1
- package/dist/src/ui/components/AboutBox.js.map +1 -1
- package/dist/src/ui/components/AppHeader.js +3 -8
- package/dist/src/ui/components/AppHeader.js.map +1 -1
- package/dist/src/ui/components/Banner.d.ts +4 -2
- package/dist/src/ui/components/Banner.js +19 -1
- package/dist/src/ui/components/Banner.js.map +1 -1
- package/dist/src/ui/components/DebugProfiler.d.ts +1 -0
- package/dist/src/ui/components/DebugProfiler.js +23 -34
- package/dist/src/ui/components/DebugProfiler.js.map +1 -1
- package/dist/src/ui/components/DebugProfiler.test.js +1 -0
- package/dist/src/ui/components/DebugProfiler.test.js.map +1 -1
- package/dist/src/ui/components/DialogManager.js +1 -1
- package/dist/src/ui/components/DialogManager.js.map +1 -1
- package/dist/src/ui/components/GradientRegression.test.js +1 -1
- package/dist/src/ui/components/GradientRegression.test.js.map +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.js +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.js.map +1 -1
- package/dist/src/ui/components/SettingsDialog.d.ts +3 -1
- package/dist/src/ui/components/SettingsDialog.js +4 -1
- package/dist/src/ui/components/SettingsDialog.js.map +1 -1
- package/dist/src/ui/components/shared/text-buffer.js +2 -1
- package/dist/src/ui/components/shared/text-buffer.js.map +1 -1
- package/dist/src/ui/contexts/KeypressContext.test.js +14 -9
- package/dist/src/ui/contexts/KeypressContext.test.js.map +1 -1
- package/dist/src/ui/hooks/useBracketedPaste.js +3 -2
- package/dist/src/ui/hooks/useBracketedPaste.js.map +1 -1
- package/dist/src/ui/hooks/useCommandCompletion.test.js +5 -5
- package/dist/src/ui/hooks/useCommandCompletion.test.js.map +1 -1
- package/dist/src/ui/hooks/useConsoleMessages.d.ts +0 -1
- package/dist/src/ui/hooks/useConsoleMessages.js +26 -1
- package/dist/src/ui/hooks/useConsoleMessages.js.map +1 -1
- package/dist/src/ui/hooks/useConsoleMessages.test.js +37 -5
- package/dist/src/ui/hooks/useConsoleMessages.test.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.d.ts +1 -1
- package/dist/src/ui/hooks/useGeminiStream.js +2 -2
- package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.test.js +18 -19
- package/dist/src/ui/hooks/useGeminiStream.test.js.map +1 -1
- package/dist/src/ui/hooks/useInputHistoryStore.test.js +4 -1
- package/dist/src/ui/hooks/useInputHistoryStore.test.js.map +1 -1
- package/dist/src/ui/hooks/useReactToolScheduler.d.ts +1 -1
- package/dist/src/ui/hooks/useReactToolScheduler.js +1 -8
- package/dist/src/ui/hooks/useReactToolScheduler.js.map +1 -1
- package/dist/src/ui/hooks/useReactToolScheduler.test.js +1 -8
- package/dist/src/ui/hooks/useReactToolScheduler.test.js.map +1 -1
- package/dist/src/ui/hooks/useReverseSearchCompletion.test.js +18 -12
- package/dist/src/ui/hooks/useReverseSearchCompletion.test.js.map +1 -1
- package/dist/src/ui/hooks/useToolScheduler.test.js +2 -2
- package/dist/src/ui/hooks/useToolScheduler.test.js.map +1 -1
- package/dist/src/ui/themes/theme-manager.test.js +2 -1
- package/dist/src/ui/themes/theme-manager.test.js.map +1 -1
- package/dist/src/ui/types.d.ts +2 -0
- package/dist/src/ui/types.js.map +1 -1
- package/dist/src/ui/utils/ConsolePatcher.js +6 -9
- package/dist/src/ui/utils/ConsolePatcher.js.map +1 -1
- package/dist/src/ui/utils/kittyProtocolDetector.js +20 -21
- package/dist/src/ui/utils/kittyProtocolDetector.js.map +1 -1
- package/dist/src/ui/utils/mouse.js +3 -3
- package/dist/src/ui/utils/mouse.js.map +1 -1
- package/dist/src/utils/cleanup.d.ts +2 -0
- package/dist/src/utils/cleanup.js +16 -0
- package/dist/src/utils/cleanup.js.map +1 -1
- package/dist/src/utils/errors.js +10 -0
- package/dist/src/utils/errors.js.map +1 -1
- package/dist/src/utils/events.d.ts +0 -2
- package/dist/src/utils/events.js +0 -1
- package/dist/src/utils/events.js.map +1 -1
- package/dist/src/utils/installationInfo.test.js +8 -9
- package/dist/src/utils/installationInfo.test.js.map +1 -1
- package/dist/src/utils/sessionCleanup.test.js +4 -2
- package/dist/src/utils/sessionCleanup.test.js.map +1 -1
- package/dist/src/utils/stdio.d.ts +32 -0
- package/dist/src/utils/stdio.js +85 -0
- package/dist/src/utils/stdio.js.map +1 -0
- package/dist/src/utils/stdio.test.d.ts +6 -0
- package/dist/src/utils/stdio.test.js +47 -0
- package/dist/src/utils/stdio.test.js.map +1 -0
- package/dist/src/validateNonInterActiveAuth.js +2 -0
- package/dist/src/validateNonInterActiveAuth.js.map +1 -1
- package/dist/src/validateNonInterActiveAuth.test.js +10 -6
- package/dist/src/validateNonInterActiveAuth.test.js.map +1 -1
- package/dist/src/zed-integration/schema.d.ts +30 -30
- package/dist/src/zed-integration/zedIntegration.d.ts +0 -7
- package/dist/src/zed-integration/zedIntegration.js +3 -19
- package/dist/src/zed-integration/zedIntegration.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -4
- package/dist/google-gemini-cli-0.18.0-nightly.20251118.86828bb56.tgz +0 -0
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@google/gemini-cli",
|
|
3
|
-
"version": "0.18.0-
|
|
3
|
+
"version": "0.18.0-preview.0",
|
|
4
4
|
"description": "Gemini CLI",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"dist"
|
|
26
26
|
],
|
|
27
27
|
"config": {
|
|
28
|
-
"sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.18.0-
|
|
28
|
+
"sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.18.0-preview.0"
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
31
|
"@google/gemini-cli-core": "file:../core",
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
"fzf": "^0.5.2",
|
|
44
44
|
"glob": "^12.0.0",
|
|
45
45
|
"highlight.js": "^11.11.1",
|
|
46
|
-
"ink": "npm:@jrichman/ink@6.4.
|
|
46
|
+
"ink": "npm:@jrichman/ink@6.4.5",
|
|
47
47
|
"ink-gradient": "^3.0.0",
|
|
48
48
|
"ink-spinner": "^5.0.0",
|
|
49
49
|
"latest-version": "^9.0.0",
|
|
@@ -4,25 +4,35 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { vi, describe, it, expect, beforeEach, afterEach, } from 'vitest';
|
|
7
|
+
import { format } from 'node:util';
|
|
7
8
|
import {} from 'yargs';
|
|
8
9
|
import { handleDisable, disableCommand } from './disable.js';
|
|
9
10
|
import { ExtensionManager } from '../../config/extension-manager.js';
|
|
10
11
|
import { loadSettings, SettingScope, } from '../../config/settings.js';
|
|
11
12
|
import { getErrorMessage } from '../../utils/errors.js';
|
|
12
13
|
// Mock dependencies
|
|
13
|
-
vi.
|
|
14
|
-
vi.
|
|
15
|
-
vi.
|
|
14
|
+
const emitConsoleLog = vi.hoisted(() => vi.fn());
|
|
15
|
+
const debugLogger = vi.hoisted(() => ({
|
|
16
|
+
log: vi.fn((message, ...args) => {
|
|
17
|
+
emitConsoleLog('log', format(message, ...args));
|
|
18
|
+
}),
|
|
19
|
+
error: vi.fn((message, ...args) => {
|
|
20
|
+
emitConsoleLog('error', format(message, ...args));
|
|
21
|
+
}),
|
|
22
|
+
}));
|
|
16
23
|
vi.mock('@google/gemini-cli-core', async (importOriginal) => {
|
|
17
24
|
const actual = await importOriginal();
|
|
18
25
|
return {
|
|
19
26
|
...actual,
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
error: vi.fn(),
|
|
27
|
+
coreEvents: {
|
|
28
|
+
emitConsoleLog,
|
|
23
29
|
},
|
|
30
|
+
debugLogger,
|
|
24
31
|
};
|
|
25
32
|
});
|
|
33
|
+
vi.mock('../../config/extension-manager.js');
|
|
34
|
+
vi.mock('../../config/settings.js');
|
|
35
|
+
vi.mock('../../utils/errors.js');
|
|
26
36
|
vi.mock('../../config/extensions/consent.js', () => ({
|
|
27
37
|
requestConsentNonInteractive: vi.fn(),
|
|
28
38
|
}));
|
|
@@ -33,12 +43,8 @@ describe('extensions disable command', () => {
|
|
|
33
43
|
const mockLoadSettings = vi.mocked(loadSettings);
|
|
34
44
|
const mockGetErrorMessage = vi.mocked(getErrorMessage);
|
|
35
45
|
const mockExtensionManager = vi.mocked(ExtensionManager);
|
|
36
|
-
let mockDebugLogger;
|
|
37
46
|
beforeEach(async () => {
|
|
38
47
|
vi.clearAllMocks();
|
|
39
|
-
// We need to re-import the mocked module to get the fresh mock
|
|
40
|
-
mockDebugLogger = (await import('@google/gemini-cli-core'))
|
|
41
|
-
.debugLogger;
|
|
42
48
|
mockLoadSettings.mockReturnValue({
|
|
43
49
|
merged: {},
|
|
44
50
|
});
|
|
@@ -80,7 +86,7 @@ describe('extensions disable command', () => {
|
|
|
80
86
|
}));
|
|
81
87
|
expect(mockExtensionManager.prototype.loadExtensions).toHaveBeenCalled();
|
|
82
88
|
expect(mockExtensionManager.prototype.disableExtension).toHaveBeenCalledWith(name, expectedScope);
|
|
83
|
-
expect(
|
|
89
|
+
expect(emitConsoleLog).toHaveBeenCalledWith('log', expectedLog);
|
|
84
90
|
mockCwd.mockRestore();
|
|
85
91
|
});
|
|
86
92
|
it('should log an error message and exit with code 1 when extension disabling fails', async () => {
|
|
@@ -91,7 +97,7 @@ describe('extensions disable command', () => {
|
|
|
91
97
|
mockExtensionManager.prototype.disableExtension.mockRejectedValue(error);
|
|
92
98
|
mockGetErrorMessage.mockReturnValue('Disable failed message');
|
|
93
99
|
await handleDisable({ name: 'my-extension' });
|
|
94
|
-
expect(
|
|
100
|
+
expect(emitConsoleLog).toHaveBeenCalledWith('error', 'Disable failed message');
|
|
95
101
|
expect(mockProcessExit).toHaveBeenCalledWith(1);
|
|
96
102
|
mockProcessExit.mockRestore();
|
|
97
103
|
});
|
|
@@ -152,7 +158,7 @@ describe('extensions disable command', () => {
|
|
|
152
158
|
}));
|
|
153
159
|
expect(mockExtensionManager.prototype.loadExtensions).toHaveBeenCalled();
|
|
154
160
|
expect(mockExtensionManager.prototype.disableExtension).toHaveBeenCalledWith('test-ext', SettingScope.Workspace);
|
|
155
|
-
expect(
|
|
161
|
+
expect(emitConsoleLog).toHaveBeenCalledWith('log', 'Extension "test-ext" successfully disabled for scope "workspace".');
|
|
156
162
|
mockCwd.mockRestore();
|
|
157
163
|
});
|
|
158
164
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"disable.test.js","sourceRoot":"","sources":["../../../../src/commands/extensions/disable.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,EAAE,EACF,QAAQ,EACR,EAAE,EACF,MAAM,EACN,UAAU,EACV,SAAS,GAEV,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"disable.test.js","sourceRoot":"","sources":["../../../../src/commands/extensions/disable.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,22 +4,30 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { vi, describe, it, expect, beforeEach, afterEach, } from 'vitest';
|
|
7
|
+
import { format } from 'node:util';
|
|
7
8
|
import {} from 'yargs';
|
|
8
9
|
import { handleEnable, enableCommand } from './enable.js';
|
|
9
10
|
import { ExtensionManager } from '../../config/extension-manager.js';
|
|
10
11
|
import { loadSettings, SettingScope, } from '../../config/settings.js';
|
|
11
12
|
import { FatalConfigError } from '@google/gemini-cli-core';
|
|
12
13
|
// Mock dependencies
|
|
13
|
-
vi.
|
|
14
|
-
vi.
|
|
14
|
+
const emitConsoleLog = vi.hoisted(() => vi.fn());
|
|
15
|
+
const debugLogger = vi.hoisted(() => ({
|
|
16
|
+
log: vi.fn((message, ...args) => {
|
|
17
|
+
emitConsoleLog('log', format(message, ...args));
|
|
18
|
+
}),
|
|
19
|
+
error: vi.fn((message, ...args) => {
|
|
20
|
+
emitConsoleLog('error', format(message, ...args));
|
|
21
|
+
}),
|
|
22
|
+
}));
|
|
15
23
|
vi.mock('@google/gemini-cli-core', async (importOriginal) => {
|
|
16
24
|
const actual = await importOriginal();
|
|
17
25
|
return {
|
|
18
26
|
...actual,
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
error: vi.fn(),
|
|
27
|
+
coreEvents: {
|
|
28
|
+
emitConsoleLog,
|
|
22
29
|
},
|
|
30
|
+
debugLogger,
|
|
23
31
|
getErrorMessage: vi.fn((error) => error.message),
|
|
24
32
|
FatalConfigError: class extends Error {
|
|
25
33
|
constructor(message) {
|
|
@@ -29,16 +37,15 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
|
|
|
29
37
|
},
|
|
30
38
|
};
|
|
31
39
|
});
|
|
40
|
+
vi.mock('../../config/extension-manager.js');
|
|
41
|
+
vi.mock('../../config/settings.js');
|
|
32
42
|
vi.mock('../../config/extensions/consent.js');
|
|
33
43
|
vi.mock('../../config/extensions/extensionSettings.js');
|
|
34
44
|
describe('extensions enable command', () => {
|
|
35
45
|
const mockLoadSettings = vi.mocked(loadSettings);
|
|
36
46
|
const mockExtensionManager = vi.mocked(ExtensionManager);
|
|
37
|
-
let mockDebugLogger;
|
|
38
47
|
beforeEach(async () => {
|
|
39
48
|
vi.clearAllMocks();
|
|
40
|
-
mockDebugLogger = (await import('@google/gemini-cli-core'))
|
|
41
|
-
.debugLogger;
|
|
42
49
|
mockLoadSettings.mockReturnValue({
|
|
43
50
|
merged: {},
|
|
44
51
|
});
|
|
@@ -72,7 +79,7 @@ describe('extensions enable command', () => {
|
|
|
72
79
|
}));
|
|
73
80
|
expect(mockExtensionManager.prototype.loadExtensions).toHaveBeenCalled();
|
|
74
81
|
expect(mockExtensionManager.prototype.enableExtension).toHaveBeenCalledWith(name, expectedScope);
|
|
75
|
-
expect(
|
|
82
|
+
expect(emitConsoleLog).toHaveBeenCalledWith('log', expectedLog);
|
|
76
83
|
mockCwd.mockRestore();
|
|
77
84
|
});
|
|
78
85
|
it('should throw FatalConfigError when extension enabling fails', async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enable.test.js","sourceRoot":"","sources":["../../../../src/commands/extensions/enable.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,EAAE,EACF,QAAQ,EACR,EAAE,EACF,MAAM,EACN,UAAU,EACV,SAAS,GAEV,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAiC,MAAM,OAAO,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EACL,YAAY,EACZ,YAAY,GAEb,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,oBAAoB;AACpB,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"enable.test.js","sourceRoot":"","sources":["../../../../src/commands/extensions/enable.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,25 +4,35 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { vi, describe, it, expect, beforeEach, afterEach, } from 'vitest';
|
|
7
|
+
import { format } from 'node:util';
|
|
7
8
|
import {} from 'yargs';
|
|
8
9
|
import { handleLink, linkCommand } from './link.js';
|
|
9
10
|
import { ExtensionManager } from '../../config/extension-manager.js';
|
|
10
11
|
import { loadSettings } from '../../config/settings.js';
|
|
11
12
|
import { getErrorMessage } from '../../utils/errors.js';
|
|
12
13
|
// Mock dependencies
|
|
13
|
-
vi.
|
|
14
|
-
vi.
|
|
15
|
-
vi.
|
|
14
|
+
const emitConsoleLog = vi.hoisted(() => vi.fn());
|
|
15
|
+
const debugLogger = vi.hoisted(() => ({
|
|
16
|
+
log: vi.fn((message, ...args) => {
|
|
17
|
+
emitConsoleLog('log', format(message, ...args));
|
|
18
|
+
}),
|
|
19
|
+
error: vi.fn((message, ...args) => {
|
|
20
|
+
emitConsoleLog('error', format(message, ...args));
|
|
21
|
+
}),
|
|
22
|
+
}));
|
|
16
23
|
vi.mock('@google/gemini-cli-core', async (importOriginal) => {
|
|
17
24
|
const actual = await importOriginal();
|
|
18
25
|
return {
|
|
19
26
|
...actual,
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
error: vi.fn(),
|
|
27
|
+
coreEvents: {
|
|
28
|
+
emitConsoleLog,
|
|
23
29
|
},
|
|
30
|
+
debugLogger,
|
|
24
31
|
};
|
|
25
32
|
});
|
|
33
|
+
vi.mock('../../config/extension-manager.js');
|
|
34
|
+
vi.mock('../../config/settings.js');
|
|
35
|
+
vi.mock('../../utils/errors.js');
|
|
26
36
|
vi.mock('../../config/extensions/consent.js', () => ({
|
|
27
37
|
requestConsentNonInteractive: vi.fn(),
|
|
28
38
|
}));
|
|
@@ -33,11 +43,8 @@ describe('extensions link command', () => {
|
|
|
33
43
|
const mockLoadSettings = vi.mocked(loadSettings);
|
|
34
44
|
const mockGetErrorMessage = vi.mocked(getErrorMessage);
|
|
35
45
|
const mockExtensionManager = vi.mocked(ExtensionManager);
|
|
36
|
-
let mockDebugLogger;
|
|
37
46
|
beforeEach(async () => {
|
|
38
47
|
vi.clearAllMocks();
|
|
39
|
-
mockDebugLogger = (await import('@google/gemini-cli-core'))
|
|
40
|
-
.debugLogger;
|
|
41
48
|
mockLoadSettings.mockReturnValue({
|
|
42
49
|
merged: {},
|
|
43
50
|
});
|
|
@@ -63,7 +70,7 @@ describe('extensions link command', () => {
|
|
|
63
70
|
source: '/local/path/to/extension',
|
|
64
71
|
type: 'link',
|
|
65
72
|
});
|
|
66
|
-
expect(
|
|
73
|
+
expect(emitConsoleLog).toHaveBeenCalledWith('log', 'Extension "my-linked-extension" linked successfully and enabled.');
|
|
67
74
|
mockCwd.mockRestore();
|
|
68
75
|
});
|
|
69
76
|
it('should log an error message and exit with code 1 when linking fails', async () => {
|
|
@@ -74,7 +81,7 @@ describe('extensions link command', () => {
|
|
|
74
81
|
mockExtensionManager.prototype.installOrUpdateExtension.mockRejectedValue(error);
|
|
75
82
|
mockGetErrorMessage.mockReturnValue('Link failed message');
|
|
76
83
|
await handleLink({ path: '/local/path/to/extension' });
|
|
77
|
-
expect(
|
|
84
|
+
expect(emitConsoleLog).toHaveBeenCalledWith('error', 'Link failed message');
|
|
78
85
|
expect(mockProcessExit).toHaveBeenCalledWith(1);
|
|
79
86
|
mockProcessExit.mockRestore();
|
|
80
87
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"link.test.js","sourceRoot":"","sources":["../../../../src/commands/extensions/link.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,EAAE,EACF,QAAQ,EACR,EAAE,EACF,MAAM,EACN,UAAU,EACV,SAAS,GAEV,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAiC,MAAM,OAAO,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,YAAY,EAAuB,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,oBAAoB;AACpB,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"link.test.js","sourceRoot":"","sources":["../../../../src/commands/extensions/link.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,26 +3,36 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { vi, describe, it, expect, beforeEach, afterEach
|
|
6
|
+
import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
|
|
7
|
+
import { format } from 'node:util';
|
|
7
8
|
import {} from 'yargs';
|
|
8
9
|
import { handleList, listCommand } from './list.js';
|
|
9
10
|
import { ExtensionManager } from '../../config/extension-manager.js';
|
|
10
11
|
import { loadSettings } from '../../config/settings.js';
|
|
11
12
|
import { getErrorMessage } from '../../utils/errors.js';
|
|
12
13
|
// Mock dependencies
|
|
13
|
-
vi.
|
|
14
|
-
vi.
|
|
15
|
-
vi.
|
|
14
|
+
const emitConsoleLog = vi.hoisted(() => vi.fn());
|
|
15
|
+
const debugLogger = vi.hoisted(() => ({
|
|
16
|
+
log: vi.fn((message, ...args) => {
|
|
17
|
+
emitConsoleLog('log', format(message, ...args));
|
|
18
|
+
}),
|
|
19
|
+
error: vi.fn((message, ...args) => {
|
|
20
|
+
emitConsoleLog('error', format(message, ...args));
|
|
21
|
+
}),
|
|
22
|
+
}));
|
|
16
23
|
vi.mock('@google/gemini-cli-core', async (importOriginal) => {
|
|
17
24
|
const actual = await importOriginal();
|
|
18
25
|
return {
|
|
19
26
|
...actual,
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
error: vi.fn(),
|
|
27
|
+
coreEvents: {
|
|
28
|
+
emitConsoleLog,
|
|
23
29
|
},
|
|
30
|
+
debugLogger,
|
|
24
31
|
};
|
|
25
32
|
});
|
|
33
|
+
vi.mock('../../config/extension-manager.js');
|
|
34
|
+
vi.mock('../../config/settings.js');
|
|
35
|
+
vi.mock('../../utils/errors.js');
|
|
26
36
|
vi.mock('../../config/extensions/consent.js', () => ({
|
|
27
37
|
requestConsentNonInteractive: vi.fn(),
|
|
28
38
|
}));
|
|
@@ -33,11 +43,8 @@ describe('extensions list command', () => {
|
|
|
33
43
|
const mockLoadSettings = vi.mocked(loadSettings);
|
|
34
44
|
const mockGetErrorMessage = vi.mocked(getErrorMessage);
|
|
35
45
|
const mockExtensionManager = vi.mocked(ExtensionManager);
|
|
36
|
-
let mockDebugLogger;
|
|
37
46
|
beforeEach(async () => {
|
|
38
47
|
vi.clearAllMocks();
|
|
39
|
-
mockDebugLogger = (await import('@google/gemini-cli-core'))
|
|
40
|
-
.debugLogger;
|
|
41
48
|
mockLoadSettings.mockReturnValue({
|
|
42
49
|
merged: {},
|
|
43
50
|
});
|
|
@@ -52,7 +59,7 @@ describe('extensions list command', () => {
|
|
|
52
59
|
.fn()
|
|
53
60
|
.mockResolvedValue([]);
|
|
54
61
|
await handleList();
|
|
55
|
-
expect(
|
|
62
|
+
expect(emitConsoleLog).toHaveBeenCalledWith('log', 'No extensions installed.');
|
|
56
63
|
mockCwd.mockRestore();
|
|
57
64
|
});
|
|
58
65
|
it('should list all installed extensions', async () => {
|
|
@@ -66,7 +73,7 @@ describe('extensions list command', () => {
|
|
|
66
73
|
.mockResolvedValue(extensions);
|
|
67
74
|
mockExtensionManager.prototype.toOutputString = vi.fn((ext) => `${ext.name}@${ext.version}`);
|
|
68
75
|
await handleList();
|
|
69
|
-
expect(
|
|
76
|
+
expect(emitConsoleLog).toHaveBeenCalledWith('log', 'ext1@1.0.0\n\next2@2.0.0');
|
|
70
77
|
mockCwd.mockRestore();
|
|
71
78
|
});
|
|
72
79
|
it('should log an error message and exit with code 1 when listing fails', async () => {
|
|
@@ -79,7 +86,7 @@ describe('extensions list command', () => {
|
|
|
79
86
|
.mockRejectedValue(error);
|
|
80
87
|
mockGetErrorMessage.mockReturnValue('List failed message');
|
|
81
88
|
await handleList();
|
|
82
|
-
expect(
|
|
89
|
+
expect(emitConsoleLog).toHaveBeenCalledWith('error', 'List failed message');
|
|
83
90
|
expect(mockProcessExit).toHaveBeenCalledWith(1);
|
|
84
91
|
mockProcessExit.mockRestore();
|
|
85
92
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.test.js","sourceRoot":"","sources":["../../../../src/commands/extensions/list.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"list.test.js","sourceRoot":"","sources":["../../../../src/commands/extensions/list.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { vi, describe, it, expect, beforeEach, afterEach, } from 'vitest';
|
|
7
|
+
import { format } from 'node:util';
|
|
7
8
|
import {} from 'yargs';
|
|
8
9
|
import { handleUninstall, uninstallCommand } from './uninstall.js';
|
|
9
10
|
import { ExtensionManager } from '../../config/extension-manager.js';
|
|
@@ -29,18 +30,28 @@ vi.mock('../../config/extension-manager.js', async (importOriginal) => {
|
|
|
29
30
|
})),
|
|
30
31
|
};
|
|
31
32
|
});
|
|
32
|
-
|
|
33
|
-
vi.
|
|
33
|
+
// Mock dependencies
|
|
34
|
+
const emitConsoleLog = vi.hoisted(() => vi.fn());
|
|
35
|
+
const debugLogger = vi.hoisted(() => ({
|
|
36
|
+
log: vi.fn((message, ...args) => {
|
|
37
|
+
emitConsoleLog('log', format(message, ...args));
|
|
38
|
+
}),
|
|
39
|
+
error: vi.fn((message, ...args) => {
|
|
40
|
+
emitConsoleLog('error', format(message, ...args));
|
|
41
|
+
}),
|
|
42
|
+
}));
|
|
34
43
|
vi.mock('@google/gemini-cli-core', async (importOriginal) => {
|
|
35
44
|
const actual = await importOriginal();
|
|
36
45
|
return {
|
|
37
46
|
...actual,
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
error: vi.fn(),
|
|
47
|
+
coreEvents: {
|
|
48
|
+
emitConsoleLog,
|
|
41
49
|
},
|
|
50
|
+
debugLogger,
|
|
42
51
|
};
|
|
43
52
|
});
|
|
53
|
+
vi.mock('../../config/settings.js');
|
|
54
|
+
vi.mock('../../utils/errors.js');
|
|
44
55
|
vi.mock('../../config/extensions/consent.js', () => ({
|
|
45
56
|
requestConsentNonInteractive: vi.fn(),
|
|
46
57
|
}));
|
|
@@ -51,10 +62,7 @@ describe('extensions uninstall command', () => {
|
|
|
51
62
|
const mockLoadSettings = vi.mocked(loadSettings);
|
|
52
63
|
const mockGetErrorMessage = vi.mocked(getErrorMessage);
|
|
53
64
|
const mockExtensionManager = vi.mocked(ExtensionManager);
|
|
54
|
-
let mockDebugLogger;
|
|
55
65
|
beforeEach(async () => {
|
|
56
|
-
mockDebugLogger = (await import('@google/gemini-cli-core'))
|
|
57
|
-
.debugLogger;
|
|
58
66
|
mockLoadSettings.mockReturnValue({
|
|
59
67
|
merged: {},
|
|
60
68
|
});
|
|
@@ -75,7 +83,7 @@ describe('extensions uninstall command', () => {
|
|
|
75
83
|
}));
|
|
76
84
|
expect(mockLoadExtensions).toHaveBeenCalled();
|
|
77
85
|
expect(mockUninstallExtension).toHaveBeenCalledWith('my-extension', false);
|
|
78
|
-
expect(
|
|
86
|
+
expect(emitConsoleLog).toHaveBeenCalledWith('log', 'Extension "my-extension" successfully uninstalled.');
|
|
79
87
|
mockCwd.mockRestore();
|
|
80
88
|
});
|
|
81
89
|
it('should uninstall multiple extensions', async () => {
|
|
@@ -87,9 +95,9 @@ describe('extensions uninstall command', () => {
|
|
|
87
95
|
expect(mockUninstallExtension).toHaveBeenCalledWith('ext1', false);
|
|
88
96
|
expect(mockUninstallExtension).toHaveBeenCalledWith('ext2', false);
|
|
89
97
|
expect(mockUninstallExtension).toHaveBeenCalledWith('ext3', false);
|
|
90
|
-
expect(
|
|
91
|
-
expect(
|
|
92
|
-
expect(
|
|
98
|
+
expect(emitConsoleLog).toHaveBeenCalledWith('log', 'Extension "ext1" successfully uninstalled.');
|
|
99
|
+
expect(emitConsoleLog).toHaveBeenCalledWith('log', 'Extension "ext2" successfully uninstalled.');
|
|
100
|
+
expect(emitConsoleLog).toHaveBeenCalledWith('log', 'Extension "ext3" successfully uninstalled.');
|
|
93
101
|
mockCwd.mockRestore();
|
|
94
102
|
});
|
|
95
103
|
it('should report errors for failed uninstalls but continue with others', async () => {
|
|
@@ -107,9 +115,9 @@ describe('extensions uninstall command', () => {
|
|
|
107
115
|
mockGetErrorMessage.mockReturnValue('Extension not found');
|
|
108
116
|
await handleUninstall({ names: ['ext1', 'ext2', 'ext3'] });
|
|
109
117
|
expect(mockUninstallExtension).toHaveBeenCalledTimes(3);
|
|
110
|
-
expect(
|
|
111
|
-
expect(
|
|
112
|
-
expect(
|
|
118
|
+
expect(emitConsoleLog).toHaveBeenCalledWith('log', 'Extension "ext1" successfully uninstalled.');
|
|
119
|
+
expect(emitConsoleLog).toHaveBeenCalledWith('error', 'Failed to uninstall "ext2": Extension not found');
|
|
120
|
+
expect(emitConsoleLog).toHaveBeenCalledWith('log', 'Extension "ext3" successfully uninstalled.');
|
|
113
121
|
expect(mockProcessExit).toHaveBeenCalledWith(1);
|
|
114
122
|
mockProcessExit.mockRestore();
|
|
115
123
|
mockCwd.mockRestore();
|
|
@@ -124,8 +132,8 @@ describe('extensions uninstall command', () => {
|
|
|
124
132
|
mockUninstallExtension.mockRejectedValue(error);
|
|
125
133
|
mockGetErrorMessage.mockReturnValue('Extension not found');
|
|
126
134
|
await handleUninstall({ names: ['ext1', 'ext2'] });
|
|
127
|
-
expect(
|
|
128
|
-
expect(
|
|
135
|
+
expect(emitConsoleLog).toHaveBeenCalledWith('error', 'Failed to uninstall "ext1": Extension not found');
|
|
136
|
+
expect(emitConsoleLog).toHaveBeenCalledWith('error', 'Failed to uninstall "ext2": Extension not found');
|
|
129
137
|
expect(mockProcessExit).toHaveBeenCalledWith(1);
|
|
130
138
|
mockProcessExit.mockRestore();
|
|
131
139
|
mockCwd.mockRestore();
|
|
@@ -139,7 +147,7 @@ describe('extensions uninstall command', () => {
|
|
|
139
147
|
mockLoadExtensions.mockRejectedValue(error);
|
|
140
148
|
mockGetErrorMessage.mockReturnValue('Initialization failed message');
|
|
141
149
|
await handleUninstall({ names: ['my-extension'] });
|
|
142
|
-
expect(
|
|
150
|
+
expect(emitConsoleLog).toHaveBeenCalledWith('error', 'Initialization failed message');
|
|
143
151
|
expect(mockProcessExit).toHaveBeenCalledWith(1);
|
|
144
152
|
mockProcessExit.mockRestore();
|
|
145
153
|
mockCwd.mockRestore();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uninstall.test.js","sourceRoot":"","sources":["../../../../src/commands/extensions/uninstall.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,EAAE,EACF,QAAQ,EACR,EAAE,EACF,MAAM,EACN,UAAU,EACV,SAAS,GAEV,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAiC,MAAM,OAAO,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,YAAY,EAAuB,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,0EAA0E;AAC1E,yEAAyE;AACzE,gFAAgF;AAChF,qFAAqF;AAErF,mDAAmD;AACnD,MAAM,sBAAsB,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AACzD,MAAM,kBAAkB,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAErD,2CAA2C;AAC3C,EAAE,CAAC,IAAI,CAAC,mCAAmC,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IACpE,MAAM,MAAM,GACV,MAAM,cAAc,EAAsD,CAAC;IAC7E,OAAO;QACL,GAAG,MAAM;QACT,gBAAgB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC;YAClD,kBAAkB,EAAE,sBAAsB;YAC1C,cAAc,EAAE,kBAAkB;YAClC,iBAAiB,EAAE,EAAE,CAAC,EAAE,EAAE;YAC1B,iBAAiB,EAAE,EAAE,CAAC,EAAE,EAAE;SAC3B,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"uninstall.test.js","sourceRoot":"","sources":["../../../../src/commands/extensions/uninstall.test.ts"],"names":[],"mappings":"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"}
|