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

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

@@ -33,7 +33,7 @@ export const aboutCommand: SlashCommand = {
     const modelVersion = context.services.config?.getModel() || 'Unknown';
     const cliVersion = await getVersion();
     const selectedAuthType =
-      context.services.settings.merged.security?.auth?.selectedType || '';
+      context.services.settings.merged.security.auth.selectedType || '';
     const gcpProject = process.env['GOOGLE_CLOUD_PROJECT'] || '';
     const ideClient = await getIdeClientName(context);
 

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

@@ -7,7 +7,7 @@
 import { vi, describe, it, expect, beforeEach } from 'vitest';
 import { agentsCommand } from './agentsCommand.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import type { Config, AgentOverride } from '@google/gemini-cli-core';
+import type { Config } from '@google/gemini-cli-core';
 import type { LoadedSettings } from '../../config/settings.js';
 import { MessageType } from '../types.js';
 import { enableAgent, disableAgent } from '../../utils/agentSettings.js';
@@ -148,12 +148,9 @@ describe('agentsCommand', () => {
       reload: reloadSpy,
     });
     // Add agent to disabled overrides so validation passes
-    (
-      mockContext.services.settings.merged.agents!.overrides as Record<
-        string,
-        AgentOverride
-      >
-    )['test-agent'] = { disabled: true };
+    mockContext.services.settings.merged.agents.overrides['test-agent'] = {
+      disabled: true,
+    };
 
     vi.mocked(enableAgent).mockReturnValue({
       status: 'success',
@@ -266,12 +263,9 @@ describe('agentsCommand', () => {
 
   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 };
+    mockContext.services.settings.merged.agents.overrides['test-agent'] = {
+      disabled: true,
+    };
 
     const disableCommand = agentsCommand.subCommands?.find(
       (cmd) => cmd.name === 'disable',

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

@@ -12,7 +12,6 @@ import type {
 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';
 
@@ -84,10 +83,7 @@ async function enableAction(
   }
 
   const allAgents = agentRegistry.getAllAgentNames();
-  const overrides = (settings.merged.agents?.overrides ?? {}) as Record<
-    string,
-    AgentOverride
-  >;
+  const overrides = settings.merged.agents.overrides;
   const disabledAgents = Object.keys(overrides).filter(
     (name) => overrides[name]?.disabled === true,
   );
@@ -157,10 +153,7 @@ async function disableAction(
   }
 
   const allAgents = agentRegistry.getAllAgentNames();
-  const overrides = (settings.merged.agents?.overrides ?? {}) as Record<
-    string,
-    AgentOverride
-  >;
+  const overrides = settings.merged.agents.overrides;
   const disabledAgents = Object.keys(overrides).filter(
     (name) => overrides[name]?.disabled === true,
   );
@@ -211,10 +204,7 @@ 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 overrides = settings.merged.agents.overrides;
   const disabledAgents = Object.entries(overrides)
     .filter(([_, override]) => override?.disabled === true)
     .map(([name]) => name);

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

@@ -271,9 +271,10 @@ describe('hooksCommand', () => {
 
     it('should enable a hook and update settings', async () => {
       // Update the context's settings with disabled hooks
-      mockContext.services.settings.merged.hooks = {
-        disabled: ['test-hook', 'other-hook'],
-      };
+      mockContext.services.settings.merged.hooks.disabled = [
+        'test-hook',
+        'other-hook',
+      ];
 
       const enableCmd = hooksCommand.subCommands!.find(
         (cmd) => cmd.name === 'enable',
@@ -401,9 +402,7 @@ describe('hooksCommand', () => {
     });
 
     it('should disable a hook and update settings', async () => {
-      mockContext.services.settings.merged.hooks = {
-        disabled: [],
-      };
+      mockContext.services.settings.merged.hooks.disabled = [];
 
       const disableCmd = hooksCommand.subCommands!.find(
         (cmd) => cmd.name === 'disable',
@@ -432,9 +431,7 @@ describe('hooksCommand', () => {
 
     it('should return info when hook is already disabled', async () => {
       // Update the context's settings with the hook already disabled
-      mockContext.services.settings.merged.hooks = {
-        disabled: ['test-hook'],
-      };
+      mockContext.services.settings.merged.hooks.disabled = ['test-hook'];
 
       const disableCmd = hooksCommand.subCommands!.find(
         (cmd) => cmd.name === 'disable',
@@ -455,9 +452,7 @@ describe('hooksCommand', () => {
     });
 
     it('should handle error when disabling hook fails', async () => {
-      mockContext.services.settings.merged.hooks = {
-        disabled: [],
-      };
+      mockContext.services.settings.merged.hooks.disabled = [];
       mockSettings.setValue.mockImplementationOnce(() => {
         throw new Error('Failed to save settings');
       });

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

@@ -76,8 +76,7 @@ async function enableAction(
 
   // Get current disabled hooks from settings
   const settings = context.services.settings;
-  const disabledHooks = settings.merged.hooks?.disabled || ([] as string[]);
-
+  const disabledHooks = settings.merged.hooks.disabled;
   // Remove from disabled list if present
   const newDisabledHooks = disabledHooks.filter(
     (name: string) => name !== hookName,
@@ -143,8 +142,7 @@ async function disableAction(
 
   // Get current disabled hooks from settings
   const settings = context.services.settings;
-  const disabledHooks = settings.merged.hooks?.disabled || ([] as string[]);
-
+  const disabledHooks = settings.merged.hooks.disabled;
   // Add to disabled list if not already present
   if (!disabledHooks.includes(hookName)) {
     const newDisabledHooks = [...disabledHooks, hookName];