Enable & disable agents (#16225)

packages/cli/src/ui/commands/agentsCommand.test.ts

@@ -7,8 +7,20 @@
 import { vi, describe, it, expect, beforeEach } from 'vitest';
 import { agentsCommand } from './agentsCommand.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import type { Config } from '@google/gemini-cli-core';
+import type { Config, AgentOverride } from '@google/gemini-cli-core';
+import type { LoadedSettings } from '../../config/settings.js';
 import { MessageType } from '../types.js';
+import { enableAgent, disableAgent } from '../../utils/agentSettings.js';
+import { renderAgentActionFeedback } from '../../utils/agentUtils.js';
+
+vi.mock('../../utils/agentSettings.js', () => ({
+  enableAgent: vi.fn(),
+  disableAgent: vi.fn(),
+}));
+
+vi.mock('../../utils/agentUtils.js', () => ({
+  renderAgentActionFeedback: vi.fn(),
+}));
 
 describe('agentsCommand', () => {
   let mockContext: ReturnType<typeof createMockCommandContext>;
@@ -22,12 +34,18 @@ describe('agentsCommand', () => {
     mockConfig = {
       getAgentRegistry: vi.fn().mockReturnValue({
         getAllDefinitions: vi.fn().mockReturnValue([]),
+        getAllAgentNames: vi.fn().mockReturnValue([]),
+        reload: vi.fn(),
       }),
     };
 
     mockContext = createMockCommandContext({
       services: {
         config: mockConfig as unknown as Config,
+        settings: {
+          workspace: { path: '/mock/path' },
+          merged: { agents: { overrides: {} } },
+        } as unknown as LoadedSettings,
       },
     });
   });
@@ -68,7 +86,12 @@ describe('agentsCommand', () => {
         description: 'desc1',
         kind: 'local',
       },
-      { name: 'agent2', description: 'desc2', kind: 'remote' },
+      {
+        name: 'agent2',
+        displayName: undefined,
+        description: 'desc2',
+        kind: 'remote',
+      },
     ];
     mockConfig.getAgentRegistry().getAllDefinitions.mockReturnValue(mockAgents);
 
@@ -117,4 +140,178 @@ describe('agentsCommand', () => {
       content: 'Agent registry not found.',
     });
   });
+
+  it('should enable an agent successfully', async () => {
+    const reloadSpy = vi.fn().mockResolvedValue(undefined);
+    mockConfig.getAgentRegistry = vi.fn().mockReturnValue({
+      getAllAgentNames: vi.fn().mockReturnValue([]),
+      reload: reloadSpy,
+    });
+    // Add agent to disabled overrides so validation passes
+    (
+      mockContext.services.settings.merged.agents!.overrides as Record<
+        string,
+        AgentOverride
+      >
+    )['test-agent'] = { disabled: true };
+
+    vi.mocked(enableAgent).mockReturnValue({
+      status: 'success',
+      agentName: 'test-agent',
+      action: 'enable',
+      modifiedScopes: [],
+      alreadyInStateScopes: [],
+    });
+    vi.mocked(renderAgentActionFeedback).mockReturnValue('Enabled test-agent.');
+
+    const enableCommand = agentsCommand.subCommands?.find(
+      (cmd) => cmd.name === 'enable',
+    );
+    expect(enableCommand).toBeDefined();
+
+    const result = await enableCommand!.action!(mockContext, 'test-agent');
+
+    expect(enableAgent).toHaveBeenCalledWith(
+      mockContext.services.settings,
+      'test-agent',
+    );
+    expect(reloadSpy).toHaveBeenCalled();
+    expect(mockContext.ui.addItem).toHaveBeenCalledWith(
+      expect.objectContaining({
+        type: MessageType.INFO,
+        text: 'Enabling test-agent...',
+      }),
+    );
+    expect(result).toEqual({
+      type: 'message',
+      messageType: 'info',
+      content: 'Enabled test-agent.',
+    });
+  });
+
+  it('should handle no-op when enabling an agent', async () => {
+    mockConfig
+      .getAgentRegistry()
+      .getAllAgentNames.mockReturnValue(['test-agent']);
+
+    const enableCommand = agentsCommand.subCommands?.find(
+      (cmd) => cmd.name === 'enable',
+    );
+    const result = await enableCommand!.action!(mockContext, 'test-agent');
+
+    expect(enableAgent).not.toHaveBeenCalled();
+    expect(mockContext.ui.addItem).not.toHaveBeenCalled();
+    expect(result).toEqual({
+      type: 'message',
+      messageType: 'info',
+      content: "Agent 'test-agent' is already enabled.",
+    });
+  });
+
+  it('should show usage error if no agent name provided for enable', async () => {
+    const enableCommand = agentsCommand.subCommands?.find(
+      (cmd) => cmd.name === 'enable',
+    );
+    const result = await enableCommand!.action!(mockContext, '   ');
+
+    expect(result).toEqual({
+      type: 'message',
+      messageType: 'error',
+      content: 'Usage: /agents enable <agent-name>',
+    });
+  });
+
+  it('should disable an agent successfully', async () => {
+    const reloadSpy = vi.fn().mockResolvedValue(undefined);
+    mockConfig.getAgentRegistry = vi.fn().mockReturnValue({
+      getAllAgentNames: vi.fn().mockReturnValue(['test-agent']),
+      reload: reloadSpy,
+    });
+    vi.mocked(disableAgent).mockReturnValue({
+      status: 'success',
+      agentName: 'test-agent',
+      action: 'disable',
+      modifiedScopes: [],
+      alreadyInStateScopes: [],
+    });
+    vi.mocked(renderAgentActionFeedback).mockReturnValue(
+      'Disabled test-agent.',
+    );
+
+    const disableCommand = agentsCommand.subCommands?.find(
+      (cmd) => cmd.name === 'disable',
+    );
+    expect(disableCommand).toBeDefined();
+
+    const result = await disableCommand!.action!(mockContext, 'test-agent');
+
+    expect(disableAgent).toHaveBeenCalledWith(
+      mockContext.services.settings,
+      'test-agent',
+      expect.anything(), // Scope is derived in the command
+    );
+    expect(reloadSpy).toHaveBeenCalled();
+    expect(mockContext.ui.addItem).toHaveBeenCalledWith(
+      expect.objectContaining({
+        type: MessageType.INFO,
+        text: 'Disabling test-agent...',
+      }),
+    );
+    expect(result).toEqual({
+      type: 'message',
+      messageType: 'info',
+      content: 'Disabled test-agent.',
+    });
+  });
+
+  it('should show info message if agent is already disabled', async () => {
+    mockConfig.getAgentRegistry().getAllAgentNames.mockReturnValue([]);
+    (
+      mockContext.services.settings.merged.agents!.overrides as Record<
+        string,
+        AgentOverride
+      >
+    )['test-agent'] = { disabled: true };
+
+    const disableCommand = agentsCommand.subCommands?.find(
+      (cmd) => cmd.name === 'disable',
+    );
+    const result = await disableCommand!.action!(mockContext, 'test-agent');
+
+    expect(disableAgent).not.toHaveBeenCalled();
+    expect(result).toEqual({
+      type: 'message',
+      messageType: 'info',
+      content: "Agent 'test-agent' is already disabled.",
+    });
+  });
+
+  it('should show error if agent is not found when disabling', async () => {
+    mockConfig.getAgentRegistry().getAllAgentNames.mockReturnValue([]);
+
+    const disableCommand = agentsCommand.subCommands?.find(
+      (cmd) => cmd.name === 'disable',
+    );
+    const result = await disableCommand!.action!(mockContext, 'test-agent');
+
+    expect(disableAgent).not.toHaveBeenCalled();
+    expect(result).toEqual({
+      type: 'message',
+      messageType: 'error',
+      content: "Agent 'test-agent' not found.",
+    });
+  });
+
+  it('should show usage error if no agent name provided for disable', async () => {
+    const disableCommand = agentsCommand.subCommands?.find(
+      (cmd) => cmd.name === 'disable',
+    );
+    const result = await disableCommand!.action!(mockContext, '');
+
+    expect(result).toEqual({
+      type: 'message',
+      messageType: 'error',
+      content: 'Usage: /agents disable <agent-name>',
+    });
+  });
 });

packages/cli/src/ui/commands/agentsCommand.ts

@@ -4,9 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SlashCommand, CommandContext } from './types.js';
+import type {
+  SlashCommand,
+  CommandContext,
+  SlashCommandActionReturn,
+} from './types.js';
 import { CommandKind } from './types.js';
 import { MessageType, type HistoryItemAgentsList } from '../types.js';
+import { SettingScope } from '../../config/settings.js';
+import type { AgentOverride } from '@google/gemini-cli-core';
+import { disableAgent, enableAgent } from '../../utils/agentSettings.js';
+import { renderAgentActionFeedback } from '../../utils/agentUtils.js';
 
 const agentsListCommand: SlashCommand = {
   name: 'list',
@@ -50,6 +58,197 @@ const agentsListCommand: SlashCommand = {
   },
 };
 
+async function enableAction(
+  context: CommandContext,
+  args: string,
+): Promise<SlashCommandActionReturn | void> {
+  const { config, settings } = context.services;
+  if (!config) return;
+
+  const agentName = args.trim();
+  if (!agentName) {
+    return {
+      type: 'message',
+      messageType: 'error',
+      content: 'Usage: /agents enable <agent-name>',
+    };
+  }
+
+  const agentRegistry = config.getAgentRegistry();
+  if (!agentRegistry) {
+    return {
+      type: 'message',
+      messageType: 'error',
+      content: 'Agent registry not found.',
+    };
+  }
+
+  const allAgents = agentRegistry.getAllAgentNames();
+  const overrides = (settings.merged.agents?.overrides ?? {}) as Record<
+    string,
+    AgentOverride
+  >;
+  const disabledAgents = Object.keys(overrides).filter(
+    (name) => overrides[name]?.disabled === true,
+  );
+
+  if (allAgents.includes(agentName)) {
+    return {
+      type: 'message',
+      messageType: 'info',
+      content: `Agent '${agentName}' is already enabled.`,
+    };
+  }
+
+  if (!disabledAgents.includes(agentName)) {
+    return {
+      type: 'message',
+      messageType: 'error',
+      content: `Agent '${agentName}' not found.`,
+    };
+  }
+
+  const result = enableAgent(settings, agentName);
+
+  if (result.status === 'no-op') {
+    return {
+      type: 'message',
+      messageType: 'info',
+      content: renderAgentActionFeedback(result, (l, p) => `${l} (${p})`),
+    };
+  }
+
+  context.ui.addItem({
+    type: MessageType.INFO,
+    text: `Enabling ${agentName}...`,
+  });
+  await agentRegistry.reload();
+
+  return {
+    type: 'message',
+    messageType: 'info',
+    content: renderAgentActionFeedback(result, (l, p) => `${l} (${p})`),
+  };
+}
+
+async function disableAction(
+  context: CommandContext,
+  args: string,
+): Promise<SlashCommandActionReturn | void> {
+  const { config, settings } = context.services;
+  if (!config) return;
+
+  const agentName = args.trim();
+  if (!agentName) {
+    return {
+      type: 'message',
+      messageType: 'error',
+      content: 'Usage: /agents disable <agent-name>',
+    };
+  }
+
+  const agentRegistry = config.getAgentRegistry();
+  if (!agentRegistry) {
+    return {
+      type: 'message',
+      messageType: 'error',
+      content: 'Agent registry not found.',
+    };
+  }
+
+  const allAgents = agentRegistry.getAllAgentNames();
+  const overrides = (settings.merged.agents?.overrides ?? {}) as Record<
+    string,
+    AgentOverride
+  >;
+  const disabledAgents = Object.keys(overrides).filter(
+    (name) => overrides[name]?.disabled === true,
+  );
+
+  if (disabledAgents.includes(agentName)) {
+    return {
+      type: 'message',
+      messageType: 'info',
+      content: `Agent '${agentName}' is already disabled.`,
+    };
+  }
+
+  if (!allAgents.includes(agentName)) {
+    return {
+      type: 'message',
+      messageType: 'error',
+      content: `Agent '${agentName}' not found.`,
+    };
+  }
+
+  const scope = context.services.settings.workspace.path
+    ? SettingScope.Workspace
+    : SettingScope.User;
+  const result = disableAgent(settings, agentName, scope);
+
+  if (result.status === 'no-op') {
+    return {
+      type: 'message',
+      messageType: 'info',
+      content: renderAgentActionFeedback(result, (l, p) => `${l} (${p})`),
+    };
+  }
+
+  context.ui.addItem({
+    type: MessageType.INFO,
+    text: `Disabling ${agentName}...`,
+  });
+  await agentRegistry.reload();
+
+  return {
+    type: 'message',
+    messageType: 'info',
+    content: renderAgentActionFeedback(result, (l, p) => `${l} (${p})`),
+  };
+}
+
+function completeAgentsToEnable(context: CommandContext, partialArg: string) {
+  const { config, settings } = context.services;
+  if (!config) return [];
+
+  const overrides = (settings.merged.agents?.overrides ?? {}) as Record<
+    string,
+    AgentOverride
+  >;
+  const disabledAgents = Object.entries(overrides)
+    .filter(([_, override]) => override?.disabled === true)
+    .map(([name]) => name);
+
+  return disabledAgents.filter((name) => name.startsWith(partialArg));
+}
+
+function completeAgentsToDisable(context: CommandContext, partialArg: string) {
+  const { config } = context.services;
+  if (!config) return [];
+
+  const agentRegistry = config.getAgentRegistry();
+  const allAgents = agentRegistry ? agentRegistry.getAllAgentNames() : [];
+  return allAgents.filter((name: string) => name.startsWith(partialArg));
+}
+
+const enableCommand: SlashCommand = {
+  name: 'enable',
+  description: 'Enable a disabled agent',
+  kind: CommandKind.BUILT_IN,
+  autoExecute: false,
+  action: enableAction,
+  completion: completeAgentsToEnable,
+};
+
+const disableCommand: SlashCommand = {
+  name: 'disable',
+  description: 'Disable an enabled agent',
+  kind: CommandKind.BUILT_IN,
+  autoExecute: false,
+  action: disableAction,
+  completion: completeAgentsToDisable,
+};
+
 const agentsRefreshCommand: SlashCommand = {
   name: 'refresh',
   description: 'Reload the agent registry',
@@ -84,7 +283,12 @@ export const agentsCommand: SlashCommand = {
   name: 'agents',
   description: 'Manage agents',
   kind: CommandKind.BUILT_IN,
-  subCommands: [agentsListCommand, agentsRefreshCommand],
+  subCommands: [
+    agentsListCommand,
+    agentsRefreshCommand,
+    enableCommand,
+    disableCommand,
+  ],
   action: async (context: CommandContext, args) =>
     // Default to list if no subcommand is provided
     agentsListCommand.action!(context, args),