Merge branch 'aws:master' into master

Author: laileni-aws

package-lock.json

@@ -560,21 +560,6 @@
             ]
         },
         "commands": [
-            {
-                "command": "aws.amazonq.stopCmdExecution",
-                "title": "Stop Amazon Q Command Execution",
-                "category": "%AWS.amazonq.title%"
-            },
-            {
-                "command": "aws.amazonq.runCmdExecution",
-                "title": "Run Amazon Q Command Execution",
-                "category": "%AWS.amazonq.title%"
-            },
-            {
-                "command": "aws.amazonq.rejectCmdExecution",
-                "title": "Reject Amazon Q Command Execution",
-                "category": "%AWS.amazonq.title%"
-            },
             {
                 "command": "_aws.amazonq.notifications.dismiss",
                 "title": "%AWS.generic.dismiss%",
@@ -865,24 +850,6 @@
             }
         ],
         "keybindings": [
-            {
-                "command": "aws.amazonq.stopCmdExecution",
-                "key": "ctrl+shift+backspace",
-                "mac": "cmd+shift+backspace",
-                "when": "aws.amazonq.amazonqChatLSP.isRunning"
-            },
-            {
-                "command": "aws.amazonq.runCmdExecution",
-                "key": "ctrl+shift+enter",
-                "mac": "cmd+shift+enter",
-                "when": "aws.amazonq.amazonqChatLSP.isRunning"
-            },
-            {
-                "command": "aws.amazonq.rejectCmdExecution",
-                "key": "ctrl+shift+r",
-                "mac": "cmd+shift+r",
-                "when": "aws.amazonq.amazonqChatLSP.isRunning"
-            },
             {
                 "command": "_aws.amazonq.focusChat.keybinding",
                 "win": "win+alt+i",

packages/amazonq/package.json

@@ -59,10 +59,7 @@ export function registerCommands(provider: AmazonQChatViewProvider) {
                     params: {},
                 })
             })
-        }),
-        registerShellCommandShortCut('aws.amazonq.runCmdExecution', 'run-shell-command', provider),
-        registerShellCommandShortCut('aws.amazonq.rejectCmdExecution', 'reject-shell-command', provider),
-        registerShellCommandShortCut('aws.amazonq.stopCmdExecution', 'stop-shell-command', provider)
+        })
     )
 }
 
@@ -159,14 +156,3 @@ export async function focusAmazonQPanel() {
     await Commands.tryExecute('aws.amazonq.AmazonQChatView.focus')
     await Commands.tryExecute('aws.amazonq.AmazonCommonAuth.focus')
 }
-
-function registerShellCommandShortCut(commandName: string, buttonId: string, provider: AmazonQChatViewProvider) {
-    return Commands.register(commandName, async () => {
-        void focusAmazonQPanel().then(() => {
-            void provider.webview?.postMessage({
-                command: 'aws/chat/executeShellCommandShortCut',
-                params: { id: buttonId },
-            })
-        })
-    })
-}

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

@@ -13,7 +13,6 @@ import {
     Webview,
 } from 'vscode'
 import * as path from 'path'
-import * as os from 'os'
 import {
     globals,
     isSageMaker,
@@ -150,7 +149,7 @@ export class AmazonQChatViewProvider implements WebviewViewProvider {
                     const vscodeApi = acquireVsCodeApi()
                     const hybridChatConnector = new HybridChatAdapter(${(await AuthUtil.instance.getChatAuthState()).amazonQ === 'connected'},${featureConfigData},${welcomeCount},${disclaimerAcknowledged},${regionProfileString},${disabledCommands},${isSMUS},${isSM},vscodeApi.postMessage)
                     const commands = [hybridChatConnector.initialQuickActions[0]]
-                    qChat = amazonQChat.createChat(vscodeApi, {os: "${os.platform()}", disclaimerAcknowledged: ${disclaimerAcknowledged}, pairProgrammingAcknowledged: ${pairProgrammingAcknowledged}, agenticMode: true, quickActionCommands: commands, modelSelectionEnabled: ${modelSelectionEnabled}}, hybridChatConnector, ${JSON.stringify(featureConfigData)});
+                    qChat = amazonQChat.createChat(vscodeApi, {disclaimerAcknowledged: ${disclaimerAcknowledged}, pairProgrammingAcknowledged: ${pairProgrammingAcknowledged}, agenticMode: true, quickActionCommands: commands, modelSelectionEnabled: ${modelSelectionEnabled}}, hybridChatConnector, ${JSON.stringify(featureConfigData)});
                 }
                 window.addEventListener('message', (event) => {
                     /**

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

@@ -39,7 +39,6 @@ import {
     getClientId,
     extensionVersion,
     isSageMaker,
-    setContext,
 } from 'aws-core-vscode/shared'
 import { processUtils } from 'aws-core-vscode/shared'
 import { activate } from './chat/activation'
@@ -166,7 +165,6 @@ export async function startLanguageServer(
                         pinnedContextEnabled: true,
                         imageContextEnabled: true,
                         mcp: true,
-                        shortcut: true,
                         reroute: true,
                         modelSelection: true,
                         workspaceFilePath: vscode.workspace.workspaceFile?.fsPath,
@@ -278,17 +276,6 @@ async function onLanguageServerReady(
 
     if (Experiments.instance.get('amazonqChatLSP', true)) {
         await activate(client, encryptionKey, resourcePaths.ui)
-
-        await setContext('aws.amazonq.amazonqChatLSP.isRunning', true)
-        getLogger().info('Amazon Q Chat LSP context flag set on client activated')
-
-        // Add a disposable to reset the context flag when the client stops
-        toDispose.push({
-            dispose: async () => {
-                await setContext('aws.amazonq.amazonqChatLSP.isRunning', false)
-                getLogger().info('Amazon Q Chat LSP context flag reset on client disposal')
-            },
-        })
     }
 
     const refreshInterval = auth.startTokenRefreshInterval(10 * oneSecond)

packages/amazonq/src/lsp/client.ts

@@ -609,8 +609,10 @@
         "whatwg-url": "^14.0.0",
         "winston": "^3.11.0",
         "winston-transport": "^4.6.0",
+        "ws": "^8.16.0",
         "xml2js": "^0.6.1",
         "yaml-cfn": "^0.3.2",
+        "protobufjs": "^7.2.6",
         "@svgdotjs/svg.js": "^3.0.16",
         "svgdom": "^0.1.0",
         "jaro-winkler": "^0.2.8"

packages/core/package.json

@@ -99,7 +99,7 @@
     "AWS.configuration.description.amazonq.workspaceIndexCacheDirPath": "The path to the directory that contains the cache of the index of your workspace files",
     "AWS.configuration.description.amazonq.ignoredSecurityIssues": "Specifies a list of code issue identifiers that Amazon Q should ignore when reviewing your workspace. Each item in the array should be a unique string identifier for a specific code issue. This allows you to suppress notifications for known issues that you've assessed and determined to be false positives or not applicable to your project. Use this setting with caution, as it may cause you to miss important security alerts.",
     "AWS.configuration.description.amazonq.proxy.certificateAuthority": "Path to a Certificate Authority (PEM file) for SSL/TLS verification when using a proxy.",
-    "AWS.command.apig.invokeRemoteRestApi": "Invoke in the cloud",
+    "AWS.command.apig.invokeRemoteRestApi": "Invoke remotely",
     "AWS.command.apig.invokeRemoteRestApi.cn": "Invoke on Amazon",
     "AWS.appBuilder.explorerTitle": "Application Builder",
     "AWS.appBuilder.explorerNode.noApps": "[This resource is not yet supported.]",
@@ -159,11 +159,12 @@
     "AWS.command.aboutToolkit": "About",
     "AWS.command.downloadLambda": "Download...",
     "AWS.command.uploadLambda": "Upload Lambda...",
-    "AWS.command.invokeLambda": "Invoke in the cloud",
+    "AWS.command.invokeLambda": "Invoke Remotely",
     "AWS.command.openLambdaFile": "Open your Lambda code",
     "AWS.command.quickDeployLambda": "Save and deploy your code",
     "AWS.command.openLambdaWorkspace": "Open in a workspace",
     "AWS.command.invokeLambda.cn": "Invoke on Amazon",
+    "AWS.command.remoteDebugging.clearSnapshot": "Reset Lambda Remote Debugging Snapshot",
     "AWS.command.lambda.convertToSam": "Convert to SAM Application",
     "AWS.command.refreshAwsExplorer": "Refresh Explorer",
     "AWS.command.refreshCdkExplorer": "Refresh CDK Explorer",

packages/core/package.nls.json

@@ -27,6 +27,7 @@ import {
     s3BucketType,
 } from '../../../../shared/cloudformation/cloudformation'
 import { ToolkitError } from '../../../../shared/errors'
+import { ResourceTreeEntity } from '../samProject'
 
 const localize = nls.loadMessageBundle()
 export interface DeployedResource {
@@ -77,7 +78,8 @@ export async function generateDeployedNode(
     deployedResource: any,
     regionCode: string,
     stackName: string,
-    resourceTreeEntity: any
+    resourceTreeEntity: ResourceTreeEntity,
+    location?: vscode.Uri
 ): Promise<any[]> {
     let newDeployedResource: any
     const partitionId = globals.regionProvider.getPartitionId(regionCode) ?? defaultPartition
@@ -90,7 +92,13 @@ export async function generateDeployedNode(
                 try {
                     configuration = (await defaultClient.getFunction(deployedResource.PhysicalResourceId))
                         .Configuration as Lambda.FunctionConfiguration
-                    newDeployedResource = new LambdaFunctionNode(lambdaNode, regionCode, configuration)
+                    newDeployedResource = new LambdaFunctionNode(
+                        lambdaNode,
+                        regionCode,
+                        configuration,
+                        undefined,
+                        location ? vscode.Uri.joinPath(location, resourceTreeEntity.CodeUri ?? '').fsPath : undefined
+                    )
                 } catch (error: any) {
                     getLogger().error('Error getting Lambda configuration: %O', error)
                     throw ToolkitError.chain(error, 'Error getting Lambda configuration', {

packages/core/src/awsService/appBuilder/explorer/nodes/deployedNode.ts

@@ -60,7 +60,8 @@ export class ResourceNode implements TreeNode {
                 this.deployedResource,
                 this.region,
                 this.stackName,
-                this.resourceTreeEntity
+                this.resourceTreeEntity,
+                this.location.projectRoot
             )
         }
         if (this.resourceTreeEntity.Type === SERVERLESS_FUNCTION_TYPE) {

packages/core/src/awsService/appBuilder/explorer/nodes/resourceNode.ts

@@ -569,19 +569,24 @@ export async function getLambdaHandlerFile(
         })
     }
 
+    // if this function is used to get handler from a just downloaded lambda function zip. codeUri will be ''
+    if (codeUri !== '') {
+        folderUri = vscode.Uri.joinPath(folderUri, codeUri)
+    }
+
     const handlerParts = handler.split('.')
     // sample: app.lambda_handler -> app.rb
     if (family === RuntimeFamily.Ruby) {
         // Ruby supports namespace/class handlers as well, but the path is
         // guaranteed to be slash-delimited so we can assume the first part is
         // the path
-        return vscode.Uri.joinPath(folderUri, codeUri, handlerParts.slice(0, handlerParts.length - 1).join('/') + '.rb')
+        return vscode.Uri.joinPath(folderUri, handlerParts.slice(0, handlerParts.length - 1).join('/') + '.rb')
     }
 
     // sample:app.lambda_handler -> app.py
     if (family === RuntimeFamily.Python) {
         // Otherwise (currently Node.js and Python) handle dot-delimited paths
-        return vscode.Uri.joinPath(folderUri, codeUri, handlerParts.slice(0, handlerParts.length - 1).join('/') + '.py')
+        return vscode.Uri.joinPath(folderUri, handlerParts.slice(0, handlerParts.length - 1).join('/') + '.py')
     }
 
     // sample: app.handler -> app.mjs/app.js
@@ -591,23 +596,23 @@ export async function getLambdaHandlerFile(
         const handlerPath = path.dirname(handlerName)
         const handlerFile = path.basename(handlerName)
         const pattern = new vscode.RelativePattern(
-            vscode.Uri.joinPath(folderUri, codeUri, handlerPath),
-            `${handlerFile}.{js,mjs}`
+            vscode.Uri.joinPath(folderUri, handlerPath),
+            `${handlerFile}.{js,mjs,cjs,ts}`
         )
         return searchHandlerFile(folderUri, pattern)
     }
     // search directly under Code uri for Dotnet and java
     // sample: ImageResize::ImageResize.Function::FunctionHandler -> Function.cs
     if (family === RuntimeFamily.DotNet) {
         const handlerName = path.basename(handler.split('::')[1].replaceAll('.', '/'))
-        const pattern = new vscode.RelativePattern(vscode.Uri.joinPath(folderUri, codeUri), `${handlerName}.cs`)
+        const pattern = new vscode.RelativePattern(folderUri, `${handlerName}.cs`)
         return searchHandlerFile(folderUri, pattern)
     }
 
     // sample: resizer.App::handleRequest -> App.java
     if (family === RuntimeFamily.Java) {
         const handlerName = handler.split('::')[0].replaceAll('.', '/')
-        const pattern = new vscode.RelativePattern(vscode.Uri.joinPath(folderUri, codeUri), `**/${handlerName}.java`)
+        const pattern = new vscode.RelativePattern(folderUri, `**/${handlerName}.java`)
         return searchHandlerFile(folderUri, pattern)
     }
 }