feat(macos): add macOS menu-bar app and harden cross-device iCloud sync

Introduce a standalone macOS menu-bar app (OSGKeyboardMac) that reuses the platform-agnostic OSGKeyboardShared core: record -> cloud/local ASR -> polish -> insert. Local mode uses Qwen3-ASR via mlx-swift-asr (macOS 15+, Apple Silicon); iOS targets stay zero-SPM. Harden iCloud sync for multi-device correctness: - Per-field settings merge (appSettings.v2) so concurrent edits no longer clobber each other's unrelated fields. - Per-device usage statistics (G-Counter) that sum instead of max(). - Tombstoned dictionary/history merge so deletes propagate and entries can't resurrect. - API keys replicate via iCloud Keychain, never iCloud KVS JSON; pulling a legacy blob without key fields no longer wipes local Keychain entries. - Add a low-risk "Sync Now" action in Settings. Fix Flow keyboard mic state: stay orange until the host publishes a real ready contract, share a single MicVoiceAvailability gate, and self-heal stale cross-process heartbeat jitter instead of getting stuck. Extract shared storage (SpeechHistoryStore/UsageStatisticsStore, ConfigurationStore) into OSGKeyboardShared and add tests for the new sync/merge logic.
2026-07-08 18:13:56 +08:00
parent 128aab1b02
commit c2f07bd8d2
99 changed files with 6735 additions and 740 deletions
@@ -0,0 +1,79 @@
+// SpeechHistoryStorage.swift
+// OSGKeyboard · Shared
+//
+// Local persistence for the speech history payload (entries + tombstones).
+
+import Foundation
+
+public enum SpeechHistoryStorage {
+    public static let storageKey = SyncedSpeechHistory.kvsKey
+    /// Pre-unification iOS history in `UserDefaults.standard`.
+    public static let legacyIOSEntriesKey = "speechHistory.entries.v1"
+    /// Pre-unification macOS history in `UserDefaults.standard`.
+    public static let legacyMacHistoryKey = "mac.history"
+
+    public static func load(from defaults: UserDefaults) -> SyncedSpeechHistory {
+        if let data = defaults.data(forKey: storageKey),
+           let history = try? JSONDecoder().decode(SyncedSpeechHistory.self, from: data) {
+            return history
+        }
+        return migrateLegacyIfNeeded(into: defaults)
+    }
+
+    public static func save(_ history: SyncedSpeechHistory, to defaults: UserDefaults) {
+        guard let data = try? JSONEncoder().encode(history) else { return }
+        defaults.set(data, forKey: storageKey)
+    }
+
+    /// Import older per-platform keys once, then persist the unified payload.
+    public static func migrateLegacyIfNeeded(into defaults: UserDefaults) -> SyncedSpeechHistory {
+        var entries: [SpeechHistoryEntry] = []
+
+        if let data = defaults.data(forKey: legacyIOSEntriesKey),
+           let legacy = try? JSONDecoder().decode([LegacyIOSHistoryEntry].self, from: data) {
+            entries.append(contentsOf: legacy.map {
+                SpeechHistoryEntry(
+                    id: $0.id,
+                    text: $0.text,
+                    createdAt: $0.createdAt,
+                    engineMode: $0.engineMode
+                )
+            })
+            defaults.removeObject(forKey: legacyIOSEntriesKey)
+        }
+
+        if let data = defaults.data(forKey: legacyMacHistoryKey),
+           let legacy = try? JSONDecoder().decode([LegacyMacHistoryRecord].self, from: data) {
+            entries.append(contentsOf: legacy.map {
+                SpeechHistoryEntry(id: $0.id, text: $0.text, createdAt: $0.date, engineMode: nil)
+            })
+            defaults.removeObject(forKey: legacyMacHistoryKey)
+        }
+
+        guard !entries.isEmpty else { return .empty }
+
+        var history = SyncedSpeechHistory(updatedAt: Date(), entries: [])
+        for entry in entries {
+            history.entries.append(entry)
+        }
+        history.entries.sort { $0.createdAt > $1.createdAt }
+        history.trimEntries()
+        save(history, to: defaults)
+        return history
+    }
+}
+
+// MARK: - Legacy decoding
+
+private struct LegacyIOSHistoryEntry: Codable {
+    let id: UUID
+    let text: String
+    let createdAt: Date
+    let engineMode: String
+}
+
+private struct LegacyMacHistoryRecord: Codable {
+    let id: UUID
+    let text: String
+    let date: Date
+}