Rocky
c2f07bd8d2
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.
32 lines
1.2 KiB
Swift
32 lines
1.2 KiB
Swift
// ConfigurationStore.swift
|
|
// OSGKeyboard · Shared
|
|
//
|
|
// Cross-platform read facade for the dictation pipeline (ASR → polish).
|
|
// iOS implements this via `AppGroupStore` (App Group UserDefaults + Keychain).
|
|
// macOS will gain a separate implementation (standard UserDefaults + Keychain)
|
|
// without pulling in keyboard-extension-only APIs.
|
|
|
|
import Foundation
|
|
|
|
/// Read-only configuration surface consumed by ASR, cloud ASR, and polish services.
|
|
///
|
|
/// Keep this protocol narrow: only what the shared pipeline needs today.
|
|
/// Platform-specific settings UI and iCloud sync stay on concrete stores.
|
|
public protocol ConfigurationStore: Sendable {
|
|
var providerId: String { get }
|
|
var baseURL: String { get }
|
|
var apiKey: String { get }
|
|
var model: String { get }
|
|
var engineMode: String { get }
|
|
var polishIntensity: PolishIntensity { get }
|
|
var personalDictionary: PersonalDictionary { get }
|
|
|
|
/// Foreground-app context for polish prompts (keyboard extension publishes this).
|
|
var detectedAppContext: (context: AppContext, observedAt: Date)? { get }
|
|
|
|
/// Provider-specific ASR caches (e.g. Alibaba Fun-ASR vocabulary IDs).
|
|
var cloudASRPersistence: UserDefaults { get }
|
|
|
|
func makeClient() -> LLMClient
|
|
}
|