refactor(amazonqFeatureDev): add logic for codeGenerationId

Author: tverney

packages/core/src/amazonqFeatureDev/client/codewhispererruntime-2022-11-11.json

@@ -439,7 +439,8 @@
                 "acceptedCharacterCount": { "shape": "Integer" },
                 "acceptedLineCount": { "shape": "Integer" },
                 "acceptedSnippetHasReference": { "shape": "Boolean" },
-                "hasProjectLevelContext": { "shape": "Boolean" }
+                "hasProjectLevelContext": { "shape": "Boolean" },
+                "userIntent": { "shape": "UserIntent" }
             }
         },
         "ChatInteractWithMessageEventInteractionTargetString": {
@@ -1564,6 +1565,7 @@
                 "conversationState": { "shape": "ConversationState" },
                 "workspaceState": { "shape": "WorkspaceState" },
                 "taskAssistPlan": { "shape": "TaskAssistPlan" },
+                "codeGenerationId": { "shape": "CodeGenerationId" },
                 "currentCodeGenerationId": { "shape": "CodeGenerationId" }
             }
         },
@@ -2107,7 +2109,8 @@
                 "CITE_SOURCES",
                 "EXPLAIN_LINE_BY_LINE",
                 "EXPLAIN_CODE_SELECTION",
-                "GENERATE_CLOUDFORMATION_TEMPLATE"
+                "GENERATE_CLOUDFORMATION_TEMPLATE",
+                "GENERATE_UNIT_TESTS"
             ]
         },
         "UserModificationEvent": {

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

@@ -121,11 +121,13 @@ export class FeatureDevClient {
         conversationId: string,
         uploadId: string,
         message: string,
+        codeGenerationId: string,
         currentCodeGenerationId?: string
     ) {
         try {
             const client = await this.getClient()
             const params = {
+                codeGenerationId,
                 conversationState: {
                     conversationId,
                     currentMessage: {

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

@@ -273,11 +273,12 @@ export class CodeGenState extends CodeGenBase implements SessionState {
 
                 action.telemetry.setGenerateCodeIteration(this.currentIteration)
                 action.telemetry.setGenerateCodeLastInvocationTime()
-
-                const { codeGenerationId } = await this.config.proxyClient.startCodeGeneration(
+                const codeGenerationId = randomUUID()
+                await this.config.proxyClient.startCodeGeneration(
                     this.config.conversationId,
                     this.config.uploadId,
                     action.msg,
+                    codeGenerationId,
                     this.currentCodeGenerationId
                 )
 
@@ -457,41 +458,40 @@ export class PrepareCodeGenState implements SessionState {
         })
 
         action.messenger.sendUpdatePlaceholder(this.tabID, i18n('AWS.amazonq.featureDev.pillText.uploadingCode'))
-        if (!this.uploadId) {
-            const uploadId = await telemetry.amazonq_createUpload.run(async (span) => {
-                span.record({
-                    amazonqConversationId: this.config.conversationId,
-                    credentialStartUrl: AuthUtil.instance.startUrl,
-                })
-                const { zipFileBuffer, zipFileChecksum } = await prepareRepoData(
-                    this.config.workspaceRoots,
-                    this.config.workspaceFolders,
-                    action.telemetry,
-                    span
-                )
+        const uploadId = await telemetry.amazonq_createUpload.run(async (span) => {
+            span.record({
+                amazonqConversationId: this.config.conversationId,
+                credentialStartUrl: AuthUtil.instance.startUrl,
+            })
+            const { zipFileBuffer, zipFileChecksum } = await prepareRepoData(
+                this.config.workspaceRoots,
+                this.config.workspaceFolders,
+                action.telemetry,
+                span
+            )
 
-                const { uploadUrl, uploadId, kmsKeyArn } = await this.config.proxyClient.createUploadUrl(
-                    this.config.conversationId,
-                    zipFileChecksum,
-                    zipFileBuffer.length
-                )
+            const { uploadUrl, uploadId, kmsKeyArn } = await this.config.proxyClient.createUploadUrl(
+                this.config.conversationId,
+                zipFileChecksum,
+                zipFileBuffer.length
+            )
 
-                await uploadCode(uploadUrl, zipFileBuffer, zipFileChecksum, kmsKeyArn)
-                action.messenger.sendAnswer({
-                    message: i18n('AWS.amazonq.featureDev.pillText.contextGatheringCompleted'),
-                    type: 'answer-part',
-                    tabID: this.tabID,
-                })
+            await uploadCode(uploadUrl, zipFileBuffer, zipFileChecksum, kmsKeyArn)
+            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
+        })
+        this.uploadId = uploadId
 
-                return uploadId
-            })
-            this.uploadId = uploadId
-        }
         const nextState = new CodeGenState(
             { ...this.config, uploadId: this.uploadId, currentCodeGenerationId: this.currentCodeGenerationId },
             this.filePaths,