MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-03-21 11:30:38 -07:00
Code Issues Packages Projects Releases Wiki Activity

feat(core): unify agent enabled and disabled flags (#17127)

Browse Source
This commit is contained in:
Sandy Tao
2026-01-20 13:00:43 -08:00
committed by GitHub
parent f42b4c80ac
commit f0f705d3ca
8 changed files with 25 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/cli/src/config/settingsSchema.ts
View File

@@ -2117,10 +2117,6 @@ export const SETTINGS_SCHEMA_DEFINITIONS: Record<
type: 'boolean',
description: 'Whether to enable the agent.',
},
disabled: {
type: 'boolean',
description: 'Whether to disable the agent.',
},
},
},
CustomTheme: {

4
packages/cli/src/ui/commands/agentsCommand.test.ts
View File

@@ -149,7 +149,7 @@ describe('agentsCommand', () => {
});
// Add agent to disabled overrides so validation passes
mockContext.services.settings.merged.agents.overrides['test-agent'] = {
disabled: true,
enabled: false,
};
vi.mocked(enableAgent).mockReturnValue({
@@ -264,7 +264,7 @@ describe('agentsCommand', () => {
it('should show info message if agent is already disabled', async () => {
mockConfig.getAgentRegistry().getAllAgentNames.mockReturnValue([]);
mockContext.services.settings.merged.agents.overrides['test-agent'] = {
disabled: true,
enabled: false,
};
const disableCommand = agentsCommand.subCommands?.find(

10
packages/cli/src/ui/commands/agentsCommand.ts
View File

@@ -85,10 +85,10 @@ async function enableAction(
const allAgents = agentRegistry.getAllAgentNames();
const overrides = settings.merged.agents.overrides;
const disabledAgents = Object.keys(overrides).filter(
(name) => overrides[name]?.disabled === true,
(name) => overrides[name]?.enabled === false,
);
if (allAgents.includes(agentName)) {
if (allAgents.includes(agentName) && !disabledAgents.includes(agentName)) {
return {
type: 'message',
messageType: 'info',
@@ -96,7 +96,7 @@ async function enableAction(
};
}
if (!disabledAgents.includes(agentName)) {
if (!disabledAgents.includes(agentName) && !allAgents.includes(agentName)) {
return {
type: 'message',
messageType: 'error',
@@ -155,7 +155,7 @@ async function disableAction(
const allAgents = agentRegistry.getAllAgentNames();
const overrides = settings.merged.agents.overrides;
const disabledAgents = Object.keys(overrides).filter(
(name) => overrides[name]?.disabled === true,
(name) => overrides[name]?.enabled === false,
);
if (disabledAgents.includes(agentName)) {
@@ -206,7 +206,7 @@ function completeAgentsToEnable(context: CommandContext, partialArg: string) {
const overrides = settings.merged.agents.overrides;
const disabledAgents = Object.entries(overrides)
.filter(([_, override]) => override?.disabled === true)
.filter(([_, override]) => override?.enabled === false)
.map(([name]) => name);
return disabledAgents.filter((name) => name.startsWith(partialArg));

23
packages/cli/src/utils/agentSettings.ts
View File

@@ -29,8 +29,8 @@ export interface AgentActionResult {
}
/**
* Enables an agent by ensuring it is not disabled in any writable scope (User and Workspace).
* It sets `agents.overrides.<agentName>.disabled` to `false` if it was found to be `true`.
* Enables an agent by ensuring it is enabled in any writable scope (User and Workspace).
* It sets `agents.overrides.<agentName>.enabled` to `true`.
*/
export function enableAgent(
settings: LoadedSettings,
@@ -45,9 +45,9 @@ export function enableAgent(
const scopePath = settings.forScope(scope).path;
const agentOverrides =
settings.forScope(scope).settings.agents?.overrides;
const isDisabled = agentOverrides?.[agentName]?.disabled === true;
const isEnabled = agentOverrides?.[agentName]?.enabled === true;
if (isDisabled) {
if (!isEnabled) {
foundInDisabledScopes.push({ scope, path: scopePath });
} else {
alreadyEnabledScopes.push({ scope, path: scopePath });
@@ -68,9 +68,8 @@ export function enableAgent(
const modifiedScopes: ModifiedScope[] = [];
for (const { scope, path } of foundInDisabledScopes) {
if (isLoadableSettingScope(scope)) {
// Explicitly enable it to override any lower-precedence disables, or just clear the disable.
// Setting to false ensures it is enabled.
settings.setValue(scope, `agents.overrides.${agentName}.disabled`, false);
// Explicitly enable it.
settings.setValue(scope, `agents.overrides.${agentName}.enabled`, true);
modifiedScopes.push({ scope, path });
}
}
@@ -85,7 +84,7 @@ export function enableAgent(
}
/**
* Disables an agent by setting `agents.overrides.<agentName>.disabled` to `true` in the specified scope.
* Disables an agent by setting `agents.overrides.<agentName>.enabled` to `false` in the specified scope.
*/
export function disableAgent(
settings: LoadedSettings,
@@ -105,9 +104,9 @@ export function disableAgent(
const scopePath = settings.forScope(scope).path;
const agentOverrides = settings.forScope(scope).settings.agents?.overrides;
const isDisabled = agentOverrides?.[agentName]?.disabled === true;
const isEnabled = agentOverrides?.[agentName]?.enabled !== false;
if (isDisabled) {
if (!isEnabled) {
return {
status: 'no-op',
agentName,
@@ -127,7 +126,7 @@ export function disableAgent(
if (isLoadableSettingScope(otherScope)) {
const otherOverrides =
settings.forScope(otherScope).settings.agents?.overrides;
if (otherOverrides?.[agentName]?.disabled === true) {
if (otherOverrides?.[agentName]?.enabled === false) {
alreadyDisabledInOther.push({
scope: otherScope,
path: settings.forScope(otherScope).path,
@@ -135,7 +134,7 @@ export function disableAgent(
}
}
settings.setValue(scope, `agents.overrides.${agentName}.disabled`, true);
settings.setValue(scope, `agents.overrides.${agentName}.enabled`, false);
return {
status: 'success',