Refactor createCompletion to use SessionEntry object

Updated createCompletion and related calls to accept a SessionEntry object instead of separate conversation and sessionId parameters. This change improves type safety and allows for easier management of session-related data, including tools. Also updated type definitions and usages to reflect this refactor.

Author: aiqlcom

src/renderer/components/common/SamplingCard.vue

@@ -46,7 +46,13 @@ const tryCompletions = () => {
       // const { messages, ...restParams } = samplingParams.value
       // restParams.target = samplingResults.value
       samplingId.value = historyStore.getDate()
-      createCompletion(samplingResults.value, samplingId.value, samplingParams.value)
+      createCompletion(
+        {
+          id: samplingId.value,
+          messages: samplingResults.value
+        },
+        samplingParams.value
+      )
     }
   }
 }

src/renderer/composables/chatCompletions.ts

@@ -9,16 +9,17 @@ import type { ChatbotConfig } from '@/types/llm'
 
 import { SamplingRequestParams, SamplingMessage } from '@/types/ipc'
 
+import type { SessionEntry, McpToolMessage } from '@/renderer/types/session'
+
+import { unionBy } from 'lodash'
+
 import type {
   AssistantMessage,
   ToolCall,
   ChatCompletionRequestMessage,
-  ChatCompletionMessage,
-  ChatConversationMessage
+  ChatCompletionMessage
 } from '@/renderer/types/message'
 
-import { Tool } from '@modelcontextprotocol/sdk/types'
-
 import { ReasoningEffort, REASONING_EFFORT, ENABLE_THINKING } from '@/renderer/types'
 
 type ChatRequestBody = {
@@ -27,7 +28,7 @@ type ChatRequestBody = {
   temperature?: number
   messages?: ChatCompletionMessage[]
   top_p?: number
-  tools?: Tool[]
+  tools?: McpToolMessage[]
   reasoning_effort?: ReasoningEffort
   enable_thinking?: boolean
   chat_template_kwargs?: Record<string, any>
@@ -129,8 +130,7 @@ const promptMessage = (
 }
 
 export const createCompletion = async (
-  targetConversation: ChatConversationMessage[],
-  sessionId: string,
+  session: SessionEntry,
   sampling?: SamplingRequestParams
 ): Promise<ChatProcessResult> => {
   const snackbarStore = useSnackbarStore()
@@ -185,7 +185,7 @@ export const createCompletion = async (
       }
     }
 
-    const target = targetConversation
+    const target = session.messages
 
     if (!sampling) {
       const conversation = target.reduce(
@@ -225,6 +225,7 @@ export const createCompletion = async (
         const tools = await agentStore.getTools()
         if (tools && tools.length > 0) {
           body.tools = tools
+          session.tools = unionBy(session.tools, tools, 'function.name')
         }
       }
     } else {
@@ -249,8 +250,8 @@ export const createCompletion = async (
 
     const abortController = new AbortController()
 
-    console.log('Chat session started: ', sessionId)
-    messageStore.generating[sessionId] = abortController
+    console.log('Chat session started: ', session.id)
+    messageStore.generating[session.id] = abortController
 
     const completion = await fetch(
       chatbotConfig.url + (chatbotConfig.path ? chatbotConfig.path : ''),
@@ -305,11 +306,11 @@ export const createCompletion = async (
     const buffer = ''
 
     // Read the stream
-    await read(reader, sessionId, lastItem, buffer, chatbotConfig.stream)
+    await read(reader, session.id, lastItem, buffer, chatbotConfig.stream)
   } catch (error: any) {
     snackbarStore.showErrorMessage(error?.message)
   } finally {
-    const result = messageStore.delete(sessionId) ? 'done' : 'aborted'
+    const result = messageStore.delete(session.id) ? 'done' : 'aborted'
     return result
   }
 }

src/renderer/store/message.ts

@@ -137,7 +137,7 @@ export const useMessageStore = defineStore('messageStore', {
       // Verify the old conversation still exist
       if (oldConversation) {
         this.generating[sessionId] = 'prepare'
-        createCompletion(oldConversation.messages, sessionId).then((reason: ChatProcessResult) => {
+        createCompletion(oldConversation).then((reason: ChatProcessResult) => {
           if (reason === 'done') {
             this.postToolCall(sessionId)
           }

src/renderer/types/session.ts

@@ -1,8 +1,13 @@
 import type { ChatConversationMessage } from '@/renderer/types/message'
 
+import { Tool as McpToolMessage } from '@modelcontextprotocol/sdk/types'
+
 export type SessionId = string
 
+export type { McpToolMessage }
+
 export type SessionEntry = {
   id: SessionId
   messages: ChatConversationMessage[]
+  tools?: McpToolMessage[]
 }