From 93e973b85175a9d6ebeaca0c925afd9038410c68 Mon Sep 17 00:00:00 2001
From: samlhuillier <sam.jansa123@gmail.com>
Date: Sun, 29 Sep 2024 11:22:18 +0100
Subject: [PATCH 1/4] move props around

---
 .../ChatConfigComponents/DBSearchFilters.tsx  | 34 +++++++++++++---
 src/components/Chat/StartChat.tsx             | 39 +++----------------
 2 files changed, 33 insertions(+), 40 deletions(-)

diff --git a/src/components/Chat/ChatConfigComponents/DBSearchFilters.tsx b/src/components/Chat/ChatConfigComponents/DBSearchFilters.tsx
index 55651d4c..c7ac3056 100644
--- a/src/components/Chat/ChatConfigComponents/DBSearchFilters.tsx
+++ b/src/components/Chat/ChatConfigComponents/DBSearchFilters.tsx
@@ -1,16 +1,38 @@
-import React from 'react'
+import React, { useCallback } from 'react'
 import { Slider } from '@/components/ui/slider'
 import DateRangePicker from '../../ui/date-picker'
 import { DatabaseSearchFilters } from '../types'
 
 interface DbSearchFiltersProps {
   dbSearchFilters: DatabaseSearchFilters
-  onSliderChange: (value: number[]) => void
-  onDateChange: (from: Date | undefined, to: Date | undefined) => void
+  onFiltersChange: (newFilters: DatabaseSearchFilters) => void
 }
 
-const DbSearchFilters: React.FC<DbSearchFiltersProps> = ({ dbSearchFilters, onSliderChange, onDateChange }) => {
+const DbSearchFilters: React.FC<DbSearchFiltersProps> = ({ dbSearchFilters, onFiltersChange }) => {
   const inverseLogScale = (value: number) => Math.round(Math.log(value + 1) * 25)
+  const logScale = (value: number) => Math.round(Math.exp(value / 25) - 1)
+
+  const handleSliderChange = useCallback(
+    (value: number[]) => {
+      const scaledValue = logScale(value[0])
+      onFiltersChange({
+        ...dbSearchFilters,
+        limit: scaledValue,
+      })
+    },
+    [dbSearchFilters, onFiltersChange],
+  )
+
+  const handleDateChange = useCallback(
+    (from: Date | undefined, to: Date | undefined) => {
+      onFiltersChange({
+        ...dbSearchFilters,
+        minDate: from,
+        maxDate: to,
+      })
+    },
+    [dbSearchFilters, onFiltersChange],
+  )
 
   return (
     <div className="space-y-2 rounded-md border border-foreground p-3">
@@ -20,7 +42,7 @@ const DbSearchFilters: React.FC<DbSearchFiltersProps> = ({ dbSearchFilters, onSl
           min={0}
           max={100}
           step={1}
-          onValueChange={onSliderChange}
+          onValueChange={handleSliderChange}
         />
         <div className="flex flex-col">
           <span className="">{dbSearchFilters.limit} </span>
@@ -29,7 +51,7 @@ const DbSearchFilters: React.FC<DbSearchFiltersProps> = ({ dbSearchFilters, onSl
       </div>
       <div className="flex flex-col items-start">
         <span className="mb-1 text-sm text-muted-foreground">Filter search by date (last modified):</span>
-        <DateRangePicker from={dbSearchFilters.minDate} to={dbSearchFilters.maxDate} onDateChange={onDateChange} />
+        <DateRangePicker from={dbSearchFilters.minDate} to={dbSearchFilters.maxDate} onDateChange={handleDateChange} />
       </div>
     </div>
   )
diff --git a/src/components/Chat/StartChat.tsx b/src/components/Chat/StartChat.tsx
index 2ff67d82..6bb44462 100644
--- a/src/components/Chat/StartChat.tsx
+++ b/src/components/Chat/StartChat.tsx
@@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useState } from 'react'
 import { PiPaperPlaneRight } from 'react-icons/pi'
 import { LLMConfig } from 'electron/main/electron-store/storeConfig'
 import '../../styles/chat.css'
-import { AgentConfig, ToolDefinition } from './types'
+import { AgentConfig, ToolDefinition, DatabaseSearchFilters } from './types'
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
 import { Card, CardDescription } from '../ui/card'
 import { allAvailableToolDefinitions } from './tools'
@@ -51,45 +51,17 @@ const StartChat: React.FC<StartChatProps> = ({ defaultModelName, handleNewChatMe
     setSelectedLLM(value)
   }
 
-  const handleSliderChange = useCallback((value: number[]) => {
-    const logScale = (_value: number) => Math.round(Math.exp(_value / 25) - 1)
-    const scaledValue = logScale(value[0])
-    setAgentConfig((prevConfig) => ({
-      ...prevConfig,
-      dbSearchFilters: prevConfig.dbSearchFilters
-        ? {
-            ...prevConfig.dbSearchFilters,
-            limit: scaledValue,
-          }
-        : {
-            limit: scaledValue,
-            minDate: new Date(new Date().setFullYear(new Date().getFullYear() - 1)),
-            maxDate: new Date(),
-          },
-    }))
-  }, [])
-
   const handleToolsChange = (tools: ToolDefinition[]) => {
     setSelectedTools(tools)
     setAgentConfig((prevConfig) => ({ ...prevConfig, toolDefinitions: tools }))
   }
 
-  const handleDateChange = (from: Date | undefined, to: Date | undefined) => {
+  const handleDbSearchFiltersChange = useCallback((newFilters: DatabaseSearchFilters) => {
     setAgentConfig((prevConfig) => ({
       ...prevConfig,
-      dbSearchFilters: prevConfig.dbSearchFilters
-        ? {
-            ...prevConfig.dbSearchFilters,
-            minDate: from,
-            maxDate: to,
-          }
-        : {
-            limit: 33,
-            minDate: from,
-            maxDate: to,
-          },
+      dbSearchFilters: newFilters,
     }))
-  }
+  }, [])
 
   const handleDbSearchToggle = (checked: boolean) => {
     setAgentConfig((prevConfig) => ({
@@ -195,8 +167,7 @@ const StartChat: React.FC<StartChatProps> = ({ defaultModelName, handleNewChatMe
               {agentConfig.dbSearchFilters && (
                 <DbSearchFilters
                   dbSearchFilters={agentConfig.dbSearchFilters}
-                  onSliderChange={handleSliderChange}
-                  onDateChange={handleDateChange}
+                  onFiltersChange={handleDbSearchFiltersChange}
                 />
               )}
             </div>

From 87d6f611d8d2ca3fcdab820f4f50b99e3ac7769b Mon Sep 17 00:00:00 2001
From: samlhuillier <sam.jansa123@gmail.com>
Date: Sun, 29 Sep 2024 11:31:03 +0100
Subject: [PATCH 2/4] working drawer

---
 package-lock.json                 | 13 +++++
 package.json                      |  1 +
 src/components/Chat/StartChat.tsx | 43 ++++++++++++---
 src/components/ui/drawer.tsx      | 89 +++++++++++++++++++++++++++++++
 4 files changed, 140 insertions(+), 6 deletions(-)
 create mode 100644 src/components/ui/drawer.tsx

diff --git a/package-lock.json b/package-lock.json
index 54c85ac4..ffcd4d0e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -102,6 +102,7 @@
         "use-debounce": "^10.0.1",
         "uuid": "^10.0.0",
         "uuidv4": "^6.2.13",
+        "vaul": "^1.0.0",
         "vectordb": "0.4.10",
         "zod": "^3.23.8"
       },
@@ -22480,6 +22481,18 @@
         "spdx-expression-parse": "^3.0.0"
       }
     },
+    "node_modules/vaul": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/vaul/-/vaul-1.0.0.tgz",
+      "integrity": "sha512-TegfMkwy86RSvSiIVREG6OqgRL7agqRsKYyWYacyVUAdpcIi34QoCOED476Mbf8J5d06e1hygSdvJhehlxEBhQ==",
+      "dependencies": {
+        "@radix-ui/react-dialog": "^1.1.1"
+      },
+      "peerDependencies": {
+        "react": "^16.8 || ^17.0 || ^18.0",
+        "react-dom": "^16.8 || ^17.0 || ^18.0"
+      }
+    },
     "node_modules/vectordb": {
       "version": "0.4.10",
       "cpu": [
diff --git a/package.json b/package.json
index 709fec36..030f6cfc 100644
--- a/package.json
+++ b/package.json
@@ -121,6 +121,7 @@
     "use-debounce": "^10.0.1",
     "uuid": "^10.0.0",
     "uuidv4": "^6.2.13",
+    "vaul": "^1.0.0",
     "vectordb": "0.4.10",
     "zod": "^3.23.8"
   },
diff --git a/src/components/Chat/StartChat.tsx b/src/components/Chat/StartChat.tsx
index 6bb44462..48ec9531 100644
--- a/src/components/Chat/StartChat.tsx
+++ b/src/components/Chat/StartChat.tsx
@@ -14,6 +14,16 @@ import DbSearchFilters from './ChatConfigComponents/DBSearchFilters'
 import exampleAgents from './ChatConfigComponents/exampleAgents'
 import PromptEditor from './ChatConfigComponents/PromptEditor'
 import ToolSelector from './ChatConfigComponents/ToolSelector'
+import {
+  Drawer,
+  DrawerClose,
+  DrawerContent,
+  DrawerDescription,
+  DrawerFooter,
+  DrawerHeader,
+  DrawerTitle,
+  DrawerTrigger,
+} from '@/components/ui/drawer'
 
 interface StartChatProps {
   defaultModelName: string
@@ -26,6 +36,7 @@ const StartChat: React.FC<StartChatProps> = ({ defaultModelName, handleNewChatMe
   const [userTextFieldInput, setUserTextFieldInput] = useState<string>('')
   const [agentConfig, setAgentConfig] = useState<AgentConfig>(exampleAgents[0])
   const [selectedTools, setSelectedTools] = useState<ToolDefinition[]>(agentConfig.toolDefinitions)
+  const [isDrawerOpen, setIsDrawerOpen] = useState(false)
 
   useEffect(() => {
     const fetchLLMModels = async () => {
@@ -74,6 +85,9 @@ const StartChat: React.FC<StartChatProps> = ({ defaultModelName, handleNewChatMe
           }
         : undefined,
     }))
+    if (checked) {
+      setIsDrawerOpen(true)
+    }
   }
 
   return (
@@ -164,12 +178,29 @@ const StartChat: React.FC<StartChatProps> = ({ defaultModelName, handleNewChatMe
                 </Label>
               </div>
 
-              {agentConfig.dbSearchFilters && (
-                <DbSearchFilters
-                  dbSearchFilters={agentConfig.dbSearchFilters}
-                  onFiltersChange={handleDbSearchFiltersChange}
-                />
-              )}
+              <Drawer open={isDrawerOpen} onOpenChange={setIsDrawerOpen}>
+                <DrawerTrigger asChild>
+                  <Button disabled={!agentConfig.dbSearchFilters}>Configure DB Search</Button>
+                </DrawerTrigger>
+                <DrawerContent>
+                  <DrawerHeader>
+                    <DrawerTitle>Database Search Filters</DrawerTitle>
+                    <DrawerDescription>Configure your database search filters</DrawerDescription>
+                  </DrawerHeader>
+                  {agentConfig.dbSearchFilters && (
+                    <DbSearchFilters
+                      dbSearchFilters={agentConfig.dbSearchFilters}
+                      onFiltersChange={handleDbSearchFiltersChange}
+                    />
+                  )}
+                  <DrawerFooter>
+                    <Button onClick={() => setIsDrawerOpen(false)}>Save Changes</Button>
+                    <DrawerClose asChild>
+                      <Button variant="outline">Cancel</Button>
+                    </DrawerClose>
+                  </DrawerFooter>
+                </DrawerContent>
+              </Drawer>
             </div>
           </div>
         </div>
diff --git a/src/components/ui/drawer.tsx b/src/components/ui/drawer.tsx
new file mode 100644
index 00000000..9b3b5c19
--- /dev/null
+++ b/src/components/ui/drawer.tsx
@@ -0,0 +1,89 @@
+/* eslint-disable react/prop-types */
+/* eslint-disable react/jsx-props-no-spreading */
+import * as React from 'react'
+import { Drawer as DrawerPrimitive } from 'vaul'
+
+import { cn } from '@/lib/utils'
+
+const Drawer = ({ shouldScaleBackground = true, ...props }: React.ComponentProps<typeof DrawerPrimitive.Root>) => (
+  <DrawerPrimitive.Root shouldScaleBackground={shouldScaleBackground} {...props} />
+)
+Drawer.displayName = 'Drawer'
+
+const DrawerTrigger = DrawerPrimitive.Trigger
+
+const DrawerPortal = DrawerPrimitive.Portal
+
+const DrawerClose = DrawerPrimitive.Close
+
+const DrawerOverlay = React.forwardRef<
+  React.ElementRef<typeof DrawerPrimitive.Overlay>,
+  React.ComponentPropsWithoutRef<typeof DrawerPrimitive.Overlay>
+>(({ className, ...props }, ref) => (
+  <DrawerPrimitive.Overlay ref={ref} className={cn('fixed inset-0 z-50 bg-black/80', className)} {...props} />
+))
+DrawerOverlay.displayName = DrawerPrimitive.Overlay.displayName
+
+const DrawerContent = React.forwardRef<
+  React.ElementRef<typeof DrawerPrimitive.Content>,
+  React.ComponentPropsWithoutRef<typeof DrawerPrimitive.Content>
+>(({ className, children, ...props }, ref) => (
+  <DrawerPortal>
+    <DrawerOverlay />
+    <DrawerPrimitive.Content
+      ref={ref}
+      className={cn(
+        'fixed inset-x-0 bottom-0 z-50 mt-24 flex h-auto flex-col rounded-t-[10px] border bg-background',
+        className,
+      )}
+      {...props}
+    >
+      <div className="mx-auto mt-4 h-2 w-[100px] rounded-full bg-muted" />
+      {children}
+    </DrawerPrimitive.Content>
+  </DrawerPortal>
+))
+DrawerContent.displayName = 'DrawerContent'
+
+const DrawerHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
+  <div className={cn('grid gap-1.5 p-4 text-center sm:text-left', className)} {...props} />
+)
+DrawerHeader.displayName = 'DrawerHeader'
+
+const DrawerFooter = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
+  <div className={cn('mt-auto flex flex-col gap-2 p-4', className)} {...props} />
+)
+DrawerFooter.displayName = 'DrawerFooter'
+
+const DrawerTitle = React.forwardRef<
+  React.ElementRef<typeof DrawerPrimitive.Title>,
+  React.ComponentPropsWithoutRef<typeof DrawerPrimitive.Title>
+>(({ className, ...props }, ref) => (
+  <DrawerPrimitive.Title
+    ref={ref}
+    className={cn('text-lg font-semibold leading-none tracking-tight', className)}
+    {...props}
+  />
+))
+DrawerTitle.displayName = DrawerPrimitive.Title.displayName
+
+const DrawerDescription = React.forwardRef<
+  React.ElementRef<typeof DrawerPrimitive.Description>,
+  React.ComponentPropsWithoutRef<typeof DrawerPrimitive.Description>
+>(({ className, ...props }, ref) => (
+  <DrawerPrimitive.Description ref={ref} className={cn('text-sm text-muted-foreground', className)} {...props} />
+))
+DrawerDescription.displayName = DrawerPrimitive.Description.displayName
+
+export {
+  Drawer,
+  DrawerPortal,
+  DrawerOverlay,
+  DrawerTrigger,
+  DrawerClose,
+  DrawerContent,
+  DrawerHeader,
+  DrawerFooter,
+  DrawerTitle,
+  DrawerDescription,
+}

From 91ad3189f299dc6ff12ec34b61ffcdb274419056 Mon Sep 17 00:00:00 2001
From: samlhuillier <sam.jansa123@gmail.com>
Date: Sun, 29 Sep 2024 11:50:32 +0100
Subject: [PATCH 3/4] change settings icon

---
 src/components/Chat/StartChat.tsx | 39 +++++++++++++++++--------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/components/Chat/StartChat.tsx b/src/components/Chat/StartChat.tsx
index 48ec9531..50b77eea 100644
--- a/src/components/Chat/StartChat.tsx
+++ b/src/components/Chat/StartChat.tsx
@@ -1,5 +1,6 @@
 import React, { useCallback, useEffect, useState } from 'react'
 import { PiPaperPlaneRight } from 'react-icons/pi'
+import { FiSettings } from 'react-icons/fi'
 import { LLMConfig } from 'electron/main/electron-store/storeConfig'
 import '../../styles/chat.css'
 import { AgentConfig, ToolDefinition, DatabaseSearchFilters } from './types'
@@ -85,9 +86,6 @@ const StartChat: React.FC<StartChatProps> = ({ defaultModelName, handleNewChatMe
           }
         : undefined,
     }))
-    if (checked) {
-      setIsDrawerOpen(true)
-    }
   }
 
   return (
@@ -167,21 +165,28 @@ const StartChat: React.FC<StartChatProps> = ({ defaultModelName, handleNewChatMe
                 onToolsChange={handleToolsChange}
               />
 
-              <div className="flex items-center space-x-2">
-                <Switch
-                  id="db-search-toggle"
-                  checked={!!agentConfig.dbSearchFilters}
-                  onCheckedChange={handleDbSearchToggle}
-                />
-                <Label htmlFor="db-search-toggle" className="text-sm text-muted-foreground">
-                  Include initial database search in context
-                </Label>
-              </div>
-
               <Drawer open={isDrawerOpen} onOpenChange={setIsDrawerOpen}>
-                <DrawerTrigger asChild>
-                  <Button disabled={!agentConfig.dbSearchFilters}>Configure DB Search</Button>
-                </DrawerTrigger>
+                <div className="flex items-center space-x-2">
+                  <Switch
+                    id="db-search-toggle"
+                    checked={!!agentConfig.dbSearchFilters}
+                    onCheckedChange={handleDbSearchToggle}
+                  />
+                  <Label htmlFor="db-search-toggle" className="text-sm text-muted-foreground">
+                    Include initial database search in context
+                  </Label>
+                  <DrawerTrigger asChild>
+                    <Button
+                      variant="secondary"
+                      size="icon"
+                      className="size-8 rounded-full"
+                      disabled={!agentConfig.dbSearchFilters}
+                    >
+                      <FiSettings className="size-4" />
+                      <span className="sr-only">Open DB search settings</span>
+                    </Button>
+                  </DrawerTrigger>
+                </div>
                 <DrawerContent>
                   <DrawerHeader>
                     <DrawerTitle>Database Search Filters</DrawerTitle>

From 37851a3f8d02e527486d6d33f934f1f93434d69f Mon Sep 17 00:00:00 2001
From: samlhuillier <sam.jansa123@gmail.com>
Date: Mon, 30 Sep 2024 20:49:54 +0100
Subject: [PATCH 4/4] move prompt editor to main settings of chat

---
 package-lock.json                             | 11 ++-
 package.json                                  |  2 +
 .../ChatConfigComponents/PromptEditor.tsx     | 71 ++++++++++---------
 .../ChatConfigComponents/exampleAgents.ts     |  5 --
 src/components/Chat/StartChat.tsx             | 13 ++--
 src/components/Chat/tools.ts                  |  2 +-
 src/components/Common/MarkdownRenderer.tsx    |  5 +-
 .../LLMSettings/modals/NewOllamaModel.tsx     |  4 +-
 8 files changed, 67 insertions(+), 46 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ffcd4d0e..d4fc75df 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -71,6 +71,7 @@
         "katex": "^0.16.10",
         "langchain": "^0.1.5",
         "lit": "^3.0.0",
+        "lodash": "^4.17.21",
         "lodash.debounce": "^4.0.8",
         "lucide-react": "^0.435.0",
         "marked": "^12.0.1",
@@ -110,6 +111,7 @@
         "@electron/notarize": "2.3.2",
         "@playwright/test": "^1.37.1",
         "@types/jest": "^29.5.11",
+        "@types/lodash": "^4.17.9",
         "@types/react": "^18.2.20",
         "@types/react-dom": "^18.2.7",
         "@types/react-window": "^1.8.8",
@@ -5529,6 +5531,12 @@
       "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.5.tgz",
       "integrity": "sha512-yg6E+u0/+Zjva+buc3EIb+29XEg4wltq7cSmd4Uc2EE/1nUVmxyzpX6gUXD0V8jIrG0r7YeOGVIbYRkxeooCtw=="
     },
+    "node_modules/@types/lodash": {
+      "version": "4.17.9",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.9.tgz",
+      "integrity": "sha512-w9iWudx1XWOHW5lQRS9iKpK/XuRhnN+0T7HvdCCd802FYkT1AMTnxndJHGrNJwRoRHkslGr4S29tjm1cT7x/7w==",
+      "dev": true
+    },
     "node_modules/@types/long": {
       "version": "4.0.2",
       "license": "MIT"
@@ -14730,7 +14738,8 @@
     },
     "node_modules/lodash": {
       "version": "4.17.21",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "node_modules/lodash.assignwith": {
       "version": "4.2.0",
diff --git a/package.json b/package.json
index 030f6cfc..6a29c7b8 100644
--- a/package.json
+++ b/package.json
@@ -90,6 +90,7 @@
     "katex": "^0.16.10",
     "langchain": "^0.1.5",
     "lit": "^3.0.0",
+    "lodash": "^4.17.21",
     "lodash.debounce": "^4.0.8",
     "lucide-react": "^0.435.0",
     "marked": "^12.0.1",
@@ -129,6 +130,7 @@
     "@electron/notarize": "2.3.2",
     "@playwright/test": "^1.37.1",
     "@types/jest": "^29.5.11",
+    "@types/lodash": "^4.17.9",
     "@types/react": "^18.2.20",
     "@types/react-dom": "^18.2.7",
     "@types/react-window": "^1.8.8",
diff --git a/src/components/Chat/ChatConfigComponents/PromptEditor.tsx b/src/components/Chat/ChatConfigComponents/PromptEditor.tsx
index aaf926d1..1d7530c1 100644
--- a/src/components/Chat/ChatConfigComponents/PromptEditor.tsx
+++ b/src/components/Chat/ChatConfigComponents/PromptEditor.tsx
@@ -1,10 +1,9 @@
-import React, { useState } from 'react'
+import React, { useState, useEffect, useCallback } from 'react'
+import { debounce } from 'lodash'
 import { PromptTemplate } from '../types'
-import { DialogContent, DialogHeader, DialogTitle, DialogDescription, DialogFooter } from '@/components/ui/dialog'
 import { Label } from '@/components/ui/label'
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
 import { Textarea } from '@/components/ui/textarea'
-import { Button } from '@/components/ui/button'
 
 const PromptEditor: React.FC<{
   promptTemplate: PromptTemplate
@@ -12,20 +11,42 @@ const PromptEditor: React.FC<{
 }> = ({ promptTemplate, onSave }) => {
   const [editedPrompt, setEditedPrompt] = useState<PromptTemplate>(promptTemplate)
 
-  const handleSave = () => {
-    onSave(editedPrompt)
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  const debouncedSave = useCallback(
+    debounce((newPromptTemplate: PromptTemplate) => {
+      onSave(newPromptTemplate)
+    }, 500),
+    [onSave],
+  )
+
+  useEffect(() => {
+    debouncedSave(editedPrompt)
+  }, [editedPrompt, debouncedSave])
+
+  const updateRole = (index: number, newRole: 'system' | 'user') => {
+    setEditedPrompt((prevPrompt) => {
+      const updatedPrompt = [...prevPrompt]
+      updatedPrompt[index] = { ...updatedPrompt[index], role: newRole }
+      return updatedPrompt
+    })
+  }
+
+  const updateContent = (index: number, newContent: string) => {
+    setEditedPrompt((prevPrompt) => {
+      const updatedPrompt = [...prevPrompt]
+      updatedPrompt[index] = { ...updatedPrompt[index], content: newContent }
+      return updatedPrompt
+    })
   }
 
   return (
-    <DialogContent className="w-full max-w-4xl bg-background text-foreground">
-      <DialogHeader>
-        <DialogTitle className="text-foreground">Edit Prompt Template</DialogTitle>
-        <DialogDescription className="text-foreground">
-          Customize the prompt template for your AI assistant. Use the variables {`{QUERY}`} and {`{CONTEXT}`} to
-          reference the user&apos;s query and the context searched (if you toggle the &quot;make initial search&quot;
-          option in settings).
-        </DialogDescription>
-      </DialogHeader>
+    <div className="w-full max-w-4xl bg-background text-foreground">
+      <h3 className="text-foreground">Edit Prompt Template</h3>
+      <p className="text-muted-foreground">
+        Customize the prompt template for your AI assistant. Use the variables {`{QUERY}`} and {`{CONTEXT}`} to
+        reference the user&apos;s query and the context searched (if you toggle the &quot;make initial search&quot;
+        option in settings).
+      </p>
       <div className="grid gap-6 py-4">
         {editedPrompt.map((prompt, index) => (
           // eslint-disable-next-line react/no-array-index-key
@@ -34,14 +55,7 @@ const PromptEditor: React.FC<{
               <Label htmlFor={`role-${index}`} className="w-20 text-foreground">
                 Role
               </Label>
-              <Select
-                value={prompt.role}
-                onValueChange={(value) =>
-                  setEditedPrompt(
-                    editedPrompt.map((p, i) => (i === index ? { ...p, role: value as 'system' | 'user' } : p)),
-                  )
-                }
-              >
+              <Select value={prompt.role} onValueChange={(value: 'system' | 'user') => updateRole(index, value)}>
                 <SelectTrigger className="w-full border-input bg-background text-foreground">
                   <SelectValue placeholder="Select role" />
                 </SelectTrigger>
@@ -58,21 +72,14 @@ const PromptEditor: React.FC<{
               <Textarea
                 id={`content-${index}`}
                 value={prompt.content}
-                onChange={(e) =>
-                  setEditedPrompt(editedPrompt.map((p, i) => (i === index ? { ...p, content: e.target.value } : p)))
-                }
-                className="h-64 flex-1 border border-solid border-input bg-background text-muted-foreground"
+                onChange={(e) => updateContent(index, e.target.value)}
+                className="h-64 flex-1 border border-solid border-input bg-background text-sm text-muted-foreground"
               />
             </div>
           </div>
         ))}
       </div>
-      <DialogFooter>
-        <Button type="submit" onClick={handleSave} className="bg-primary text-primary-foreground hover:bg-primary/90">
-          Done
-        </Button>
-      </DialogFooter>
-    </DialogContent>
+    </div>
   )
 }
 
diff --git a/src/components/Chat/ChatConfigComponents/exampleAgents.ts b/src/components/Chat/ChatConfigComponents/exampleAgents.ts
index 7dc6cda0..6ff3bf02 100644
--- a/src/components/Chat/ChatConfigComponents/exampleAgents.ts
+++ b/src/components/Chat/ChatConfigComponents/exampleAgents.ts
@@ -61,11 +61,6 @@ const reasoningAgentPromptTemplate: PromptTemplate = [
 const exampleAgents: AgentConfig[] = [
   {
     files: [],
-    dbSearchFilters: {
-      limit: 15,
-      minDate: undefined,
-      maxDate: undefined,
-    },
     name: 'Default',
     toolDefinitions: [searchToolDefinition, createNoteToolDefinition],
     promptTemplate: defaultAgentPromptTemplate,
diff --git a/src/components/Chat/StartChat.tsx b/src/components/Chat/StartChat.tsx
index 50b77eea..c301ff73 100644
--- a/src/components/Chat/StartChat.tsx
+++ b/src/components/Chat/StartChat.tsx
@@ -8,7 +8,6 @@ import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@
 import { Card, CardDescription } from '../ui/card'
 import { allAvailableToolDefinitions } from './tools'
 import { Button } from '@/components/ui/button'
-import { Dialog, DialogContent, DialogTrigger } from '@/components/ui/dialog'
 import { Switch } from '@/components/ui/switch'
 import { Label } from '@/components/ui/label'
 import DbSearchFilters from './ChatConfigComponents/DBSearchFilters'
@@ -89,7 +88,7 @@ const StartChat: React.FC<StartChatProps> = ({ defaultModelName, handleNewChatMe
   }
 
   return (
-    <div className="relative flex w-full flex-col items-center">
+    <div className="relative flex w-full flex-col items-center overflow-y-auto">
       <div className="relative flex w-full flex-col text-center lg:top-10 lg:max-w-2xl">
         <div className="flex w-full justify-center">
           <img src="icon.png" style={{ width: '64px', height: '64px' }} alt="ReorImage" />
@@ -145,7 +144,13 @@ const StartChat: React.FC<StartChatProps> = ({ defaultModelName, handleNewChatMe
 
           <div className="mx-auto w-[96%] rounded-b border border-solid border-border bg-background px-4 py-2">
             <div className="space-y-4">
-              <Dialog>
+              <PromptEditor
+                promptTemplate={agentConfig.promptTemplate}
+                onSave={(newPromptTemplate) => {
+                  setAgentConfig((prevConfig) => ({ ...prevConfig, promptTemplate: newPromptTemplate }))
+                }}
+              />
+              {/* <Dialog>
                 <DialogTrigger asChild>
                   <Button>Edit Prompt</Button>
                 </DialogTrigger>
@@ -157,7 +162,7 @@ const StartChat: React.FC<StartChatProps> = ({ defaultModelName, handleNewChatMe
                     }}
                   />
                 </DialogContent>
-              </Dialog>
+              </Dialog> */}
 
               <ToolSelector
                 allTools={allAvailableToolDefinitions}
diff --git a/src/components/Chat/tools.ts b/src/components/Chat/tools.ts
index 63fa2a00..6e4da5bc 100644
--- a/src/components/Chat/tools.ts
+++ b/src/components/Chat/tools.ts
@@ -15,7 +15,7 @@ export const searchToolDefinition: ToolDefinition = {
     {
       name: 'limit',
       type: 'number',
-      defaultValue: 10,
+      defaultValue: 20,
       description: 'The number of results to return',
     },
   ],
diff --git a/src/components/Common/MarkdownRenderer.tsx b/src/components/Common/MarkdownRenderer.tsx
index 8b77983d..95f65a6c 100644
--- a/src/components/Common/MarkdownRenderer.tsx
+++ b/src/components/Common/MarkdownRenderer.tsx
@@ -8,7 +8,10 @@ interface MarkdownRendererProps {
 
 const MarkdownRenderer: React.FC<MarkdownRendererProps> = ({ content }) => {
   return (
-    <ReactMarkdown className="overflow-hidden whitespace-normal break-words" rehypePlugins={[rehypeRaw]}>
+    <ReactMarkdown
+      className="overflow-hidden whitespace-normal break-words text-muted-foreground"
+      rehypePlugins={[rehypeRaw]}
+    >
       {content}
     </ReactMarkdown>
   )
diff --git a/src/components/Settings/LLMSettings/modals/NewOllamaModel.tsx b/src/components/Settings/LLMSettings/modals/NewOllamaModel.tsx
index e8196124..c61ff73d 100644
--- a/src/components/Settings/LLMSettings/modals/NewOllamaModel.tsx
+++ b/src/components/Settings/LLMSettings/modals/NewOllamaModel.tsx
@@ -90,9 +90,9 @@ const NewOllamaModelModal: React.FC<NewOllamaModelModalProps> = ({ isOpen, onClo
           className=" mt-1 box-border block w-full rounded-md border border-gray-300 px-3 py-2 transition duration-150 ease-in-out focus:border-blue-300 focus:outline-none"
           value={modelNameBeingInputted}
           onChange={(e) => setModelNameBeingInputted(e.target.value)}
-          placeholder="mistral"
+          placeholder="llama3.2"
         />
-        <p className="my-2 text-xs italic text-white"> We recommended either mistral, llama3, or phi3.</p>
+        <p className="my-2 text-xs italic text-white"> We recommended either nemotron-mini, llama3.2, or qwen2.5.</p>
 
         <div className="flex justify-end pb-2">
           <Button