fixup

Author: jpinkney-aws

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

@@ -8,7 +8,6 @@ import { LanguageClient } from 'vscode-languageclient'
 import { AmazonQChatViewProvider } from './webviewProvider'
 import { registerCommands } from './commands'
 import { registerLanguageServerEventListener, registerMessageListeners } from './messages'
-import { focusAmazonQPanel, focusAmazonQPanelKeybinding } from 'aws-core-vscode/amazonq'
 import { globals } from 'aws-core-vscode/shared'
 
 export function activate(languageClient: LanguageClient, encryptionKey: Buffer, mynahUIPath: string) {
@@ -19,10 +18,7 @@ export function activate(languageClient: LanguageClient, encryptionKey: Buffer,
             webviewOptions: {
                 retainContextWhenHidden: true,
             },
-        }),
-
-        focusAmazonQPanel.register(),
-        focusAmazonQPanelKeybinding.register()
+        })
     )
 
     /**

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

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { focusAmazonQPanel } from 'aws-core-vscode/amazonq'
-import { Commands, globals, placeholder } from 'aws-core-vscode/shared'
+import * as vscode from 'vscode'
+import { Commands, globals } from 'aws-core-vscode/shared'
 import { window } from 'vscode'
 import { AmazonQChatViewProvider } from './webviewProvider'
 
@@ -18,15 +18,15 @@ export function registerCommands(provider: AmazonQChatViewProvider) {
             const triggerType = getCommandTriggerType(data)
             const selection = getSelectedText()
 
-            void focusAmazonQPanel.execute(placeholder, 'aws.amazonq.sendToPrompt').then(() => {
+            void focusAmazonQPanel().then(() => {
                 void provider.webview?.postMessage({
                     command: 'sendToPrompt',
                     params: { selection: selection, triggerType },
                 })
             })
         }),
         Commands.register('aws.amazonq.openTab', () => {
-            void focusAmazonQPanel.execute(placeholder, 'aws.amazonq.openTab').then(() => {
+            void focusAmazonQPanel().then(() => {
                 void provider.webview?.postMessage({
                     command: 'aws/chat/openTab',
                     params: {},
@@ -58,11 +58,22 @@ function registerGenericCommand(commandName: string, genericCommand: string, pro
         const triggerType = getCommandTriggerType(data)
         const selection = getSelectedText()
 
-        void focusAmazonQPanel.execute(placeholder, commandName).then(() => {
+        void focusAmazonQPanel().then(() => {
             void provider.webview?.postMessage({
                 command: 'genericCommand',
                 params: { genericCommand, selection, triggerType },
             })
         })
     })
 }
+
+/**
+ * Importing focusAmazonQPanel from aws-core-vscode/amazonq leads to several dependencies down the chain not resolving since AmazonQ chat
+ * is currently only activated on node, but the language server is activated on both web and node.
+ *
+ * Instead, we just create our own as a temporary solution
+ */
+async function focusAmazonQPanel() {
+    await vscode.commands.executeCommand('aws.amazonq.AmazonQChatView.focus')
+    await vscode.commands.executeCommand('aws.amazonq.AmazonCommonAuth.focus')
+}

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

@@ -15,7 +15,7 @@ import {
 import { LanguageServerResolver } from 'aws-core-vscode/shared'
 
 export class AmazonQChatViewProvider implements WebviewViewProvider {
-    public static readonly viewType = 'aws.AmazonQChatView'
+    public static readonly viewType = 'aws.amazonq.AmazonQChatView'
     private readonly onDidResolveWebviewEmitter = new EventEmitter<void>()
     public readonly onDidResolveWebview = this.onDidResolveWebviewEmitter.event