bec36befa2
This is a major rewrite of OpenLessKeyboard, renamed to OSGKeyboard
and rebuilt end-to-end. 59 files changed (+3205/-1550).
Architecture
------------
- Rename project, targets, directories from OpenLess* to OSGKeyboard*
(OpenLess / OpenLessKeyboard / OpenLessShared / OpenLessTests).
- AudioCaptureService rewritten as @unchecked Sendable class with
OSAllocatedUnfairLock instead of an actor, so it survives Swift 6
strict-concurrency checks while still serialising engine + converter
state correctly.
- Single design system (Palette / Spacing / Radius / TypeStyle /
Motion) lifted into OSGKeyboardShared so the host app and the
keyboard extension stay in lock-step.
Push-to-talk — first-principles fix
-----------------------------------
- App Group + audio-input entitlements were stripped by Xcode's
Automatic Signing. They are now declared in project.yml so
'xcodegen generate' re-emits them every time. iOS Developer
Account is untouched; only the App Group capability was added.
- State machine uses a real stored `phase` (was a derived shim
that locked out every press after the first because
recordStream was never nilled after the pipeline finished).
- Microphone permission is requested inside pressBegan (async
Task) so the press flow optimistically enters .recording;
permission denial surfaces a short error and returns to idle.
- Replaced LongPressGesture(0.15s) with a DragGesture +
TapGesture pair separated by pressArmed, so a single tap no
longer fires both onPressBegan and onTap simultaneously.
- Real RMS / peak level meter from the AVAudioEngine tap (was a
pseudo-random walk); the visible waveform is now driven by
actual audio.
- SFSpeechRecognizer(locale:) with selectable ASR locales
(auto / zh-Hans / zh-Hant / en-US / ja-JP / ko-KR) for
first-class Chinese / English / Japanese / Korean dictation,
with on-device recognition when supported.
- AVAudioSession now deactivates on stop so other apps' audio
routing is restored.
Keyboard UI — Typeless-inspired layout
---------------------------------------
- Hero area is 280 pt with a 96 pt record disc, breathing outer
ring, and a 12-bar waveform driven by the real RMS.
- inputView.allowsSelfSizing + a heightAnchor constraint so iOS
no longer crops the keyboard under the Spotlight bar / home
indicator.
- Top bar: mode chip (Off / 转写 / 润色) + locale chip
(Auto / 简体 / 繁體 / EN / 日 / 한) + status badge + ⚙.
- Bottom bar: globe / delete / 空格 / return — all 40 pt and
balanced.
- RecordButton onPressEnded is now safe to fire from a quick
press; pressArmed prevents double-firing.
LLM / Polishing
---------------
- LLMClient: stopped leaking the server response body in errors
(server body is now logged at debug, never surfaced to UI);
added a dedicated .rateLimited case for 429.
- PolishingService timeout 8s → 12s to accommodate slower
domestic LLM providers.
- AppGroupStore.defaultSystemPrompt is now provider-aware
(Chinese for zhipu/moonshot/qwen/deepseek, English otherwise).
Onboarding & Settings
---------------------
- Re-themed OnboardingView / HomeView / SettingsView on the
new design system.
- ProviderPickerSection now shows 6 providers (OpenAI, DeepSeek,
Qwen DashScope, 智谱 GLM, 月之暗面 Moonshot, Custom) with
blurb + selected accent.
- PickerRow for Mode and ASR locale; System Prompt editor with
reset-to-default.
- API settings page "Get an API key" used SwiftUI Link, which
has a hit-test bug on iOS 18 that ate gestures from adjacent
TextFields (manifested as "typing jumps to a website"). It is
now an explicit Button + contentShape + .submitLabel(.done) on
the fields.
Polish & tests
--------------
- LLMClientTests: 4 unit tests passing (ProviderConfig
persistence + OpenAI request/response + HTTP error + missing
key); test App Group renamed to the correct identifier.
- ProviderConfig.apply now captures the previous provider id
*before* mutating, so switching providers actually resets the
system prompt to the new default.
Build
-----
- Swift 6 strict concurrency, iOS 18.0 deployment target.
- Tested on Xcode 26 + iPhone 17 Pro simulator. A real device on
iOS 27 beta aborts with __abort_with_payload (dispatch
library ABI mismatch); use an iOS 18 real device or the
iOS 26 simulator for now.
🤖 Generated with Claude Code
89 lines
2.7 KiB
Swift
89 lines
2.7 KiB
Swift
// LLMRequest.swift
|
|
// OSGKeyboard · Shared
|
|
//
|
|
// OpenAI-compatible chat completion request/response models.
|
|
// Compatible with OpenAI, DeepSeek, Qwen DashScope, and any provider that
|
|
// implements POST {baseURL}/chat/completions.
|
|
|
|
import Foundation
|
|
|
|
public struct LLMRequest: Codable, Sendable {
|
|
public let model: String
|
|
public let messages: [Message]
|
|
public let temperature: Double?
|
|
public let maxTokens: Int?
|
|
|
|
public enum Message: Codable, Sendable {
|
|
case system(String)
|
|
case user(String)
|
|
case assistant(String)
|
|
|
|
private enum CodingKeys: String, CodingKey {
|
|
case role, content
|
|
}
|
|
|
|
public func encode(to encoder: Encoder) throws {
|
|
var c = encoder.container(keyedBy: CodingKeys.self)
|
|
switch self {
|
|
case .system(let s):
|
|
try c.encode("system", forKey: .role); try c.encode(s, forKey: .content)
|
|
case .user(let s):
|
|
try c.encode("user", forKey: .role); try c.encode(s, forKey: .content)
|
|
case .assistant(let s):
|
|
try c.encode("assistant", forKey: .role); try c.encode(s, forKey: .content)
|
|
}
|
|
}
|
|
|
|
public init(from decoder: Decoder) throws {
|
|
let c = try decoder.container(keyedBy: CodingKeys.self)
|
|
let role = try c.decode(String.self, forKey: .role)
|
|
let content = try c.decode(String.self, forKey: .content)
|
|
switch role {
|
|
case "system": self = .system(content)
|
|
case "user": self = .user(content)
|
|
case "assistant": self = .assistant(content)
|
|
default:
|
|
throw DecodingError.dataCorruptedError(forKey: .role, in: c,
|
|
debugDescription: "Unknown role \(role)")
|
|
}
|
|
}
|
|
}
|
|
|
|
public init(
|
|
model: String,
|
|
messages: [Message],
|
|
temperature: Double? = 0.3,
|
|
maxTokens: Int? = nil
|
|
) {
|
|
self.model = model
|
|
self.messages = messages
|
|
self.temperature = temperature
|
|
self.maxTokens = maxTokens
|
|
}
|
|
}
|
|
|
|
public struct LLMResponse: Codable, Sendable {
|
|
public let id: String?
|
|
public let choices: [Choice]
|
|
|
|
public struct Choice: Codable, Sendable {
|
|
public let index: Int
|
|
public let message: LLMRequest.Message
|
|
public let finishReason: String?
|
|
|
|
private enum CodingKeys: String, CodingKey {
|
|
case index, message
|
|
case finishReason = "finish_reason"
|
|
}
|
|
}
|
|
|
|
public var content: String {
|
|
switch choices.first?.message {
|
|
case .system(let s), .user(let s), .assistant(let s):
|
|
return s
|
|
case .none:
|
|
return ""
|
|
}
|
|
}
|
|
}
|