@google/gemini-cli 0.16.0-preview.4 → 0.17.0-nightly.20251116.e650a4ee5

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.
Files changed (130) hide show
  1. package/dist/google-gemini-cli-0.17.0-nightly.20251114.0fcbff506.tgz +0 -0
  2. package/dist/package.json +2 -2
  3. package/dist/src/commands/extensions/disable.test.d.ts +6 -0
  4. package/dist/src/commands/extensions/disable.test.js +160 -0
  5. package/dist/src/commands/extensions/disable.test.js.map +1 -0
  6. package/dist/src/commands/extensions/enable.test.d.ts +6 -0
  7. package/dist/src/commands/extensions/enable.test.js +140 -0
  8. package/dist/src/commands/extensions/enable.test.js.map +1 -0
  9. package/dist/src/commands/extensions/examples/mcp-server/example.test.d.ts +6 -0
  10. package/dist/src/commands/extensions/examples/mcp-server/example.test.js +111 -0
  11. package/dist/src/commands/extensions/examples/mcp-server/example.test.js.map +1 -0
  12. package/dist/src/commands/extensions/examples/mcp-server/example.test.ts +143 -0
  13. package/dist/src/commands/extensions/link.test.d.ts +6 -0
  14. package/dist/src/commands/extensions/link.test.js +121 -0
  15. package/dist/src/commands/extensions/link.test.js.map +1 -0
  16. package/dist/src/commands/extensions/list.test.d.ts +6 -0
  17. package/dist/src/commands/extensions/list.test.js +102 -0
  18. package/dist/src/commands/extensions/list.test.js.map +1 -0
  19. package/dist/src/commands/extensions/uninstall.test.js +107 -9
  20. package/dist/src/commands/extensions/uninstall.test.js.map +1 -1
  21. package/dist/src/commands/extensions/update.test.d.ts +6 -0
  22. package/dist/src/commands/extensions/update.test.js +160 -0
  23. package/dist/src/commands/extensions/update.test.js.map +1 -0
  24. package/dist/src/config/auth.js +1 -1
  25. package/dist/src/config/auth.test.js +2 -2
  26. package/dist/src/config/config.js +1 -3
  27. package/dist/src/config/config.js.map +1 -1
  28. package/dist/src/config/config.test.js +5 -2
  29. package/dist/src/config/config.test.js.map +1 -1
  30. package/dist/src/config/settingsSchema.d.ts +9 -0
  31. package/dist/src/config/settingsSchema.js +10 -1
  32. package/dist/src/config/settingsSchema.js.map +1 -1
  33. package/dist/src/config/trustedFolders.d.ts +1 -1
  34. package/dist/src/config/trustedFolders.js +24 -17
  35. package/dist/src/config/trustedFolders.js.map +1 -1
  36. package/dist/src/gemini.js +6 -4
  37. package/dist/src/gemini.js.map +1 -1
  38. package/dist/src/gemini.test.js.map +1 -1
  39. package/dist/src/generated/git-commit.d.ts +2 -2
  40. package/dist/src/generated/git-commit.js +2 -2
  41. package/dist/src/generated/git-commit.js.map +1 -1
  42. package/dist/src/ui/AppContainer.js +22 -4
  43. package/dist/src/ui/AppContainer.js.map +1 -1
  44. package/dist/src/ui/auth/AuthDialog.js +11 -3
  45. package/dist/src/ui/auth/AuthDialog.js.map +1 -1
  46. package/dist/src/ui/auth/AuthDialog.test.js +32 -2
  47. package/dist/src/ui/auth/AuthDialog.test.js.map +1 -1
  48. package/dist/src/ui/commands/directoryCommand.d.ts +0 -1
  49. package/dist/src/ui/commands/directoryCommand.js +104 -43
  50. package/dist/src/ui/commands/directoryCommand.js.map +1 -1
  51. package/dist/src/ui/commands/directoryCommand.test.js +91 -2
  52. package/dist/src/ui/commands/directoryCommand.test.js.map +1 -1
  53. package/dist/src/ui/commands/permissionsCommand.js +62 -5
  54. package/dist/src/ui/commands/permissionsCommand.js.map +1 -1
  55. package/dist/src/ui/commands/permissionsCommand.test.js +60 -4
  56. package/dist/src/ui/commands/permissionsCommand.test.js.map +1 -1
  57. package/dist/src/ui/commands/types.d.ts +7 -1
  58. package/dist/src/ui/commands/types.js.map +1 -1
  59. package/dist/src/ui/components/DialogManager.js +1 -1
  60. package/dist/src/ui/components/DialogManager.js.map +1 -1
  61. package/dist/src/ui/components/HistoryItemDisplay.js +2 -1
  62. package/dist/src/ui/components/HistoryItemDisplay.js.map +1 -1
  63. package/dist/src/ui/components/MultiFolderTrustDialog.d.ts +23 -0
  64. package/dist/src/ui/components/MultiFolderTrustDialog.js +90 -0
  65. package/dist/src/ui/components/MultiFolderTrustDialog.js.map +1 -0
  66. package/dist/src/ui/components/MultiFolderTrustDialog.test.d.ts +6 -0
  67. package/dist/src/ui/components/MultiFolderTrustDialog.test.js +161 -0
  68. package/dist/src/ui/components/MultiFolderTrustDialog.test.js.map +1 -0
  69. package/dist/src/ui/components/PermissionsModifyTrustDialog.d.ts +5 -2
  70. package/dist/src/ui/components/PermissionsModifyTrustDialog.js +12 -7
  71. package/dist/src/ui/components/PermissionsModifyTrustDialog.js.map +1 -1
  72. package/dist/src/ui/components/PermissionsModifyTrustDialog.test.js +2 -2
  73. package/dist/src/ui/components/PermissionsModifyTrustDialog.test.js.map +1 -1
  74. package/dist/src/ui/components/messages/ModelMessage.d.ts +11 -0
  75. package/dist/src/ui/components/messages/ModelMessage.js +5 -0
  76. package/dist/src/ui/components/messages/ModelMessage.js.map +1 -0
  77. package/dist/src/ui/contexts/UIActionsContext.d.ts +2 -0
  78. package/dist/src/ui/contexts/UIActionsContext.js +1 -0
  79. package/dist/src/ui/contexts/UIActionsContext.js.map +1 -1
  80. package/dist/src/ui/contexts/UIStateContext.d.ts +4 -0
  81. package/dist/src/ui/contexts/UIStateContext.js.map +1 -1
  82. package/dist/src/ui/hooks/slashCommandProcessor.d.ts +4 -2
  83. package/dist/src/ui/hooks/slashCommandProcessor.js +9 -2
  84. package/dist/src/ui/hooks/slashCommandProcessor.js.map +1 -1
  85. package/dist/src/ui/hooks/slashCommandProcessor.test.js +2 -1
  86. package/dist/src/ui/hooks/slashCommandProcessor.test.js.map +1 -1
  87. package/dist/src/ui/hooks/useFolderTrust.js +11 -1
  88. package/dist/src/ui/hooks/useFolderTrust.js.map +1 -1
  89. package/dist/src/ui/hooks/useFolderTrust.test.js +22 -0
  90. package/dist/src/ui/hooks/useFolderTrust.test.js.map +1 -1
  91. package/dist/src/ui/hooks/useGeminiStream.js +17 -0
  92. package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
  93. package/dist/src/ui/hooks/useIncludeDirsTrust.d.ts +8 -0
  94. package/dist/src/ui/hooks/useIncludeDirsTrust.js +120 -0
  95. package/dist/src/ui/hooks/useIncludeDirsTrust.js.map +1 -0
  96. package/dist/src/ui/hooks/useIncludeDirsTrust.test.d.ts +6 -0
  97. package/dist/src/ui/hooks/useIncludeDirsTrust.test.js +151 -0
  98. package/dist/src/ui/hooks/useIncludeDirsTrust.test.js.map +1 -0
  99. package/dist/src/ui/hooks/usePermissionsModifyTrust.d.ts +2 -2
  100. package/dist/src/ui/hooks/usePermissionsModifyTrust.js +44 -7
  101. package/dist/src/ui/hooks/usePermissionsModifyTrust.js.map +1 -1
  102. package/dist/src/ui/hooks/usePermissionsModifyTrust.test.js +191 -89
  103. package/dist/src/ui/hooks/usePermissionsModifyTrust.test.js.map +1 -1
  104. package/dist/src/ui/layouts/DefaultAppLayout.js +1 -1
  105. package/dist/src/ui/layouts/DefaultAppLayout.js.map +1 -1
  106. package/dist/src/ui/noninteractive/nonInteractiveUi.js +1 -0
  107. package/dist/src/ui/noninteractive/nonInteractiveUi.js.map +1 -1
  108. package/dist/src/ui/types.d.ts +5 -1
  109. package/dist/src/ui/types.js.map +1 -1
  110. package/dist/src/ui/utils/directoryUtils.d.ts +6 -0
  111. package/dist/src/ui/utils/directoryUtils.js +21 -0
  112. package/dist/src/ui/utils/directoryUtils.js.map +1 -0
  113. package/dist/src/ui/utils/directoryUtils.test.d.ts +6 -0
  114. package/dist/src/ui/utils/directoryUtils.test.js +52 -0
  115. package/dist/src/ui/utils/directoryUtils.test.js.map +1 -0
  116. package/dist/src/zed-integration/acp.d.ts +2 -24
  117. package/dist/src/zed-integration/acp.js +2 -156
  118. package/dist/src/zed-integration/acp.js.map +1 -1
  119. package/dist/src/zed-integration/acp.test.d.ts +6 -0
  120. package/dist/src/zed-integration/acp.test.js +227 -0
  121. package/dist/src/zed-integration/acp.test.js.map +1 -0
  122. package/dist/src/zed-integration/connection.d.ts +28 -0
  123. package/dist/src/zed-integration/connection.js +163 -0
  124. package/dist/src/zed-integration/connection.js.map +1 -0
  125. package/dist/src/zed-integration/schema.d.ts +69 -13
  126. package/dist/src/zed-integration/schema.js +6 -5
  127. package/dist/src/zed-integration/schema.js.map +1 -1
  128. package/dist/tsconfig.tsbuildinfo +1 -1
  129. package/package.json +3 -3
  130. package/dist/google-gemini-cli-0.16.0-preview.3.tgz +0 -0
@@ -0,0 +1,121 @@
1
+ /**
2
+ * @license
3
+ * Copyright 2025 Google LLC
4
+ * SPDX-License-Identifier: Apache-2.0
5
+ */
6
+ import { vi, describe, it, expect, beforeEach, afterEach, } from 'vitest';
7
+ import {} from 'yargs';
8
+ import { handleLink, linkCommand } from './link.js';
9
+ import { ExtensionManager } from '../../config/extension-manager.js';
10
+ import { loadSettings } from '../../config/settings.js';
11
+ import { getErrorMessage } from '../../utils/errors.js';
12
+ // Mock dependencies
13
+ vi.mock('../../config/extension-manager.js');
14
+ vi.mock('../../config/settings.js');
15
+ vi.mock('../../utils/errors.js');
16
+ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
17
+ const actual = await importOriginal();
18
+ return {
19
+ ...actual,
20
+ debugLogger: {
21
+ log: vi.fn(),
22
+ error: vi.fn(),
23
+ },
24
+ };
25
+ });
26
+ vi.mock('../../config/extensions/consent.js', () => ({
27
+ requestConsentNonInteractive: vi.fn(),
28
+ }));
29
+ vi.mock('../../config/extensions/extensionSettings.js', () => ({
30
+ promptForSetting: vi.fn(),
31
+ }));
32
+ describe('extensions link command', () => {
33
+ const mockLoadSettings = vi.mocked(loadSettings);
34
+ const mockGetErrorMessage = vi.mocked(getErrorMessage);
35
+ const mockExtensionManager = vi.mocked(ExtensionManager);
36
+ let mockDebugLogger;
37
+ beforeEach(async () => {
38
+ vi.clearAllMocks();
39
+ mockDebugLogger = (await import('@google/gemini-cli-core'))
40
+ .debugLogger;
41
+ mockLoadSettings.mockReturnValue({
42
+ merged: {},
43
+ });
44
+ mockExtensionManager.prototype.loadExtensions = vi
45
+ .fn()
46
+ .mockResolvedValue(undefined);
47
+ mockExtensionManager.prototype.installOrUpdateExtension = vi
48
+ .fn()
49
+ .mockResolvedValue({ name: 'my-linked-extension' });
50
+ });
51
+ afterEach(() => {
52
+ vi.restoreAllMocks();
53
+ });
54
+ describe('handleLink', () => {
55
+ it('should link an extension from a local path', async () => {
56
+ const mockCwd = vi.spyOn(process, 'cwd').mockReturnValue('/test/dir');
57
+ await handleLink({ path: '/local/path/to/extension' });
58
+ expect(mockExtensionManager).toHaveBeenCalledWith(expect.objectContaining({
59
+ workspaceDir: '/test/dir',
60
+ }));
61
+ expect(mockExtensionManager.prototype.loadExtensions).toHaveBeenCalled();
62
+ expect(mockExtensionManager.prototype.installOrUpdateExtension).toHaveBeenCalledWith({
63
+ source: '/local/path/to/extension',
64
+ type: 'link',
65
+ });
66
+ expect(mockDebugLogger.log).toHaveBeenCalledWith('Extension "my-linked-extension" linked successfully and enabled.');
67
+ mockCwd.mockRestore();
68
+ });
69
+ it('should log an error message and exit with code 1 when linking fails', async () => {
70
+ const mockProcessExit = vi
71
+ .spyOn(process, 'exit')
72
+ .mockImplementation((() => { }));
73
+ const error = new Error('Link failed');
74
+ mockExtensionManager.prototype.installOrUpdateExtension.mockRejectedValue(error);
75
+ mockGetErrorMessage.mockReturnValue('Link failed message');
76
+ await handleLink({ path: '/local/path/to/extension' });
77
+ expect(mockDebugLogger.error).toHaveBeenCalledWith('Link failed message');
78
+ expect(mockProcessExit).toHaveBeenCalledWith(1);
79
+ mockProcessExit.mockRestore();
80
+ });
81
+ });
82
+ describe('linkCommand', () => {
83
+ const command = linkCommand;
84
+ it('should have correct command and describe', () => {
85
+ expect(command.command).toBe('link <path>');
86
+ expect(command.describe).toBe('Links an extension from a local path. Updates made to the local path will always be reflected.');
87
+ });
88
+ describe('builder', () => {
89
+ let yargsMock;
90
+ beforeEach(() => {
91
+ yargsMock = {
92
+ positional: vi.fn().mockReturnThis(),
93
+ check: vi.fn().mockReturnThis(),
94
+ };
95
+ });
96
+ it('should configure positional argument', () => {
97
+ command.builder(yargsMock);
98
+ expect(yargsMock.positional).toHaveBeenCalledWith('path', {
99
+ describe: 'The name of the extension to link.',
100
+ type: 'string',
101
+ });
102
+ expect(yargsMock.check).toHaveBeenCalled();
103
+ });
104
+ });
105
+ it('handler should call handleLink', async () => {
106
+ const mockCwd = vi.spyOn(process, 'cwd').mockReturnValue('/test/dir');
107
+ const argv = {
108
+ path: '/local/path/to/extension',
109
+ _: [],
110
+ $0: '',
111
+ };
112
+ await command.handler(argv);
113
+ expect(mockExtensionManager.prototype.installOrUpdateExtension).toHaveBeenCalledWith({
114
+ source: '/local/path/to/extension',
115
+ type: 'link',
116
+ });
117
+ mockCwd.mockRestore();
118
+ });
119
+ });
120
+ });
121
+ //# sourceMappingURL=link.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"link.test.js","sourceRoot":"","sources":["../../../../src/commands/extensions/link.test.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,6 @@
1
+ /**
2
+ * @license
3
+ * Copyright 2025 Google LLC
4
+ * SPDX-License-Identifier: Apache-2.0
5
+ */
6
+ export {};
@@ -0,0 +1,102 @@
1
+ /**
2
+ * @license
3
+ * Copyright 2025 Google LLC
4
+ * SPDX-License-Identifier: Apache-2.0
5
+ */
6
+ import { vi, describe, it, expect, beforeEach, afterEach, } from 'vitest';
7
+ import {} from 'yargs';
8
+ import { handleList, listCommand } from './list.js';
9
+ import { ExtensionManager } from '../../config/extension-manager.js';
10
+ import { loadSettings } from '../../config/settings.js';
11
+ import { getErrorMessage } from '../../utils/errors.js';
12
+ // Mock dependencies
13
+ vi.mock('../../config/extension-manager.js');
14
+ vi.mock('../../config/settings.js');
15
+ vi.mock('../../utils/errors.js');
16
+ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
17
+ const actual = await importOriginal();
18
+ return {
19
+ ...actual,
20
+ debugLogger: {
21
+ log: vi.fn(),
22
+ error: vi.fn(),
23
+ },
24
+ };
25
+ });
26
+ vi.mock('../../config/extensions/consent.js', () => ({
27
+ requestConsentNonInteractive: vi.fn(),
28
+ }));
29
+ vi.mock('../../config/extensions/extensionSettings.js', () => ({
30
+ promptForSetting: vi.fn(),
31
+ }));
32
+ describe('extensions list command', () => {
33
+ const mockLoadSettings = vi.mocked(loadSettings);
34
+ const mockGetErrorMessage = vi.mocked(getErrorMessage);
35
+ const mockExtensionManager = vi.mocked(ExtensionManager);
36
+ let mockDebugLogger;
37
+ beforeEach(async () => {
38
+ vi.clearAllMocks();
39
+ mockDebugLogger = (await import('@google/gemini-cli-core'))
40
+ .debugLogger;
41
+ mockLoadSettings.mockReturnValue({
42
+ merged: {},
43
+ });
44
+ });
45
+ afterEach(() => {
46
+ vi.restoreAllMocks();
47
+ });
48
+ describe('handleList', () => {
49
+ it('should log a message if no extensions are installed', async () => {
50
+ const mockCwd = vi.spyOn(process, 'cwd').mockReturnValue('/test/dir');
51
+ mockExtensionManager.prototype.loadExtensions = vi
52
+ .fn()
53
+ .mockResolvedValue([]);
54
+ await handleList();
55
+ expect(mockDebugLogger.log).toHaveBeenCalledWith('No extensions installed.');
56
+ mockCwd.mockRestore();
57
+ });
58
+ it('should list all installed extensions', async () => {
59
+ const mockCwd = vi.spyOn(process, 'cwd').mockReturnValue('/test/dir');
60
+ const extensions = [
61
+ { name: 'ext1', version: '1.0.0' },
62
+ { name: 'ext2', version: '2.0.0' },
63
+ ];
64
+ mockExtensionManager.prototype.loadExtensions = vi
65
+ .fn()
66
+ .mockResolvedValue(extensions);
67
+ mockExtensionManager.prototype.toOutputString = vi.fn((ext) => `${ext.name}@${ext.version}`);
68
+ await handleList();
69
+ expect(mockDebugLogger.log).toHaveBeenCalledWith('ext1@1.0.0\n\next2@2.0.0');
70
+ mockCwd.mockRestore();
71
+ });
72
+ it('should log an error message and exit with code 1 when listing fails', async () => {
73
+ const mockProcessExit = vi
74
+ .spyOn(process, 'exit')
75
+ .mockImplementation((() => { }));
76
+ const error = new Error('List failed');
77
+ mockExtensionManager.prototype.loadExtensions = vi
78
+ .fn()
79
+ .mockRejectedValue(error);
80
+ mockGetErrorMessage.mockReturnValue('List failed message');
81
+ await handleList();
82
+ expect(mockDebugLogger.error).toHaveBeenCalledWith('List failed message');
83
+ expect(mockProcessExit).toHaveBeenCalledWith(1);
84
+ mockProcessExit.mockRestore();
85
+ });
86
+ });
87
+ describe('listCommand', () => {
88
+ const command = listCommand;
89
+ it('should have correct command and describe', () => {
90
+ expect(command.command).toBe('list');
91
+ expect(command.describe).toBe('Lists installed extensions.');
92
+ });
93
+ it('handler should call handleList', async () => {
94
+ mockExtensionManager.prototype.loadExtensions = vi
95
+ .fn()
96
+ .mockResolvedValue([]);
97
+ await command.handler();
98
+ expect(mockExtensionManager.prototype.loadExtensions).toHaveBeenCalled();
99
+ });
100
+ });
101
+ });
102
+ //# sourceMappingURL=list.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"list.test.js","sourceRoot":"","sources":["../../../../src/commands/extensions/list.test.ts"],"names":[],"mappings":"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"}
@@ -3,16 +3,114 @@
3
3
  * Copyright 2025 Google LLC
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
- import { describe, it, expect } from 'vitest';
7
- import { uninstallCommand } from './uninstall.js';
8
- import yargs from 'yargs';
6
+ import { vi, describe, it, expect, beforeEach, afterEach, } from 'vitest';
7
+ import {} from 'yargs';
8
+ import { handleUninstall, uninstallCommand } from './uninstall.js';
9
+ import { ExtensionManager } from '../../config/extension-manager.js';
10
+ import { loadSettings } from '../../config/settings.js';
11
+ import { getErrorMessage } from '../../utils/errors.js';
12
+ // Mock dependencies
13
+ vi.mock('../../config/extension-manager.js');
14
+ vi.mock('../../config/settings.js');
15
+ vi.mock('../../utils/errors.js');
16
+ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
17
+ const actual = await importOriginal();
18
+ return {
19
+ ...actual,
20
+ debugLogger: {
21
+ log: vi.fn(),
22
+ error: vi.fn(),
23
+ },
24
+ };
25
+ });
26
+ vi.mock('../../config/extensions/consent.js', () => ({
27
+ requestConsentNonInteractive: vi.fn(),
28
+ }));
29
+ vi.mock('../../config/extensions/extensionSettings.js', () => ({
30
+ promptForSetting: vi.fn(),
31
+ }));
9
32
  describe('extensions uninstall command', () => {
10
- it('should fail if no source is provided', () => {
11
- const validationParser = yargs([])
12
- .command(uninstallCommand)
13
- .fail(false)
14
- .locale('en');
15
- expect(() => validationParser.parse('uninstall')).toThrow('Not enough non-option arguments: got 0, need at least 1');
33
+ const mockLoadSettings = vi.mocked(loadSettings);
34
+ const mockGetErrorMessage = vi.mocked(getErrorMessage);
35
+ const mockExtensionManager = vi.mocked(ExtensionManager);
36
+ let mockDebugLogger;
37
+ beforeEach(async () => {
38
+ vi.clearAllMocks();
39
+ mockDebugLogger = (await import('@google/gemini-cli-core'))
40
+ .debugLogger;
41
+ mockLoadSettings.mockReturnValue({
42
+ merged: {},
43
+ });
44
+ mockExtensionManager.prototype.loadExtensions = vi
45
+ .fn()
46
+ .mockResolvedValue(undefined);
47
+ mockExtensionManager.prototype.uninstallExtension = vi
48
+ .fn()
49
+ .mockResolvedValue(undefined);
50
+ });
51
+ afterEach(() => {
52
+ vi.restoreAllMocks();
53
+ });
54
+ describe('handleUninstall', () => {
55
+ it('should uninstall an extension', async () => {
56
+ const mockCwd = vi.spyOn(process, 'cwd').mockReturnValue('/test/dir');
57
+ await handleUninstall({ name: 'my-extension' });
58
+ expect(mockExtensionManager).toHaveBeenCalledWith(expect.objectContaining({
59
+ workspaceDir: '/test/dir',
60
+ }));
61
+ expect(mockExtensionManager.prototype.loadExtensions).toHaveBeenCalled();
62
+ expect(mockExtensionManager.prototype.uninstallExtension).toHaveBeenCalledWith('my-extension', false);
63
+ expect(mockDebugLogger.log).toHaveBeenCalledWith('Extension "my-extension" successfully uninstalled.');
64
+ mockCwd.mockRestore();
65
+ });
66
+ it('should log an error message and exit with code 1 when uninstallation fails', async () => {
67
+ const mockProcessExit = vi
68
+ .spyOn(process, 'exit')
69
+ .mockImplementation((() => { }));
70
+ const error = new Error('Uninstall failed');
71
+ mockExtensionManager.prototype.uninstallExtension.mockRejectedValue(error);
72
+ mockGetErrorMessage.mockReturnValue('Uninstall failed message');
73
+ await handleUninstall({ name: 'my-extension' });
74
+ expect(mockDebugLogger.error).toHaveBeenCalledWith('Uninstall failed message');
75
+ expect(mockProcessExit).toHaveBeenCalledWith(1);
76
+ mockProcessExit.mockRestore();
77
+ });
78
+ });
79
+ describe('uninstallCommand', () => {
80
+ const command = uninstallCommand;
81
+ it('should have correct command and describe', () => {
82
+ expect(command.command).toBe('uninstall <name>');
83
+ expect(command.describe).toBe('Uninstalls an extension.');
84
+ });
85
+ describe('builder', () => {
86
+ let yargsMock;
87
+ beforeEach(() => {
88
+ yargsMock = {
89
+ positional: vi.fn().mockReturnThis(),
90
+ check: vi.fn().mockReturnThis(),
91
+ };
92
+ });
93
+ it('should configure positional argument', () => {
94
+ command.builder(yargsMock);
95
+ expect(yargsMock.positional).toHaveBeenCalledWith('name', {
96
+ describe: 'The name or source path of the extension to uninstall.',
97
+ type: 'string',
98
+ });
99
+ expect(yargsMock.check).toHaveBeenCalled();
100
+ });
101
+ it('check function should throw for missing name', () => {
102
+ command.builder(yargsMock);
103
+ const checkCallback = yargsMock.check.mock.calls[0][0];
104
+ expect(() => checkCallback({ name: '' })).toThrow('Please include the name of the extension to uninstall as a positional argument.');
105
+ });
106
+ });
107
+ it('handler should call handleUninstall', async () => {
108
+ const mockCwd = vi.spyOn(process, 'cwd').mockReturnValue('/test/dir');
109
+ const argv = { name: 'my-extension', _: [], $0: '' };
110
+ await command.handler(argv);
111
+ expect(mockExtensionManager.prototype.uninstallExtension).toHaveBeenCalledWith('my-extension', false);
112
+ mockCwd.mockRestore();
113
+ });
16
114
  });
17
115
  });
18
116
  //# sourceMappingURL=uninstall.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"uninstall.test.js","sourceRoot":"","sources":["../../../../src/commands/extensions/uninstall.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,QAAQ,CAAC,8BAA8B,EAAE,GAAG,EAAE;IAC5C,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC9C,MAAM,gBAAgB,GAAG,KAAK,CAAC,EAAE,CAAC;aAC/B,OAAO,CAAC,gBAAgB,CAAC;aACzB,IAAI,CAAC,KAAK,CAAC;aACX,MAAM,CAAC,IAAI,CAAC,CAAC;QAChB,MAAM,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CACvD,yDAAyD,CAC1D,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"uninstall.test.js","sourceRoot":"","sources":["../../../../src/commands/extensions/uninstall.test.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,6 @@
1
+ /**
2
+ * @license
3
+ * Copyright 2025 Google LLC
4
+ * SPDX-License-Identifier: Apache-2.0
5
+ */
6
+ export {};
@@ -0,0 +1,160 @@
1
+ /**
2
+ * @license
3
+ * Copyright 2025 Google LLC
4
+ * SPDX-License-Identifier: Apache-2.0
5
+ */
6
+ import { vi, describe, it, expect, beforeEach, afterEach, } from 'vitest';
7
+ import {} from 'yargs';
8
+ import { handleUpdate, updateCommand } from './update.js';
9
+ import { ExtensionManager } from '../../config/extension-manager.js';
10
+ import { loadSettings } from '../../config/settings.js';
11
+ import * as update from '../../config/extensions/update.js';
12
+ import * as github from '../../config/extensions/github.js';
13
+ import { ExtensionUpdateState } from '../../ui/state/extensions.js';
14
+ // Mock dependencies
15
+ vi.mock('../../config/extension-manager.js');
16
+ vi.mock('../../config/settings.js');
17
+ vi.mock('../../utils/errors.js');
18
+ vi.mock('../../config/extensions/update.js');
19
+ vi.mock('../../config/extensions/github.js');
20
+ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
21
+ const actual = await importOriginal();
22
+ return {
23
+ ...actual,
24
+ debugLogger: {
25
+ log: vi.fn(),
26
+ error: vi.fn(),
27
+ },
28
+ };
29
+ });
30
+ vi.mock('../../config/extensions/consent.js', () => ({
31
+ requestConsentNonInteractive: vi.fn(),
32
+ }));
33
+ vi.mock('../../config/extensions/extensionSettings.js', () => ({
34
+ promptForSetting: vi.fn(),
35
+ }));
36
+ describe('extensions update command', () => {
37
+ const mockLoadSettings = vi.mocked(loadSettings);
38
+ const mockExtensionManager = vi.mocked(ExtensionManager);
39
+ const mockUpdateExtension = vi.mocked(update.updateExtension);
40
+ const mockCheckForExtensionUpdate = vi.mocked(github.checkForExtensionUpdate);
41
+ const mockCheckForAllExtensionUpdates = vi.mocked(update.checkForAllExtensionUpdates);
42
+ const mockUpdateAllUpdatableExtensions = vi.mocked(update.updateAllUpdatableExtensions);
43
+ let mockDebugLogger;
44
+ beforeEach(async () => {
45
+ vi.clearAllMocks();
46
+ mockDebugLogger = (await import('@google/gemini-cli-core'))
47
+ .debugLogger;
48
+ mockLoadSettings.mockReturnValue({
49
+ merged: { experimental: { extensionReloading: true } },
50
+ });
51
+ });
52
+ afterEach(() => {
53
+ vi.restoreAllMocks();
54
+ });
55
+ describe('handleUpdate', () => {
56
+ it.each([
57
+ {
58
+ state: ExtensionUpdateState.UPDATE_AVAILABLE,
59
+ expectedLog: 'Extension "my-extension" successfully updated: 1.0.0 → 1.1.0.',
60
+ shouldCallUpdateExtension: true,
61
+ },
62
+ {
63
+ state: ExtensionUpdateState.UP_TO_DATE,
64
+ expectedLog: 'Extension "my-extension" is already up to date.',
65
+ shouldCallUpdateExtension: false,
66
+ },
67
+ ])('should handle single extension update state: $state', async ({ state, expectedLog, shouldCallUpdateExtension }) => {
68
+ const mockCwd = vi.spyOn(process, 'cwd').mockReturnValue('/test/dir');
69
+ const extensions = [{ name: 'my-extension', installMetadata: {} }];
70
+ mockExtensionManager.prototype.loadExtensions = vi
71
+ .fn()
72
+ .mockResolvedValue(extensions);
73
+ mockCheckForExtensionUpdate.mockResolvedValue(state);
74
+ mockUpdateExtension.mockResolvedValue({
75
+ name: 'my-extension',
76
+ originalVersion: '1.0.0',
77
+ updatedVersion: '1.1.0',
78
+ });
79
+ await handleUpdate({ name: 'my-extension' });
80
+ expect(mockDebugLogger.log).toHaveBeenCalledWith(expectedLog);
81
+ if (shouldCallUpdateExtension) {
82
+ expect(mockUpdateExtension).toHaveBeenCalled();
83
+ }
84
+ else {
85
+ expect(mockUpdateExtension).not.toHaveBeenCalled();
86
+ }
87
+ mockCwd.mockRestore();
88
+ });
89
+ it.each([
90
+ {
91
+ updatedExtensions: [
92
+ { name: 'ext1', originalVersion: '1.0.0', updatedVersion: '1.1.0' },
93
+ { name: 'ext2', originalVersion: '2.0.0', updatedVersion: '2.1.0' },
94
+ ],
95
+ expectedLog: 'Extension "ext1" successfully updated: 1.0.0 → 1.1.0.\nExtension "ext2" successfully updated: 2.0.0 → 2.1.0.',
96
+ },
97
+ {
98
+ updatedExtensions: [],
99
+ expectedLog: 'No extensions to update.',
100
+ },
101
+ ])('should handle updating all extensions: %s', async ({ updatedExtensions, expectedLog }) => {
102
+ const mockCwd = vi.spyOn(process, 'cwd').mockReturnValue('/test/dir');
103
+ mockExtensionManager.prototype.loadExtensions = vi
104
+ .fn()
105
+ .mockResolvedValue([]);
106
+ mockCheckForAllExtensionUpdates.mockResolvedValue(undefined);
107
+ mockUpdateAllUpdatableExtensions.mockResolvedValue(updatedExtensions);
108
+ await handleUpdate({ all: true });
109
+ expect(mockDebugLogger.log).toHaveBeenCalledWith(expectedLog);
110
+ mockCwd.mockRestore();
111
+ });
112
+ });
113
+ describe('updateCommand', () => {
114
+ const command = updateCommand;
115
+ it('should have correct command and describe', () => {
116
+ expect(command.command).toBe('update [<name>] [--all]');
117
+ expect(command.describe).toBe('Updates all extensions or a named extension to the latest version.');
118
+ });
119
+ describe('builder', () => {
120
+ let yargsMock;
121
+ beforeEach(() => {
122
+ yargsMock = {
123
+ positional: vi.fn().mockReturnThis(),
124
+ option: vi.fn().mockReturnThis(),
125
+ conflicts: vi.fn().mockReturnThis(),
126
+ check: vi.fn().mockReturnThis(),
127
+ };
128
+ });
129
+ it('should configure arguments', () => {
130
+ command.builder(yargsMock);
131
+ expect(yargsMock.positional).toHaveBeenCalledWith('name', expect.any(Object));
132
+ expect(yargsMock.option).toHaveBeenCalledWith('all', expect.any(Object));
133
+ expect(yargsMock.conflicts).toHaveBeenCalledWith('name', 'all');
134
+ expect(yargsMock.check).toHaveBeenCalled();
135
+ });
136
+ it('check function should throw an error if neither a name nor --all is provided', () => {
137
+ command.builder(yargsMock);
138
+ const checkCallback = yargsMock.check.mock.calls[0][0];
139
+ expect(() => checkCallback({ name: undefined, all: false })).toThrow('Either an extension name or --all must be provided');
140
+ });
141
+ });
142
+ it('handler should call handleUpdate', async () => {
143
+ const extensions = [{ name: 'my-extension', installMetadata: {} }];
144
+ mockExtensionManager.prototype.loadExtensions = vi
145
+ .fn()
146
+ .mockResolvedValue(extensions);
147
+ mockCheckForExtensionUpdate.mockResolvedValue(ExtensionUpdateState.UPDATE_AVAILABLE);
148
+ mockUpdateExtension.mockResolvedValue({
149
+ name: 'my-extension',
150
+ originalVersion: '1.0.0',
151
+ updatedVersion: '1.1.0',
152
+ });
153
+ await command.handler({
154
+ name: 'my-extension',
155
+ });
156
+ expect(mockUpdateExtension).toHaveBeenCalled();
157
+ });
158
+ });
159
+ });
160
+ //# sourceMappingURL=update.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"update.test.js","sourceRoot":"","sources":["../../../../src/commands/extensions/update.test.ts"],"names":[],"mappings":"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"}
@@ -8,7 +8,7 @@ import { loadEnvironment, loadSettings } from './settings.js';
8
8
  export function validateAuthMethod(authMethod) {
9
9
  loadEnvironment(loadSettings().merged);
10
10
  if (authMethod === AuthType.LOGIN_WITH_GOOGLE ||
11
- authMethod === AuthType.CLOUD_SHELL) {
11
+ authMethod === AuthType.COMPUTE_ADC) {
12
12
  return null;
13
13
  }
14
14
  if (authMethod === AuthType.USE_GEMINI) {
@@ -26,8 +26,8 @@ describe('validateAuthMethod', () => {
26
26
  it('should return null for LOGIN_WITH_GOOGLE', () => {
27
27
  expect(validateAuthMethod(AuthType.LOGIN_WITH_GOOGLE)).toBeNull();
28
28
  });
29
- it('should return null for CLOUD_SHELL', () => {
30
- expect(validateAuthMethod(AuthType.CLOUD_SHELL)).toBeNull();
29
+ it('should return null for COMPUTE_ADC', () => {
30
+ expect(validateAuthMethod(AuthType.COMPUTE_ADC)).toBeNull();
31
31
  });
32
32
  describe('USE_GEMINI', () => {
33
33
  it('should return null if GEMINI_API_KEY is set', () => {
@@ -303,9 +303,7 @@ export async function loadCliConfig(settings, sessionId, argv, cwd = process.cwd
303
303
  });
304
304
  await extensionManager.loadExtensions();
305
305
  // Call the (now wrapper) loadHierarchicalGeminiMemory which calls the server's version
306
- const { memoryContent, fileCount, filePaths } = await loadServerHierarchicalMemory(cwd, settings.context?.loadMemoryFromIncludeDirectories
307
- ? includeDirectories
308
- : [], debugMode, fileService, extensionManager, trustedFolder, memoryImportFormat, memoryFileFiltering, settings.context?.discoveryMaxDirs);
306
+ const { memoryContent, fileCount, filePaths } = await loadServerHierarchicalMemory(cwd, [], debugMode, fileService, extensionManager, trustedFolder, memoryImportFormat, memoryFileFiltering, settings.context?.discoveryMaxDirs);
309
307
  const question = argv.promptInteractive || argv.prompt || '';
310
308
  // Determine approval mode with backward compatibility
311
309
  let approvalMode;