feat(amazon q): display multiple diff patches

packages/amazonq/test/unit/amazonqGumby/resources/files/diff.json

@@ -0,0 +1,9 @@
+{
+    "content": [
+        {
+            "name": "Added file",
+            "fileName": "resources/files/addedFile.diff",
+            "isSuccessful": true
+        }
+    ]
+}

packages/amazonq/test/unit/amazonqGumby/transformationResultsHandler.test.ts

@@ -4,13 +4,19 @@
  */
 import assert from 'assert'
 import sinon from 'sinon'
-import os from 'os'
 import { DiffModel, AddedChangeNode, ModifiedChangeNode } from 'aws-core-vscode/codewhisperer/node'
+import { DescriptionContent } from 'aws-core-vscode/codewhisperer'
 import path from 'path'
 import { getTestResourceFilePath } from './amazonQGumbyUtil'
 import { fs } from 'aws-core-vscode/shared'
+import { createTestWorkspace } from 'aws-core-vscode/test'
 
 describe('DiffModel', function () {
+    let parsedTestDescriptions: DescriptionContent
+    beforeEach(async () => {
+        parsedTestDescriptions = JSON.parse(await fs.readFileText(getTestResourceFilePath('resources/files/diff.json')))
+    })
+
     afterEach(() => {
         sinon.restore()
     })
@@ -28,34 +34,76 @@ describe('DiffModel', function () {
 
             return true
         })
+        testDiffModel.parseDiff(
+            getTestResourceFilePath('resources/files/addedFile.diff'),
+            workspacePath,
+            parsedTestDescriptions.content[0],
+            1
+        )
 
-        testDiffModel.parseDiff(getTestResourceFilePath('resources/files/addedFile.diff'), workspacePath)
-
-        assert.strictEqual(testDiffModel.changes.length, 1)
-        const change = testDiffModel.changes[0]
+        assert.strictEqual(
+            testDiffModel.patchFileNodes[0].patchFilePath,
+            getTestResourceFilePath('resources/files/addedFile.diff')
+        )
+        assert(testDiffModel.patchFileNodes[0].label.includes(parsedTestDescriptions.content[0].name))
+        const change = testDiffModel.patchFileNodes[0].children[0]
 
         assert.strictEqual(change instanceof AddedChangeNode, true)
     })
 
     it('WHEN parsing a diff patch where a file was modified THEN returns an array representing the modified file', async function () {
         const testDiffModel = new DiffModel()
 
-        const workspacePath = os.tmpdir()
-
-        sinon.replace(fs, 'exists', async (path) => true)
+        const fileAmount = 1
+        const workspaceFolder = await createTestWorkspace(fileAmount, { fileContent: '' })
 
         await fs.writeFile(
-            path.join(workspacePath, 'README.md'),
+            path.join(workspaceFolder.uri.fsPath, 'README.md'),
             'This guide walks you through using Gradle to build a simple Java project.'
         )
 
-        testDiffModel.parseDiff(getTestResourceFilePath('resources/files/modifiedFile.diff'), workspacePath)
+        testDiffModel.parseDiff(
+            getTestResourceFilePath('resources/files/modifiedFile.diff'),
+            workspaceFolder.uri.fsPath,
+            parsedTestDescriptions.content[0],
+            1
+        )
 
-        assert.strictEqual(testDiffModel.changes.length, 1)
-        const change = testDiffModel.changes[0]
+        assert.strictEqual(
+            testDiffModel.patchFileNodes[0].patchFilePath,
+            getTestResourceFilePath('resources/files/modifiedFile.diff')
+        )
+        assert(testDiffModel.patchFileNodes[0].label.includes(parsedTestDescriptions.content[0].name))
+        const change = testDiffModel.patchFileNodes[0].children[0]
 
         assert.strictEqual(change instanceof ModifiedChangeNode, true)
+    })
+
+    it('WHEN parsing a diff patch where diff.json is not present and a file was modified THEN returns an array representing the modified file', async function () {
+        const testDiffModel = new DiffModel()
 
-        await fs.delete(path.join(workspacePath, 'README.md'), { recursive: true })
+        const fileAmount = 1
+        const workspaceFolder = await createTestWorkspace(fileAmount, { fileContent: '' })
+
+        await fs.writeFile(
+            path.join(workspaceFolder.uri.fsPath, 'README.md'),
+            'This guide walks you through using Gradle to build a simple Java project.'
+        )
+
+        testDiffModel.parseDiff(
+            getTestResourceFilePath('resources/files/modifiedFile.diff'),
+            workspaceFolder.uri.fsPath,
+            undefined,
+            1
+        )
+
+        assert.strictEqual(
+            testDiffModel.patchFileNodes[0].patchFilePath,
+            getTestResourceFilePath('resources/files/modifiedFile.diff')
+        )
+        assert(testDiffModel.patchFileNodes[0].label.endsWith('modifiedFile.diff'))
+        const change = testDiffModel.patchFileNodes[0].children[0]
+
+        assert.strictEqual(change instanceof ModifiedChangeNode, true)
     })
 })

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

@@ -62,6 +62,7 @@ import { getStringHash } from '../../../shared/utilities/textUtilities'
 import { getVersionData } from '../../../codewhisperer/service/transformByQ/transformMavenHandler'
 import AdmZip from 'adm-zip'
 import { AuthError } from '../../../auth/sso/server'
+import { isSelectiveTransformationReady } from '../../../dev/config'
 
 // These events can be interactions within the chat,
 // or elsewhere in the IDE
@@ -358,6 +359,7 @@ export class GumbyController {
                 this.transformationFinished({
                     message: CodeWhispererConstants.jobCancelledChatMessage,
                     tabID: message.tabID,
+                    includeStartNewTransformationButton: true,
                 })
                 break
             case ButtonActions.CONFIRM_SKIP_TESTS_FORM:
@@ -366,6 +368,12 @@ export class GumbyController {
             case ButtonActions.CANCEL_SKIP_TESTS_FORM:
                 this.messenger.sendJobFinishedMessage(message.tabID, CodeWhispererConstants.jobCancelledChatMessage)
                 break
+            case ButtonActions.CONFIRM_SELECTIVE_TRANSFORMATION_FORM:
+                await this.handleOneOrMultipleDiffs(message)
+                break
+            case ButtonActions.CANCEL_SELECTIVE_TRANSFORMATION_FORM:
+                this.messenger.sendJobFinishedMessage(message.tabID, CodeWhispererConstants.jobCancelledChatMessage)
+                break
             case ButtonActions.CONFIRM_SQL_CONVERSION_TRANSFORMATION_FORM:
                 await this.handleUserSQLConversionProjectSelection(message)
                 break
@@ -416,6 +424,20 @@ export class GumbyController {
             result: MetadataResult.Pass,
         })
         this.messenger.sendSkipTestsSelectionMessage(skipTestsSelection, message.tabID)
+        if (!isSelectiveTransformationReady) {
+            // perform local build
+            await this.validateBuildWithPromptOnError(message)
+        } else {
+            await this.messenger.sendOneOrMultipleDiffsPrompt(message.tabID)
+        }
+    }
+
+    private async handleOneOrMultipleDiffs(message: any) {
+        const oneOrMultipleDiffsSelection = message.formSelectedValues['GumbyTransformOneOrMultipleDiffsForm']
+        if (oneOrMultipleDiffsSelection === CodeWhispererConstants.multipleDiffsMessage) {
+            transformByQState.setMultipleDiffs(true)
+        }
+        this.messenger.sendOneOrMultipleDiffsMessage(oneOrMultipleDiffsSelection, message.tabID)
         // perform local build
         await this.validateBuildWithPromptOnError(message)
     }
@@ -452,7 +474,6 @@ export class GumbyController {
                 this.messenger.sendUnrecoverableErrorResponse('unsupported-source-jdk-version', message.tabID)
                 return
             }
-
             await processLanguageUpgradeTransformFormInput(pathToProject, fromJDKVersion, toJDKVersion)
             await this.messenger.sendSkipTestsPrompt(message.tabID)
         })
@@ -563,6 +584,7 @@ export class GumbyController {
             this.transformationFinished({
                 message: CodeWhispererConstants.jobCancelledChatMessage,
                 tabID: message.tabID,
+                includeStartNewTransformationButton: true,
             })
             return
         }
@@ -591,11 +613,15 @@ export class GumbyController {
         )
     }
 
-    private transformationFinished(data: { message: string | undefined; tabID: string }) {
+    private transformationFinished(data: {
+        message: string | undefined
+        tabID: string
+        includeStartNewTransformationButton: boolean
+    }) {
         this.resetTransformationChatFlow()
         // at this point job is either completed, partially_completed, cancelled, or failed
         if (data.message) {
-            this.messenger.sendJobFinishedMessage(data.tabID, data.message)
+            this.messenger.sendJobFinishedMessage(data.tabID, data.message, data.includeStartNewTransformationButton)
         }
     }
 
@@ -701,7 +727,11 @@ export class GumbyController {
         try {
             await finishHumanInTheLoop()
         } catch (err: any) {
-            this.transformationFinished({ tabID: message.tabID, message: (err as Error).message })
+            this.transformationFinished({
+                tabID: message.tabID,
+                message: (err as Error).message,
+                includeStartNewTransformationButton: true,
+            })
         }
 
         this.messenger.sendStaticTextResponse('end-HIL-early', message.tabID)

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

@@ -155,6 +155,45 @@ export class Messenger {
         )
     }
 
+    public async sendOneOrMultipleDiffsPrompt(tabID: string) {
+        const formItems: ChatItemFormItem[] = []
+        formItems.push({
+            id: 'GumbyTransformOneOrMultipleDiffsForm',
+            type: 'select',
+            title: CodeWhispererConstants.selectiveTransformationFormTitle,
+            mandatory: true,
+            options: [
+                {
+                    value: CodeWhispererConstants.oneDiffMessage,
+                    label: CodeWhispererConstants.oneDiffMessage,
+                },
+                {
+                    value: CodeWhispererConstants.multipleDiffsMessage,
+                    label: CodeWhispererConstants.multipleDiffsMessage,
+                },
+            ],
+        })
+
+        this.dispatcher.sendAsyncEventProgress(
+            new AsyncEventProgressMessage(tabID, {
+                inProgress: true,
+                message: CodeWhispererConstants.userPatchDescriptionChatMessage,
+            })
+        )
+
+        this.dispatcher.sendChatPrompt(
+            new ChatPrompt(
+                {
+                    message: 'Q Code Transformation',
+                    formItems: formItems,
+                },
+                'TransformOneOrMultipleDiffsForm',
+                tabID,
+                false
+            )
+        )
+    }
+
     public async sendLanguageUpgradeProjectPrompt(projects: TransformationCandidateProject[], tabID: string) {
         const projectFormOptions: { value: any; label: string }[] = []
         const detectedJavaVersions = new Array<JDKVersion | undefined>()
@@ -367,7 +406,6 @@ export class Messenger {
             },
             tabID
         )
-
         this.dispatcher.sendChatMessage(jobSubmittedMessage)
     }
 
@@ -477,13 +515,15 @@ export class Messenger {
         this.dispatcher.sendCommandMessage(new SendCommandMessage(message.command, message.tabID, message.eventId))
     }
 
-    public sendJobFinishedMessage(tabID: string, message: string) {
+    public sendJobFinishedMessage(tabID: string, message: string, includeStartNewTransformationButton: boolean = true) {
         const buttons: ChatItemButton[] = []
-        buttons.push({
-            keepCardAfterClick: false,
-            text: CodeWhispererConstants.startTransformationButtonText,
-            id: ButtonActions.CONFIRM_START_TRANSFORMATION_FLOW,
-        })
+        if (includeStartNewTransformationButton) {
+            buttons.push({
+                keepCardAfterClick: false,
+                text: CodeWhispererConstants.startTransformationButtonText,
+                id: ButtonActions.CONFIRM_START_TRANSFORMATION_FLOW,
+            })
+        }
 
         this.dispatcher.sendChatMessage(
             new ChatMessage(
@@ -562,6 +602,11 @@ export class Messenger {
         this.dispatcher.sendChatMessage(new ChatMessage({ message, messageType: 'ai-prompt' }, tabID))
     }
 
+    public sendOneOrMultipleDiffsMessage(selectiveTransformationSelection: string, tabID: string) {
+        const message = `Okay, I will create ${selectiveTransformationSelection.toLowerCase()} when providing the proposed changes.`
+        this.dispatcher.sendChatMessage(new ChatMessage({ message, messageType: 'ai-prompt' }, tabID))
+    }
+
     public sendHumanInTheLoopInitialMessage(tabID: string, codeSnippet: string) {
         let message = `I was not able to upgrade all dependencies. To resolve it, I will try to find an updated depedency in your local Maven repository. I will need additional information from you to continue.`
 

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

@@ -18,6 +18,8 @@ export enum ButtonActions {
     CANCEL_TRANSFORMATION_FORM = 'gumbyTransformFormCancel', // shared between Language Upgrade & SQL Conversion
     CONFIRM_SKIP_TESTS_FORM = 'gumbyTransformSkipTestsFormConfirm',
     CANCEL_SKIP_TESTS_FORM = 'gumbyTransformSkipTestsFormCancel',
+    CONFIRM_SELECTIVE_TRANSFORMATION_FORM = 'gumbyTransformOneOrMultipleDiffsFormConfirm',
+    CANCEL_SELECTIVE_TRANSFORMATION_FORM = 'gumbyTransformOneOrMultipleDiffsFormCancel',
     SELECT_SQL_CONVERSION_METADATA_FILE = 'gumbySQLConversionMetadataTransformFormConfirm',
     CONFIRM_DEPENDENCY_FORM = 'gumbyTransformDependencyFormConfirm',
     CANCEL_DEPENDENCY_FORM = 'gumbyTransformDependencyFormCancel',

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

@@ -811,15 +811,17 @@ export async function postTransformationJob() {
     }
 
     let chatMessage = transformByQState.getJobFailureErrorChatMessage()
+    const diffMessage = CodeWhispererConstants.diffMessage(transformByQState.getMultipleDiffs())
     if (transformByQState.isSucceeded()) {
-        chatMessage = CodeWhispererConstants.jobCompletedChatMessage
+        chatMessage = CodeWhispererConstants.jobCompletedChatMessage(diffMessage)
     } else if (transformByQState.isPartiallySucceeded()) {
-        chatMessage = CodeWhispererConstants.jobPartiallyCompletedChatMessage
+        chatMessage = CodeWhispererConstants.jobPartiallyCompletedChatMessage(diffMessage)
     }
 
-    transformByQState
-        .getChatControllers()
-        ?.transformationFinished.fire({ message: chatMessage, tabID: ChatSessionManager.Instance.getSession().tabID })
+    transformByQState.getChatControllers()?.transformationFinished.fire({
+        message: chatMessage,
+        tabID: ChatSessionManager.Instance.getSession().tabID,
+    })
     const durationInMs = calculateTotalLatency(CodeTransformTelemetryState.instance.getStartTime())
     const resultStatusMessage = transformByQState.getStatus()
 
@@ -842,11 +844,11 @@ export async function postTransformationJob() {
     }
 
     if (transformByQState.isSucceeded()) {
-        void vscode.window.showInformationMessage(CodeWhispererConstants.jobCompletedNotification)
+        void vscode.window.showInformationMessage(CodeWhispererConstants.jobCompletedNotification(diffMessage))
     } else if (transformByQState.isPartiallySucceeded()) {
         void vscode.window
             .showInformationMessage(
-                CodeWhispererConstants.jobPartiallyCompletedNotification,
+                CodeWhispererConstants.jobPartiallyCompletedNotification(diffMessage),
                 CodeWhispererConstants.amazonQFeedbackText
             )
             .then((choice) => {