Merge branch 'master' into debug_feedback

Author: roger-zhangg

package-lock.json

@@ -0,0 +1,5 @@
+{
+	"date": "2025-09-29",
+	"version": "1.97.0",
+	"entries": []
+}

packages/amazonq/.changes/1.97.0.json

@@ -1,3 +1,7 @@
+## 1.97.0 2025-09-29
+
+- Miscellaneous non-user-facing changes
+
 ## 1.96.0 2025-09-25
 
 - **Bug Fix** Amazon Q support web/container environments running Ubuntu/Linux, even when the host machine is Amazon Linux 2.

packages/amazonq/CHANGELOG.md

@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "The most capable generative AI–powered assistant for software development.",
-    "version": "1.97.0-SNAPSHOT",
+    "version": "1.98.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

packages/amazonq/package.json

@@ -11,10 +11,8 @@ import {
     session,
     AuthUtil,
     DefaultCodeWhispererClient,
-    RecommendationsList,
     ConfigurationEntry,
     RecommendationHandler,
-    CodeWhispererCodeCoverageTracker,
     supplementalContextUtil,
 } from 'aws-core-vscode/codewhisperer'
 import {
@@ -54,35 +52,35 @@ describe('recommendationHandler', function () {
             sinon.restore()
         })
 
-        it('should assign correct recommendations given input', async function () {
-            assert.strictEqual(CodeWhispererCodeCoverageTracker.instances.size, 0)
-            assert.strictEqual(
-                CodeWhispererCodeCoverageTracker.getTracker(mockEditor.document.languageId)?.serviceInvocationCount,
-                0
-            )
+        // it('should assign correct recommendations given input', async function () {
+        //     assert.strictEqual(CodeWhispererCodeCoverageTracker.instances.size, 0)
+        //     assert.strictEqual(
+        //         CodeWhispererCodeCoverageTracker.getTracker(mockEditor.document.languageId)?.serviceInvocationCount,
+        //         0
+        //     )
 
-            const mockServerResult = {
-                recommendations: [{ content: "print('Hello World!')" }, { content: '' }],
-                $response: {
-                    requestId: 'test_request',
-                    httpResponse: {
-                        headers: {
-                            'x-amzn-sessionid': 'test_request',
-                        },
-                    },
-                },
-            }
-            const handler = new RecommendationHandler()
-            sinon.stub(handler, 'getServerResponse').resolves(mockServerResult)
-            await handler.getRecommendations(mockClient, mockEditor, 'AutoTrigger', config, 'Enter', false)
-            const actual = session.recommendations
-            const expected: RecommendationsList = [{ content: "print('Hello World!')" }, { content: '' }]
-            assert.deepStrictEqual(actual, expected)
-            assert.strictEqual(
-                CodeWhispererCodeCoverageTracker.getTracker(mockEditor.document.languageId)?.serviceInvocationCount,
-                1
-            )
-        })
+        //     const mockServerResult = {
+        //         recommendations: [{ content: "print('Hello World!')" }, { content: '' }],
+        //         $response: {
+        //             requestId: 'test_request',
+        //             httpResponse: {
+        //                 headers: {
+        //                     'x-amzn-sessionid': 'test_request',
+        //                 },
+        //             },
+        //         },
+        //     }
+        //     const handler = new RecommendationHandler()
+        //     sinon.stub(handler, 'getServerResponse').resolves(mockServerResult)
+        //     await handler.getRecommendations(mockClient, mockEditor, 'AutoTrigger', config, 'Enter', false)
+        //     const actual = session.recommendations
+        //     const expected: RecommendationsList = [{ content: "print('Hello World!')" }, { content: '' }]
+        //     assert.deepStrictEqual(actual, expected)
+        //     assert.strictEqual(
+        //         CodeWhispererCodeCoverageTracker.getTracker(mockEditor.document.languageId)?.serviceInvocationCount,
+        //         1
+        //     )
+        // })
 
         it('should assign request id correctly', async function () {
             const mockServerResult = {

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

@@ -28,6 +28,7 @@ import globals from '../../../../shared/extensionGlobals'
 export class ToolkitLoginWebview extends CommonAuthWebview {
     public override id: string = 'aws.toolkit.AmazonCommonAuth'
     public static sourcePath: string = 'vue/src/login/webview/vue/toolkit/index.js'
+    public override supportsLoadTelemetry: boolean = true
     private isCodeCatalystLogin = false
 
     override onActiveConnectionModified: vscode.EventEmitter<void> = new vscode.EventEmitter()

packages/core/src/login/webview/vue/toolkit/backend_toolkit.ts

@@ -0,0 +1,5 @@
+{
+	"date": "2025-09-29",
+	"version": "3.77.0",
+	"entries": []
+}

packages/toolkit/.changes/3.77.0.json

@@ -1,3 +1,7 @@
+## 3.77.0 2025-09-29
+
+- Miscellaneous non-user-facing changes
+
 ## 3.76.0 2025-09-25
 
 - Miscellaneous non-user-facing changes

packages/toolkit/CHANGELOG.md

@@ -2,7 +2,7 @@
     "name": "aws-toolkit-vscode",
     "displayName": "AWS Toolkit",
     "description": "Including CodeCatalyst, Infrastructure Composer, and support for Lambda, S3, CloudWatch Logs, CloudFormation, and many other services.",
-    "version": "3.77.0-SNAPSHOT",
+    "version": "3.78.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],