Merge branch 'aws:master' into master

Author: l0minous

.github/workflows/node.js.yml

@@ -184,7 +184,7 @@ jobs:
     windows:
         needs: lint-commits
         name: test Windows
-        runs-on: windows-2019
+        runs-on: windows-latest
         strategy:
             fail-fast: false
             matrix:

docs/lsp.md

@@ -26,9 +26,7 @@ sequenceDiagram
 
 ## Language Server Debugging
 
-1. Clone https://github.com/aws/language-servers.git and set it up in the same workspace as this project by cmd+shift+p and "add folder to workspace" and selecting the language-servers folder that you just cloned. Your VS code folder structure should look like  below.
-
-    
+1. Clone https://github.com/aws/language-servers.git and set it up in the same workspace as this project by cmd+shift+p and "add folder to workspace" and selecting the language-servers folder that you just cloned. Your VS code folder structure should look like below.
 
     ```
     /aws-toolkit-vscode
@@ -45,7 +43,7 @@ sequenceDiagram
     npm run package
     ```
     to get the project setup
-3. Enable the lsp experiment:
+3. You need to open VScode user settings (Cmd+Shift+P and Search "Open User Settings (JSON)") and add the lines below at the bottom of the settings to enable the lsp experiment:
     ```
     "aws.experiments": {
       "amazonqLSP": true,
@@ -54,7 +52,7 @@ sequenceDiagram
     }
     ```
 4. Uncomment the `__AMAZONQLSP_PATH` and `__AMAZONQLSP_UI` variables in the `amazonq/.vscode/launch.json` extension configuration
-5. Use the `Launch LSP with Debugging` configuration and set breakpoints in VSCode or the language server
+5. Use the `Launch LSP with Debugging` configuration and set breakpoints in VSCode or the language server, Once you run "Launch LSP with Debugging" a new window should start, wait for the plugin to show up there. Then go to the run menu again and run "Attach to Language Server (amazonq)" after this you should be able to add breakpoints in the LSP code.
 6. (Optional): Enable `"amazonq.trace.server": "on"` or `"amazonq.trace.server": "verbose"` in your VSCode settings to view detailed log messages sent to/from the language server. These log messages will show up in the "Amazon Q Language Server" output channel
 
 ## Amazon Q Inline Activation

package-lock.json

@@ -41,7 +41,7 @@
         "skippedTestReport": "ts-node ./scripts/skippedTestReport.ts ./packages/amazonq/test/e2e/"
     },
     "devDependencies": {
-        "@aws-toolkits/telemetry": "^1.0.323",
+        "@aws-toolkits/telemetry": "^1.0.324",
         "@playwright/browser-chromium": "^1.43.1",
         "@stylistic/eslint-plugin": "^2.11.0",
         "@types/he": "^1.2.3",

package.json

@@ -0,0 +1,18 @@
+{
+	"date": "2025-06-18",
+	"version": "1.76.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "/transform: only show lines of code statistic in plan"
+		},
+		{
+			"type": "Feature",
+			"description": "Add model selection feature"
+		},
+		{
+			"type": "Feature",
+			"description": "Pin context items in chat and manage workspace rules"
+		}
+	]
+}

packages/amazonq/.changes/1.76.0.json

@@ -0,0 +1,5 @@
+{
+	"date": "2025-06-18",
+	"version": "1.77.0",
+	"entries": []
+}

packages/amazonq/.changes/1.77.0.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Resolve missing chat options in Amazon Q chat interface."
+}

packages/amazonq/.changes/next-release/Bug Fix-541466ab-cebc-4f12-bbc6-6cdedad9eafe.json

@@ -1,3 +1,13 @@
+## 1.77.0 2025-06-18
+
+- Miscellaneous non-user-facing changes
+
+## 1.76.0 2025-06-18
+
+- **Bug Fix** /transform: only show lines of code statistic in plan
+- **Feature** Add model selection feature
+- **Feature** Pin context items in chat and manage workspace rules
+
 ## 1.75.0 2025-06-13
 
 - Miscellaneous non-user-facing changes

packages/amazonq/CHANGELOG.md

@@ -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.76.0-SNAPSHOT",
+    "version": "1.78.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

packages/amazonq/package.json

@@ -6,68 +6,26 @@
 import vscode from 'vscode'
 import {
     AuthUtil,
-    CodeSuggestionsState,
-    CodeWhispererCodeCoverageTracker,
     CodeWhispererConstants,
-    CodeWhispererSettings,
-    ConfigurationEntry,
-    DefaultCodeWhispererClient,
-    invokeRecommendation,
     isInlineCompletionEnabled,
-    KeyStrokeHandler,
-    RecommendationHandler,
     runtimeLanguageContext,
     TelemetryHelper,
     UserWrittenCodeTracker,
     vsCodeState,
 } from 'aws-core-vscode/codewhisperer'
-import { Commands, getLogger, globals, sleep } from 'aws-core-vscode/shared'
+import { globals, sleep } from 'aws-core-vscode/shared'
 
 export async function activate() {
-    const codewhispererSettings = CodeWhispererSettings.instance
-    const client = new DefaultCodeWhispererClient()
-
     if (isInlineCompletionEnabled()) {
         await setSubscriptionsforInlineCompletion()
         await AuthUtil.instance.setVscodeContextProps()
     }
 
-    function getAutoTriggerStatus(): boolean {
-        return CodeSuggestionsState.instance.isSuggestionsEnabled()
-    }
-
-    async function getConfigEntry(): Promise<ConfigurationEntry> {
-        const isShowMethodsEnabled: boolean =
-            vscode.workspace.getConfiguration('editor').get('suggest.showMethods') || false
-        const isAutomatedTriggerEnabled: boolean = getAutoTriggerStatus()
-        const isManualTriggerEnabled: boolean = true
-        const isSuggestionsWithCodeReferencesEnabled = codewhispererSettings.isSuggestionsWithCodeReferencesEnabled()
-
-        // TODO:remove isManualTriggerEnabled
-        return {
-            isShowMethodsEnabled,
-            isManualTriggerEnabled,
-            isAutomatedTriggerEnabled,
-            isSuggestionsWithCodeReferencesEnabled,
-        }
-    }
-
     async function setSubscriptionsforInlineCompletion() {
-        RecommendationHandler.instance.subscribeSuggestionCommands()
-
         /**
          * Automated trigger
          */
         globals.context.subscriptions.push(
-            vscode.window.onDidChangeActiveTextEditor(async (editor) => {
-                await RecommendationHandler.instance.onEditorChange()
-            }),
-            vscode.window.onDidChangeWindowState(async (e) => {
-                await RecommendationHandler.instance.onFocusChange()
-            }),
-            vscode.window.onDidChangeTextEditorSelection(async (e) => {
-                await RecommendationHandler.instance.onCursorChange(e)
-            }),
             vscode.workspace.onDidChangeTextDocument(async (e) => {
                 const editor = vscode.window.activeTextEditor
                 if (!editor) {
@@ -80,7 +38,6 @@ export async function activate() {
                     return
                 }
 
-                CodeWhispererCodeCoverageTracker.getTracker(e.document.languageId)?.countTotalTokens(e)
                 UserWrittenCodeTracker.instance.onTextDocumentChange(e)
                 /**
                  * Handle this keystroke event only when
@@ -105,19 +62,6 @@ export async function activate() {
                  * Then this event can be processed by our code.
                  */
                 await sleep(CodeWhispererConstants.vsCodeCursorUpdateDelay)
-                if (!RecommendationHandler.instance.isSuggestionVisible()) {
-                    await KeyStrokeHandler.instance.processKeyStroke(e, editor, client, await getConfigEntry())
-                }
-            }),
-            // manual trigger
-            Commands.register({ id: 'aws.amazonq.invokeInlineCompletion', autoconnect: true }, async () => {
-                invokeRecommendation(
-                    vscode.window.activeTextEditor as vscode.TextEditor,
-                    client,
-                    await getConfigEntry()
-                ).catch((e) => {
-                    getLogger().error('invokeRecommendation failed: %s', (e as Error).message)
-                })
             })
         )
     }