Merge master into feature/amazonqLSP

Author: aws-toolkit-automation

packages/amazonq/package.json

@@ -218,11 +218,6 @@
                     "id": "aws.AmazonQChatView",
                     "name": "%AWS.amazonq.chat%",
                     "when": "!aws.isWebExtHost && !aws.amazonq.showLoginView"
-                },
-                {
-                    "id": "aws.AmazonQNeverShowBadge",
-                    "name": "",
-                    "when": "false"
                 }
             ],
             "aws-codewhisperer-reference-log": [

packages/amazonq/src/app/chat/activation.ts

@@ -61,7 +61,6 @@ export async function activate(context: ExtensionContext) {
         void vscode.env.openExternal(vscode.Uri.parse(amazonq.amazonQHelpUrl))
     })
 
-    await amazonq.activateBadge()
     void setupLsp()
     void setupAuthNotification()
 }

packages/core/src/amazonq/index.ts

@@ -24,7 +24,6 @@ export { init as featureDevChatAppInit } from '../amazonqFeatureDev/app'
 export { init as gumbyChatAppInit } from '../amazonqGumby/app'
 export { init as testChatAppInit } from '../amazonqTest/app'
 export { init as docChatAppInit } from '../amazonqDoc/app'
-export { activateBadge } from './util/viewBadgeHandler'
 export { amazonQHelpUrl } from '../shared/constants'
 export { listCodeWhispererCommandsWalkthrough } from '../codewhisperer/ui/statusBarMenu'
 export { focusAmazonQPanel, focusAmazonQPanelKeybinding } from '../codewhispererChat/commands/registerCommands'

packages/core/src/amazonq/util/viewBadgeHandler.ts

@@ -19,8 +19,6 @@ import { dispatchAppsMessagesToWebView, dispatchWebViewMessagesToApps } from './
 import { MessageListener } from '../messages/messageListener'
 import { MessagePublisher } from '../messages/messagePublisher'
 import { TabType } from './ui/storages/tabsStorage'
-import { deactivateInitialViewBadge, shouldShowBadge } from '../util/viewBadgeHandler'
-import { telemetry } from '../../shared/telemetry/telemetry'
 import { amazonqMark } from '../../shared/performance/marks'
 
 export class AmazonQChatViewProvider implements WebviewViewProvider {
@@ -66,19 +64,5 @@ export class AmazonQChatViewProvider implements WebviewViewProvider {
         )
 
         performance.mark(amazonqMark.open)
-
-        // badge is shown, emit telemetry for first time an existing, unscoped user tries Q
-        // note: this will fire on any not-properly-scoped Q entry.
-        // this means we can't tie it directly to the badge although it is hinted at
-        if (await shouldShowBadge()) {
-            telemetry.ui_click.emit({
-                elementId: 'amazonq_tryAmazonQ',
-                passive: false,
-            })
-        }
-        // if a user EVER enters Q, we should never show the badge again.
-        // the webview view only loads if the user clicks the view container,
-        // so we can essentially use this as a guarantee that a user has entered Q.
-        deactivateInitialViewBadge()
     }
 }

packages/core/src/amazonq/webview/webView.ts

@@ -60,7 +60,6 @@ export type globalKey =
     | 'dev.beta'
     | 'globalsMostRecentVersion'
     | 'gumby.wasQCodeTransformationUsed'
-    | 'hasAlreadyOpenedAmazonQ'
     | 'isExtensionFirstUse'
     | 'lastExtensionVersion'
     | 'lastSelectedRegion'