Remove unnecessary promiuse usage. (#6585)

packages/cli/src/nonInteractiveCli.test.ts

@@ -65,7 +65,7 @@ describe('runNonInteractive', () => {
     mockConfig = {
       initialize: vi.fn().mockResolvedValue(undefined),
       getGeminiClient: vi.fn().mockReturnValue(mockGeminiClient),
-      getToolRegistry: vi.fn().mockResolvedValue(mockToolRegistry),
+      getToolRegistry: vi.fn().mockReturnValue(mockToolRegistry),
       getMaxSessionTurns: vi.fn().mockReturnValue(10),
       getIdeMode: vi.fn().mockReturnValue(false),
       getFullContext: vi.fn().mockReturnValue(false),

packages/cli/src/nonInteractiveCli.ts

@@ -39,7 +39,7 @@ export async function runNonInteractive(
     });
 
     const geminiClient = config.getGeminiClient();
-    const toolRegistry: ToolRegistry = await config.getToolRegistry();
+    const toolRegistry: ToolRegistry = config.getToolRegistry();
 
     const abortController = new AbortController();
     let currentMessages: Content[] = [

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

@@ -83,7 +83,7 @@ describe('mcpCommand', () => {
 
     // Create mock config with all necessary methods
     mockConfig = {
-      getToolRegistry: vi.fn().mockResolvedValue({
+      getToolRegistry: vi.fn().mockReturnValue({
         getAllTools: vi.fn().mockReturnValue([]),
       }),
       getMcpServers: vi.fn().mockReturnValue({}),
@@ -119,7 +119,7 @@ describe('mcpCommand', () => {
     });
 
     it('should show an error if tool registry is not available', async () => {
-      mockConfig.getToolRegistry = vi.fn().mockResolvedValue(undefined);
+      mockConfig.getToolRegistry = vi.fn().mockReturnValue(undefined);
 
       const result = await mcpCommand.action!(mockContext, '');
 
@@ -133,7 +133,7 @@ describe('mcpCommand', () => {
 
   describe('no MCP servers configured', () => {
     beforeEach(() => {
-      mockConfig.getToolRegistry = vi.fn().mockResolvedValue({
+      mockConfig.getToolRegistry = vi.fn().mockReturnValue({
         getAllTools: vi.fn().mockReturnValue([]),
       });
       mockConfig.getMcpServers = vi.fn().mockReturnValue({});
@@ -184,7 +184,7 @@ describe('mcpCommand', () => {
         ...mockServer3Tools,
       ];
 
-      mockConfig.getToolRegistry = vi.fn().mockResolvedValue({
+      mockConfig.getToolRegistry = vi.fn().mockReturnValue({
         getAllTools: vi.fn().mockReturnValue(allTools),
       });
 
@@ -243,7 +243,7 @@ describe('mcpCommand', () => {
         createMockMCPTool('tool2', 'server1', 'This is tool 2 description'),
       ];
 
-      mockConfig.getToolRegistry = vi.fn().mockResolvedValue({
+      mockConfig.getToolRegistry = vi.fn().mockReturnValue({
         getAllTools: vi.fn().mockReturnValue(mockServerTools),
       });
 
@@ -296,7 +296,7 @@ describe('mcpCommand', () => {
         createMockMCPTool('tool1', 'server1', 'This is tool 1 description'),
       ];
 
-      mockConfig.getToolRegistry = vi.fn().mockResolvedValue({
+      mockConfig.getToolRegistry = vi.fn().mockReturnValue({
         getAllTools: vi.fn().mockReturnValue(mockServerTools),
       });
 
@@ -340,7 +340,7 @@ describe('mcpCommand', () => {
       // Mock tools - only server1 has tools
       const mockServerTools = [createMockMCPTool('server1_tool1', 'server1')];
 
-      mockConfig.getToolRegistry = vi.fn().mockResolvedValue({
+      mockConfig.getToolRegistry = vi.fn().mockReturnValue({
         getAllTools: vi.fn().mockReturnValue(mockServerTools),
       });
 
@@ -386,7 +386,7 @@ describe('mcpCommand', () => {
         createMockMCPTool('server2_tool1', 'server2'),
       ];
 
-      mockConfig.getToolRegistry = vi.fn().mockResolvedValue({
+      mockConfig.getToolRegistry = vi.fn().mockReturnValue({
         getAllTools: vi.fn().mockReturnValue(mockServerTools),
       });
 
@@ -523,7 +523,7 @@ describe('mcpCommand', () => {
 
       const mockServerTools = [tool1, tool2];
 
-      mockConfig.getToolRegistry = vi.fn().mockResolvedValue({
+      mockConfig.getToolRegistry = vi.fn().mockReturnValue({
         getAllTools: vi.fn().mockReturnValue(mockServerTools),
       });
 
@@ -566,7 +566,7 @@ describe('mcpCommand', () => {
         createMockMCPTool('tool1', 'server1', 'Tool without schema'),
       ];
 
-      mockConfig.getToolRegistry = vi.fn().mockResolvedValue({
+      mockConfig.getToolRegistry = vi.fn().mockReturnValue({
         getAllTools: vi.fn().mockReturnValue(mockServerTools),
       });
 
@@ -603,7 +603,7 @@ describe('mcpCommand', () => {
         createMockMCPTool('tool1', 'server1', 'Test tool'),
       ];
 
-      mockConfig.getToolRegistry = vi.fn().mockResolvedValue({
+      mockConfig.getToolRegistry = vi.fn().mockReturnValue({
         getAllTools: vi.fn().mockReturnValue(mockServerTools),
       });
     });
@@ -766,7 +766,7 @@ describe('mcpCommand', () => {
       };
 
       mockConfig.getMcpServers = vi.fn().mockReturnValue(mockMcpServers);
-      mockConfig.getToolRegistry = vi.fn().mockResolvedValue({
+      mockConfig.getToolRegistry = vi.fn().mockReturnValue({
         getAllTools: vi.fn().mockReturnValue([]),
       });
 
@@ -787,7 +787,7 @@ describe('mcpCommand', () => {
       };
 
       mockConfig.getMcpServers = vi.fn().mockReturnValue(mockMcpServers);
-      mockConfig.getToolRegistry = vi.fn().mockResolvedValue({
+      mockConfig.getToolRegistry = vi.fn().mockReturnValue({
         getAllTools: vi.fn().mockReturnValue([]),
       });
 
@@ -879,7 +879,7 @@ describe('mcpCommand', () => {
                 oauth: { enabled: true },
               },
             }),
-            getToolRegistry: vi.fn().mockResolvedValue(mockToolRegistry),
+            getToolRegistry: vi.fn().mockReturnValue(mockToolRegistry),
             getGeminiClient: vi.fn().mockReturnValue(mockGeminiClient),
             getPromptRegistry: vi.fn().mockResolvedValue({
               removePromptsByServer: vi.fn(),
@@ -984,7 +984,7 @@ describe('mcpCommand', () => {
           config: {
             getMcpServers: vi.fn().mockReturnValue({ server1: {} }),
             getBlockedMcpServers: vi.fn().mockReturnValue([]),
-            getToolRegistry: vi.fn().mockResolvedValue(mockToolRegistry),
+            getToolRegistry: vi.fn().mockReturnValue(mockToolRegistry),
             getGeminiClient: vi.fn().mockReturnValue(mockGeminiClient),
             getPromptRegistry: vi.fn().mockResolvedValue({
               getPromptsByServer: vi.fn().mockReturnValue([]),
@@ -1040,7 +1040,7 @@ describe('mcpCommand', () => {
     });
 
     it('should show an error if tool registry is not available', async () => {
-      mockConfig.getToolRegistry = vi.fn().mockResolvedValue(undefined);
+      mockConfig.getToolRegistry = vi.fn().mockReturnValue(undefined);
 
       const refreshCommand = mcpCommand.subCommands?.find(
         (cmd) => cmd.name === 'refresh',

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

@@ -44,7 +44,7 @@ const getMcpStatus = async (
     };
   }
 
-  const toolRegistry = await config.getToolRegistry();
+  const toolRegistry = config.getToolRegistry();
   if (!toolRegistry) {
     return {
       type: 'message',
@@ -400,7 +400,7 @@ const authCommand: SlashCommand = {
       );
 
       // Trigger tool re-discovery to pick up authenticated server
-      const toolRegistry = await config.getToolRegistry();
+      const toolRegistry = config.getToolRegistry();
       if (toolRegistry) {
         context.ui.addItem(
           {
@@ -485,7 +485,7 @@ const refreshCommand: SlashCommand = {
       };
     }
 
-    const toolRegistry = await config.getToolRegistry();
+    const toolRegistry = config.getToolRegistry();
     if (!toolRegistry) {
       return {
         type: 'message',

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

@@ -31,7 +31,7 @@ describe('toolsCommand', () => {
     const mockContext = createMockCommandContext({
       services: {
         config: {
-          getToolRegistry: () => Promise.resolve(undefined),
+          getToolRegistry: () => undefined,
         },
       },
     });
@@ -52,8 +52,7 @@ describe('toolsCommand', () => {
     const mockContext = createMockCommandContext({
       services: {
         config: {
-          getToolRegistry: () =>
-            Promise.resolve({ getAllTools: () => [] as Tool[] }),
+          getToolRegistry: () => ({ getAllTools: () => [] as Tool[] }),
         },
       },
     });
@@ -73,8 +72,7 @@ describe('toolsCommand', () => {
     const mockContext = createMockCommandContext({
       services: {
         config: {
-          getToolRegistry: () =>
-            Promise.resolve({ getAllTools: () => mockTools }),
+          getToolRegistry: () => ({ getAllTools: () => mockTools }),
         },
       },
     });
@@ -92,8 +90,7 @@ describe('toolsCommand', () => {
     const mockContext = createMockCommandContext({
       services: {
         config: {
-          getToolRegistry: () =>
-            Promise.resolve({ getAllTools: () => mockTools }),
+          getToolRegistry: () => ({ getAllTools: () => mockTools }),
         },
       },
     });

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

@@ -24,7 +24,7 @@ export const toolsCommand: SlashCommand = {
       useShowDescriptions = true;
     }
 
-    const toolRegistry = await context.services.config?.getToolRegistry();
+    const toolRegistry = context.services.config?.getToolRegistry();
     if (!toolRegistry) {
       context.ui.addItem(
         {

packages/cli/src/ui/hooks/atCommandProcessor.ts

@@ -157,7 +157,7 @@ export async function handleAtCommand({
     both: [],
   };
 
-  const toolRegistry = await config.getToolRegistry();
+  const toolRegistry = config.getToolRegistry();
   const readManyFilesTool = toolRegistry.getTool('read_many_files');
   const globTool = toolRegistry.getTool('glob');
 

packages/cli/src/zed-integration/zedIntegration.ts

@@ -10,7 +10,6 @@ import {
   AuthType,
   Config,
   GeminiChat,
-  ToolRegistry,
   logToolCall,
   ToolResult,
   convertToFunctionResponse,
@@ -366,7 +365,7 @@ class Session {
       return errorResponse(new Error('Missing function name'));
     }
 
-    const toolRegistry: ToolRegistry = await this.config.getToolRegistry();
+    const toolRegistry = this.config.getToolRegistry();
     const tool = toolRegistry.getTool(fc.name as string);
 
     if (!tool) {
@@ -531,7 +530,7 @@ class Session {
     const contentLabelsForDisplay: string[] = [];
     const ignoredPaths: string[] = [];
 
-    const toolRegistry = await this.config.getToolRegistry();
+    const toolRegistry = this.config.getToolRegistry();
     const readManyFilesTool = toolRegistry.getTool('read_many_files');
     const globTool = toolRegistry.getTool('glob');