save

Author: jpinkney-aws

package-lock.json

@@ -4,25 +4,14 @@
  */
 
 import * as vscode from 'vscode'
-import { ExtensionContext, window } from 'vscode'
+import { ExtensionContext } from 'vscode'
 import { telemetry } from 'aws-core-vscode/telemetry'
 import { AuthUtil, CodeWhispererSettings } from 'aws-core-vscode/codewhisperer'
 import { Commands, placeholder, funcUtil } from 'aws-core-vscode/shared'
 import * as amazonq from 'aws-core-vscode/amazonq'
-import { scanChatAppInit } from '../amazonqScan'
 
 export async function activate(context: ExtensionContext) {
     const appInitContext = amazonq.DefaultAmazonQAppInitContext.instance
-
-    registerApps(appInitContext, context)
-
-    const provider = new amazonq.AmazonQChatViewProvider(
-        context,
-        appInitContext.getWebViewToAppsMessagePublishers(),
-        appInitContext.getAppsToWebViewMessageListener(),
-        appInitContext.onDidChangeAmazonQVisibility
-    )
-
     await amazonq.TryChatCodeLensProvider.register(appInitContext.onDidChangeAmazonQVisibility.event)
 
     const setupLsp = funcUtil.debounce(async () => {
@@ -34,11 +23,6 @@ export async function activate(context: ExtensionContext) {
     }, 5000)
 
     context.subscriptions.push(
-        window.registerWebviewViewProvider(amazonq.AmazonQChatViewProvider.viewType, provider, {
-            webviewOptions: {
-                retainContextWhenHidden: true,
-            },
-        }),
         amazonq.focusAmazonQChatWalkthrough.register(),
         amazonq.walkthroughInlineSuggestionsExample.register(),
         amazonq.walkthroughSecurityScanExample.register(),
@@ -64,15 +48,6 @@ export async function activate(context: ExtensionContext) {
     void setupAuthNotification()
 }
 
-function registerApps(appInitContext: amazonq.AmazonQAppInitContext, context: ExtensionContext) {
-    amazonq.cwChatAppInit(appInitContext)
-    amazonq.featureDevChatAppInit(appInitContext)
-    amazonq.gumbyChatAppInit(appInitContext)
-    amazonq.testChatAppInit(appInitContext)
-    scanChatAppInit(appInitContext)
-    amazonq.docChatAppInit(appInitContext)
-}
-
 /**
  * Display a notification to user for Log In.
  *

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

@@ -0,0 +1,19 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as amazonqNode from 'aws-core-vscode/amazonq/node'
+import { scanChatAppInit } from '../../amazonqScan'
+import { DefaultAmazonQAppInitContext } from 'aws-core-vscode/amazonq'
+
+export function registerAgents() {
+    const appInitContext = DefaultAmazonQAppInitContext.instance
+
+    amazonqNode.cwChatAppInit(appInitContext)
+    amazonqNode.featureDevChatAppInit(appInitContext)
+    amazonqNode.gumbyChatAppInit(appInitContext)
+    amazonqNode.testChatAppInit(appInitContext)
+    amazonqNode.docChatAppInit(appInitContext)
+    scanChatAppInit(appInitContext)
+}

packages/amazonq/src/app/chat/node/registerAgents.ts

@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode'
 import { activateAmazonQCommon, amazonQContextPrefix, deactivateCommon } from './extension'
-import { DefaultAmazonQAppInitContext } from 'aws-core-vscode/amazonq'
+import { DefaultAmazonQAppInitContext, AmazonQChatViewProvider } from 'aws-core-vscode/amazonq'
 import { activate as activateQGumby } from 'aws-core-vscode/amazonqGumby'
 import {
     ExtContext,
@@ -30,6 +30,7 @@ import { beta } from 'aws-core-vscode/dev'
 import { activate as activateNotifications, NotificationsController } from 'aws-core-vscode/notifications'
 import { AuthState, AuthUtil } from 'aws-core-vscode/codewhisperer'
 import { telemetry, AuthUserState } from 'aws-core-vscode/telemetry'
+import { registerAgents } from './app/chat/node/registerAgents'
 
 export async function activate(context: vscode.ExtensionContext) {
     // IMPORTANT: No other code should be added to this function. Place it in one of the following 2 functions where appropriate.
@@ -53,9 +54,24 @@ async function activateAmazonQNode(context: vscode.ExtensionContext) {
     }
 
     if (!Experiments.instance.get('amazonqChatLSP', false)) {
+        const appInitContext = DefaultAmazonQAppInitContext.instance
+        const provider = new AmazonQChatViewProvider(
+            context,
+            appInitContext.getWebViewToAppsMessagePublishers(),
+            appInitContext.getAppsToWebViewMessageListener(),
+            appInitContext.onDidChangeAmazonQVisibility
+        )
+        context.subscriptions.push(
+            vscode.window.registerWebviewViewProvider(AmazonQChatViewProvider.viewType, provider, {
+                webviewOptions: {
+                    retainContextWhenHidden: true,
+                },
+            })
+        )
         await activateCWChat(context)
         await activateQGumby(extContext as ExtContext)
     }
+    void registerAgents()
     activateInlineChat(context)
 
     const authProvider = new CommonAuthViewProvider(

packages/amazonq/src/extensionNode.ts

@@ -8,9 +8,11 @@ import { LanguageClient } from 'vscode-languageclient'
 import { AmazonQChatViewProvider } from './webviewProvider'
 import { registerCommands } from './commands'
 import { registerLanguageServerEventListener, registerMessageListeners } from './messages'
-import { globals } from 'aws-core-vscode/shared'
+import { getLogger, globals } from 'aws-core-vscode/shared'
+import { activate as registerLegacyChatListeners } from '../../app/chat/activation'
+import { DefaultAmazonQAppInitContext } from 'aws-core-vscode/amazonq'
 
-export function activate(languageClient: LanguageClient, encryptionKey: Buffer, mynahUIPath: string) {
+export async function activate(languageClient: LanguageClient, encryptionKey: Buffer, mynahUIPath: string) {
     const provider = new AmazonQChatViewProvider(mynahUIPath)
 
     globals.context.subscriptions.push(
@@ -29,6 +31,17 @@ export function activate(languageClient: LanguageClient, encryptionKey: Buffer,
     registerLanguageServerEventListener(languageClient, provider)
 
     provider.onDidResolveWebview(() => {
+        if (provider.webview) {
+            DefaultAmazonQAppInitContext.instance.getAppsToWebViewMessageListener().onMessage((msg) => {
+                provider.webview?.postMessage(msg).then(undefined, (e) => {
+                    getLogger().error('webView.postMessage failed: %s', (e as Error).message)
+                })
+            })
+        }
+
         registerMessageListeners(languageClient, provider, encryptionKey)
     })
+
+    // register event listeners from the legacy agent flow
+    await registerLegacyChatListeners(globals.context)
 }

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

@@ -4,26 +4,30 @@
  */
 
 import { Commands, globals } from 'aws-core-vscode/shared'
-import { window } from 'vscode'
+// import { window } from 'vscode'
 import { AmazonQChatViewProvider } from './webviewProvider'
 
+/**
+ * TODO: Re-enable these once we can figure out which path they're going to live in
+ * In hybrid chat mode they were being registered twice causing a registration error
+ */
 export function registerCommands(provider: AmazonQChatViewProvider) {
     globals.context.subscriptions.push(
-        registerGenericCommand('aws.amazonq.explainCode', 'Explain', provider),
-        registerGenericCommand('aws.amazonq.refactorCode', 'Refactor', provider),
-        registerGenericCommand('aws.amazonq.fixCode', 'Fix', provider),
-        registerGenericCommand('aws.amazonq.optimizeCode', 'Optimize', provider),
-        Commands.register('aws.amazonq.sendToPrompt', (data) => {
-            const triggerType = getCommandTriggerType(data)
-            const selection = getSelectedText()
+        // registerGenericCommand('aws.amazonq.explainCode', 'Explain', provider),
+        // registerGenericCommand('aws.amazonq.refactorCode', 'Refactor', provider),
+        // registerGenericCommand('aws.amazonq.fixCode', 'Fix', provider),
+        // registerGenericCommand('aws.amazonq.optimizeCode', 'Optimize', provider),
+        // Commands.register('aws.amazonq.sendToPrompt', (data) => {
+        //     const triggerType = getCommandTriggerType(data)
+        //     const selection = getSelectedText()
 
-            void focusAmazonQPanel().then(() => {
-                void provider.webview?.postMessage({
-                    command: 'sendToPrompt',
-                    params: { selection: selection, triggerType },
-                })
-            })
-        }),
+        //     void focusAmazonQPanel().then(() => {
+        //         void provider.webview?.postMessage({
+        //             command: 'sendToPrompt',
+        //             params: { selection: selection, triggerType },
+        //         })
+        //     })
+        // }),
         Commands.register('aws.amazonq.openTab', () => {
             void focusAmazonQPanel().then(() => {
                 void provider.webview?.postMessage({
@@ -35,36 +39,36 @@ export function registerCommands(provider: AmazonQChatViewProvider) {
     )
 }
 
-function getSelectedText(): string {
-    const editor = window.activeTextEditor
-    if (editor) {
-        const selection = editor.selection
-        const selectedText = editor.document.getText(selection)
-        return selectedText
-    }
+// function getSelectedText(): string {
+//     const editor = window.activeTextEditor
+//     if (editor) {
+//         const selection = editor.selection
+//         const selectedText = editor.document.getText(selection)
+//         return selectedText
+//     }
 
-    return ' '
-}
+//     return ' '
+// }
 
-function getCommandTriggerType(data: any): string {
-    // data is undefined when commands triggered from keybinding or command palette. Currently no
-    // way to differentiate keybinding and command palette, so both interactions are recorded as keybinding
-    return data === undefined ? 'hotkeys' : 'contextMenu'
-}
+// function getCommandTriggerType(data: any): string {
+//     // data is undefined when commands triggered from keybinding or command palette. Currently no
+//     // way to differentiate keybinding and command palette, so both interactions are recorded as keybinding
+//     return data === undefined ? 'hotkeys' : 'contextMenu'
+// }
 
-function registerGenericCommand(commandName: string, genericCommand: string, provider: AmazonQChatViewProvider) {
-    return Commands.register(commandName, (data) => {
-        const triggerType = getCommandTriggerType(data)
-        const selection = getSelectedText()
+// function registerGenericCommand(commandName: string, genericCommand: string, provider: AmazonQChatViewProvider) {
+//     return Commands.register(commandName, (data) => {
+//         const triggerType = getCommandTriggerType(data)
+//         const selection = getSelectedText()
 
-        void focusAmazonQPanel().then(() => {
-            void provider.webview?.postMessage({
-                command: 'genericCommand',
-                params: { genericCommand, selection, triggerType },
-            })
-        })
-    })
-}
+//         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

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

@@ -29,6 +29,7 @@ import * as jose from 'jose'
 import { AmazonQChatViewProvider } from './webviewProvider'
 import { AuthUtil } from 'aws-core-vscode/codewhisperer'
 import { AmazonQPromptSettings, messages } from 'aws-core-vscode/shared'
+import { DefaultAmazonQAppInitContext, messageDispatcher } from 'aws-core-vscode/amazonq'
 
 export function registerLanguageServerEventListener(languageClient: LanguageClient, provider: AmazonQChatViewProvider) {
     languageClient.onDidChangeState(({ oldState, newState }) => {
@@ -60,6 +61,15 @@ export function registerMessageListeners(
     provider.webview?.onDidReceiveMessage(async (message) => {
         languageClient.info(`[VSCode Client]  Received ${JSON.stringify(message)} from chat`)
 
+        if ((message.tabType && message.tabType !== 'cwc') || messageDispatcher.isLegacyEvent(message.command)) {
+            // handle the mynah ui -> agent legacy flow
+            messageDispatcher.handleWebviewEvent(
+                message,
+                DefaultAmazonQAppInitContext.instance.getWebViewToAppsMessagePublishers()
+            )
+            return
+        }
+
         switch (message.command) {
             case COPY_TO_CLIPBOARD:
                 languageClient.info('[VSCode Client] Copy to clipboard event received')

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

@@ -118,7 +118,7 @@ export async function startLanguageServer(
         }
 
         if (Experiments.instance.get('amazonqChatLSP', false)) {
-            activate(client, encryptionKey, resourcePaths.ui)
+            await activate(client, encryptionKey, resourcePaths.ui)
         }
 
         const refreshInterval = auth.startTokenRefreshInterval()

packages/amazonq/src/lsp/client.ts

@@ -13,6 +13,7 @@
         "./web": "./dist/src/extensionWeb.js",
         "./webShared": "./dist/src/extensionWebShared.js",
         "./amazonq": "./dist/src/amazonq/index.js",
+        "./amazonq/node": "./dist/src/amazonq/indexNode.js",
         "./codewhisperer": "./dist/src/codewhisperer/index.js",
         "./codewhisperer/node": "./dist/src/codewhisperer/indexNode.js",
         "./shared": "./dist/src/shared/index.js",
@@ -440,6 +441,7 @@
     },
     "devDependencies": {
         "@aws-sdk/types": "^3.13.1",
+        "@aws/chat-client": "^0.1.4",
         "@aws/chat-client-ui-types": "^0.1.12",
         "@aws/language-server-runtimes": "^0.2.49",
         "@aws/language-server-runtimes-types": "^0.1.10",

packages/core/package.json

@@ -19,11 +19,6 @@ export { LspController } from './lsp/lspController'
 export { LspClient } from './lsp/lspClient'
 export { api } from './extApi'
 export { AmazonQChatViewProvider } from './webview/webView'
-export { init as cwChatAppInit } from '../codewhispererChat/app'
-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 { amazonQHelpUrl } from '../shared/constants'
 export * as webviewConstants from './webview/ui/texts/constants'
 export * as webviewTabConstants from './webview/ui/tabs/constants'
@@ -48,6 +43,8 @@ export * from './lsp/config'
 export * as WorkspaceLspInstaller from './lsp/workspaceInstaller'
 export * as secondaryAuth from '../auth/secondaryAuth'
 export * as authConnection from '../auth/connection'
+export * as featureConfig from './webview/generators/featureConfig'
+export * as messageDispatcher from './webview/messages/messageDispatcher'
 import { FeatureContext } from '../shared/featureConfig'
 
 /**