Merge master into feature/emr

Author: aws-toolkit-automation

packages/amazonq/package.json

@@ -353,7 +353,7 @@
                 {
                     "command": "aws.amazonq.generateUnitTests",
                     "group": "cw_chat@5",
-                    "when": "false"
+                    "when": "aws.codewhisperer.connected && aws.isInternalUser"
                 },
                 {
                     "command": "aws.amazonq.sendToPrompt",
@@ -433,7 +433,7 @@
                 "command": "aws.amazonq.generateUnitTests",
                 "title": "%AWS.command.amazonq.generateUnitTests%",
                 "category": "%AWS.amazonq.title%",
-                "enablement": "false"
+                "enablement": "aws.codewhisperer.connected && aws.isInternalUser"
             },
             {
                 "command": "aws.amazonq.reconnect",
@@ -616,7 +616,7 @@
                 "key": "win+alt+t",
                 "mac": "cmd+alt+t",
                 "linux": "meta+alt+t",
-                "when": "false"
+                "when": "aws.codewhisperer.connected && aws.isInternalUser"
             },
             {
                 "command": "aws.amazonq.invokeInlineCompletion",

packages/core/src/codewhispererChat/controllers/chat/userIntent/userIntentRecognizer.ts

@@ -6,6 +6,7 @@
 import { UserIntent } from '@amzn/codewhisperer-streaming'
 import { EditorContextCommand } from '../../../commands/registerCommands'
 import { PromptMessage } from '../model'
+import { Auth } from '../../../../auth'
 
 export class UserIntentRecognizer {
     public getFromContextMenuCommand(command: EditorContextCommand): UserIntent | undefined {
@@ -38,6 +39,8 @@ export class UserIntentRecognizer {
             return UserIntent.APPLY_COMMON_BEST_PRACTICES
         } else if (prompt.message.startsWith('Optimize')) {
             return UserIntent.IMPROVE_CODE
+        } else if (prompt.message.startsWith('Generate unit tests') && Auth.instance.isInternalAmazonUser()) {
+            return UserIntent.GENERATE_UNIT_TESTS
         }
         return undefined
     }