@aws/lsp-codewhisperer 0.0.86 → 0.0.89

package/out/language-server/agenticChat/context/contextCommandsProvider.d.ts

@@ -9,12 +9,18 @@ export declare class ContextCommandsProvider implements Disposable {
     private readonly lsp;
     private promptFileWatcher?;
     private cachedContextCommands?;
+    private codeSymbolsPending;
+    private filesAndFoldersPending;
+    private workspacePending;
+    private initialStateSent;
     constructor(logging: Logging, chat: Chat, workspace: Workspace, lsp: Lsp);
+    onReady(): void;
     private registerContextCommandHandler;
     registerPromptFileWatcher(): void;
     getUserPromptsCommand(): Promise<ContextCommand[]>;
     processContextCommandUpdate(items: ContextCommandItem[]): Promise<void>;
     mapContextCommandItems(items: ContextCommandItem[]): Promise<ContextCommandGroup[]>;
     maybeUpdateCodeSymbols(): Promise<void>;
+    setFilesAndFoldersPending(value: boolean): void;
     dispose(): void;
 }

package/out/language-server/agenticChat/context/contextCommandsProvider.js

@@ -13,6 +13,10 @@ class ContextCommandsProvider {
     lsp;
     promptFileWatcher;
     cachedContextCommands;
+    codeSymbolsPending = true;
+    filesAndFoldersPending = true;
+    workspacePending = true;
+    initialStateSent = false;
     constructor(logging, chat, workspace, lsp) {
         this.logging = logging;
         this.chat = chat;
@@ -21,12 +25,24 @@ class ContextCommandsProvider {
         this.registerPromptFileWatcher();
         this.registerContextCommandHandler().catch(e => this.logging.error(`Error registering context command handler: ${e}`));
     }
+    onReady() {
+        if (!this.initialStateSent) {
+            this.initialStateSent = true;
+            void this.processContextCommandUpdate([]).catch(e => this.logging.error(`Failed to send initial context commands: ${e}`));
+        }
+    }
     async registerContextCommandHandler() {
         try {
             const controller = await localProjectContextController_1.LocalProjectContextController.getInstance();
             controller.onContextItemsUpdated = async (contextItems) => {
                 await this.processContextCommandUpdate(contextItems);
             };
+            controller.onIndexingInProgressChanged = (indexingInProgress) => {
+                if (this.workspacePending !== indexingInProgress) {
+                    this.workspacePending = indexingInProgress;
+                    void this.processContextCommandUpdate(this.cachedContextCommands ?? []);
+                }
+            };
         }
         catch (e) {
             this.logging.warn(`Error processing context command update: ${e}`);
@@ -95,6 +111,7 @@ class ContextCommandsProvider {
             ],
             description: 'Add all files in a folder to context',
             icon: 'folder',
+            disabledText: this.filesAndFoldersPending ? 'pending' : undefined,
         };
         const fileCmds = [additionalContextProvider_1.activeFileCmd];
         const fileCmdGroup = {
@@ -107,6 +124,7 @@ class ContextCommandsProvider {
             ],
             description: 'Add a file to context',
             icon: 'file',
+            disabledText: this.filesAndFoldersPending ? 'pending' : undefined,
         };
         const codeCmds = [];
         const codeCmdGroup = {
@@ -119,6 +137,7 @@ class ContextCommandsProvider {
             ],
             description: 'Add code to context',
             icon: 'code-block',
+            disabledText: this.codeSymbolsPending ? 'pending' : undefined,
         };
         const promptCmds = [];
         const promptCmdGroup = {
@@ -142,6 +161,7 @@ class ContextCommandsProvider {
             command: '@workspace',
             id: '@workspace',
             description: 'Reference all code in workspace',
+            disabledText: this.workspacePending ? 'pending' : undefined,
         };
         const commands = [workspaceCmd, folderCmdGroup, fileCmdGroup, codeCmdGroup, promptCmdGroup];
         if (imageContextEnabled) {
@@ -191,10 +211,14 @@ class ContextCommandsProvider {
     async maybeUpdateCodeSymbols() {
         const needUpdate = await (await localProjectContextController_1.LocalProjectContextController.getInstance()).shouldUpdateContextCommandSymbolsOnce();
         if (needUpdate) {
+            this.codeSymbolsPending = false;
             const items = await (await localProjectContextController_1.LocalProjectContextController.getInstance()).getContextCommandItems();
             await this.processContextCommandUpdate(items);
         }
     }
+    setFilesAndFoldersPending(value) {
+        this.filesAndFoldersPending = value;
+    }
     dispose() {
         void this.promptFileWatcher?.close();
     }

package/out/language-server/agenticChat/context/contextCommandsProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"contextCommandsProvider.js","sourceRoot":"","sources":["../../../../src/language-server/agenticChat/context/contextCommandsProvider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"contextCommandsProvider.js","sourceRoot":"","sources":["../../../../src/language-server/agenticChat/context/contextCommandsProvider.ts"],"names":[],"mappings":"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"}

package/out/language-server/agenticChat/tools/mcp/mcpEventHandler.d.ts

@@ -14,6 +14,13 @@ export declare class McpEventHandler {
      * Handles the list MCP servers event
      */
     onListMcpServers(params: ListMcpServersParams): Promise<{
+        header: {
+            title: string;
+            description: string;
+            actions: never[];
+        };
+        list: never[];
+    } | {
         header: {
             title: string;
             description: string;

package/out/language-server/agenticChat/tools/mcp/mcpEventHandler.js

@@ -70,7 +70,14 @@ class McpEventHandler {
      */
     async onListMcpServers(params) {
         this.#currentEditingServerName = undefined;
-        const mcpManager = mcpManager_1.McpManager.instance;
+        let mcpManager;
+        try {
+            mcpManager = mcpManager_1.McpManager.instance;
+        }
+        catch (error) {
+            this.#features.logging.debug(`McpManager not initialized, returning empty list: ${error}`);
+            return { header: { title: 'MCP Servers', description: '', actions: [] }, list: [] };
+        }
         // Check for errors in loading MCP config files
         const configLoadErrors = mcpManager.getConfigLoadErrors();
         // Only register the event listener once
@@ -135,7 +142,14 @@ class McpEventHandler {
         Array.from(mcpManagerServerConfigs.entries()).forEach(([serverName, config]) => {
             const toolsWithPermissions = mcpManager.getAllToolsWithPermissions(serverName);
             const toolsCount = toolsWithPermissions.length;
-            const serverState = mcpManager_1.McpManager.instance.getServerState(serverName);
+            let serverState;
+            try {
+                serverState = mcpManager_1.McpManager.instance.getServerState(serverName);
+            }
+            catch (error) {
+                this.#features.logging.debug(`McpManager not initialized for getServerState: ${error}`);
+                serverState = undefined;
+            }
             // Check if this server has validation errors
             const hasValidationErrors = serversWithErrors.has(serverName);
             const item = {
@@ -321,13 +335,25 @@ class McpEventHandler {
         if (existingValues.name) {
             const serverName = existingValues.name;
             const sanitizedServerName = (0, mcpUtils_1.sanitizeName)(serverName);
-            const serverState = mcpManager_1.McpManager.instance.getAllServerConfigs().get(sanitizedServerName);
-            // Check if the server exists in McpManager
-            const mcpManager = mcpManager_1.McpManager.instance;
-            const serverConfig = mcpManager.getAllServerConfigs().get(sanitizedServerName);
+            let serverConfig;
+            try {
+                serverConfig = mcpManager_1.McpManager.instance.getAllServerConfigs().get(sanitizedServerName);
+            }
+            catch (error) {
+                this.#features.logging.debug(`McpManager not initialized for getAllServerConfigs: ${error}`);
+                serverConfig = undefined;
+            }
             if (serverConfig) {
                 // Use the helper method to determine if the server is global
-                existingValues.scope = mcpManager.isServerGlobal(sanitizedServerName) ? 'global' : 'workspace';
+                try {
+                    existingValues.scope = mcpManager_1.McpManager.instance.isServerGlobal(sanitizedServerName)
+                        ? 'global'
+                        : 'workspace';
+                }
+                catch (error) {
+                    this.#features.logging.debug(`McpManager not initialized for isServerGlobal: ${error}`);
+                    existingValues.scope = 'global';
+                }
             }
             else {
                 // Default to global scope for new servers
@@ -509,8 +535,16 @@ class McpEventHandler {
         }
         else {
             if (checkExistingServerName) {
-                const existingServers = mcpManager_1.McpManager.instance.getAllServerConfigs();
-                const serverState = mcpManager_1.McpManager.instance.getServerState(values.name);
+                let existingServers, serverState;
+                try {
+                    existingServers = mcpManager_1.McpManager.instance.getAllServerConfigs();
+                    serverState = mcpManager_1.McpManager.instance.getServerState(values.name);
+                }
+                catch (error) {
+                    this.#features.logging.debug(`McpManager not initialized for validation: ${error}`);
+                    existingServers = new Map();
+                    serverState = undefined;
+                }
                 if (existingServers.has(values.name) &&
                     values.name !== originalServerName &&
                     serverState?.status === mcpTypes_1.McpServerStatus.ENABLED) {
@@ -584,7 +618,13 @@ class McpEventHandler {
         const serverName = params.optionsValues.name;
         const sanitizedServerName = (0, mcpUtils_1.sanitizeName)(serverName);
         const originalServerName = this.#currentEditingServerName;
-        const isEditMode = !!(originalServerName && mcpManager_1.McpManager.instance.getAllServerConfigs().has(originalServerName));
+        let isEditMode = false;
+        try {
+            isEditMode = !!(originalServerName && mcpManager_1.McpManager.instance.getAllServerConfigs().has(originalServerName));
+        }
+        catch (error) {
+            this.#features.logging.debug(`McpManager not initialized for isEditMode check: ${error}`);
+        }
         // Validate form values
         const validation = this.#validateMcpServerForm(params.optionsValues, true, isEditMode ? originalServerName : undefined);
         if (!validation.isValid) {
@@ -670,15 +710,34 @@ class McpEventHandler {
         try {
             if (isEditMode && originalServerName) {
                 const serverToRemove = this.#serverNameBeforeUpdate || originalServerName;
-                const serverConfig = mcpManager_1.McpManager.instance.getAllServerConfigs().get(serverToRemove);
+                let serverConfig;
+                try {
+                    serverConfig = mcpManager_1.McpManager.instance.getAllServerConfigs().get(serverToRemove);
+                }
+                catch (error) {
+                    this.#features.logging.error(`McpManager not initialized for server removal: ${error}`);
+                    throw error;
+                }
                 const isLegacyMcpServer = serverConfig?.__configPath__?.endsWith('mcp.json') ?? false;
                 const configPath = isLegacyMcpServer ? await this.#getMcpConfigPath(isGlobal) : agentPath;
-                await mcpManager_1.McpManager.instance.removeServer(serverToRemove);
-                await mcpManager_1.McpManager.instance.addServer(serverName, config, configPath, isLegacyMcpServer);
+                try {
+                    await mcpManager_1.McpManager.instance.removeServer(serverToRemove);
+                    await mcpManager_1.McpManager.instance.addServer(serverName, config, configPath, isLegacyMcpServer);
+                }
+                catch (error) {
+                    this.#features.logging.error(`McpManager operation failed: ${error}`);
+                    throw error;
+                }
             }
             else {
                 // Create new server
-                await mcpManager_1.McpManager.instance.addServer(serverName, config, agentPath);
+                try {
+                    await mcpManager_1.McpManager.instance.addServer(serverName, config, agentPath);
+                }
+                catch (error) {
+                    this.#features.logging.error(`McpManager not initialized for addServer: ${error}`);
+                    throw error;
+                }
                 this.#newlyAddedServers.add(serverName);
             }
         }
@@ -689,18 +748,30 @@ class McpEventHandler {
         this.#serverNameBeforeUpdate = undefined;
         // need to check server state now, as there is possibility of error during server initialization
         const serverStatusError = this.#getServerStatusError(serverName);
+        let numTools = 0;
+        try {
+            numTools = mcpManager_1.McpManager.instance.getAllToolsWithPermissions(sanitizedServerName).length;
+        }
+        catch (error) {
+            this.#features.logging.debug(`McpManager not initialized for getAllToolsWithPermissions: ${error}`);
+        }
         this.#telemetryController?.emitMCPServerInitializeEvent({
             source: isEditMode ? 'updateServer' : 'addServer',
             command: selectedTransport === TransportType.STDIO ? params.optionsValues.command : undefined,
             url: selectedTransport === TransportType.HTTP ? params.optionsValues.url : undefined,
             enabled: true,
-            numTools: mcpManager_1.McpManager.instance.getAllToolsWithPermissions(sanitizedServerName).length,
+            numTools,
             scope: params.optionsValues['scope'] === 'global' ? 'global' : 'workspace',
             transportType: selectedTransport,
             languageServerVersion: this.#features.runtime.serverInfo.version,
         });
         if (serverStatusError) {
-            await mcpManager_1.McpManager.instance.removeServerFromConfigFile(serverName);
+            try {
+                await mcpManager_1.McpManager.instance.removeServerFromConfigFile(serverName);
+            }
+            catch (error) {
+                this.#features.logging.error(`McpManager not initialized for removeServerFromConfigFile: ${error}`);
+            }
             if (this.#newlyAddedServers.has(serverName)) {
                 this.#newlyAddedServers.delete(serverName);
             }
@@ -740,7 +811,13 @@ class McpEventHandler {
         if (serverName === 'Built-in') {
             // Handle Built-in server specially
             const allTools = this.#features.agent.getTools({ format: 'bedrock' });
-            const mcpToolNames = new Set(mcpManager_1.McpManager.instance.getAllTools().map(tool => tool.toolName));
+            let mcpToolNames = new Set();
+            try {
+                mcpToolNames = new Set(mcpManager_1.McpManager.instance.getAllTools().map(tool => tool.toolName));
+            }
+            catch (error) {
+                this.#features.logging.debug(`McpManager not initialized for getAllTools: ${error}`);
+            }
             const builtInTools = allTools
                 .filter(tool => !mcpToolNames.has(tool.toolSpecification.name))
                 .map(tool => {
@@ -769,7 +846,13 @@ class McpEventHandler {
         }
         else {
             // Handle regular MCP servers
-            const toolsWithPermissions = mcpManager_1.McpManager.instance.getAllToolsWithPermissions(serverName);
+            let toolsWithPermissions = [];
+            try {
+                toolsWithPermissions = mcpManager_1.McpManager.instance.getAllToolsWithPermissions(serverName);
+            }
+            catch (error) {
+                this.#features.logging.debug(`McpManager not initialized for getAllToolsWithPermissions: ${error}`);
+            }
             filterOptions = this.#buildServerFilterOptions(serverName, toolsWithPermissions);
             return {
                 id: params.id,
@@ -803,9 +886,16 @@ class McpEventHandler {
         if (!serverName) {
             return { id: params.id };
         }
-        const mcpManager = mcpManager_1.McpManager.instance;
-        // Get the appropriate agent path
-        const agentPath = mcpManager.getAllServerConfigs().get(serverName)?.__configPath__;
+        let mcpManager, agentPath;
+        try {
+            mcpManager = mcpManager_1.McpManager.instance;
+            // Get the appropriate agent path
+            agentPath = mcpManager.getAllServerConfigs().get(serverName)?.__configPath__;
+        }
+        catch (error) {
+            this.#features.logging.error(`McpManager not initialized for enable server: ${error}`);
+            return { id: params.id };
+        }
         // Set flag to ignore file changes during permission update
         this.#isProgrammaticChange = true;
         try {
@@ -830,9 +920,16 @@ class McpEventHandler {
         if (!serverName) {
             return { id: params.id };
         }
-        const mcpManager = mcpManager_1.McpManager.instance;
-        // Set flag to ignore file changes during permission update
-        const agentPath = mcpManager.getAllServerConfigs().get(serverName)?.__configPath__;
+        let mcpManager, agentPath;
+        try {
+            mcpManager = mcpManager_1.McpManager.instance;
+            // Set flag to ignore file changes during permission update
+            agentPath = mcpManager.getAllServerConfigs().get(serverName)?.__configPath__;
+        }
+        catch (error) {
+            this.#features.logging.error(`McpManager not initialized for disable server:${error}`);
+            return { id: params.id };
+        }
         // Set flag to ignore file changes during permission update
         this.#isProgrammaticChange = true;
         try {
@@ -860,7 +957,13 @@ class McpEventHandler {
         // Set flag to ignore file changes during server deletion
         this.#isProgrammaticChange = true;
         try {
-            await mcpManager_1.McpManager.instance.removeServer(serverName);
+            try {
+                await mcpManager_1.McpManager.instance.removeServer(serverName);
+            }
+            catch (error) {
+                this.#features.logging.error(`McpManager not initialized for removeServer: ${error}`);
+                throw error;
+            }
             this.#releaseProgrammaticAfterDebounce();
             return { id: params.id };
         }
@@ -883,7 +986,25 @@ class McpEventHandler {
             return { id: params.id };
         }
         this.#currentEditingServerName = serverName;
-        const config = mcpManager_1.McpManager.instance.getAllServerConfigs().get(serverName);
+        let config;
+        try {
+            config = mcpManager_1.McpManager.instance.getAllServerConfigs().get(serverName);
+        }
+        catch (error) {
+            this.#features.logging.error(`McpManager not initialized for getAllServerConfigs: ${error}`);
+            return {
+                id: params.id,
+                header: {
+                    title: 'Edit MCP Server',
+                    status: {
+                        title: 'MCP Manager not initialized',
+                        icon: 'cancel-circle',
+                        status: 'error',
+                    },
+                },
+                list: [],
+            };
+        }
         if (!config) {
             return {
                 id: params.id,
@@ -1041,7 +1162,14 @@ class McpEventHandler {
         }
         try {
             // Skip server config check for Built-in server
-            const serverConfig = mcpManager_1.McpManager.instance.getAllServerConfigs().get(serverName);
+            let serverConfig;
+            try {
+                serverConfig = mcpManager_1.McpManager.instance.getAllServerConfigs().get(serverName);
+            }
+            catch (error) {
+                this.#features.logging.error(`McpManager not initialized for getAllServerConfigs: ${error}`);
+                return { id: params.id };
+            }
             if (serverName !== 'Built-in') {
                 if (!serverConfig) {
                     throw new Error(`Server '${serverName}' not found`);
@@ -1075,10 +1203,22 @@ class McpEventHandler {
         try {
             const { serverName, permission } = this.#pendingPermissionConfig;
             // Apply the stored permission changes
-            await mcpManager_1.McpManager.instance.updateServerPermission(serverName, permission);
+            try {
+                await mcpManager_1.McpManager.instance.updateServerPermission(serverName, permission);
+            }
+            catch (error) {
+                this.#features.logging.error(`McpManager not initialized for updateServerPermission: ${error}`);
+                throw error;
+            }
             this.#emitMCPConfigEvent();
             // Get server config to emit telemetry
-            const serverConfig = mcpManager_1.McpManager.instance.getAllServerConfigs().get(serverName);
+            let serverConfig;
+            try {
+                serverConfig = mcpManager_1.McpManager.instance.getAllServerConfigs().get(serverName);
+            }
+            catch (error) {
+                this.#features.logging.debug(`McpManager not initialized for getAllServerConfigs: ${error}`);
+            }
             if (serverConfig) {
                 // Emit server initialize event after permission change
                 const transportType = serverConfig.command?.trim() ? TransportType.STDIO : TransportType.HTTP;
@@ -1087,7 +1227,15 @@ class McpEventHandler {
                     command: transportType === TransportType.STDIO ? serverConfig.command : undefined,
                     url: transportType === TransportType.HTTP ? serverConfig.url : undefined,
                     enabled: true,
-                    numTools: mcpManager_1.McpManager.instance.getAllToolsWithPermissions(serverName).length,
+                    numTools: (() => {
+                        try {
+                            return mcpManager_1.McpManager.instance.getAllToolsWithPermissions(serverName).length;
+                        }
+                        catch (error) {
+                            this.#features.logging.debug(`McpManager not initialized for getAllToolsWithPermissions: ${error}`);
+                            return 0;
+                        }
+                    })(),
                     scope: serverConfig.__configPath__ ===
                         (0, mcpUtils_1.getGlobalAgentConfigPath)(this.#features.workspace.fs.getUserHomeDir()) ||
                         serverConfig.__configPath__ ===
@@ -1112,8 +1260,15 @@ class McpEventHandler {
     }
     #emitMCPConfigEvent() {
         // Emit MCP config event after reinitialization
-        const mcpManager = mcpManager_1.McpManager.instance;
-        const serverConfigs = mcpManager.getAllServerConfigs();
+        let mcpManager, serverConfigs;
+        try {
+            mcpManager = mcpManager_1.McpManager.instance;
+            serverConfigs = mcpManager.getAllServerConfigs();
+        }
+        catch (error) {
+            this.#features.logging.debug(`McpManager not initialized for emitMCPConfigEvent with error: ${error}`);
+            return;
+        }
         const activeServers = Array.from(serverConfigs.entries()).filter(([name, _]) => !mcpManager.isServerDisabled(name));
         // Get the global paths
         const globalAgentPath = (0, mcpUtils_1.getGlobalAgentConfigPath)(this.#features.workspace.fs.getUserHomeDir());
@@ -1171,7 +1326,13 @@ class McpEventHandler {
         // Set flag to ignore file changes during reinitialization if this is a programmatic change
         this.#isProgrammaticChange = isProgrammatic;
         try {
-            await mcpManager_1.McpManager.instance.reinitializeMcpServers();
+            try {
+                await mcpManager_1.McpManager.instance.reinitializeMcpServers();
+            }
+            catch (error) {
+                this.#features.logging.error(`McpManager not initialized for reinitializeMcpServers: ${error}`);
+                throw error;
+            }
             this.#emitMCPConfigEvent();
             // Reset flag after reinitialization
             this.#isProgrammaticChange = false;
@@ -1279,7 +1440,14 @@ class McpEventHandler {
      * Gets the UI status object for a specific MCP server
      */
     #getServerStatusError(serverName) {
-        const serverStates = mcpManager_1.McpManager.instance.getAllServerStates();
+        let serverStates;
+        try {
+            serverStates = mcpManager_1.McpManager.instance.getAllServerStates();
+        }
+        catch (error) {
+            this.#features.logging.debug(`McpManager not initialized for getAllServerStates: ${error}`);
+            return undefined;
+        }
         const key = serverName ? (0, mcpUtils_1.sanitizeName)(serverName) : serverName;
         const serverState = key ? serverStates.get(key) : undefined;
         if (!serverState) {