Merge remote-tracking branch 'upstream/master' into modelRouting

Will-ShaoHua · Will-ShaoHua · commit 17c0ae5d76ac · 2025-02-04T10:54:50.000-08:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-22f55c14-bd62-49d7-aa68-3ab3cc8f0929.json b/packages/amazonq/.changes/next-release/Bug Fix-22f55c14-bd62-49d7-aa68-3ab3cc8f0929.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Citation links are not clickable as numbers, but appear as non-clickable texts"
+}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-5c9f7fbc-1333-4c28-a049-7b17a17a7cea.json b/packages/amazonq/.changes/next-release/Bug Fix-5c9f7fbc-1333-4c28-a049-7b17a17a7cea.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Fix language server start failure in AL2023 ARM64"
+}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-dc78e630-6320-4297-9ae9-7a19891f5357.json b/packages/amazonq/.changes/next-release/Bug Fix-dc78e630-6320-4297-9ae9-7a19891f5357.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "/test placeholder text aligned across IDEs"
+}
diff --git a/packages/amazonq/.changes/next-release/Feature-d4b1f56f-fbfd-43e9-b4e1-e2c972dcf197.json b/packages/amazonq/.changes/next-release/Feature-d4b1f56f-fbfd-43e9-b4e1-e2c972dcf197.json
@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Added github issue link and description to the chat answer feedback form"
+}
diff --git a/packages/amazonq/test/e2e/amazonq/featureDev.test.ts b/packages/amazonq/test/e2e/amazonq/featureDev.test.ts
@@ -161,7 +161,8 @@ describe('Amazon Q Feature Dev', function () {
         })
     })
 
-    describe('/dev {msg} entry', async () => {
+    // Disable failing tests while investigation. The tests are only failing in CI environments.
+    describe.skip('/dev {msg} entry', async () => {
         beforeEach(async function () {
             tab.addChatMessage({ command: '/dev', prompt })
             await retryIfRequired(
@@ -216,7 +217,7 @@ describe('Amazon Q Feature Dev', function () {
         })
     })
 
-    describe('file-level accepts', async () => {
+    describe.skip('file-level accepts', async () => {
         beforeEach(async function () {
             tab.addChatMessage({ command: '/dev', prompt: fileLevelAcceptPrompt })
             await retryIfRequired(
diff --git a/packages/amazonq/test/unit/codewhisperer/util/zipUtil.test.ts b/packages/amazonq/test/unit/codewhisperer/util/zipUtil.test.ts
@@ -195,22 +195,5 @@ describe('zipUtil', function () {
 
             await assert.rejects(() => zipUtil.generateZipTestGen(appRoot, false), /Zip failed/)
         })
-
-        it('Should handle file copy to downloads folder error', async function () {
-            // Mock LSP client
-            sinon.stub(LspClient, 'instance').get(() => ({
-                getRepoMapJSON: sinon.stub().resolves('{"mock": "data"}'),
-            }))
-
-            const mkdirSpy = sinon.spy(fs, 'mkdir')
-            sinon.stub(fs, 'exists').resolves(true)
-            sinon.stub(fs, 'copy').rejects(new Error('Copy failed'))
-
-            await assert.rejects(() => zipUtil.generateZipTestGen(appRoot, false), /Copy failed/)
-
-            // Verify mkdir was called for all directories
-            assert(mkdirSpy.called, 'mkdir should have been called')
-            assert.strictEqual(mkdirSpy.callCount, 4, 'mkdir should have been called 4 times')
-        })
     })
 })
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -508,7 +508,7 @@
         "@aws-sdk/property-provider": "3.46.0",
         "@aws-sdk/smithy-client": "^3.46.0",
         "@aws-sdk/util-arn-parser": "^3.46.0",
-        "@aws/mynah-ui": "^4.21.6",
+        "@aws/mynah-ui": "^4.22.1",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
         "@iarna/toml": "^2.2.5",
         "@smithy/middleware-retry": "^2.3.1",
@@ -519,7 +519,7 @@
         "@vscode/debugprotocol": "^1.57.0",
         "@zip.js/zip.js": "^2.7.41",
         "adm-zip": "^0.5.10",
-        "amazon-states-language-service": "^1.13.0",
+        "amazon-states-language-service": "^1.15.0",
         "async-lock": "^1.4.0",
         "aws-sdk": "^2.1692.0",
         "aws-ssm-document-language-service": "^1.0.0",
diff --git a/packages/core/src/amazonq/lsp/lspController.ts b/packages/core/src/amazonq/lsp/lspController.ts
@@ -58,7 +58,7 @@ export interface Manifest {
 }
 const manifestUrl = 'https://aws-toolkit-language-servers.amazonaws.com/q-context/manifest.json'
 // this LSP client in Q extension is only going to work with these LSP server versions
-const supportedLspServerVersions = ['0.1.32']
+const supportedLspServerVersions = ['0.1.35']
 
 const nodeBinName = process.platform === 'win32' ? 'node.exe' : 'node'
 
diff --git a/packages/core/src/amazonq/webview/messages/messageDispatcher.ts b/packages/core/src/amazonq/webview/messages/messageDispatcher.ts
@@ -48,9 +48,9 @@ export function dispatchWebViewMessagesToApps(
                 AmazonQChatMessageDuration.stopChatMessageTelemetry(msg)
                 return
             }
-            case 'open-user-guide': {
-                const { userGuideLink } = msg
-                void openUrl(Uri.parse(userGuideLink))
+            case 'open-link': {
+                const { link } = msg
+                void openUrl(Uri.parse(link))
                 return
             }
             case 'send-telemetry': {
diff --git a/packages/core/src/amazonq/webview/ui/apps/amazonqCommonsConnector.ts b/packages/core/src/amazonq/webview/ui/apps/amazonqCommonsConnector.ts
@@ -130,8 +130,8 @@ export class Connector {
         this.sendMessageToExtension(createClickTelemetry(`amazonq-explore-${actionId}`))
 
         this.sendMessageToExtension({
-            command: 'open-user-guide',
-            userGuideLink,
+            command: 'open-link',
+            link: userGuideLink,
         })
     }
 
diff --git a/packages/core/src/amazonq/webview/ui/commands.ts b/packages/core/src/amazonq/webview/ui/commands.ts
@@ -39,7 +39,7 @@ type MessageCommand =
     | 'store-code-result-message-id'
     | 'start-test-gen'
     | 'review'
-    | 'open-user-guide'
+    | 'open-link'
     | 'send-telemetry'
     | 'update-welcome-count'
 
diff --git a/packages/core/src/amazonq/webview/ui/connector.ts b/packages/core/src/amazonq/webview/ui/connector.ts
@@ -131,6 +131,13 @@ export class Connector {
         }
     }
 
+    onLinkClick = (link: string): void => {
+        this.sendMessageToExtension({
+            command: 'open-link',
+            link,
+        })
+    }
+
     onResponseBodyLinkClick = (tabID: string, messageId: string, link: string): void => {
         switch (this.tabsStorage.getTab(tabID)?.type) {
             case 'cwc':
diff --git a/packages/core/src/amazonq/webview/ui/main.ts b/packages/core/src/amazonq/webview/ui/main.ts
@@ -834,6 +834,12 @@ export const createMynahUI = (
             mouseEvent?.stopImmediatePropagation()
             connector.onResponseBodyLinkClick(tabId, messageId, link)
         },
+        onFormLinkClick: (link, mouseEvent) => {
+            mouseEvent?.preventDefault()
+            mouseEvent?.stopPropagation()
+            mouseEvent?.stopImmediatePropagation()
+            connector.onLinkClick(link)
+        },
         onInfoLinkClick: (tabId: string, link: string, mouseEvent?: MouseEvent) => {
             mouseEvent?.preventDefault()
             mouseEvent?.stopPropagation()
diff --git a/packages/core/src/amazonq/webview/ui/texts/constants.ts b/packages/core/src/amazonq/webview/ui/texts/constants.ts
@@ -8,6 +8,8 @@ export const uiComponentsTexts = {
     copy: 'Copy',
     insertAtCursorLabel: 'Insert at cursor',
     feedbackFormTitle: 'Report an issue',
+    feedbackFormDescription:
+        '_Feedback is anonymous. For issue updates, please contact us on [GitHub](https://github.com/aws/aws-toolkit-vscode/issues/new/choose)._',
     feedbackFormOptionsLabel: 'What type of issue would you like to report?',
     feedbackFormCommentLabel: 'Description of issue (optional):',
     feedbackThanks: 'Thanks for your feedback!',
diff --git a/packages/core/src/amazonqTest/chat/controller/controller.ts b/packages/core/src/amazonqTest/chat/controller/controller.ts
@@ -1317,7 +1317,7 @@ export class TestController {
         if (session.tabID) {
             getLogger().debug('Setting input state with tabID: %s', session.tabID)
             this.messenger.sendChatInputEnabled(session.tabID, true)
-            this.messenger.sendUpdatePlaceholder(session.tabID, '/test Generate unit tests') // TODO: Change according to the UX
+            this.messenger.sendUpdatePlaceholder(session.tabID, 'Enter "/" for quick actions')
         }
         getLogger().debug(
             'Deleting output.log and temp result directory. testGenerationLogsDir: %s',
diff --git a/packages/core/src/codewhisperer/service/securityScanHandler.ts b/packages/core/src/codewhisperer/service/securityScanHandler.ts
diff --git a/packages/core/src/codewhisperer/service/testGenHandler.ts b/packages/core/src/codewhisperer/service/testGenHandler.ts
diff --git a/packages/toolkit/.changes/next-release/Feature-f899524a-1862-4e6f-a10a-bda639f1e792.json b/packages/toolkit/.changes/next-release/Feature-f899524a-1862-4e6f-a10a-bda639f1e792.json

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +	"type": "Bug Fix",
 +	"description": "Citation links are not clickable as numbers, but appear as non-clickable texts"
 +}
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ export interface Manifest {`
`58`	`58`	`}`
`59`	`59`	`const manifestUrl = 'https://aws-toolkit-language-servers.amazonaws.com/q-context/manifest.json'`
`60`	`60`	`// this LSP client in Q extension is only going to work with these LSP server versions`
`61`		`-const supportedLspServerVersions = ['0.1.32']`
	`61`	`+const supportedLspServerVersions = ['0.1.35']`
`62`	`62`
`63`	`63`	`const nodeBinName = process.platform === 'win32' ? 'node.exe' : 'node'`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,9 @@ export function dispatchWebViewMessagesToApps(`
`48`	`48`	`AmazonQChatMessageDuration.stopChatMessageTelemetry(msg)`
`49`	`49`	`return`
`50`	`50`	`}`
`51`		`- case 'open-user-guide': {`
`52`		`- const { userGuideLink } = msg`
`53`		`- void openUrl(Uri.parse(userGuideLink))`
	`51`	`+ case 'open-link': {`
	`52`	`+ const { link } = msg`
	`53`	`+ void openUrl(Uri.parse(link))`
`54`	`54`	`return`
`55`	`55`	`}`
`56`	`56`	`case 'send-telemetry': {`