Merge branch 'master' of github.com:leigaol/aws-toolkit-vscode into build_script

Author: leigaol

package-lock.json

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

package.json

@@ -435,6 +435,21 @@ export function registerMessageListeners(
         async (params: ShowDocumentParams): Promise<ShowDocumentParams | ResponseError<ShowDocumentResult>> => {
             try {
                 const uri = vscode.Uri.parse(params.uri)
+
+                if (params.external) {
+                    // Note: Not using openUrl() because we probably don't want telemetry for these URLs.
+                    // Also it doesn't yet support the required HACK below.
+
+                    // HACK: workaround vscode bug: https://github.com/microsoft/vscode/issues/85930
+                    vscode.env.openExternal(params.uri as any).then(undefined, (e) => {
+                        // TODO: getLogger('?').error('failed vscode.env.openExternal: %O', e)
+                        vscode.env.openExternal(uri).then(undefined, (e) => {
+                            // TODO: getLogger('?').error('failed vscode.env.openExternal: %O', e)
+                        })
+                    })
+                    return params
+                }
+
                 const doc = await vscode.workspace.openTextDocument(uri)
                 await vscode.window.showTextDocument(doc, { preview: false })
                 return params

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

@@ -123,7 +123,6 @@ export async function startLanguageServer(
                 awsClientCapabilities: {
                     q: {
                         developerProfiles: true,
-                        mcp: true,
                     },
                     window: {
                         notifications: true,

packages/amazonq/src/lsp/client.ts

@@ -63,7 +63,8 @@ To learn more, visit the [User Guide](${userGuideURL}).`,
     gumby: {
         title: 'Q - Code Transformation',
         placeholder: 'Open a new tab to chat with Q',
-        welcome: 'Welcome to Code Transformation!',
+        welcome:
+            'Welcome to Code Transformation! You can also run transformations from the command line. To install the tool, see the [documentation](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/run-CLI-transformations.html).',
     },
     review: {
         title: 'Q - Review',

packages/core/src/amazonq/webview/ui/tabs/constants.ts

@@ -215,8 +215,11 @@ export function reloadWindowPrompt(message: string): void {
  * if user dismisses the vscode confirmation prompt.
  */
 export async function openUrl(url: vscode.Uri, source?: string): Promise<boolean> {
+    // Avoid PII in URL.
+    const truncatedUrl = `${url.scheme}${url.authority}${url.path}${url.fragment.substring(20)}`
+
     return telemetry.aws_openUrl.run(async (span) => {
-        span.record({ url: url.toString(), source })
+        span.record({ url: truncatedUrl, source })
         const didOpen = await vscode.env.openExternal(url)
         if (!didOpen) {
             throw new CancellationError('user')