fix(amazonq): added abortController back

Author: ashishrp-aws

package-lock.json

@@ -86,7 +86,6 @@ export class AdaptiveRetryConfig {
 
     /**
      * Calculate exponential backoff delay with jitter
-     * Matches CLI's calculate_exponential_backoff logic
      */
     static calculateExponentialBackoff(
         baseMultiplier: number,
@@ -100,7 +99,7 @@ export class AdaptiveRetryConfig {
 
     /**
      * Generate jitter base multiplier
-     * Matches CLI's fastrand::f64() behavior
+     * Matches fastrand::f64() behavior
      */
     static generateJitterBase(useStatic: boolean): number {
         return useStatic ? 1.0 : Math.random()

server/aws-lsp-codewhisperer/src/language-server/agenticChat/retry/retryConfig.ts

@@ -188,7 +188,11 @@ export class ChatSessionService {
         const client = this.#serviceManager.getStreamingClient()
 
         // Execute with retry logic
-        return await this.#executeWithRetry(() => client.sendMessage(request), 'sendMessage', TokenCost.InitialRequest)
+        return await this.#executeWithRetry(
+            () => client.sendMessage(request, this.#abortController),
+            'sendMessage',
+            TokenCost.InitialRequest
+        )
     }
 
     private isModelSelectionEnabled(): boolean {
@@ -218,13 +222,13 @@ export class ChatSessionService {
 
     async #performChatRequest(client: any, request: ChatCommandInput): Promise<ChatCommandOutput> {
         if (client instanceof StreamingClientServiceToken) {
-            return await client.generateAssistantResponse(request)
+            return await client.generateAssistantResponse(request, this.#abortController)
         } else if (client instanceof StreamingClientServiceIAM) {
             // @ts-ignore
             // SendMessageStreaming checks for origin from request source
             // https://code.amazon.com/packages/AWSVectorConsolasRuntimeService/blobs/ac917609a28dbcb6757a8427bcc585a42fd15bf2/--/src/com/amazon/aws/vector/consolas/runtimeservice/activity/SendMessageStreamingActivity.java#L246
             request.source = this.#origin ? this.#origin : 'IDE'
-            return await client.sendMessage(request)
+            return await client.sendMessage(request, this.#abortController)
         } else {
             // error
             return Promise.reject(
@@ -305,19 +309,45 @@ export class ChatSessionService {
         const startTime = Date.now()
 
         while (attempt <= this.#retryConfig.maxAttempts) {
+            // Check if request was aborted before each attempt
+            if (this.#abortController?.signal.aborted) {
+                const abortError = new Error('Request aborted')
+                abortError.name = 'AbortError'
+                throw abortError
+            }
+
             try {
                 // Check rate limiter and apply delay if needed
                 const rateLimitDelayMs = this.#rateLimiter.checkAndCalculateDelay(tokenCost)
                 if (rateLimitDelayMs > 0) {
                     if (attempt === 1) {
                         this.#delayTracker.trackInitialDelay(rateLimitDelayMs)
                     }
+                    // Check abort before applying delay
+                    if (this.#abortController?.signal.aborted) {
+                        const abortError = new Error('Request aborted')
+                        abortError.name = 'AbortError'
+                        throw abortError
+                    }
                     await this.#rateLimiter.applyDelayAndConsumeTokens(rateLimitDelayMs, tokenCost)
                 } else if (this.#rateLimiter.isEnabled()) {
                     // Consume tokens even if no delay
                     await this.#rateLimiter.applyDelayAndConsumeTokens(0, tokenCost)
                 }
 
+                // TEST: Throw throttling exception on first attempt
+                if (attempt === 1) {
+                    const throttlingError = new Error(
+                        'Encountered unexpectedly high load when processing the request, please try again.'
+                    )
+                    ;(throttlingError as any).cause = {
+                        $metadata: {
+                            httpStatusCode: 500,
+                        },
+                    }
+                    throw throttlingError
+                }
+
                 const response = await operation()
 
                 // Track success for rate limiter recovery
@@ -341,6 +371,13 @@ export class ChatSessionService {
                     break
                 }
 
+                // Check abort before continuing with retry logic
+                if (this.#abortController?.signal.aborted) {
+                    const abortError = new Error('Request aborted')
+                    abortError.name = 'AbortError'
+                    throw abortError
+                }
+
                 // Activate rate limiter for throttling errors
                 if (retryAction === RetryAction.ThrottlingError) {
                     const wasEnabled = this.#rateLimiter.isEnabled()
@@ -380,8 +417,14 @@ export class ChatSessionService {
                 this.#delayTracker.trackRetryDelay(totalDelayMs, attempt + 1, previousDelayMs)
                 previousDelayMs = totalDelayMs
 
-                // Apply the delay
+                // Apply the delay with abort checking
                 if (totalDelayMs > 0) {
+                    // Check abort before delay
+                    if (this.#abortController?.signal.aborted) {
+                        const abortError = new Error('Request aborted')
+                        abortError.name = 'AbortError'
+                        throw abortError
+                    }
                     await new Promise(resolve => setTimeout(resolve, totalDelayMs))
                 }