small fixes to Amazon Q tree nodes in toolkit view (#4137)

* refact(awsq): update enable button string

* fix(awsq): use more reliable command to focus on Amazon Q Chat view

Problem: "Switch To Amazon Q" tree node button does not always work for all clients. It is a silent
failure.
Solution: Use an alternative generated command to open the chat view.

Author: hayemaxi

.changes/next-release/Bug Fix-c3b1288b-9bb9-41a8-910e-44bd160631a4.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q: 'Switch to Q Chat' button not working for some users."
+}

src/amazonq/activation.ts

@@ -13,9 +13,9 @@ import { Commands, VsCodeCommandArg } from '../shared/vscode/commands2'
 import { MessagePublisher } from './messages/messagePublisher'
 import { welcome } from './onboardingPage'
 import { learnMoreAmazonQCommand, switchToAmazonQCommand } from './explorer/amazonQChildrenNodes'
-import { focusAmazonQPanel } from '../codewhisperer/commands/basicCommands'
 import { activateBadge } from './util/viewBadgeHandler'
 import { telemetry } from '../shared/telemetry/telemetry'
+import { focusAmazonQPanel } from '../auth/ui/vue/show'
 
 export async function activate(context: ExtensionContext) {
     const appInitContext = new DefaultAmazonQAppInitContext()

src/amazonq/explorer/amazonQChildrenNodes.ts

@@ -7,12 +7,13 @@ import * as vscode from 'vscode'
 import * as nls from 'vscode-nls'
 import { Commands, placeholder } from '../../shared/vscode/commands2'
 import { getIcon } from '../../shared/icons'
-import { focusAmazonQPanel, reconnect, showTransformByQ } from '../../codewhisperer/commands/basicCommands'
+import { reconnect, showTransformByQ } from '../../codewhisperer/commands/basicCommands'
 import { transformByQState } from '../../codewhisperer/models/model'
 import * as CodeWhispererConstants from '../../codewhisperer/models/constants'
 import { amazonQHelpUrl } from '../../shared/constants'
 import { cwTreeNodeSource } from '../../codewhisperer/commands/types'
 import { telemetry } from '../../shared/telemetry/telemetry'
+import { focusAmazonQPanel } from '../../auth/ui/vue/show'
 
 const localize = nls.loadMessageBundle()
 
@@ -50,7 +51,7 @@ export const switchToAmazonQNode = () =>
 export const enableAmazonQNode = () =>
     // Simply trigger re-auth to obtain the proper scopes- same functionality as if requested in the chat window.
     reconnect.build(placeholder, cwTreeNodeSource).asTreeNode({
-        label: localize('AWS.amazonq.enable', 'Enable Amazon Q (Preview)'),
+        label: localize('AWS.amazonq.enable', 'Enable'),
         iconPath: getIcon('vscode-debug-start'),
         contextValue: 'awsEnableAmazonQ',
     })

src/amazonq/onboardingPage/index.ts

@@ -7,8 +7,8 @@ import * as vscode from 'vscode'
 import globals from '../../shared/extensionGlobals'
 import path from 'path'
 import { MessagePublisher } from '../messages/messagePublisher'
-import { focusAmazonQPanel } from '../../codewhisperer/commands/basicCommands'
 import { telemetry } from '../../shared/telemetry/telemetry'
+import { focusAmazonQPanel } from '../../auth/ui/vue/show'
 
 export function welcome(context: vscode.ExtensionContext, cwcWebViewToAppsPublisher: MessagePublisher<any>): void {
     const panel = vscode.window.createWebviewPanel(

src/auth/ui/vue/show.ts

@@ -181,7 +181,7 @@ export class AuthWebview extends VueWebview {
     }
 
     async showAmazonQChat(): Promise<void> {
-        await vscode.commands.executeCommand('aws.AmazonQChatView.focus')
+        focusAmazonQPanel()
     }
 
     async getIdentityCenterRegion(): Promise<Region | undefined> {
@@ -843,3 +843,11 @@ export async function emitWebviewClosed(authWebview: ClassToInterfaceType<AuthWe
         return result
     }
 }
+
+/**
+ * Forces focus to Amazon Q panel - USE THIS SPARINGLY (don't betray customer trust by hijacking the IDE)
+ * Used on first load, and any time we want to directly populate chat.
+ */
+export async function focusAmazonQPanel(): Promise<void> {
+    await vscode.commands.executeCommand('aws.AmazonQChatView.focus')
+}

src/codewhisperer/commands/basicCommands.ts

@@ -312,15 +312,6 @@ export const applySecurityFix = Commands.declare(
     }
 )
 
-/**
- * Forces focus to Amazon Q panel - USE THIS SPARINGLY (don't betray customer trust by hijacking the IDE)
- * Used on first load, and any time we want to directly populate chat.
- */
-export async function focusAmazonQPanel(): Promise<void> {
-    // VS Code-owned command: "View: Show Amazon Q"
-    await vscode.commands.executeCommand('workbench.view.extension.amazonq')
-}
-
 export const signoutCodeWhisperer = Commands.declare(
     { id: 'aws.codewhisperer.signout', compositeKey: { 1: 'source' } },
     (auth: AuthUtil) => (_: VsCodeCommandArg, source: CodeWhispererSource) => {

src/codewhispererChat/commands/registerCommands.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { focusAmazonQPanel } from '../../codewhisperer/commands/basicCommands'
+import { focusAmazonQPanel } from '../../auth/ui/vue/show'
 import { Commands } from '../../shared/vscode/commands2'
 import { ChatControllerMessagePublishers } from '../controllers/chat/controller'