Merge master into feature/amazonqLSP

Author: aws-toolkit-automation

.github/CODEOWNERS

@@ -1,6 +1,6 @@
 * @aws/aws-ides-team
 packages/core/src/codewhisperer/ @aws/codewhisperer-team
 packages/core/src/amazonqFeatureDev/ @aws/earlybird
-packages/core/src/codewhispererChat/ @aws/dexp
-packages/core/src/amazonq/ @aws/dexp
+packages/core/src/codewhispererChat/ @aws/flare
+packages/core/src/amazonq/ @aws/flare
 packages/core/src/awsService/accessanalyzer/ @aws/access-analyzer

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"
+}

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,