.claude/skills/swiftdata-pro

@@ -1 +0,0 @@
-../../.agents/skills/swiftdata-pro

.pi/skills/swiftdata-pro

@@ -1 +0,0 @@
-../../.agents/skills/swiftdata-pro

KDChat/ContentView.swift

@@ -1,9 +1,7 @@
-import SwiftData
 import SwiftUI
 
 struct ContentView: View {
     @Environment(ConnectionManager.self) private var manager
-    @Environment(\.modelContext) private var modelContext
 
     var body: some View {
         Group {
@@ -19,43 +17,5 @@ struct ContentView: View {
             }
         }
         .animation(.default, value: manager.screen)
-        .onAppear {
-            manager.modelContext = modelContext
-            purgeExpiredMessages()
-        }
-    }
-
-    private func purgeExpiredMessages() {
-        // Purge all if save is off
-        if !UserDefaults.standard.bool(forKey: "save_messages", default: true) {
-            try? modelContext.delete(model: SavedMessage.self)
-            try? modelContext.save()
-            return
-        }
-
-        // Purge expired messages
-        let deleteAfterRaw = UserDefaults.standard.integer(forKey: "delete_after")
-        let days = deleteAfterRaw == 0 ? 0 : (DeleteAfter(rawValue: deleteAfterRaw) ?? .oneMonth).rawValue
-        if days > 0 {
-            let cutoff = Calendar.current.date(byAdding: .day, value: -days, to: .now) ?? .now
-            let expired = FetchDescriptor<SavedMessage>(
-                predicate: #Predicate { $0.timestamp < cutoff }
-            )
-            if let old = try? modelContext.fetch(expired) {
-                for message in old { modelContext.delete(message) }
-            }
-        }
-
-        // Purge debug messages if not saving them
-        if !UserDefaults.standard.bool(forKey: "save_debug_buffer") {
-            let debugDesc = FetchDescriptor<SavedMessage>(
-                predicate: #Predicate { $0.buffer == "debug" }
-            )
-            if let debugMsgs = try? modelContext.fetch(debugDesc) {
-                for message in debugMsgs { modelContext.delete(message) }
-            }
-        }
-
-        try? modelContext.save()
     }
 }

KDChat/KDChatApp.swift

@@ -1,4 +1,3 @@
-import SwiftData
 import SwiftUI
 
 @main
@@ -14,6 +13,5 @@ struct KDChatApp: App {
             ContentView()
                 .environment(connectionManager)
         }
-        .modelContainer(for: SavedMessage.self)
     }
 }

KDChat/Models/ChatModels.swift

@@ -56,7 +56,7 @@ struct ChatMessage: Identifiable, Sendable, Decodable {
         _ = c.isAtEnd ? nil : try (c.decodeNil() ? nil : c.decode(String.self))     // [6] sound
         senderIsRecipient = c.isAtEnd ? false : try c.decode(Bool.self)             // [7]
         isSystem = false
-        timestamp = .now
+        timestamp = Date()
     }
 
     /// Create a system message (from Say packets)
@@ -69,6 +69,6 @@ struct ChatMessage: Identifiable, Sendable, Decodable {
         self.isInteractable = false
         self.senderIsRecipient = false
         self.isSystem = true
-        self.timestamp = .now
+        self.timestamp = Date()
     }
 }

KDChat/Models/SavedMessage.swift

@@ -1,38 +0,0 @@
-import Foundation
-import SwiftData
-
-@Model class SavedMessage {
-    #Index<SavedMessage>([\.buffer, \.timestamp])
-
-    var buffer: String
-    var senderId: String?
-    var senderName: String
-    var content: String
-    var timestamp: Date
-    var isSystem: Bool = false
-    var senderIsRecipient: Bool = false
-    var characterId: String?
-    var sessionId: UUID
-
-    init(
-        buffer: String,
-        senderId: String?,
-        senderName: String,
-        content: String,
-        timestamp: Date = .now,
-        isSystem: Bool = false,
-        senderIsRecipient: Bool = false,
-        characterId: String? = nil,
-        sessionId: UUID
-    ) {
-        self.buffer = buffer
-        self.senderId = senderId
-        self.senderName = senderName
-        self.content = content
-        self.timestamp = timestamp
-        self.isSystem = isSystem
-        self.senderIsRecipient = senderIsRecipient
-        self.characterId = characterId
-        self.sessionId = sessionId
-    }
-}

KDChat/Services/ConnectionManager.swift

@@ -1,10 +1,9 @@
 import Foundation
 import MessagePack
-import SwiftData
 import SwiftUI
 import os
 
-extension UserDefaults {
+private extension UserDefaults {
     func bool(forKey key: String, default defaultValue: Bool) -> Bool {
         object(forKey: key) == nil ? defaultValue : bool(forKey: key)
     }
@@ -44,14 +43,17 @@ final class ConnectionManager {
 
     // Chat
     var buffers: [ChatBuffer] = []
+    var messages: [String: [ChatMessage]] = [:]
     var currentCharacterId: String?
     var localSenderId: String?
-    var sessionId = UUID()
-    var modelContext: ModelContext?
-    private var lastDMRecipientId: String?
+
+    // Feedback triggers (views observe these for sensoryFeedback / announcements)
+    var messageFeedbackTrigger: Int = 0
+    var systemFeedbackTrigger: Int = 0
 
     // Tracks which buffer the user is viewing (set by ChatView)
     var activeBuffer: String = "global"
+    var lastAnnouncement: String = ""
 
     // Auth
     private(set) var isLoggedIn: Bool = false
@@ -103,7 +105,6 @@ final class ConnectionManager {
 
     private func startClient(host: String, port: UInt16) {
         tearDownClient()
-        sessionId = UUID()
 
         let client = LNLClient()
         self.client = client
@@ -137,7 +138,6 @@ final class ConnectionManager {
     }
 
     func sendDirectMessage(recipientId: String, message: String) {
-        lastDMRecipientId = recipientId
         let packet = PacketEncoder.directMessage(recipientId: recipientId, message: message)
         Task { await client?.send(data: packet) }
     }
@@ -213,9 +213,9 @@ final class ConnectionManager {
 
     private func resetState() {
         buffers.removeAll()
+        messages.removeAll()
         remoteForms.removeAll()
         currentCharacterId = nil
-        localSenderId = nil
         errorMessage = nil
     }
 
@@ -343,63 +343,57 @@ final class ConnectionManager {
         log.info("addBuffer: \(buffer.name), canSend=\(buffer.canSend)")
         if !buffers.contains(where: { $0.name == buffer.name }) {
             buffers.append(buffer)
+            messages[buffer.name] = []
         }
     }
 
     private func handleAddMessage(_ message: ChatMessage) {
+        messages[message.buffer, default: []].append(message)
+
         // Learn our own entity ID from echoed messages
         if message.senderIsRecipient, let id = message.senderId {
             if localSenderId == nil { localSenderId = id }
             if currentCharacterId == nil { currentCharacterId = id }
         }
 
-        // For DMs, characterId stores the conversation partner's ID
-        let dmPartnerId: String? = if message.buffer == "direct-messages" {
-            message.senderIsRecipient ? lastDMRecipientId : message.senderId
-        } else {
-            nil
-        }
-
-        let saved = SavedMessage(
-            buffer: message.buffer,
-            senderId: message.senderId,
-            senderName: message.senderName,
-            content: message.content,
-            senderIsRecipient: message.senderIsRecipient,
-            characterId: dmPartnerId,
-            sessionId: sessionId
-        )
-        modelContext?.insert(saved)
-        try? modelContext?.save()
-
+        messageFeedbackTrigger += 1
+        lastAnnouncement = "\(message.senderName): \(message.content)"
+        playMessageSound(buffer: message.buffer)
     }
 
     private func handleSay(_ say: ServerSay) {
-        let saved = SavedMessage(
-            buffer: "debug",
-            senderId: nil,
-            senderName: "System",
-            content: say.message,
-            isSystem: true,
-            sessionId: sessionId
-        )
-        modelContext?.insert(saved)
-        try? modelContext?.save()
+        let sysMessage = ChatMessage(systemMessage: say.message)
 
-        announce(say.message)
-        playStatusHaptic()
+        for buffer in buffers {
+            messages[buffer.name, default: []].append(sysMessage)
+        }
+
+        systemFeedbackTrigger += 1
+        lastAnnouncement = say.message
     }
 
-    private func announce(_ text: String) {
-        AccessibilityNotification.Announcement(text).post()
-    }
+    private func playMessageSound(buffer: String) {
+        guard UserDefaults.standard.bool(forKey: "sounds_enabled", default: true) else { return }
 
-    private func playStatusHaptic() {
-        guard UserDefaults.standard.bool(forKey: "haptics_enabled", default: true),
-              UserDefaults.standard.bool(forKey: "haptics_status", default: true) else { return }
-        UINotificationFeedbackGenerator().notificationOccurred(.warning)
-    }
+        let isActiveBuffer = buffer == activeBuffer
+        if !isActiveBuffer {
+            guard UserDefaults.standard.bool(forKey: "sounds_background_buffers", default: true) else { return }
+        }
 
+        switch buffer {
+        case "global":
+            guard UserDefaults.standard.bool(forKey: "sounds_global", default: true) else { return }
+            SoundPlayer.play("global")
+        case "map":
+            guard UserDefaults.standard.bool(forKey: "sounds_map", default: true) else { return }
+            SoundPlayer.play("map")
+        case "direct-messages":
+            guard UserDefaults.standard.bool(forKey: "sounds_dm", default: true) else { return }
+            SoundPlayer.play("direct-message")
+        default:
+            break
+        }
+    }
 
 
     // MARK: - Game State Handlers

KDChat/Views/ChatBufferView.swift

@@ -1,25 +1,14 @@
-import SwiftData
 import SwiftUI
 
 struct ChatBufferView: View {
     let bufferName: String
     let canSend: Bool
-    var onDM: ((SavedMessage) -> Void)?
+    var onDM: ((ChatMessage) -> Void)?
     @Environment(ConnectionManager.self) private var manager
-    @Environment(\.modelContext) private var modelContext
-    @Query private var messages: [SavedMessage]
     @State private var messageText = ""
 
-    init(bufferName: String, canSend: Bool, onDM: ((SavedMessage) -> Void)? = nil) {
-        self.bufferName = bufferName
-        self.canSend = canSend
-        self.onDM = onDM
-
-        let buf = bufferName
-        _messages = Query(
-            filter: #Predicate<SavedMessage> { $0.buffer == buf },
-            sort: \.timestamp
-        )
+    private var messages: [ChatMessage] {
+        manager.messages[bufferName] ?? []
     }
 
     var body: some View {
@@ -32,34 +21,15 @@ struct ChatBufferView: View {
                                 message: message,
                                 onDM: onDM
                             )
-                            .id(message.persistentModelID)
+                            .id(message.id)
                         }
                     }
                     .padding()
                 }
                 .onChange(of: messages.count) {
-                    guard let last = messages.last, last.sessionId == manager.sessionId else { return }
-                    proxy.scrollTo(last.persistentModelID, anchor: .bottom)
-
-                    let isActive = bufferName == manager.activeBuffer
-                    let playBackground = UserDefaults.standard.bool(forKey: "sounds_background_buffers", default: true)
-
-                    // Sound — plays for active buffer, or background if enabled
-                    if isActive || playBackground {
-                        playBufferSound()
-                    }
-
-                    // Announce + haptic
-                    let announceOther = UserDefaults.standard.bool(forKey: "announce_other_buffers")
-                    if isActive || announceOther {
-                        if !last.isSystem {
-                            AccessibilityNotification.Announcement(
-                                "\(last.senderName): \(last.content)"
-                            ).post()
-                        }
-                        if UserDefaults.standard.bool(forKey: "haptics_enabled", default: true),
-                           UserDefaults.standard.bool(forKey: "haptics_messages", default: true) {
-                            UIImpactFeedbackGenerator(style: .soft).impactOccurred()
+                    if let lastId = messages.last?.id {
+                        withAnimation(.easeOut(duration: 0.2)) {
+                            proxy.scrollTo(lastId, anchor: .bottom)
                         }
                     }
                 }
@@ -105,20 +75,4 @@ struct ChatBufferView: View {
         messageText = ""
     }
 
-    private func playBufferSound() {
-        guard UserDefaults.standard.bool(forKey: "sounds_enabled", default: true) else { return }
-        switch bufferName {
-        case "global":
-            guard UserDefaults.standard.bool(forKey: "sounds_global", default: true) else { return }
-            SoundPlayer.play("global")
-        case "map":
-            guard UserDefaults.standard.bool(forKey: "sounds_map", default: true) else { return }
-            SoundPlayer.play("map")
-        case "direct-messages":
-            guard UserDefaults.standard.bool(forKey: "sounds_dm", default: true) else { return }
-            SoundPlayer.play("direct-message")
-        default:
-            break
-        }
-    }
 }

KDChat/Views/ChatView.swift

@@ -1,4 +1,3 @@
-import SwiftData
 import SwiftUI
 
 struct ChatView: View {
@@ -6,6 +5,9 @@ struct ChatView: View {
     @State private var selectedBuffer: String = "global"
     @State private var showSettings = false
     @State private var selectedDMPartner: String?
+    @AppStorage("haptics_enabled") private var hapticsEnabled = true
+    @AppStorage("haptics_messages") private var messageHaptics = true
+    @AppStorage("haptics_status") private var statusHaptics = true
 
     var body: some View {
         NavigationStack {
@@ -48,6 +50,11 @@ struct ChatView: View {
                 let name = partnerName(for: partnerId)
                 DMConversationView(partnerId: partnerId, partnerName: name)
             }
+            .sensoryFeedback(.impact(flexibility: .soft), trigger: hapticsEnabled && messageHaptics ? manager.messageFeedbackTrigger : 0)
+            .sensoryFeedback(.warning, trigger: hapticsEnabled && statusHaptics ? manager.systemFeedbackTrigger : 0)
+            .onChange(of: manager.lastAnnouncement) {
+                AccessibilityNotification.Announcement(manager.lastAnnouncement).post()
+            }
             .onChange(of: selectedBuffer) {
                 manager.activeBuffer = selectedBuffer
             }
@@ -79,17 +86,12 @@ struct ChatView: View {
         }
     }
 
-    @Environment(\.modelContext) private var modelContext
-
     private func partnerName(for partnerId: String) -> String {
-        let descriptor = FetchDescriptor<SavedMessage>(
-            predicate: #Predicate { $0.buffer == "direct-messages" && $0.senderId == partnerId }
-        )
-        let results = (try? modelContext.fetch(descriptor)) ?? []
-        return results.first?.senderName ?? partnerId
+        let dmMessages = manager.messages["direct-messages"] ?? []
+        return dmMessages.first { $0.senderId == partnerId }?.senderName ?? partnerId
     }
 
-    private func navigateToDM(_ message: SavedMessage) {
+    private func navigateToDM(_ message: ChatMessage) {
         guard let senderId = message.senderId else { return }
         selectedBuffer = "direct-messages"
         selectedDMPartner = senderId

KDChat/Views/DMConversationView.swift

@@ -1,24 +1,15 @@
-import SwiftData
 import SwiftUI
 
 struct DMConversationView: View {
     let partnerId: String
     let partnerName: String
     @Environment(ConnectionManager.self) private var manager
-    @Query private var messages: [SavedMessage]
     @State private var messageText = ""
 
-    init(partnerId: String, partnerName: String) {
-        self.partnerId = partnerId
-        self.partnerName = partnerName
-
-        let pid = partnerId
-        _messages = Query(
-            filter: #Predicate<SavedMessage> {
-                $0.buffer == "direct-messages" && $0.characterId == pid
-            },
-            sort: \.timestamp
-        )
+    private var messages: [ChatMessage] {
+        (manager.messages["direct-messages"] ?? []).filter { message in
+            message.senderId == partnerId || (message.senderIsRecipient && !message.isSystem)
+        }
     }
 
     var body: some View {
@@ -28,14 +19,16 @@ struct DMConversationView: View {
                     LazyVStack(alignment: .leading, spacing: 8) {
                         ForEach(messages) { message in
                             MessageRow(message: message)
-                                .id(message.persistentModelID)
+                                .id(message.id)
                         }
                     }
                     .padding()
                 }
                 .onChange(of: messages.count) {
-                    if let last = messages.last {
-                        proxy.scrollTo(last.persistentModelID, anchor: .bottom)
+                    if let lastId = messages.last?.id {
+                        withAnimation(.easeOut(duration: 0.2)) {
+                            proxy.scrollTo(lastId, anchor: .bottom)
+                        }
                     }
                 }
             }

KDChat/Views/DMListView.swift

@@ -1,23 +1,21 @@
-import SwiftData
 import SwiftUI
 
 struct DMListView: View {
     @Environment(ConnectionManager.self) private var manager
     @Binding var selectedConversation: String?
-    @Query(
-        filter: #Predicate<SavedMessage> { $0.buffer == "direct-messages" && !$0.isSystem },
-        sort: \.timestamp,
-        order: .reverse
-    ) private var dmMessages: [SavedMessage]
 
-    private var conversations: [(id: String, name: String, lastMessage: SavedMessage)] {
-        var latest: [String: (name: String, message: SavedMessage)] = [:]
-        for message in dmMessages {
+    private var conversations: [(id: String, name: String, lastMessage: ChatMessage)] {
+        let dmMessages = manager.messages["direct-messages"] ?? []
+        var latest: [String: (name: String, message: ChatMessage)] = [:]
+
+        for message in dmMessages where !message.isSystem {
+            // The conversation partner is the other person
             guard let senderId = message.senderId, !message.senderIsRecipient else { continue }
-            if latest[senderId] == nil {
+            if latest[senderId].map({ message.timestamp > $0.message.timestamp }) ?? true {
                 latest[senderId] = (message.senderName, message)
             }
         }
+
         return latest
             .map { (id: $0.key, name: $0.value.name, lastMessage: $0.value.message) }
             .sorted { $0.lastMessage.timestamp > $1.lastMessage.timestamp }

KDChat/Views/MessageRow.swift

@@ -1,9 +1,9 @@
 import SwiftUI
 
 struct MessageRow: View {
-    let message: SavedMessage
-    var onDM: ((SavedMessage) -> Void)?
-    var onProfile: ((SavedMessage) -> Void)?
+    let message: ChatMessage
+    var onDM: ((ChatMessage) -> Void)?
+    var onProfile: ((ChatMessage) -> Void)?
     @Environment(ConnectionManager.self) private var manager
 
     private var isOwnMessage: Bool {

KDChat/Views/SettingsView.swift

@@ -1,28 +1,6 @@
-import SwiftData
 import SwiftUI
 
-enum DeleteAfter: Int, CaseIterable {
-    case oneDay = 1
-    case oneWeek = 7
-    case oneMonth = 30
-    case oneYear = 365
-    case never = 0
-
-    var label: String {
-        switch self {
-        case .oneDay: "1 Day"
-        case .oneWeek: "1 Week"
-        case .oneMonth: "1 Month"
-        case .oneYear: "1 Year"
-        case .never: "Never"
-        }
-    }
-}
-
 struct SettingsView: View {
-    @AppStorage("save_messages") private var saveMessages = true
-    @AppStorage("save_debug_buffer") private var saveDebugBuffer = false
-    @AppStorage("delete_after") private var deleteAfterRaw = DeleteAfter.oneMonth.rawValue
     @AppStorage("haptics_enabled") private var hapticsEnabled = true
     @AppStorage("haptics_messages") private var messageHaptics = true
     @AppStorage("haptics_status") private var statusHaptics = true
@@ -31,50 +9,10 @@ struct SettingsView: View {
     @AppStorage("sounds_map") private var mapSound = true
     @AppStorage("sounds_dm") private var dmSound = true
     @AppStorage("sounds_background_buffers") private var backgroundBufferSounds = true
-    @AppStorage("announce_other_buffers") private var announceOtherBuffers = false
-    @Environment(\.modelContext) private var modelContext
-    @State private var showDeleteConfirmation = false
-
-    private var deleteAfter: Binding<DeleteAfter> {
-        Binding(
-            get: { DeleteAfter(rawValue: deleteAfterRaw) ?? .oneMonth },
-            set: { deleteAfterRaw = $0.rawValue }
-        )
-    }
 
     var body: some View {
         Form {
-            Section {
-                Toggle("Save Messages", isOn: $saveMessages)
-                Toggle("Save Debug Buffer", isOn: $saveDebugBuffer)
-                    .disabled(!saveMessages)
-                Picker("Delete After", selection: deleteAfter) {
-                    ForEach(DeleteAfter.allCases, id: \.self) { option in
-                        Text(option.label).tag(option)
-                    }
-                }
-                .disabled(!saveMessages)
-                Button("Delete All Messages", role: .destructive) {
-                    showDeleteConfirmation = true
-                }
-                .confirmationDialog(
-                    "Delete Messages",
-                    isPresented: $showDeleteConfirmation,
-                    titleVisibility: .visible
-                ) {
-                    Button("Delete All Messages", role: .destructive) {
-                        deleteAllMessages()
-                    }
-                } message: {
-                    Text("Are you sure you want to delete all messages from all buffers?")
-                }
-            } header: {
-                Text("Messages")
-            } footer: {
-                Text("Save Debug Buffer saves system and debug messages between sessions.")
-            }
-
-            Section {
+            Section("Sounds") {
                 Toggle("Sounds", isOn: $soundsEnabled)
                 Toggle("Global Chat", isOn: $globalSound)
                     .disabled(!soundsEnabled)
@@ -82,32 +20,16 @@ struct SettingsView: View {
                     .disabled(!soundsEnabled)
                 Toggle("Direct Messages", isOn: $dmSound)
                     .disabled(!soundsEnabled)
-                Toggle("Background Buffer Sounds", isOn: $backgroundBufferSounds)
+                Toggle("Other Buffers", isOn: $backgroundBufferSounds)
                     .disabled(!soundsEnabled)
-            } header: {
-                Text("Sounds")
-            } footer: {
-                Text("Background Buffer Sounds plays sounds for messages in buffers you're not currently viewing.")
             }
 
-            Section {
+            Section("Haptics") {
                 Toggle("Haptics", isOn: $hapticsEnabled)
                 Toggle("Message Haptics", isOn: $messageHaptics)
                     .disabled(!hapticsEnabled)
                 Toggle("Status Haptics", isOn: $statusHaptics)
                     .disabled(!hapticsEnabled)
-            } header: {
-                Text("Haptics")
-            } footer: {
-                Text("Status Haptics provides feedback for system events such as connect and disconnect.")
-            }
-
-            Section {
-                Toggle("Announce Background Messages", isOn: $announceOtherBuffers)
-            } header: {
-                Text("Accessibility")
-            } footer: {
-                Text("When on, VoiceOver announces new messages from buffers you're not currently viewing.")
             }
 
             Section {
@@ -121,15 +43,5 @@ struct SettingsView: View {
             }
         }
         .navigationTitle("Settings")
-        .onChange(of: saveMessages) {
-            if !saveMessages {
-                deleteAllMessages()
-            }
-        }
-    }
-
-    private func deleteAllMessages() {
-        try? modelContext.delete(model: SavedMessage.self)
-        try? modelContext.save()
     }
 }

skills-lock.json

@@ -1,10 +0,0 @@
-{
-  "version": 1,
-  "skills": {
-    "swiftdata-pro": {
-      "source": "twostraws/swiftdata-agent-skill",
-      "sourceType": "github",
-      "computedHash": "2f979bad98ea3a6744084c5f93e27897f02e8d0ffe15dd03042e88aaae4da14c"
-    }
-  }
-}