Merge master into feature/emr

aws-toolkit-automation · web-flow · commit b3a4ab6300a7 · 2024-12-04T19:12:11.000+01:00
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-357cef5f-a2e7-43c4-b4ca-0e89bc8fccd7.json b/packages/amazonq/.changes/next-release/Bug Fix-357cef5f-a2e7-43c4-b4ca-0e89bc8fccd7.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q /doc: progress bar persists after cancelling README creation"
+}
diff --git a/packages/core/src/amazonqDoc/session/sessionState.ts b/packages/core/src/amazonqDoc/session/sessionState.ts
@@ -244,9 +244,9 @@ export class CodeGenState extends CodeGenBase implements SessionState {
                 action.telemetry.setGenerateCodeIteration(this.currentIteration)
                 action.telemetry.setGenerateCodeLastInvocationTime()
                 const codeGenerationId = randomUUID()
-
-                action.messenger.sendDocProgress(this.tabID, DocGenerationStep.SUMMARIZING_FILES, 0, action.mode)
-
+                if (!action.tokenSource?.token.isCancellationRequested) {
+                    action.messenger.sendDocProgress(this.tabID, DocGenerationStep.SUMMARIZING_FILES, 0, action.mode)
+                }
                 await this.config.proxyClient.startCodeGeneration(
                     this.config.conversationId,
                     this.config.uploadId,

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +	"type": "Bug Fix",
 +	"description": "Amazon Q /doc: progress bar persists after cancelling README creation"
 +}