feat: Improve Prompts

cameronrye · cameronrye · commit 0f5541067fcd · 2026-01-04T11:49:52.000-05:00
diff --git a/apple/Clarissa/Sources/Agent/Agent.swift b/apple/Clarissa/Sources/Agent/Agent.swift
@@ -171,46 +171,33 @@ public final class Agent: ObservableObject {
     /// - Explicit negative rules to avoid unnecessary tool use
     /// Community insights: "Instructions in English work best", "Use CAPS for critical rules"
     private func buildSystemPrompt() async -> String {
-        // Keep prompt concise (~600 chars = ~150 tokens) to maximize context for conversation
+        // Format current date/time for relative date understanding
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateFormat = "EEEE, MMMM d, yyyy 'at' h:mm a"
+        let currentTime = dateFormatter.string(from: Date())
+
+        // Keep prompt concise to maximize context for conversation
+        // Optimized based on Foundation Models community insights
         var prompt = """
-        You are Clarissa, an iOS assistant.
-
-        ALWAYS USE TOOLS FOR:
-        - Weather/temperature/forecast/rain/hot/cold -> weather tool
-        - Math/calculate/percent/tip/convert -> calculator tool
-        - Schedule/meeting/event/calendar/what's on -> calendar tool
-        - Remind me/task/to-do/don't forget/list reminders -> reminders tool
-        - Phone number/email/contact/call/text -> contacts tool
-        - Where am I/my location/current location -> location tool
-        - Remember that/remember I/my preference/I like -> remember tool
-        - URL/webpage/fetch/read page/get content -> web_fetch tool
-        - Image file URL (file://) needs analysis -> image_analysis tool
-        - PDF file URL (file://) needs reading -> image_analysis tool (pdf_extract_text or pdf_ocr)
-
-        ANSWER DIRECTLY (no tools):
-        - Message contains "[Image Analysis]" -> USE the provided OCR text and classifications to respond
-        - Date/time/day -> answer from your knowledge
-        - General knowledge -> answer directly
-        - Opinions/advice -> respond conversationally
-        - Greetings/chat -> respond naturally
+        You are Clarissa, a personal assistant. Be warm but concise.
+        Current time: \(currentTime)
+
+        TOOLS: weather(location?), calculator(expression), calendar(action,title?,date?), reminders(action,title?), contacts(query), location(), remember(content), web_fetch(url), image_analysis(file_url)
+
+        USE TOOLS for: weather, math, calendar, reminders, contacts, location, saving facts, fetching URLs, analyzing images/PDFs
+        ANSWER DIRECTLY for: "[Image Analysis]" in message (use provided OCR/classifications), date/time questions, general knowledge, opinions, greetings
 
         EXAMPLES:
-        "Weather?" -> weather (no params = current location)
         "Weather in Paris" -> weather(location="Paris")
-        "What's 20% of 85?" -> calculator(expression="85 * 0.20")
-        "Meeting tomorrow 2pm" -> calendar(action=create, title, startDate)
-        "What's on my calendar?" -> calendar(action=list)
-        "Remind me to call Bob" -> reminders(action=create, title="Call Bob")
-        "Show my reminders" -> reminders(action=list)
-        "What's John's phone number?" -> contacts(action=search, query="John")
-        "Fetch example.com" -> web_fetch(url="https://example.com")
-        User: "Analyze this image [Image Analysis] Text: Hello World Contains: sign" -> "This image shows a sign with the text 'Hello World'."
-
-        RESPONSE RULES:
-        - Be brief (1-2 sentences)
+        "What's 20% of 85?" -> calculator(expression="85*0.20")
+        "Meeting tomorrow 2pm" -> calendar(action=create,title,startDate)
+
+        RULES:
+        - Brief responses (1-2 sentences)
         - State result, not process
+        - If request is ambiguous, ask one clarifying question before using tools
         - If tool fails, explain and suggest alternative
-        - If user asks about saved facts (name, preferences), answer from Saved Facts section
+        - Use saved facts when user asks about their name/preferences
         """
 
         // Add disabled tools section so AI can inform user about features that can be enabled
@@ -380,7 +367,7 @@ public final class Agent: ObservableObject {
             // The LLM session has already executed tools and incorporated results
             if nativeToolHandling {
                 ClarissaLogger.agent.info("Agent run completed (native tool handling)")
-                let finalContent = Self.applyRefusalFallback(fullContent)
+                let finalContent = Self.applyRefusalFallback(fullContent, userMessage: userMessage)
                 callbacks?.onResponse(content: finalContent)
                 return finalContent
             }
@@ -413,7 +400,7 @@ public final class Agent: ObservableObject {
 
             // No tool calls - final response
             ClarissaLogger.agent.info("Agent run completed with response")
-            let finalContent = Self.applyRefusalFallback(fullContent)
+            let finalContent = Self.applyRefusalFallback(fullContent, userMessage: userMessage)
             callbacks?.onResponse(content: finalContent)
             return finalContent
         }
@@ -442,19 +429,39 @@ public final class Agent: ObservableObject {
         "i'm sorry, but i can't"
     ]
 
-    /// Friendly redirect message when model refuses
-    private static let refusalFallback = """
-        I'm best at helping with tasks like checking your calendar, setting reminders, getting weather updates, and doing calculations. What can I help you with?
-        """
+    /// Context-aware suggestions based on what the user was trying to do
+    private static func getRefusalSuggestion(for userMessage: String) -> String {
+        let lowercased = userMessage.lowercased()
+
+        // Detect intent and suggest relevant alternatives
+        if lowercased.contains("weather") || lowercased.contains("temperature") || lowercased.contains("forecast") {
+            return "I can check the weather for you. Try asking \"What's the weather in [city]?\" or just \"Weather?\""
+        }
+        if lowercased.contains("remind") || lowercased.contains("reminder") || lowercased.contains("task") {
+            return "I can help with reminders. Try \"Remind me to [task]\" or \"Show my reminders\"."
+        }
+        if lowercased.contains("calendar") || lowercased.contains("meeting") || lowercased.contains("schedule") || lowercased.contains("event") {
+            return "I can help with your calendar. Try \"What's on my calendar?\" or \"Schedule a meeting\"."
+        }
+        if lowercased.contains("calculate") || lowercased.contains("math") || lowercased.contains("%") || lowercased.contains("tip") {
+            return "I can do calculations. Try \"What's 20% of 85?\" or \"Calculate 15 + 27\"."
+        }
+        if lowercased.contains("contact") || lowercased.contains("phone") || lowercased.contains("email") || lowercased.contains("call") {
+            return "I can look up contacts. Try \"What's [name]'s phone number?\" or \"Find [name]'s email\"."
+        }
+
+        // Default fallback
+        return "I'm best at helping with your calendar, reminders, weather, calculations, and contacts. What can I help you with?"
+    }
 
-    /// Check if a response is a refusal and provide a helpful redirect if so
-    private static func applyRefusalFallback(_ content: String) -> String {
+    /// Check if a response is a refusal and provide a context-aware redirect if so
+    private static func applyRefusalFallback(_ content: String, userMessage: String) -> String {
         let lowercased = content.lowercased()
 
         for phrase in refusalPhrases {
             if lowercased.contains(phrase) {
-                ClarissaLogger.agent.info("Detected refusal response, applying fallback")
-                return refusalFallback
+                ClarissaLogger.agent.info("Detected refusal response, applying context-aware fallback")
+                return getRefusalSuggestion(for: userMessage)
             }
         }
 
diff --git a/apple/Clarissa/Sources/LLM/PromptEnhancer.swift b/apple/Clarissa/Sources/LLM/PromptEnhancer.swift
@@ -1,28 +1,14 @@
 import Foundation
 
 /// System prompt for the prompt enhancement feature.
-/// Optimized for Apple's on-device model - focuses on clarity for tool execution.
-/// Keeps prompts short and direct rather than making them verbose.
+/// Optimized for Apple's on-device model - uses examples only, no redundant rules.
+/// The instruction and examples are sufficient for the model to understand the task.
 private let enhancementSystemPrompt = """
-Rewrite the user's request to be clearer. Output ONLY the rewritten text.
+Rewrite to be clearer. Output ONLY the rewritten text.
 
-Example:
-User: "weather"
-Output: "What's the weather right now?"
-
-Example:
-User: "remind me about the thing tomorrow"
-Output: "Set a reminder for tomorrow"
-
-Example:
-User: "whats 15% of 50 dolars"
-Output: "What's 15% of $50?"
-
-Rules:
-- Keep it short and direct
-- Fix typos and grammar
-- Add missing context (like "current" for weather)
-- Output ONLY the improved text
+"weather" -> "What's the weather right now?"
+"remind me about the thing tomorrow" -> "Set a reminder for tomorrow"
+"whats 15% of 50 dolars" -> "What's 15% of $50?"
 """
 
 /// Keywords that indicate the prompt is already clear enough for tool use
diff --git a/apple/Clarissa/Sources/Persistence/MemoryManager.swift b/apple/Clarissa/Sources/Persistence/MemoryManager.swift
@@ -208,6 +208,7 @@ public actor MemoryManager {
 
     /// Get memories formatted for the system prompt
     /// Includes topic tags when available for better context
+    /// Optimized for token efficiency while maintaining clarity
     func getForPrompt() async -> String? {
         await ensureLoaded()
 
@@ -221,21 +222,17 @@ public actor MemoryManager {
         let memoryList = recentMemories.map { memory -> String in
             if let topics = memory.topics, !topics.isEmpty {
                 let topicStr = topics.joined(separator: ", ")
-                return "- \(memory.content) [topics: \(topicStr)]"
+                return "- \(memory.content) [\(topicStr)]"
             }
             return "- \(memory.content)"
         }.joined(separator: "\n")
 
         logger.info("getForPrompt: Including \(recentMemories.count) memories in system prompt")
 
+        // Concise format - the system prompt already instructs to use saved facts
         return """
-        ## Saved Facts About This User
-
+        USER FACTS:
         \(memoryList)
-
-        IMPORTANT: When the user asks about their name, preferences, or anything in the saved facts above, respond using this information directly. For example:
-        - "Say my name" or "What's my name?" -> Answer with their name from saved facts
-        - "What do you know about me?" -> List the saved facts
         """
     }
 
diff --git a/apple/Clarissa/Sources/Tools/CalculatorTool.swift b/apple/Clarissa/Sources/Tools/CalculatorTool.swift
@@ -316,11 +316,16 @@ final class CalculatorTool: ClarissaTool, @unchecked Sendable {
 	            if computedValue.isNaN {
 	                throw ToolError.executionFailed("Expression '\(name)(\(argString))' resulted in an undefined value (NaN).")
 	            }
+	            // Allow infinity as a valid result - expressions like log(0) should return -Infinity
+	            // Format infinity as a string representation to avoid NSExpression issues
+	            let replacement: String
 	            if computedValue.isInfinite {
-	                throw ToolError.executionFailed("Expression '\(name)(\(argString))' resulted in a value too large to represent.")
+	                replacement = computedValue > 0 ? "Infinity" : "-Infinity"
+	            } else {
+	                replacement = "\(computedValue)"
 	            }
-	
-	            result.replaceSubrange(fullRange, with: "\(computedValue)")
+
+	            result.replaceSubrange(fullRange, with: replacement)
 	        }
 
         return result
diff --git a/apple/Clarissa/Sources/UI/SettingsView.swift b/apple/Clarissa/Sources/UI/SettingsView.swift
@@ -245,6 +245,10 @@ public struct SettingsView: View {
                         }
                     }
 
+                    if !hasHighQualityVoices {
+                        VoiceDownloadPromptView()
+                    }
+
                     VStack(alignment: .leading, spacing: 8) {
                         HStack {
                             Text("Speech Rate")
@@ -275,12 +279,7 @@ public struct SettingsView: View {
             } header: {
                 Text("Voice Output")
             } footer: {
-                VStack(alignment: .leading, spacing: 8) {
-                    Text("When enabled, Clarissa will speak responses aloud in voice mode.")
-                    if voiceOutputEnabled {
-                        Text("Premium and Enhanced voices provide the best quality. Download more in System Settings -> Accessibility -> Spoken Content -> System Voices.")
-                    }
-                }
+                Text("When enabled, Clarissa will speak responses aloud in voice mode.")
             }
         }
         .formStyle(.grouped)
@@ -495,6 +494,10 @@ public struct SettingsView: View {
                             }
                         }
 
+                        if !hasHighQualityVoices {
+                            VoiceDownloadPromptView()
+                        }
+
                         VStack(alignment: .leading, spacing: 8) {
                             HStack {
                                 Text("Speech Rate")
@@ -525,12 +528,7 @@ public struct SettingsView: View {
                 } header: {
                     Text("Voice")
                 } footer: {
-                    VStack(alignment: .leading, spacing: 8) {
-                        Text("When enabled, Clarissa will speak responses aloud in voice mode.")
-                        if voiceOutputEnabled {
-                            Text("Premium and Enhanced voices provide the best quality. Download more in Settings -> Accessibility -> Spoken Content -> Voices.")
-                        }
-                    }
+                    Text("When enabled, Clarissa will speak responses aloud in voice mode.")
                 }
 
                 Section {
@@ -656,6 +654,13 @@ public struct SettingsView: View {
         }
     }
 
+    /// Check if any Premium or Enhanced voices are available
+    private var hasHighQualityVoices: Bool {
+        availableVoices.contains { voice in
+            voice.quality == .premium || voice.quality == .enhanced
+        }
+    }
+
     private func testVoice() {
         voiceTester.testVoice(rate: speechRate, voiceIdentifier: selectedVoiceIdentifier)
     }
@@ -970,6 +975,55 @@ struct MemorySettingsView: View {
     }
 }
 
+// MARK: - Voice Download Prompt
+
+/// View shown when no Premium or Enhanced voices are installed
+/// Provides helpful guidance and a deep link to system settings
+private struct VoiceDownloadPromptView: View {
+    var body: some View {
+        VStack(alignment: .leading, spacing: 12) {
+            HStack(spacing: 8) {
+                Image(systemName: "exclamationmark.triangle.fill")
+                    .foregroundStyle(.orange)
+                Text("No High-Quality Voices")
+                    .font(.subheadline.weight(.semibold))
+            }
+
+            Text("For the best experience, download Premium or Enhanced voices from System Settings.")
+                .font(.caption)
+                .foregroundStyle(.secondary)
+
+            #if os(iOS)
+            Button {
+                // Deep link to Accessibility settings
+                // iOS 26: Settings > Accessibility > Read & Speak > Voices
+                if let url = URL(string: "App-prefs:ACCESSIBILITY") {
+                    UIApplication.shared.open(url)
+                }
+            } label: {
+                HStack(spacing: 4) {
+                    Text("Open Accessibility Settings")
+                    Image(systemName: "arrow.up.forward.app")
+                }
+                .font(.caption.weight(.medium))
+            }
+            .buttonStyle(.borderedProminent)
+            .tint(ClarissaTheme.purple)
+            .controlSize(.small)
+
+            Text("Go to: Read & Speak > Voices")
+                .font(.caption2)
+                .foregroundStyle(.tertiary)
+            #else
+            Text("Open System Settings > Accessibility > Spoken Content > System Voices")
+                .font(.caption)
+                .foregroundStyle(.tertiary)
+            #endif
+        }
+        .padding(.vertical, 8)
+    }
+}
+
 // MARK: - Voice Tester Helper
 
 /// Helper class for testing voice settings with proper delegate handling
diff --git a/apple/Clarissa/Sources/Voice/SpeechSynthesizer.swift b/apple/Clarissa/Sources/Voice/SpeechSynthesizer.swift
diff --git a/shared/prompts/system.json b/shared/prompts/system.json

Original file line number	Diff line number	Diff line change
`@@ -316,11 +316,16 @@ final class CalculatorTool: ClarissaTool, @unchecked Sendable {`
`316`	`316`	`if computedValue.isNaN {`
`317`	`317`	`throw ToolError.executionFailed("Expression '\(name)(\(argString))' resulted in an undefined value (NaN).")`
`318`	`318`	`}`
	`319`	`+ // Allow infinity as a valid result - expressions like log(0) should return -Infinity`
	`320`	`+ // Format infinity as a string representation to avoid NSExpression issues`
	`321`	`+ let replacement: String`
`319`	`322`	`if computedValue.isInfinite {`
`320`		`- throw ToolError.executionFailed("Expression '\(name)(\(argString))' resulted in a value too large to represent.")`
	`323`	`+ replacement = computedValue > 0 ? "Infinity" : "-Infinity"`
	`324`	`+ } else {`
	`325`	`+ replacement = "\(computedValue)"`
`321`	`326`	`}`
`322`		`-`
`323`		`- result.replaceSubrange(fullRange, with: "\(computedValue)")`
	`327`	`+`
	`328`	`+ result.replaceSubrange(fullRange, with: replacement)`
`324`	`329`	`}`
`325`	`330`
`326`	`331`	`return result`