fix(amazonqFeatureDev): use shared context from action to check cancellation

Author: tverney

packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts

@@ -284,6 +284,16 @@ export class FeatureDevController {
         }
     }
 
+    private disposeToken(session: Session | undefined) {
+        if (session?.state?.tokenSource?.token.isCancellationRequested) {
+            session?.state.tokenSource?.dispose()
+            if (session?.state?.tokenSource) {
+                session.state.tokenSource = new vscode.CancellationTokenSource()
+            }
+            getLogger().debug('Request cancelled, skipping further processing')
+        }
+    }
+
     // TODO add type
     private async processUserChatMessage(message: any) {
         if (message.message === undefined) {
@@ -319,6 +329,7 @@ export class FeatureDevController {
                 await this.onCodeGeneration(session, message.message, message.tabID)
             }
         } catch (err: any) {
+            this.disposeToken(session)
             this.processErrorChatMessage(err, message, session)
             // Lock the chat input until they explicitly click one of the follow ups
             this.messenger.sendChatInputEnabled(message.tabID, false)
@@ -413,11 +424,7 @@ export class FeatureDevController {
             // Finish processing the event
 
             if (session?.state?.tokenSource?.token.isCancellationRequested) {
-                session?.state.tokenSource?.dispose()
-                if (session?.state?.tokenSource) {
-                    session.state.tokenSource = new vscode.CancellationTokenSource()
-                }
-                getLogger().debug('Request cancelled, skipping further processing')
+                this.disposeToken(session)
             } else {
                 this.messenger.sendAsyncEventProgress(tabID, false, undefined)
 

packages/core/src/amazonqFeatureDev/session/sessionState.ts

@@ -116,7 +116,6 @@ abstract class CodeGenBase {
     private pollCount = 180
     private requestDelay = 10000
     public tokenSource: vscode.CancellationTokenSource
-    public isCancellationRequested: boolean
     public phase: SessionStatePhase = DevPhase.CODEGEN
     public readonly conversationId: string
     public readonly uploadId: string
@@ -127,7 +126,6 @@ abstract class CodeGenBase {
         public tabID: string
     ) {
         this.tokenSource = new vscode.CancellationTokenSource()
-        this.isCancellationRequested = false
         this.conversationId = config.conversationId
         this.uploadId = config.uploadId
         this.currentCodeGenerationId = config.currentCodeGenerationId || EmptyCodeGenID
@@ -139,12 +137,14 @@ abstract class CodeGenBase {
         codeGenerationId,
         telemetry: telemetry,
         workspaceFolders,
+        isCancellationRequested,
     }: {
         messenger: Messenger
         fs: VirtualFileSystem
         codeGenerationId: string
         telemetry: TelemetryHelper
         workspaceFolders: CurrentWsFolders
+        isCancellationRequested?: boolean
     }): Promise<{
         newFiles: NewFileInfo[]
         deletedFiles: DeletedFileInfo[]
@@ -154,7 +154,7 @@ abstract class CodeGenBase {
     }> {
         for (
             let pollingIteration = 0;
-            pollingIteration < this.pollCount && !this.isCancellationRequested;
+            pollingIteration < this.pollCount && !isCancellationRequested;
             ++pollingIteration
         ) {
             const codegenResult = await this.config.proxyClient.getCodeGeneration(this.conversationId, codeGenerationId)
@@ -230,7 +230,7 @@ abstract class CodeGenBase {
                 }
             }
         }
-        if (!this.isCancellationRequested) {
+        if (!isCancellationRequested) {
             // still in progress
             const errorMessage = i18n('AWS.amazonq.featureDev.error.codeGen.timeout')
             throw new ToolkitError(errorMessage, { code: 'CodeGenTimeout' })
@@ -265,13 +265,6 @@ export class CodeGenState extends CodeGenBase implements SessionState {
                     credentialStartUrl: AuthUtil.instance.startUrl,
                 })
 
-                action.tokenSource?.token.onCancellationRequested(() => {
-                    this.isCancellationRequested = true
-                    if (action.tokenSource) {
-                        this.tokenSource = action.tokenSource
-                    }
-                })
-
                 action.telemetry.setGenerateCodeIteration(this.currentIteration)
                 action.telemetry.setGenerateCodeLastInvocationTime()
                 const codeGenerationId = randomUUID()
@@ -283,7 +276,7 @@ export class CodeGenState extends CodeGenBase implements SessionState {
                     this.currentCodeGenerationId
                 )
 
-                if (!this.isCancellationRequested) {
+                if (!action.tokenSource?.token.isCancellationRequested) {
                     action.messenger.sendAnswer({
                         message: i18n('AWS.amazonq.featureDev.pillText.generatingCode'),
                         type: 'answer-part',
@@ -301,9 +294,10 @@ export class CodeGenState extends CodeGenBase implements SessionState {
                     codeGenerationId,
                     telemetry: action.telemetry,
                     workspaceFolders: this.config.workspaceFolders,
+                    isCancellationRequested: action.tokenSource?.token.isCancellationRequested,
                 })
 
-                if (codeGeneration && !this.isCancellationRequested) {
+                if (codeGeneration && !action.tokenSource?.token.isCancellationRequested) {
                     this.config.currentCodeGenerationId = codeGenerationId
                     this.currentCodeGenerationId = codeGenerationId
                 }
@@ -325,7 +319,7 @@ export class CodeGenState extends CodeGenBase implements SessionState {
                     this.currentIteration + 1,
                     this.codeGenerationRemainingIterationCount,
                     this.codeGenerationTotalIterationCount,
-                    this.tokenSource,
+                    action.tokenSource,
                     this.currentCodeGenerationId
                 )
                 return {
@@ -481,16 +475,18 @@ export class PrepareCodeGenState implements SessionState {
             )
 
             await uploadCode(uploadUrl, zipFileBuffer, zipFileChecksum, kmsKeyArn)
-            action.messenger.sendAnswer({
-                message: i18n('AWS.amazonq.featureDev.pillText.contextGatheringCompleted'),
-                type: 'answer-part',
-                tabID: this.tabID,
-            })
+            if (!action.tokenSource?.token.isCancellationRequested) {
+                action.messenger.sendAnswer({
+                    message: i18n('AWS.amazonq.featureDev.pillText.contextGatheringCompleted'),
+                    type: 'answer-part',
+                    tabID: this.tabID,
+                })
 
-            action.messenger.sendUpdatePlaceholder(
-                this.tabID,
-                i18n('AWS.amazonq.featureDev.pillText.contextGatheringCompleted')
-            )
+                action.messenger.sendUpdatePlaceholder(
+                    this.tabID,
+                    i18n('AWS.amazonq.featureDev.pillText.contextGatheringCompleted')
+                )
+            }
 
             return uploadId
         })

packages/core/src/amazonqFeatureDev/util/files.ts

@@ -63,15 +63,18 @@ export async function prepareRepoData(
         const iterator = ignoredExtensionMap.entries()
 
         for (let i = 0; i < ignoredExtensionMap.size; i++) {
-            const [key, value] = iterator.next().value
-            await amznTelemetry.amazonq_bundleExtensionIgnored.run(async (bundleSpan) => {
-                const event = {
-                    filenameExt: key,
-                    count: value,
-                }
+            const iteratorValue = iterator.next().value
+            if (iteratorValue) {
+                const [key, value] = iteratorValue
+                await amznTelemetry.amazonq_bundleExtensionIgnored.run(async (bundleSpan) => {
+                    const event = {
+                        filenameExt: key,
+                        count: value,
+                    }
 
-                bundleSpan.record(event)
-            })
+                    bundleSpan.record(event)
+                })
+            }
         }
 
         telemetry.setRepositorySize(totalBytes)