From 5ceaba4676fc525440d83be2d515a4354716aafb Mon Sep 17 00:00:00 2001
From: rjmacarthy <richardmacarthy@hotmail.com>
Date: Thu, 16 Jan 2025 09:51:08 +0000
Subject: [PATCH] fix conversation reset

---
 src/extension/chat-service.ts   |  4 ++++
 src/extension/providers/base.ts | 14 +++++++-------
 src/index.ts                    |  1 +
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/extension/chat-service.ts b/src/extension/chat-service.ts
index 322e8f7..39397ae 100644
--- a/src/extension/chat-service.ts
+++ b/src/extension/chat-service.ts
@@ -530,6 +530,10 @@ export class ChatService extends Base {
     })
   }
 
+  public resetConversation () {
+    this._conversation = []
+  }
+
   public async getTemplateMessages(
     template: string,
     context?: string,
diff --git a/src/extension/providers/base.ts b/src/extension/providers/base.ts
index 040786c..35154a5 100644
--- a/src/extension/providers/base.ts
+++ b/src/extension/providers/base.ts
@@ -41,7 +41,6 @@ import {
 } from "../utils"
 
 export class BaseProvider {
-  private _chatService: ChatService | undefined
   private _diffManager = new DiffManager()
   private _embeddingDatabase: EmbeddingDatabase | undefined
   private _fileTreeProvider: FileTreeProvider
@@ -51,6 +50,7 @@ export class BaseProvider {
   private _symmetryService?: SymmetryService
   private _templateDir: string | undefined
   private _templateProvider: TemplateProvider
+  public chatService: ChatService | undefined
   public context: vscode.ExtensionContext
   public conversationHistory: ConversationHistory | undefined
   public reviewService: ReviewService | undefined
@@ -87,7 +87,7 @@ export class BaseProvider {
       this.context
     )
 
-    this._chatService = new ChatService(
+    this.chatService = new ChatService(
       this._statusBarItem,
       this._templateDir,
       this.context,
@@ -208,7 +208,7 @@ export class BaseProvider {
   }
 
   public destroyStream = () => {
-    this._chatService?.abort()
+    this.chatService?.abort()
     this.reviewService?.abort()
     this.webView?.postMessage({
       type: EVENT_NAME.twinnyStopGeneration
@@ -219,8 +219,8 @@ export class BaseProvider {
     const symmetryConnected = this._sessionManager?.get(
       EXTENSION_SESSION_NAME.twinnySymmetryConnection
     )
-    if (symmetryConnected && this._chatService) {
-      const messages = await this._chatService.getTemplateMessages(template)
+    if (symmetryConnected && this.chatService) {
+      const messages = await this.chatService.getTemplateMessages(template)
       logger.log(`
         Using symmetry for inference
         Messages: ${JSON.stringify(messages)}
@@ -232,7 +232,7 @@ export class BaseProvider {
         })
       )
     }
-    this._chatService?.streamTemplateCompletion(template)
+    this.chatService?.streamTemplateCompletion(template)
   }
 
   public getGitCommitMessage = async () => {
@@ -363,7 +363,7 @@ export class BaseProvider {
       )
     }
 
-    this._chatService?.streamChatCompletion(
+    this.chatService?.streamChatCompletion(
       data.data || [],
       data.meta as FileItem[]
     )
diff --git a/src/index.ts b/src/index.ts
index 7aeb8bf..7b008f2 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -246,6 +246,7 @@ export async function activate(context: ExtensionContext) {
     }),
     commands.registerCommand(TWINNY_COMMAND_NAME.newConversation, () => {
       sidebarProvider.conversationHistory?.resetConversation()
+      sidebarProvider.chatService?.resetConversation()
       sidebarProvider.newSymmetryConversation()
       sidebarProvider.webView?.postMessage({
         type: EVENT_NAME.twinnyNewConversation