fix(amazonqFeatureDev): create a new token to stop and iterate in the same session

Author: tverney

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

@@ -137,13 +137,17 @@ export class Session {
 
         if (resp.nextState) {
             // Cancel the request before moving to a new state
+<<<<<<< HEAD
 <<<<<<< HEAD
             if (!this.state?.tokenSource?.token.isCancellationRequested) {
                 this.state?.tokenSource?.cancel()
             }
 =======
             this.state?.tokenSource?.cancel()
 >>>>>>> 4742b3c59 (refactor(amazonqFeatureDev): include updated rts model)
+=======
+            if (!this.state?.tokenSource?.token.isCancellationRequested) this.state?.tokenSource?.cancel()
+>>>>>>> e6782b66f (fix(amazonqFeatureDev): create a new token to stop and iterate in the same session)
 
             // Move to the next state
             this._state = resp.nextState

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

@@ -306,9 +306,6 @@ export class CodeGenState extends CodeGenBase implements SessionState {
                         this.tokenSource = action.tokenSource
                     }
                     this.isCancellationRequested = true
-                    if (action.tokenSource) {
-                        this.tokenSource = action.tokenSource
-                    }
                     action.tokenSource?.dispose()
                     action.tokenSource = undefined
                 })
@@ -324,9 +321,6 @@ export class CodeGenState extends CodeGenBase implements SessionState {
                     this.currentCodeGenerationId
                 )
 
-                this.currentCodeGenerationId = codeGenerationId
-                this.config.currentCodeGenerationId = codeGenerationId
-
                 if (!this.isCancellationRequested) {
                     action.messenger.sendAnswer({
                         message: i18n('AWS.amazonq.featureDev.pillText.generatingCode'),
@@ -541,7 +535,11 @@ export class PrepareCodeGenState implements SessionState {
                 span
             )
             const uploadId = randomUUID()
-            const { uploadUrl, kmsKeyArn } = await this.config.proxyClient.createUploadUrl(
+            const {
+                uploadUrl,
+                uploadId: returnedUploadId,
+                kmsKeyArn,
+            } = await this.config.proxyClient.createUploadUrl(
                 this.config.conversationId,
                 zipFileChecksum,
                 zipFileBuffer.length,