Merge branch 'aws:master' into feature/utg

Author: laileni-aws

package-lock.json

@@ -39,7 +39,7 @@
         "generateNonCodeFiles": "npm run generateNonCodeFiles -w packages/ --if-present"
     },
     "devDependencies": {
-        "@aws-toolkits/telemetry": "^1.0.250",
+        "@aws-toolkits/telemetry": "^1.0.254",
         "@playwright/browser-chromium": "^1.43.1",
         "@types/vscode": "^1.68.0",
         "@types/vscode-webview": "^1.57.1",

package.json

@@ -0,0 +1,22 @@
+{
+	"date": "2024-09-12",
+	"version": "1.25.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Fixed inline code blocks are not vertically aligned with texts"
+		},
+		{
+			"type": "Feature",
+			"description": "Record telemetry event when AWS Toolkits extension is uninstalled."
+		},
+		{
+			"type": "Feature",
+			"description": "Improve workspace indexing by only index files that are changed since last indexing"
+		},
+		{
+			"type": "Removal",
+			"description": "Amazon Q Feature dev: Remove approach generation flow"
+		}
+	]
+}

packages/amazonq/.changes/1.25.0.json

@@ -1,3 +1,10 @@
+## 1.25.0 2024-09-12
+
+- **Bug Fix** Amazon Q Chat: Fixed inline code blocks are not vertically aligned with texts
+- **Feature** Record telemetry event when AWS Toolkits extension is uninstalled.
+- **Feature** Improve workspace indexing by only index files that are changed since last indexing
+- **Removal** Amazon Q Feature dev: Remove approach generation flow
+
 ## 1.24.0 2024-09-05
 
 - **Bug Fix** Network errors causing premature SSO logout

packages/amazonq/CHANGELOG.md

@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "Amazon Q is your generative AI-powered assistant across the software development lifecycle.",
-    "version": "1.25.0-SNAPSHOT",
+    "version": "1.26.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

packages/amazonq/package.json

@@ -39,6 +39,7 @@ import {
     messages,
     placeholder,
     setContext,
+    setupUninstallHandler,
 } from 'aws-core-vscode/shared'
 import { ExtStartUpSources, telemetry } from 'aws-core-vscode/telemetry'
 import { VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
@@ -129,6 +130,9 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
     // Amazon Q specific commands
     registerCommands(context)
 
+    // Handle Amazon Q Extension un-installation.
+    setupUninstallHandler(VSCODE_EXTENSION_ID.amazonq, context)
+
     // Hide the Amazon Q tree in toolkit explorer
     await setContext('aws.toolkit.amazonq.dismissed', true)
 

packages/amazonq/src/extension.ts

@@ -61,7 +61,6 @@ describe('session', () => {
 
             const uploadID = '789'
             const tabID = '123'
-            const testApproach = 'test-approach'
             const workspaceFolders = [controllerSetup.workspaceFolder] as CurrentWsFolders
             workspaceFolderUriFsPath = controllerSetup.workspaceFolder.uri.fsPath
             uri = generateVirtualMemoryUri(uploadID, notRejectedFileName)
@@ -76,7 +75,6 @@ describe('session', () => {
 
             const codeGenState = new CodeGenState(
                 testConfig,
-                testApproach,
                 [
                     {
                         zipFilePath: notRejectedFileName,

packages/amazonq/test/unit/amazonqFeatureDev/session/session.test.ts

@@ -2,16 +2,23 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-
 import assert from 'assert'
 import * as codewhispererClient from 'aws-core-vscode/codewhisperer'
 import * as EditorContext from 'aws-core-vscode/codewhisperer'
-import { createMockTextEditor, createMockClientRequest, resetCodeWhispererGlobalVariables } from 'aws-core-vscode/test'
+import {
+    createMockTextEditor,
+    createMockClientRequest,
+    resetCodeWhispererGlobalVariables,
+    openATextEditorWithText,
+    createTestWorkspaceFolder,
+    closeAllEditors,
+} from 'aws-core-vscode/test'
 import { globals } from 'aws-core-vscode/shared'
 import { GenerateCompletionsRequest } from 'aws-core-vscode/codewhisperer'
 
 describe('editorContext', function () {
     let telemetryEnabledDefault: boolean
+    let tempFolder: string
 
     beforeEach(async function () {
         await resetCodeWhispererGlobalVariables()
@@ -66,15 +73,19 @@ describe('editorContext', function () {
             assert.strictEqual(actual, expected)
         })
 
-        it('Should return expected filename for a long filename', function () {
+        it('Should return expected filename for a long filename', async function () {
             const editor = createMockTextEditor('', 'a'.repeat(1500), 'python', 1, 17)
             const actual = EditorContext.getFileName(editor)
             const expected = 'a'.repeat(1024)
             assert.strictEqual(actual, expected)
         })
     })
 
-    describe('getfileNameForRequest', function () {
+    describe('getFileRelativePath', function () {
+        this.beforeEach(async function () {
+            tempFolder = (await createTestWorkspaceFolder()).uri.fsPath
+        })
+
         it('Should return a new filename with correct extension given a .ipynb file', function () {
             const languageToExtension = new Map<string, string>([
                 ['python', 'py'],
@@ -86,11 +97,22 @@ describe('editorContext', function () {
 
             languageToExtension.forEach((extension, language) => {
                 const editor = createMockTextEditor('', 'test.ipynb', language, 1, 17)
-                const actual = EditorContext.getFileNameForRequest(editor)
+                const actual = EditorContext.getFileRelativePath(editor)
                 const expected = 'test.' + extension
                 assert.strictEqual(actual, expected)
             })
         })
+
+        it('Should return relative path', async function () {
+            const editor = await openATextEditorWithText('tttt', 'test.py', tempFolder)
+            const actual = EditorContext.getFileRelativePath(editor)
+            const expected = 'test.py'
+            assert.strictEqual(actual, expected)
+        })
+
+        afterEach(async function () {
+            await closeAllEditors()
+        })
     })
 
     describe('validateRequest', function () {

packages/amazonq/test/unit/codewhisperer/util/editorContext.test.ts

@@ -4115,7 +4115,7 @@
         "@aws-sdk/property-provider": "3.46.0",
         "@aws-sdk/smithy-client": "^3.46.0",
         "@aws-sdk/util-arn-parser": "^3.46.0",
-        "@aws/mynah-ui": "^4.15.8",
+        "@aws/mynah-ui": "^4.15.9",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
         "@iarna/toml": "^2.2.5",
         "@smithy/middleware-retry": "^2.3.1",

packages/core/package.json

@@ -272,11 +272,8 @@
     "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.zipFileError": "The zip file is corrupted",
-    "AWS.amazonq.featureDev.error.planIterationLimitError": "Sorry, you've reached the quota for number of iterations on an implementation plan. You can generate code for this task 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\">Amazon Q Developer documentation</a>.",
     "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.",
-    "AWS.amazonq.featureDev.error.approachPhase.denyListedError": "I'm sorry, I'm having trouble generating a plan. Please try again.",
-    "AWS.amazonq.featureDev.error.approachPhase.default": "I'm sorry, I ran into an issue while trying to approach the problem. Please try again.",
     "AWS.amazonq.featureDev.error.codeGen.denyListedError": "I'm sorry, I'm having trouble generating your code and can't continue at the moment. Please try again later, and share feedback to help me improve.",
     "AWS.amazonq.featureDev.error.codeGen.default": "I'm sorry, I ran into an issue while trying to generate your code. Please try again.",
     "AWS.amazonq.featureDev.error.codeGen.timeout": "Code generation did not finish within the expected time",
@@ -287,35 +284,34 @@
     "AWS.amazonq.featureDev.error.technicalDifficulties": "I'm sorry, I'm having technical difficulties and can't continue at the moment. Please try again later, and share feedback to help me improve.",
     "AWS.amazonq.featureDev.error.throttling": "I'm sorry, I'm experiencing high demand at the moment and can't generate your code. This attempt won't count toward usage limits. Please try again.",
     "AWS.amazonq.featureDev.error.submitFeedback": "'submitFeedback' command was called programmatically, but its not registered.",
-    "AWS.amazonq.featureDev.error.approachNewTab": "There has been a problem generating an approach. Please open a conversation in a new tab",
-    "AWS.amazonq.featureDev.pillText.awaitMessage": "This may take a few minutes. I will send a notification when it's complete if you navigate away from this panel, but please keep the tab open.",
+    "AWS.amazonq.featureDev.pillText.awaitMessage": "Okay, I'll generate code for that.\n\nThis might take a few minutes. You can navigate away from this chat, but please keep this tab open. I'll notify you when I'm done.",
+    "AWS.amazonq.featureDev.pillText.awaitMessageRetry": "Okay, I'll generate new code.\n\nThis might take a few minutes. You can navigate away from this chat, but please keep this tab open. I'll notify you when I'm done.",
     "AWS.amazonq.featureDev.pillText.modifyDefaultSourceFolder": "Choose another folder in your workspace",
-    "AWS.amazonq.featureDev.pillText.newPlan": "Discuss a new plan",
-    "AWS.amazonq.featureDev.pillText.newTask": "Work on new task",
+    "AWS.amazonq.featureDev.pillText.newTask": "Yes, I have another task",
     "AWS.amazonq.featureDev.pillText.generateCode": "Generate code",
+    "AWS.amazonq.featureDev.pillText.uploadingCode": "Uploading code ...",
+    "AWS.amazonq.featureDev.pillText.contextGatheringCompleted": "Gathering context...",
     "AWS.amazonq.featureDev.pillText.generatingCode": "Generating code ...",
-    "AWS.amazonq.featureDev.pillText.generatingPlan": "Generating plan ...",
     "AWS.amazonq.featureDev.pillText.requestingChanges": "Requesting changes ...",
     "AWS.amazonq.featureDev.pillText.insertCode": "Insert code",
     "AWS.amazonq.featureDev.pillText.sendFeedback": "Send feedback",
     "AWS.amazonq.featureDev.pillText.selectFiles": "Select files for context",
     "AWS.amazonq.featureDev.pillText.retry": "Retry",
     "AWS.amazonq.featureDev.pillText.writeNewPrompt": "Write a new prompt",
     "AWS.amazonq.featureDev.pillText.reauthenticate": "Follow instructions to re-authenticate ...",
-    "AWS.amazonq.featureDev.pillText.closeSession": "Close session",
+    "AWS.amazonq.featureDev.pillText.closeSession": "No, thanks",
     "AWS.amazonq.featureDev.pillText.selectOption": "Select an option above to proceed",
     "AWS.amazonq.featureDev.pillText.unableGenerateChanges": "Unable to generate any file changes",
     "AWS.amazonq.featureDev.pillText.provideFeedback": "Provide feedback to regenerate",
     "AWS.amazonq.featureDev.answer.generateSuggestion": "Would you like to generate a suggestion for this? You’ll review a file diff before inserting into your project.",
-    "AWS.amazonq.featureDev.answer.howPlanCanBeImproved": "How can this plan be improved?",
     "AWS.amazonq.featureDev.answer.qGeneratedCode": "The Amazon Q Developer Agent for software development has generated code for you to review",
-    "AWS.amazonq.featureDev.answer.howCodeCanBeImproved": "How can the code be improved?",
-    "AWS.amazonq.featureDev.answer.approachCreation": "Ok, let me create a plan. This may take a few minutes.",
-    "AWS.amazonq.featureDev.answer.updateCode": "Code has been updated. Would you like to work on another task?",
-    "AWS.amazonq.featureDev.answer.sessionClosed": "Your session is now closed.",
-    "AWS.amazonq.featureDev.answer.newTaskChanges": "What change would you like to make?",
+    "AWS.amazonq.featureDev.answer.howCodeCanBeImproved": "How can I improve the code for your use case?",
+    "AWS.amazonq.featureDev.answer.updateCode": "Okay, I updated your code files. Would you like to work on another task?",
+    "AWS.amazonq.featureDev.answer.sessionClosed": "Okay, I've ended this chat session. You can open a new tab to chat or start another workflow.",
+    "AWS.amazonq.featureDev.answer.newTaskChanges": "What new task would you like to work on?",
     "AWS.amazonq.featureDev.placeholder.chatInputDisabled": "Chat input is disabled",
     "AWS.amazonq.featureDev.placeholder.additionalImprovements": "Provide input on additional improvements",
     "AWS.amazonq.featureDev.placeholder.feedback": "Feedback, comments ...",
-    "AWS.amazonq.featureDev.placeholder.describe": "Describe your task or issue in as much detail as possible"
+    "AWS.amazonq.featureDev.placeholder.describe": "Describe your task or issue in as much detail as possible",
+    "AWS.amazonq.featureDev.placeholder.sessionClosed": "Open a new chat tab to continue"
 }