fix: some cancer

Author: Atharva Vaidya

Sources/CompilerSwiftAI/Model Calling/ChatHistory.swift

@@ -28,28 +28,28 @@ actor ChatHistory {
     }
 
     init(systemPrompt: String) {
-        self._messages = [Message(role: .system, content: [.text(systemPrompt)])]
+        self._messages = [Message(role: .system, content: systemPrompt)]
     }
 
     func notifyMessageUpdate() {
         continuation?.yield(_messages)
     }
 
     func addUserMessage(_ content: String) {
-        _messages.append(Message(role: .user, content: [.text(content)]))
+        _messages.append(Message(role: .user, content: content))
         notifyMessageUpdate()
     }
 
     func addAssistantMessage(_ content: String) {
-        _messages.append(Message(role: .assistant, content: [.text(content)]))
+        _messages.append(Message(role: .assistant, content: content))
         notifyMessageUpdate()
     }
 
     /// Start a new streaming response from the assistant
     @discardableResult
     func beginStreamingResponse() -> UUID {
         let id = UUID()
-        let msg = Message(id: id, role: .assistant, content: [.text("")], state: .streaming(""))
+        let msg = Message(id: id, role: .assistant, content: "", state: .streaming(""))
         _messages.append(msg)
         messageID = id
         notifyMessageUpdate()
@@ -66,7 +66,7 @@ actor ChatHistory {
         _messages[idx] = Message(
             id: old.id,
             role: old.role,
-            content: [.text(partial)],
+            content: partial,
             state: .streaming(partial)
         )
         notifyMessageUpdate()
@@ -81,7 +81,7 @@ actor ChatHistory {
         _messages[idx] = Message(
             id: id,
             role: .assistant,
-            content: [.text(finalContent)],
+            content: finalContent,
             state: .complete
         )
         messageID = nil

Sources/CompilerSwiftAI/Model Calling/CompilerClient+Streaming.swift

@@ -35,11 +35,11 @@ extension CompilerClient {
            let lastUserMessageIndex = messages.lastIndex(where: { $0.role == .user }) {
             var modifiedMessages = messages
             let lastUserMessage = modifiedMessages[lastUserMessageIndex]
-            let stateContent = "\(lastUserMessage.apiContent)\n\nThe current app state is: \(state)"
+            let stateContent = "\(lastUserMessage.content)\n\nThe current app state is: \(state)"
             modifiedMessages[lastUserMessageIndex] = Message(
                 id: lastUserMessage.id,
                 role: .user,
-                content: [.text(stateContent)]
+                content: stateContent
             )
             finalMessages = modifiedMessages
         } else {
@@ -155,14 +155,14 @@ extension CompilerClient {
                         state: state
                     )
 
-                    var streamingMessage = Message(role: .assistant, content: [.text("")])
+                    var streamingMessage = Message(role: .assistant, content: "")
                     continuation.yield(streamingMessage)
 
                     for try await chunk in stream {
                         streamingMessage = Message(
                             id: streamingMessage.id,
                             role: .assistant,
-                            content: [.text(streamingMessage.apiContent + chunk)]
+                            content: streamingMessage.content + chunk
                         )
                         continuation.yield(streamingMessage)
                     }

Sources/CompilerSwiftAI/Model Calling/Message.swift

@@ -4,29 +4,10 @@ import Combine
 import SwiftUI
 
 struct Message: Codable, Sendable, Identifiable, Equatable {
-    let id: UUID
-    let role: Role
-    let content: [Content]
-    var state: MessageState
-    
     private enum CodingKeys: String, CodingKey {
         case role, content
     }
 
-    init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        self.id = UUID()  // Generate new UUID on decode since we don't send it
-        self.role = try container.decode(Role.self, forKey: .role)
-        self.content = try container.decode([Content].self, forKey: .content)
-        self.state = .complete  // Default to complete state when decoding
-    }
-    
-    func encode(to encoder: Encoder) throws {
-        var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encode(role, forKey: .role)
-        try container.encode(content, forKey: .content)
-    }
-    
     enum Role: String, Codable, Sendable {
         case system
         case user
@@ -98,26 +79,31 @@ struct Message: Codable, Sendable, Identifiable, Equatable {
         }
     }
 
-    init(role: Role, text: String) {
-        self.id = UUID()
-        self.role = role
-        self.content = [Content(type: .text, content: .text(text))]
-        self.state = .complete
-    }
-    
-    init(role: Role, content: [Content]) {
-        self.id = UUID()
-        self.role = role
-        self.content = content
-        self.state = .complete
-    }
+    let id: UUID
+    let role: Role
+    let content: String
+    var state: MessageState
 
-    init(id: UUID = UUID(), role: Role, content: [Content], state: MessageState = .complete) {
+    init(id: UUID = UUID(), role: Message.Role, content: String, state: Message.MessageState = .complete) {
         self.id = id
         self.role = role
         self.content = content
         self.state = state
     }
+    
+    init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        self.id = UUID()  // Generate new UUID on decode since we don't send it
+        self.role = try container.decode(Role.self, forKey: .role)
+        self.content = try container.decode(String.self, forKey: .content)
+        self.state = .complete  // Default to complete state when decoding
+    }
+    
+    func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(role, forKey: .role)
+        try container.encode(content, forKey: .content)
+    }
 }
 
 // Convenience extensions for creating messages

Sources/CompilerSwiftAI/Model Calling/ModelCall.swift

@@ -80,20 +80,3 @@ struct CompletionResponse: Codable, Sendable {
 struct StreamChunk: Codable, Sendable {
     let content: String
 }
-
-// Helper for encoding/decoding Message content arrays for the API
-extension Message {
-    var apiContent: String {
-        content.map { content in
-            switch content.content {
-            case .text(let text):
-                return text
-            case .image(let image):
-                return """
-                    [Image: \(image.mimeType.rawValue), 
-                     Base64: \(image.base64Data.prefix(20))...]
-                    """
-            }
-        }.joined(separator: "\n")
-    }
-}

Sources/CompilerSwiftAI/UI/Chat/ChatBubble.swift

@@ -49,7 +49,7 @@ struct ChatBubble: View {
         case .streaming(let partial):
             return partial
         case .complete:
-            return message.apiContent
+            return message.content
         }
     }
 

Sources/CompilerSwiftAI/UI/Chat/ChatView/ChatViewModel.swift

@@ -1,18 +1,17 @@
-import SwiftUI
 import Speech
+import SwiftUI
 import Transcriber
 
 import OSLog
 
 // Example system prompt
 let defaultSystemPrompt: String = """
-        You are a helpful AI Assistant. Be direct, concise, and friendly.
-        """
+You are a helpful AI Assistant. Be direct, concise, and friendly. Always format your responses in valid Markdown.
+"""
 
 @MainActor
 @Observable
 class ChatViewModel: Transcribable {
-    
     public var isRecording = false
     public var transcribedText = ""
     public var authStatus: SFSpeechRecognizerAuthorizationStatus = .notDetermined
@@ -33,8 +32,9 @@ class ChatViewModel: Transcribable {
     }
 
     // MARK: - Properties
+
     var errorMessage: String?
-    private var _userInput = ""  // Make private to control access
+    private var _userInput = "" // Make private to control access
     var isStreaming = false
     var visibleMessageCount: Int = 15
 
@@ -83,7 +83,7 @@ class ChatViewModel: Transcribable {
         self.chatHistory = ChatHistory(systemPrompt: systemPrompt)
 
         // Start observing messages from chatHistory
-        messageStreamTask = Task.detached { [weak self] in
+        self.messageStreamTask = Task.detached { [weak self] in
             guard let self = self else { return }
             await self.observeMessageStream()
         }
@@ -125,6 +125,7 @@ class ChatViewModel: Transcribable {
     }
 
     // MARK: - Observe ChatHistory
+
     /// Continuously read `chatHistory.messagesStream` and publish changes to SwiftUI.
     private func observeMessageStream() async {
         let throttleInterval: TimeInterval = 0.15
@@ -200,7 +201,7 @@ class ChatViewModel: Transcribable {
                 var chunkCount = 0
                 for try await partialMessage in stream {
                     chunkCount += 1
-                    accumulated = partialMessage.apiContent
+                    accumulated = partialMessage.content
 
                     // Log each chunk size
                     self.logger.log("Chunk #\(chunkCount): partial content size=\(accumulated.count). Updating streaming message.")
@@ -224,6 +225,7 @@ class ChatViewModel: Transcribable {
     }
 
     // MARK: - Clear Chat
+
     func clearChat() {
         logger.log("clearChat called. Clearing chat history.")
         Task.detached {