@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
|
@@ -3,99 +3,50 @@
|
|
|
3
3
|
* Copyright 2026 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import {
|
|
6
|
+
import { enableFeature, disableFeature, } from './featureToggleUtils.js';
|
|
7
|
+
const skillStrategy = {
|
|
8
|
+
needsEnabling: (settings, scope, skillName) => {
|
|
9
|
+
const scopeDisabled = settings.forScope(scope).settings.skills?.disabled;
|
|
10
|
+
return !!scopeDisabled?.includes(skillName);
|
|
11
|
+
},
|
|
12
|
+
enable: (settings, scope, skillName) => {
|
|
13
|
+
const currentScopeDisabled = settings.forScope(scope).settings.skills?.disabled ?? [];
|
|
14
|
+
const newDisabled = currentScopeDisabled.filter((name) => name !== skillName);
|
|
15
|
+
settings.setValue(scope, 'skills.disabled', newDisabled);
|
|
16
|
+
},
|
|
17
|
+
isExplicitlyDisabled: (settings, scope, skillName) => {
|
|
18
|
+
const currentScopeDisabled = settings.forScope(scope).settings.skills?.disabled ?? [];
|
|
19
|
+
return currentScopeDisabled.includes(skillName);
|
|
20
|
+
},
|
|
21
|
+
disable: (settings, scope, skillName) => {
|
|
22
|
+
const currentScopeDisabled = settings.forScope(scope).settings.skills?.disabled ?? [];
|
|
23
|
+
// The generic utility checks isExplicitlyDisabled before calling this,
|
|
24
|
+
// but just to be safe and idempotent, we check or we assume the utility did its job.
|
|
25
|
+
// The utility does check isExplicitlyDisabled first.
|
|
26
|
+
// So we can blindly add it, but since we are modifying an array, pushing is fine.
|
|
27
|
+
// However, if we assume purely that we must disable it:
|
|
28
|
+
const newDisabled = [...currentScopeDisabled, skillName];
|
|
29
|
+
settings.setValue(scope, 'skills.disabled', newDisabled);
|
|
30
|
+
},
|
|
31
|
+
};
|
|
7
32
|
/**
|
|
8
33
|
* Enables a skill by removing it from all writable disabled lists (User and Workspace).
|
|
9
34
|
*/
|
|
10
35
|
export function enableSkill(settings, skillName) {
|
|
11
|
-
const
|
|
12
|
-
const foundInDisabledScopes = [];
|
|
13
|
-
const alreadyEnabledScopes = [];
|
|
14
|
-
for (const scope of writableScopes) {
|
|
15
|
-
if (isLoadableSettingScope(scope)) {
|
|
16
|
-
const scopePath = settings.forScope(scope).path;
|
|
17
|
-
const scopeDisabled = settings.forScope(scope).settings.skills?.disabled;
|
|
18
|
-
if (scopeDisabled?.includes(skillName)) {
|
|
19
|
-
foundInDisabledScopes.push({ scope, path: scopePath });
|
|
20
|
-
}
|
|
21
|
-
else {
|
|
22
|
-
alreadyEnabledScopes.push({ scope, path: scopePath });
|
|
23
|
-
}
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
if (foundInDisabledScopes.length === 0) {
|
|
27
|
-
return {
|
|
28
|
-
status: 'no-op',
|
|
29
|
-
skillName,
|
|
30
|
-
action: 'enable',
|
|
31
|
-
modifiedScopes: [],
|
|
32
|
-
alreadyInStateScopes: alreadyEnabledScopes,
|
|
33
|
-
};
|
|
34
|
-
}
|
|
35
|
-
const modifiedScopes = [];
|
|
36
|
-
for (const { scope, path } of foundInDisabledScopes) {
|
|
37
|
-
if (isLoadableSettingScope(scope)) {
|
|
38
|
-
const currentScopeDisabled = settings.forScope(scope).settings.skills?.disabled ?? [];
|
|
39
|
-
const newDisabled = currentScopeDisabled.filter((name) => name !== skillName);
|
|
40
|
-
settings.setValue(scope, 'skills.disabled', newDisabled);
|
|
41
|
-
modifiedScopes.push({ scope, path });
|
|
42
|
-
}
|
|
43
|
-
}
|
|
36
|
+
const { featureName, ...rest } = enableFeature(settings, skillName, skillStrategy);
|
|
44
37
|
return {
|
|
45
|
-
|
|
46
|
-
skillName,
|
|
47
|
-
action: 'enable',
|
|
48
|
-
modifiedScopes,
|
|
49
|
-
alreadyInStateScopes: alreadyEnabledScopes,
|
|
38
|
+
...rest,
|
|
39
|
+
skillName: featureName,
|
|
50
40
|
};
|
|
51
41
|
}
|
|
52
42
|
/**
|
|
53
43
|
* Disables a skill by adding it to the disabled list in the specified scope.
|
|
54
44
|
*/
|
|
55
45
|
export function disableSkill(settings, skillName, scope) {
|
|
56
|
-
|
|
57
|
-
return {
|
|
58
|
-
status: 'error',
|
|
59
|
-
skillName,
|
|
60
|
-
action: 'disable',
|
|
61
|
-
modifiedScopes: [],
|
|
62
|
-
alreadyInStateScopes: [],
|
|
63
|
-
error: `Invalid settings scope: ${scope}`,
|
|
64
|
-
};
|
|
65
|
-
}
|
|
66
|
-
const scopePath = settings.forScope(scope).path;
|
|
67
|
-
const currentScopeDisabled = settings.forScope(scope).settings.skills?.disabled ?? [];
|
|
68
|
-
if (currentScopeDisabled.includes(skillName)) {
|
|
69
|
-
return {
|
|
70
|
-
status: 'no-op',
|
|
71
|
-
skillName,
|
|
72
|
-
action: 'disable',
|
|
73
|
-
modifiedScopes: [],
|
|
74
|
-
alreadyInStateScopes: [{ scope, path: scopePath }],
|
|
75
|
-
};
|
|
76
|
-
}
|
|
77
|
-
// Check if it's already disabled in the other writable scope
|
|
78
|
-
const otherScope = scope === SettingScope.Workspace
|
|
79
|
-
? SettingScope.User
|
|
80
|
-
: SettingScope.Workspace;
|
|
81
|
-
const alreadyDisabledInOther = [];
|
|
82
|
-
if (isLoadableSettingScope(otherScope)) {
|
|
83
|
-
const otherScopeDisabled = settings.forScope(otherScope).settings.skills?.disabled;
|
|
84
|
-
if (otherScopeDisabled?.includes(skillName)) {
|
|
85
|
-
alreadyDisabledInOther.push({
|
|
86
|
-
scope: otherScope,
|
|
87
|
-
path: settings.forScope(otherScope).path,
|
|
88
|
-
});
|
|
89
|
-
}
|
|
90
|
-
}
|
|
91
|
-
const newDisabled = [...currentScopeDisabled, skillName];
|
|
92
|
-
settings.setValue(scope, 'skills.disabled', newDisabled);
|
|
46
|
+
const { featureName, ...rest } = disableFeature(settings, skillName, scope, skillStrategy);
|
|
93
47
|
return {
|
|
94
|
-
|
|
95
|
-
skillName,
|
|
96
|
-
action: 'disable',
|
|
97
|
-
modifiedScopes: [{ scope, path: scopePath }],
|
|
98
|
-
alreadyInStateScopes: alreadyDisabledInOther,
|
|
48
|
+
...rest,
|
|
49
|
+
skillName: featureName,
|
|
99
50
|
};
|
|
100
51
|
}
|
|
101
52
|
//# sourceMappingURL=skillSettings.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skillSettings.js","sourceRoot":"","sources":["../../../src/utils/skillSettings.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"skillSettings.js","sourceRoot":"","sources":["../../../src/utils/skillSettings.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAGL,aAAa,EACb,cAAc,GACf,MAAM,yBAAyB,CAAC;AAcjC,MAAM,aAAa,GAA0B;IAC3C,aAAa,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE;QAC5C,MAAM,aAAa,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC;QACzE,OAAO,CAAC,CAAC,aAAa,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;IAC9C,CAAC;IACD,MAAM,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE;QACrC,MAAM,oBAAoB,GACxB,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,IAAI,EAAE,CAAC;QAC3D,MAAM,WAAW,GAAG,oBAAoB,CAAC,MAAM,CAC7C,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,SAAS,CAC7B,CAAC;QACF,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,iBAAiB,EAAE,WAAW,CAAC,CAAC;IAC3D,CAAC;IACD,oBAAoB,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE;QACnD,MAAM,oBAAoB,GACxB,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,IAAI,EAAE,CAAC;QAC3D,OAAO,oBAAoB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAClD,CAAC;IACD,OAAO,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE;QACtC,MAAM,oBAAoB,GACxB,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,IAAI,EAAE,CAAC;QAC3D,uEAAuE;QACvE,qFAAqF;QACrF,qDAAqD;QACrD,kFAAkF;QAClF,wDAAwD;QACxD,MAAM,WAAW,GAAG,CAAC,GAAG,oBAAoB,EAAE,SAAS,CAAC,CAAC;QACzD,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,iBAAiB,EAAE,WAAW,CAAC,CAAC;IAC3D,CAAC;CACF,CAAC;AAEF;;GAEG;AACH,MAAM,UAAU,WAAW,CACzB,QAAwB,EACxB,SAAiB;IAEjB,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,EAAE,GAAG,aAAa,CAC5C,QAAQ,EACR,SAAS,EACT,aAAa,CACd,CAAC;IACF,OAAO;QACL,GAAG,IAAI;QACP,SAAS,EAAE,WAAW;KACvB,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,YAAY,CAC1B,QAAwB,EACxB,SAAiB,EACjB,KAAmB;IAEnB,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,EAAE,GAAG,cAAc,CAC7C,QAAQ,EACR,SAAS,EACT,KAAK,EACL,aAAa,CACd,CAAC;IACF,OAAO;QACL,GAAG,IAAI;QACP,SAAS,EAAE,WAAW;KACvB,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,142 @@
|
|
|
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 { SettingScope, } from '../config/settings.js';
|
|
8
|
+
import { enableSkill, disableSkill } from './skillSettings.js';
|
|
9
|
+
function createMockLoadedSettings(opts) {
|
|
10
|
+
const scopes = {
|
|
11
|
+
[SettingScope.User]: {
|
|
12
|
+
settings: opts.userSettings ?? {},
|
|
13
|
+
originalSettings: opts.userSettings ?? {},
|
|
14
|
+
path: opts.userPath ?? '/home/user/.gemini/settings.json',
|
|
15
|
+
},
|
|
16
|
+
[SettingScope.Workspace]: {
|
|
17
|
+
settings: opts.workspaceSettings ?? {},
|
|
18
|
+
originalSettings: opts.workspaceSettings ?? {},
|
|
19
|
+
path: opts.workspacePath ?? '/project/.gemini/settings.json',
|
|
20
|
+
},
|
|
21
|
+
};
|
|
22
|
+
return {
|
|
23
|
+
forScope: vi.fn((scope) => scopes[scope]),
|
|
24
|
+
setValue: vi.fn(),
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
describe('skillSettings', () => {
|
|
28
|
+
describe('skillStrategy (via enableSkill / disableSkill)', () => {
|
|
29
|
+
describe('enableSkill', () => {
|
|
30
|
+
it('should return no-op when the skill is not in any disabled list', () => {
|
|
31
|
+
const settings = createMockLoadedSettings({
|
|
32
|
+
userSettings: { skills: { disabled: [] } },
|
|
33
|
+
workspaceSettings: { skills: { disabled: [] } },
|
|
34
|
+
});
|
|
35
|
+
const result = enableSkill(settings, 'my-skill');
|
|
36
|
+
expect(result.status).toBe('no-op');
|
|
37
|
+
expect(result.action).toBe('enable');
|
|
38
|
+
expect(result.skillName).toBe('my-skill');
|
|
39
|
+
expect(result.modifiedScopes).toHaveLength(0);
|
|
40
|
+
expect(settings.setValue).not.toHaveBeenCalled();
|
|
41
|
+
});
|
|
42
|
+
it('should return no-op when skills.disabled is undefined', () => {
|
|
43
|
+
const settings = createMockLoadedSettings({
|
|
44
|
+
userSettings: {},
|
|
45
|
+
workspaceSettings: {},
|
|
46
|
+
});
|
|
47
|
+
const result = enableSkill(settings, 'my-skill');
|
|
48
|
+
expect(result.status).toBe('no-op');
|
|
49
|
+
expect(result.action).toBe('enable');
|
|
50
|
+
expect(result.modifiedScopes).toHaveLength(0);
|
|
51
|
+
});
|
|
52
|
+
it('should enable the skill when it is in the disabled list of one scope', () => {
|
|
53
|
+
const settings = createMockLoadedSettings({
|
|
54
|
+
userSettings: { skills: { disabled: ['my-skill'] } },
|
|
55
|
+
workspaceSettings: { skills: { disabled: [] } },
|
|
56
|
+
});
|
|
57
|
+
const result = enableSkill(settings, 'my-skill');
|
|
58
|
+
expect(result.status).toBe('success');
|
|
59
|
+
expect(result.action).toBe('enable');
|
|
60
|
+
expect(result.modifiedScopes).toHaveLength(1);
|
|
61
|
+
expect(result.modifiedScopes[0].scope).toBe(SettingScope.User);
|
|
62
|
+
expect(result.alreadyInStateScopes).toHaveLength(1);
|
|
63
|
+
expect(result.alreadyInStateScopes[0].scope).toBe(SettingScope.Workspace);
|
|
64
|
+
expect(settings.setValue).toHaveBeenCalledTimes(1);
|
|
65
|
+
});
|
|
66
|
+
it('should enable the skill when it is in the disabled list of both scopes', () => {
|
|
67
|
+
const settings = createMockLoadedSettings({
|
|
68
|
+
userSettings: { skills: { disabled: ['my-skill', 'other-skill'] } },
|
|
69
|
+
workspaceSettings: { skills: { disabled: ['my-skill'] } },
|
|
70
|
+
});
|
|
71
|
+
const result = enableSkill(settings, 'my-skill');
|
|
72
|
+
expect(result.status).toBe('success');
|
|
73
|
+
expect(result.modifiedScopes).toHaveLength(2);
|
|
74
|
+
expect(result.alreadyInStateScopes).toHaveLength(0);
|
|
75
|
+
expect(settings.setValue).toHaveBeenCalledTimes(2);
|
|
76
|
+
});
|
|
77
|
+
it('should not affect other skills in the disabled list', () => {
|
|
78
|
+
const settings = createMockLoadedSettings({
|
|
79
|
+
userSettings: { skills: { disabled: ['my-skill', 'keep-disabled'] } },
|
|
80
|
+
workspaceSettings: { skills: { disabled: [] } },
|
|
81
|
+
});
|
|
82
|
+
const result = enableSkill(settings, 'my-skill');
|
|
83
|
+
expect(result.status).toBe('success');
|
|
84
|
+
expect(settings.setValue).toHaveBeenCalledTimes(1);
|
|
85
|
+
});
|
|
86
|
+
});
|
|
87
|
+
describe('disableSkill', () => {
|
|
88
|
+
it('should return no-op when the skill is already in the disabled list', () => {
|
|
89
|
+
const settings = createMockLoadedSettings({
|
|
90
|
+
userSettings: { skills: { disabled: ['my-skill'] } },
|
|
91
|
+
});
|
|
92
|
+
const result = disableSkill(settings, 'my-skill', SettingScope.User);
|
|
93
|
+
expect(result.status).toBe('no-op');
|
|
94
|
+
expect(result.action).toBe('disable');
|
|
95
|
+
expect(result.skillName).toBe('my-skill');
|
|
96
|
+
expect(result.modifiedScopes).toHaveLength(0);
|
|
97
|
+
expect(result.alreadyInStateScopes).toHaveLength(1);
|
|
98
|
+
expect(settings.setValue).not.toHaveBeenCalled();
|
|
99
|
+
});
|
|
100
|
+
it('should disable the skill when it is not in the disabled list', () => {
|
|
101
|
+
const settings = createMockLoadedSettings({
|
|
102
|
+
userSettings: { skills: { disabled: [] } },
|
|
103
|
+
});
|
|
104
|
+
const result = disableSkill(settings, 'my-skill', SettingScope.User);
|
|
105
|
+
expect(result.status).toBe('success');
|
|
106
|
+
expect(result.action).toBe('disable');
|
|
107
|
+
expect(result.modifiedScopes).toHaveLength(1);
|
|
108
|
+
expect(result.modifiedScopes[0].scope).toBe(SettingScope.User);
|
|
109
|
+
expect(settings.setValue).toHaveBeenCalledTimes(1);
|
|
110
|
+
});
|
|
111
|
+
it('should disable the skill when skills.disabled is undefined', () => {
|
|
112
|
+
const settings = createMockLoadedSettings({
|
|
113
|
+
userSettings: {},
|
|
114
|
+
});
|
|
115
|
+
const result = disableSkill(settings, 'my-skill', SettingScope.User);
|
|
116
|
+
expect(result.status).toBe('success');
|
|
117
|
+
expect(result.action).toBe('disable');
|
|
118
|
+
expect(result.modifiedScopes).toHaveLength(1);
|
|
119
|
+
expect(settings.setValue).toHaveBeenCalledTimes(1);
|
|
120
|
+
});
|
|
121
|
+
it('should return error for an invalid scope', () => {
|
|
122
|
+
const settings = createMockLoadedSettings({});
|
|
123
|
+
const result = disableSkill(settings, 'my-skill', SettingScope.Session);
|
|
124
|
+
expect(result.status).toBe('error');
|
|
125
|
+
expect(result.error).toContain('Invalid settings scope');
|
|
126
|
+
});
|
|
127
|
+
it('should disable in workspace and report user as already disabled', () => {
|
|
128
|
+
const settings = createMockLoadedSettings({
|
|
129
|
+
userSettings: { skills: { disabled: ['my-skill'] } },
|
|
130
|
+
workspaceSettings: { skills: { disabled: [] } },
|
|
131
|
+
});
|
|
132
|
+
const result = disableSkill(settings, 'my-skill', SettingScope.Workspace);
|
|
133
|
+
expect(result.status).toBe('success');
|
|
134
|
+
expect(result.modifiedScopes).toHaveLength(1);
|
|
135
|
+
expect(result.modifiedScopes[0].scope).toBe(SettingScope.Workspace);
|
|
136
|
+
expect(result.alreadyInStateScopes).toHaveLength(1);
|
|
137
|
+
expect(result.alreadyInStateScopes[0].scope).toBe(SettingScope.User);
|
|
138
|
+
});
|
|
139
|
+
});
|
|
140
|
+
});
|
|
141
|
+
});
|
|
142
|
+
//# sourceMappingURL=skillSettings.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"skillSettings.test.js","sourceRoot":"","sources":["../../../src/utils/skillSettings.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,6 +68,10 @@ describe('GeminiAgent Session Resume', () => {
|
|
|
68
68
|
},
|
|
69
69
|
getApprovalMode: vi.fn().mockReturnValue('default'),
|
|
70
70
|
isPlanEnabled: vi.fn().mockReturnValue(false),
|
|
71
|
+
getModel: vi.fn().mockReturnValue('gemini-pro'),
|
|
72
|
+
getHasAccessToPreviewModel: vi.fn().mockReturnValue(false),
|
|
73
|
+
getGemini31LaunchedSync: vi.fn().mockReturnValue(false),
|
|
74
|
+
getCheckpointingEnabled: vi.fn().mockReturnValue(false),
|
|
71
75
|
};
|
|
72
76
|
mockSettings = {
|
|
73
77
|
merged: {
|
|
@@ -167,6 +171,10 @@ describe('GeminiAgent Session Resume', () => {
|
|
|
167
171
|
],
|
|
168
172
|
currentModeId: ApprovalMode.DEFAULT,
|
|
169
173
|
},
|
|
174
|
+
models: {
|
|
175
|
+
availableModels: expect.any(Array),
|
|
176
|
+
currentModelId: 'gemini-pro',
|
|
177
|
+
},
|
|
170
178
|
});
|
|
171
179
|
// Verify resumeChat received the correct arguments
|
|
172
180
|
expect(mockConfig.getGeminiClient().resumeChat).toHaveBeenCalledWith(mockClientHistory, expect.objectContaining({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"acpResume.test.js","sourceRoot":"","sources":["../../../src/zed-integration/acpResume.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"acpResume.test.js","sourceRoot":"","sources":["../../../src/zed-integration/acpResume.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import type { CommandContext } from './commands/types.js';
|
|
7
|
+
export declare class CommandHandler {
|
|
8
|
+
private registry;
|
|
9
|
+
constructor();
|
|
10
|
+
private static createRegistry;
|
|
11
|
+
getAvailableCommands(): Array<{
|
|
12
|
+
name: string;
|
|
13
|
+
description: string;
|
|
14
|
+
}>;
|
|
15
|
+
/**
|
|
16
|
+
* Parses and executes a command string if it matches a registered command.
|
|
17
|
+
* Returns true if a command was handled, false otherwise.
|
|
18
|
+
*/
|
|
19
|
+
handleCommand(commandText: string, context: CommandContext): Promise<boolean>;
|
|
20
|
+
private runCommand;
|
|
21
|
+
/**
|
|
22
|
+
* Parses a raw slash command string into its matching headless command and arguments.
|
|
23
|
+
* Mirrors `packages/cli/src/utils/commands.ts` logic.
|
|
24
|
+
*/
|
|
25
|
+
private parseSlashCommand;
|
|
26
|
+
}
|
|
@@ -0,0 +1,102 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { CommandRegistry } from './commands/commandRegistry.js';
|
|
7
|
+
import { MemoryCommand } from './commands/memory.js';
|
|
8
|
+
import { ExtensionsCommand } from './commands/extensions.js';
|
|
9
|
+
import { InitCommand } from './commands/init.js';
|
|
10
|
+
import { RestoreCommand } from './commands/restore.js';
|
|
11
|
+
export class CommandHandler {
|
|
12
|
+
registry;
|
|
13
|
+
constructor() {
|
|
14
|
+
this.registry = CommandHandler.createRegistry();
|
|
15
|
+
}
|
|
16
|
+
static createRegistry() {
|
|
17
|
+
const registry = new CommandRegistry();
|
|
18
|
+
registry.register(new MemoryCommand());
|
|
19
|
+
registry.register(new ExtensionsCommand());
|
|
20
|
+
registry.register(new InitCommand());
|
|
21
|
+
registry.register(new RestoreCommand());
|
|
22
|
+
return registry;
|
|
23
|
+
}
|
|
24
|
+
getAvailableCommands() {
|
|
25
|
+
return this.registry.getAllCommands().map((cmd) => ({
|
|
26
|
+
name: cmd.name,
|
|
27
|
+
description: cmd.description,
|
|
28
|
+
}));
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* Parses and executes a command string if it matches a registered command.
|
|
32
|
+
* Returns true if a command was handled, false otherwise.
|
|
33
|
+
*/
|
|
34
|
+
async handleCommand(commandText, context) {
|
|
35
|
+
const { commandToExecute, args } = this.parseSlashCommand(commandText);
|
|
36
|
+
if (commandToExecute) {
|
|
37
|
+
await this.runCommand(commandToExecute, args, context);
|
|
38
|
+
return true;
|
|
39
|
+
}
|
|
40
|
+
return false;
|
|
41
|
+
}
|
|
42
|
+
async runCommand(commandToExecute, args, context) {
|
|
43
|
+
try {
|
|
44
|
+
const result = await commandToExecute.execute(context, args ? args.split(/\s+/) : []);
|
|
45
|
+
let messageContent = '';
|
|
46
|
+
if (typeof result.data === 'string') {
|
|
47
|
+
messageContent = result.data;
|
|
48
|
+
}
|
|
49
|
+
else if (typeof result.data === 'object' &&
|
|
50
|
+
result.data !== null &&
|
|
51
|
+
'content' in result.data) {
|
|
52
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion, @typescript-eslint/no-explicit-any
|
|
53
|
+
messageContent = result.data['content'];
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
messageContent = JSON.stringify(result.data, null, 2);
|
|
57
|
+
}
|
|
58
|
+
await context.sendMessage(messageContent);
|
|
59
|
+
}
|
|
60
|
+
catch (error) {
|
|
61
|
+
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
62
|
+
await context.sendMessage(`Error: ${errorMessage}`);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
/**
|
|
66
|
+
* Parses a raw slash command string into its matching headless command and arguments.
|
|
67
|
+
* Mirrors `packages/cli/src/utils/commands.ts` logic.
|
|
68
|
+
*/
|
|
69
|
+
parseSlashCommand(query) {
|
|
70
|
+
const trimmed = query.trim();
|
|
71
|
+
const parts = trimmed.substring(1).trim().split(/\s+/);
|
|
72
|
+
const commandPath = parts.filter((p) => p);
|
|
73
|
+
let currentCommands = this.registry.getAllCommands();
|
|
74
|
+
let commandToExecute;
|
|
75
|
+
let pathIndex = 0;
|
|
76
|
+
for (const part of commandPath) {
|
|
77
|
+
const foundCommand = currentCommands.find((cmd) => {
|
|
78
|
+
const expectedName = commandPath.slice(0, pathIndex + 1).join(' ');
|
|
79
|
+
return (cmd.name === part ||
|
|
80
|
+
cmd.name === expectedName ||
|
|
81
|
+
cmd.aliases?.includes(part) ||
|
|
82
|
+
cmd.aliases?.includes(expectedName));
|
|
83
|
+
});
|
|
84
|
+
if (foundCommand) {
|
|
85
|
+
commandToExecute = foundCommand;
|
|
86
|
+
pathIndex++;
|
|
87
|
+
if (foundCommand.subCommands) {
|
|
88
|
+
currentCommands = foundCommand.subCommands;
|
|
89
|
+
}
|
|
90
|
+
else {
|
|
91
|
+
break;
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
else {
|
|
95
|
+
break;
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
const args = parts.slice(pathIndex).join(' ');
|
|
99
|
+
return { commandToExecute, args };
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
//# sourceMappingURL=commandHandler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"commandHandler.js","sourceRoot":"","sources":["../../../src/zed-integration/commandHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2026 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { CommandHandler } from './commandHandler.js';
|
|
7
|
+
import { describe, it, expect } from 'vitest';
|
|
8
|
+
describe('CommandHandler', () => {
|
|
9
|
+
it('parses commands correctly', () => {
|
|
10
|
+
const handler = new CommandHandler();
|
|
11
|
+
// @ts-expect-error - testing private method
|
|
12
|
+
const parse = (query) => handler.parseSlashCommand(query);
|
|
13
|
+
const memShow = parse('/memory show');
|
|
14
|
+
expect(memShow.commandToExecute?.name).toBe('memory show');
|
|
15
|
+
expect(memShow.args).toBe('');
|
|
16
|
+
const memAdd = parse('/memory add hello world');
|
|
17
|
+
expect(memAdd.commandToExecute?.name).toBe('memory add');
|
|
18
|
+
expect(memAdd.args).toBe('hello world');
|
|
19
|
+
const extList = parse('/extensions list');
|
|
20
|
+
expect(extList.commandToExecute?.name).toBe('extensions list');
|
|
21
|
+
const init = parse('/init');
|
|
22
|
+
expect(init.commandToExecute?.name).toBe('init');
|
|
23
|
+
});
|
|
24
|
+
});
|
|
25
|
+
//# sourceMappingURL=commandHandler.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"commandHandler.test.js","sourceRoot":"","sources":["../../../src/zed-integration/commandHandler.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE9C,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACnC,MAAM,OAAO,GAAG,IAAI,cAAc,EAAE,CAAC;QACrC,4CAA4C;QAC5C,MAAM,KAAK,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAElE,MAAM,OAAO,GAAG,KAAK,CAAC,cAAc,CAAC,CAAC;QACtC,MAAM,CAAC,OAAO,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC3D,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE9B,MAAM,MAAM,GAAG,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAChD,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACzD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAExC,MAAM,OAAO,GAAG,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAC1C,MAAM,CAAC,OAAO,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAE/D,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5B,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import type { Command } from './types.js';
|
|
7
|
+
export declare class CommandRegistry {
|
|
8
|
+
private readonly commands;
|
|
9
|
+
register(command: Command): void;
|
|
10
|
+
get(commandName: string): Command | undefined;
|
|
11
|
+
getAllCommands(): Command[];
|
|
12
|
+
}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { debugLogger } from '@google/gemini-cli-core';
|
|
7
|
+
export class CommandRegistry {
|
|
8
|
+
commands = new Map();
|
|
9
|
+
register(command) {
|
|
10
|
+
if (this.commands.has(command.name)) {
|
|
11
|
+
debugLogger.warn(`Command ${command.name} already registered. Skipping.`);
|
|
12
|
+
return;
|
|
13
|
+
}
|
|
14
|
+
this.commands.set(command.name, command);
|
|
15
|
+
for (const subCommand of command.subCommands ?? []) {
|
|
16
|
+
this.register(subCommand);
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
get(commandName) {
|
|
20
|
+
return this.commands.get(commandName);
|
|
21
|
+
}
|
|
22
|
+
getAllCommands() {
|
|
23
|
+
return [...this.commands.values()];
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=commandRegistry.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"commandRegistry.js","sourceRoot":"","sources":["../../../../src/zed-integration/commands/commandRegistry.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGtD,MAAM,OAAO,eAAe;IACT,QAAQ,GAAG,IAAI,GAAG,EAAmB,CAAC;IAEvD,QAAQ,CAAC,OAAgB;QACvB,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACpC,WAAW,CAAC,IAAI,CAAC,WAAW,OAAO,CAAC,IAAI,gCAAgC,CAAC,CAAC;YAC1E,OAAO;QACT,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEzC,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,WAAW,IAAI,EAAE,EAAE,CAAC;YACnD,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC;IAED,GAAG,CAAC,WAAmB;QACrB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACxC,CAAC;IAED,cAAc;QACZ,OAAO,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IACrC,CAAC;CACF"}
|