Skip to content

Fastest and only macOS Dictation app with on-device STT and custom trained AI enhancement model. Windows, iOS testflight! Android, Linux waitlist open! A local Wispr Flow alternative. Follow https://x.com/fluidvoiceapp for more

Finalize remaining 1.5.8 code updates

altic-dev2fb1a17c113f
diff --git a/Sources/Fluid/Persistence/SettingsStore.swift b/Sources/Fluid/Persistence/SettingsStore.swift
index c3313b00..805adb84 100644
--- a/Sources/Fluid/Persistence/SettingsStore.swift
+++ b/Sources/Fluid/Persistence/SettingsStore.swift
@@ -227,7 +227,7 @@ final class SettingsStore: ObservableObject {
self.id = try container.decode(String.self, forKey: .id)
self.name = try container.decode(String.self, forKey: .name)
self.prompt = try container.decode(String.self, forKey: .prompt)
- self.mode = (try container.decodeIfPresent(PromptMode.self, forKey: .mode) ?? .dictate).normalized
+ self.mode = try (container.decodeIfPresent(PromptMode.self, forKey: .mode) ?? .dictate).normalized
self.includeContext = try container.decodeIfPresent(Bool.self, forKey: .includeContext) ?? false
self.createdAt = try container.decode(Date.self, forKey: .createdAt)
self.updatedAt = try container.decode(Date.self, forKey: .updatedAt)
@@ -2134,12 +2134,8 @@ final class SettingsStore: ObservableObject {
return false
}
// Filter by macOS 15 requirement
- if model.requiresMacOS15 {
- if #available(macOS 15.0, *) {
- // continue
- } else {
- return false
- }
+ if model.requiresMacOS15, #unavailable(macOS 15.0) {
+ return false
}
// Filter by macOS 26 requirement
if model.requiresMacOS26 {
@@ -2478,37 +2474,6 @@ final class SettingsStore: ObservableObject {
}
}
- /// Available Whisper model sizes
- enum WhisperModelSize: String, CaseIterable, Identifiable {
- case tiny = "ggml-tiny.bin"
- case base = "ggml-base.bin"
- case small = "ggml-small.bin"
- case medium = "ggml-medium.bin"
- case large = "ggml-large-v3.bin"
-
- var id: String { rawValue }
-
- var displayName: String {
- switch self {
- case .tiny: return "Tiny (~75 MB)"
- case .base: return "Base (~142 MB)"
- case .small: return "Small (~466 MB)"
- case .medium: return "Medium (~1.5 GB)"
- case .large: return "Large (~2.9 GB)"
- }
- }
-
- var description: String {
- switch self {
- case .tiny: return "Fastest, lower accuracy"
- case .base: return "Good balance of speed and accuracy"
- case .small: return "Better accuracy, slower"
- case .medium: return "High accuracy, requires more memory"
- case .large: return "Best accuracy, large download"
- }
- }
- }
-
/// Selected transcription provider - defaults to "auto" which picks based on architecture
var selectedTranscriptionProvider: TranscriptionProviderOption {
get {
@@ -2540,7 +2505,42 @@ final class SettingsStore: ObservableObject {
self.defaults.set(newValue.rawValue, forKey: Keys.whisperModelSize)
}
}
+}
+
+extension SettingsStore {
+ /// Available Whisper model sizes
+ enum WhisperModelSize: String, CaseIterable, Identifiable {
+ case tiny = "ggml-tiny.bin"
+ case base = "ggml-base.bin"
+ case small = "ggml-small.bin"
+ case medium = "ggml-medium.bin"
+ case large = "ggml-large-v3.bin"
+
+ var id: String { rawValue }
+
+ var displayName: String {
+ switch self {
+ case .tiny: return "Tiny (~75 MB)"
+ case .base: return "Base (~142 MB)"
+ case .small: return "Small (~466 MB)"
+ case .medium: return "Medium (~1.5 GB)"
+ case .large: return "Large (~2.9 GB)"
+ }
+ }
+
+ var description: String {
+ switch self {
+ case .tiny: return "Fastest, lower accuracy"
+ case .base: return "Good balance of speed and accuracy"
+ case .small: return "Better accuracy, slower"
+ case .medium: return "High accuracy, requires more memory"
+ case .large: return "Best accuracy, large download"
+ }
+ }
+ }
+}
+extension SettingsStore {
// MARK: - Unified Speech Model Selection
/// The selected speech recognition model.
@@ -2559,19 +2559,11 @@ final class SettingsStore: ObservableObject {
if model.requiresAppleSilicon && !CPUArchitecture.isAppleSilicon {
return .whisperBase
}
- if model.requiresMacOS15 {
- if #available(macOS 15.0, *) {
- // available
- } else {
- return .whisperBase
- }
+ if model.requiresMacOS15, #unavailable(macOS 15.0) {
+ return .whisperBase
}
- if model.requiresMacOS26 {
- if #available(macOS 26.0, *) {
- // available
- } else {
- return .whisperBase
- }
+ if model.requiresMacOS26, #unavailable(macOS 26.0) {
+ return .whisperBase
}
return model
}
diff --git a/Sources/Fluid/Services/FileLogger.swift b/Sources/Fluid/Services/FileLogger.swift
index 7d2330f3..ec2bd002 100644
--- a/Sources/Fluid/Services/FileLogger.swift
+++ b/Sources/Fluid/Services/FileLogger.swift
@@ -1,5 +1,5 @@
-import Foundation
import Darwin
+import Foundation
/// A lightweight file-backed logger that mirrors in-app debug logs to disk for diagnostics.
final class FileLogger {
@@ -112,8 +112,8 @@ final class FileLogger {
let build = bundle.object(forInfoDictionaryKey: "CFBundleVersion") as? String ?? "unknown"
let osVersion = ProcessInfo.processInfo.operatingSystemVersionString
let pid = ProcessInfo.processInfo.processIdentifier
- appendUnlocked(line: "[RUN] PID=\(pid) AppVersion=\(appVersion) Build=\(build) OS=\(osVersion)")
- appendUnlocked(line: "[RUN] Processed by \(Bundle.main.bundleIdentifier ?? "unknown")")
+ self.appendUnlocked(line: "[RUN] PID=\(pid) AppVersion=\(appVersion) Build=\(build) OS=\(osVersion)")
+ self.appendUnlocked(line: "[RUN] Processed by \(Bundle.main.bundleIdentifier ?? "unknown")")
}
private func rotateIfNeeded(force: Bool) {
@@ -170,8 +170,8 @@ final class FileLogger {
signal(SIGTRAP, fileLoggerSignalHandler)
}
- fileprivate static func writeCrashSignalLine(_ signalNumber: Int32) {
- guard Self.crashFileDescriptor >= 0 else { return }
+ static func writeCrashSignalLine(_ signalNumber: Int32) {
+ guard self.crashFileDescriptor >= 0 else { return }
let bytes: [UInt8]
switch signalNumber {
case SIGABRT: bytes = Self.sigAbrtLine
@@ -187,8 +187,8 @@ final class FileLogger {
}
}
- fileprivate static func writeCrashLineDirect(_ line: String) {
- guard Self.crashFileDescriptor >= 0 else { return }
+ static func writeCrashLineDirect(_ line: String) {
+ guard self.crashFileDescriptor >= 0 else { return }
let message = line.hasSuffix("\n") ? line : "\(line)\n"
message.withCString { ptr in
_ = write(Self.crashFileDescriptor, ptr, strlen(ptr))
@@ -196,7 +196,7 @@ final class FileLogger {
}
}
-private func fileLoggerSignalHandler(_ signalNumber: Int32) -> Void {
+private func fileLoggerSignalHandler(_ signalNumber: Int32) {
FileLogger.writeCrashSignalLine(signalNumber)
signal(signalNumber, SIG_DFL)
raise(signalNumber)
diff --git a/Sources/Fluid/Services/FluidAudioProvider.swift b/Sources/Fluid/Services/FluidAudioProvider.swift
index 53e2cacd..e9301d95 100644
--- a/Sources/Fluid/Services/FluidAudioProvider.swift
+++ b/Sources/Fluid/Services/FluidAudioProvider.swift
@@ -226,12 +226,10 @@ final class FluidAudioProvider: TranscriptionProvider {
var hits: [String] = []
hits.reserveCapacity(min(limit, 2))
- for candidate in self.boostedTermLookup {
- if normalizedText.contains(" \(candidate) ") {
- hits.append(candidate)
- if hits.count >= limit {
- break
- }
+ for candidate in self.boostedTermLookup where normalizedText.contains(" \(candidate) ") {
+ hits.append(candidate)
+ if hits.count >= limit {
+ break
}
}
return hits
@@ -241,12 +239,12 @@ final class FluidAudioProvider: TranscriptionProvider {
var unique: Set<String> = []
unique.reserveCapacity(terms.count * 2)
for term in terms {
- let normalized = normalizeForLookup(term.text)
+ let normalized = self.normalizeForLookup(term.text)
if !normalized.isEmpty {
unique.insert(normalized)
}
for alias in term.aliases ?? [] {
- let normalizedAlias = normalizeForLookup(alias)
+ let normalizedAlias = self.normalizeForLookup(alias)
if !normalizedAlias.isEmpty {
unique.insert(normalizedAlias)
}
diff --git a/Sources/Fluid/Services/MenuBarManager.swift b/Sources/Fluid/Services/MenuBarManager.swift
index f2f30b2f..3ed1adc8 100644
--- a/Sources/Fluid/Services/MenuBarManager.swift
+++ b/Sources/Fluid/Services/MenuBarManager.swift
@@ -551,7 +551,7 @@ final class MenuBarManager: ObservableObject {
let first = NSApplication.ModalResponse.alertFirstButtonReturn.rawValue
let index = response.rawValue - first
- if index >= 0 && index < options.count {
+ if index >= 0, index < options.count {
NSWorkspace.shared.open(options[index].url)
return
}
diff --git a/Sources/Fluid/Services/ParakeetVocabularyStore.swift b/Sources/Fluid/Services/ParakeetVocabularyStore.swift
index afa9e7a3..1480f65c 100644
--- a/Sources/Fluid/Services/ParakeetVocabularyStore.swift
+++ b/Sources/Fluid/Services/ParakeetVocabularyStore.swift
@@ -12,7 +12,35 @@ final class ParakeetVocabularyStore {
struct Term: Codable, Hashable, Sendable {
let text: String
let weight: Float?
- let aliases: [String]?
+ let aliases: [String]
+
+ init(text: String, weight: Float?, aliases: [String] = []) {
+ self.text = text
+ self.weight = weight
+ self.aliases = aliases
+ }
+
+ private enum CodingKeys: String, CodingKey {
+ case text
+ case weight
+ case aliases
+ }
+
+ init(from decoder: Decoder) throws {
+ let container = try decoder.container(keyedBy: CodingKeys.self)
+ self.text = try container.decode(String.self, forKey: .text)
+ self.weight = try container.decodeIfPresent(Float.self, forKey: .weight)
+ self.aliases = try container.decodeIfPresent([String].self, forKey: .aliases) ?? []
+ }
+
+ func encode(to encoder: Encoder) throws {
+ var container = encoder.container(keyedBy: CodingKeys.self)
+ try container.encode(self.text, forKey: .text)
+ try container.encodeIfPresent(self.weight, forKey: .weight)
+ if !self.aliases.isEmpty {
+ try container.encode(self.aliases, forKey: .aliases)
+ }
+ }
}
let alpha: Float?
@@ -191,13 +219,13 @@ final class ParakeetVocabularyStore {
)
var mergedByText: [String: VocabularyConfig.Term] = [:]
- func normalizeAliases(_ aliases: [String]?, excluding text: String) -> [String]? {
- let normalized = (aliases ?? [])
+ func normalizeAliases(_ aliases: [String], excluding text: String) -> [String] {
+ let normalized = aliases
.map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
.filter { !$0.isEmpty }
.filter { $0.caseInsensitiveCompare(text) != .orderedSame }
let deduped = Array(Set(normalized.map { $0.lowercased() })).sorted()
- return deduped.isEmpty ? nil : deduped
+ return deduped
}
func upsert(_ term: VocabularyConfig.Term) {
@@ -206,12 +234,12 @@ final class ParakeetVocabularyStore {
let key = normalizedText.lowercased()
if let existing = mergedByText[key] {
- let combinedAliases = Array(Set((existing.aliases ?? []) + (term.aliases ?? []))).sorted()
+ let combinedAliases = Array(Set(existing.aliases + term.aliases)).sorted()
let combinedWeight = max(existing.weight ?? 0, term.weight ?? 0)
mergedByText[key] = VocabularyConfig.Term(
text: existing.text,
weight: combinedWeight > 0 ? combinedWeight : nil,
- aliases: combinedAliases.isEmpty ? nil : combinedAliases
+ aliases: combinedAliases
)
return
}
@@ -259,7 +287,7 @@ final class ParakeetVocabularyStore {
guard !seen.contains(key) else { continue }
seen.insert(key)
- let aliases = (term.aliases ?? [])
+ let aliases = term.aliases
.map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
.filter { !$0.isEmpty }
.filter { $0.caseInsensitiveCompare(text) != .orderedSame }
@@ -269,7 +297,7 @@ final class ParakeetVocabularyStore {
VocabularyConfig.Term(
text: text,
weight: term.weight,
- aliases: dedupedAliases.isEmpty ? nil : dedupedAliases
+ aliases: dedupedAliases
)
)
diff --git a/Sources/Fluid/Services/RewriteModeService.swift b/Sources/Fluid/Services/RewriteModeService.swift
index 98886efa..3005e075 100644
--- a/Sources/Fluid/Services/RewriteModeService.swift
+++ b/Sources/Fluid/Services/RewriteModeService.swift
@@ -19,12 +19,14 @@ final class RewriteModeService: ObservableObject {
private var forcePromptTraceToConsole: Bool {
ProcessInfo.processInfo.environment["FLUID_PROMPT_TRACE"] == "1"
}
+
private var diagnosticsEnabled: Bool {
if ProcessInfo.processInfo.environment["FLUID_REWRITE_DIAGNOSTICS"] == "1" {
return true
}
return UserDefaults.standard.bool(forKey: "RewriteModeDiagnosticsEnabled")
}
+
private var shouldTracePromptProcessing: Bool {
if let explicit = UserDefaults.standard.object(forKey: "RewriteModePromptTraceEnabled") as? Bool {
return explicit
@@ -274,7 +276,9 @@ final class RewriteModeService: ObservableObject {
return settings.rewriteModeSelectedModel ?? "gpt-4.1"
}()
self.appendDiagnosticLog(
- "LLM config | writeMode=\(isWriteMode) | linkedToGlobal=\(settings.rewriteModeLinkedToGlobal) | provider=\(providerID) | model=\(model) | profile=\(selectedPromptName) | contextChars=\(contextText.count) | contextInjected=\(!contextBlock.isEmpty)"
+ "LLM config | writeMode=\(isWriteMode) | linkedToGlobal=\(settings.rewriteModeLinkedToGlobal) | " +
+ "provider=\(providerID) | model=\(model) | profile=\(selectedPromptName) | " +
+ "contextChars=\(contextText.count) | contextInjected=\(!contextBlock.isEmpty)"
)
let apiKey = settings.getAPIKey(for: providerID) ?? ""
diff --git a/Sources/Fluid/Services/SimpleUpdater.swift b/Sources/Fluid/Services/SimpleUpdater.swift
index e8aed701..9a456f3f 100644
--- a/Sources/Fluid/Services/SimpleUpdater.swift
+++ b/Sources/Fluid/Services/SimpleUpdater.swift
@@ -123,10 +123,16 @@ final class SimpleUpdater {
$0.name.lowercased().hasSuffix(".zip")
}
let fallbackTagURL = URL(string: "https://github.com/\(owner)/\(repo)/releases/tag/\(release.tag_name)")
- let url = zipAsset?.browser_download_url ?? release.html_url ?? fallbackTagURL ?? URL(string: "https://github.com/\(owner)/\(repo)/releases")!
+ let fallbackReleasesURL = URL(string: "https://github.com/\(owner)/\(repo)/releases")
+ let url = zipAsset?.browser_download_url ??
+ release.html_url ??
+ fallbackTagURL ??
+ fallbackReleasesURL ??
+ URL(fileURLWithPath: "/")
return ReleaseBuildOption(version: release.tag_name, url: url)
}
}
+
// Allowed Apple Developer Team IDs for code-sign validation
// Configured per your request; restrict to your actual Team ID only.
private let allowedTeamIDs: Set<String> = [
diff --git a/Sources/Fluid/Services/TextSelectionService.swift b/Sources/Fluid/Services/TextSelectionService.swift
index c29d9f23..601a06f9 100644
--- a/Sources/Fluid/Services/TextSelectionService.swift
+++ b/Sources/Fluid/Services/TextSelectionService.swift
@@ -123,7 +123,8 @@ final class TextSelectionService {
let nsText = fullText as NSString
guard range.location >= 0,
range.length > 0,
- range.location + range.length <= nsText.length else {
+ range.location + range.length <= nsText.length
+ else {
self.diag("Selected range out of bounds (textLen=\(nsText.length), location=\(range.location), length=\(range.length))")
return nil
}
diff --git a/Sources/Fluid/Services/TranscriptionProvider.swift b/Sources/Fluid/Services/TranscriptionProvider.swift
index 3c7c6945..46393a6a 100644
--- a/Sources/Fluid/Services/TranscriptionProvider.swift
+++ b/Sources/Fluid/Services/TranscriptionProvider.swift
@@ -59,6 +59,7 @@ extension TranscriptionProvider {
func transcribeStreaming(_ samples: [Float]) async throws -> ASRTranscriptionResult {
try await self.transcribe(samples)
}
+
func transcribeFinal(_ samples: [Float]) async throws -> ASRTranscriptionResult {
try await self.transcribe(samples)
}
diff --git a/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swift b/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swift
index f38139cd..9d466ea9 100644
--- a/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swift
+++ b/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swift
@@ -116,29 +116,29 @@ extension AIEnhancementSettingsView {
.foregroundStyle(isSelected ? tone : self.theme.palette.secondaryText.opacity(0.35))
.frame(width: 18, height: 18)
- Menu {
- Button("Edit Prompt") { onManage() }
- if mode == .edit {
- Divider()
- Text("Selected text context is added automatically when text is selected.")
- }
- if let onDelete {
- Divider()
- Button(role: .destructive, action: { onDelete() }) {
- Label("Delete Prompt", systemImage: "trash")
- }
- } else if let onResetDefault {
- Divider()
- Button("Reset to Built-in Default", role: .destructive) { onResetDefault() }
- .disabled(!canResetDefault)
+ Menu {
+ Button("Edit Prompt") { onManage() }
+ if mode == .edit {
+ Divider()
+ Text("Selected text context is added automatically when text is selected.")
+ }
+ if let onDelete {
+ Divider()
+ Button(role: .destructive, action: { onDelete() }) {
+ Label("Delete Prompt", systemImage: "trash")
}
- } label: {
- Image(systemName: "ellipsis.circle")
- .font(.system(size: 14, weight: .semibold))
- .frame(width: AISettingsLayout.controlHeight, height: AISettingsLayout.controlHeight)
+ } else if let onResetDefault {
+ Divider()
+ Button("Reset to Built-in Default", role: .destructive) { onResetDefault() }
+ .disabled(!canResetDefault)
}
- .buttonStyle(.plain)
- .foregroundStyle(self.theme.palette.secondaryText)
+ } label: {
+ Image(systemName: "ellipsis.circle")
+ .font(.system(size: 14, weight: .semibold))
+ .frame(width: AISettingsLayout.controlHeight, height: AISettingsLayout.controlHeight)
+ }
+ .buttonStyle(.plain)
+ .foregroundStyle(self.theme.palette.secondaryText)
}
}
.padding(12)
@@ -269,7 +269,7 @@ extension AIEnhancementSettingsView {
HStack(spacing: 8) {
Image(systemName: "info.circle")
.font(.system(size: 12))
- .foregroundStyle(.secondary)
+ .foregroundStyle(.secondary)
Text("No verified providers yet. Verify a provider above to enable Edit Text model selection.")
.font(.caption)
.foregroundStyle(.secondary)
@@ -611,114 +611,114 @@ extension AIEnhancementSettingsView {
if self.viewModel.draftPromptMode == .dictate {
VStack(alignment: .leading, spacing: 8) {
- HStack(spacing: 8) {
- Image(systemName: "waveform")
- .foregroundStyle(self.theme.palette.accent)
- Text("Test")
- .font(.subheadline)
- .fontWeight(.semibold)
- Spacer()
- }
-
- let hotkeyDisplay = self.settings.hotkeyShortcut.displayString
- let canTest = self.viewModel.isAIPostProcessingConfiguredForDictation()
-
- Toggle(isOn: Binding(
- get: { self.promptTest.isActive },
- set: { enabled in
- if enabled {
- let combined = self.viewModel.combinedDraftPrompt(self.viewModel.draftPromptText, mode: self.viewModel.draftPromptMode)
- self.promptTest.activate(draftPromptText: combined)
- } else {
- self.promptTest.deactivate()
- }
+ HStack(spacing: 8) {
+ Image(systemName: "waveform")
+ .foregroundStyle(self.theme.palette.accent)
+ Text("Test")
+ .font(.subheadline)
+ .fontWeight(.semibold)
+ Spacer()
}
- )) {
- Text("Enable Test Mode (Hotkey: \(hotkeyDisplay))")
- .font(.caption)
- }
- .toggleStyle(.switch)
- .disabled(!canTest)
- if !canTest {
- Text("Testing is disabled because AI post-processing is not configured.")
- .font(.caption2)
- .foregroundStyle(.secondary)
- } else if self.promptTest.isActive {
- Text("Press the hotkey to start/stop recording. The transcription will be post-processed using your draft prompt and shown below (nothing will be typed into other apps).")
- .font(.caption2)
- .foregroundStyle(.secondary)
- }
+ let hotkeyDisplay = self.settings.hotkeyShortcut.displayString
+ let canTest = self.viewModel.isAIPostProcessingConfiguredForDictation()
- if self.promptTest.isActive {
- if self.promptTest.isProcessing {
- HStack(spacing: 8) {
- ProgressView().controlSize(.small)
- Text("Processing…")
- .font(.caption)
- .foregroundStyle(.secondary)
+ Toggle(isOn: Binding(
+ get: { self.promptTest.isActive },
+ set: { enabled in
+ if enabled {
+ let combined = self.viewModel.combinedDraftPrompt(self.viewModel.draftPromptText, mode: self.viewModel.draftPromptMode)
+ self.promptTest.activate(draftPromptText: combined)
+ } else {
+ self.promptTest.deactivate()
+ }
}
+ )) {
+ Text("Enable Test Mode (Hotkey: \(hotkeyDisplay))")
+ .font(.caption)
}
+ .toggleStyle(.switch)
+ .disabled(!canTest)
- if !self.promptTest.lastError.isEmpty {
- Text(self.promptTest.lastError)
+ if !canTest {
+ Text("Testing is disabled because AI post-processing is not configured.")
.font(.caption2)
- .foregroundStyle(.red)
- .textSelection(.enabled)
- }
-
- VStack(alignment: .leading, spacing: 6) {
- Text("Raw transcription")
+ .foregroundStyle(.secondary)
+ } else if self.promptTest.isActive {
+ Text("Press the hotkey to start/stop recording. The transcription will be post-processed using your draft prompt and shown below (nothing will be typed into other apps).")
.font(.caption2)
.foregroundStyle(.secondary)
- TextEditor(text: Binding(
- get: { self.promptTest.lastTranscriptionText },
- set: { _ in }
- ))
- .font(.system(.caption, design: .monospaced))
- .frame(minHeight: 70)
- .scrollContentBackground(.hidden)
- .background(
- RoundedRectangle(cornerRadius: 8, style: .continuous)
- .fill(self.theme.palette.contentBackground.opacity(0.7))
- .overlay(
- RoundedRectangle(cornerRadius: 8, style: .continuous)
- .stroke(self.theme.palette.cardBorder.opacity(0.35), lineWidth: 1)
- )
- )
}
- VStack(alignment: .leading, spacing: 6) {
- Text("Post-processed output")
- .font(.caption2)
- .foregroundStyle(.secondary)
- TextEditor(text: Binding(
- get: { self.promptTest.lastOutputText },
- set: { _ in }
- ))
- .font(.system(.caption, design: .monospaced))
- .frame(minHeight: 110)
- .scrollContentBackground(.hidden)
- .background(
- RoundedRectangle(cornerRadius: 8, style: .continuous)
- .fill(self.theme.palette.contentBackground.opacity(0.7))
- .overlay(
- RoundedRectangle(cornerRadius: 8, style: .continuous)
- .stroke(self.theme.palette.cardBorder.opacity(0.35), lineWidth: 1)
- )
- )
+ if self.promptTest.isActive {
+ if self.promptTest.isProcessing {
+ HStack(spacing: 8) {
+ ProgressView().controlSize(.small)
+ Text("Processing…")
+ .font(.caption)
+ .foregroundStyle(.secondary)
+ }
+ }
+
+ if !self.promptTest.lastError.isEmpty {
+ Text(self.promptTest.lastError)
+ .font(.caption2)
+ .foregroundStyle(.red)
+ .textSelection(.enabled)
+ }
+
+ VStack(alignment: .leading, spacing: 6) {
+ Text("Raw transcription")
+ .font(.caption2)
+ .foregroundStyle(.secondary)
+ TextEditor(text: Binding(
+ get: { self.promptTest.lastTranscriptionText },
+ set: { _ in }
+ ))
+ .font(.system(.caption, design: .monospaced))
+ .frame(minHeight: 70)
+ .scrollContentBackground(.hidden)
+ .background(
+ RoundedRectangle(cornerRadius: 8, style: .continuous)
+ .fill(self.theme.palette.contentBackground.opacity(0.7))
+ .overlay(
+ RoundedRectangle(cornerRadius: 8, style: .continuous)
+ .stroke(self.theme.palette.cardBorder.opacity(0.35), lineWidth: 1)
+ )
+ )
+ }
+
+ VStack(alignment: .leading, spacing: 6) {
+ Text("Post-processed output")
+ .font(.caption2)
+ .foregroundStyle(.secondary)
+ TextEditor(text: Binding(
+ get: { self.promptTest.lastOutputText },
+ set: { _ in }
+ ))
+ .font(.system(.caption, design: .monospaced))
+ .frame(minHeight: 110)
+ .scrollContentBackground(.hidden)
+ .background(
+ RoundedRectangle(cornerRadius: 8, style: .continuous)
+ .fill(self.theme.palette.contentBackground.opacity(0.7))
+ .overlay(
+ RoundedRectangle(cornerRadius: 8, style: .continuous)
+ .stroke(self.theme.palette.cardBorder.opacity(0.35), lineWidth: 1)
+ )
+ )
+ }
}
}
- }
- .padding(12)
- .background(
- RoundedRectangle(cornerRadius: 12, style: .continuous)
- .fill(self.theme.palette.accent.opacity(0.06))
- .overlay(
- RoundedRectangle(cornerRadius: 12, style: .continuous)
- .stroke(self.theme.palette.cardBorder.opacity(0.5), lineWidth: 1)
- )
- )
+ .padding(12)
+ .background(
+ RoundedRectangle(cornerRadius: 12, style: .continuous)
+ .fill(self.theme.palette.accent.opacity(0.06))
+ .overlay(
+ RoundedRectangle(cornerRadius: 12, style: .continuous)
+ .stroke(self.theme.palette.cardBorder.opacity(0.5), lineWidth: 1)
+ )
+ )
} else if self.promptTest.isActive {
Text("Prompt test mode is available only for Dictate prompts.")
.font(.caption2)
diff --git a/Sources/Fluid/UI/CustomDictionaryView.swift b/Sources/Fluid/UI/CustomDictionaryView.swift
index 327390a5..957a656f 100644
--- a/Sources/Fluid/UI/CustomDictionaryView.swift
+++ b/Sources/Fluid/UI/CustomDictionaryView.swift
@@ -625,7 +625,7 @@ struct AddBoostTermSheet: View {
ParakeetVocabularyStore.VocabularyConfig.Term(
text: self.normalizedTerm,
weight: self.strength.weight,
- aliases: nil
+ aliases: []
)
)
self.dismiss()
diff --git a/Sources/Fluid/UI/SettingsView.swift b/Sources/Fluid/UI/SettingsView.swift
index 4490bbb4..3f4336dc 100644
--- a/Sources/Fluid/UI/SettingsView.swift
+++ b/Sources/Fluid/UI/SettingsView.swift
@@ -1161,11 +1161,11 @@ struct SettingsView: View {
}
}
- // CRITICAL FIX: Populate cached default device names after onAppear, not during view body evaluation.
- // This avoids the CoreAudio/SwiftUI AttributeGraph race condition that causes EXC_BAD_ACCESS.
- self.cachedDefaultInputName = AudioDevice.getDefaultInputDevice()?.name ?? ""
- self.cachedDefaultOutputName = AudioDevice.getDefaultOutputDevice()?.name ?? ""
- self.refreshRollbackState()
+ // CRITICAL FIX: Populate cached default device names after onAppear, not during view body evaluation.
+ // This avoids the CoreAudio/SwiftUI AttributeGraph race condition that causes EXC_BAD_ACCESS.
+ self.cachedDefaultInputName = AudioDevice.getDefaultInputDevice()?.name ?? ""
+ self.cachedDefaultOutputName = AudioDevice.getDefaultOutputDevice()?.name ?? ""
+ self.refreshRollbackState()
}
}
.onChange(of: self.visualizerNoiseThreshold) { _, newValue in
@@ -1218,7 +1218,7 @@ struct SettingsView: View {
let first = NSApplication.ModalResponse.alertFirstButtonReturn.rawValue
let index = response.rawValue - first
- if index >= 0 && index < options.count {
+ if index >= 0, index < options.count {
NSWorkspace.shared.open(options[index].url)
return
}
diff --git a/Sources/Fluid/Views/BottomOverlayView.swift b/Sources/Fluid/Views/BottomOverlayView.swift
index 5c4b238e..0bdd8e21 100644
--- a/Sources/Fluid/Views/BottomOverlayView.swift
+++ b/Sources/Fluid/Views/BottomOverlayView.swift
@@ -353,7 +353,7 @@ final class BottomOverlayPromptMenuController {
guard self.menuWindow?.isVisible == true else { return }
let insideMenu = self.menuWindow?.frame.contains(screenPoint) ?? false
let insideSelector = self.selectorFrameInScreen.contains(screenPoint)
- if !insideMenu && !insideSelector {
+ if !insideMenu, !insideSelector {
self.hide()
}
}
@@ -630,7 +630,7 @@ final class BottomOverlayModeMenuController {
guard self.menuWindow?.isVisible == true else { return }
let insideMenu = self.menuWindow?.frame.contains(screenPoint) ?? false
let insideSelector = self.selectorFrameInScreen.contains(screenPoint)
- if !insideMenu && !insideSelector {
+ if !insideMenu, !insideSelector {
self.hide()
}
}
@@ -894,7 +894,7 @@ final class BottomOverlayActionsMenuController {
guard self.menuWindow?.isVisible == true else { return }
let insideMenu = self.menuWindow?.frame.contains(screenPoint) ?? false
let insideSelector = self.selectorFrameInScreen.contains(screenPoint)
- if !insideMenu && !insideSelector {
+ if !insideMenu, !insideSelector {
self.hide()
}
}
@@ -1319,7 +1319,6 @@ private struct BottomOverlayPromptMenuView: View {
if let pid { _ = TypingService.activateApp(pid: pid) }
}
}
-
}
private struct BottomOverlayActionsMenuView: View {
@@ -1964,22 +1963,22 @@ struct BottomOverlayView: View {
}
.allowsHitTesting(false)
)
- .contentShape(Rectangle())
- .onHover { hovering in
- self.isHoveringModeChip = hovering && !self.contentState.isProcessing
- }
- .onTapGesture {
- guard self.layout.showsTopControls, !self.contentState.isProcessing else { return }
- self.closePromptMenu()
- self.closeActionsMenu()
- BottomOverlayModeMenuController.shared.updateAnchor(
- selectorFrameInScreen: self.modeSelectorFrameInScreen,
- parentWindow: self.modeSelectorWindow,
- maxWidth: self.promptSelectorMaxWidth,
- menuGap: self.promptMenuGap
- )
- BottomOverlayModeMenuController.shared.toggleFromTap()
- }
+ .contentShape(Rectangle())
+ .onHover { hovering in
+ self.isHoveringModeChip = hovering && !self.contentState.isProcessing
+ }
+ .onTapGesture {
+ guard self.layout.showsTopControls, !self.contentState.isProcessing else { return }
+ self.closePromptMenu()
+ self.closeActionsMenu()
+ BottomOverlayModeMenuController.shared.updateAnchor(
+ selectorFrameInScreen: self.modeSelectorFrameInScreen,
+ parentWindow: self.modeSelectorWindow,
+ maxWidth: self.promptSelectorMaxWidth,
+ menuGap: self.promptMenuGap
+ )
+ BottomOverlayModeMenuController.shared.toggleFromTap()
+ }
}
private var promptSelectorTrigger: some View {
@@ -2308,7 +2307,8 @@ struct BottomOverlayView: View {
// Target app icon (the app where text will be typed)
let appIcon = self.contentState.targetAppIcon ?? self.activeAppMonitor.activeAppIcon
if appIcon != nil || !self.appServices.asr.isAsrReady &&
- (self.appServices.asr.isLoadingModel || self.appServices.asr.isDownloadingModel) {
+ (self.appServices.asr.isLoadingModel || self.appServices.asr.isDownloadingModel)
+ {
let showModelLoading = !self.appServices.asr.isAsrReady &&
(self.appServices.asr.isLoadingModel || self.appServices.asr.isDownloadingModel)
VStack(spacing: 2) {
@@ -2351,7 +2351,7 @@ struct BottomOverlayView: View {
}
}
}
- }
+ }
.padding(.horizontal, self.layout.hPadding)
.padding(.vertical, self.layout.vPadding)
.frame(maxWidth: .infinity, alignment: .center)