Merge master into feature/hybridChat-local

Author: aws-toolkit-automation

packages/amazonq/package.json

@@ -562,17 +562,17 @@
         "commands": [
             {
                 "command": "aws.amazonq.stopCmdExecution",
-                "title": "Stop Amazon Q Command Execution",
+                "title": "Stop Amazon Q",
                 "category": "%AWS.amazonq.title%"
             },
             {
                 "command": "aws.amazonq.runCmdExecution",
-                "title": "Run Amazon Q Command Execution",
+                "title": "Run Amazon Q Tool",
                 "category": "%AWS.amazonq.title%"
             },
             {
                 "command": "aws.amazonq.rejectCmdExecution",
-                "title": "Reject Amazon Q Command Execution",
+                "title": "Reject Amazon Q Tool",
                 "category": "%AWS.amazonq.title%"
             },
             {

packages/amazonq/src/lsp/chat/messages.ts

@@ -447,13 +447,15 @@ export function registerMessageListeners(
                     )
 
                     // Get the log directory path
-                    const logPath = globals.context.logUri?.fsPath
+                    const logFolderPath = globals.context.logUri?.fsPath
                     const result = { ...message.params, success: false }
 
-                    if (logPath) {
+                    if (logFolderPath) {
                         // Open the log directory in the OS file explorer directly
                         languageClient.info('[VSCode Client] Opening logs directory')
-                        await vscode.commands.executeCommand('revealFileInOS', vscode.Uri.file(logPath))
+                        const path = require('path')
+                        const logFilePath = path.join(logFolderPath, 'Amazon Q Logs.log')
+                        await vscode.commands.executeCommand('revealFileInOS', vscode.Uri.file(logFilePath))
                         result.success = true
                     } else {
                         // Fallback: show error if log path is not available