Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions Sources/Fluid/ContentView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2551,9 +2551,10 @@ struct ContentView: View {
if typingTarget.shouldRestoreOriginalFocus {
await self.restoreFocusToRecordingTarget()
}
self.asr.typeTextToActiveField(
self.rewriteModeService.rewrittenText,
preferredTargetPID: typingTarget.pid
self.rewriteModeService.acceptRewrite(
preferredTargetPID: typingTarget.pid,
hideApp: false,
recordAnalytics: false
)
AnalyticsService.shared.capture(
.outputDelivered,
Expand Down
4 changes: 4 additions & 0 deletions Sources/Fluid/Persistence/SettingsStore+CommandMode.swift
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ extension SettingsStore {
}

var commandModeReadinessIssue: String? {
if self.commandModeRouteToCodex {
return nil
}

let sourceProviderID = self.commandModeLinkedToGlobal ? self.selectedProviderID : self.commandModeSelectedProviderID
if sourceProviderID == "apple-intelligence" || sourceProviderID == "apple-intelligence-disabled" {
return "Command Mode cannot use Apple Intelligence because terminal tools require a chat API. Choose a verified chat provider or turn Sync off."
Expand Down
27 changes: 26 additions & 1 deletion Sources/Fluid/Persistence/SettingsStore.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ final class SettingsStore: ObservableObject {
static let transcriptionPreviewCharLimitRange: ClosedRange<Int> = 50...800
static let transcriptionPreviewCharLimitStep = 50
static let defaultTranscriptionPreviewCharLimit = 150
static let defaultVisualizerNoiseThreshold = 0.12
private let defaults = UserDefaults.standard
private let keychain = KeychainService.shared
private(set) var launchAtStartupEnabled = false
Expand Down Expand Up @@ -1553,7 +1554,7 @@ final class SettingsStore: ObservableObject {
var visualizerNoiseThreshold: Double {
get {
let value = self.defaults.double(forKey: Keys.visualizerNoiseThreshold)
return value == 0.0 ? 0.4 : value // Default to 0.4 if not set
return value == 0.0 ? Self.defaultVisualizerNoiseThreshold : value
}
set {
// Clamp between 0.0 and 0.95 to avoid division by zero issues in visualizers
Expand Down Expand Up @@ -2342,6 +2343,28 @@ final class SettingsStore: ObservableObject {
}
}

var commandModeRouteToCodex: Bool {
get {
let value = self.defaults.object(forKey: Keys.commandModeRouteToCodex)
return value as? Bool ?? false
}
set {
objectWillChange.send()
self.defaults.set(newValue, forKey: Keys.commandModeRouteToCodex)
}
}

var commandModeCodexHandoffStyle: String {
get {
let value = self.defaults.string(forKey: Keys.commandModeCodexHandoffStyle) ?? "notch"
return ["notch", "app"].contains(value) ? value : "notch"
}
set {
objectWillChange.send()
self.defaults.set(newValue, forKey: Keys.commandModeCodexHandoffStyle)
}
}

// MARK: - Rewrite Mode Settings

var rewriteModeHotkeyShortcut: HotkeyShortcut {
Expand Down Expand Up @@ -4235,6 +4258,8 @@ private extension SettingsStore {
static let cancelRecordingHotkeyShortcut = "CancelRecordingHotkeyShortcut"
static let commandModeLinkedToGlobal = "CommandModeLinkedToGlobal"
static let commandModeShortcutEnabled = "CommandModeShortcutEnabled"
static let commandModeRouteToCodex = "CommandModeRouteToCodex"
static let commandModeCodexHandoffStyle = "CommandModeCodexHandoffStyle"

// Prompt Mode Keys (Transcribe with Prompt)
static let promptModeHotkeyShortcut = "PromptModeHotkeyShortcut"
Expand Down
Loading