refactor(amazonqFeatureDev): include updated rts model

Author: tverney

packages/core/src/amazonqFeatureDev/client/featureDev.ts

@@ -134,7 +134,10 @@ export class FeatureDevClient {
         conversationId: string,
         uploadId: string,
         message: string,
+<<<<<<< HEAD
         codeGenerationId: string,
+=======
+>>>>>>> 4742b3c59 (refactor(amazonqFeatureDev): include updated rts model)
         currentCodeGenerationId?: string
     ) {
         try {

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

@@ -109,6 +109,7 @@ export class Session {
             workspaceFolders: this.config.workspaceFolders,
             proxyClient: this.proxyClient,
             conversationId: this.conversationId,
+            currentCodeGenerationId: this.currentCodeGenerationId as string,
         }
     }
 
@@ -137,9 +138,13 @@ export class Session {
 
         if (resp.nextState) {
             // Cancel the request before moving to a new state
+<<<<<<< HEAD
             if (!this.state?.tokenSource?.token.isCancellationRequested) {
                 this.state?.tokenSource?.cancel()
             }
+=======
+            this.state?.tokenSource?.cancel()
+>>>>>>> 4742b3c59 (refactor(amazonqFeatureDev): include updated rts model)
 
             // Move to the next state
             this._state = resp.nextState

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

@@ -147,6 +147,7 @@ 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
@@ -304,6 +305,9 @@ export class CodeGenState extends CodeGenBase implements SessionState {
                     if (action.tokenSource) {
                         this.tokenSource = action.tokenSource
                     }
+                    this.isCancellationRequested = true
+                    action.tokenSource?.dispose()
+                    action.tokenSource = undefined
                 })
 
                 action.telemetry.setGenerateCodeIteration(this.currentIteration)
@@ -492,7 +496,6 @@ export class PrepareCodeGenState implements SessionState {
         public references: CodeReference[],
         public tabID: string,
         public currentIteration: number,
-
         public codeGenerationRemainingIterationCount?: number,
         public codeGenerationTotalIterationCount?: number,
         public currentCodeGenerationId?: string,