Merge master into feature/flare-mega

Author: aws-toolkit-automation

packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts

@@ -735,7 +735,7 @@ dependencyManagement:
     - identifier: "com.example:library1"
       targetVersion: "2.1.0"
       versionProperty: "library1.version"  # Optional
-      originType: "FIRST_PARTY" # or "THIRD_PARTY"  # Optional
+      originType: "FIRST_PARTY" # or "THIRD_PARTY"
     - identifier: "com.example:library2"
       targetVersion: "3.0.0"
       originType: "THIRD_PARTY"

packages/core/src/codewhisperer/commands/startTransformByQ.ts

@@ -677,7 +677,7 @@ export async function postTransformationJob() {
 
     let chatMessage = transformByQState.getJobFailureErrorChatMessage()
     if (transformByQState.isSucceeded()) {
-        chatMessage = CodeWhispererConstants.jobCompletedChatMessage
+        chatMessage = CodeWhispererConstants.jobCompletedChatMessage(transformByQState.getTargetJDKVersion() ?? '')
     } else if (transformByQState.isPartiallySucceeded()) {
         chatMessage = CodeWhispererConstants.jobPartiallyCompletedChatMessage
     }
@@ -708,9 +708,12 @@ export async function postTransformationJob() {
     }
 
     if (transformByQState.isSucceeded()) {
-        void vscode.window.showInformationMessage(CodeWhispererConstants.jobCompletedNotification, {
-            title: localizedText.ok,
-        })
+        void vscode.window.showInformationMessage(
+            CodeWhispererConstants.jobCompletedNotification(transformByQState.getTargetJDKVersion() ?? ''),
+            {
+                title: localizedText.ok,
+            }
+        )
     } else if (transformByQState.isPartiallySucceeded()) {
         void vscode.window
             .showInformationMessage(

packages/core/src/codewhisperer/models/constants.ts

@@ -649,9 +649,11 @@ export const enterJavaHomePlaceholder = 'Enter the path to your Java installatio
 
 export const openNewTabPlaceholder = 'Open a new tab to chat with Q'
 
-export const jobCompletedChatMessage = `I completed your transformation. You can review the diff to see my proposed changes and accept or reject them. The transformation summary has details about the changes I'm proposing.`
+export const jobCompletedChatMessage = (version: string) =>
+    `I completed your transformation. You can review the diff to see my proposed changes and accept or reject them. The transformation summary has details about the changes I'm proposing. If you want to upgrade additional libraries and other dependencies, run /transform with the transformed code and specify ${version} as the source and target version.`
 
-export const jobCompletedNotification = `Amazon Q transformed your code. You can review the diff to see my proposed changes and accept or reject them. The transformation summary has details about the changes.`
+export const jobCompletedNotification = (version: string) =>
+    `Amazon Q transformed your code. You can review the diff to see my proposed changes and accept or reject them. The transformation summary has details about the changes. If you want to upgrade additional libraries and other dependencies, run /transform with the transformed code and specify ${version} as the source and target version.`
 
 export const jobPartiallyCompletedChatMessage = `I transformed part of your code. You can review the diff to see my proposed changes and accept or reject them. The transformation summary has details about the files I updated and the errors that prevented a complete transformation.`
 

packages/core/src/codewhisperer/models/model.ts

@@ -683,8 +683,8 @@ export class ZipManifest {
     version: string = '1.0'
     hilCapabilities: string[] = ['HIL_1pDependency_VersionUpgrade']
     // TO-DO: add 'CLIENT_SIDE_BUILD' here when releasing
-    // TO-DO: add something like AGENTIC_PLAN_V1 here when BE allowlists everyone
-    transformCapabilities: string[] = ['EXPLAINABILITY_V1']
+    transformCapabilities: string[] = ['EXPLAINABILITY_V1', 'SELECTIVE_TRANSFORMATION_V2']
+    noInteractiveMode: boolean = true
     customBuildCommand: string = 'clean test'
     requestedConversions?: {
         sqlConversion?: {

packages/core/src/test/codewhisperer/commands/transformByQ.test.ts

@@ -392,6 +392,8 @@ dependencyManagement:
             const manifestText = manifestBuffer.toString('utf8')
             const manifest = JSON.parse(manifestText)
             assert.strictEqual(manifest.customBuildCommand, CodeWhispererConstants.skipUnitTestsBuildCommand)
+            assert.strictEqual(manifest.noInteractiveMode, true)
+            assert.strictEqual(manifest.transformCapabilities.includes('SELECTIVE_TRANSFORMATION_V2'), true)
         })
     })