refactor: removing redundant code from amazon q repo

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

@@ -10,7 +10,6 @@ import { DefaultAmazonQAppInitContext } from 'aws-core-vscode/amazonq'
 export function activateAgents() {
     const appInitContext = DefaultAmazonQAppInitContext.instance
 
-    amazonqNode.cwChatAppInit(appInitContext)
     amazonqNode.gumbyChatAppInit(appInitContext)
     scanChatAppInit(appInitContext)
 }

packages/amazonq/src/extensionNode.ts

@@ -5,17 +5,9 @@
 
 import * as vscode from 'vscode'
 import { activateAmazonQCommon, amazonQContextPrefix, deactivateCommon } from './extension'
-import { DefaultAmazonQAppInitContext, AmazonQChatViewProvider } from 'aws-core-vscode/amazonq'
+import { DefaultAmazonQAppInitContext } from 'aws-core-vscode/amazonq'
 import { activate as activateTransformationHub } from 'aws-core-vscode/amazonqGumby'
-import {
-    ExtContext,
-    globals,
-    CrashMonitoring,
-    getLogger,
-    isNetworkError,
-    isSageMaker,
-    Experiments,
-} from 'aws-core-vscode/shared'
+import { ExtContext, globals, CrashMonitoring, getLogger, isNetworkError, isSageMaker } from 'aws-core-vscode/shared'
 import { filetypes, SchemaService } from 'aws-core-vscode/sharedNode'
 import { updateDevMode } from 'aws-core-vscode/dev'
 import { CommonAuthViewProvider } from 'aws-core-vscode/login'
@@ -24,7 +16,6 @@ import { registerSubmitFeedback } from 'aws-core-vscode/feedback'
 import { DevOptions } from 'aws-core-vscode/dev'
 import { Auth, AuthUtils, getTelemetryMetadataForConn, isAnySsoConnection } from 'aws-core-vscode/auth'
 import api from './api'
-import { activate as activateCWChat } from './app/chat/activation'
 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'
@@ -52,24 +43,6 @@ async function activateAmazonQNode(context: vscode.ExtensionContext) {
         extensionContext: context,
     }
 
-    if (!Experiments.instance.get('amazonqChatLSP', true)) {
-        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,
-                },
-            })
-        )
-        // this is registered inside of lsp/chat/activation.ts when the chat experiment is enabled
-        await activateCWChat(context)
-    }
     activateAgents()
     await activateTransformationHub(extContext as ExtContext)
 

packages/amazonq/test/unit/codewhispererChat/controllers/chat/chatRequest/converter.test.ts

@@ -4,12 +4,7 @@
  */
 
 import assert from 'assert'
-import {
-    ChatTriggerType,
-    filePathSizeLimit,
-    TriggerPayload,
-    triggerPayloadToChatRequest,
-} from 'aws-core-vscode/codewhispererChat'
+import { ChatTriggerType, TriggerPayload, triggerPayloadToChatRequest } from 'aws-core-vscode/codewhispererChat'
 
 describe('triggerPayloadToChatRequest', () => {
     const mockBasicPayload: TriggerPayload = {
@@ -185,7 +180,7 @@ describe('triggerPayloadToChatRequest', () => {
         assert.strictEqual(
             result.conversationState.currentMessage?.userInputMessage?.userInputMessageContext?.editorState?.document
                 ?.relativeFilePath?.length,
-            filePathSizeLimit
+            4_000
         )
     })
 

packages/core/package.json

@@ -588,7 +588,6 @@
         "@aws-sdk/client-cloudcontrol": "<3.731.0",
         "@aws-sdk/client-cloudformation": "<3.731.0",
         "@aws-sdk/client-cloudwatch-logs": "<3.731.0",
-        "@aws-sdk/client-codecatalyst": "<3.731.0",
         "@aws-sdk/client-cognito-identity": "<3.731.0",
         "@aws-sdk/client-datazone": "^3.848.0",
         "@aws-sdk/client-docdb": "<3.731.0",

packages/core/scripts/build/copyFiles.ts

@@ -26,7 +26,6 @@ interface CopyTask {
 }
 
 const tasks: CopyTask[] = [
-    { target: path.join('src', 'templates') },
     { target: path.join('src', 'test', 'shared', 'cloudformation', 'yaml') },
     { target: path.join('src', 'testFixtures') },
     { target: 'src/auth/sso/vue' },
@@ -36,19 +35,6 @@ const tasks: CopyTask[] = [
         target: path.join('../../node_modules', 'vue', 'dist', 'vue.global.prod.js'),
         destination: path.join('libs', 'vue.min.js'),
     },
-    // SSM
-    {
-        target: path.join('../../node_modules', 'aws-ssm-document-language-service', 'dist', 'server.js'),
-        destination: path.join('src', 'ssmDocument', 'ssm', 'ssmServer.js'),
-    },
-    {
-        target: path.join('../../node_modules', 'aws-ssm-document-language-service', 'dist', 'server.js.LICENSE.txt'),
-        destination: path.join('src', 'ssmDocument', 'ssm', 'ssmServer.js.LICENSE.txt'),
-    },
-    {
-        target: path.join('../../node_modules', 'aws-ssm-document-language-service', 'dist', 'server.js.map'),
-        destination: path.join('src', 'ssmDocument', 'ssm', 'server.js.map'),
-    },
 ]
 
 function copy(task: CopyTask): void {

packages/core/scripts/build/generateServiceClient.ts

@@ -241,14 +241,6 @@ void (async () => {
             serviceJsonPath: 'src/codewhisperer/client/user-service-2.json',
             serviceName: 'CodeWhispererUserClient',
         },
-        {
-            serviceJsonPath: 'src/sagemakerunifiedstudio/shared/client/sqlworkbench.json',
-            serviceName: 'SQLWorkbench',
-        },
-        {
-            serviceJsonPath: 'src/sagemakerunifiedstudio/shared/client/datazonecustomclient.json',
-            serviceName: 'DataZoneCustomClient',
-        },
     ]
     await generateServiceClients(serviceClientDefinitions)
 })()

packages/core/src/amazonq/commons/model.ts

@@ -4,7 +4,16 @@
  */
 
 import { LicenseUtil } from '../../codewhisperer/util/licenseUtil'
-import { CodeReference } from '../../codewhispererChat/view/connector/connector'
+
+export interface CodeReference {
+    licenseName?: string
+    repository?: string
+    url?: string
+    recommendationContentSpan?: {
+        start?: number
+        end?: number
+    }
+}
 
 // Currently importing ChatItemType in Mynah UI from the vscode side causes an error
 // TODO remove this once the import stops failing

packages/core/src/amazonq/index.ts

@@ -15,7 +15,6 @@ export {
     walkthroughInlineSuggestionsExample,
 } from './onboardingPage/walkthrough'
 export { api } from './extApi'
-export { AmazonQChatViewProvider } from './webview/webView'
 export { amazonQHelpUrl } from '../shared/constants'
 export * as webviewConstants from './webview/ui/texts/constants'
 export * as webviewTabConstants from './webview/ui/tabs/constants'
@@ -31,9 +30,8 @@ export {
     computeDiff,
 } from './commons/diff'
 export { AuthFollowUpType, AuthMessageDataMap } from './auth/model'
-export { ChatItemType, referenceLogText } from './commons/model'
+export { ChatItemType, CodeReference, referenceLogText } from './commons/model'
 export { ExtensionMessage } from '../amazonq/webview/ui/commands'
-export { CodeReference } from '../codewhispererChat/view/connector/connector'
 export { extractAuthFollowUp } from './util/authUtils'
 export * as secondaryAuth from '../auth/secondaryAuth'
 export * as authConnection from '../auth/connection'

packages/core/src/amazonq/indexNode.ts

@@ -6,5 +6,4 @@
 /**
  * These agents have underlying requirements on node dependencies (e.g. jsdom, admzip)
  */
-export { init as cwChatAppInit } from '../codewhispererChat/app'
 export { init as gumbyChatAppInit } from '../amazonqGumby/app'

packages/core/src/amazonq/webview/messages/messageDispatcher.ts

@@ -3,11 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Webview, Uri } from 'vscode'
+import { Uri } from 'vscode'
 import { MessagePublisher } from '../../messages/messagePublisher'
-import { MessageListener } from '../../messages/messageListener'
 import { TabType } from '../ui/storages/tabsStorage'
-import { getLogger } from '../../../shared/logger/logger'
 import { amazonqMark } from '../../../shared/performance/marks'
 import { telemetry } from '../../../shared/telemetry/telemetry'
 import { AmazonQChatMessageDuration } from '../../messages/chatMessageDuration'
@@ -19,15 +17,6 @@ import { AmazonQPromptSettings } from '../../../shared/settings'
 
 const qChatModuleName = 'amazonqChat'
 
-export function dispatchWebViewMessagesToApps(
-    webview: Webview,
-    webViewToAppsMessagePublishers: Map<TabType, MessagePublisher<any>>
-) {
-    webview.onDidReceiveMessage((msg) => {
-        handleWebviewEvent(msg, webViewToAppsMessagePublishers)
-    })
-}
-
 export function isLegacyEvent(value: string): boolean {
     return (
         value === 'ui-is-ready' ||
@@ -129,11 +118,3 @@ export function handleWebviewEvent(msg: any, webViewToAppsMessagePublishers: Map
     }
     appMessagePublisher.publish(msg)
 }
-
-export function dispatchAppsMessagesToWebView(webView: Webview, appsMessageListener: MessageListener<any>) {
-    appsMessageListener.onMessage((msg) => {
-        webView.postMessage(JSON.stringify(msg)).then(undefined, (e) => {
-            getLogger().error('webView.postMessage failed: %s', (e as Error).message)
-        })
-    })
-}