Make merged settings non-nullable and fix all lints related to that. (#16647)

packages/cli/src/commands/mcp/list.test.ts

@@ -6,15 +6,20 @@
 
 import { vi, describe, it, expect, beforeEach, type Mock } from 'vitest';
 import { listMcpServers } from './list.js';
-import { loadSettings } from '../../config/settings.js';
+import { loadSettings, mergeSettings } from '../../config/settings.js';
 import { createTransport, debugLogger } from '@google/gemini-cli-core';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { ExtensionStorage } from '../../config/extensions/storage.js';
 import { ExtensionManager } from '../../config/extension-manager.js';
 
-vi.mock('../../config/settings.js', () => ({
-  loadSettings: vi.fn(),
-}));
+vi.mock('../../config/settings.js', async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import('../../config/settings.js')>();
+  return {
+    ...actual,
+    loadSettings: vi.fn(),
+  };
+});
 vi.mock('../../config/extensions/storage.js', () => ({
   ExtensionStorage: {
     getUserExtensionsDir: vi.fn(),
@@ -32,11 +37,16 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
       CONNECTING: 'CONNECTING',
       DISCONNECTED: 'DISCONNECTED',
     },
-    Storage: vi.fn().mockImplementation((_cwd: string) => ({
-      getGlobalSettingsPath: () => '/tmp/gemini/settings.json',
-      getWorkspaceSettingsPath: () => '/tmp/gemini/workspace-settings.json',
-      getProjectTempDir: () => '/test/home/.gemini/tmp/mocked_hash',
-    })),
+    Storage: Object.assign(
+      vi.fn().mockImplementation((_cwd: string) => ({
+        getGlobalSettingsPath: () => '/tmp/gemini/settings.json',
+        getWorkspaceSettingsPath: () => '/tmp/gemini/workspace-settings.json',
+        getProjectTempDir: () => '/test/home/.gemini/tmp/mocked_hash',
+      })),
+      {
+        getGlobalSettingsPath: () => '/tmp/gemini/settings.json',
+      },
+    ),
     GEMINI_DIR: '.gemini',
     getErrorMessage: (e: unknown) =>
       e instanceof Error ? e.message : String(e),
@@ -96,7 +106,10 @@ describe('mcp list command', () => {
   });
 
   it('should display message when no servers configured', async () => {
-    mockedLoadSettings.mockReturnValue({ merged: { mcpServers: {} } });
+    const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
+    mockedLoadSettings.mockReturnValue({
+      merged: { ...defaultMergedSettings, mcpServers: {} },
+    });
 
     await listMcpServers();
 
@@ -104,8 +117,10 @@ describe('mcp list command', () => {
   });
 
   it('should display different server types with connected status', async () => {
+    const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
     mockedLoadSettings.mockReturnValue({
       merged: {
+        ...defaultMergedSettings,
         mcpServers: {
           'stdio-server': { command: '/path/to/server', args: ['arg1'] },
           'sse-server': { url: 'https://example.com/sse' },
@@ -138,8 +153,10 @@ describe('mcp list command', () => {
   });
 
   it('should display disconnected status when connection fails', async () => {
+    const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
     mockedLoadSettings.mockReturnValue({
       merged: {
+        ...defaultMergedSettings,
         mcpServers: {
           'test-server': { command: '/test/server' },
         },
@@ -158,9 +175,13 @@ describe('mcp list command', () => {
   });
 
   it('should merge extension servers with config servers', async () => {
+    const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
     mockedLoadSettings.mockReturnValue({
       merged: {
-        mcpServers: { 'config-server': { command: '/config/server' } },
+        ...defaultMergedSettings,
+        mcpServers: {
+          'config-server': { command: '/config/server' },
+        },
       },
     });