move the activation inside autodebug feature

Author: MarcoWang3

packages/amazonq/src/extension.ts

@@ -45,7 +45,6 @@ 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'
 
@@ -138,15 +137,6 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
     // Amazon Q specific commands
     registerCommands(context)
 
-    // Activate Auto Debug feature
-    try {
-        const autoDebugFeature = await activateAutoDebug(context)
-        context.subscriptions.push(autoDebugFeature)
-        getLogger().info('Amazon Q Auto Debug feature activated successfully')
-    } catch (error) {
-        getLogger().error('Failed to activate Auto Debug feature: %s', error)
-    }
-
     // Handle Amazon Q Extension un-installation.
     setupUninstallHandler(VSCODE_EXTENSION_ID.amazonq, context.extension.packageJSON.version, context)
 

packages/amazonq/src/lsp/autoDebug/activation.ts

@@ -8,7 +8,6 @@ import { getLogger } from 'aws-core-vscode/shared'
 import { AutoDebugCommands } from './commands'
 import { AutoDebugCodeActionsProvider } from './codeActionsProvider'
 import { AutoDebugController } from './controller'
-import { registerAutoDebugFeature } from '../client'
 
 /**
  * Auto Debug feature activation for Amazon Q
@@ -65,15 +64,24 @@ export class AutoDebugFeature implements vscode.Disposable {
 }
 
 /**
- * Factory function to activate auto debug feature
+ * Factory function to activate auto debug feature with LSP client
  * This is the main entry point for activating auto debug
  */
-export async function activateAutoDebug(context: vscode.ExtensionContext): Promise<AutoDebugFeature> {
+export async function activateAutoDebug(
+    context: vscode.ExtensionContext,
+    client?: any,
+    encryptionKey?: Buffer
+): Promise<AutoDebugFeature> {
     const feature = new AutoDebugFeature(context)
     await feature.activate()
 
-    // Register the feature with the module-level registry
-    registerAutoDebugFeature(feature)
+    // If LSP client is provided, connect it immediately
+    if (client) {
+        const controller = feature.getController()
+        if (controller) {
+            controller.setLanguageClient(client)
+        }
+    }
 
     return feature
 }

packages/amazonq/src/lsp/autoDebug/constants.ts

@@ -53,64 +53,11 @@ 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 { AutoDebugFeature } from '../lsp/autoDebug'
-import { autoDebugRetryConfig } from '../lsp/autoDebug/constants'
-
-// Module-level registry for AutoDebug feature
-let registeredAutoDebugFeature: AutoDebugFeature | undefined
-
-export function registerAutoDebugFeature(feature: AutoDebugFeature) {
-    registeredAutoDebugFeature = feature
-}
-
-export function getRegisteredAutoDebugFeature(): AutoDebugFeature | undefined {
-    return registeredAutoDebugFeature
-}
+import { activateAutoDebug } from './autoDebug/activation'
 
 const localize = nls.loadMessageBundle()
 const logger = getLogger('amazonqLsp.lspClient')
 
-interface RetryOptions {
-    maxAttempts: number
-    initialDelayMs: number
-    maxDelayMs: number
-    backoffMultiplier: number
-    onRetry?: (attempt: number, error: Error) => void
-    onFailure?: (attempts: number, lastError: Error) => void
-}
-
-/**
- * Retry a function with exponential backoff
- */
-async function retryWithExponentialBackoff<T>(fn: () => T | Promise<T>, options: RetryOptions): Promise<T> {
-    const { maxAttempts, initialDelayMs, maxDelayMs, backoffMultiplier, onRetry, onFailure } = options
-
-    let lastError: Error
-
-    for (let attempt = 1; attempt <= maxAttempts; attempt++) {
-        try {
-            return await fn()
-        } catch (error) {
-            lastError = error instanceof Error ? error : new Error(String(error))
-
-            if (attempt === maxAttempts) {
-                onFailure?.(attempt, lastError)
-                throw lastError
-            }
-
-            onRetry?.(attempt, lastError)
-
-            // Calculate delay with exponential backoff
-            const delay = Math.min(initialDelayMs * Math.pow(backoffMultiplier, attempt - 1), maxDelayMs)
-
-            await new Promise((resolve) => setTimeout(resolve, delay))
-        }
-    }
-
-    // This should never be reached, but TypeScript requires it
-    throw lastError!
-}
-
 export function hasGlibcPatch(): boolean {
     // Skip GLIBC patching for SageMaker environments
     if (isSageMaker()) {
@@ -396,48 +343,12 @@ async function onLanguageServerReady(
         await activate(client, encryptionKey, resourcePaths.ui)
     }
 
-    // Connect AutoDebug feature to the language client
+    // Activate AutoDebug feature with direct LSP client connection
     try {
-        getLogger('amazonqLsp').debug('Attempting to connect AutoDebug feature to language client')
-
-        await retryWithExponentialBackoff(
-            () => {
-                const autoDebugFeature = getRegisteredAutoDebugFeature()
-                if (!autoDebugFeature) {
-                    throw new Error('AutoDebug feature not registered')
-                }
-                const controller = autoDebugFeature.getController()
-                if (!controller) {
-                    throw new Error('AutoDebug controller not available')
-                }
-                controller.setLanguageClient(client)
-                getLogger('amazonqLsp').debug('AutoDebug feature connected successfully')
-            },
-            {
-                maxAttempts: autoDebugRetryConfig.maxAttempts,
-                initialDelayMs: autoDebugRetryConfig.initialDelayMs,
-                maxDelayMs: autoDebugRetryConfig.maxDelayMs,
-                backoffMultiplier: autoDebugRetryConfig.backoffMultiplier,
-                onRetry: (attempt, error) => {
-                    getLogger('amazonqLsp').debug(
-                        'AutoDebug connection attempt %d failed: %s. Retrying...',
-                        attempt,
-                        error.message
-                    )
-                },
-                onFailure: (attempts, lastError) => {
-                    getLogger('amazonqLsp').error(
-                        'AutoDebug feature not found after %d attempts - integration will not work. ' +
-                            'This may indicate that the AutoDebug feature failed to activate or there is a timing issue. ' +
-                            'Last error: %s',
-                        attempts,
-                        lastError.message
-                    )
-                },
-            }
-        )
+        const autoDebugFeature = await activateAutoDebug(extensionContext, client, encryptionKey)
+        toDispose.push(autoDebugFeature)
     } catch (error) {
-        getLogger('amazonqLsp').error('Failed to connect AutoDebug feature to language client: %s', error)
+        getLogger('amazonqLsp').error('Failed to activate AutoDebug feature: %s', error)
     }
 
     const refreshInterval = auth.startTokenRefreshInterval(10 * oneSecond)