Merge remote-tracking branch 'upstream/feature/agentic-chat' into feature/agentic-chat

laileni-aws · laileni-aws · commit bdaae157ec38 · 2025-04-14T09:34:07.000-07:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/amazonq/.changes/1.59.0.json b/packages/amazonq/.changes/1.59.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2025-04-11",
+	"version": "1.59.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Code fix line number or file is sometimes not accurate"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix Q agents will fail for /transform /dev /test features if IdC kms key is configured with 400 error"
+		}
+	]
+}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-42b2c2f0-e40e-4f97-842b-cb7ead1a010b.json b/packages/amazonq/.changes/next-release/Bug Fix-42b2c2f0-e40e-4f97-842b-cb7ead1a010b.json
diff --git a/packages/amazonq/CHANGELOG.md b/packages/amazonq/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.59.0 2025-04-11
+
+- **Bug Fix** Code fix line number or file is sometimes not accurate
+- **Bug Fix** Fix Q agents will fail for /transform /dev /test features if IdC kms key is configured with 400 error
+
 ## 1.58.0 2025-04-11
 
 - **Bug Fix** inline chat activates properly when using 'aws.experiments.amazonqChatLSP' feature flag
diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json
@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI",
-    "version": "1.59.0-SNAPSHOT",
+    "version": "1.60.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -525,7 +525,7 @@
         "@aws-sdk/s3-request-presigner": "<3.731.0",
         "@aws-sdk/smithy-client": "<3.731.0",
         "@aws-sdk/util-arn-parser": "<3.731.0",
-        "@aws/mynah-ui": "^4.30.1",
+        "@aws/mynah-ui": "^4.31.0-beta.1",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
         "@iarna/toml": "^2.2.5",
         "@smithy/fetch-http-handler": "^5.0.1",
diff --git a/packages/core/src/amazonq/webview/ui/tabs/generator.ts b/packages/core/src/amazonq/webview/ui/tabs/generator.ts
@@ -91,20 +91,11 @@ export class TabDataGenerator {
                 tabType === 'cwc'
                     ? [
                           {
-                              type: 'toggle',
-                              id: 'prompt-type',
-                              value: 'pair-programming-on',
-                              tooltip: 'Pair programmer on',
-                              options: [
-                                  {
-                                      value: 'pair-programming-on',
-                                      icon: 'code-block', // TODO: correct icons
-                                  },
-                                  {
-                                      value: 'pair-programming-off',
-                                      icon: 'chat', // TODO: correct icons
-                                  },
-                              ],
+                              type: 'switch',
+                              id: 'pair-programmer-mode',
+                              tooltip: 'Enable or disable pair programmer mode',
+                              value: 'true',
+                              icon: 'code-block',
                           },
                       ]
                     : [],
diff --git a/packages/core/src/amazonqDoc/session/session.ts b/packages/core/src/amazonqDoc/session/session.ts
@@ -313,6 +313,7 @@ export class Session {
                     clientId: getClientId(globals.globalState),
                     ideVersion: extensionVersion,
                 },
+                profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,
             }
 
             const response = await client.sendTelemetryEvent(params).promise()
diff --git a/packages/core/src/amazonqFeatureDev/client/featureDev.ts b/packages/core/src/amazonqFeatureDev/client/featureDev.ts
@@ -244,11 +244,13 @@ export class FeatureDevClient implements FeatureClient {
     }
 
     public async exportResultArchive(conversationId: string) {
+        const profile = AuthUtil.instance.regionProfileManager.activeRegionProfile
         try {
             const streamingClient = await createCodeWhispererChatStreamingClient()
             const params = {
                 exportId: conversationId,
                 exportIntent: 'TASK_ASSIST',
+                profileArn: profile?.arn,
             } satisfies ExportResultArchiveCommandInput
             getLogger().debug(`Executing exportResultArchive with %O`, params)
             const archiveResponse = await streamingClient.exportResultArchive(params)
diff --git a/packages/core/src/codewhisperer/client/codewhisperer.ts b/packages/core/src/codewhisperer/client/codewhisperer.ts
@@ -252,6 +252,7 @@ export class DefaultCodeWhispererClient {
                 clientId: getClientId(globals.globalState),
                 ideVersion: extensionVersion,
             },
+            profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,
         }
         if (!AuthUtil.instance.isValidEnterpriseSsoInUse() && !globals.telemetry.telemetryEnabled) {
             return
diff --git a/packages/core/src/codewhisperer/commands/startTestGeneration.ts b/packages/core/src/codewhisperer/commands/startTestGeneration.ts
@@ -72,7 +72,7 @@ export async function startTestGenerationProcess(
         let artifactMap: ArtifactMap = {}
         const uploadStartTime = performance.now()
         try {
-            artifactMap = await getPresignedUrlAndUploadTestGen(zipMetadata)
+            artifactMap = await getPresignedUrlAndUploadTestGen(zipMetadata, profile)
         } finally {
             const outputLogPath = path.join(testGenerationLogsDir, 'output.log')
             if (await fs.existsFile(outputLogPath)) {
diff --git a/packages/core/src/codewhisperer/commands/startTransformByQ.ts b/packages/core/src/codewhisperer/commands/startTransformByQ.ts
@@ -269,7 +269,7 @@ export async function preTransformationUploadCode() {
             })
 
             transformByQState.setPayloadFilePath(payloadFilePath)
-            uploadId = await uploadPayload(payloadFilePath)
+            uploadId = await uploadPayload(payloadFilePath, AuthUtil.instance.regionProfileManager.activeRegionProfile)
             telemetry.record({ codeTransformJobId: uploadId }) // uploadId is re-used as jobId
         })
     } catch (err) {
@@ -457,7 +457,7 @@ export async function finishHumanInTheLoop(selectedDependency?: string) {
             }),
         })
 
-        await uploadPayload(uploadResult.tempFilePath, {
+        await uploadPayload(uploadResult.tempFilePath, profile, {
             transformationUploadContext: {
                 jobId,
                 uploadArtifactType: 'Dependencies',
diff --git a/packages/core/src/codewhisperer/service/testGenHandler.ts b/packages/core/src/codewhisperer/service/testGenHandler.ts
@@ -36,6 +36,7 @@ import { randomUUID } from '../../shared/crypto'
 import { sleep } from '../../shared/utilities/timeoutUtils'
 import { tempDirPath } from '../../shared/filesystemUtilities'
 import fs from '../../shared/fs/fs'
+import { AuthUtil } from '../util/authUtil'
 
 // TODO: Get TestFileName and Framework and to error message
 export function throwIfCancelled() {
@@ -45,7 +46,7 @@ export function throwIfCancelled() {
     }
 }
 
-export async function getPresignedUrlAndUploadTestGen(zipMetadata: ZipMetadata) {
+export async function getPresignedUrlAndUploadTestGen(zipMetadata: ZipMetadata, profile: RegionProfile | undefined) {
     const logger = getLogger()
     if (zipMetadata.zipFilePath === '') {
         getLogger().error('Failed to create valid source zip')
@@ -55,6 +56,7 @@ export async function getPresignedUrlAndUploadTestGen(zipMetadata: ZipMetadata)
         contentMd5: getMd5(zipMetadata.zipFilePath),
         artifactType: 'SourceCode',
         uploadIntent: CodeWhispererConstants.testGenUploadIntent,
+        profileArn: profile?.arn,
     }
     logger.verbose(`Prepare for uploading src context...`)
     const srcResp = await codeWhisperer.codeWhispererClient.createUploadUrl(srcReq).catch((err) => {
@@ -310,7 +312,8 @@ export async function downloadResultArchive(
                     },
                 },
             },
-            pathToArchive
+            pathToArchive,
+            AuthUtil.instance.regionProfileManager.activeRegionProfile
         )
     } catch (e: any) {
         downloadErrorMessage = (e as Error).message
diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts b/packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts
@@ -51,6 +51,7 @@ import { encodeHTML } from '../../../shared/utilities/textUtilities'
 import { convertToTimeString } from '../../../shared/datetime'
 import { getAuthType } from '../../../auth/utils'
 import { UserWrittenCodeTracker } from '../../tracker/userWrittenCodeTracker'
+import { AuthUtil } from '../../util/authUtil'
 
 export function getSha256(buffer: Buffer) {
     const hasher = crypto.createHash('sha256')
@@ -193,7 +194,11 @@ export async function stopJob(jobId: string) {
     }
 }
 
-export async function uploadPayload(payloadFileName: string, uploadContext?: UploadContext) {
+export async function uploadPayload(
+    payloadFileName: string,
+    profile: RegionProfile | undefined,
+    uploadContext?: UploadContext
+) {
     const buffer = Buffer.from(await fs.readFileBytes(payloadFileName))
     const sha256 = getSha256(buffer)
 
@@ -205,6 +210,7 @@ export async function uploadPayload(payloadFileName: string, uploadContext?: Upl
             contentChecksumType: CodeWhispererConstants.contentChecksumType,
             uploadIntent: CodeWhispererConstants.uploadIntent,
             uploadContext,
+            profileArn: profile?.arn,
         })
     } catch (e: any) {
         const errorMessage = `Creating the upload URL failed due to: ${(e as Error).message}`
@@ -759,7 +765,8 @@ export async function downloadResultArchive(
                 exportId: jobId,
                 exportIntent: ExportIntent.TRANSFORMATION,
             },
-            pathToArchive
+            pathToArchive,
+            AuthUtil.instance.regionProfileManager.activeRegionProfile
         )
     } catch (e: any) {
         getLogger().error(`CodeTransformation: ExportResultArchive error = %O`, e)
diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts b/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts
@@ -27,6 +27,7 @@ import { ChatSessionManager } from '../../../amazonqGumby/chat/storages/chatSess
 import { setContext } from '../../../shared/vscode/setContext'
 import * as codeWhisperer from '../../client/codewhisperer'
 import { UserWrittenCodeTracker } from '../../tracker/userWrittenCodeTracker'
+import { AuthUtil } from '../../util/authUtil'
 
 export abstract class ProposedChangeNode {
     abstract readonly resourcePath: string
@@ -403,7 +404,8 @@ export class ProposedTransformationExplorer {
                             exportId: transformByQState.getJobId(),
                             exportIntent: ExportIntent.TRANSFORMATION,
                         },
-                        pathToArchive
+                        pathToArchive,
+                        AuthUtil.instance.regionProfileManager.activeRegionProfile
                     )
 
                     getLogger().info('CodeTransformation: downloaded results successfully')
diff --git a/packages/core/src/codewhispererChat/controllers/chat/controller.ts b/packages/core/src/codewhispererChat/controllers/chat/controller.ts
@@ -955,8 +955,8 @@ export class ChatController {
 
     private async processPromptInputOptionChange(message: PromptInputOptionChange) {
         const session = this.sessionStorage.getSession(message.tabID)
-        const promptTypeValue = message.optionsValues['prompt-type']
-        if (promptTypeValue === 'pair-programming-on') {
+        const promptTypeValue = message.optionsValues['pair-programmer-mode']
+        if (promptTypeValue === 'true') {
             session.setPairProgrammingModeOn(true)
             this.messenger.sendDirectiveMessage(
                 message.tabID,
diff --git a/packages/core/src/shared/utilities/download.ts b/packages/core/src/shared/utilities/download.ts
@@ -6,6 +6,7 @@
 import { CodeWhispererStreaming, ExportResultArchiveCommandInput } from '@amzn/codewhisperer-streaming'
 import { ToolkitError } from '../errors'
 import fs from '../fs/fs'
+import { RegionProfile } from '../../codewhisperer/models/model'
 
 /**
  * This class represents the structure of the archive returned by the ExportResultArchive endpoint
@@ -21,9 +22,10 @@ export class ExportResultArchiveStructure {
 export async function downloadExportResultArchive(
     cwStreamingClient: CodeWhispererStreaming,
     exportResultArchiveArgs: ExportResultArchiveCommandInput,
-    toPath: string
+    toPath: string,
+    profile: RegionProfile | undefined
 ) {
-    const result = await cwStreamingClient.exportResultArchive(exportResultArchiveArgs)
+    const result = await cwStreamingClient.exportResultArchive({ ...exportResultArchiveArgs, profileArn: profile?.arn })
 
     const buffer = []
 
diff --git a/packages/core/src/testInteg/perf/downloadExportResultArchive.test.ts b/packages/core/src/testInteg/perf/downloadExportResultArchive.test.ts
@@ -11,12 +11,14 @@ import { fs, getRandomString } from '../../shared'
 import { createTestWorkspace } from '../../test/testUtil'
 import { getEqualOSTestOptions, performanceTest } from '../../shared/performance/performance'
 import { downloadExportResultArchive } from '../../shared/utilities/download'
+import { RegionProfile } from '../../codewhisperer'
 
 interface SetupResult {
     workspace: WorkspaceFolder
     exportCommandInput: ExportResultArchiveCommandInput
     writeFileStub: sinon.SinonStub
     cwStreaming: any
+    profile: RegionProfile
 }
 
 interface FakeCommandOutput {
@@ -42,7 +44,8 @@ async function setup(pieces: number, pieceSize: number): Promise<SetupResult> {
     const cwStreaming = { exportResultArchive: () => generateCommandOutput(pieces, pieceSize) }
 
     const writeFileStub = sinon.stub(fs, 'writeFile')
-    return { workspace, exportCommandInput, writeFileStub, cwStreaming }
+    const profile: RegionProfile = { name: 'foo', region: 'us-east-1', arn: 'foo-arn', description: '' }
+    return { workspace, exportCommandInput, writeFileStub, cwStreaming, profile }
 }
 
 function perfTest(pieces: number, pieceSize: number, label: string) {
@@ -56,11 +59,18 @@ function perfTest(pieces: number, pieceSize: number, label: string) {
         function () {
             return {
                 setup: async () => await setup(pieces, pieceSize),
-                execute: async ({ workspace, cwStreaming, exportCommandInput, writeFileStub }: SetupResult) => {
+                execute: async ({
+                    workspace,
+                    cwStreaming,
+                    exportCommandInput,
+                    writeFileStub,
+                    profile,
+                }: SetupResult) => {
                     await downloadExportResultArchive(
                         cwStreaming,
                         exportCommandInput,
-                        path.join(workspace.uri.fsPath, 'result')
+                        path.join(workspace.uri.fsPath, 'result'),
+                        profile
                     )
                 },
                 verify: async (setup: SetupResult) => {

Original file line number	Diff line number	Diff line change
`@@ -313,6 +313,7 @@ export class Session {`
`313`	`313`	`clientId: getClientId(globals.globalState),`
`314`	`314`	`ideVersion: extensionVersion,`
`315`	`315`	`},`
	`316`	`+ profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,`
`316`	`317`	`}`
`317`	`318`
`318`	`319`	`const response = await client.sendTelemetryEvent(params).promise()`
Original file line number	Diff line number	Diff line change
`@@ -252,6 +252,7 @@ export class DefaultCodeWhispererClient {`
`252`	`252`	`clientId: getClientId(globals.globalState),`
`253`	`253`	`ideVersion: extensionVersion,`
`254`	`254`	`},`
	`255`	`+ profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,`
`255`	`256`	`}`
`256`	`257`	`if (!AuthUtil.instance.isValidEnterpriseSsoInUse() && !globals.telemetry.telemetryEnabled) {`
`257`	`258`	`return`