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.
This commit is contained in:
@@ -0,0 +1,80 @@
|
||||
// MicVoiceAvailabilityTests.swift
|
||||
// OSGKeyboardTests
|
||||
|
||||
import XCTest
|
||||
@testable import OSGKeyboardShared
|
||||
|
||||
final class MicVoiceAvailabilityTests: XCTestCase {
|
||||
|
||||
func testReadyWhenHostReadyAndIdle() {
|
||||
let availability = MicVoiceAvailabilityResolver.resolve(
|
||||
phase: .idle,
|
||||
micDisabled: false,
|
||||
hasFullAccess: true,
|
||||
appGroupAvailable: true,
|
||||
hostReady: true,
|
||||
isPreparingSession: false
|
||||
)
|
||||
XCTAssertEqual(availability, .ready)
|
||||
}
|
||||
|
||||
func testUnavailableWhenMissingAPIKey() {
|
||||
let availability = MicVoiceAvailabilityResolver.resolve(
|
||||
phase: .idle,
|
||||
micDisabled: true,
|
||||
hasFullAccess: true,
|
||||
appGroupAvailable: true,
|
||||
hostReady: true,
|
||||
isPreparingSession: false
|
||||
)
|
||||
XCTAssertEqual(availability, .unavailable(.missingAPIKey))
|
||||
}
|
||||
|
||||
func testUnavailableWhenHostNotReady() {
|
||||
let availability = MicVoiceAvailabilityResolver.resolve(
|
||||
phase: .idle,
|
||||
micDisabled: false,
|
||||
hasFullAccess: true,
|
||||
appGroupAvailable: true,
|
||||
hostReady: false,
|
||||
isPreparingSession: false
|
||||
)
|
||||
XCTAssertEqual(availability, .unavailable(.hostNotReady))
|
||||
}
|
||||
|
||||
func testUnavailableWhenPreparingSession() {
|
||||
let availability = MicVoiceAvailabilityResolver.resolve(
|
||||
phase: .idle,
|
||||
micDisabled: false,
|
||||
hasFullAccess: true,
|
||||
appGroupAvailable: true,
|
||||
hostReady: false,
|
||||
isPreparingSession: true
|
||||
)
|
||||
XCTAssertEqual(availability, .unavailable(.preparingSession))
|
||||
}
|
||||
|
||||
func testRecordingOverridesReady() {
|
||||
let availability = MicVoiceAvailabilityResolver.resolve(
|
||||
phase: .recording,
|
||||
micDisabled: false,
|
||||
hasFullAccess: true,
|
||||
appGroupAvailable: true,
|
||||
hostReady: true,
|
||||
isPreparingSession: false
|
||||
)
|
||||
XCTAssertEqual(availability, .recording)
|
||||
}
|
||||
|
||||
func testProcessingOverridesUnavailable() {
|
||||
let availability = MicVoiceAvailabilityResolver.resolve(
|
||||
phase: .processing,
|
||||
micDisabled: false,
|
||||
hasFullAccess: true,
|
||||
appGroupAvailable: true,
|
||||
hostReady: false,
|
||||
isPreparingSession: false
|
||||
)
|
||||
XCTAssertEqual(availability, .processing)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user