Merge branch 'master' into fullyRemoveFSE

Hweinstock · Hweinstock · commit ce26f4bfe6ec · 2024-10-08T09:31:17.000-04:00
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-ff32752d-fa0b-4d38-b719-68eb3c9ddca6.json b/packages/amazonq/.changes/next-release/Bug Fix-ff32752d-fa0b-4d38-b719-68eb3c9ddca6.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Q dev handle no change required"
+}
diff --git a/packages/core/package.nls.json b/packages/core/package.nls.json
@@ -273,6 +273,7 @@
     "AWS.amazonq.featureDev.error.illegalStateTransition": "Illegal transition between states, restart the conversation",
     "AWS.amazonq.featureDev.error.prepareRepoFailedError": "Sorry, I ran into an issue while trying to upload your code. Please try again.",
     "AWS.amazonq.featureDev.error.promptRefusalException": "I'm sorry, I can't generate code for your request. Please make sure your message and code files comply with the <a href=\"https://aws.amazon.com/machine-learning/responsible-ai/policy/\">AWS Responsible AI Policy.</a>",
+    "AWS.amazonq.featureDev.error.noChangeRequiredException": "I’m sorry, I ran into an issue while trying to generate your code.\n\n- `/dev` can generate code to make a change in your project. Provide a detailed description of the new feature or code changes you want to make, including the specifics of what the code should achieve.\n\n- To ask me to explain, debug, or optimize your code, you can close this chat tab to start a new conversation.",
     "AWS.amazonq.featureDev.error.zipFileError": "The zip file is corrupted",
     "AWS.amazonq.featureDev.error.codeIterationLimitError": "Sorry, you've reached the quota for number of iterations on code generation. You can insert this code in your files or discuss a new plan. For more information on quotas, see the <a href=\"https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/software-dev.html#quotas\" target=\"_blank\">Amazon Q Developer documentation.</a>",
     "AWS.amazonq.featureDev.error.tabIdNotFoundError": "I'm sorry, I'm having technical difficulties at the moment. Please try again.",
diff --git a/packages/core/src/amazonq/webview/ui/quickActions/generator.ts b/packages/core/src/amazonq/webview/ui/quickActions/generator.ts
@@ -29,8 +29,7 @@ export class QuickActionGenerator {
                               {
                                   command: '/dev',
                                   placeholder: 'Describe your task or issue in as much detail as possible',
-                                  description:
-                                      'Plan and implement new functionality across multiple files in your workspace.',
+                                  description: 'Generate code to make a change in your project',
                               },
                           ]
                         : []),
diff --git a/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts b/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts
@@ -14,6 +14,7 @@ import {
     ContentLengthError,
     FeatureDevServiceError,
     MonthlyConversationLimitError,
+    NoChangeRequiredException,
     PrepareRepoFailedError,
     PromptRefusalException,
     SelectedFolderNotInWorkspaceFolderError,
@@ -131,6 +132,11 @@ export class FeatureDevController {
                     this.initialExamples(data)
                     break
                 case FollowUpTypes.NewTask:
+                    this.messenger.sendAnswer({
+                        type: 'answer',
+                        tabID: data?.tabID,
+                        message: i18n('AWS.amazonq.featureDev.answer.newTaskChanges'),
+                    })
                     return this.newTask(data)
                 case FollowUpTypes.CloseSession:
                     return this.closeSession(data)
@@ -246,6 +252,15 @@ export class FeatureDevController {
             case ZipFileError.errorName:
                 this.messenger.sendErrorMessage(errorMessage, message.tabID, 0, session?.conversationIdUnsafe, true)
                 break
+            case NoChangeRequiredException.errorName:
+                this.messenger.sendAnswer({
+                    type: 'answer',
+                    tabID: message.tabID,
+                    message: err.message,
+                    canBeVoted: true,
+                })
+                // Allow users to re-work the task description.
+                return this.newTask(message)
             case CodeIterationLimitError.errorName:
                 this.messenger.sendAnswer({
                     type: 'answer',
@@ -319,7 +334,7 @@ export class FeatureDevController {
                 await this.onCodeGeneration(session, message.message, message.tabID)
             }
         } catch (err: any) {
-            this.processErrorChatMessage(err, message, session)
+            await this.processErrorChatMessage(err, message, session)
             // Lock the chat input until they explicitly click one of the follow ups
             this.messenger.sendChatInputEnabled(message.tabID, false)
         }
@@ -758,11 +773,7 @@ export class FeatureDevController {
         // Re-run the opening flow, where we check auth + create a session
         await this.tabOpened(message)
 
-        this.messenger.sendAnswer({
-            type: 'answer',
-            tabID: message.tabID,
-            message: i18n('AWS.amazonq.featureDev.answer.newTaskChanges'),
-        })
+        this.messenger.sendChatInputEnabled(message.tabID, true)
         this.messenger.sendUpdatePlaceholder(message.tabID, i18n('AWS.amazonq.featureDev.placeholder.describe'))
     }
 
diff --git a/packages/core/src/amazonqFeatureDev/errors.ts b/packages/core/src/amazonqFeatureDev/errors.ts
@@ -66,6 +66,15 @@ export class PromptRefusalException extends ToolkitError {
     }
 }
 
+export class NoChangeRequiredException extends ToolkitError {
+    static errorName = 'NoChangeRequiredException'
+    constructor() {
+        super(i18n('AWS.amazonq.featureDev.error.noChangeRequiredException'), {
+            code: 'NoChangeRequiredException',
+        })
+    }
+}
+
 export class FeatureDevServiceError extends ToolkitError {
     static errorName = 'FeatureDevServiceError'
     constructor(message: string, code: string) {
diff --git a/packages/core/src/amazonqFeatureDev/session/sessionState.ts b/packages/core/src/amazonqFeatureDev/session/sessionState.ts
@@ -13,7 +13,12 @@ import { telemetry } from '../../shared/telemetry/telemetry'
 import { VirtualFileSystem } from '../../shared/virtualFilesystem'
 import { VirtualMemoryFile } from '../../shared/virtualMemoryFile'
 import { featureDevScheme } from '../constants'
-import { FeatureDevServiceError, IllegalStateTransition, PromptRefusalException } from '../errors'
+import {
+    FeatureDevServiceError,
+    IllegalStateTransition,
+    NoChangeRequiredException,
+    PromptRefusalException,
+} from '../errors'
 import {
     CodeGenerationStatus,
     CurrentWsFolders,
@@ -208,6 +213,9 @@ abstract class CodeGenBase {
                             throw new PromptRefusalException()
                         }
                         case codegenResult.codeGenerationStatusDetail?.includes('EmptyPatch'): {
+                            if (codegenResult.codeGenerationStatusDetail?.includes('NO_CHANGE_REQUIRED')) {
+                                throw new NoChangeRequiredException()
+                            }
                             throw new FeatureDevServiceError(
                                 i18n('AWS.amazonq.featureDev.error.codeGen.default'),
                                 'EmptyPatchException'
diff --git a/packages/core/src/shared/telemetry/vscodeTelemetry.json b/packages/core/src/shared/telemetry/vscodeTelemetry.json
@@ -1157,22 +1157,6 @@
             "name": "function_call",
             "description": "Represents a function call. In most cases this should wrap code with a run(), then you can add context.",
             "metadata": [
-                {
-                    "type": "userCpuUsage",
-                    "required": false
-                },
-                {
-                    "type": "systemCpuUsage",
-                    "required": false
-                },
-                {
-                    "type": "architecture",
-                    "required": false
-                },
-                {
-                    "type": "heapTotal",
-                    "required": false
-                },
                 {
                     "type": "functionName",
                     "required": true
diff --git a/packages/core/src/shared/utilities/workspaceUtils.ts b/packages/core/src/shared/utilities/workspaceUtils.ts
@@ -17,7 +17,6 @@ import { sanitizeFilename } from './textUtilities'
 import { GitIgnoreAcceptor } from '@gerhobbelt/gitignore-parser'
 import * as parser from '@gerhobbelt/gitignore-parser'
 import fs from '../fs/fs'
-import { telemetry } from '../telemetry'
 
 type GitIgnoreRelativeAcceptor = {
     folderPath: string
@@ -323,80 +322,70 @@ export async function collectFiles(
         zipFilePath: string
     }[]
 > {
-    return telemetry.function_call.run(
-        async (span) => {
-            const storage: Awaited<ReturnType<typeof collectFiles>> = []
-
-            const workspaceFoldersMapping = getWorkspaceFoldersByPrefixes(workspaceFolders)
-            const workspaceToPrefix = new Map<vscode.WorkspaceFolder, string>(
-                workspaceFoldersMapping === undefined
-                    ? [[workspaceFolders[0], '']]
-                    : Object.entries(workspaceFoldersMapping).map((value) => [value[1], value[0]])
-            )
-            const prefixWithFolderPrefix = (folder: vscode.WorkspaceFolder, path: string) => {
-                const prefix = workspaceToPrefix.get(folder)
-                /**
-                 * collects all files that are marked as source
-                 * @param sourcePaths the paths where collection starts
-                 * @param workspaceFolders the current workspace folders opened
-                 * @param respectGitIgnore whether to respect gitignore file
-                 * @returns all matched files
-                 */
-                if (prefix === undefined) {
-                    throw new ToolkitError(`Failed to find prefix for workspace folder ${folder.name}`)
-                }
-                return prefix === '' ? path : `${prefix}/${path}`
-            }
+    const storage: Awaited<ReturnType<typeof collectFiles>> = []
 
-            let totalSizeBytes = 0
-            for (const rootPath of sourcePaths) {
-                const allFiles = await vscode.workspace.findFiles(
-                    new vscode.RelativePattern(rootPath, '**'),
-                    getExcludePattern()
-                )
+    const workspaceFoldersMapping = getWorkspaceFoldersByPrefixes(workspaceFolders)
+    const workspaceToPrefix = new Map<vscode.WorkspaceFolder, string>(
+        workspaceFoldersMapping === undefined
+            ? [[workspaceFolders[0], '']]
+            : Object.entries(workspaceFoldersMapping).map((value) => [value[1], value[0]])
+    )
+    const prefixWithFolderPrefix = (folder: vscode.WorkspaceFolder, path: string) => {
+        const prefix = workspaceToPrefix.get(folder)
+        /**
+         * collects all files that are marked as source
+         * @param sourcePaths the paths where collection starts
+         * @param workspaceFolders the current workspace folders opened
+         * @param respectGitIgnore whether to respect gitignore file
+         * @returns all matched files
+         */
+        if (prefix === undefined) {
+            throw new ToolkitError(`Failed to find prefix for workspace folder ${folder.name}`)
+        }
+        return prefix === '' ? path : `${prefix}/${path}`
+    }
 
-                const files = respectGitIgnore ? await filterOutGitignoredFiles(rootPath, allFiles) : allFiles
+    let totalSizeBytes = 0
+    for (const rootPath of sourcePaths) {
+        const allFiles = await vscode.workspace.findFiles(
+            new vscode.RelativePattern(rootPath, '**'),
+            getExcludePattern()
+        )
 
-                for (const file of files) {
-                    const relativePath = getWorkspaceRelativePath(file.fsPath, { workspaceFolders })
-                    if (!relativePath) {
-                        continue
-                    }
+        const files = respectGitIgnore ? await filterOutGitignoredFiles(rootPath, allFiles) : allFiles
 
-                    const fileStat = await fs.stat(file)
-                    if (totalSizeBytes + fileStat.size > maxSize) {
-                        throw new ToolkitError(
-                            'The project you have selected for source code is too large to use as context. Please select a different folder to use',
-                            { code: 'ContentLengthError' }
-                        )
-                    }
+        for (const file of files) {
+            const relativePath = getWorkspaceRelativePath(file.fsPath, { workspaceFolders })
+            if (!relativePath) {
+                continue
+            }
 
-                    const fileContent = await readFile(file)
+            const fileStat = await fs.stat(file)
+            if (totalSizeBytes + fileStat.size > maxSize) {
+                throw new ToolkitError(
+                    'The project you have selected for source code is too large to use as context. Please select a different folder to use',
+                    { code: 'ContentLengthError' }
+                )
+            }
 
-                    if (fileContent === undefined) {
-                        continue
-                    }
+            const fileContent = await readFile(file)
 
-                    // Now that we've read the file, increase our usage
-                    totalSizeBytes += fileStat.size
-                    storage.push({
-                        workspaceFolder: relativePath.workspaceFolder,
-                        relativeFilePath: relativePath.relativePath,
-                        fileUri: file,
-                        fileContent: fileContent,
-                        zipFilePath: prefixWithFolderPrefix(relativePath.workspaceFolder, relativePath.relativePath),
-                    })
-                }
+            if (fileContent === undefined) {
+                continue
             }
-            return storage
-        },
-        {
-            emit: true,
-            functionId: {
-                name: 'collectFiles',
-            },
+
+            // Now that we've read the file, increase our usage
+            totalSizeBytes += fileStat.size
+            storage.push({
+                workspaceFolder: relativePath.workspaceFolder,
+                relativeFilePath: relativePath.relativePath,
+                fileUri: file,
+                fileContent: fileContent,
+                zipFilePath: prefixWithFolderPrefix(relativePath.workspaceFolder, relativePath.relativePath),
+            })
         }
-    )
+    }
+    return storage
 }
 
 const readFile = async (file: vscode.Uri) => {
diff --git a/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts b/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts
@@ -13,10 +13,14 @@ import { CurrentWsFolders, FollowUpTypes, NewFileInfo, DeletedFileInfo } from '.
 import { Session } from '../../../../amazonqFeatureDev/session/session'
 import { Prompter } from '../../../../shared/ui/prompter'
 import { assertTelemetry, toFile } from '../../../testUtil'
-import { SelectedFolderNotInWorkspaceFolderError } from '../../../../amazonqFeatureDev/errors'
+import {
+    NoChangeRequiredException,
+    SelectedFolderNotInWorkspaceFolderError,
+} from '../../../../amazonqFeatureDev/errors'
 import { CodeGenState, PrepareCodeGenState } from '../../../../amazonqFeatureDev/session/sessionState'
 import { FeatureDevClient } from '../../../../amazonqFeatureDev/client/featureDev'
 import { createAmazonQUri } from '../../../../amazonq/commons/diff'
+import { AuthUtil } from '../../../../codewhisperer'
 
 let mockGetCodeGeneration: sinon.SinonStub
 describe('Controller', () => {
@@ -68,6 +72,12 @@ describe('Controller', () => {
     beforeEach(async () => {
         controllerSetup = await createController()
         session = await createSession({ messenger: controllerSetup.messenger, conversationID, tabID, uploadID })
+
+        sinon.stub(AuthUtil.instance, 'getChatAuthState').resolves({
+            codewhispererCore: 'connected',
+            codewhispererChat: 'connected',
+            amazonQ: 'connected',
+        })
     })
 
     afterEach(() => {
@@ -357,4 +367,41 @@ describe('Controller', () => {
             })
         })
     })
+
+    describe('processUserChatMessage', function () {
+        async function fireChatMessage() {
+            const getSessionStub = sinon.stub(controllerSetup.sessionStorage, 'getSession').resolves(session)
+
+            controllerSetup.emitters.processHumanChatMessage.fire({
+                tabID,
+                conversationID,
+                message: 'test message',
+            })
+
+            // Wait until the controller has time to process the event
+            await waitUntil(() => {
+                return Promise.resolve(getSessionStub.callCount > 0)
+            }, {})
+        }
+
+        describe('processErrorChatMessage', function () {
+            it('should handle NoChangeRequiredException', async function () {
+                const noChangeRequiredException = new NoChangeRequiredException()
+                sinon.stub(session, 'preloader').throws(noChangeRequiredException)
+                const sendAnswerSpy = sinon.stub(controllerSetup.messenger, 'sendAnswer')
+
+                await fireChatMessage()
+
+                assert.strictEqual(
+                    sendAnswerSpy.calledWith({
+                        type: 'answer',
+                        tabID,
+                        message: noChangeRequiredException.message,
+                        canBeVoted: true,
+                    }),
+                    true
+                )
+            })
+        })
+    })
 })
diff --git a/packages/core/src/testInteg/shared/utilities/workspaceUtils.test.ts b/packages/core/src/testInteg/shared/utilities/workspaceUtils.test.ts
@@ -16,7 +16,7 @@ import {
 import { getTestWorkspaceFolder } from '../../integrationTestsUtilities'
 import globals from '../../../shared/extensionGlobals'
 import { CodelensRootRegistry } from '../../../shared/fs/codelensRootRegistry'
-import { assertTelemetry, createTestWorkspace, createTestWorkspaceFolder, toFile } from '../../../test/testUtil'
+import { createTestWorkspace, createTestWorkspaceFolder, toFile } from '../../../test/testUtil'
 import sinon from 'sinon'
 import { performanceTest } from '../../../shared/performance/performance'
 import { randomUUID } from '../../../shared/crypto'
@@ -298,10 +298,6 @@ describe('collectFiles', function () {
             ] satisfies typeof result,
             result
         )
-
-        assertTelemetry('function_call', {
-            functionName: 'collectFiles',
-        })
     })
 
     it('does not return license files', async function () {
diff --git a/packages/core/src/testInteg/zipcode.test.ts b/packages/core/src/testInteg/zipcode.test.ts

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +	"type": "Bug Fix",
 +	"description": "Q dev handle no change required"
 +}
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,7 @@ export class QuickActionGenerator {`
`29`	`29`	`{`
`30`	`30`	`command: '/dev',`
`31`	`31`	`placeholder: 'Describe your task or issue in as much detail as possible',`
`32`		`- description:`
`33`		`- 'Plan and implement new functionality across multiple files in your workspace.',`
	`32`	`+ description: 'Generate code to make a change in your project',`
`34`	`33`	`},`
`35`	`34`	`]`
`36`	`35`	`: []),`