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,59 @@
+// PersonalDictionaryMergeTests.swift
+// OSGKeyboardTests
+//
+// Hermetic tests for dictionary tombstone merge semantics.
+
+import XCTest
+@testable import OSGKeyboardShared
+
+final class PersonalDictionaryMergeTests: XCTestCase {
+    func testDeletedEntryDoesNotResurrectFromRemote() {
+        let id = UUID()
+        let deletedAt = Date()
+        let local = PersonalDictionary(
+            entries: [],
+            deletedEntryIDs: [id: deletedAt]
+        )
+        let remote = PersonalDictionary(
+            entries: [
+                PersonalDictionary.Entry(
+                    id: id,
+                    term: "OSG",
+                    category: .productName,
+                    source: .manual
+                ),
+            ]
+        )
+
+        let merged = PersonalDictionary.merge(local: local, remote: remote)
+
+        XCTAssertTrue(merged.entries.isEmpty)
+        XCTAssertEqual(merged.deletedEntryIDs[id], deletedAt)
+    }
+
+    func testClearAllExcludesOlderRemoteEntries() {
+        let clearedAt = Date(timeIntervalSince1970: 500)
+        let local = PersonalDictionary(entries: [], clearedAt: clearedAt)
+        let remote = PersonalDictionary(
+            entries: [
+                PersonalDictionary.Entry(
+                    term: "old",
+                    category: .custom,
+                    source: .manual,
+                    createdAt: Date(timeIntervalSince1970: 100)
+                ),
+                PersonalDictionary.Entry(
+                    term: "new",
+                    category: .custom,
+                    source: .manual,
+                    createdAt: Date(timeIntervalSince1970: 600)
+                ),
+            ]
+        )
+
+        let merged = PersonalDictionary.merge(local: local, remote: remote)
+
+        XCTAssertEqual(merged.entries.count, 1)
+        XCTAssertEqual(merged.entries.first?.term, "new")
+    }
+}