fixed types

src/components/Sidebar/chat/ChatInput.tsx

@@ -7,13 +7,13 @@ import ChatHistory from './ChatHistory'
 import { useChatHistory } from '../../../hooks/useChatHistory'
 import WebPageContentToggle from './WebPageContentToggle'
 import ImageCaptureButton from './ImageCaptureButton'
-import { useMessageDraft } from '../../../hooks/useMessageDraft'
+import { MessageDraft, useMessageDraft } from '../../../hooks/useMessageDraft'
 import FilePreviewBar from './FilePreviewBar'
 import MessageDraftLengthCounter from './MessageDraftLengthCounter'
 
 interface SidebarInputProps {
   loading: boolean
-  submitMessage: (message: string, context?: string) => void
+  submitMessage: (message: MessageDraft, context?: string) => void
   clearMessages: () => void
   chatIsEmpty: boolean
   cancelRequest: () => void
@@ -66,7 +66,7 @@ export function SidebarInput({
       })
       context = (await pageContent) as string
     }
-    submitMessage(messageDraft.text, isWebpageContextOn ? context : undefined)
+    submitMessage(messageDraft, isWebpageContextOn ? context : undefined)
     resetMessageDraft()
   }
 

src/components/Sidebar/chat/MessageDraftLengthCounter.tsx

@@ -1,13 +1,13 @@
 import React from 'react'
 
-interface MessageDraftlengthCounterProps {
+interface MessageDraftLengthCounterProps {
   length: number
   MAX_LENGTH: number
 }
 const MessageDraftLengthCounter = ({
   length,
   MAX_LENGTH,
-}: MessageDraftlengthCounterProps) => {
+}: MessageDraftLengthCounterProps) => {
   return (
     <div className="cdx-text-neutral-500">
       <span>{length.toLocaleString()}</span>/

src/components/Sidebar/chat/index.tsx

@@ -25,7 +25,7 @@ const Chat = ({ settings }: ChatProps) => {
         prompt: string
       }
       if (action === 'generate') {
-        submitQuery(prompt)
+        submitQuery({ text: prompt, files: [] })
       }
     }
     window.addEventListener('message', handleWindowMessage)

src/hooks/useChatCompletion.ts

@@ -5,6 +5,7 @@ import { useMemo, useState } from 'react'
 import { AvailableModels, Mode } from '../config/settings'
 import { ChatRole, useCurrentChat } from './useCurrentChat'
 import { getMatchedContent } from '../lib/getMatchedContent'
+import { MessageDraft } from './useMessageDraft'
 
 interface UseChatCompletionProps {
   model: AvailableModels
@@ -62,8 +63,8 @@ export const useChatCompletion = ({
 
   const controller = new AbortController()
 
-  const submitQuery = async (query: string, context?: string) => {
-    await addNewMessage(ChatRole.USER, query)
+  const submitQuery = async (message: MessageDraft, context?: string) => {
+    await addNewMessage(ChatRole.USER, message)
     const options = {
       signal: controller.signal,
       callbacks: [{ handleLLMNewToken: updateAssistantMessage }],
@@ -78,17 +79,17 @@ export const useChatCompletion = ({
      */
     let matchedContext
     if (context) {
-      matchedContext = await getMatchedContent(query, context, apiKey)
+      matchedContext = await getMatchedContent(message.text, context, apiKey)
     }
 
     const expandedQuery = matchedContext
       ? endent`
       ### Context
       ${matchedContext}
       ### Question:
-      ${query}
+      ${message}
     `
-      : query
+      : message.text
 
     const messages = [
       new SystemMessage(systemPrompt),

src/hooks/useCurrentChat.ts

@@ -2,6 +2,7 @@ import { useEffect, useRef, useState } from 'react'
 import { getCurrentSiteHostName } from '../lib/getCurrentSiteHostName'
 import { useChatHistory } from './useChatHistory'
 import { readStorage, setStorage } from './useStorage'
+import { MessageDraft, MessageFile } from './useMessageDraft'
 
 export enum ChatRole {
   USER = 'USER',
@@ -12,6 +13,7 @@ export enum ChatRole {
 export type ChatMessage = {
   role: ChatRole
   content: string
+  files?: MessageFile[]
   timestamp: number
 }
 
@@ -104,7 +106,7 @@ export const useCurrentChat = () => {
     })
   }
 
-  const addNewMessage = async (role: ChatRole, message: string) => {
+  const addNewMessage = async (role: ChatRole, message: MessageDraft) => {
     if (!currentChatIdRef.current || !historyRef.current.length) {
       console.log({
         currentChatId: currentChatIdRef.current,
@@ -132,7 +134,8 @@ export const useCurrentChat = () => {
     }
     const newMessage: ChatMessage = {
       role,
-      content: message,
+      content: message.text,
+      files: message.files,
       timestamp: Date.now(),
     }
     setMessages((m) => [...m, newMessage])