feat(amazonq): Add conversation persistence to agentic chat (aws#6965)

tsmithsz · web-flow · commit 7e37569a3233 · 2025-04-08T13:46:26.000-07:00
## Problem Users lose all chats when they close VSCode, and there's no way to browse through chat history. Users also cant export their conversations to an easily shareable format. ## Solution Automatically persist conversations to JSON files in ~/.aws/amazonq/history, one for each workspace where Amazon Q chats occur. Add chat history and chat export buttons to top of Amazon Q toolbar. Clicking on the chat history button allows users to browse and search through chat history. Users click on an old conversation to open it back up (currently open conversations are in bold). Clicking on chat export button allows users to save chat transcript as a markdown or html. Note: persistence + history is only for Q Chat Tabs (not /dev, /doc, /transform, etc.) ![Screenshot 2025-04-08 at 12 03 11 PM](https://github.com/user-attachments/assets/9b383294-5e0a-499b-a4e8-993dd73b555c) ## Note Agentic chat does not currently use this persisted history in it's context. Follow-up PR will address this issue. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
diff --git a/packages/core/src/codewhispererChat/clients/chat/v0/chat.ts b/packages/core/src/codewhispererChat/clients/chat/v0/chat.ts
@@ -21,6 +21,8 @@ export type ToolUseWithError = {
     toolUse: ToolUse
     error: Error | undefined
 }
+import { getLogger } from '../../../../shared/logger/logger'
+import { randomUUID } from '../../../../shared/crypto'
 
 export class ChatSession {
     private sessionId?: string
@@ -141,6 +143,10 @@ export class ChatSession {
         }
 
         this.sessionId = response.conversationId
+        if (this.sessionId?.length === 0) {
+            getLogger().debug(`Session ID: ${this.sessionId} is empty. Generating random UUID`)
+            this.sessionId = randomUUID()
+        }
 
         UserWrittenCodeTracker.instance.onQFeatureInvoked()
 
diff --git a/packages/core/src/codewhispererChat/controllers/chat/controller.ts b/packages/core/src/codewhispererChat/controllers/chat/controller.ts
@@ -1497,13 +1497,15 @@ export class ChatController {
             }
             this.telemetryHelper.recordEnterFocusConversation(triggerEvent.tabID)
             this.telemetryHelper.recordStartConversation(triggerEvent, triggerPayload)
-            if (currentMessage) {
+
+            if (currentMessage && session.sessionIdentifier) {
                 chatHistory.appendUserMessage(currentMessage)
-            }
-            if (session.sessionIdentifier) {
                 this.chatHistoryDb.addMessage(tabID, 'cwc', session.sessionIdentifier, {
                     body: triggerPayload.message,
                     type: 'prompt' as any,
+                    userIntent: currentMessage.userInputMessage?.userIntent,
+                    origin: currentMessage.userInputMessage?.origin,
+                    userInputMessageContext: currentMessage.userInputMessage?.userInputMessageContext,
                 })
             }
 
diff --git a/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts b/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts
@@ -379,6 +379,11 @@ export class Messenger {
                         type: 'answer' as any,
                         codeReference: codeReference as any,
                         relatedContent: { title: 'Sources', content: relatedSuggestions as any },
+                        messageId: messageID,
+                        toolUses:
+                            toolUse && toolUse.input !== undefined && toolUse.input !== ''
+                                ? [{ ...toolUse }]
+                                : undefined,
                     })
                 }
                 if (
diff --git a/packages/core/src/shared/db/chatDb/chatDb.ts b/packages/core/src/shared/db/chatDb/chatDb.ts
@@ -19,6 +19,7 @@ import {
 import crypto from 'crypto'
 import path from 'path'
 import { fs } from '../../fs/fs'
+import { getLogger } from '../../logger/logger'
 
 /**
  * A singleton database class that manages chat history persistence using LokiJS.
@@ -36,6 +37,7 @@ import { fs } from '../../fs/fs'
 export class Database {
     private static instance: Database | undefined = undefined
     private db: Loki
+    private logger = getLogger('chatHistoryDb')
     /**
      * Keep track of which open tabs have a corresponding history entry. Maps tabIds to historyIds
      */
@@ -48,6 +50,8 @@ export class Database {
         const workspaceId = this.getWorkspaceIdentifier()
         const dbName = `chat-history-${workspaceId}.json`
 
+        this.logger.debug(`Initializing database at ${this.dbDirectory}/${dbName}`)
+
         this.db = new Loki(dbName, {
             adapter: new FileSystemAdapter(this.dbDirectory),
             autosave: true,
@@ -66,6 +70,7 @@ export class Database {
     }
 
     setHistoryIdMapping(tabId: string, historyId: string) {
+        this.logger.debug(`[Setting historyIdMapping: tabId=${tabId}, historyId=${historyId}`)
         this.historyIdMapping.set(tabId, historyId)
     }
 
@@ -92,12 +97,14 @@ export class Database {
         }
 
         // Case 4: No workspace
+        this.logger.debug(`No workspace found, using default identifier: 'no-workspace'`)
         return 'no-workspace'
     }
 
     async databaseInitialize() {
         let entries = this.db.getCollection(TabCollection)
         if (entries === null) {
+            this.logger.info(`Creating new tabs collection`)
             entries = this.db.addCollection(TabCollection, {
                 unique: ['historyId'],
                 indices: ['updatedAt', 'isOpen'],
@@ -137,24 +144,32 @@ export class Database {
         if (this.initialized) {
             const tabCollection = this.db.getCollection<Tab>(TabCollection)
             const historyId = this.historyIdMapping.get(tabId)
+            this.logger.info(`Clearing tab: tabId=${tabId}, historyId=${historyId || 'undefined'}`)
             if (historyId) {
                 tabCollection.findAndRemove({ historyId })
+                this.logger.debug(`Removed tab with historyId=${historyId} from collection`)
             }
             this.historyIdMapping.delete(tabId)
+            this.logger.debug(`Removed tabId=${tabId} from historyIdMapping`)
         }
     }
 
     updateTabOpenState(tabId: string, isOpen: boolean) {
         if (this.initialized) {
             const tabCollection = this.db.getCollection<Tab>(TabCollection)
             const historyId = this.historyIdMapping.get(tabId)
+            this.logger.info(
+                `Updating tab open state: tabId=${tabId}, historyId=${historyId || 'undefined'}, isOpen=${isOpen}`
+            )
             if (historyId) {
                 tabCollection.findAndUpdate({ historyId }, (tab: Tab) => {
                     tab.isOpen = isOpen
                     return tab
                 })
+                this.logger.debug(`Updated tab open state in collection`)
                 if (!isOpen) {
                     this.historyIdMapping.delete(tabId)
+                    this.logger.debug(`Removed tabId=${tabId} from historyIdMapping`)
                 }
             }
         }
@@ -164,9 +179,11 @@ export class Database {
         let searchResults: DetailedListItemGroup[] = []
         if (this.initialized) {
             if (!filter) {
+                this.logger.info(`Empty search filter, returning all history`)
                 return this.getHistory()
             }
 
+            this.logger.info(`Searching messages with filter: "${filter}"`)
             const searchTermLower = filter.toLowerCase()
             const tabCollection = this.db.getCollection<Tab>(TabCollection)
             const tabs = tabCollection.find()
@@ -177,9 +194,11 @@ export class Database {
                     })
                 })
             })
+            this.logger.info(`Found ${filteredTabs.length} matching tabs`)
             searchResults = groupTabsByDate(filteredTabs)
         }
         if (searchResults.length === 0) {
+            this.logger.info(`No search results found, returning default message`)
             searchResults = [{ children: [{ description: 'No matches found' }] }]
         }
         return searchResults
@@ -194,6 +213,9 @@ export class Database {
         if (this.initialized) {
             const tabCollection = this.db.getCollection<Tab>(TabCollection)
             const historyId = this.historyIdMapping.get(tabId)
+            this.logger.info(
+                `Getting messages: tabId=${tabId}, historyId=${historyId || 'undefined'}, numMessages=${numMessages || 'all'}`
+            )
             const tabData = historyId ? tabCollection.findOne({ historyId }) : undefined
             if (tabData) {
                 const allMessages = tabData.conversations.flatMap((conversation: Conversation) => conversation.messages)
@@ -210,6 +232,7 @@ export class Database {
         if (this.initialized) {
             const tabCollection = this.db.getCollection<Tab>(TabCollection)
             const tabs = tabCollection.find()
+            this.logger.debug(`Getting history from ${tabs.length} tabs`)
             return groupTabsByDate(tabs)
         }
         return []
@@ -218,6 +241,7 @@ export class Database {
     deleteHistory(historyId: string) {
         if (this.initialized) {
             const tabCollection = this.db.getCollection<Tab>(TabCollection)
+            this.logger.info(`Deleting history: historyId=${historyId}`)
             tabCollection.findAndRemove({ historyId })
             const tabId = this.getOpenTabId(historyId)
             if (tabId) {
@@ -229,23 +253,29 @@ export class Database {
     addMessage(tabId: string, tabType: TabType, conversationId: string, message: Message) {
         if (this.initialized) {
             const tabCollection = this.db.getCollection<Tab>(TabCollection)
+            this.logger.info(`Adding message: tabId=${tabId}, tabType=${tabType}, conversationId=${conversationId}`)
 
             let historyId = this.historyIdMapping.get(tabId)
 
             if (!historyId) {
                 historyId = crypto.randomUUID()
+                this.logger.debug(`No historyId found, creating new one: ${historyId}`)
                 this.setHistoryIdMapping(tabId, historyId)
             }
 
             const tabData = historyId ? tabCollection.findOne({ historyId }) : undefined
             const tabTitle =
-                (message.type === ('prompt' as ChatItemType) ? message.body : tabData?.title) || 'Amazon Q Chat'
+                message.type === ('prompt' as ChatItemType) && message.body.trim().length > 0
+                    ? message.body
+                    : tabData?.title || 'Amazon Q Chat'
             if (tabData) {
+                this.logger.info(`Found existing tab data, updating conversations`)
                 tabData.conversations = updateOrCreateConversation(tabData.conversations, conversationId, message)
                 tabData.updatedAt = new Date()
                 tabData.title = tabTitle
                 tabCollection.update(tabData)
             } else {
+                this.logger.info(`No existing tab data, creating new tab entry`)
                 tabCollection.insert({
                     historyId,
                     updatedAt: new Date(),
diff --git a/packages/core/src/shared/logger/logger.ts b/packages/core/src/shared/logger/logger.ts
@@ -21,6 +21,7 @@ export type LogTopic =
     | 'executeBash'
     | 'listDirectory'
     | 'chatStream'
+    | 'chatHistoryDb'
     | 'unknown'
 
 class ErrorLog {
