Merge master into feature/emr

Author: aws-toolkit-automation

packages/core/package.nls.json

@@ -289,29 +289,29 @@
     "AWS.amazonq.featureDev.pillText.modifyDefaultSourceFolder": "Choose another folder in your workspace",
     "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.uploadingCode": "Uploading code...",
     "AWS.amazonq.featureDev.pillText.contextGatheringCompleted": "Gathering context...",
-    "AWS.amazonq.featureDev.pillText.generatingCode": "Generating code ...",
+    "AWS.amazonq.featureDev.pillText.generatingCode": "Generating code...",
     "AWS.amazonq.featureDev.pillText.requestingChanges": "Requesting changes ...",
-    "AWS.amazonq.featureDev.pillText.insertCode": "Insert code",
+    "AWS.amazonq.featureDev.pillText.insertCode": "Accept 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": "No, thanks",
-    "AWS.amazonq.featureDev.pillText.selectOption": "Select an option above to proceed",
+    "AWS.amazonq.featureDev.pillText.selectOption": "Choose an option 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.pillText.provideFeedback": "Provide feedback & 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.qGeneratedCode": "The Amazon Q Developer Agent for software development has generated code for you to review",
     "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.additionalImprovements": "Choose an option to proceed",
+    "AWS.amazonq.featureDev.placeholder.feedback": "Provide feedback or comments",
+    "AWS.amazonq.featureDev.placeholder.describe": "Describe your task or issue in detail",
     "AWS.amazonq.featureDev.placeholder.sessionClosed": "Open a new chat tab to continue"
 }

packages/core/src/amazonq/webview/ui/tabs/constants.ts

@@ -24,9 +24,9 @@ export const TabTypeDataMap: Record<TabType, TabTypeData> = {
     featuredev: {
         title: 'Q - Dev',
         placeholder: 'Describe your task or issue in as much detail as possible',
-        welcome: `Hi, I'm the Amazon Q Developer Agent for software development.
-
-I can generate code to implement new functionality across your workspace. To get started, describe the task you're trying to accomplish, and I'll generate code. If you want to make changes, you can provide feedback and I'll regenerate code.
+        welcome: `Hi! I'm the Amazon Q Developer Agent for software development. 
+        
+I can generate code to implement new functionality across your workspace. To get started, describe the task you're trying to accomplish, and I'll generate code to implement it. If you want to make changes to the code, you can tell me what to improve and I'll generate new code based on your feedback. 
 
 What would you like to work on?`,
     },

packages/core/src/amazonq/webview/ui/texts/constants.ts

@@ -26,6 +26,6 @@ export const uiComponentsTexts = {
     spinnerText: 'Generating your answer...',
 }
 
-export const userGuideURL = 'https://docs.aws.amazon.com/amazonq/latest/aws-builder-use-ug/getting-started.html'
+export const userGuideURL = 'https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/software-dev.html'
 export const manageAccessGuideURL =
     'https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/security_iam_manage-access-with-policies.html'

packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts

@@ -397,8 +397,8 @@ export class FeatureDevController {
                     tabID: tabID,
                     message:
                         remainingIterations === 0
-                            ? 'Would you like me to add this code to your files?'
-                            : `Would you like me to add this code to your project, or provide feedback for new code? You have ${remainingIterations} out of ${totalIterations} code iterations remaining.`,
+                            ? 'Would you like me to add this code to your project?'
+                            : `Would you like me to add this code to your project, or provide feedback for new code? You have ${remainingIterations} out of ${totalIterations} code generations left.`,
                 })
             }
 
@@ -474,8 +474,6 @@ export class FeatureDevController {
                 ],
             })
 
-            // Ensure that chat input is enabled so that they can provide additional iterations if they choose
-            this.messenger.sendChatInputEnabled(message.tabID, true)
             this.messenger.sendUpdatePlaceholder(
                 message.tabID,
                 i18n('AWS.amazonq.featureDev.placeholder.additionalImprovements')
@@ -749,7 +747,12 @@ export class FeatureDevController {
 
     private async newTask(message: any) {
         // Old session for the tab is ending, delete it so we can create a new one for the message id
-        await this.closeSession(message)
+        const session = await this.sessionStorage.getSession(message.tabID)
+        telemetry.amazonq_endChat.emit({
+            amazonqConversationId: session.conversationId,
+            amazonqEndOfTheConversationLatency: performance.now() - session.telemetry.sessionStartTime,
+            result: 'Succeeded',
+        })
         this.sessionStorage.deleteSession(message.tabID)
 
         // Re-run the opening flow, where we check auth + create a session

packages/core/src/amazonqFeatureDev/userFacingText.ts

@@ -14,7 +14,7 @@ You can use /dev to:
 - Fix a bug in your project
 - Generate a README for a file, folder, or project
 
-To learn more, visit the _[Amazon Q User Guide](${userGuideURL})_.
+To learn more, visit the _[Amazon Q Developer User Guide](${userGuideURL})_.
 `
 
 export const uploadCodeError = `I'm sorry, I couldn’t upload your workspace artifacts to Amazon S3 to help you with this task. You might need to allow access to the S3 bucket. For more information, see the [Amazon Q documentation](${manageAccessGuideURL}) or contact your network or organization administrator.`