Squashes the working tree that had accumulated on cloud-agent. Two strands of work, kept in one commit at the maintainer's request. Crash and stability (this session): - Subscribe to MetricKit so crash, hang, CPU, and disk-write diagnostics are recorded on device. Keyboard-extension memory kills are the most likely way a user loses the keyboard mid-sentence and iOS does not classify them as crashes, so they never reach App Store Connect. - Upload those reports to POST /v1/analytics/diagnostics from internal builds only (local Debug and TestFlight), reusing the analytics installation identifier and skipping entirely when analytics are off. App Store builds keep everything on device. - Shed the Chinese engine, English lexicon, and in-flight pipeline work at the 40 MiB and 48 MiB budget thresholds instead of waiting for a system memory warning that jetsam often preempts. - Install audio taps with the input node's live format through one shared adaptive resampler, so an audio-route change mid-recording no longer raises an uncatchable format-mismatch exception. Covers the dictation preview and the Mac recorder, which still used the pattern the Flow capture path had already moved away from. - Harden the librime bridge: never pass a nil string across a nonnull boundary when a user dictionary holds malformed UTF-8, null-check the engine API vector, and distrust a candidate count without its array. - Guard the expanded candidate grid against a list that shrinks while the collection view is still laying out against the previous count. - Resolve localized text without the App Group so the screen shown when that container is missing renders its message instead of crashing on launch, which is the one situation it exists to handle. - Gate CI on the App Group and Keychain wiring that the keyboard extension hard-depends on, with a self-test proving the check fails. Clipboard, reply, and semantics (pre-existing working tree): - Unify the reply center, refresh keyboard AI features, and add native event and reminder exporters. - Expand clipboard semantic routing with authored corpora and a product-blind holdout, plus the scripts that build and validate them. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
155 lines
6.0 KiB
Swift
155 lines
6.0 KiB
Swift
// KeyboardSurfaceRoot.swift
|
|
// OSGKeyboard · Keyboard Extension
|
|
//
|
|
// Switches between voice and typing surfaces driven by KeyboardState.surface.
|
|
|
|
import OSGKeyboardShared
|
|
import SwiftUI
|
|
|
|
struct KeyboardSurfaceRoot: View {
|
|
@Environment(\.colorScheme) private var colorScheme
|
|
@Namespace private var keyboardTabSelectionNamespace
|
|
|
|
@ObservedObject var state: KeyboardState
|
|
@ObservedObject var typing: TypingSessionController
|
|
|
|
var onInsert: (String) -> Void
|
|
var onDeleteBackward: () -> Void
|
|
|
|
private var palette: ThemePalette {
|
|
colorScheme == .dark ? Palette.dark : Palette.light
|
|
}
|
|
|
|
/// True only for overlays that replace the keyboard surface. The auto-reply
|
|
/// guide is excluded — it dims the keyboard but keeps it visible underneath.
|
|
private var surfacesHidden: Bool {
|
|
switch state.clipboardOverlay {
|
|
case .enableGuide, .historyPanel:
|
|
return true
|
|
case .none, .autoReplyGuide:
|
|
return false
|
|
}
|
|
}
|
|
|
|
/// Height is deliberately independent of the surface: the voice surface
|
|
/// adopts the typing surface's content-driven height and parks the surplus
|
|
/// above its action cluster, so switching surfaces never resizes the
|
|
/// keyboard. Keeping this a single expression is what guarantees it.
|
|
static func height(
|
|
for surface: KeyboardState.Surface,
|
|
isIPad: Bool = false,
|
|
width: CGFloat = 0
|
|
) -> CGFloat {
|
|
TypingSurfaceMetrics.contentHeight(isIPad: isIPad, width: width)
|
|
}
|
|
|
|
var body: some View {
|
|
ZStack {
|
|
Group {
|
|
switch state.surface {
|
|
case .voice:
|
|
AIKeyboardView(
|
|
state: state,
|
|
typing: typing,
|
|
onInsert: wrappedInsert
|
|
)
|
|
case .typing:
|
|
TypingRootView(
|
|
state: state,
|
|
typing: typing,
|
|
onInsert: wrappedInsert,
|
|
onDeleteBackward: wrappedDeleteBackward
|
|
)
|
|
case .ai:
|
|
// Legacy persisted surface; controller canonicalizes it to
|
|
// `.voice`, but render the unified assistant defensively.
|
|
AIKeyboardView(
|
|
state: state,
|
|
typing: typing,
|
|
onInsert: wrappedInsert
|
|
)
|
|
}
|
|
}
|
|
// The enable-guide / history panel replace the surface; the
|
|
// auto-reply guide instead layers over the still-visible keyboard.
|
|
.opacity(surfacesHidden ? 0 : 1)
|
|
.allowsHitTesting(!surfacesHidden)
|
|
|
|
// Match every surface's outer chrome so the panel title / X sit in
|
|
// the same slot as the logo + clipboard chip (not 4 pt higher).
|
|
clipboardOverlayLayer
|
|
.padding(.top, TypingSurfaceMetrics.outerPaddingTop)
|
|
.padding(.bottom, TypingSurfaceMetrics.outerPaddingBottom)
|
|
|
|
// Scrim-based nudge sits on top of the live keyboard, no padding so
|
|
// the dim reaches every edge.
|
|
if state.clipboardOverlay == .autoReplyGuide, state.canShowClipboardEntry {
|
|
ClipboardAutoReplyGuideView(
|
|
onClose: state.dismissClipboardOverlay,
|
|
onTry: state.tryAutoReplyFromGuide
|
|
)
|
|
}
|
|
}
|
|
// Overlays are siblings of the surfaces, so the palette has to be
|
|
// injected here or they fall back to the environment's dark default.
|
|
.environment(\.themePalette, palette)
|
|
// The input surfaces are replaced when switching tabs. Keep one
|
|
// namespace above that switch so the selected glass pill can morph
|
|
// between the outgoing and incoming top-control instances.
|
|
.environment(\.keyboardTabSelectionNamespace, keyboardTabSelectionNamespace)
|
|
// Bottom-anchored on purpose: UIKit hands the input view a container up
|
|
// to the full screen height while the keyboard slides in, and centering
|
|
// a fixed-height surface in it parks the whole keyboard above the
|
|
// visible slot — which reads as a blank keyboard whenever that frame
|
|
// lingers (a slow Universal Clipboard read, a system alert).
|
|
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .bottom)
|
|
.animation(.easeInOut(duration: 0.15), value: state.surface)
|
|
}
|
|
|
|
private func wrappedInsert(_ text: String) {
|
|
if !text.isEmpty {
|
|
state.noteUserDidInputText()
|
|
}
|
|
onInsert(text)
|
|
}
|
|
|
|
private func wrappedDeleteBackward() {
|
|
state.noteUserDidInputText()
|
|
onDeleteBackward()
|
|
}
|
|
|
|
@ViewBuilder
|
|
private var clipboardOverlayLayer: some View {
|
|
if !state.canShowClipboardEntry {
|
|
EmptyView()
|
|
} else {
|
|
switch state.clipboardOverlay {
|
|
case .none:
|
|
EmptyView()
|
|
case .enableGuide:
|
|
ClipboardEnableGuideView(
|
|
onClose: state.dismissClipboardOverlay,
|
|
onOpenSettings: {
|
|
state.dismissClipboardOverlay()
|
|
state.openClipboardSettings()
|
|
}
|
|
)
|
|
case .historyPanel:
|
|
ClipboardHistoryPanelView(
|
|
history: ClipboardHistoryStore.shared,
|
|
onClose: state.dismissClipboardOverlay,
|
|
onClear: state.clearClipboardHistory,
|
|
onInsert: { state.insertClipboardText($0) },
|
|
onDelete: { state.deleteClipboardHistoryEntry($0) },
|
|
pastePermissionHint: state.needsClipboardFullAccessHint
|
|
? ExtL10n.string("keyboard.clipboard.panel.fullAccessHint")
|
|
: nil
|
|
)
|
|
case .autoReplyGuide:
|
|
// Rendered as a scrim layer over the live keyboard, not here.
|
|
EmptyView()
|
|
}
|
|
}
|
|
}
|
|
}
|