From d3b1708261f167f02d6e5cac365631a8ca3157b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vi=CC=81ctor=20Ferna=CC=81ndez?=
 <victor.fernandez.gabriel@gmail.com>
Date: Fri, 14 Apr 2023 14:54:08 +0200
Subject: [PATCH 1/3] feat: add role types

---
 src/services/prompts.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/services/prompts.ts b/src/services/prompts.ts
index e1433dc5..b124618b 100644
--- a/src/services/prompts.ts
+++ b/src/services/prompts.ts
@@ -1,10 +1,12 @@
 import Browser from 'webextension-polyfill'
 import { ofetch } from 'ofetch'
 
+export type PromptRole = 'system' | 'user'
 export interface Prompt {
   id: string
   title: string
   prompt: string
+  role: PromptRole
 }
 
 export async function loadLocalPrompts() {
@@ -19,6 +21,7 @@ export async function saveLocalPrompt(prompt: Prompt) {
     if (p.id === prompt.id) {
       p.title = prompt.title
       p.prompt = prompt.prompt
+      p.role = prompt.role
       existed = true
       break
     }

From 7594f86132e46e4d839bb53baf151f68f93f12cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vi=CC=81ctor=20Ferna=CC=81ndez?=
 <victor.fernandez.gabriel@gmail.com>
Date: Fri, 14 Apr 2023 14:54:32 +0200
Subject: [PATCH 2/3] feat: collect role on prompt library

---
 src/app/components/PromptLibrary/Library.tsx | 30 ++++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/app/components/PromptLibrary/Library.tsx b/src/app/components/PromptLibrary/Library.tsx
index 241ed666..d901d477 100644
--- a/src/app/components/PromptLibrary/Library.tsx
+++ b/src/app/components/PromptLibrary/Library.tsx
@@ -1,13 +1,21 @@
-import { Suspense, useCallback, useMemo, useState } from 'react'
+import { Suspense, useCallback, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { BeatLoader } from 'react-spinners'
 import useSWR from 'swr'
 import closeIcon from '~/assets/icons/close.svg'
 import { trackEvent } from '~app/plausible'
-import { Prompt, loadLocalPrompts, loadRemotePrompts, removeLocalPrompt, saveLocalPrompt } from '~services/prompts'
+import {
+  Prompt,
+  PromptRole,
+  loadLocalPrompts,
+  loadRemotePrompts,
+  removeLocalPrompt,
+  saveLocalPrompt,
+} from '~services/prompts'
 import { uuid } from '~utils'
 import Button from '../Button'
 import { Input, Textarea } from '../Input'
+import Select from '../Select'
 import Tabs, { Tab } from '../Tabs'
 
 const ActionButton = (props: { text: string; onClick: () => void }) => {
@@ -58,8 +66,14 @@ const PromptItem = (props: {
   )
 }
 
+const PROMPT_ROLE_OPTIONS = [
+  { value: 'user', name: 'User' },
+  { value: 'system', name: 'System' },
+]
+
 function PromptForm(props: { initialData: Prompt; onSubmit: (data: Prompt) => void }) {
   const { t } = useTranslation()
+  const roleRef = useRef<HTMLInputElement>(null)
   const onSubmit = useCallback(
     (e: React.FormEvent<HTMLFormElement>) => {
       e.preventDefault()
@@ -71,6 +85,7 @@ function PromptForm(props: { initialData: Prompt; onSubmit: (data: Prompt) => vo
           id: props.initialData.id,
           title: json.title as string,
           prompt: json.prompt as string,
+          role: json.role as PromptRole,
         })
       }
     },
@@ -82,6 +97,15 @@ function PromptForm(props: { initialData: Prompt; onSubmit: (data: Prompt) => vo
         <span className="text-sm font-semibold block mb-1 text-primary-text">Prompt {t('Title')}</span>
         <Input className="w-full" name="title" defaultValue={props.initialData.title} />
       </div>
+      <div className="w-full">
+        <span className="text-sm font-semibold block mb-1 text-primary-text">Prompt {t('Role')}</span>
+        <input name="role" hidden ref={roleRef} />
+        <Select
+          options={PROMPT_ROLE_OPTIONS}
+          value={props.initialData.role ?? 'user'}
+          onChange={(value) => roleRef.current && (roleRef.current.value = value)}
+        ></Select>
+      </div>
       <div className="w-full">
         <span className="text-sm font-semibold block mb-1 text-primary-text">Prompt {t('Content')}</span>
         <Textarea className="w-full" name="prompt" defaultValue={props.initialData.prompt} />
@@ -116,7 +140,7 @@ function LocalPrompts(props: { insertPrompt: (text: string) => void }) {
   )
 
   const create = useCallback(() => {
-    setFormData({ id: uuid(), title: '', prompt: '' })
+    setFormData({ id: uuid(), title: '', prompt: '', role: 'user' })
   }, [])
 
   return (

From ec0d64f8829365d6373c5b47e36b5a58f41640a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vi=CC=81ctor=20Ferna=CC=81ndez?=
 <victor.fernandez.gabriel@gmail.com>
Date: Fri, 14 Apr 2023 16:13:26 +0200
Subject: [PATCH 3/3] feat: send prompt role

---
 src/app/bots/abstract-bot.ts                  |  2 +
 src/app/bots/chatgpt-api/index.ts             | 10 ++++-
 src/app/components/Chat/ChatMessageInput.tsx  | 20 ++++++---
 src/app/components/Chat/ConversationPanel.tsx | 12 +++---
 src/app/components/PromptLibrary/Dialog.tsx   |  3 +-
 src/app/components/PromptLibrary/Library.tsx  | 43 ++++++++++---------
 src/app/hooks/use-chat.ts                     |  8 ++--
 src/app/i18n.ts                               |  2 +
 src/app/pages/MultiBotChatPanel.tsx           | 10 ++---
 src/services/prompts.ts                       |  6 +--
 10 files changed, 69 insertions(+), 47 deletions(-)

diff --git a/src/app/bots/abstract-bot.ts b/src/app/bots/abstract-bot.ts
index d9e51d41..2c5a404b 100644
--- a/src/app/bots/abstract-bot.ts
+++ b/src/app/bots/abstract-bot.ts
@@ -1,3 +1,4 @@
+import { Prompt } from '~services/prompts'
 import { ChatError, ErrorCode } from '~utils/errors'
 
 export type Event =
@@ -17,6 +18,7 @@ export type Event =
 
 export interface SendMessageParams {
   prompt: string
+  role: Prompt['role']
   onEvent: (event: Event) => void
   signal?: AbortSignal
 }
diff --git a/src/app/bots/chatgpt-api/index.ts b/src/app/bots/chatgpt-api/index.ts
index 7604ab3d..85999073 100644
--- a/src/app/bots/chatgpt-api/index.ts
+++ b/src/app/bots/chatgpt-api/index.ts
@@ -16,7 +16,13 @@ export class ChatGPTApiBot extends AbstractBot {
   private conversationContext?: ConversationContext
 
   buildMessages(): ChatMessage[] {
-    return [SYSTEM_MESSAGE, ...this.conversationContext!.messages.slice(-(CONTEXT_SIZE + 1))]
+    let systemMessage = SYSTEM_MESSAGE
+    let otherMessages = this.conversationContext!.messages
+    if (this.conversationContext!.messages[0].role === 'system') {
+      systemMessage = this.conversationContext!.messages[0]
+      otherMessages = this.conversationContext!.messages.slice(1)
+    }
+    return [systemMessage, ...otherMessages.slice(-(CONTEXT_SIZE + 1))]
   }
 
   async doSendMessage(params: SendMessageParams) {
@@ -27,7 +33,7 @@ export class ChatGPTApiBot extends AbstractBot {
     if (!this.conversationContext) {
       this.conversationContext = { messages: [] }
     }
-    this.conversationContext.messages.push({ role: 'user', content: params.prompt })
+    this.conversationContext.messages.push({ role: params.role, content: params.prompt })
 
     const resp = await fetch(`${openaiApiHost}/v1/chat/completions`, {
       method: 'POST',
diff --git a/src/app/components/Chat/ChatMessageInput.tsx b/src/app/components/Chat/ChatMessageInput.tsx
index 825dc73e..bcd58ede 100644
--- a/src/app/components/Chat/ChatMessageInput.tsx
+++ b/src/app/components/Chat/ChatMessageInput.tsx
@@ -2,13 +2,19 @@ import cx from 'classnames'
 import { FC, memo, ReactNode, useCallback, useEffect, useRef, useState } from 'react'
 import { GoBook } from 'react-icons/go'
 import { trackEvent } from '~app/plausible'
+import { Prompt } from '~services/prompts'
 import Button from '../Button'
 import PromptLibraryDialog from '../PromptLibrary/Dialog'
 import TextInput from './TextInput'
 
+export interface Message {
+  text: string
+  role: Prompt['role']
+}
+
 interface Props {
   mode: 'full' | 'compact'
-  onSubmit: (value: string) => void
+  onSubmit: (message: Message) => void
   className?: string
   disabled?: boolean
   placeholder?: string
@@ -21,6 +27,7 @@ const ChatMessageInput: FC<Props> = (props) => {
   const formRef = useRef<HTMLFormElement>(null)
   const inputRef = useRef<HTMLTextAreaElement>(null)
   const [isPromptLibraryDialogOpen, setIsPromptLibraryDialogOpen] = useState(false)
+  const role = useRef<Prompt['role']>('user')
 
   useEffect(() => {
     if (!props.disabled && props.autoFocus) {
@@ -32,19 +39,20 @@ const ChatMessageInput: FC<Props> = (props) => {
     (e: React.FormEvent<HTMLFormElement>) => {
       e.preventDefault()
       if (value.trim()) {
-        props.onSubmit(value)
+        props.onSubmit({ text: value, role: role.current })
       }
       setValue('')
     },
     [props, value],
   )
 
-  const insertTextAtCursor = useCallback(
-    (text: string) => {
+  const insertPromptAtCursor = useCallback(
+    (prompt: Prompt) => {
       const cursorPosition = inputRef.current?.selectionStart || 0
       const textBeforeCursor = value.slice(0, cursorPosition)
       const textAfterCursor = value.slice(cursorPosition)
-      setValue(`${textBeforeCursor}${text}${textAfterCursor}`)
+      setValue(`${textBeforeCursor}${prompt.prompt}${textAfterCursor}`)
+      role.current = prompt.role
       setIsPromptLibraryDialogOpen(false)
       inputRef.current?.focus()
     },
@@ -65,7 +73,7 @@ const ChatMessageInput: FC<Props> = (props) => {
             <PromptLibraryDialog
               isOpen={true}
               onClose={() => setIsPromptLibraryDialogOpen(false)}
-              insertPrompt={insertTextAtCursor}
+              insertPrompt={insertPromptAtCursor}
             />
           )}
         </>
diff --git a/src/app/components/Chat/ConversationPanel.tsx b/src/app/components/Chat/ConversationPanel.tsx
index 4b6eb3f8..f5787772 100644
--- a/src/app/components/Chat/ConversationPanel.tsx
+++ b/src/app/components/Chat/ConversationPanel.tsx
@@ -1,25 +1,25 @@
 import cx from 'classnames'
 import { FC, useCallback, useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
 import clearIcon from '~/assets/icons/clear.svg'
 import historyIcon from '~/assets/icons/history.svg'
 import shareIcon from '~/assets/icons/share.svg'
 import { CHATBOTS } from '~app/consts'
 import { ConversationContext, ConversationContextValue } from '~app/context'
 import { trackEvent } from '~app/plausible'
-import ShareDialog from '../Share/Dialog'
 import { ChatMessageModel } from '~types'
 import { BotId } from '../../bots'
 import Button from '../Button'
 import HistoryDialog from '../History/Dialog'
+import ShareDialog from '../Share/Dialog'
 import SwitchBotDropdown from '../SwitchBotDropdown'
-import ChatMessageInput from './ChatMessageInput'
+import ChatMessageInput, { Message } from './ChatMessageInput'
 import ChatMessageList from './ChatMessageList'
-import { useTranslation } from 'react-i18next'
 
 interface Props {
   botId: BotId
   messages: ChatMessageModel[]
-  onUserSendMessage: (input: string, botId: BotId) => void
+  onUserSendMessage: (message: Message, botId: BotId) => void
   resetConversation: () => void
   generating: boolean
   stopGenerating: () => void
@@ -42,8 +42,8 @@ const ConversationPanel: FC<Props> = (props) => {
   }, [props.resetConversation])
 
   const onSubmit = useCallback(
-    async (input: string) => {
-      props.onUserSendMessage(input as string, props.botId)
+    async (message: Message) => {
+      props.onUserSendMessage(message, props.botId)
     },
     [props],
   )
diff --git a/src/app/components/PromptLibrary/Dialog.tsx b/src/app/components/PromptLibrary/Dialog.tsx
index 7b488423..56492500 100644
--- a/src/app/components/PromptLibrary/Dialog.tsx
+++ b/src/app/components/PromptLibrary/Dialog.tsx
@@ -1,10 +1,11 @@
 import PromptLibrary from './Library'
 import Dialog from '../Dialog'
+import { Prompt } from '~services/prompts'
 
 interface Props {
   isOpen: boolean
   onClose: () => void
-  insertPrompt: (text: string) => void
+  insertPrompt: (prompt: Prompt) => void
 }
 
 const PromptLibraryDialog = (props: Props) => {
diff --git a/src/app/components/PromptLibrary/Library.tsx b/src/app/components/PromptLibrary/Library.tsx
index d901d477..4e5eb522 100644
--- a/src/app/components/PromptLibrary/Library.tsx
+++ b/src/app/components/PromptLibrary/Library.tsx
@@ -3,15 +3,9 @@ import { useTranslation } from 'react-i18next'
 import { BeatLoader } from 'react-spinners'
 import useSWR from 'swr'
 import closeIcon from '~/assets/icons/close.svg'
+import { ChatMessage } from '~app/bots/chatgpt-api/consts'
 import { trackEvent } from '~app/plausible'
-import {
-  Prompt,
-  PromptRole,
-  loadLocalPrompts,
-  loadRemotePrompts,
-  removeLocalPrompt,
-  saveLocalPrompt,
-} from '~services/prompts'
+import { Prompt, loadLocalPrompts, loadRemotePrompts, removeLocalPrompt, saveLocalPrompt } from '~services/prompts'
 import { uuid } from '~utils'
 import Button from '../Button'
 import { Input, Textarea } from '../Input'
@@ -31,11 +25,11 @@ const ActionButton = (props: { text: string; onClick: () => void }) => {
 
 const PromptItem = (props: {
   title: string
-  prompt: string
+  prompt: Prompt
   edit?: () => void
   remove?: () => void
   copyToLocal?: () => void
-  insertPrompt: (text: string) => void
+  insertPrompt: (prompt: Prompt) => void
 }) => {
   const { t } = useTranslation()
   const [saved, setSaved] = useState(false)
@@ -50,7 +44,12 @@ const PromptItem = (props: {
       <div className="min-w-0 flex-1">
         <p className="truncate text-sm font-medium text-primary-text">{props.title}</p>
       </div>
-      <div className="flex flex-row gap-1">
+      <div className="flex flex-row gap-1 items-center">
+        {props.prompt.role === 'system' && (
+          <div className="h-6 w-6 rounded-full bg-secondary flex items-center justify-center">
+            <span className="text-sm text-secondary-text">$</span>
+          </div>
+        )}
         {props.edit && <ActionButton text={t('Edit')} onClick={props.edit} />}
         {props.copyToLocal && <ActionButton text={t(saved ? 'Saved' : 'Save')} onClick={copyToLocal} />}
         <ActionButton text={t('Use')} onClick={() => props.insertPrompt(props.prompt)} />
@@ -85,7 +84,7 @@ function PromptForm(props: { initialData: Prompt; onSubmit: (data: Prompt) => vo
           id: props.initialData.id,
           title: json.title as string,
           prompt: json.prompt as string,
-          role: json.role as PromptRole,
+          role: json.role as ChatMessage['role'],
         })
       }
     },
@@ -98,8 +97,10 @@ function PromptForm(props: { initialData: Prompt; onSubmit: (data: Prompt) => vo
         <Input className="w-full" name="title" defaultValue={props.initialData.title} />
       </div>
       <div className="w-full">
-        <span className="text-sm font-semibold block mb-1 text-primary-text">Prompt {t('Role')}</span>
-        <input name="role" hidden ref={roleRef} />
+        <span className="text-sm font-semibold block mb-1 text-primary-text">
+          Prompt {t('Role')} ({t('PromptRoleWarning')})
+        </span>
+        <input name="role" hidden ref={roleRef} value={props.initialData.role ?? 'user'} />
         <Select
           options={PROMPT_ROLE_OPTIONS}
           value={props.initialData.role ?? 'user'}
@@ -115,7 +116,7 @@ function PromptForm(props: { initialData: Prompt; onSubmit: (data: Prompt) => vo
   )
 }
 
-function LocalPrompts(props: { insertPrompt: (text: string) => void }) {
+function LocalPrompts(props: { insertPrompt: (prompt: Prompt) => void }) {
   const { t } = useTranslation()
   const [formData, setFormData] = useState<Prompt | null>(null)
   const localPromptsQuery = useSWR('local-prompts', () => loadLocalPrompts(), { suspense: true })
@@ -151,7 +152,7 @@ function LocalPrompts(props: { insertPrompt: (text: string) => void }) {
             <PromptItem
               key={prompt.id}
               title={prompt.title}
-              prompt={prompt.prompt}
+              prompt={prompt}
               edit={() => setFormData(prompt)}
               remove={() => removePrompt(prompt.id)}
               insertPrompt={props.insertPrompt}
@@ -174,7 +175,7 @@ function LocalPrompts(props: { insertPrompt: (text: string) => void }) {
   )
 }
 
-function CommunityPrompts(props: { insertPrompt: (text: string) => void }) {
+function CommunityPrompts(props: { insertPrompt: (prompt: Prompt) => void }) {
   const promptsQuery = useSWR('community-prompts', () => loadRemotePrompts(), { suspense: true })
 
   const copyToLocal = useCallback(async (prompt: Prompt) => {
@@ -188,7 +189,7 @@ function CommunityPrompts(props: { insertPrompt: (text: string) => void }) {
           <PromptItem
             key={index}
             title={prompt.title}
-            prompt={prompt.prompt}
+            prompt={prompt}
             insertPrompt={props.insertPrompt}
             copyToLocal={() => copyToLocal(prompt)}
           />
@@ -213,10 +214,10 @@ function CommunityPrompts(props: { insertPrompt: (text: string) => void }) {
   )
 }
 
-const PromptLibrary = (props: { insertPrompt: (text: string) => void }) => {
+const PromptLibrary = (props: { insertPrompt: (prompt: Prompt) => void }) => {
   const insertPrompt = useCallback(
-    (text: string) => {
-      props.insertPrompt(text)
+    (prompt: Prompt) => {
+      props.insertPrompt(prompt)
       trackEvent('use_prompt')
     },
     [props],
diff --git a/src/app/hooks/use-chat.ts b/src/app/hooks/use-chat.ts
index 3c3f70ee..7c2955d8 100644
--- a/src/app/hooks/use-chat.ts
+++ b/src/app/hooks/use-chat.ts
@@ -1,5 +1,6 @@
 import { useAtom } from 'jotai'
 import { useCallback, useEffect, useMemo } from 'react'
+import { Message } from '~app/components/Chat/ChatMessageInput'
 import { trackEvent } from '~app/plausible'
 import { chatFamily } from '~app/state'
 import { setConversationMessages } from '~services/chat-history'
@@ -24,11 +25,11 @@ export function useChat(botId: BotId, page = 'singleton') {
   )
 
   const sendMessage = useCallback(
-    async (input: string) => {
+    async ({ text, role }: Message) => {
       trackEvent('send_message', { botId })
       const botMessageId = uuid()
       setChatState((draft) => {
-        draft.messages.push({ id: uuid(), text: input, author: 'user' }, { id: botMessageId, text: '', author: botId })
+        draft.messages.push({ id: uuid(), text, author: 'user' }, { id: botMessageId, text: '', author: botId })
       })
       const abortController = new AbortController()
       setChatState((draft) => {
@@ -36,7 +37,8 @@ export function useChat(botId: BotId, page = 'singleton') {
         draft.abortController = abortController
       })
       await chatState.bot.sendMessage({
-        prompt: input,
+        prompt: text,
+        role,
         signal: abortController.signal,
         onEvent(event) {
           if (event.type === 'UPDATE_ANSWER') {
diff --git a/src/app/i18n.ts b/src/app/i18n.ts
index da699c3d..a66c74a1 100644
--- a/src/app/i18n.ts
+++ b/src/app/i18n.ts
@@ -23,6 +23,7 @@ const resources = {
       Stop: 'Stop',
       Title: 'Title',
       Cotnent: 'Content',
+      PromptRoleWarning: 'Only available for ChatGPT using API',
     },
   },
   de: {
@@ -53,6 +54,7 @@ const resources = {
       'Export/Import All Data': 'Exportar/Importar todos los datos',
       'Data includes all your settings, chat histories, and local prompts':
         'Los datos incluyen todas tus configuraciones, historiales de chat y promociones locales',
+      PromptRoleWarning: 'Solo disponible para ChatGPT usando API',
     },
   },
   fr: {
diff --git a/src/app/pages/MultiBotChatPanel.tsx b/src/app/pages/MultiBotChatPanel.tsx
index e3361973..088b53e2 100644
--- a/src/app/pages/MultiBotChatPanel.tsx
+++ b/src/app/pages/MultiBotChatPanel.tsx
@@ -1,13 +1,13 @@
 import { useAtomValue } from 'jotai'
 import { uniqBy } from 'lodash-es'
 import { FC, useCallback, useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
 import Button from '~app/components/Button'
-import ChatMessageInput from '~app/components/Chat/ChatMessageInput'
+import ChatMessageInput, { Message } from '~app/components/Chat/ChatMessageInput'
 import { useChat } from '~app/hooks/use-chat'
 import { compareBotsAtom } from '~app/state'
 import { BotId } from '../bots'
 import ConversationPanel from '../components/Chat/ConversationPanel'
-import { useTranslation } from 'react-i18next'
 
 const MultiBotChatPanel: FC = () => {
   const { t } = useTranslation()
@@ -20,12 +20,12 @@ const MultiBotChatPanel: FC = () => {
   const generating = useMemo(() => chats.some((c) => c.generating), [chats])
 
   const onUserSendMessage = useCallback(
-    (input: string, botId?: BotId) => {
+    (message: Message, botId?: BotId) => {
       if (botId) {
         const chat = chats.find((c) => c.botId === botId)
-        chat?.sendMessage(input)
+        chat?.sendMessage(message)
       } else {
-        uniqBy(chats, (c) => c.botId).forEach((c) => c.sendMessage(input))
+        uniqBy(chats, (c) => c.botId).forEach((c) => c.sendMessage(message))
       }
     },
     [chats],
diff --git a/src/services/prompts.ts b/src/services/prompts.ts
index b124618b..6042b766 100644
--- a/src/services/prompts.ts
+++ b/src/services/prompts.ts
@@ -1,12 +1,12 @@
-import Browser from 'webextension-polyfill'
 import { ofetch } from 'ofetch'
+import Browser from 'webextension-polyfill'
+import { ChatMessage } from '~app/bots/chatgpt-api/consts'
 
-export type PromptRole = 'system' | 'user'
 export interface Prompt {
   id: string
   title: string
   prompt: string
-  role: PromptRole
+  role: ChatMessage['role']
 }
 
 export async function loadLocalPrompts() {