Merge master into feature/cwltail

Author: aws-toolkit-automation

packages/amazonq/package.json

@@ -366,6 +366,10 @@
                 {
                     "command": "aws.amazonq.sendToPrompt",
                     "group": "cw_chat@6"
+                },
+                {
+                    "command": "aws.amazonq.inline.invokeChat",
+                    "group": "cw_chat@7"
                 }
             ],
             "editor/context": [
@@ -594,6 +598,12 @@
                 "title": "%AWS.amazonq.toggleCodeScan%",
                 "category": "%AWS.amazonq.title%",
                 "enablement": "aws.codewhisperer.connected"
+            },
+            {
+                "command": "aws.amazonq.inline.invokeChat",
+                "title": "%AWS.amazonq.inline.invokeChat%",
+                "category": "%AWS.amazonq.title%",
+                "enablement": "aws.codewhisperer.connected"
             }
         ],
         "keybindings": [
@@ -669,7 +679,7 @@
                 "when": "inlineSuggestionVisible && !editorReadonly && aws.codewhisperer.connected"
             },
             {
-                "command": "aws.amazonq.inline.waitForUserInput",
+                "command": "aws.amazonq.inline.invokeChat",
                 "win": "ctrl+i",
                 "mac": "cmd+i",
                 "linux": "ctrl+i",

packages/amazonq/src/inlineChat/command/registerInlineCommands.ts

@@ -9,7 +9,7 @@ import { InlineTask } from '../controller/inlineTask'
 
 export function registerInlineCommands(context: vscode.ExtensionContext, inlineChatController: InlineChatController) {
     context.subscriptions.push(
-        vscode.commands.registerCommand('aws.amazonq.inline.waitForUserInput', async () => {
+        vscode.commands.registerCommand('aws.amazonq.inline.invokeChat', async () => {
             await inlineChatController.inlineQuickPick()
         }),
         vscode.commands.registerCommand('aws.amazonq.inline.waitForUserDecisionAcceptAll', async (task: InlineTask) => {

packages/amazonq/src/inlineChat/controller/inlineChatController.ts

@@ -11,7 +11,7 @@ import { responseTransformer } from '../output/responseTransformer'
 import { adjustTextDiffForEditing, computeDiff } from '../output/computeDiff'
 import { computeDecorations } from '../decorations/computeDecorations'
 import { CodelensProvider } from '../codeLenses/codeLenseProvider'
-import { ReferenceLogController } from 'aws-core-vscode/codewhispererChat'
+import { PromptMessage, ReferenceLogController } from 'aws-core-vscode/codewhispererChat'
 import { CodeWhispererSettings } from 'aws-core-vscode/codewhisperer'
 import { codicon, getIcon, getLogger, messages, setContext, Timeout, textDocumentUtil } from 'aws-core-vscode/shared'
 import { InlineLineAnnotationController } from '../decorations/inlineLineAnnotationController'
@@ -176,10 +176,12 @@ export class InlineChatController {
                 prompt: codicon`${getIcon('aws-amazonq-q-white')} Edit code`,
             })
             .then(async (query) => {
-                this.userQuery = query
-                if (!query) {
+                if (!query || query.trim() === '') {
+                    void vscode.window.showWarningMessage('Amazon Q: Instructions for cannot be empty')
                     return
                 }
+
+                this.userQuery = query
                 await textDocumentUtil.addEofNewline(editor)
                 this.task = await this.createTask(query, editor.document, editor.selection)
                 await this.inlineLineAnnotationController.disable(editor)
@@ -201,11 +203,10 @@ export class InlineChatController {
         }
 
         await this.updateTaskAndLenses(this.task, TaskState.InProgress)
-        const prompt = query
-        getLogger().info(`prompt:\n${prompt}`)
+        getLogger().info(`inline chat query:\n${query}`)
         const uuid = randomUUID()
-        const message = {
-            message: prompt,
+        const message: PromptMessage = {
+            message: query,
             messageId: uuid,
             command: undefined,
             userIntent: undefined,

packages/core/package.nls.json

@@ -322,5 +322,6 @@
     "AWS.amazonq.featureDev.placeholder.additionalImprovements": "Describe your task or issue in detail",
     "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"
+    "AWS.amazonq.featureDev.placeholder.sessionClosed": "Open a new chat tab to continue",
+    "AWS.amazonq.inline.invokeChat": "Inline chat"
 }