Merge master into feature/logs

CONTRIBUTING.md

@@ -382,7 +382,7 @@ If you need to report an issue attach these to give the most detailed informatio
     - ![](./docs/images/logsView.png)
 2. Click the gear icon on the bottom right and select `Debug`
     - ![](./docs/images/logsSetDebug.png)
-3. Click the gear icon again and select `Set As Default`. This will ensure we stay in `Debug` until explicitly changed
+3. Click the gear icon again and select `Set As Default`. This will ensure we stay in `Debug` until explicitly changed.
     - ![](./docs/images/logsSetDefault.png)
 4. Open the Command Palette again and select `Reload Window`.
 5. Now you should see additional `[debug]` prefixed logs in the output.

packages/amazonq/.changes/1.68.0.json

@@ -0,0 +1,18 @@
+{
+	"date": "2025-05-15",
+	"version": "1.68.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Fix Error: 'Amazon Q service is not signed in'"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix Error: 'Amazon Q Profile is not selected for IDC connection type'"
+		},
+		{
+			"type": "Feature",
+			"description": "Add inline completion support for abap language"
+		}
+	]
+}

packages/amazonq/.changes/1.69.0.json

@@ -0,0 +1,14 @@
+{
+	"date": "2025-05-22",
+	"version": "1.69.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "/transform: avoid prompting user for target JDK path unnecessarily"
+		},
+		{
+			"type": "Removal",
+			"description": "/transform: remove option to select multiple diffs"
+		}
+	]
+}

packages/amazonq/.changes/1.70.0.json

@@ -0,0 +1,10 @@
+{
+	"date": "2025-05-28",
+	"version": "1.70.0",
+	"entries": [
+		{
+			"type": "Removal",
+			"description": "Disable local workspace LSP"
+		}
+	]
+}

packages/amazonq/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 1.70.0 2025-05-28
+
+- **Removal** Disable local workspace LSP
+
+## 1.69.0 2025-05-22
+
+- **Bug Fix** /transform: avoid prompting user for target JDK path unnecessarily
+- **Removal** /transform: remove option to select multiple diffs
+
+## 1.68.0 2025-05-15
+
+- **Bug Fix** Fix Error: 'Amazon Q service is not signed in'
+- **Bug Fix** Fix Error: 'Amazon Q Profile is not selected for IDC connection type'
+- **Feature** Add inline completion support for abap language
+
 ## 1.67.0 2025-05-14
 
 - **Bug Fix** Previous and subsequent cells are used as context for completion in a Jupyter notebook

packages/amazonq/package.json

@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI",
-    "version": "1.68.0-SNAPSHOT",
+    "version": "1.71.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
@@ -805,6 +805,11 @@
             {
                 "command": "aws.amazonq.walkthrough.show",
                 "title": "%AWS.amazonq.welcomeWalkthrough%"
+            },
+            {
+                "command": "aws.amazonq.clearCache",
+                "title": "%AWS.amazonq.clearCache%",
+                "category": "%AWS.amazonq.title%"
             }
         ],
         "keybindings": [

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

@@ -6,22 +6,14 @@
 import * as vscode from 'vscode'
 import { ExtensionContext } from 'vscode'
 import { telemetry } from 'aws-core-vscode/telemetry'
-import { AuthUtil, CodeWhispererSettings } from 'aws-core-vscode/codewhisperer'
-import { Commands, placeholder, funcUtil } from 'aws-core-vscode/shared'
+import { AuthUtil } from 'aws-core-vscode/codewhisperer'
+import { Commands, getLogger, placeholder } from 'aws-core-vscode/shared'
 import * as amazonq from 'aws-core-vscode/amazonq'
 
 export async function activate(context: ExtensionContext) {
     const appInitContext = amazonq.DefaultAmazonQAppInitContext.instance
     await amazonq.TryChatCodeLensProvider.register(appInitContext.onDidChangeAmazonQVisibility.event)
 
-    const setupLsp = funcUtil.debounce(async () => {
-        void amazonq.LspController.instance.trySetupLsp(context, {
-            startUrl: AuthUtil.instance.startUrl,
-            maxIndexSize: CodeWhispererSettings.instance.getMaxIndexSize(),
-            isVectorIndexEnabled: false,
-        })
-    }, 5000)
-
     context.subscriptions.push(
         amazonq.focusAmazonQChatWalkthrough.register(),
         amazonq.walkthroughInlineSuggestionsExample.register(),
@@ -37,7 +29,6 @@ export async function activate(context: ExtensionContext) {
         void vscode.env.openExternal(vscode.Uri.parse(amazonq.amazonQHelpUrl))
     })
 
-    void setupLsp()
     void setupAuthNotification()
 }
 
@@ -76,7 +67,9 @@ async function setupAuthNotification() {
         const selection = await vscode.window.showWarningMessage('Start using Amazon Q', buttonAction)
 
         if (selection === buttonAction) {
-            void amazonq.focusAmazonQPanel.execute(placeholder, source)
+            amazonq.focusAmazonQPanel.execute(placeholder, source).catch((e) => {
+                getLogger().error('focusAmazonQPanel failed: %s', e)
+            })
         }
     }
 }

packages/amazonq/src/commands.ts

@@ -9,7 +9,11 @@
 import * as vscode from 'vscode'
 import { Auth } from 'aws-core-vscode/auth'
 import { Commands } from 'aws-core-vscode/shared'
+import { clearCacheDeclaration } from './util/clearCache'
 
 export function registerCommands(context: vscode.ExtensionContext) {
-    context.subscriptions.push(Commands.register('_aws.amazonq.auth.autoConnect', Auth.instance.tryAutoConnect))
+    context.subscriptions.push(
+        Commands.register('_aws.amazonq.auth.autoConnect', Auth.instance.tryAutoConnect),
+        clearCacheDeclaration.register()
+    )
 }

packages/amazonq/src/extension.ts

@@ -166,7 +166,9 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
         // Give time for the extension to finish initializing.
         globals.clock.setTimeout(async () => {
             CommonAuthWebview.authSource = ExtStartUpSources.firstStartUp
-            void focusAmazonQPanel.execute(placeholder, ExtStartUpSources.firstStartUp)
+            focusAmazonQPanel.execute(placeholder, ExtStartUpSources.firstStartUp).catch((e) => {
+                getLogger().error('focusAmazonQPanel failed: %s', e)
+            })
         }, 1000)
     }
 

packages/amazonq/src/lsp/auth.ts

@@ -18,6 +18,7 @@ import { AuthUtil } from 'aws-core-vscode/codewhisperer'
 import { Writable } from 'stream'
 import { onceChanged } from 'aws-core-vscode/utils'
 import { getLogger, oneMinute } from 'aws-core-vscode/shared'
+import { isSsoConnection } from 'aws-core-vscode/auth'
 
 export const encryptionKey = crypto.randomBytes(32)
 
@@ -76,8 +77,8 @@ export class AmazonQLspAuth {
      * @param force bypass memoization, and forcefully update the bearer token
      */
     async refreshConnection(force: boolean = false) {
-        const activeConnection = this.authUtil.auth.activeConnection
-        if (activeConnection?.state === 'valid' && activeConnection?.type === 'sso') {
+        const activeConnection = this.authUtil.conn
+        if (this.authUtil.isConnectionValid() && isSsoConnection(activeConnection)) {
             // send the token to the language server
             const token = await this.authUtil.getBearerToken()
             await (force ? this._updateBearerToken(token) : this.updateBearerToken(token))
@@ -118,7 +119,7 @@ export class AmazonQLspAuth {
             data: jwt,
             metadata: {
                 sso: {
-                    startUrl: AuthUtil.instance.auth.startUrl,
+                    startUrl: AuthUtil.instance.startUrl,
                 },
             },
             encrypted: true,

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

@@ -12,25 +12,11 @@ import { Commands, getLogger, globals, undefinedIfEmpty } from 'aws-core-vscode/
 import { activate as registerLegacyChatListeners } from '../../app/chat/activation'
 import { DefaultAmazonQAppInitContext } from 'aws-core-vscode/amazonq'
 import { AuthUtil, getSelectedCustomization } from 'aws-core-vscode/codewhisperer'
-import {
-    DidChangeConfigurationNotification,
-    updateConfigurationRequestType,
-} from '@aws/language-server-runtimes/protocol'
+import { pushConfigUpdate } from '../config'
 
 export async function activate(languageClient: LanguageClient, encryptionKey: Buffer, mynahUIPath: string) {
     const disposables = globals.context.subscriptions
 
-    // Make sure we've sent an auth profile to the language server before even initializing the UI
-    await pushConfigUpdate(languageClient, {
-        type: 'profile',
-        profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,
-    })
-    // We need to push the cached customization on startup explicitly
-    await pushConfigUpdate(languageClient, {
-        type: 'customization',
-        customization: getSelectedCustomization(),
-    })
-
     const provider = new AmazonQChatViewProvider(mynahUIPath)
 
     disposables.push(
@@ -79,10 +65,6 @@ export async function activate(languageClient: LanguageClient, encryptionKey: Bu
 
     disposables.push(
         AuthUtil.instance.regionProfileManager.onDidChangeRegionProfile(async () => {
-            void pushConfigUpdate(languageClient, {
-                type: 'profile',
-                profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,
-            })
             await provider.refreshWebview()
         }),
         Commands.register('aws.amazonq.updateCustomizations', () => {
@@ -99,45 +81,3 @@ export async function activate(languageClient: LanguageClient, encryptionKey: Bu
         })
     )
 }
-
-/**
- * Push a config value to the language server, effectively updating it with the
- * latest configuration from the client.
- *
- * The issue is we need to push certain configs to different places, since there are
- * different handlers for specific configs. So this determines the correct place to
- * push the given config.
- */
-async function pushConfigUpdate(client: LanguageClient, config: QConfigs) {
-    switch (config.type) {
-        case 'profile':
-            await client.sendRequest(updateConfigurationRequestType.method, {
-                section: 'aws.q',
-                settings: { profileArn: config.profileArn },
-            })
-            break
-        case 'customization':
-            client.sendNotification(DidChangeConfigurationNotification.type.method, {
-                section: 'aws.q',
-                settings: { customization: config.customization },
-            })
-            break
-        case 'logLevel':
-            client.sendNotification(DidChangeConfigurationNotification.type.method, {
-                section: 'aws.logLevel',
-            })
-            break
-    }
-}
-type ProfileConfig = {
-    type: 'profile'
-    profileArn: string | undefined
-}
-type CustomizationConfig = {
-    type: 'customization'
-    customization: string | undefined
-}
-type LogLevelConfig = {
-    type: 'logLevel'
-}
-type QConfigs = ProfileConfig | CustomizationConfig | LogLevelConfig

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

@@ -32,6 +32,8 @@ import {
     getSerializedChatRequestType,
     listConversationsRequestType,
     conversationClickRequestType,
+    listMcpServersRequestType,
+    mcpServerClickRequestType,
     ShowSaveFileDialogRequestType,
     ShowSaveFileDialogParams,
     LSPErrorCodes,
@@ -313,6 +315,8 @@ export function registerMessageListeners(
             }
             case listConversationsRequestType.method:
             case conversationClickRequestType.method:
+            case listMcpServersRequestType.method:
+            case mcpServerClickRequestType.method:
             case tabBarActionRequestType.method:
                 await resolveChatResponse(message.command, message.params, languageClient, webview)
                 break