feat: Introduce file by file acceptance (#4523)

* feat: Introduce file by file acceptance

Problem:
- We don't have a way for users to individually select which files should be accepted after code generation

Solution:
- Allow users to reject files from being accepted after code generation

Co-authored-by: Diana Abitova <[email protected]>
Co-authored-by: Josh Pinkney <[email protected]>

Author: jpinkney-aws

package-lock.json

@@ -4241,7 +4241,7 @@
     },
     "devDependencies": {
         "@aws-sdk/types": "^3.13.1",
-        "@aws-toolkits/telemetry": "^1.0.192",
+        "@aws-toolkits/telemetry": "^1.0.193",
         "@aws/fully-qualified-names": "^2.1.4",
         "@cspotcode/source-map-support": "^0.8.1",
         "@sinonjs/fake-timers": "^10.0.2",

packages/core/package.json

@@ -8,6 +8,8 @@ import { ExtensionMessage } from '../commands'
 import { TabType, TabsStorage } from '../storages/tabsStorage'
 import { CodeReference } from './amazonqCommonsConnector'
 import { FollowUpGenerator } from '../followUps/generator'
+import { getActions } from '../diffTree/actions'
+import { DiffTreeFileInfo } from '../diffTree/types'
 
 interface ChatPayload {
     chatMessage: string
@@ -21,6 +23,8 @@ export interface ConnectorProps {
     sendFeedback?: (tabId: string, feedbackPayload: FeedbackPayload) => void | undefined
     onError: (tabID: string, message: string, title: string) => void
     onWarning: (tabID: string, message: string, title: string) => void
+    onFileComponentUpdate: (tabID: string, filePaths: DiffTreeFileInfo[], deletedFiles: DiffTreeFileInfo[]) => void
+    onFileActionClick: (tabID: string, messageId: string, filePath: string, actionName: string) => void
     onUpdatePlaceholder: (tabID: string, newPlaceholder: string) => void
     onChatInputEnabled: (tabID: string, enabled: boolean) => void
     onUpdateAuthentication: (featureDevEnabled: boolean, authenticatingTabIDs: string[]) => void
@@ -32,6 +36,7 @@ export class Connector {
     private readonly sendMessageToExtension
     private readonly onError
     private readonly onWarning
+    private readonly onFileComponentUpdate
     private readonly onChatAnswerReceived
     private readonly onAsyncEventProgress
     private readonly updatePlaceholder
@@ -44,6 +49,7 @@ export class Connector {
         this.sendMessageToExtension = props.sendMessageToExtension
         this.onChatAnswerReceived = props.onChatAnswerReceived
         this.onWarning = props.onWarning
+        this.onFileComponentUpdate = props.onFileComponentUpdate
         this.onError = props.onError
         this.onAsyncEventProgress = props.onAsyncEventProgress
         this.updatePlaceholder = props.onUpdatePlaceholder
@@ -92,6 +98,16 @@ export class Connector {
             tabType: 'featuredev',
         })
     }
+    onFileActionClick = (tabID: string, messageId: string, filePath: string, actionName: string): void => {
+        this.sendMessageToExtension({
+            command: 'file-click',
+            tabID,
+            messageId,
+            filePath,
+            actionName,
+            tabType: 'featuredev',
+        })
+    }
 
     followUpClicked = (tabID: string, followUp: ChatItemAction): void => {
         this.sendMessageToExtension({
@@ -137,6 +153,7 @@ export class Connector {
 
     private processCodeResultMessage = async (messageData: any): Promise<void> => {
         if (this.onChatAnswerReceived !== undefined) {
+            const actions = getActions([...messageData.filePaths, ...messageData.deletedFiles])
             const answer: ChatItem = {
                 type: ChatItemType.CODE_RESULT,
                 relatedContent: undefined,
@@ -146,8 +163,9 @@ export class Connector {
                 // TODO get the backend to store a message id in addition to conversationID
                 messageId: messageData.messageID ?? messageData.triggerID ?? messageData.conversationID,
                 fileList: {
-                    filePaths: messageData.filePaths,
-                    deletedFiles: messageData.deletedFiles,
+                    filePaths: messageData.filePaths.map((f: DiffTreeFileInfo) => f.zipFilePath),
+                    deletedFiles: messageData.deletedFiles.map((f: DiffTreeFileInfo) => f.zipFilePath),
+                    actions,
                 },
                 body: '',
             }
@@ -178,6 +196,10 @@ export class Connector {
     }
 
     handleMessageReceive = async (messageData: any): Promise<void> => {
+        if (messageData.type === 'updateFileComponent') {
+            this.onFileComponentUpdate(messageData.tabID, messageData.filePaths, messageData.deletedFiles)
+            return
+        }
         if (messageData.type === 'errorMessage') {
             this.onError(messageData.tabID, messageData.message, messageData.title)
             return

packages/core/src/amazonq/webview/ui/apps/featureDevChatConnector.ts

@@ -28,5 +28,6 @@ type MessageCommand =
     | 'response-body-link-click'
     | 'transform'
     | 'footer-info-link-click'
+    | 'file-click'
 
 export type ExtensionMessage = Record<string, any> & { command: MessageCommand }

packages/core/src/amazonq/webview/ui/commands.ts

@@ -11,6 +11,7 @@ import { ExtensionMessage } from './commands'
 import { TabType, TabsStorage } from './storages/tabsStorage'
 import { WelcomeFollowupType } from './apps/amazonqCommonsConnector'
 import { AuthFollowUpType } from './followUps/generator'
+import { DiffTreeFileInfo } from './diffTree/types'
 
 export interface CodeReference {
     licenseName?: string
@@ -37,10 +38,12 @@ export interface ConnectorProps {
     onCWCOnboardingPageInteractionMessage: (message: ChatItem) => string | undefined
     onError: (tabID: string, message: string, title: string) => void
     onWarning: (tabID: string, message: string, title: string) => void
+    onFileComponentUpdate: (tabID: string, filePaths: DiffTreeFileInfo[], deletedFiles: DiffTreeFileInfo[]) => void
     onUpdatePlaceholder: (tabID: string, newPlaceholder: string) => void
     onChatInputEnabled: (tabID: string, enabled: boolean) => void
     onUpdateAuthentication: (featureDevEnabled: boolean, authenticatingTabIDs: string[]) => void
     onNewTab: (tabType: TabType) => void
+    onFileActionClick: (tabID: string, messageId: string, filePath: string, actionName: string) => void
     tabsStorage: TabsStorage
 }
 
@@ -297,6 +300,14 @@ export class Connector {
         }
     }
 
+    onFileActionClick = (tabID: string, messageId: string, filePath: string, actionName: string): void => {
+        switch (this.tabsStorage.getTab(tabID)?.type) {
+            case 'featuredev':
+                this.featureDevChatConnector.onFileActionClick(tabID, messageId, filePath, actionName)
+                break
+        }
+    }
+
     onOpenDiff = (tabID: string, filePath: string, deleted: boolean): void => {
         switch (this.tabsStorage.getTab(tabID)?.type) {
             case 'featuredev':

packages/core/src/amazonq/webview/ui/connector.ts

@@ -0,0 +1,50 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { MynahIcons } from '@aws/mynah-ui'
+import { FileNodeAction, TreeNodeDetails } from '@aws/mynah-ui/dist/static'
+import { DiffTreeFileInfo } from './types'
+
+export function getDetails(filePaths: DiffTreeFileInfo[]): Record<string, TreeNodeDetails> {
+    const details: Record<string, TreeNodeDetails> = {}
+    for (const filePath of filePaths) {
+        if (filePath.rejected) {
+            details[filePath.relativePath] = {
+                status: 'error',
+                label: 'File rejected',
+                icon: MynahIcons.CANCEL_CIRCLE,
+            }
+        }
+    }
+    return details
+}
+
+export function getActions(filePaths: DiffTreeFileInfo[]): Record<string, FileNodeAction[]> {
+    const actions: Record<string, FileNodeAction[]> = {}
+    for (const filePath of filePaths) {
+        switch (filePath.rejected) {
+            case true:
+                actions[filePath.relativePath] = [
+                    {
+                        icon: MynahIcons.REVERT,
+                        name: 'revert-rejection',
+                        description: 'Revert rejection',
+                    },
+                ]
+                break
+            case false:
+                actions[filePath.relativePath] = [
+                    {
+                        icon: MynahIcons.CANCEL_CIRCLE,
+                        status: 'error',
+                        name: 'reject-change',
+                        description: 'Reject change',
+                    },
+                ]
+                break
+        }
+    }
+    return actions
+}

packages/core/src/amazonq/webview/ui/diffTree/actions.ts

@@ -0,0 +1,10 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export type DiffTreeFileInfo = {
+    zipFilePath: string
+    relativePath: string
+    rejected: boolean
+}

packages/core/src/amazonq/webview/ui/diffTree/types.ts

@@ -14,6 +14,8 @@ import { FollowUpInteractionHandler } from './followUps/handler'
 import { QuickActionHandler } from './quickActions/handler'
 import { TextMessageHandler } from './messages/handler'
 import { MessageController } from './messages/controller'
+import { getActions, getDetails } from './diffTree/actions'
+import { DiffTreeFileInfo } from './diffTree/types'
 
 export const createMynahUI = (ideApi: any, featureDevInitEnabled: boolean, gumbyInitEnabled: boolean) => {
     // eslint-disable-next-line prefer-const
@@ -98,6 +100,7 @@ export const createMynahUI = (ideApi: any, featureDevInitEnabled: boolean, gumby
                 }
             }
         },
+        onFileActionClick: (tabID: string, messageId: string, filePath: string, actionName: string): void => {},
         onCWCOnboardingPageInteractionMessage: (message: ChatItem): string | undefined => {
             return messageController.sendMessageToTab(message, 'cwc')
         },
@@ -188,6 +191,18 @@ export const createMynahUI = (ideApi: any, featureDevInitEnabled: boolean, gumby
         onMessageReceived: (tabID: string, messageData: MynahUIDataModel) => {
             mynahUI.updateStore(tabID, messageData)
         },
+        onFileComponentUpdate: (tabID: string, filePaths: DiffTreeFileInfo[], deletedFiles: DiffTreeFileInfo[]) => {
+            const updateWith: Partial<ChatItem> = {
+                type: ChatItemType.CODE_RESULT,
+                fileList: {
+                    filePaths: filePaths.map(i => i.relativePath),
+                    deletedFiles: deletedFiles.map(i => i.relativePath),
+                    details: getDetails(filePaths),
+                    actions: getActions([...filePaths, ...deletedFiles]),
+                },
+            }
+            mynahUI.updateLastChatAnswer(tabID, updateWith)
+        },
         onWarning: (tabID: string, message: string, title: string) => {
             mynahUI.notify({
                 title: title,
@@ -330,6 +345,9 @@ export const createMynahUI = (ideApi: any, featureDevInitEnabled: boolean, gumby
         onFollowUpClicked: (tabID, messageId, followUp) => {
             followUpsInteractionHandler.onFollowUpClicked(tabID, messageId, followUp)
         },
+        onFileActionClick: async (tabID: string, messageId: string, filePath: string, actionName: string) => {
+            connector.onFileActionClick(tabID, messageId, filePath, actionName)
+        },
         onOpenDiff: connector.onOpenDiff,
         tabs: {
             'tab-1': {

packages/core/src/amazonq/webview/ui/main.ts

@@ -32,6 +32,7 @@ export function init(appContext: AmazonQAppInitContext) {
         authClicked: new vscode.EventEmitter<any>(),
         processResponseBodyLinkClick: new vscode.EventEmitter<any>(),
         insertCodeAtPositionClicked: new vscode.EventEmitter<any>(),
+        fileClicked: new vscode.EventEmitter<any>(),
     }
 
     const messenger = new Messenger(new AppToWebViewMessageDispatcher(appContext.getAppsToWebViewMessagePublisher()))

packages/core/src/amazonqFeatureDev/app.ts

@@ -39,6 +39,7 @@ export interface ChatControllerEventEmitters {
     readonly authClicked: EventEmitter<any>
     readonly processResponseBodyLinkClick: EventEmitter<any>
     readonly insertCodeAtPositionClicked: EventEmitter<any>
+    readonly fileClicked: EventEmitter<any>
 }
 
 type OpenDiffMessage = {
@@ -48,6 +49,13 @@ type OpenDiffMessage = {
     filePath: string
     deleted: boolean
 }
+
+type fileClickedMessage = {
+    tabID: string
+    messageId: string
+    filePath: string
+    actionName: string
+}
 export class FeatureDevController {
     private readonly messenger: Messenger
     private readonly sessionStorage: ChatSessionStorage
@@ -131,6 +139,9 @@ export class FeatureDevController {
         this.chatControllerMessageListeners.insertCodeAtPositionClicked.event(data => {
             this.insertCodeAtPosition(data)
         })
+        this.chatControllerMessageListeners.fileClicked.event(async data => {
+            return await this.fileClicked(data)
+        })
     }
 
     private async processChatItemVotedMessage(tabId: string, messageId: string, vote: string) {
@@ -402,6 +413,7 @@ export class FeatureDevController {
             session = await this.sessionStorage.getSession(message.tabID)
             telemetry.amazonq_isAcceptedCodeChanges.emit({
                 amazonqConversationId: session.conversationId,
+                amazonqNumberOfFilesAccepted: session.state.filePaths?.filter(i => !i.rejected).length ?? -1,
                 enabled: true,
                 result: 'Succeeded',
             })
@@ -599,6 +611,27 @@ export class FeatureDevController {
         return { left, right }
     }
 
+    private async fileClicked(message: fileClickedMessage) {
+        // TODO: add Telemetry here
+        const tabId: string = message.tabID
+        const filePathToUpdate: string = message.filePath
+
+        const session = await this.sessionStorage.getSession(tabId)
+        const filePathIndex = (session.state.filePaths ?? []).findIndex(obj => obj.relativePath === filePathToUpdate)
+        if (filePathIndex !== -1 && session.state.filePaths) {
+            session.state.filePaths[filePathIndex].rejected = !session.state.filePaths[filePathIndex].rejected
+        }
+        const deletedFilePathIndex = (session.state.deletedFiles ?? []).findIndex(
+            obj => obj.relativePath === filePathToUpdate
+        )
+        if (deletedFilePathIndex !== -1 && session.state.deletedFiles) {
+            session.state.deletedFiles[deletedFilePathIndex].rejected =
+                !session.state.deletedFiles[deletedFilePathIndex].rejected
+        }
+
+        await session.updateFilesPaths(tabId, session.state.filePaths ?? [], session.state.deletedFiles ?? [])
+    }
+
     private async openDiff(message: OpenDiffMessage) {
         const tabId: string = message.tabID
         const zipFilePath: string = message.filePath