Merge master into feature/model-selection

Author: aws-toolkit-automation

package-lock.json

@@ -7,7 +7,11 @@ import { window } from 'vscode'
 import { LanguageClient } from 'vscode-languageclient'
 import { AmazonQChatViewProvider } from './webviewProvider'
 import { focusAmazonQPanel, registerCommands } from './commands'
-import { registerLanguageServerEventListener, registerMessageListeners } from './messages'
+import {
+    registerActiveEditorChangeListener,
+    registerLanguageServerEventListener,
+    registerMessageListeners,
+} from './messages'
 import { Commands, getLogger, globals, undefinedIfEmpty } from 'aws-core-vscode/shared'
 import { activate as registerLegacyChatListeners } from '../../app/chat/activation'
 import { DefaultAmazonQAppInitContext } from 'aws-core-vscode/amazonq'
@@ -33,6 +37,7 @@ export async function activate(languageClient: LanguageClient, encryptionKey: Bu
      **/
     registerCommands(provider)
     registerLanguageServerEventListener(languageClient, provider)
+    registerActiveEditorChangeListener(languageClient)
 
     provider.onDidResolveWebview(() => {
         const disposable = DefaultAmazonQAppInitContext.instance.getAppsToWebViewMessageListener().onMessage((msg) => {

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

@@ -55,14 +55,18 @@ import {
     ChatUpdateParams,
     chatOptionsUpdateType,
     ChatOptionsUpdateParams,
+    listRulesRequestType,
+    ruleClickRequestType,
+    pinnedContextNotificationType,
+    activeEditorChangedNotificationType,
 } from '@aws/language-server-runtimes/protocol'
 import { v4 as uuidv4 } from 'uuid'
 import * as vscode from 'vscode'
 import { Disposable, LanguageClient, Position, TextDocumentIdentifier } from 'vscode-languageclient'
 import * as jose from 'jose'
 import { AmazonQChatViewProvider } from './webviewProvider'
 import { AuthUtil, ReferenceLogViewProvider } from 'aws-core-vscode/codewhisperer'
-import { amazonQDiffScheme, AmazonQPromptSettings, messages, openUrl } from 'aws-core-vscode/shared'
+import { amazonQDiffScheme, AmazonQPromptSettings, messages, openUrl, isTextEditor } from 'aws-core-vscode/shared'
 import {
     DefaultAmazonQAppInitContext,
     messageDispatcher,
@@ -74,6 +78,29 @@ import { telemetry, TelemetryBase } from 'aws-core-vscode/telemetry'
 import { isValidResponseError } from './error'
 import { focusAmazonQPanel } from './commands'
 
+export function registerActiveEditorChangeListener(languageClient: LanguageClient) {
+    let debounceTimer: NodeJS.Timeout | undefined
+    vscode.window.onDidChangeActiveTextEditor((editor) => {
+        if (debounceTimer) {
+            clearTimeout(debounceTimer)
+        }
+        debounceTimer = setTimeout(() => {
+            let textDocument = undefined
+            let cursorState = undefined
+            if (editor) {
+                textDocument = {
+                    uri: editor.document.uri.toString(),
+                }
+                cursorState = getCursorState(editor.selections)
+            }
+            languageClient.sendNotification(activeEditorChangedNotificationType.method, {
+                textDocument,
+                cursorState,
+            })
+        }, 100)
+    })
+}
+
 export function registerLanguageServerEventListener(languageClient: LanguageClient, provider: AmazonQChatViewProvider) {
     languageClient.info(
         'Language client received initializeResult from server:',
@@ -316,6 +343,8 @@ export function registerMessageListeners(
                 )
                 break
             }
+            case listRulesRequestType.method:
+            case ruleClickRequestType.method:
             case listConversationsRequestType.method:
             case conversationClickRequestType.method:
             case listMcpServersRequestType.method:
@@ -471,6 +500,20 @@ export function registerMessageListeners(
             params: params,
         })
     })
+    languageClient.onNotification(
+        pinnedContextNotificationType.method,
+        (params: ContextCommandParams & { tabId: string; textDocument?: TextDocumentIdentifier }) => {
+            const editor = vscode.window.activeTextEditor
+            let textDocument = undefined
+            if (editor && isTextEditor(editor)) {
+                textDocument = { uri: vscode.workspace.asRelativePath(editor.document.uri) }
+            }
+            void provider.webview?.postMessage({
+                command: pinnedContextNotificationType.method,
+                params: { ...params, textDocument },
+            })
+        }
+    )
 
     languageClient.onNotification(openFileDiffNotificationType.method, async (params: OpenFileDiffParams) => {
         const ecc = new EditorContentController()

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

@@ -123,6 +123,7 @@ export async function startLanguageServer(
                 awsClientCapabilities: {
                     q: {
                         developerProfiles: true,
+                        pinnedContextEnabled: true,
                         mcp: true,
                     },
                     window: {

packages/amazonq/src/lsp/client.ts

@@ -443,8 +443,8 @@
         "@aws-sdk/types": "^3.13.1",
         "@aws/chat-client": "^0.1.4",
         "@aws/chat-client-ui-types": "^0.1.24",
-        "@aws/language-server-runtimes": "^0.2.81",
-        "@aws/language-server-runtimes-types": "^0.1.28",
+        "@aws/language-server-runtimes": "^0.2.97",
+        "@aws/language-server-runtimes-types": "^0.1.39",
         "@cspotcode/source-map-support": "^0.8.1",
         "@sinonjs/fake-timers": "^10.0.2",
         "@types/adm-zip": "^0.4.34",
@@ -526,7 +526,7 @@
         "@aws-sdk/s3-request-presigner": "<3.731.0",
         "@aws-sdk/smithy-client": "<3.731.0",
         "@aws-sdk/util-arn-parser": "<3.731.0",
-        "@aws/mynah-ui": "^4.34.1",
+        "@aws/mynah-ui": "^4.35.4",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
         "@iarna/toml": "^2.2.5",
         "@smithy/fetch-http-handler": "^5.0.1",

packages/core/package.json

@@ -362,7 +362,7 @@ export class QuickActionHandler {
                 cancelButtonWhenLoading: false,
             })
         } else {
-            this.mynahUI.updateStore(affectedTabId, { promptInputOptions: [] })
+            this.mynahUI.updateStore(affectedTabId, { promptInputOptions: [], promptTopBarTitle: '' })
         }
 
         if (affectedTabId && this.isHybridChatEnabled) {

packages/core/src/amazonq/webview/ui/quickActions/handler.ts

@@ -51,6 +51,7 @@ export * from './vscode/commands2'
 export * from './utilities/pathUtils'
 export * from './utilities/zipStream'
 export * from './errors'
+export { isTextEditor } from './utilities/editorUtilities'
 export * as messages from './utilities/messages'
 export * as errors from './errors'
 export * as funcUtil from './utilities/functionUtils'