Merge master into feature/amazonqLSP

package.json

@@ -40,7 +40,7 @@
         "mergeReports": "ts-node ./scripts/mergeReports.ts"
     },
     "devDependencies": {
-        "@aws-toolkits/telemetry": "^1.0.295",
+        "@aws-toolkits/telemetry": "^1.0.296",
         "@playwright/browser-chromium": "^1.43.1",
         "@stylistic/eslint-plugin": "^2.11.0",
         "@types/he": "^1.2.3",

packages/amazonq/.changes/1.46.0.json

@@ -0,0 +1,38 @@
+{
+	"date": "2025-02-05",
+	"version": "1.46.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Citation links are not clickable as numbers, but appear as non-clickable texts"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix language server start failure in AL2023 ARM64"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/review: Auto-review issues did not populate code issues list"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q: Fix code upload error when using /dev or /doc on Remote SSH"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/test placeholder text aligned across IDEs"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Inline: Typos in the first example suggestion"
+		},
+		{
+			"type": "Feature",
+			"description": "Inline suggestions: Pre-fetch recommendations to reduce suggestion latency."
+		},
+		{
+			"type": "Feature",
+			"description": "Added github issue link and description to the chat answer feedback form"
+		}
+	]
+}

packages/amazonq/.vscode/launch.json

@@ -9,11 +9,6 @@
             "name": "Extension",
             "type": "extensionHost",
             "request": "launch",
-            "debugWebviews": true,
-            "rendererDebugOptions": {
-                "urlFilter": "*amazonwebservices.amazon-q-vscode*",
-                "webRoot": "${workspaceFolder}"
-            },
             "runtimeExecutable": "${execPath}",
             "args": ["--extensionDevelopmentPath=${workspaceFolder}"],
             "env": {

packages/amazonq/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 1.46.0 2025-02-05
+
+- **Bug Fix** Citation links are not clickable as numbers, but appear as non-clickable texts
+- **Bug Fix** Fix language server start failure in AL2023 ARM64
+- **Bug Fix** /review: Auto-review issues did not populate code issues list
+- **Bug Fix** Amazon Q: Fix code upload error when using /dev or /doc on Remote SSH
+- **Bug Fix** /test placeholder text aligned across IDEs
+- **Bug Fix** Inline: Typos in the first example suggestion
+- **Feature** Inline suggestions: Pre-fetch recommendations to reduce suggestion latency.
+- **Feature** Added github issue link and description to the chat answer feedback form
+
 ## 1.45.0 2025-01-30
 
 - **Bug Fix** Allow AB users with an overridden customization to go back to the default customization

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.46.0-SNAPSHOT",
+    "version": "1.47.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

packages/amazonq/src/lsp/activation.ts

@@ -6,12 +6,14 @@
 import vscode from 'vscode'
 import { startLanguageServer } from './client'
 import { AmazonQLSPResolver } from './lspInstaller'
-import { Commands, ToolkitError } from 'aws-core-vscode/shared'
+import { Commands, lspSetupStage, ToolkitError } from 'aws-core-vscode/shared'
 
 export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
     try {
-        const installResult = await new AmazonQLSPResolver().resolve()
-        await startLanguageServer(ctx, installResult.resourcePaths)
+        await lspSetupStage('all', async () => {
+            const installResult = await new AmazonQLSPResolver().resolve()
+            await lspSetupStage('launch', async () => await startLanguageServer(ctx, installResult.resourcePaths))
+        })
         ctx.subscriptions.push(
             Commands.register({ id: 'aws.amazonq.invokeInlineCompletion', autoconnect: true }, async () => {
                 await vscode.commands.executeCommand('editor.action.inlineSuggest.trigger')

packages/amazonq/test/e2e/amazonq/testGen.test.ts

@@ -9,7 +9,7 @@ import { qTestingFramework } from './framework/framework'
 import sinon from 'sinon'
 import { Messenger } from './framework/messenger'
 import { FollowUpTypes } from 'aws-core-vscode/amazonq'
-import { registerAuthHook, using, TestFolder } from 'aws-core-vscode/test'
+import { registerAuthHook, using, TestFolder, closeAllEditors } from 'aws-core-vscode/test'
 import { loginToIdC } from './utils/setup'
 import { waitUntil, workspaceUtils } from 'aws-core-vscode/shared'
 
@@ -51,10 +51,12 @@ describe('Amazon Q Test Generation', function () {
             assert.fail(`Failed to open ${language} file`)
         }
 
-        await vscode.window.showTextDocument(document, { preview: false })
+        await waitUntil(async () => {
+            await vscode.window.showTextDocument(document, { preview: false })
+        }, {})
 
         const activeEditor = vscode.window.activeTextEditor
-        if (!activeEditor || activeEditor.document !== document) {
+        if (!activeEditor || activeEditor.document.uri.fsPath !== document.uri.fsPath) {
             assert.fail(`Failed to make temp file active`)
         }
     }
@@ -80,7 +82,7 @@ describe('Amazon Q Test Generation', function () {
 
     afterEach(async () => {
         // Close all editors to prevent conflicts with subsequent tests trying to open the same file
-        await vscode.commands.executeCommand('workbench.action.closeAllEditors')
+        await closeAllEditors()
         framework.removeTab(tab.tabID)
         framework.dispose()
         sinon.restore()
@@ -161,9 +163,11 @@ describe('Amazon Q Test Generation', function () {
         })
 
         for (const { language, filePath } of testFiles) {
-            describe(`${language} file`, () => {
+            // skipping for now since this test is flaky. passes locally, but only half the time in CI
+            // have tried retries for setupTestDocument, openTextDocument, and showTextDocument
+            describe.skip(`${language} file`, () => {
                 beforeEach(async () => {
-                    await setupTestDocument(filePath, language)
+                    await waitUntil(async () => await setupTestDocument(filePath, language), {})
 
                     tab.addChatMessage({ command: '/test' })
                     await tab.waitForChatFinishesLoading()

packages/amazonq/test/e2e/lsp/lspInstaller.test.ts

@@ -8,12 +8,17 @@ import sinon from 'sinon'
 import { AmazonQLSPResolver, supportedLspServerVersions } from '../../../src/lsp/lspInstaller'
 import {
     fs,
+    globals,
     LanguageServerResolver,
     makeTemporaryToolkitFolder,
     ManifestResolver,
+    manifestStorageKey,
     request,
 } from 'aws-core-vscode/shared'
 import * as semver from 'semver'
+import { assertTelemetry } from 'aws-core-vscode/test'
+import { LspController } from 'aws-core-vscode/amazonq'
+import { LanguageServerSetup } from 'aws-core-vscode/telemetry'
 
 function createVersion(version: string) {
     return {
@@ -40,12 +45,22 @@ describe('AmazonQLSPInstaller', () => {
     let resolver: AmazonQLSPResolver
     let sandbox: sinon.SinonSandbox
     let tempDir: string
+    // If globalState contains an ETag that is up to date with remote, we won't fetch it resulting in inconsistent behavior.
+    // Therefore, we clear it temporarily for these tests to ensure consistent behavior.
+    let manifestStorage: { [key: string]: any }
+
+    before(async () => {
+        manifestStorage = globals.globalState.get(manifestStorageKey) || {}
+    })
 
     beforeEach(async () => {
         sandbox = sinon.createSandbox()
         resolver = new AmazonQLSPResolver()
         tempDir = await makeTemporaryToolkitFolder()
         sandbox.stub(LanguageServerResolver.prototype, 'defaultDownloadFolder').returns(tempDir)
+        // Called on extension activation and can contaminate telemetry.
+        sandbox.stub(LspController.prototype, 'trySetupLsp')
+        await globals.globalState.update(manifestStorageKey, {})
     })
 
     afterEach(async () => {
@@ -56,6 +71,10 @@ describe('AmazonQLSPInstaller', () => {
         })
     })
 
+    after(async () => {
+        await globals.globalState.update(manifestStorageKey, manifestStorage)
+    })
+
     describe('resolve()', () => {
         it('uses AWS_LANGUAGE_SERVER_OVERRIDE', async () => {
             const overridePath = '/custom/path/to/lsp'
@@ -117,6 +136,94 @@ describe('AmazonQLSPInstaller', () => {
             assert.ok(fallback.assetDirectory.startsWith(tempDir))
             assert.deepStrictEqual(fallback.location, 'fallback')
             assert.ok(semver.satisfies(fallback.version, supportedLspServerVersions))
+
+            /* First Try Telemetry
+                    getManifest: remote succeeds
+                    getServer: cache fails then remote succeeds.
+                    validate: succeeds.
+            */
+            const firstTryTelemetry: Partial<LanguageServerSetup>[] = [
+                {
+                    id: 'AmazonQ',
+                    manifestLocation: 'remote',
+                    languageServerSetupStage: 'getManifest',
+                    result: 'Succeeded',
+                },
+                {
+                    id: 'AmazonQ',
+                    languageServerLocation: 'cache',
+                    languageServerSetupStage: 'getServer',
+                    result: 'Failed',
+                },
+                {
+                    id: 'AmazonQ',
+                    languageServerLocation: 'remote',
+                    languageServerSetupStage: 'validate',
+                    result: 'Succeeded',
+                },
+                {
+                    id: 'AmazonQ',
+                    languageServerLocation: 'remote',
+                    languageServerSetupStage: 'getServer',
+                    result: 'Succeeded',
+                },
+            ]
+
+            /* Second Try Telemetry
+                    getManifest: remote fails, then cache succeeds.
+                    getServer: cache succeeds
+                    validate: doesn't run since its cached.
+            */
+            const secondTryTelemetry: Partial<LanguageServerSetup>[] = [
+                {
+                    id: 'AmazonQ',
+                    manifestLocation: 'remote',
+                    languageServerSetupStage: 'getManifest',
+                    result: 'Failed',
+                },
+                {
+                    id: 'AmazonQ',
+                    manifestLocation: 'cache',
+                    languageServerSetupStage: 'getManifest',
+                    result: 'Succeeded',
+                },
+                {
+                    id: 'AmazonQ',
+                    languageServerLocation: 'cache',
+                    languageServerSetupStage: 'getServer',
+                    result: 'Succeeded',
+                },
+            ]
+
+            /* Third Try Telemetry
+                    getManifest: (stubbed to fail, no telemetry)
+                    getServer: remote and cache fail
+                    validate: no validation since not remote. 
+            */
+            const thirdTryTelemetry: Partial<LanguageServerSetup>[] = [
+                {
+                    id: 'AmazonQ',
+                    languageServerLocation: 'cache',
+                    languageServerSetupStage: 'getServer',
+                    result: 'Failed',
+                },
+                {
+                    id: 'AmazonQ',
+                    languageServerLocation: 'remote',
+                    languageServerSetupStage: 'getServer',
+                    result: 'Failed',
+                },
+                {
+                    id: 'AmazonQ',
+                    languageServerLocation: 'fallback',
+                    languageServerSetupStage: 'getServer',
+                    result: 'Succeeded',
+                },
+            ]
+
+            const expectedTelemetry = firstTryTelemetry.concat(secondTryTelemetry, thirdTryTelemetry)
+
+            assertTelemetry('languageServer_setup', expectedTelemetry)
         })
     })
 })

packages/amazonq/test/unit/codewhisperer/commands/onAcceptance.test.ts

@@ -9,19 +9,21 @@ import * as sinon from 'sinon'
 import {
     onAcceptance,
     AcceptedSuggestionEntry,
-    session,
+    CodeWhispererSessionState,
     CodeWhispererTracker,
     RecommendationHandler,
     AuthUtil,
+    CodeWhispererSession,
 } from 'aws-core-vscode/codewhisperer'
 import { resetCodeWhispererGlobalVariables, createMockTextEditor } from 'aws-core-vscode/test'
 import { assertTelemetryCurried } from 'aws-core-vscode/test'
 
 describe('onAcceptance', function () {
+    let session: CodeWhispererSession
     describe('onAcceptance', function () {
         beforeEach(async function () {
+            session = CodeWhispererSessionState.instance.getSession()
             await resetCodeWhispererGlobalVariables()
-            session.reset()
         })
 
         afterEach(function () {

packages/amazonq/test/unit/codewhisperer/commands/onInlineAcceptance.test.ts

@@ -8,15 +8,22 @@ import * as vscode from 'vscode'
 import * as sinon from 'sinon'
 import { resetCodeWhispererGlobalVariables, createMockTextEditor } from 'aws-core-vscode/test'
 import { assertTelemetryCurried } from 'aws-core-vscode/test'
-import { onInlineAcceptance, RecommendationHandler, AuthUtil, session } from 'aws-core-vscode/codewhisperer'
+import {
+    onInlineAcceptance,
+    RecommendationHandler,
+    AuthUtil,
+    CodeWhispererSessionState,
+    CodeWhispererSession,
+} from 'aws-core-vscode/codewhisperer'
 import { globals } from 'aws-core-vscode/shared'
 import { extensionVersion } from 'aws-core-vscode/shared'
 
 describe('onInlineAcceptance', function () {
+    let session: CodeWhispererSession
     describe('onInlineAcceptance', function () {
         beforeEach(async function () {
+            session = CodeWhispererSessionState.instance.getSession()
             await resetCodeWhispererGlobalVariables()
-            session.reset()
         })
 
         afterEach(function () {

packages/amazonq/test/unit/codewhisperer/service/completionProvider.test.ts

@@ -12,7 +12,7 @@ import {
     getLabel,
     Recommendation,
     RecommendationHandler,
-    session,
+    CodeWhispererSessionState,
 } from 'aws-core-vscode/codewhisperer'
 import { createMockDocument, resetCodeWhispererGlobalVariables } from 'aws-core-vscode/test'
 
@@ -39,6 +39,7 @@ describe('completionProviderService', function () {
 
     describe('getCompletionItem', function () {
         it('should return targetCompletionItem given input', function () {
+            const session = CodeWhispererSessionState.instance.getSession()
             session.startPos = new vscode.Position(0, 0)
             RecommendationHandler.instance.requestId = 'mock_requestId_getCompletionItem'
             session.sessionId = 'mock_sessionId_getCompletionItem'
@@ -95,6 +96,7 @@ describe('completionProviderService', function () {
 
     describe('getCompletionItems', function () {
         it('should return completion items for each non-empty recommendation', async function () {
+            const session = CodeWhispererSessionState.instance.getSession()
             session.recommendations = [
                 { content: "\n\t\tconsole.log('Hello world!');\n\t}" },
                 { content: '\nvar a = 10' },
@@ -106,6 +108,7 @@ describe('completionProviderService', function () {
         })
 
         it('should return empty completion items when recommendation is empty', async function () {
+            const session = CodeWhispererSessionState.instance.getSession()
             session.recommendations = []
             const mockPosition = new vscode.Position(14, 83)
             const mockDocument = createMockDocument()