refactor(amazonq): reorg amazonq servers by their function

app/aws-lsp-codewhisperer-runtimes/src/iam-webworker.ts

@@ -1,6 +1,6 @@
 import { webworker } from '@aws/language-server-runtimes/runtimes/webworker'
 import { RuntimeProps } from '@aws/language-server-runtimes/runtimes/runtime'
-import { CodeWhispererServerIAM } from '@aws/lsp-codewhisperer/out/language-server/codeWhispererServer'
+import { CodeWhispererServerIAM } from '@aws/lsp-codewhisperer/out/language-server/inline-completion/codeWhispererServer'
 
 const props: RuntimeProps = {
     version: '1.0.0',

server/aws-lsp-codewhisperer/src/index.ts

@@ -1,6 +1,6 @@
-export * from './language-server/codeWhispererSecurityScanServer'
-export * from './language-server/codeWhispererServer'
-export * from './language-server/qChatServer'
+export * from './language-server/securityScan/codeWhispererSecurityScanServer'
+export * from './language-server/inline-completion/codeWhispererServer'
+export * from './language-server/chat/qChatServer'
 export * as QAgenticChatServer from './language-server/agenticChat/qAgenticChatServer'
 export * from './language-server/proxy-server'
-export * from './language-server/netTransformServer'
+export * from './language-server/netTransform/netTransformServer'

server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.test.ts

@@ -18,7 +18,7 @@ import {
 } from '@aws/language-server-runtimes/server-interface'
 import { TestFeatures } from '@aws/language-server-runtimes/testing'
 import * as assert from 'assert'
-import { createIterableResponse, setCredentialsForAmazonQTokenServiceManagerFactory } from '../testUtils'
+import { createIterableResponse, setCredentialsForAmazonQTokenServiceManagerFactory } from '../../shared/testUtils'
 import sinon from 'ts-sinon'
 import { AgenticChatController } from './agenticChatController'
 import { ChatSessionManagementService } from '../chat/chatSessionManagementService'
@@ -27,8 +27,8 @@ import { ChatTelemetryController } from '../chat/telemetry/chatTelemetryControll
 import { DocumentContextExtractor } from '../chat/contexts/documentContext'
 import * as utils from '../chat/utils'
 import { DEFAULT_HELP_FOLLOW_UP_PROMPT, HELP_MESSAGE } from '../chat/constants'
-import { TelemetryService } from '../telemetryService'
-import { AmazonQTokenServiceManager } from '../amazonQServiceManager/AmazonQTokenServiceManager'
+import { TelemetryService } from '../../shared/telemetry/telemetryService'
+import { AmazonQTokenServiceManager } from '../../shared/amazonQServiceManager/AmazonQTokenServiceManager'
 
 describe('AgenticChatController', () => {
     const mockTabId = 'tab-1'

server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.ts

@@ -33,22 +33,25 @@ import {
     ChatInteractionType,
     ChatTelemetryEventName,
     CombinedConversationEvent,
-} from '../telemetry/types'
+} from '../../shared/telemetry/types'
 import { Features, LspHandlers, Result } from '../types'
 import { ChatEventParser, ChatResultWithMetadata } from '../chat/chatEventParser'
 import { createAuthFollowUpResult, getAuthFollowUpType, getDefaultChatResponse } from '../chat/utils'
 import { ChatSessionManagementService } from '../chat/chatSessionManagementService'
 import { ChatTelemetryController } from '../chat/telemetry/chatTelemetryController'
 import { QuickAction } from '../chat/quickActions'
-import { Metric } from '../telemetry/metric'
-import { getErrorMessage, isAwsError, isNullish, isObject } from '../utils'
+import { Metric } from '../../shared/telemetry/metric'
+import { getErrorMessage, isAwsError, isNullish, isObject } from '../../shared/utils'
 import { QChatTriggerContext, TriggerContext } from '../chat/contexts/triggerContext'
 import { HELP_MESSAGE } from '../chat/constants'
 import { Q_CONFIGURATION_SECTION } from '../configuration/qConfigurationServer'
 import { textUtils } from '@aws/lsp-core'
-import { TelemetryService } from '../telemetryService'
-import { AmazonQServicePendingProfileError, AmazonQServicePendingSigninError } from '../amazonQServiceManager/errors'
-import { AmazonQTokenServiceManager } from '../amazonQServiceManager/AmazonQTokenServiceManager'
+import { TelemetryService } from '../../shared/telemetry/telemetryService'
+import {
+    AmazonQServicePendingProfileError,
+    AmazonQServicePendingSigninError,
+} from '../../shared/amazonQServiceManager/errors'
+import { AmazonQTokenServiceManager } from '../../shared/amazonQServiceManager/AmazonQTokenServiceManager'
 
 type ChatHandlers = Omit<LspHandlers<Chat>, 'openTab' | 'sendChatUpdate' | 'onFileClicked'>
 

server/aws-lsp-codewhisperer/src/language-server/agenticChat/qAgenticChatServer.test.ts

@@ -9,7 +9,7 @@ import sinon from 'ts-sinon'
 import { AgenticChatController } from './agenticChatController'
 import { ChatSessionManagementService } from '../chat/chatSessionManagementService'
 import { QAgenticChatServer } from './qAgenticChatServer'
-import { AmazonQTokenServiceManager } from '../amazonQServiceManager/AmazonQTokenServiceManager'
+import { AmazonQTokenServiceManager } from '../../shared/amazonQServiceManager/AmazonQTokenServiceManager'
 
 describe('QAgenticChatServer', () => {
     const mockTabId = 'mockTabId'

server/aws-lsp-codewhisperer/src/language-server/agenticChat/qAgenticChatServer.ts

@@ -7,11 +7,11 @@ import { InitializeParams, Server } from '@aws/language-server-runtimes/server-i
 import { AgenticChatController } from './agenticChatController'
 import { ChatSessionManagementService } from '../chat/chatSessionManagementService'
 import { CLEAR_QUICK_ACTION, HELP_QUICK_ACTION } from '../chat/quickActions'
-import { TelemetryService } from '../telemetryService'
-import { makeUserContextObject } from '../utilities/telemetryUtils'
-import { AmazonQTokenServiceManager } from '../amazonQServiceManager/AmazonQTokenServiceManager'
-import { AmazonQServiceInitializationError } from '../amazonQServiceManager/errors'
-import { safeGet } from '../utils'
+import { TelemetryService } from '../../shared/telemetry/telemetryService'
+import { makeUserContextObject } from '../../shared/telemetryUtils'
+import { AmazonQTokenServiceManager } from '../../shared/amazonQServiceManager/AmazonQTokenServiceManager'
+import { safeGet } from '../../shared/utils'
+import { AmazonQServiceInitializationError } from '../../shared/amazonQServiceManager/errors'
 
 export const QAgenticChatServer =
     // prettier-ignore
@@ -53,17 +53,17 @@ export const QAgenticChatServer =
                 .withAmazonQServiceManager(amazonQServiceManager)
 
             telemetryService = new TelemetryService(
-                    amazonQServiceManager,
-                    credentialsProvider,
-                    telemetry,
-                    logging,
-                )
-
-            const clientParams = safeGet(lsp.getClientInitializeParams(),new AmazonQServiceInitializationError(
-                    'TelemetryService initialized before LSP connection was initialized.'))
-            
+                amazonQServiceManager,
+                credentialsProvider,
+                telemetry,
+                logging,
+            )
+
+            const clientParams = safeGet(lsp.getClientInitializeParams(), new AmazonQServiceInitializationError(
+                'TelemetryService initialized before LSP connection was initialized.'))
+
             telemetryService.updateUserContext(makeUserContextObject(clientParams, runtime.platform, 'CHAT'))
-        
+
             chatController = new AgenticChatController(chatSessionManagementService, features, telemetryService)
 
             await updateConfigurationHandler()

server/aws-lsp-codewhisperer/src/language-server/chat/chatController.test.ts

@@ -13,17 +13,19 @@ import {
 } from '@aws/language-server-runtimes/server-interface'
 import { TestFeatures } from '@aws/language-server-runtimes/testing'
 import * as assert from 'assert'
-import { createIterableResponse, setCredentialsForAmazonQTokenServiceManagerFactory } from '../testUtils'
+
+import { createIterableResponse, setCredentialsForAmazonQTokenServiceManagerFactory } from '../../shared/testUtils'
 import sinon from 'ts-sinon'
+
 import { ChatController } from './chatController'
 import { ChatSessionManagementService } from './chatSessionManagementService'
 import { ChatSessionService } from './chatSessionService'
 import { ChatTelemetryController } from './telemetry/chatTelemetryController'
 import { DocumentContextExtractor } from './contexts/documentContext'
 import * as utils from './utils'
 import { DEFAULT_HELP_FOLLOW_UP_PROMPT, HELP_MESSAGE } from './constants'
-import { TelemetryService } from '../telemetryService'
-import { AmazonQTokenServiceManager } from '../amazonQServiceManager/AmazonQTokenServiceManager'
+import { TelemetryService } from '../../shared/telemetry/telemetryService'
+import { AmazonQTokenServiceManager } from '../../shared/amazonQServiceManager/AmazonQTokenServiceManager'
 
 describe('ChatController', () => {
     const mockTabId = 'tab-1'

server/aws-lsp-codewhisperer/src/language-server/chat/chatController.ts

@@ -28,22 +28,25 @@ import {
     ChatInteractionType,
     ChatTelemetryEventName,
     CombinedConversationEvent,
-} from '../telemetry/types'
+} from '../../shared/telemetry/types'
 import { Features, LspHandlers, Result } from '../types'
 import { ChatEventParser, ChatResultWithMetadata } from './chatEventParser'
 import { createAuthFollowUpResult, getAuthFollowUpType, getDefaultChatResponse } from './utils'
 import { ChatSessionManagementService } from './chatSessionManagementService'
 import { ChatTelemetryController } from './telemetry/chatTelemetryController'
 import { QuickAction } from './quickActions'
-import { getErrorMessage, isAwsError, isNullish, isObject } from '../utils'
-import { Metric } from '../telemetry/metric'
+import { getErrorMessage, isAwsError, isNullish, isObject } from '../../shared/utils'
+import { Metric } from '../../shared/telemetry/metric'
 import { QChatTriggerContext, TriggerContext } from './contexts/triggerContext'
 import { HELP_MESSAGE } from './constants'
 import { Q_CONFIGURATION_SECTION } from '../configuration/qConfigurationServer'
 import { textUtils } from '@aws/lsp-core'
-import { TelemetryService } from '../telemetryService'
-import { AmazonQServicePendingProfileError, AmazonQServicePendingSigninError } from '../amazonQServiceManager/errors'
-import { AmazonQTokenServiceManager } from '../amazonQServiceManager/AmazonQTokenServiceManager'
+import {
+    AmazonQServicePendingProfileError,
+    AmazonQServicePendingSigninError,
+} from '../../shared/amazonQServiceManager/errors'
+import { AmazonQTokenServiceManager } from '../../shared/amazonQServiceManager/AmazonQTokenServiceManager'
+import { TelemetryService } from '../../shared/telemetry/telemetryService'
 
 type ChatHandlers = Omit<LspHandlers<Chat>, 'openTab' | 'sendChatUpdate' | 'onFileClicked'>
 

server/aws-lsp-codewhisperer/src/language-server/chat/chatEventParser.test.ts

@@ -3,8 +3,8 @@ import * as assert from 'assert'
 import sinon from 'ts-sinon'
 
 import { ChatEventParser } from './chatEventParser'
-import { Metric } from '../telemetry/metric'
-import { AddMessageEvent } from '../telemetry/types'
+import { Metric } from '../../shared/telemetry/metric'
+import { AddMessageEvent } from '../../shared/telemetry/types'
 
 describe('ChatEventParser', () => {
     const mockMessageId = 'mock-message-id'

server/aws-lsp-codewhisperer/src/language-server/chat/chatEventParser.ts

@@ -6,8 +6,8 @@ import {
     SourceLink,
 } from '@aws/language-server-runtimes/protocol'
 import { Result } from '../types'
-import { AddMessageEvent } from '../telemetry/types'
-import { Metric } from '../telemetry/metric'
+import { AddMessageEvent } from '../../shared/telemetry/types'
+import { Metric } from '../../shared/telemetry/metric'
 
 export type ChatResultWithMetadata = {
     chatResult: ChatResult

server/aws-lsp-codewhisperer/src/language-server/chat/chatSessionManagementService.ts

@@ -1,6 +1,6 @@
 import { Result } from '../types'
 import { ChatSessionService } from './chatSessionService'
-import { AmazonQTokenServiceManager } from '../amazonQServiceManager/AmazonQTokenServiceManager'
+import { AmazonQTokenServiceManager } from '../../shared/amazonQServiceManager/AmazonQTokenServiceManager'
 
 export class ChatSessionManagementService {
     static #instance?: ChatSessionManagementService

server/aws-lsp-codewhisperer/src/language-server/chat/chatSessionService.test.ts

@@ -6,7 +6,8 @@ import {
 import * as assert from 'assert'
 import sinon, { StubbedInstance, stubInterface } from 'ts-sinon'
 import { ChatSessionService } from './chatSessionService'
-import { AmazonQTokenServiceManager } from '../amazonQServiceManager/AmazonQTokenServiceManager'
+
+import { AmazonQTokenServiceManager } from '../../shared/amazonQServiceManager/AmazonQTokenServiceManager'
 
 describe('Chat Session Service', () => {
     let sendMessageStub: sinon.SinonStub<any, any>

server/aws-lsp-codewhisperer/src/language-server/chat/chatSessionService.ts

@@ -3,7 +3,8 @@ import {
     SendMessageCommandInput,
     SendMessageCommandOutput,
 } from '@amzn/codewhisperer-streaming'
-import { AmazonQTokenServiceManager } from '../amazonQServiceManager/AmazonQTokenServiceManager'
+
+import { AmazonQTokenServiceManager } from '../../shared/amazonQServiceManager/AmazonQTokenServiceManager'
 
 export type ChatSessionServiceConfig = CodeWhispererStreamingClientConfig
 export class ChatSessionService {

server/aws-lsp-codewhisperer/src/language-server/chat/contexts/documentContext.ts

@@ -1,7 +1,7 @@
 import { EditorState, TextDocument as CwsprTextDocument } from '@amzn/codewhisperer-streaming'
 import { CursorState } from '@aws/language-server-runtimes/server-interface'
 import { Range, TextDocument } from 'vscode-languageserver-textdocument'
-import { getLanguageId } from '../../languageDetection'
+import { getLanguageId } from '../../../shared/languageDetection'
 import { Features } from '../../types'
 import { getExtendedCodeBlockRange, getSelectionWithinExtendedRange } from './utils'
 import path = require('path')

server/aws-lsp-codewhisperer/src/language-server/qChatServer.test.ts → server/aws-lsp-codewhisperer/src/language-server/chat/qChatServer.test.ts

@@ -1,10 +1,10 @@
 import { Server } from '@aws/language-server-runtimes/server-interface'
 import { TestFeatures } from '@aws/language-server-runtimes/testing'
 import sinon from 'ts-sinon'
-import { ChatController } from './chat/chatController'
-import { ChatSessionManagementService } from './chat/chatSessionManagementService'
+import { ChatController } from './chatController'
+import { ChatSessionManagementService } from './chatSessionManagementService'
 import { QChatServer } from './qChatServer'
-import { AmazonQTokenServiceManager } from './amazonQServiceManager/AmazonQTokenServiceManager'
+import { AmazonQTokenServiceManager } from '../../shared/amazonQServiceManager/AmazonQTokenServiceManager'
 
 describe('QChatServer', () => {
     const mockTabId = 'mockTabId'

server/aws-lsp-codewhisperer/src/language-server/qChatServer.ts → server/aws-lsp-codewhisperer/src/language-server/chat/qChatServer.ts

@@ -1,12 +1,12 @@
 import { InitializeParams, Server } from '@aws/language-server-runtimes/server-interface'
-import { ChatController } from './chat/chatController'
-import { ChatSessionManagementService } from './chat/chatSessionManagementService'
-import { CLEAR_QUICK_ACTION, HELP_QUICK_ACTION } from './chat/quickActions'
-import { TelemetryService } from './telemetryService'
-import { makeUserContextObject } from './utilities/telemetryUtils'
-import { AmazonQTokenServiceManager } from './amazonQServiceManager/AmazonQTokenServiceManager'
-import { AmazonQServiceInitializationError } from './amazonQServiceManager/errors'
-import { safeGet } from './utils'
+import { ChatController } from './chatController'
+import { ChatSessionManagementService } from './chatSessionManagementService'
+import { CLEAR_QUICK_ACTION, HELP_QUICK_ACTION } from './quickActions'
+import { TelemetryService } from '../../shared/telemetry/telemetryService'
+import { makeUserContextObject } from '../../shared/telemetryUtils'
+import { AmazonQTokenServiceManager } from '../../shared/amazonQServiceManager/AmazonQTokenServiceManager'
+import { AmazonQServiceInitializationError } from '../../shared/amazonQServiceManager/errors'
+import { safeGet } from '../../shared/utils'
 
 export const QChatServer =
     // prettier-ignore
@@ -48,17 +48,17 @@ export const QChatServer =
                 .withAmazonQServiceManager(amazonQServiceManager)
 
             telemetryService = new TelemetryService(
-                    amazonQServiceManager,
-                    credentialsProvider,
-                    telemetry,
-                    logging,
-                )
-
-            const clientParams = safeGet(lsp.getClientInitializeParams(),new AmazonQServiceInitializationError(
-                    'TelemetryService initialized before LSP connection was initialized.'))
-            
+                amazonQServiceManager,
+                credentialsProvider,
+                telemetry,
+                logging,
+            )
+
+            const clientParams = safeGet(lsp.getClientInitializeParams(), new AmazonQServiceInitializationError(
+                'TelemetryService initialized before LSP connection was initialized.'))
+
             telemetryService.updateUserContext(makeUserContextObject(clientParams, runtime.platform, 'CHAT'))
-        
+
             chatController = new ChatController(chatSessionManagementService, features, telemetryService)
 
             await updateConfigurationHandler()

server/aws-lsp-codewhisperer/src/language-server/chat/telemetry/chatTelemetryController.test.ts

@@ -1,10 +1,10 @@
 import { TestFeatures } from '@aws/language-server-runtimes/testing'
 import sinon from 'ts-sinon'
-import { ChatTelemetryEventName } from '../../telemetry/types'
+import { ChatTelemetryEventName } from '../../../shared/telemetry/types'
 import { CONVERSATION_ID_METRIC_KEY, ChatTelemetryController } from './chatTelemetryController'
 import assert = require('assert')
 import { ChatUIEventName } from './clientTelemetry'
-import { TelemetryService } from '../../telemetryService'
+import { TelemetryService } from '../../../shared/telemetry/telemetryService'
 
 describe('TelemetryController', () => {
     const mockTabId = 'mockTabId'

server/aws-lsp-codewhisperer/src/language-server/chat/telemetry/chatTelemetryController.ts

@@ -6,7 +6,7 @@ import {
     ChatTelemetryEventName,
     CombinedConversationEvent,
     InteractWithMessageEvent,
-} from '../../telemetry/types'
+} from '../../../shared/telemetry/types'
 import { Features, KeysMatching } from '../../types'
 import {
     ChatUIEventName,
@@ -16,11 +16,12 @@ import {
 } from './clientTelemetry'
 import { UserIntent } from '@amzn/codewhisperer-streaming'
 import { TriggerContext } from '../contexts/triggerContext'
-import { AcceptedSuggestionEntry, CodeDiffTracker } from '../../telemetry/codeDiffTracker'
-import { TelemetryService } from '../../telemetryService'
-import { getEndPositionForAcceptedSuggestion } from '../../utils'
-import { CodewhispererLanguage } from '../../languageDetection'
+
 import { CredentialsProvider, Logging } from '@aws/language-server-runtimes/server-interface'
+import { AcceptedSuggestionEntry, CodeDiffTracker } from '../../inline-completion/codeDiffTracker'
+import { TelemetryService } from '../../../shared/telemetry/telemetryService'
+import { getEndPositionForAcceptedSuggestion } from '../../../shared/utils'
+import { CodewhispererLanguage } from '../../../shared/languageDetection'
 
 export const CONVERSATION_ID_METRIC_KEY = 'cwsprChatConversationId'
 

server/aws-lsp-codewhisperer/src/language-server/chat/telemetry/clientTelemetry.ts

@@ -1,6 +1,6 @@
 import type * as ServerInterface from '@aws/language-server-runtimes/server-interface'
 import type * as ChatClientType from '@aws/chat-client-ui-types'
-import { isObject } from '../../utils'
+import { isObject } from '../../../shared/utils'
 
 export enum ChatUIEventName {
     EnterFocusChat = 'enterFocus',

server/aws-lsp-codewhisperer/src/language-server/chat/utils.ts

@@ -1,5 +1,5 @@
 import { ChatResult } from '@aws/language-server-runtimes/server-interface'
-import { GENERIC_UNAUTHORIZED_ERROR, INVALID_TOKEN, MISSING_BEARER_TOKEN_ERROR } from '../constants'
+import { GENERIC_UNAUTHORIZED_ERROR, INVALID_TOKEN, MISSING_BEARER_TOKEN_ERROR } from '../../shared/constants'
 import { DEFAULT_HELP_FOLLOW_UP_PROMPT, HELP_MESSAGE } from './constants'
 import { v4 as uuid } from 'uuid'
 

server/aws-lsp-codewhisperer/src/language-server/configuration/qConfigurationServer.test.ts

@@ -8,10 +8,10 @@ import {
     ServerConfigurationProvider,
 } from './qConfigurationServer'
 import { TestFeatures } from '@aws/language-server-runtimes/testing'
-import { CodeWhispererServiceToken } from '../codeWhispererService'
+import { CodeWhispererServiceToken } from '../../shared/codeWhispererService'
 import { InitializeParams, Server } from '@aws/language-server-runtimes/server-interface'
-import { AmazonQTokenServiceManager } from '../amazonQServiceManager/AmazonQTokenServiceManager'
-import { setCredentialsForAmazonQTokenServiceManagerFactory } from '../testUtils'
+import { AmazonQTokenServiceManager } from '../../shared/amazonQServiceManager/AmazonQTokenServiceManager'
+import { setCredentialsForAmazonQTokenServiceManagerFactory } from '../../shared/testUtils'
 
 const getInitializeParams = (developerProfiles = true): InitializeParams => {
     return {