fix the activation bug and simplify codes in commands.ts

MarcoWang3 · MarcoWang3 · commit 0c32ef83e4ff · 2025-08-04T11:56:34.000-07:00
diff --git a/packages/amazonq/src/extension.ts b/packages/amazonq/src/extension.ts
@@ -45,6 +45,7 @@ import { registerCommands } from './commands'
 import { focusAmazonQPanel } from 'aws-core-vscode/codewhispererChat'
 import { activate as activateAmazonqLsp } from './lsp/activation'
 import { hasGlibcPatch } from './lsp/client'
+import { activateAutoDebug } from './lsp/autoDebug/activation'
 
 export const amazonQContextPrefix = 'amazonq'
 
@@ -131,6 +132,14 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
         await activateAmazonqLsp(context)
     }
 
+    // Activate AutoDebug feature at extension level
+    try {
+        const autoDebugFeature = await activateAutoDebug(context)
+        context.subscriptions.push(autoDebugFeature)
+    } catch (error) {
+        getLogger().error('Failed to activate AutoDebug feature at extension level: %s', error)
+    }
+
     // Generic extension commands
     registerGenericCommands(context, amazonQContextPrefix)
 
diff --git a/packages/amazonq/src/lsp/autoDebug/commands.ts b/packages/amazonq/src/lsp/autoDebug/commands.ts
@@ -61,56 +61,81 @@ export class AutoDebugCommands implements vscode.Disposable {
     }
 
     /**
-     * Fix with Amazon Q - fixes only the specific issues the user selected
+     * Generic error handling wrapper for command execution
      */
-    private async fixWithAmazonQ(range?: vscode.Range, diagnostics?: vscode.Diagnostic[]): Promise<void> {
+    private async executeWithErrorHandling<T>(
+        action: () => Promise<T>,
+        errorMessage: string,
+        logContext: string
+    ): Promise<T | void> {
         try {
-            const editor = vscode.window.activeTextEditor
-            if (!editor) {
-                return
-            }
-
-            // Controller handles panel focusing and message sending
-            await this.controller.fixSpecificProblems(range, diagnostics)
+            return await action()
         } catch (error) {
-            this.logger.error('AutoDebugCommands: Error in Fix with Amazon Q: %s', error)
+            this.logger.error(`AutoDebugCommands: Error in ${logContext}: %s`, error)
             void messages.showMessage('error', 'Amazon Q was not able to fix or explain the problem. Try again shortly')
         }
     }
 
+    /**
+     * Check if there's an active editor and log warning if not
+     */
+    private checkActiveEditor(): vscode.TextEditor | undefined {
+        const editor = vscode.window.activeTextEditor
+        if (!editor) {
+            this.logger.warn('AutoDebugCommands: No active editor found')
+        }
+        return editor
+    }
+
+    /**
+     * Fix with Amazon Q - fixes only the specific issues the user selected
+     */
+    private async fixWithAmazonQ(range?: vscode.Range, diagnostics?: vscode.Diagnostic[]): Promise<void> {
+        await this.executeWithErrorHandling(
+            async () => {
+                const editor = this.checkActiveEditor()
+                if (!editor) {
+                    return
+                }
+                await this.controller.fixSpecificProblems(range, diagnostics)
+            },
+            'Fix with Amazon Q',
+            'fixWithAmazonQ'
+        )
+    }
+
     /**
      * Fix All with Amazon Q - processes all errors in the current file
      */
     private async fixAllWithAmazonQ(): Promise<void> {
-        try {
-            const editor = vscode.window.activeTextEditor
-            if (!editor) {
-                return
-            }
-
-            await this.controller.fixAllProblemsInFile(10) // 10 errors per batch
-        } catch (error) {
-            this.logger.error('AutoDebugCommands: Error in Fix All with Amazon Q: %s', error)
-            void messages.showMessage('error', 'Amazon Q was not able to fix or explain the problem. Try again shortly')
-        }
+        await this.executeWithErrorHandling(
+            async () => {
+                const editor = this.checkActiveEditor()
+                if (!editor) {
+                    return
+                }
+                await this.controller.fixAllProblemsInFile(10) // 10 errors per batch
+            },
+            'Fix All with Amazon Q',
+            'fixAllWithAmazonQ'
+        )
     }
 
     /**
      * Explains the problem using Amazon Q
      */
     private async explainProblem(range?: vscode.Range, diagnostics?: vscode.Diagnostic[]): Promise<void> {
-        try {
-            const editor = vscode.window.activeTextEditor
-            if (!editor) {
-                this.logger.warn('AutoDebugCommands: No active editor for explainProblem')
-                return
-            }
-
-            await this.controller.explainProblems(range, diagnostics)
-        } catch (error) {
-            this.logger.error('AutoDebugCommands: Error explaining problem: %s', error)
-            void messages.showMessage('error', 'Amazon Q was not able to fix or explain the problem. Try again shortly')
-        }
+        await this.executeWithErrorHandling(
+            async () => {
+                const editor = this.checkActiveEditor()
+                if (!editor) {
+                    return
+                }
+                await this.controller.explainProblems(range, diagnostics)
+            },
+            'Explain Problem',
+            'explainProblem'
+        )
     }
 
     /**
diff --git a/packages/amazonq/src/lsp/autoDebug/lsp/autoDebugLspClient.ts b/packages/amazonq/src/lsp/autoDebug/lsp/autoDebugLspClient.ts
@@ -2,7 +2,6 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-
 import { getLogger, placeholder } from 'aws-core-vscode/shared'
 import { focusAmazonQPanel } from 'aws-core-vscode/codewhispererChat'
 
@@ -19,11 +18,16 @@ export class AutoDebugLspClient {
 
     public async sendChatMessage(params: { message: string; triggerType: string; eventId: string }): Promise<boolean> {
         try {
+            // Ensure the chat view provider and webview are available
+            await this.ensureWebviewReady()
+
             // Get the webview provider from the static reference
             const amazonQChatViewProvider = AutoDebugLspClient.chatViewProvider
 
             if (!amazonQChatViewProvider?.webview) {
-                this.logger.error('AutoDebugLspClient: Amazon Q Chat View Provider not available')
+                this.logger.error(
+                    'AutoDebugLspClient: Amazon Q Chat View Provider webview not available after initialization'
+                )
                 return false
             }
 
@@ -50,4 +54,18 @@ export class AutoDebugLspClient {
             return false
         }
     }
+
+    /**
+     * Ensures that the chat view provider and its webview are ready for use
+     */
+    private async ensureWebviewReady(): Promise<void> {
+        if (!AutoDebugLspClient.chatViewProvider) {
+            await focusAmazonQPanel.execute(placeholder, 'autoDebug')
+        }
+
+        // Now ensure the webview is created
+        if (!AutoDebugLspClient.chatViewProvider.webview) {
+            await focusAmazonQPanel.execute(placeholder, 'autoDebug')
+        }
+    }
 }
diff --git a/packages/amazonq/src/lsp/client.ts b/packages/amazonq/src/lsp/client.ts
@@ -53,7 +53,6 @@ import { LineTracker } from '../app/inline/stateTracker/lineTracker'
 import { InlineTutorialAnnotation } from '../app/inline/tutorials/inlineTutorialAnnotation'
 import { InlineChatTutorialAnnotation } from '../app/inline/tutorials/inlineChatTutorialAnnotation'
 import { codeReviewInChat } from '../app/amazonqScan/models/constants'
-import { activateAutoDebug } from './autoDebug/activation'
 
 const localize = nls.loadMessageBundle()
 const logger = getLogger('amazonqLsp.lspClient')
@@ -343,14 +342,6 @@ async function onLanguageServerReady(
         await activate(client, encryptionKey, resourcePaths.ui)
     }
 
-    // Activate AutoDebug feature with direct LSP client connection
-    try {
-        const autoDebugFeature = await activateAutoDebug(extensionContext, client, encryptionKey)
-        toDispose.push(autoDebugFeature)
-    } catch (error) {
-        getLogger('amazonqLsp').error('Failed to activate AutoDebug feature: %s', error)
-    }
-
     const refreshInterval = auth.startTokenRefreshInterval(10 * oneSecond)
 
     // We manually push the cached values the first time since event handlers, which should push, may not have been setup yet.
