Remove ctrl-t binding for /mcp commands (#11372)

2026-03-14 08:01:02 -07:00 · 2025-10-17 09:42:09 -07:00
parent 0ded546a09
commit 795e5134c7
14 changed files with 5 additions and 52 deletions
--- a/docs/cli/commands.md
+++ b/docs/cli/commands.md
@@ -110,8 +110,6 @@ Slash commands provide meta-level control over the CLI itself.
    - **`schema`**:
      - **Description:** Show the full JSON schema for the tool's configured
        parameters.
-  - **Keyboard Shortcut:** Press **Ctrl+T** at any time to toggle between
-    showing and hiding tool descriptions.

 - **`/memory`**
  - **Description:** Manage the AI's instructional context (hierarchical memory
--- a/docs/cli/keyboard-shortcuts.md
+++ b/docs/cli/keyboard-shortcuts.md
@@ -12,7 +12,6 @@ This document lists the available keyboard shortcuts in the Gemini CLI.
 | `Ctrl+L` | Clear the screen.                                                                                                     |
 | `Ctrl+O` | Toggle the display of the debug console.                                                                              |
 | `Ctrl+S` | Allows long responses to print fully, disabling truncation. Use your terminal's scrollback to view the entire output. |
-| `Ctrl+T` | Toggle the display of tool descriptions.                                                                              |
 | `Ctrl+Y` | Toggle auto-approval (YOLO mode) for all tool calls.                                                                  |

 ## Input Prompt
--- a/packages/cli/src/config/keyBindings.ts
+++ b/packages/cli/src/config/keyBindings.ts
@@ -46,7 +46,6 @@ export enum Command {

  // App level bindings
  SHOW_ERROR_DETAILS = 'showErrorDetails',
-  TOGGLE_TOOL_DESCRIPTIONS = 'toggleToolDescriptions',
  TOGGLE_IDE_CONTEXT_DETAIL = 'toggleIDEContextDetail',
  TOGGLE_MARKDOWN = 'toggleMarkdown',
  QUIT = 'quit',
@@ -157,7 +156,6 @@ export const defaultKeyBindings: KeyBindingConfig = {

  // App level bindings
  [Command.SHOW_ERROR_DETAILS]: [{ key: 'o', ctrl: true }],
-  [Command.TOGGLE_TOOL_DESCRIPTIONS]: [{ key: 't', ctrl: true }],
  [Command.TOGGLE_IDE_CONTEXT_DETAIL]: [{ key: 'g', ctrl: true }],
  [Command.TOGGLE_MARKDOWN]: [{ key: 'm', command: true }],
  [Command.QUIT]: [{ key: 'c', ctrl: true }],
--- a/packages/cli/src/ui/AppContainer.tsx
+++ b/packages/cli/src/ui/AppContainer.tsx
@@ -796,8 +796,6 @@ Logging in with Google... Please restart Gemini CLI to continue.
  );

  const [showErrorDetails, setShowErrorDetails] = useState<boolean>(false);
-  const [showToolDescriptions, setShowToolDescriptions] =
-    useState<boolean>(false);
  const [renderMarkdown, setRenderMarkdown] = useState<boolean>(true);

  const [ctrlCPressedOnce, setCtrlCPressedOnce] = useState(false);
@@ -971,14 +969,6 @@ Logging in with Google... Please restart Gemini CLI to continue.

      if (keyMatchers[Command.SHOW_ERROR_DETAILS](key)) {
        setShowErrorDetails((prev) => !prev);
-      } else if (keyMatchers[Command.TOGGLE_TOOL_DESCRIPTIONS](key)) {
-        const newValue = !showToolDescriptions;
-        setShowToolDescriptions(newValue);
-
-        const mcpServers = config.getMcpServers();
-        if (Object.keys(mcpServers || {}).length > 0) {
-          handleSlashCommand(newValue ? '/mcp desc' : '/mcp nodesc');
-        }
      } else if (keyMatchers[Command.TOGGLE_MARKDOWN](key)) {
        setRenderMarkdown((prev) => {
          const newValue = !prev;
@@ -1007,8 +997,6 @@ Logging in with Google... Please restart Gemini CLI to continue.
      constrainHeight,
      setConstrainHeight,
      setShowErrorDetails,
-      showToolDescriptions,
-      setShowToolDescriptions,
      config,
      ideContextState,
      handleExit,
@@ -1152,7 +1140,6 @@ Logging in with Google... Please restart Gemini CLI to continue.
      showErrorDetails,
      filteredConsoleMessages,
      ideContextState,
-      showToolDescriptions,
      renderMarkdown,
      ctrlCPressedOnce,
      ctrlDPressedOnce,
@@ -1235,7 +1222,6 @@ Logging in with Google... Please restart Gemini CLI to continue.
      showErrorDetails,
      filteredConsoleMessages,
      ideContextState,
-      showToolDescriptions,
      renderMarkdown,
      ctrlCPressedOnce,
      ctrlDPressedOnce,
--- a/packages/cli/src/ui/components/Composer.test.tsx
+++ b/packages/cli/src/ui/components/Composer.test.tsx
@@ -111,7 +111,6 @@ const createMockUIState = (overrides: Partial<UIState> = {}): UIState =>
    showEscapePrompt: false,
    ideContextState: null,
    geminiMdFileCount: 0,
-    showToolDescriptions: false,
    renderMarkdown: true,
    filteredConsoleMessages: [],
    sessionStats: {
--- a/packages/cli/src/ui/components/Composer.tsx
+++ b/packages/cli/src/ui/components/Composer.tsx
@@ -100,7 +100,6 @@ export const Composer = () => {
                contextFileNames={contextFileNames}
                mcpServers={config.getMcpServers()}
                blockedMcpServers={config.getBlockedMcpServers()}
-                showToolDescriptions={uiState.showToolDescriptions}
              />
            )
          )}
--- a/packages/cli/src/ui/components/ContextSummaryDisplay.test.tsx
+++ b/packages/cli/src/ui/components/ContextSummaryDisplay.test.tsx
@@ -29,7 +29,6 @@ describe('<ContextSummaryDisplay />', () => {
    geminiMdFileCount: 1,
    contextFileNames: ['GEMINI.md'],
    mcpServers: { 'test-server': { command: 'test' } },
-    showToolDescriptions: false,
    ideContext: {
      workspaceState: {
        openFiles: [{ path: '/a/b/c' }],
@@ -41,7 +40,7 @@ describe('<ContextSummaryDisplay />', () => {
    const { lastFrame } = renderWithWidth(120, baseProps);
    const output = lastFrame();
    expect(output).toContain(
-      'Using: 1 open file (ctrl+g to view) | 1 GEMINI.md file | 1 MCP server (ctrl+t to view)',
+      'Using: 1 open file (ctrl+g to view) | 1 GEMINI.md file | 1 MCP server',
    );
    // Check for absence of newlines
    expect(output.includes('\n')).toBe(false);
@@ -54,7 +53,7 @@ describe('<ContextSummaryDisplay />', () => {
      ' Using:',
      '   - 1 open file (ctrl+g to view)',
      '   - 1 GEMINI.md file',
-      '   - 1 MCP server (ctrl+t to view)',
+      '   - 1 MCP server',
    ];
    const actualLines = output.split('\n');
    expect(actualLines).toEqual(expectedLines);
--- a/packages/cli/src/ui/components/ContextSummaryDisplay.tsx
+++ b/packages/cli/src/ui/components/ContextSummaryDisplay.tsx
@@ -16,7 +16,6 @@ interface ContextSummaryDisplayProps {
  contextFileNames: string[];
  mcpServers?: Record<string, MCPServerConfig>;
  blockedMcpServers?: Array<{ name: string; extensionName: string }>;
-  showToolDescriptions?: boolean;
  ideContext?: IdeContext;
 }

@@ -25,7 +24,6 @@ export const ContextSummaryDisplay: React.FC<ContextSummaryDisplayProps> = ({
  contextFileNames,
  mcpServers,
  blockedMcpServers,
-  showToolDescriptions,
  ideContext,
 }) => {
  const { columns: terminalWidth } = useTerminalSize();
@@ -82,16 +80,7 @@ export const ContextSummaryDisplay: React.FC<ContextSummaryDisplayProps> = ({
      }
      parts.push(blockedText);
    }
-    let text = parts.join(', ');
-    // Add ctrl+t hint when MCP servers are available
-    if (mcpServers && Object.keys(mcpServers).length > 0) {
-      if (showToolDescriptions) {
-        text += ' (ctrl+t to toggle)';
-      } else {
-        text += ' (ctrl+t to view)';
-      }
-    }
-    return text;
+    return parts.join(', ');
  })();

  const summaryParts = [openFilesText, geminiMdText, mcpText].filter(Boolean);
--- a/packages/cli/src/ui/components/shared/BaseSelectionList.test.tsx
+++ b/packages/cli/src/ui/components/shared/BaseSelectionList.test.tsx
@@ -254,7 +254,7 @@ describe('BaseSelectionList', () => {
    });
  });

-  describe('Scrolling and Pagination (maxItemsToShow)', () => {
+  describe.skip('Scrolling and Pagination (maxItemsToShow)', () => {
    const longList = Array.from({ length: 10 }, (_, i) => ({
      value: `Item ${i + 1}`,
      label: `Item ${i + 1}`,
--- a/packages/cli/src/ui/components/views/McpStatus.tsx
+++ b/packages/cli/src/ui/components/views/McpStatus.tsx
@@ -270,10 +270,6 @@ export const McpStatus: React.FC<McpStatusProps> = ({
            <Text color={theme.text.accent}>/mcp auth &lt;server-name&gt;</Text>{' '}
            to authenticate with OAuth-enabled servers
          </Text>
-          <Text>
-            {'  '}- Press <Text color={theme.text.accent}>Ctrl+T</Text> to
-            toggle tool descriptions on/off
-          </Text>
        </Box>
      )}
    </Box>
--- a/packages/cli/src/ui/components/views/snapshots/McpStatus.test.tsx.snap
+++ b/packages/cli/src/ui/components/views/snapshots/McpStatus.test.tsx.snap
@@ -150,8 +150,7 @@ A test server
  - Use /mcp desc to show server and tool descriptions
  - Use /mcp schema to show tool parameter schemas
  - Use /mcp nodesc to hide descriptions
-  - Use /mcp auth <server-name> to authenticate with OAuth-enabled servers
-  - Press Ctrl+T to toggle tool descriptions on/off"
+  - Use /mcp auth <server-name> to authenticate with OAuth-enabled servers"
 `;

 exports[`McpStatus > renders correctly with unauthenticated OAuth status 1`] = `
--- a/packages/cli/src/ui/contexts/UIStateContext.tsx
+++ b/packages/cli/src/ui/contexts/UIStateContext.tsx
@@ -81,7 +81,6 @@ export interface UIState {
  showErrorDetails: boolean;
  filteredConsoleMessages: ConsoleMessageItem[];
  ideContextState: IdeContext | undefined;
-  showToolDescriptions: boolean;
  renderMarkdown: boolean;
  ctrlCPressedOnce: boolean;
  ctrlDPressedOnce: boolean;
--- a/packages/cli/src/ui/hooks/usePhraseCycler.ts
+++ b/packages/cli/src/ui/hooks/usePhraseCycler.ts
@@ -211,7 +211,6 @@ export const INFORMATIVE_TIPS = [
  'Clear your screen at any time with Ctrl+L...',
  'Toggle the debug console display with Ctrl+O...',
  'See full, untruncated responses with Ctrl+S...',
-  'Show or hide tool descriptions with Ctrl+T...',
  'Toggle auto-approval (YOLO mode) for all tools with Ctrl+Y...',
  'Toggle shell mode by typing ! in an empty prompt...',
  'Insert a newline with a backslash (\\) followed by Enter...',
--- a/packages/cli/src/ui/keyMatchers.test.ts
+++ b/packages/cli/src/ui/keyMatchers.test.ts
@@ -51,8 +51,6 @@ describe('keyMatchers', () => {
      key.ctrl && (key.name === 'x' || key.sequence === '\x18'),
    [Command.PASTE_CLIPBOARD_IMAGE]: (key: Key) => key.ctrl && key.name === 'v',
    [Command.SHOW_ERROR_DETAILS]: (key: Key) => key.ctrl && key.name === 'o',
-    [Command.TOGGLE_TOOL_DESCRIPTIONS]: (key: Key) =>
-      key.ctrl && key.name === 't',
    [Command.TOGGLE_IDE_CONTEXT_DETAIL]: (key: Key) =>
      key.ctrl && key.name === 'g',
    [Command.TOGGLE_MARKDOWN]: (key: Key) => key.meta && key.name === 'm',
@@ -216,11 +214,6 @@ describe('keyMatchers', () => {
      positive: [createKey('o', { ctrl: true })],
      negative: [createKey('o'), createKey('e', { ctrl: true })],
    },
-    {
-      command: Command.TOGGLE_TOOL_DESCRIPTIONS,
-      positive: [createKey('t', { ctrl: true })],
-      negative: [createKey('t'), createKey('s', { ctrl: true })],
-    },
    {
      command: Command.TOGGLE_IDE_CONTEXT_DETAIL,
      positive: [createKey('g', { ctrl: true })],