updates fetching the user context and also properly adds it to the system template

Author: steven-mpawulo

apps/desktop/src/components/editor-area/index.tsx

@@ -29,17 +29,17 @@ import { FloatingButton } from "./floating-button";
 import { NoteHeader } from "./note-header";
 import { TextSelectionPopover } from "./text-selection-popover";
 
-const getUserContext = async (): Promise<{ value: string } | null> => {
+const getUserContext = async (): Promise<string | null> => {
   try {
-    const store = await load("store.json", { autoSave: false })
-    const val = await store.get("user_context")
-    if (val && typeof val === "object" && "value" in val) {
-      return val as { value: string }
+    const store = await load("store.json", { autoSave: false });
+    const val = await store.get("user_context");
+    if (val && typeof val === "object" && "value" in val && typeof (val as any).value === "string") {
+      return (val as { value: string }).value;
     }
-    return null
+    return null;
   } catch (error) {
-    console.error("Failed to fetch user context", error)
-    return null
+    console.error("Failed to fetch user context", error);
+    return null;
   }
 }
 
@@ -466,7 +466,7 @@ export function useEnhanceMutation({
 
       let customInstruction = selectedTemplate?.description;
 
-      let userContext = await getUserContext() || "";
+      const userContext = (await getUserContext()) ?? "";
 
       const systemMessage = await templateCommands.render(
         "enhance.system",

crates/template/assets/enhance.system.jinja

@@ -56,20 +56,22 @@ You will be given multiple inputs from the user. Below are useful information th
 - Meeting Information (txt)
 - Raw Note (txt)
 - Meeting Transcript (txt)
+- User Context (txt)
+
+-The User Context contains important background details about the user, such as their role, company, ongoing projects, style/tone preferences, and domain terminology.
+-You must always take this into account when generating enhanced notes to make them more relevant and personalized.
+
+{% if userContext %}
+Here is the User Context:
+{{ userContext | trim }}
+{% endif %}
 
 # About Raw Notes
 
 - Raw Notes is what user purely wrote during the meeting.
 - The beginning of a raw note may include agenda items, discussion topics, and preliminary questions.
 - Primarily consist of key phrases or sentences the user wants to remember, though they may also contain random or extraneous words.
 - May sometimes be empty.
-- User Context (txt)
-
-The User Context contains important background details about the user, such as their role, company, ongoing projects, style/tone preferences, and domain terminology.
-You must always take this into account when generating enhanced notes to make them more relevant and personalized.
-
-Here is the User Context:
-{{ userContext}}
 
 # Enhanced Note Format