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

Keep Edit Mode independent from dictation

altic-dev3eaa99b8bba3
diff --git a/Sources/Fluid/Persistence/SettingsStore.swift b/Sources/Fluid/Persistence/SettingsStore.swift
index 2ac732b4..8a7a9999 100644
--- a/Sources/Fluid/Persistence/SettingsStore.swift
+++ b/Sources/Fluid/Persistence/SettingsStore.swift
@@ -58,6 +58,7 @@ final class SettingsStore: ObservableObject {
Self.migrateModifierOnlyCancelShortcutIfNeeded(defaults: self.defaults)
self.retireLegacySecondaryPromptShortcutIfNeeded()
self.normalizePromptSelectionsIfNeeded()
+ self.makeEditModeIndependentIfNeeded()
self.purgeRetiredAppleIntelligenceState()
self.repairForcedOnboardingResetIfNeeded()
self.migrateOverlayBottomOffsetTo50IfNeeded()
@@ -3880,6 +3881,7 @@ final class SettingsStore: ObservableObject {
self.rewriteModeSelectedModel = payload.rewriteModeSelectedModel
self.rewriteModeSelectedProviderID = payload.rewriteModeSelectedProviderID
self.rewriteModeLinkedToGlobal = payload.rewriteModeLinkedToGlobal
+ self.makeEditModeIndependentIfNeeded()
if let enabled = payload.meetingRecordingShortcutEnabled {
self.meetingRecordingHotkeyShortcut = enabled ? payload.meetingRecordingHotkeyShortcut : nil
}
@@ -4485,11 +4487,6 @@ final class SettingsStore: ObservableObject {
private func syncLinkedProviderSelections(to providerID: String) {
let trimmed = providerID.trimmingCharacters(in: .whitespacesAndNewlines)
- if self.rewriteModeLinkedToGlobal {
- self.rewriteModeSelectedProviderID = trimmed
- self.rewriteModeSelectedModel = self.modelSelection(for: trimmed)
- }
-
if self.commandModeLinkedToGlobal {
let linkedProviderID = self.isPrivateAIProviderID(trimmed) ? "" : trimmed
self.commandModeSelectedProviderID = linkedProviderID
@@ -4553,6 +4550,23 @@ final class SettingsStore: ObservableObject {
return ModelRepository.shared.defaultModels(for: providerID)
}
+ /// Keep a legacy linked choice once, then let Edit Mode own its provider/model.
+ /// Also runs after restoring an older backup; an empty route stays visibly unconfigured.
+ func makeEditModeIndependentIfNeeded() {
+ guard self.rewriteModeLinkedToGlobal else { return }
+ let providerID = self.effectiveRewriteModeProviderID
+ let modelID = self.effectiveRewriteModeSelectedModel
+ self.objectWillChange.send()
+ Self.makeEditModeIndependent(defaults: self.defaults, providerID: providerID, modelID: modelID)
+ }
+
+ static func makeEditModeIndependent(defaults: UserDefaults, providerID: String, modelID: String?) {
+ guard defaults.object(forKey: Keys.rewriteModeLinkedToGlobal) as? Bool != false else { return }
+ defaults.set(providerID, forKey: Keys.rewriteModeSelectedProviderID)
+ defaults.set(modelID, forKey: Keys.rewriteModeSelectedModel)
+ defaults.set(false, forKey: Keys.rewriteModeLinkedToGlobal)
+ }
+
var effectiveRewriteModeProviderID: String {
guard self.rewriteModeLinkedToGlobal else { return self.rewriteModeSelectedProviderID }
// "Same as dictation" follows what the main shortcut really uses. On the on-device
diff --git a/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swift b/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swift
index 2da64987..46b0bf54 100644
--- a/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swift
+++ b/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swift
@@ -1363,7 +1363,6 @@ extension AIEnhancementSettingsView {
selectedTitle: self.editModeRunsOnTitle(providers: providers),
selection: self.editModeRunsOnBinding
) {
- Text("Same as dictation").tag(Self.editModeSameAsDictationID)
ForEach(providers) { provider in
Text(provider.name).tag(provider.id)
}
@@ -1401,19 +1400,14 @@ extension AIEnhancementSettingsView {
}
}
.onAppear {
- self.ensureDefaultEditModeSyncState()
- if self.settings.rewriteModeLinkedToGlobal {
- self.syncEditModeToGlobalSelection()
- } else if !providers.isEmpty {
- self.normalizeEditModeProviderSelection()
- }
+ self.settings.makeEditModeIndependentIfNeeded()
+ if !providers.isEmpty { self.normalizeEditModeProviderSelection() }
}
}
@ViewBuilder
private func editModeProviderModelRow(providerID: String) -> some View {
let models = self.editModeModels(for: providerID)
- let isLinked = self.settings.rewriteModeLinkedToGlobal
if providerID.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
FluidManagementRow(title: "Model", detail: "Add an AI provider to use Edit Mode.") {
Button("AI Providers") { AppNavigationRouter.shared.request(.aiEnhancements) }
@@ -1422,7 +1416,7 @@ extension AIEnhancementSettingsView {
} else {
FluidManagementRow(
title: "Model",
- detail: isLinked ? "The one dictation uses." : "Which of your provider's models to use."
+ detail: "Which of your provider's models to use."
) {
SearchableModelPicker(
models: models,
@@ -1432,44 +1426,27 @@ extension AIEnhancementSettingsView {
await self.viewModel.fetchModels(for: providerID)
},
isRefreshing: self.viewModel.refreshingProviderID == providerID,
- refreshEnabled: !isLinked && self.canFetchModels(for: providerID),
- selectionEnabled: !isLinked && !models.isEmpty,
+ refreshEnabled: self.canFetchModels(for: providerID),
+ selectionEnabled: !models.isEmpty,
controlWidth: AISettingsLayout.editModeControlWidth,
controlHeight: AISettingsLayout.controlHeight
)
- .disabled(isLinked)
}
}
}
- private static let editModeSameAsDictationID = "__edit_mode_same_as_dictation__"
-
private func editModeRunsOnTitle(providers: [AIEnhancementSettingsViewModel.ProviderItemData]) -> String {
- guard self.settings.rewriteModeLinkedToGlobal else {
- return providers.first(where: { $0.id == self.editModeSelectedProviderID })?.name ?? "Choose provider"
- }
- guard let dictationProvider = providers.first(where: { $0.id == self.settings.effectiveRewriteModeProviderID }) else {
- return "Same as dictation"
- }
- return "Same as dictation · \(dictationProvider.name)"
+ providers.first(where: { $0.id == self.editModeSelectedProviderID })?.name ?? "Choose provider"
}
private var editModeRunsOnBinding: Binding<String> {
Binding(
- get: {
- self.settings.rewriteModeLinkedToGlobal ? Self.editModeSameAsDictationID : self.editModeSelectedProviderID
- },
+ get: { self.editModeSelectedProviderID },
set: { selection in
- if selection == Self.editModeSameAsDictationID {
- self.settings.rewriteModeLinkedToGlobal = true
- self.syncEditModeToGlobalSelection()
- } else {
- self.settings.rewriteModeLinkedToGlobal = false
- self.settings.rewriteModeSelectedProviderID = selection
- let models = self.editModeModels(for: selection)
- if !models.contains(self.settings.rewriteModeSelectedModel ?? "") {
- self.settings.rewriteModeSelectedModel = models.first
- }
+ self.settings.rewriteModeSelectedProviderID = selection
+ let models = self.editModeModels(for: selection)
+ if !models.contains(self.settings.rewriteModeSelectedModel ?? "") {
+ self.settings.rewriteModeSelectedModel = models.first
}
}
)
@@ -1669,29 +1646,19 @@ extension AIEnhancementSettingsView {
}
private var activeEditModeProviderID: String {
- if self.settings.rewriteModeLinkedToGlobal {
- return self.settings.effectiveRewriteModeProviderID
- }
- return self.editModeSelectedProviderID
+ self.editModeSelectedProviderID
}
private func editModeModelBinding(for providerID: String) -> Binding<String> {
Binding(
get: {
let models = self.editModeModels(for: providerID)
- if self.settings.rewriteModeLinkedToGlobal {
- let key = self.viewModel.providerKey(for: providerID)
- let preferred = self.settings.selectedModelByProvider[key]
- ?? self.settings.selectedModel
- return ModelRepository.eligibleModel(preferred: preferred, from: models) ?? ""
- }
return ModelRepository.eligibleModel(
preferred: self.settings.rewriteModeSelectedModel,
from: models
) ?? ""
},
set: { newModel in
- guard !self.settings.rewriteModeLinkedToGlobal else { return }
self.settings.rewriteModeSelectedModel = newModel
}
)
@@ -1712,28 +1679,6 @@ extension AIEnhancementSettingsView {
}
}
- private func syncEditModeToGlobalSelection() {
- let global = self.settings.effectiveRewriteModeProviderID
- guard !global.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
- self.settings.rewriteModeSelectedProviderID = ""
- self.settings.rewriteModeSelectedModel = nil
- return
- }
-
- self.settings.rewriteModeSelectedProviderID = global
-
- if self.isPrivateAIProviderID(global) {
- self.settings.rewriteModeSelectedModel = self.editModeModels(for: global).first
- return
- }
-
- let key = self.viewModel.providerKey(for: global)
- let model = self.settings.selectedModelByProvider[key]
- ?? self.settings.selectedModel
- ?? self.viewModel.models(for: global).first
- self.settings.rewriteModeSelectedModel = model
- }
-
private func editModeModels(for providerID: String) -> [String] {
if self.isPrivateAIProviderID(providerID) {
return ModelRepository.shared.defaultModels(for: providerID, task: .edit)
@@ -1747,14 +1692,6 @@ extension AIEnhancementSettingsView {
== PrivateAIProviderFeature.shared.providerID
}
- private func ensureDefaultEditModeSyncState() {
- // If no persisted value exists yet, default Sync to ON.
- if UserDefaults.standard.object(forKey: "RewriteModeLinkedToGlobal") == nil {
- self.settings.rewriteModeLinkedToGlobal = true
- self.syncEditModeToGlobalSelection()
- }
- }
-
private func canFetchModels(for providerID: String) -> Bool {
let apiKey = self.viewModel.providerAPIKey(for: providerID)
let hasAPIKey = !apiKey.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
diff --git a/Tests/FluidDictationIntegrationTests/EditModeRouteTests.swift b/Tests/FluidDictationIntegrationTests/EditModeRouteTests.swift
index 652b17cd..12dbe014 100644
--- a/Tests/FluidDictationIntegrationTests/EditModeRouteTests.swift
+++ b/Tests/FluidDictationIntegrationTests/EditModeRouteTests.swift
@@ -95,4 +95,59 @@ final class EditModeRouteTests: XCTestCase {
XCTAssertNil(EditModeRoute.local(self.model).failureMessage)
XCTAssertNotNil(EditModeRoute.modelMissing.failureMessage)
}
+ @MainActor
+ func testLegacyEditLinkIsPinnedOnceWithoutChangingOtherModes() {
+ self.withIndependentDefaults { defaults in
+ defaults.set(true, forKey: "RewriteModeLinkedToGlobal")
+ defaults.set("dictation-provider", forKey: "SelectedProviderID")
+ defaults.set("dictation-model", forKey: "SelectedAIModel")
+ defaults.set("command-provider", forKey: "CommandModeSelectedProviderID")
+ SettingsStore.makeEditModeIndependent(defaults: defaults, providerID: "edit-provider", modelID: "edit-model")
+ XCTAssertFalse(defaults.bool(forKey: "RewriteModeLinkedToGlobal"))
+ XCTAssertEqual(defaults.string(forKey: "RewriteModeSelectedProviderID"), "edit-provider")
+ XCTAssertEqual(defaults.string(forKey: "RewriteModeSelectedModel"), "edit-model")
+ XCTAssertEqual(defaults.string(forKey: "SelectedProviderID"), "dictation-provider")
+ XCTAssertEqual(defaults.string(forKey: "SelectedAIModel"), "dictation-model")
+ XCTAssertEqual(defaults.string(forKey: "CommandModeSelectedProviderID"), "command-provider")
+
+ defaults.set("new-dictation-provider", forKey: "SelectedProviderID")
+ SettingsStore.makeEditModeIndependent(defaults: defaults, providerID: "new-dictation-provider", modelID: "new-model")
+ XCTAssertEqual(defaults.string(forKey: "RewriteModeSelectedProviderID"), "edit-provider")
+ XCTAssertEqual(defaults.string(forKey: "RewriteModeSelectedModel"), "edit-model")
+ }
+ }
+
+ @MainActor
+ func testExplicitIndependentEditChoiceIsNotOverwritten() {
+ self.withIndependentDefaults { defaults in
+ defaults.set(false, forKey: "RewriteModeLinkedToGlobal")
+ defaults.set("chosen-provider", forKey: "RewriteModeSelectedProviderID")
+ defaults.set("chosen-model", forKey: "RewriteModeSelectedModel")
+ SettingsStore.makeEditModeIndependent(defaults: defaults, providerID: "other", modelID: nil)
+ XCTAssertEqual(defaults.string(forKey: "RewriteModeSelectedProviderID"), "chosen-provider")
+ XCTAssertEqual(defaults.string(forKey: "RewriteModeSelectedModel"), "chosen-model")
+ }
+ }
+
+ @MainActor
+ func testMissingLegacyRouteBecomesIndependentWithoutAnInventedModel() {
+ self.withIndependentDefaults { defaults in
+ defaults.set("stale-model", forKey: "RewriteModeSelectedModel")
+ SettingsStore.makeEditModeIndependent(defaults: defaults, providerID: "", modelID: nil)
+ XCTAssertFalse(defaults.bool(forKey: "RewriteModeLinkedToGlobal"))
+ XCTAssertEqual(defaults.string(forKey: "RewriteModeSelectedProviderID"), "")
+ XCTAssertNil(defaults.string(forKey: "RewriteModeSelectedModel"))
+ }
+ }
+
+ private func withIndependentDefaults(_ body: (UserDefaults) -> Void) {
+ let name = "EditModeRouteTests-\(UUID().uuidString)"
+ guard let defaults = UserDefaults(suiteName: name) else {
+ XCTFail("Could not create isolated defaults")
+ return
+ }
+ defer { defaults.removePersistentDomain(forName: name) }
+ body(defaults)
+ }
+
}