Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions server/aws-lsp-codewhisperer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,14 @@
"got": "^11.8.5",
"hpagent": "^1.2.0",
"js-md5": "^0.8.3",
"lokijs": "^1.5.12",
"uuid": "^11.0.5",
"vscode-uri": "^3.1.0"
},
"devDependencies": {
"@types/adm-zip": "^0.5.5",
"@types/archiver": "^6.0.2",
"@types/lokijs": "^1.5.14",
"@types/uuid": "^9.0.8",
"assert": "^2.1.0",
"copyfiles": "^2.4.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import {
TextEdit,
chatRequestType,
InlineChatParams,
ConversationClickParams,
ListConversationsParams,
} from '@aws/language-server-runtimes/protocol'
import {
CancellationToken,
Expand Down Expand Up @@ -52,6 +54,8 @@ import {
} from '../../shared/amazonQServiceManager/errors'
import { AmazonQTokenServiceManager } from '../../shared/amazonQServiceManager/AmazonQTokenServiceManager'
import { AmazonQWorkspaceConfig } from '../../shared/amazonQServiceManager/configurationUtils'
import { TabBarController } from './tabBarController'
import { ChatDatabase } from './tools/chatDb/chatDb'

type ChatHandlers = Omit<
LspHandlers<Chat>,
Expand All @@ -73,6 +77,8 @@ export class AgenticChatController implements ChatHandlers {
#customizationArn?: string
#telemetryService: TelemetryService
#amazonQServiceManager?: AmazonQTokenServiceManager
#tabBarController: TabBarController
#chatHistoryDb: ChatDatabase

constructor(
chatSessionManagementService: ChatSessionManagementService,
Expand All @@ -86,13 +92,23 @@ export class AgenticChatController implements ChatHandlers {
this.#telemetryController = new ChatTelemetryController(features, telemetryService)
this.#telemetryService = telemetryService
this.#amazonQServiceManager = amazonQServiceManager
this.#chatHistoryDb = new ChatDatabase(features)
this.#tabBarController = new TabBarController(features, this.#chatHistoryDb)
}

dispose() {
this.#chatSessionManagementService.dispose()
this.#telemetryController.dispose()
}

async onListConversations(params: ListConversationsParams) {
return this.#tabBarController.onListConversations(params)
}

async onConversationClick(params: ConversationClickParams) {
return this.#tabBarController.onConversationClick(params)
}

async onChatPrompt(params: ChatParams, token: CancellationToken): Promise<ChatResult | ResponseError<ChatResult>> {
const maybeDefaultResponse = getDefaultChatResponse(params.prompt.prompt)

Expand Down Expand Up @@ -135,6 +151,11 @@ export class AgenticChatController implements ChatHandlers {
profileArn
)

if (!session.localHistoryHydrated && requestInput.conversationState) {
requestInput.conversationState.history = this.#chatHistoryDb.getMessages(params.tabId, 10)
session.localHistoryHydrated = true
}

metric.recordStart()
response = await session.sendMessage(requestInput)
this.#log('Response for conversation id:', conversationIdentifier, JSON.stringify(response.$metadata))
Expand Down Expand Up @@ -219,6 +240,24 @@ export class AgenticChatController implements ChatHandlers {
),
},
})
// Save question/answer interaction to chat history
if (params.prompt.prompt && session.conversationId && result.data?.chatResult.body) {
this.#chatHistoryDb.addMessage(params.tabId, 'cwc', session.conversationId, {
body: params.prompt.prompt,
type: 'prompt' as any,
})

this.#chatHistoryDb.addMessage(params.tabId, 'cwc', session.conversationId, {
body: result.data.chatResult.body,
type: 'answer' as any,
codeReference: result.data.chatResult.codeReference,
relatedContent:
result.data.chatResult.relatedContent?.content &&
result.data.chatResult.relatedContent.content.length > 0
? result.data?.chatResult.relatedContent
: undefined,
})
}

return result.success
? result.data.chatResult
Expand Down Expand Up @@ -392,7 +431,9 @@ export class AgenticChatController implements ChatHandlers {

onLinkClick() {}

onReady() {}
async onReady() {
await this.#tabBarController.loadChats()
}

onSendFeedback({ tabId, feedbackPayload }: FeedbackParams) {
this.#features.telemetry.emitMetric({
Expand Down Expand Up @@ -441,7 +482,7 @@ export class AgenticChatController implements ChatHandlers {
})
this.#telemetryController.activeTabId = undefined
}

this.#chatHistoryDb.updateTabOpenState(params.tabId, false)
this.#chatSessionManagementService.deleteSession(params.tabId)
this.#telemetryController.removeConversation(params.tabId)
}
Expand All @@ -459,6 +500,7 @@ export class AgenticChatController implements ChatHandlers {
})

this.#telemetryController.removeConversation(params.tabId)
this.#chatHistoryDb.clearTab(params.tabId)

sessionResult.data?.clear()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ export const QAgenticChatServer =

return chatController.onTabAdd(params)
})
chat.onReady(() => {
logging.log(`Received ready notification`)
return chatController.onReady()
})

chat.onTabChange(params => {
logging.log(`Changing to tab: ${params.tabId}`)
Expand Down Expand Up @@ -121,6 +125,14 @@ export const QAgenticChatServer =
return chatController.onCodeInsertToCursorPosition(params)
})

chat.onListConversations(params => {
return chatController.onListConversations(params)
})

chat.onConversationClick(params => {
return chatController.onConversationClick(params)
})

logging.log('Q Chat server has been initialized')

return () => {
Expand Down
Loading
Loading