@google/gemini-cli 0.32.0-preview.0 → 0.33.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/README.md +11 -9
- package/dist/package.json +3 -3
- package/dist/src/config/config.js +6 -1
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +70 -1
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/extension-manager.js +1 -0
- package/dist/src/config/extension-manager.js.map +1 -1
- package/dist/src/config/extension.d.ts +9 -0
- package/dist/src/config/extension.js.map +1 -1
- package/dist/src/config/sandboxConfig.js +3 -1
- package/dist/src/config/sandboxConfig.js.map +1 -1
- package/dist/src/config/settings.d.ts +0 -2
- package/dist/src/config/settings.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +9 -13
- package/dist/src/config/settingsSchema.js +5 -13
- package/dist/src/config/settingsSchema.js.map +1 -1
- package/dist/src/gemini.js +1 -1
- package/dist/src/gemini.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/test-utils/render.js +5 -1
- package/dist/src/test-utils/render.js.map +1 -1
- package/dist/src/ui/AppContainer.js +1 -18
- package/dist/src/ui/AppContainer.js.map +1 -1
- package/dist/src/ui/commands/extensionsCommand.js +3 -1
- package/dist/src/ui/commands/extensionsCommand.js.map +1 -1
- package/dist/src/ui/commands/extensionsCommand.test.js +45 -0
- package/dist/src/ui/commands/extensionsCommand.test.js.map +1 -1
- package/dist/src/ui/commands/hooksCommand.js +12 -8
- package/dist/src/ui/commands/hooksCommand.js.map +1 -1
- package/dist/src/ui/commands/hooksCommand.test.js +15 -23
- package/dist/src/ui/commands/hooksCommand.test.js.map +1 -1
- package/dist/src/ui/commands/planCommand.js +33 -3
- package/dist/src/ui/commands/planCommand.js.map +1 -1
- package/dist/src/ui/commands/planCommand.test.js +29 -1
- package/dist/src/ui/commands/planCommand.test.js.map +1 -1
- package/dist/src/ui/components/AgentConfigDialog.js +17 -33
- package/dist/src/ui/components/AgentConfigDialog.js.map +1 -1
- package/dist/src/ui/components/AppHeader.d.ts +1 -1
- package/dist/src/ui/components/AppHeader.js +15 -8
- package/dist/src/ui/components/AppHeader.js.map +1 -1
- package/dist/src/ui/components/AppHeader.test.js +7 -0
- package/dist/src/ui/components/AppHeader.test.js.map +1 -1
- package/dist/src/ui/components/ContextUsageDisplay.d.ts +1 -1
- package/dist/src/ui/components/ContextUsageDisplay.js +15 -3
- package/dist/src/ui/components/ContextUsageDisplay.js.map +1 -1
- package/dist/src/ui/components/ContextUsageDisplay.test.js +25 -19
- package/dist/src/ui/components/ContextUsageDisplay.test.js.map +1 -1
- package/dist/src/ui/components/DetailedMessagesDisplay.js +1 -6
- package/dist/src/ui/components/DetailedMessagesDisplay.js.map +1 -1
- package/dist/src/ui/components/DetailedMessagesDisplay.test.js +2 -2
- package/dist/src/ui/components/DetailedMessagesDisplay.test.js.map +1 -1
- package/dist/src/ui/components/DialogManager.js +3 -19
- package/dist/src/ui/components/DialogManager.js.map +1 -1
- package/dist/src/ui/components/ExitPlanModeDialog.js +2 -1
- package/dist/src/ui/components/ExitPlanModeDialog.js.map +1 -1
- package/dist/src/ui/components/ExitPlanModeDialog.test.js +2 -13
- package/dist/src/ui/components/ExitPlanModeDialog.test.js.map +1 -1
- package/dist/src/ui/components/Footer.js +3 -1
- package/dist/src/ui/components/Footer.js.map +1 -1
- package/dist/src/ui/components/Footer.test.js +41 -6
- package/dist/src/ui/components/Footer.test.js.map +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.js +2 -3
- package/dist/src/ui/components/HistoryItemDisplay.js.map +1 -1
- package/dist/src/ui/components/HooksDialog.d.ts +36 -0
- package/dist/src/ui/components/HooksDialog.js +81 -0
- package/dist/src/ui/components/HooksDialog.js.map +1 -0
- package/dist/src/ui/components/HooksDialog.test.js +187 -0
- package/dist/src/ui/components/HooksDialog.test.js.map +1 -0
- package/dist/src/ui/components/MainContent.js +2 -1
- package/dist/src/ui/components/MainContent.js.map +1 -1
- package/dist/src/ui/components/SettingsDialog.d.ts +1 -5
- package/dist/src/ui/components/SettingsDialog.js +90 -254
- package/dist/src/ui/components/SettingsDialog.js.map +1 -1
- package/dist/src/ui/components/SettingsDialog.test.js +127 -105
- package/dist/src/ui/components/SettingsDialog.test.js.map +1 -1
- package/dist/src/ui/components/StatusDisplay.test.js +5 -4
- package/dist/src/ui/components/StatusDisplay.test.js.map +1 -1
- package/dist/src/ui/components/Tips.d.ts +1 -1
- package/dist/src/ui/components/Tips.js +1 -1
- package/dist/src/ui/components/Tips.js.map +1 -1
- package/dist/src/ui/components/Tips.test.d.ts +1 -1
- package/dist/src/ui/components/Tips.test.js +6 -7
- package/dist/src/ui/components/Tips.test.js.map +1 -1
- package/dist/src/ui/components/UserIdentity.d.ts +1 -1
- package/dist/src/ui/components/UserIdentity.js +10 -12
- package/dist/src/ui/components/UserIdentity.js.map +1 -1
- package/dist/src/ui/components/UserIdentity.test.js +23 -10
- package/dist/src/ui/components/UserIdentity.test.js.map +1 -1
- package/dist/src/ui/components/messages/InfoMessage.d.ts +1 -0
- package/dist/src/ui/components/messages/InfoMessage.js +2 -2
- package/dist/src/ui/components/messages/InfoMessage.js.map +1 -1
- package/dist/src/ui/components/messages/SubagentProgressDisplay.d.ts +11 -0
- package/dist/src/ui/components/messages/SubagentProgressDisplay.js +73 -0
- package/dist/src/ui/components/messages/SubagentProgressDisplay.js.map +1 -0
- package/dist/src/ui/components/messages/SubagentProgressDisplay.test.d.ts +6 -0
- package/dist/src/ui/components/messages/SubagentProgressDisplay.test.js +158 -0
- package/dist/src/ui/components/messages/SubagentProgressDisplay.test.js.map +1 -0
- package/dist/src/ui/components/messages/ToolGroupMessage.js +1 -0
- package/dist/src/ui/components/messages/ToolGroupMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolResultDisplay.js +5 -0
- package/dist/src/ui/components/messages/ToolResultDisplay.js.map +1 -1
- package/dist/src/ui/components/shared/BaseSettingsDialog.d.ts +5 -2
- package/dist/src/ui/components/shared/BaseSettingsDialog.js +3 -2
- package/dist/src/ui/components/shared/BaseSettingsDialog.js.map +1 -1
- package/dist/src/ui/components/shared/BaseSettingsDialog.test.js +24 -0
- package/dist/src/ui/components/shared/BaseSettingsDialog.test.js.map +1 -1
- package/dist/src/ui/components/views/ExtensionRegistryView.d.ts +1 -2
- package/dist/src/ui/constants/tips.js +1 -1
- package/dist/src/ui/constants/tips.js.map +1 -1
- package/dist/src/ui/constants.d.ts +4 -0
- package/dist/src/ui/constants.js +4 -0
- package/dist/src/ui/constants.js.map +1 -1
- package/dist/src/ui/contexts/SettingsContext.js +2 -1
- package/dist/src/ui/contexts/SettingsContext.js.map +1 -1
- package/dist/src/ui/contexts/UIStateContext.d.ts +0 -2
- package/dist/src/ui/contexts/UIStateContext.js.map +1 -1
- package/dist/src/ui/contexts/VimModeContext.d.ts +1 -3
- package/dist/src/ui/contexts/VimModeContext.js +7 -16
- package/dist/src/ui/contexts/VimModeContext.js.map +1 -1
- package/dist/src/ui/hooks/toolMapping.js +1 -0
- package/dist/src/ui/hooks/toolMapping.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.js +16 -13
- package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.test.js +31 -2
- package/dist/src/ui/hooks/useGeminiStream.test.js.map +1 -1
- package/dist/src/ui/hooks/useLoadingIndicator.d.ts +1 -1
- package/dist/src/ui/hooks/useLoadingIndicator.js +1 -1
- package/dist/src/ui/hooks/useLoadingIndicator.js.map +1 -1
- package/dist/src/ui/hooks/useTerminalTheme.js +6 -3
- package/dist/src/ui/hooks/useTerminalTheme.js.map +1 -1
- package/dist/src/ui/hooks/useTerminalTheme.test.js +19 -0
- package/dist/src/ui/hooks/useTerminalTheme.test.js.map +1 -1
- package/dist/src/ui/hooks/useToolScheduler.js +26 -12
- package/dist/src/ui/hooks/useToolScheduler.js.map +1 -1
- package/dist/src/ui/hooks/useToolScheduler.test.js +101 -8
- package/dist/src/ui/hooks/useToolScheduler.test.js.map +1 -1
- package/dist/src/ui/themes/theme-manager.d.ts +26 -4
- package/dist/src/ui/themes/theme-manager.js +40 -7
- package/dist/src/ui/themes/theme-manager.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 +3 -17
- package/dist/src/ui/types.js +0 -1
- package/dist/src/ui/types.js.map +1 -1
- package/dist/src/ui/utils/commandUtils.d.ts +6 -2
- package/dist/src/ui/utils/commandUtils.js +12 -5
- package/dist/src/ui/utils/commandUtils.js.map +1 -1
- package/dist/src/ui/utils/commandUtils.test.js +21 -7
- package/dist/src/ui/utils/commandUtils.test.js.map +1 -1
- package/dist/src/utils/agentSettings.d.ts +3 -11
- package/dist/src/utils/agentSettings.js +23 -81
- package/dist/src/utils/agentSettings.js.map +1 -1
- package/dist/src/{ui/components/SessionRetentionWarningDialog.test.d.ts → utils/agentSettings.test.d.ts} +0 -2
- package/dist/src/utils/agentSettings.test.js +111 -0
- package/dist/src/utils/agentSettings.test.js.map +1 -0
- package/dist/src/utils/dialogScopeUtils.d.ts +6 -2
- package/dist/src/utils/dialogScopeUtils.js +3 -3
- package/dist/src/utils/dialogScopeUtils.js.map +1 -1
- package/dist/src/utils/dialogScopeUtils.test.js +5 -5
- package/dist/src/utils/dialogScopeUtils.test.js.map +1 -1
- package/dist/src/utils/featureToggleUtils.d.ts +55 -0
- package/dist/src/utils/featureToggleUtils.js +95 -0
- package/dist/src/utils/featureToggleUtils.js.map +1 -0
- package/dist/src/utils/featureToggleUtils.test.d.ts +6 -0
- package/dist/src/utils/featureToggleUtils.test.js +126 -0
- package/dist/src/utils/featureToggleUtils.test.js.map +1 -0
- package/dist/src/utils/handleAutoUpdate.d.ts +7 -0
- package/dist/src/utils/handleAutoUpdate.js +41 -0
- package/dist/src/utils/handleAutoUpdate.js.map +1 -1
- package/dist/src/utils/handleAutoUpdate.test.js +52 -1
- package/dist/src/utils/handleAutoUpdate.test.js.map +1 -1
- package/dist/src/utils/processUtils.js +2 -0
- package/dist/src/utils/processUtils.js.map +1 -1
- package/dist/src/utils/processUtils.test.js +7 -1
- package/dist/src/utils/processUtils.test.js.map +1 -1
- package/dist/src/utils/sessionCleanup.js +8 -0
- package/dist/src/utils/sessionCleanup.js.map +1 -1
- package/dist/src/utils/sessionCleanup.test.js +19 -0
- package/dist/src/utils/sessionCleanup.test.js.map +1 -1
- package/dist/src/utils/settingsUtils.d.ts +18 -91
- package/dist/src/utils/settingsUtils.js +127 -207
- package/dist/src/utils/settingsUtils.js.map +1 -1
- package/dist/src/utils/settingsUtils.test.js +78 -264
- package/dist/src/utils/settingsUtils.test.js.map +1 -1
- package/dist/src/utils/skillSettings.d.ts +4 -14
- package/dist/src/utils/skillSettings.js +32 -81
- package/dist/src/utils/skillSettings.js.map +1 -1
- package/dist/src/utils/skillSettings.test.d.ts +6 -0
- package/dist/src/utils/skillSettings.test.js +142 -0
- package/dist/src/utils/skillSettings.test.js.map +1 -0
- package/dist/src/zed-integration/acpResume.test.js +8 -0
- package/dist/src/zed-integration/acpResume.test.js.map +1 -1
- package/dist/src/zed-integration/commandHandler.d.ts +26 -0
- package/dist/src/zed-integration/commandHandler.js +102 -0
- package/dist/src/zed-integration/commandHandler.js.map +1 -0
- package/dist/src/zed-integration/commandHandler.test.d.ts +6 -0
- package/dist/src/zed-integration/commandHandler.test.js +25 -0
- package/dist/src/zed-integration/commandHandler.test.js.map +1 -0
- package/dist/src/zed-integration/commands/commandRegistry.d.ts +12 -0
- package/dist/src/zed-integration/commands/commandRegistry.js +26 -0
- package/dist/src/zed-integration/commands/commandRegistry.js.map +1 -0
- package/dist/src/zed-integration/commands/extensions.d.ts +57 -0
- package/dist/src/zed-integration/commands/extensions.js +320 -0
- package/dist/src/zed-integration/commands/extensions.js.map +1 -0
- package/dist/src/zed-integration/commands/init.d.ts +12 -0
- package/dist/src/zed-integration/commands/init.js +47 -0
- package/dist/src/zed-integration/commands/init.js.map +1 -0
- package/dist/src/zed-integration/commands/memory.d.ts +34 -0
- package/dist/src/zed-integration/commands/memory.js +83 -0
- package/dist/src/zed-integration/commands/memory.js.map +1 -0
- package/dist/src/zed-integration/commands/restore.d.ts +18 -0
- package/dist/src/zed-integration/commands/restore.js +140 -0
- package/dist/src/zed-integration/commands/restore.js.map +1 -0
- package/dist/src/zed-integration/commands/types.d.ts +31 -0
- package/dist/src/zed-integration/commands/types.js +7 -0
- package/dist/src/zed-integration/commands/types.js.map +1 -0
- package/dist/src/zed-integration/zedIntegration.d.ts +9 -2
- package/dist/src/zed-integration/zedIntegration.js +170 -8
- package/dist/src/zed-integration/zedIntegration.js.map +1 -1
- package/dist/src/zed-integration/zedIntegration.test.js +329 -2
- package/dist/src/zed-integration/zedIntegration.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -4
- package/dist/src/ui/components/SessionRetentionWarningDialog.d.ts +0 -12
- package/dist/src/ui/components/SessionRetentionWarningDialog.js +0 -27
- package/dist/src/ui/components/SessionRetentionWarningDialog.js.map +0 -1
- package/dist/src/ui/components/SessionRetentionWarningDialog.test.js +0 -72
- package/dist/src/ui/components/SessionRetentionWarningDialog.test.js.map +0 -1
- package/dist/src/ui/components/views/HooksList.d.ts +0 -24
- package/dist/src/ui/components/views/HooksList.js +0 -28
- package/dist/src/ui/components/views/HooksList.js.map +0 -1
- package/dist/src/ui/hooks/useSessionRetentionCheck.d.ts +0 -12
- package/dist/src/ui/hooks/useSessionRetentionCheck.js +0 -57
- package/dist/src/ui/hooks/useSessionRetentionCheck.js.map +0 -1
- package/dist/src/ui/hooks/useSessionRetentionCheck.test.js +0 -169
- package/dist/src/ui/hooks/useSessionRetentionCheck.test.js.map +0 -1
- /package/dist/src/ui/{hooks/useSessionRetentionCheck.test.d.ts → components/HooksDialog.test.d.ts} +0 -0
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2026 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { SettingScope, type LoadableSettingScope, type LoadedSettings } from '../config/settings.js';
|
|
7
|
+
export interface ModifiedScope {
|
|
8
|
+
scope: SettingScope;
|
|
9
|
+
path: string;
|
|
10
|
+
}
|
|
11
|
+
export type FeatureActionStatus = 'success' | 'no-op' | 'error';
|
|
12
|
+
export interface FeatureActionResult {
|
|
13
|
+
status: FeatureActionStatus;
|
|
14
|
+
featureName: string;
|
|
15
|
+
action: 'enable' | 'disable';
|
|
16
|
+
/** Scopes where the feature's state was actually changed. */
|
|
17
|
+
modifiedScopes: ModifiedScope[];
|
|
18
|
+
/** Scopes where the feature was already in the desired state. */
|
|
19
|
+
alreadyInStateScopes: ModifiedScope[];
|
|
20
|
+
/** Error message if status is 'error'. */
|
|
21
|
+
error?: string;
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* Strategy pattern to handle differences between feature types (e.g. skills vs agents).
|
|
25
|
+
*/
|
|
26
|
+
export interface FeatureToggleStrategy {
|
|
27
|
+
/**
|
|
28
|
+
* Checks if the feature needs to be enabled in the given scope.
|
|
29
|
+
* For skills (blacklist): returns true if in disabled list.
|
|
30
|
+
* For agents (whitelist): returns true if NOT explicitly enabled (false or undefined).
|
|
31
|
+
*/
|
|
32
|
+
needsEnabling(settings: LoadedSettings, scope: LoadableSettingScope, featureName: string): boolean;
|
|
33
|
+
/**
|
|
34
|
+
* Applies the enable change to the settings object.
|
|
35
|
+
*/
|
|
36
|
+
enable(settings: LoadedSettings, scope: LoadableSettingScope, featureName: string): void;
|
|
37
|
+
/**
|
|
38
|
+
* Checks if the feature is explicitly disabled in the given scope.
|
|
39
|
+
* For skills (blacklist): returns true if in disabled list.
|
|
40
|
+
* For agents (whitelist): returns true if explicitly set to false.
|
|
41
|
+
*/
|
|
42
|
+
isExplicitlyDisabled(settings: LoadedSettings, scope: LoadableSettingScope, featureName: string): boolean;
|
|
43
|
+
/**
|
|
44
|
+
* Applies the disable change to the settings object.
|
|
45
|
+
*/
|
|
46
|
+
disable(settings: LoadedSettings, scope: LoadableSettingScope, featureName: string): void;
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* Enables a feature by ensuring it is enabled in all writable scopes.
|
|
50
|
+
*/
|
|
51
|
+
export declare function enableFeature(settings: LoadedSettings, featureName: string, strategy: FeatureToggleStrategy): FeatureActionResult;
|
|
52
|
+
/**
|
|
53
|
+
* Disables a feature in the specified scope.
|
|
54
|
+
*/
|
|
55
|
+
export declare function disableFeature(settings: LoadedSettings, featureName: string, scope: SettingScope, strategy: FeatureToggleStrategy): FeatureActionResult;
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2026 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { SettingScope, isLoadableSettingScope, } from '../config/settings.js';
|
|
7
|
+
/**
|
|
8
|
+
* Enables a feature by ensuring it is enabled in all writable scopes.
|
|
9
|
+
*/
|
|
10
|
+
export function enableFeature(settings, featureName, strategy) {
|
|
11
|
+
const writableScopes = [SettingScope.Workspace, SettingScope.User];
|
|
12
|
+
const foundInDisabledScopes = [];
|
|
13
|
+
const alreadyEnabledScopes = [];
|
|
14
|
+
for (const scope of writableScopes) {
|
|
15
|
+
if (isLoadableSettingScope(scope)) {
|
|
16
|
+
const scopePath = settings.forScope(scope).path;
|
|
17
|
+
if (strategy.needsEnabling(settings, scope, featureName)) {
|
|
18
|
+
foundInDisabledScopes.push({ scope, path: scopePath });
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
alreadyEnabledScopes.push({ scope, path: scopePath });
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
if (foundInDisabledScopes.length === 0) {
|
|
26
|
+
return {
|
|
27
|
+
status: 'no-op',
|
|
28
|
+
featureName,
|
|
29
|
+
action: 'enable',
|
|
30
|
+
modifiedScopes: [],
|
|
31
|
+
alreadyInStateScopes: alreadyEnabledScopes,
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
const modifiedScopes = [];
|
|
35
|
+
for (const { scope, path } of foundInDisabledScopes) {
|
|
36
|
+
if (isLoadableSettingScope(scope)) {
|
|
37
|
+
strategy.enable(settings, scope, featureName);
|
|
38
|
+
modifiedScopes.push({ scope, path });
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
return {
|
|
42
|
+
status: 'success',
|
|
43
|
+
featureName,
|
|
44
|
+
action: 'enable',
|
|
45
|
+
modifiedScopes,
|
|
46
|
+
alreadyInStateScopes: alreadyEnabledScopes,
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
/**
|
|
50
|
+
* Disables a feature in the specified scope.
|
|
51
|
+
*/
|
|
52
|
+
export function disableFeature(settings, featureName, scope, strategy) {
|
|
53
|
+
if (!isLoadableSettingScope(scope)) {
|
|
54
|
+
return {
|
|
55
|
+
status: 'error',
|
|
56
|
+
featureName,
|
|
57
|
+
action: 'disable',
|
|
58
|
+
modifiedScopes: [],
|
|
59
|
+
alreadyInStateScopes: [],
|
|
60
|
+
error: `Invalid settings scope: ${scope}`,
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
const scopePath = settings.forScope(scope).path;
|
|
64
|
+
if (strategy.isExplicitlyDisabled(settings, scope, featureName)) {
|
|
65
|
+
return {
|
|
66
|
+
status: 'no-op',
|
|
67
|
+
featureName,
|
|
68
|
+
action: 'disable',
|
|
69
|
+
modifiedScopes: [],
|
|
70
|
+
alreadyInStateScopes: [{ scope, path: scopePath }],
|
|
71
|
+
};
|
|
72
|
+
}
|
|
73
|
+
// Check if it's already disabled in the other writable scope
|
|
74
|
+
const otherScope = scope === SettingScope.Workspace
|
|
75
|
+
? SettingScope.User
|
|
76
|
+
: SettingScope.Workspace;
|
|
77
|
+
const alreadyDisabledInOther = [];
|
|
78
|
+
if (isLoadableSettingScope(otherScope)) {
|
|
79
|
+
if (strategy.isExplicitlyDisabled(settings, otherScope, featureName)) {
|
|
80
|
+
alreadyDisabledInOther.push({
|
|
81
|
+
scope: otherScope,
|
|
82
|
+
path: settings.forScope(otherScope).path,
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
strategy.disable(settings, scope, featureName);
|
|
87
|
+
return {
|
|
88
|
+
status: 'success',
|
|
89
|
+
featureName,
|
|
90
|
+
action: 'disable',
|
|
91
|
+
modifiedScopes: [{ scope, path: scopePath }],
|
|
92
|
+
alreadyInStateScopes: alreadyDisabledInOther,
|
|
93
|
+
};
|
|
94
|
+
}
|
|
95
|
+
//# sourceMappingURL=featureToggleUtils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"featureToggleUtils.js","sourceRoot":"","sources":["../../../src/utils/featureToggleUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,126 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2026 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { describe, it, expect, vi } from 'vitest';
|
|
7
|
+
import { enableFeature, disableFeature, } from './featureToggleUtils.js';
|
|
8
|
+
import { SettingScope, } from '../config/settings.js';
|
|
9
|
+
function createMockLoadedSettings(opts) {
|
|
10
|
+
const scopes = {
|
|
11
|
+
[SettingScope.User]: {
|
|
12
|
+
settings: opts.userSettings ?? {},
|
|
13
|
+
path: opts.userPath ?? '/home/user/.gemini/settings.json',
|
|
14
|
+
},
|
|
15
|
+
[SettingScope.Workspace]: {
|
|
16
|
+
settings: opts.workspaceSettings ?? {},
|
|
17
|
+
path: opts.workspacePath ?? '/project/.gemini/settings.json',
|
|
18
|
+
},
|
|
19
|
+
};
|
|
20
|
+
const mockSettings = {
|
|
21
|
+
forScope: vi.fn((scope) => scopes[scope]),
|
|
22
|
+
setValue: vi.fn(),
|
|
23
|
+
};
|
|
24
|
+
return mockSettings;
|
|
25
|
+
}
|
|
26
|
+
function createMockStrategy(overrides) {
|
|
27
|
+
return {
|
|
28
|
+
needsEnabling: vi.fn(overrides?.needsEnabling ?? (() => false)),
|
|
29
|
+
enable: vi.fn(),
|
|
30
|
+
isExplicitlyDisabled: vi.fn(overrides?.isExplicitlyDisabled ?? (() => false)),
|
|
31
|
+
disable: vi.fn(),
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
describe('featureToggleUtils', () => {
|
|
35
|
+
describe('enableFeature', () => {
|
|
36
|
+
it('should return no-op when the feature is already enabled in all scopes', () => {
|
|
37
|
+
const settings = createMockLoadedSettings({});
|
|
38
|
+
const strategy = createMockStrategy({
|
|
39
|
+
needsEnabling: () => false,
|
|
40
|
+
});
|
|
41
|
+
const result = enableFeature(settings, 'my-feature', strategy);
|
|
42
|
+
expect(result.status).toBe('no-op');
|
|
43
|
+
expect(result.action).toBe('enable');
|
|
44
|
+
expect(result.featureName).toBe('my-feature');
|
|
45
|
+
expect(result.modifiedScopes).toHaveLength(0);
|
|
46
|
+
expect(result.alreadyInStateScopes).toHaveLength(2);
|
|
47
|
+
expect(strategy.enable).not.toHaveBeenCalled();
|
|
48
|
+
});
|
|
49
|
+
it('should enable the feature when disabled in one scope', () => {
|
|
50
|
+
const settings = createMockLoadedSettings({});
|
|
51
|
+
const strategy = createMockStrategy({
|
|
52
|
+
needsEnabling: (_s, scope) => scope === SettingScope.Workspace,
|
|
53
|
+
});
|
|
54
|
+
const result = enableFeature(settings, 'my-feature', strategy);
|
|
55
|
+
expect(result.status).toBe('success');
|
|
56
|
+
expect(result.action).toBe('enable');
|
|
57
|
+
expect(result.modifiedScopes).toHaveLength(1);
|
|
58
|
+
expect(result.modifiedScopes[0].scope).toBe(SettingScope.Workspace);
|
|
59
|
+
expect(result.alreadyInStateScopes).toHaveLength(1);
|
|
60
|
+
expect(result.alreadyInStateScopes[0].scope).toBe(SettingScope.User);
|
|
61
|
+
expect(strategy.enable).toHaveBeenCalledTimes(1);
|
|
62
|
+
});
|
|
63
|
+
it('should enable the feature when disabled in both scopes', () => {
|
|
64
|
+
const settings = createMockLoadedSettings({});
|
|
65
|
+
const strategy = createMockStrategy({
|
|
66
|
+
needsEnabling: () => true,
|
|
67
|
+
});
|
|
68
|
+
const result = enableFeature(settings, 'my-feature', strategy);
|
|
69
|
+
expect(result.status).toBe('success');
|
|
70
|
+
expect(result.action).toBe('enable');
|
|
71
|
+
expect(result.modifiedScopes).toHaveLength(2);
|
|
72
|
+
expect(result.alreadyInStateScopes).toHaveLength(0);
|
|
73
|
+
expect(strategy.enable).toHaveBeenCalledTimes(2);
|
|
74
|
+
});
|
|
75
|
+
it('should include correct scope paths in the result', () => {
|
|
76
|
+
const settings = createMockLoadedSettings({
|
|
77
|
+
userPath: '/custom/user/path',
|
|
78
|
+
workspacePath: '/custom/workspace/path',
|
|
79
|
+
});
|
|
80
|
+
const strategy = createMockStrategy({
|
|
81
|
+
needsEnabling: () => true,
|
|
82
|
+
});
|
|
83
|
+
const result = enableFeature(settings, 'my-feature', strategy);
|
|
84
|
+
const paths = result.modifiedScopes.map((s) => s.path);
|
|
85
|
+
expect(paths).toContain('/custom/workspace/path');
|
|
86
|
+
expect(paths).toContain('/custom/user/path');
|
|
87
|
+
});
|
|
88
|
+
});
|
|
89
|
+
describe('disableFeature', () => {
|
|
90
|
+
it('should return no-op when the feature is already disabled in the target scope', () => {
|
|
91
|
+
const settings = createMockLoadedSettings({});
|
|
92
|
+
const strategy = createMockStrategy({
|
|
93
|
+
isExplicitlyDisabled: () => true,
|
|
94
|
+
});
|
|
95
|
+
const result = disableFeature(settings, 'my-feature', SettingScope.User, strategy);
|
|
96
|
+
expect(result.status).toBe('no-op');
|
|
97
|
+
expect(result.action).toBe('disable');
|
|
98
|
+
expect(result.featureName).toBe('my-feature');
|
|
99
|
+
expect(result.modifiedScopes).toHaveLength(0);
|
|
100
|
+
expect(result.alreadyInStateScopes).toHaveLength(1);
|
|
101
|
+
expect(strategy.disable).not.toHaveBeenCalled();
|
|
102
|
+
});
|
|
103
|
+
it('should disable the feature when it is enabled', () => {
|
|
104
|
+
const settings = createMockLoadedSettings({});
|
|
105
|
+
const strategy = createMockStrategy({
|
|
106
|
+
isExplicitlyDisabled: () => false,
|
|
107
|
+
});
|
|
108
|
+
const result = disableFeature(settings, 'my-feature', SettingScope.User, strategy);
|
|
109
|
+
expect(result.status).toBe('success');
|
|
110
|
+
expect(result.action).toBe('disable');
|
|
111
|
+
expect(result.modifiedScopes).toHaveLength(1);
|
|
112
|
+
expect(result.modifiedScopes[0].scope).toBe(SettingScope.User);
|
|
113
|
+
expect(strategy.disable).toHaveBeenCalledOnce();
|
|
114
|
+
});
|
|
115
|
+
it('should return error for an invalid scope', () => {
|
|
116
|
+
const settings = createMockLoadedSettings({});
|
|
117
|
+
const strategy = createMockStrategy();
|
|
118
|
+
const result = disableFeature(settings, 'my-feature', SettingScope.Session, strategy);
|
|
119
|
+
expect(result.status).toBe('error');
|
|
120
|
+
expect(result.action).toBe('disable');
|
|
121
|
+
expect(result.error).toContain('Invalid settings scope');
|
|
122
|
+
expect(strategy.disable).not.toHaveBeenCalled();
|
|
123
|
+
});
|
|
124
|
+
});
|
|
125
|
+
});
|
|
126
|
+
//# sourceMappingURL=featureToggleUtils.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"featureToggleUtils.test.js","sourceRoot":"","sources":["../../../src/utils/featureToggleUtils.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,5 +7,12 @@ import type { UpdateObject } from '../ui/utils/updateCheck.js';
|
|
|
7
7
|
import type { LoadedSettings } from '../config/settings.js';
|
|
8
8
|
import type { HistoryItem } from '../ui/types.js';
|
|
9
9
|
import type { spawn } from 'node:child_process';
|
|
10
|
+
/** @internal */
|
|
11
|
+
export declare function _setUpdateStateForTesting(value: boolean): void;
|
|
12
|
+
export declare function isUpdateInProgress(): boolean;
|
|
13
|
+
/**
|
|
14
|
+
* Returns a promise that resolves when the update process completes or times out.
|
|
15
|
+
*/
|
|
16
|
+
export declare function waitForUpdateCompletion(timeoutMs?: number): Promise<void>;
|
|
10
17
|
export declare function handleAutoUpdate(info: UpdateObject | null, settings: LoadedSettings, projectRoot: string, spawnFn?: typeof spawn): import("child_process").ChildProcess | undefined;
|
|
11
18
|
export declare function setUpdateHandler(addItem: (item: Omit<HistoryItem, 'id'>, timestamp: number) => void, setUpdateInfo: (info: UpdateObject | null) => void): () => void;
|
|
@@ -7,6 +7,41 @@ import { getInstallationInfo, PackageManager } from './installationInfo.js';
|
|
|
7
7
|
import { updateEventEmitter } from './updateEventEmitter.js';
|
|
8
8
|
import { MessageType } from '../ui/types.js';
|
|
9
9
|
import { spawnWrapper } from './spawnWrapper.js';
|
|
10
|
+
import { debugLogger } from '@google/gemini-cli-core';
|
|
11
|
+
let _updateInProgress = false;
|
|
12
|
+
/** @internal */
|
|
13
|
+
export function _setUpdateStateForTesting(value) {
|
|
14
|
+
_updateInProgress = value;
|
|
15
|
+
}
|
|
16
|
+
export function isUpdateInProgress() {
|
|
17
|
+
return _updateInProgress;
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* Returns a promise that resolves when the update process completes or times out.
|
|
21
|
+
*/
|
|
22
|
+
export async function waitForUpdateCompletion(timeoutMs = 30000) {
|
|
23
|
+
if (!_updateInProgress) {
|
|
24
|
+
return;
|
|
25
|
+
}
|
|
26
|
+
debugLogger.log('\nGemini CLI is waiting for a background update to complete before restarting...');
|
|
27
|
+
return new Promise((resolve) => {
|
|
28
|
+
// Re-check the condition inside the promise executor to avoid a race condition.
|
|
29
|
+
// If the update finished between the initial check and now, resolve immediately.
|
|
30
|
+
if (!_updateInProgress) {
|
|
31
|
+
resolve();
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
const timer = setTimeout(cleanup, timeoutMs);
|
|
35
|
+
function cleanup() {
|
|
36
|
+
clearTimeout(timer);
|
|
37
|
+
updateEventEmitter.off('update-success', cleanup);
|
|
38
|
+
updateEventEmitter.off('update-failed', cleanup);
|
|
39
|
+
resolve();
|
|
40
|
+
}
|
|
41
|
+
updateEventEmitter.once('update-success', cleanup);
|
|
42
|
+
updateEventEmitter.once('update-failed', cleanup);
|
|
43
|
+
});
|
|
44
|
+
}
|
|
10
45
|
export function handleAutoUpdate(info, settings, projectRoot, spawnFn = spawnWrapper) {
|
|
11
46
|
if (!info) {
|
|
12
47
|
return;
|
|
@@ -35,6 +70,9 @@ export function handleAutoUpdate(info, settings, projectRoot, spawnFn = spawnWra
|
|
|
35
70
|
!settings.merged.general.enableAutoUpdate) {
|
|
36
71
|
return;
|
|
37
72
|
}
|
|
73
|
+
if (_updateInProgress) {
|
|
74
|
+
return;
|
|
75
|
+
}
|
|
38
76
|
const isNightly = info.update.latest.includes('nightly');
|
|
39
77
|
const updateCommand = installationInfo.updateCommand.replace('@latest', isNightly ? '@nightly' : `@${info.update.latest}`);
|
|
40
78
|
const updateProcess = spawnFn(updateCommand, {
|
|
@@ -42,9 +80,11 @@ export function handleAutoUpdate(info, settings, projectRoot, spawnFn = spawnWra
|
|
|
42
80
|
shell: true,
|
|
43
81
|
detached: true,
|
|
44
82
|
});
|
|
83
|
+
_updateInProgress = true;
|
|
45
84
|
// Un-reference the child process to allow the parent to exit independently.
|
|
46
85
|
updateProcess.unref();
|
|
47
86
|
updateProcess.on('close', (code) => {
|
|
87
|
+
_updateInProgress = false;
|
|
48
88
|
if (code === 0) {
|
|
49
89
|
updateEventEmitter.emit('update-success', {
|
|
50
90
|
message: 'Update successful! The new version will be used on your next run.',
|
|
@@ -57,6 +97,7 @@ export function handleAutoUpdate(info, settings, projectRoot, spawnFn = spawnWra
|
|
|
57
97
|
}
|
|
58
98
|
});
|
|
59
99
|
updateProcess.on('error', (err) => {
|
|
100
|
+
_updateInProgress = false;
|
|
60
101
|
updateEventEmitter.emit('update-failed', {
|
|
61
102
|
message: `Automatic update failed. Please try updating manually. (error: ${err.message})`,
|
|
62
103
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleAutoUpdate.js","sourceRoot":"","sources":["../../../src/utils/handleAutoUpdate.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"handleAutoUpdate.js","sourceRoot":"","sources":["../../../src/utils/handleAutoUpdate.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,IAAI,iBAAiB,GAAG,KAAK,CAAC;AAE9B,gBAAgB;AAChB,MAAM,UAAU,yBAAyB,CAAC,KAAc;IACtD,iBAAiB,GAAG,KAAK,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,kBAAkB;IAChC,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,SAAS,GAAG,KAAK;IAEjB,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,OAAO;IACT,CAAC;IAED,WAAW,CAAC,GAAG,CACb,kFAAkF,CACnF,CAAC;IAEF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,gFAAgF;QAChF,iFAAiF;QACjF,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,OAAO,EAAE,CAAC;YACV,OAAO;QACT,CAAC;QAED,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAE7C,SAAS,OAAO;YACd,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,kBAAkB,CAAC,GAAG,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;YAClD,kBAAkB,CAAC,GAAG,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YACjD,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,kBAAkB,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;QACnD,kBAAkB,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,IAAyB,EACzB,QAAwB,EACxB,WAAmB,EACnB,UAAwB,YAAY;IAEpC,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO;IACT,CAAC;IAED,IAAI,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACnE,kBAAkB,CAAC,IAAI,CAAC,aAAa,EAAE;YACrC,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,sDAAsD;SAC/E,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,4BAA4B,EAAE,CAAC;QAC1D,OAAO;IACT,CAAC;IAED,MAAM,gBAAgB,GAAG,mBAAmB,CAC1C,WAAW,EACX,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,CACzC,CAAC;IAEF,IACE,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC,QAAQ,CACrE,gBAAgB,CAAC,cAAc,CAChC,EACD,CAAC;QACD,OAAO;IACT,CAAC;IAED,IAAI,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC;IACnC,IAAI,gBAAgB,CAAC,aAAa,EAAE,CAAC;QACnC,eAAe,IAAI,KAAK,gBAAgB,CAAC,aAAa,EAAE,CAAC;IAC3D,CAAC;IAED,kBAAkB,CAAC,IAAI,CAAC,iBAAiB,EAAE;QACzC,OAAO,EAAE,eAAe;KACzB,CAAC,CAAC;IAEH,IACE,CAAC,gBAAgB,CAAC,aAAa;QAC/B,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,EACzC,CAAC;QACD,OAAO;IACT,CAAC;IAED,IAAI,iBAAiB,EAAE,CAAC;QACtB,OAAO;IACT,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAEzD,MAAM,aAAa,GAAG,gBAAgB,CAAC,aAAa,CAAC,OAAO,CAC1D,SAAS,EACT,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAClD,CAAC;IACF,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,EAAE;QAC3C,KAAK,EAAE,QAAQ;QACf,KAAK,EAAE,IAAI;QACX,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;IAEH,iBAAiB,GAAG,IAAI,CAAC;IAEzB,4EAA4E;IAC5E,aAAa,CAAC,KAAK,EAAE,CAAC;IAEtB,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;QACjC,iBAAiB,GAAG,KAAK,CAAC;QAC1B,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;YACf,kBAAkB,CAAC,IAAI,CAAC,gBAAgB,EAAE;gBACxC,OAAO,EACL,mEAAmE;aACtE,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,kBAAkB,CAAC,IAAI,CAAC,eAAe,EAAE;gBACvC,OAAO,EAAE,oEAAoE,aAAa,GAAG;aAC9F,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;QAChC,iBAAiB,GAAG,KAAK,CAAC;QAC1B,kBAAkB,CAAC,IAAI,CAAC,eAAe,EAAE;YACvC,OAAO,EAAE,kEAAkE,GAAG,CAAC,OAAO,GAAG;SAC1F,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,OAAmE,EACnE,aAAkD;IAElD,IAAI,qBAAqB,GAAG,KAAK,CAAC;IAClC,MAAM,oBAAoB,GAAG,CAAC,IAAkB,EAAE,EAAE;QAClD,aAAa,CAAC,IAAI,CAAC,CAAC;QACpB,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC;QAClC,UAAU,CAAC,GAAG,EAAE;YACd,IAAI,CAAC,qBAAqB,EAAE,CAAC;gBAC3B,OAAO,CACL;oBACE,IAAI,EAAE,WAAW,CAAC,IAAI;oBACtB,IAAI,EAAE,YAAY;iBACnB,EACD,IAAI,CAAC,GAAG,EAAE,CACX,CAAC;YACJ,CAAC;YACD,aAAa,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC,EAAE,KAAK,CAAC,CAAC;IACZ,CAAC,CAAC;IAEF,MAAM,kBAAkB,GAAG,GAAG,EAAE;QAC9B,aAAa,CAAC,IAAI,CAAC,CAAC;QACpB,OAAO,CACL;YACE,IAAI,EAAE,WAAW,CAAC,KAAK;YACvB,IAAI,EAAE,uDAAuD;SAC9D,EACD,IAAI,CAAC,GAAG,EAAE,CACX,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,mBAAmB,GAAG,GAAG,EAAE;QAC/B,qBAAqB,GAAG,IAAI,CAAC;QAC7B,aAAa,CAAC,IAAI,CAAC,CAAC;QACpB,OAAO,CACL;YACE,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,IAAI,EAAE,mEAAmE;SAC1E,EACD,IAAI,CAAC,GAAG,EAAE,CACX,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,gBAAgB,GAAG,CAAC,IAAyB,EAAE,EAAE;QACrD,OAAO,CACL;YACE,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,IAAI,EAAE,IAAI,CAAC,OAAO;SACnB,EACD,IAAI,CAAC,GAAG,EAAE,CACX,CAAC;IACJ,CAAC,CAAC;IAEF,kBAAkB,CAAC,EAAE,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,CAAC;IAC/D,kBAAkB,CAAC,EAAE,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAC;IAC3D,kBAAkB,CAAC,EAAE,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,CAAC;IAC7D,kBAAkB,CAAC,EAAE,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;IAEvD,OAAO,GAAG,EAAE;QACV,kBAAkB,CAAC,GAAG,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,CAAC;QAChE,kBAAkB,CAAC,GAAG,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAC;QAC5D,kBAAkB,CAAC,GAAG,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,CAAC;QAC9D,kBAAkB,CAAC,GAAG,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;IAC1D,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -7,7 +7,7 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
|
7
7
|
import { getInstallationInfo, PackageManager } from './installationInfo.js';
|
|
8
8
|
import { updateEventEmitter } from './updateEventEmitter.js';
|
|
9
9
|
import EventEmitter from 'node:events';
|
|
10
|
-
import { handleAutoUpdate, setUpdateHandler } from './handleAutoUpdate.js';
|
|
10
|
+
import { handleAutoUpdate, setUpdateHandler, isUpdateInProgress, waitForUpdateCompletion, _setUpdateStateForTesting, } from './handleAutoUpdate.js';
|
|
11
11
|
import { MessageType } from '../ui/types.js';
|
|
12
12
|
vi.mock('./installationInfo.js', async () => {
|
|
13
13
|
const actual = await vi.importActual('./installationInfo.js');
|
|
@@ -61,6 +61,7 @@ describe('handleAutoUpdate', () => {
|
|
|
61
61
|
afterEach(() => {
|
|
62
62
|
vi.unstubAllEnvs();
|
|
63
63
|
vi.clearAllMocks();
|
|
64
|
+
_setUpdateStateForTesting(false);
|
|
64
65
|
});
|
|
65
66
|
it('should do nothing if update info is null', () => {
|
|
66
67
|
handleAutoUpdate(null, mockSettings, '/root', mockSpawn);
|
|
@@ -68,6 +69,56 @@ describe('handleAutoUpdate', () => {
|
|
|
68
69
|
expect(updateEventEmitter.emit).not.toHaveBeenCalled();
|
|
69
70
|
expect(mockSpawn).not.toHaveBeenCalled();
|
|
70
71
|
});
|
|
72
|
+
it('should track update progress state', async () => {
|
|
73
|
+
mockGetInstallationInfo.mockReturnValue({
|
|
74
|
+
updateCommand: 'npm i -g @google/gemini-cli@latest',
|
|
75
|
+
updateMessage: 'This is an additional message.',
|
|
76
|
+
isGlobal: false,
|
|
77
|
+
packageManager: PackageManager.NPM,
|
|
78
|
+
});
|
|
79
|
+
expect(isUpdateInProgress()).toBe(false);
|
|
80
|
+
handleAutoUpdate(mockUpdateInfo, mockSettings, '/root', mockSpawn);
|
|
81
|
+
expect(isUpdateInProgress()).toBe(true);
|
|
82
|
+
mockChildProcess.emit('close', 0);
|
|
83
|
+
expect(isUpdateInProgress()).toBe(false);
|
|
84
|
+
});
|
|
85
|
+
it('should track update progress state on error', async () => {
|
|
86
|
+
mockGetInstallationInfo.mockReturnValue({
|
|
87
|
+
updateCommand: 'npm i -g @google/gemini-cli@latest',
|
|
88
|
+
updateMessage: 'This is an additional message.',
|
|
89
|
+
isGlobal: false,
|
|
90
|
+
packageManager: PackageManager.NPM,
|
|
91
|
+
});
|
|
92
|
+
handleAutoUpdate(mockUpdateInfo, mockSettings, '/root', mockSpawn);
|
|
93
|
+
expect(isUpdateInProgress()).toBe(true);
|
|
94
|
+
mockChildProcess.emit('error', new Error('fail'));
|
|
95
|
+
expect(isUpdateInProgress()).toBe(false);
|
|
96
|
+
});
|
|
97
|
+
it('should resolve waitForUpdateCompletion when update succeeds', async () => {
|
|
98
|
+
_setUpdateStateForTesting(true);
|
|
99
|
+
const waitPromise = waitForUpdateCompletion();
|
|
100
|
+
updateEventEmitter.emit('update-success', {});
|
|
101
|
+
await expect(waitPromise).resolves.toBeUndefined();
|
|
102
|
+
});
|
|
103
|
+
it('should resolve waitForUpdateCompletion when update fails', async () => {
|
|
104
|
+
_setUpdateStateForTesting(true);
|
|
105
|
+
const waitPromise = waitForUpdateCompletion();
|
|
106
|
+
updateEventEmitter.emit('update-failed', {});
|
|
107
|
+
await expect(waitPromise).resolves.toBeUndefined();
|
|
108
|
+
});
|
|
109
|
+
it('should resolve waitForUpdateCompletion immediately if not in progress', async () => {
|
|
110
|
+
_setUpdateStateForTesting(false);
|
|
111
|
+
const waitPromise = waitForUpdateCompletion();
|
|
112
|
+
await expect(waitPromise).resolves.toBeUndefined();
|
|
113
|
+
});
|
|
114
|
+
it('should timeout waitForUpdateCompletion', async () => {
|
|
115
|
+
vi.useFakeTimers();
|
|
116
|
+
_setUpdateStateForTesting(true);
|
|
117
|
+
const waitPromise = waitForUpdateCompletion(1000);
|
|
118
|
+
vi.advanceTimersByTime(1001);
|
|
119
|
+
await expect(waitPromise).resolves.toBeUndefined();
|
|
120
|
+
vi.useRealTimers();
|
|
121
|
+
});
|
|
71
122
|
it('should do nothing if update prompts are disabled', () => {
|
|
72
123
|
mockSettings.merged.general.enableAutoUpdateNotification = false;
|
|
73
124
|
handleAutoUpdate(mockUpdateInfo, mockSettings, '/root', mockSpawn);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleAutoUpdate.test.js","sourceRoot":"","sources":["../../../src/utils/handleAutoUpdate.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"handleAutoUpdate.test.js","sourceRoot":"","sources":["../../../src/utils/handleAutoUpdate.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 { runExitCleanup } from './cleanup.js';
|
|
7
|
+
import { waitForUpdateCompletion } from './handleAutoUpdate.js';
|
|
7
8
|
/**
|
|
8
9
|
* Exit code used to signal that the CLI should be relaunched.
|
|
9
10
|
*/
|
|
@@ -12,6 +13,7 @@ export const RELAUNCH_EXIT_CODE = 199;
|
|
|
12
13
|
* Exits the process with a special code to signal that the parent process should relaunch it.
|
|
13
14
|
*/
|
|
14
15
|
export async function relaunchApp() {
|
|
16
|
+
await waitForUpdateCompletion();
|
|
15
17
|
await runExitCleanup();
|
|
16
18
|
process.exit(RELAUNCH_EXIT_CODE);
|
|
17
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processUtils.js","sourceRoot":"","sources":["../../../src/utils/processUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"processUtils.js","sourceRoot":"","sources":["../../../src/utils/processUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEhE;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAEtC;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW;IAC/B,MAAM,uBAAuB,EAAE,CAAC;IAChC,MAAM,cAAc,EAAE,CAAC;IACvB,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;AACnC,CAAC"}
|
|
@@ -6,13 +6,19 @@
|
|
|
6
6
|
import { vi } from 'vitest';
|
|
7
7
|
import { RELAUNCH_EXIT_CODE, relaunchApp } from './processUtils.js';
|
|
8
8
|
import * as cleanup from './cleanup.js';
|
|
9
|
+
import * as handleAutoUpdate from './handleAutoUpdate.js';
|
|
10
|
+
vi.mock('./handleAutoUpdate.js', () => ({
|
|
11
|
+
waitForUpdateCompletion: vi.fn().mockResolvedValue(undefined),
|
|
12
|
+
}));
|
|
9
13
|
describe('processUtils', () => {
|
|
10
14
|
const processExit = vi
|
|
11
15
|
.spyOn(process, 'exit')
|
|
12
16
|
.mockReturnValue(undefined);
|
|
13
17
|
const runExitCleanup = vi.spyOn(cleanup, 'runExitCleanup');
|
|
14
|
-
|
|
18
|
+
afterEach(() => vi.clearAllMocks());
|
|
19
|
+
it('should wait for updates, run cleanup, and exit with the relaunch code', async () => {
|
|
15
20
|
await relaunchApp();
|
|
21
|
+
expect(handleAutoUpdate.waitForUpdateCompletion).toHaveBeenCalledTimes(1);
|
|
16
22
|
expect(runExitCleanup).toHaveBeenCalledTimes(1);
|
|
17
23
|
expect(processExit).toHaveBeenCalledWith(RELAUNCH_EXIT_CODE);
|
|
18
24
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processUtils.test.js","sourceRoot":"","sources":["../../../src/utils/processUtils.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"processUtils.test.js","sourceRoot":"","sources":["../../../src/utils/processUtils.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAC;AAE1D,EAAE,CAAC,IAAI,CAAC,uBAAuB,EAAE,GAAG,EAAE,CAAC,CAAC;IACtC,uBAAuB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC;CAC9D,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,MAAM,WAAW,GAAG,EAAE;SACnB,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC;SACtB,eAAe,CAAC,SAAkB,CAAC,CAAC;IACvC,MAAM,cAAc,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAE3D,SAAS,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,CAAC;IAEpC,EAAE,CAAC,uEAAuE,EAAE,KAAK,IAAI,EAAE;QACrF,MAAM,WAAW,EAAE,CAAC;QACpB,MAAM,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC1E,MAAM,CAAC,cAAc,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAChD,MAAM,CAAC,WAAW,CAAC,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -74,6 +74,14 @@ export async function cleanupExpiredSessions(config, settings) {
|
|
|
74
74
|
catch {
|
|
75
75
|
/* ignore if doesn't exist */
|
|
76
76
|
}
|
|
77
|
+
// ALSO cleanup the session-specific directory (contains plans, tasks, etc.)
|
|
78
|
+
const sessionDir = path.join(config.storage.getProjectTempDir(), sessionId);
|
|
79
|
+
try {
|
|
80
|
+
await fs.rm(sessionDir, { recursive: true, force: true });
|
|
81
|
+
}
|
|
82
|
+
catch {
|
|
83
|
+
/* ignore if doesn't exist */
|
|
84
|
+
}
|
|
77
85
|
}
|
|
78
86
|
if (config.getDebugMode()) {
|
|
79
87
|
if (sessionToDelete.sessionInfo === null) {
|