Merged
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
29 changes: 20 additions & 9 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,29 +154,34 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.formatting")

let started = CFAbsoluteTimeGetCurrent()
let processingOptions = TextProcessingOptions(settings: settings)
let dictionarySnapshot = PersonalDictionary.shared.snapshot()
let enableMemory = settings.enableMemory
let memoryWindowMinutes = settings.memoryWindowMinutes
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
guard !Task.isCancelled else { return VoicePipelineOutput(text: "", context: inputContext) }

let memoryContext = VoicePipelinePolicy.memoryContext(
for: .processed,
settings: settings,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)
let text = await textProcessor.process(
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext
inputContext: inputContext,
dictionarySnapshot: dictionarySnapshot
)
recordFormattingDuration(started, label: "Smart Format")
return VoicePipelineOutput(text: text, context: inputContext)
Expand All@@ -191,28 +196,34 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.formatting")

let started = CFAbsoluteTimeGetCurrent()
let processingOptions = TextProcessingOptions(settings: settings)
let dictionarySnapshot = PersonalDictionary.shared.snapshot()
let enableMemory = settings.enableMemory
let memoryWindowMinutes = settings.memoryWindowMinutes
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext.text,
outputMode: .command,
inputLanguage: settings.inputLanguage,
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
guard !Task.isCancelled else { return VoicePipelineOutput(text: "", context: inputContext) }

let memoryContext = VoicePipelinePolicy.memoryContext(
for: .command,
settings: settings,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)
let text = await textProcessor.processCommand(
text: raw,
model: settings.llmModel,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext
inputContext: inputContext,
dictionarySnapshot: dictionarySnapshot
)
recordFormattingDuration(started, label: "Voice Command formatting")
return VoicePipelineOutput(text: text, context: inputContext)
Expand Down
89 changes: 70 additions & 19 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,19 +38,35 @@ extension VoicePipeline {
settings: AppSettings,
targetApp: NSRunningApplication?
) async {
let quickText = immediateInsertText(from: raw, settings: settings)
let processingOptions = TextProcessingOptions(settings: settings)
let dictionarySnapshot = PersonalDictionary.shared.snapshot()
let enableMemory = settings.enableMemory
let memoryWindowMinutes = settings.memoryWindowMinutes
let quickText = immediateInsertText(
from: raw,
inputLanguage: processingOptions.inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
let quickContext = InputContext.capture(
targetApp: targetApp,
screenContext: "",
outputMode: .processed,
inputLanguage: settings.inputLanguage,
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
let ocrTask = screenOCRTask
let ocrStartedAt = screenOCRStartedAt
screenOCRTask = nil
screenOCRStartedAt = nil

guard !quickText.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
ocrTask?.cancel()
showNoSpeechDetected(
reason: "instant-insert preprocessing produced empty text"
)
return
}

appState.processedText = quickText
appState.phase = .inserting
appState.statusMessage = L("pipeline.inserting")
Expand DownExpand Up@@ -94,7 +110,10 @@ extension VoicePipeline {
await self?.finishDeferredSmartFormat(
replacementID: replacement.id,
raw: raw,
settings: settings,
processingOptions: processingOptions,
dictionarySnapshot: dictionarySnapshot,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
ocrTask: ocrTask,
ocrStartedAt: ocrStartedAt
)
Expand DownExpand Up@@ -153,7 +172,10 @@ extension VoicePipeline {
private func finishDeferredSmartFormat(
replacementID: UUID,
raw: String,
settings: AppSettings,
processingOptions: TextProcessingOptions,
dictionarySnapshot: PersonalDictionarySnapshot,
enableMemory: Bool,
memoryWindowMinutes: Int,
ocrTask: Task<ScreenContextSnapshot, Never>?,
ocrStartedAt: CFAbsoluteTime?
) async {
Expand All@@ -167,30 +189,28 @@ extension VoicePipeline {
guard !Task.isCancelled else { return }
guard let currentReplacement = appState.pendingReplacement, currentReplacement.id == replacementID else { return }

let inputContext = InputContext(
appName: currentReplacement.targetAppName,
bundleIdentifier: currentReplacement.targetBundleIdentifier,
windowTitle: currentReplacement.context?.windowTitle,
let inputContext = Self.deferredInputContext(
for: currentReplacement,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
inputLanguage: processingOptions.inputLanguage
)
let memoryContext = VoicePipelinePolicy.memoryContext(
for: .processed,
settings: settings,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)

let formattedText = await textProcessor.process(
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext,
allowsPreparedFallback: false
allowsPreparedFallback: false,
allowsGuardFallback: false,
dictionarySnapshot: dictionarySnapshot
)
let elapsed = CFAbsoluteTimeGetCurrent() - started
appState.lastFormattingDurationSeconds = elapsed
Expand All@@ -215,12 +235,43 @@ extension VoicePipeline {
appState.pendingReplacement = replacement
}

private func immediateInsertText(from raw: String, settings: AppSettings) -> String {
let cleaned = textProcessor.prepareForFormatting(text: raw, inputLanguage: settings.inputLanguage)
let fallback = textProcessor.basicClean(text: raw, inputLanguage: settings.inputLanguage)
static func deferredInputContext(
for replacement: DeferredReplacement,
screenContext: String,
inputLanguage: InputLanguage
) -> InputContext {
InputContext(
appName: replacement.targetAppName,
bundleIdentifier: replacement.targetBundleIdentifier,
windowTitle: replacement.context?.windowTitle,
screenContext: screenContext,
textBeforeSelection: replacement.context?.textBeforeSelection,
selectedText: replacement.context?.selectedText,
textAfterSelection: replacement.context?.textAfterSelection,
outputMode: .processed,
inputLanguage: inputLanguage,
source: .menuBar
)
}

private func immediateInsertText(
from raw: String,
inputLanguage: InputLanguage,
dictionarySnapshot: PersonalDictionarySnapshot
) -> String {
let cleaned = textProcessor.prepareForFormatting(
text: raw,
inputLanguage: inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
let fallback = textProcessor.basicClean(
text: raw,
inputLanguage: inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
if !cleaned.isEmpty { return cleaned }
if !fallback.isEmpty { return fallback }
return raw.trimmingCharacters(in: .whitespacesAndNewlines)
return ""
}

private func replacementCopyMessage(for reason: DeferredReplacementCopyReason) -> String {
Expand Down
5 changes: 5 additions & 0 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,6 +116,11 @@ final class VoicePipeline {
let micID = appState.settings.microphoneID
let language = appState.settings.inputLanguage.whisperCode
let streamingEnabled = appState.settings.enableStreamingRecognitionBeta
currentEngine?.configureRecognition(
context: SpeechRecognitionContext(
dictionaryEntries: PersonalDictionary.shared.entries
)
)
if streamingEnabled {
currentEngine?.startListening(language: language) { [weak self] partialText in
Task { @MainActor in
Expand Down
21 changes: 19 additions & 2 deletions Sources/App/VoicePipelinePolicy.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,9 +28,26 @@ enum VoicePipelinePolicy {
currentContext: InputContext? = nil,
recentContextProvider: ((Int, InputContext?) -> String)? = nil
) -> String {
guard settings.enableMemory else { return "" }
memoryContext(
for: outputMode,
enableMemory: settings.enableMemory,
memoryWindowMinutes: settings.memoryWindowMinutes,
currentContext: currentContext,
recentContextProvider: recentContextProvider
)
}

@MainActor
static func memoryContext(
for outputMode: OutputMode,
enableMemory: Bool,
memoryWindowMinutes: Int,
currentContext: InputContext? = nil,
recentContextProvider: ((Int, InputContext?) -> String)? = nil
) -> String {
guard enableMemory else { return "" }
guard outputMode != .direct else { return "" }
let provider = recentContextProvider ?? { MemoryStore.recentContext(windowMinutes: $0, currentContext: $1) }
return provider(settings.memoryWindowMinutes, currentContext)
return provider(memoryWindowMinutes, currentContext)
}
}
6 changes: 4 additions & 2 deletions Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,7 +224,8 @@ enum InputLanguage: String, Codable, CaseIterable {

var localeIdentifier: String {
switch self {
case .auto, .chinese: return "zh-CN"
case .auto: return Locale.current.identifier
case .chinese: return "zh-CN"
case .english: return "en-US"
case .japanese: return "ja-JP"
case .korean: return "ko-KR"
Expand All@@ -235,6 +236,7 @@ enum InputLanguage: String, Codable, CaseIterable {

final class AppSettings: ObservableObject {
static let shared = AppSettings()
static let defaultLLMModelID = "mlx-community/Qwen3.5-2B-4bit"

@Published var hotkeyType: HotkeyType {
didSet {
Expand DownExpand Up@@ -343,7 +345,7 @@ final class AppSettings: ObservableObject {
?? (savedEngine.contains("Whisper") || savedEngine.contains("whisper") ? .whisper : nil)
?? .apple
whisperModel = ud.string(forKey: Key.whisperModel.rawValue) ?? "large-v3"
llmModel = ud.string(forKey: Key.llmModel.rawValue) ?? "mlx-community/Qwen3.5-2B-4bit"
llmModel = ud.string(forKey: Key.llmModel.rawValue) ?? Self.defaultLLMModelID
microphoneID = ud.string(forKey: Key.microphoneID.rawValue)
let savedOutput = ud.string(forKey: Key.outputMode.rawValue) ?? ""
outputMode = OutputMode(rawValue: savedOutput)
Expand Down
23 changes: 15 additions & 8 deletions Sources/Config/ModelCatalog.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,11 +91,11 @@ final class ModelCatalog: ObservableObject {
let supported = Set(rec.supported)

whisperModels = Self.curatedWhisperVariants.compactMap { variant in
let fullName = rec.supported.first { name in
guard let range = name.range(of: variant) else { return false }
let after = name[range.upperBound...]
return after.isEmpty || after.first == "_"
}
let fullName = WhisperModelSelection.matches(defaultID, variant: variant)
? defaultID
: rec.supported.first {
WhisperModelSelection.matches($0, variant: variant)
}
guard let fullName, supported.contains(fullName) else { return nil }
return ModelEntry(
id: fullName,
Expand All@@ -106,16 +106,23 @@ final class ModelCatalog: ObservableObject {
}

appendLocalWhisperModels()
if !whisperModels.contains(where: { $0.id == settings.whisperModel }) {
settings.whisperModel = defaultID
let resolvedWhisperModel = WhisperModelSelection.resolve(
requested: settings.whisperModel,
available: whisperModels.map(\.id),
fallback: defaultID
)
if settings.whisperModel != resolvedWhisperModel {
settings.whisperModel = resolvedWhisperModel
}

llmModels = Self.defaultLLMModels.map {
ModelEntry(id: $0.0, displayName: $0.1, hint: $0.2, family: $0.3, tier: $0.4)
}
appendLocalLLMModels()
if !llmModels.contains(where: { $0.id == settings.llmModel }) {
settings.llmModel = llmModels.first?.id ?? ""
settings.llmModel = llmModels.first(where: {
$0.id == AppSettings.defaultLLMModelID
})?.id ?? llmModels.first?.id ?? ""
}

asrModels = Self.defaultASRModels.map {
Expand Down
5 changes: 5 additions & 0 deletions Sources/Integration/InputSessionCoordinator+AudioFile.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,11 @@ extension InputSessionCoordinator {
guard let engine = await engineProvider.engine(settings: settings), engine.isReady else {
throw IntegrationError.modelNotReady
}
engine.configureRecognition(
context: SpeechRecognitionContext(
dictionaryEntries: PersonalDictionary.shared.entries
)
)

do {
try service.emitAudioReceived(sessionID: sessionID, clientID: clientID)
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
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
29 changes: 20 additions & 9 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,29 +154,34 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.formatting")

let started = CFAbsoluteTimeGetCurrent()
let processingOptions = TextProcessingOptions(settings: settings)
let dictionarySnapshot = PersonalDictionary.shared.snapshot()
let enableMemory = settings.enableMemory
let memoryWindowMinutes = settings.memoryWindowMinutes
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
guard !Task.isCancelled else { return VoicePipelineOutput(text: "", context: inputContext) }

let memoryContext = VoicePipelinePolicy.memoryContext(
for: .processed,
settings: settings,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)
let text = await textProcessor.process(
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext
inputContext: inputContext,
dictionarySnapshot: dictionarySnapshot
)
recordFormattingDuration(started, label: "Smart Format")
return VoicePipelineOutput(text: text, context: inputContext)
Expand All@@ -191,28 +196,34 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.formatting")

let started = CFAbsoluteTimeGetCurrent()
let processingOptions = TextProcessingOptions(settings: settings)
let dictionarySnapshot = PersonalDictionary.shared.snapshot()
let enableMemory = settings.enableMemory
let memoryWindowMinutes = settings.memoryWindowMinutes
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext.text,
outputMode: .command,
inputLanguage: settings.inputLanguage,
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
guard !Task.isCancelled else { return VoicePipelineOutput(text: "", context: inputContext) }

let memoryContext = VoicePipelinePolicy.memoryContext(
for: .command,
settings: settings,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)
let text = await textProcessor.processCommand(
text: raw,
model: settings.llmModel,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext
inputContext: inputContext,
dictionarySnapshot: dictionarySnapshot
)
recordFormattingDuration(started, label: "Voice Command formatting")
return VoicePipelineOutput(text: text, context: inputContext)
Expand Down
89 changes: 70 additions & 19 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,19 +38,35 @@ extension VoicePipeline {
settings: AppSettings,
targetApp: NSRunningApplication?
) async {
let quickText = immediateInsertText(from: raw, settings: settings)
let processingOptions = TextProcessingOptions(settings: settings)
let dictionarySnapshot = PersonalDictionary.shared.snapshot()
let enableMemory = settings.enableMemory
let memoryWindowMinutes = settings.memoryWindowMinutes
let quickText = immediateInsertText(
from: raw,
inputLanguage: processingOptions.inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
let quickContext = InputContext.capture(
targetApp: targetApp,
screenContext: "",
outputMode: .processed,
inputLanguage: settings.inputLanguage,
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
let ocrTask = screenOCRTask
let ocrStartedAt = screenOCRStartedAt
screenOCRTask = nil
screenOCRStartedAt = nil

guard !quickText.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
ocrTask?.cancel()
showNoSpeechDetected(
reason: "instant-insert preprocessing produced empty text"
)
return
}

appState.processedText = quickText
appState.phase = .inserting
appState.statusMessage = L("pipeline.inserting")
Expand DownExpand Up@@ -94,7 +110,10 @@ extension VoicePipeline {
await self?.finishDeferredSmartFormat(
replacementID: replacement.id,
raw: raw,
settings: settings,
processingOptions: processingOptions,
dictionarySnapshot: dictionarySnapshot,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
ocrTask: ocrTask,
ocrStartedAt: ocrStartedAt
)
Expand DownExpand Up@@ -153,7 +172,10 @@ extension VoicePipeline {
private func finishDeferredSmartFormat(
replacementID: UUID,
raw: String,
settings: AppSettings,
processingOptions: TextProcessingOptions,
dictionarySnapshot: PersonalDictionarySnapshot,
enableMemory: Bool,
memoryWindowMinutes: Int,
ocrTask: Task<ScreenContextSnapshot, Never>?,
ocrStartedAt: CFAbsoluteTime?
) async {
Expand All@@ -167,30 +189,28 @@ extension VoicePipeline {
guard !Task.isCancelled else { return }
guard let currentReplacement = appState.pendingReplacement, currentReplacement.id == replacementID else { return }

let inputContext = InputContext(
appName: currentReplacement.targetAppName,
bundleIdentifier: currentReplacement.targetBundleIdentifier,
windowTitle: currentReplacement.context?.windowTitle,
let inputContext = Self.deferredInputContext(
for: currentReplacement,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
inputLanguage: processingOptions.inputLanguage
)
let memoryContext = VoicePipelinePolicy.memoryContext(
for: .processed,
settings: settings,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)

let formattedText = await textProcessor.process(
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext,
allowsPreparedFallback: false
allowsPreparedFallback: false,
allowsGuardFallback: false,
dictionarySnapshot: dictionarySnapshot
)
let elapsed = CFAbsoluteTimeGetCurrent() - started
appState.lastFormattingDurationSeconds = elapsed
Expand All@@ -215,12 +235,43 @@ extension VoicePipeline {
appState.pendingReplacement = replacement
}

private func immediateInsertText(from raw: String, settings: AppSettings) -> String {
let cleaned = textProcessor.prepareForFormatting(text: raw, inputLanguage: settings.inputLanguage)
let fallback = textProcessor.basicClean(text: raw, inputLanguage: settings.inputLanguage)
static func deferredInputContext(
for replacement: DeferredReplacement,
screenContext: String,
inputLanguage: InputLanguage
) -> InputContext {
InputContext(
appName: replacement.targetAppName,
bundleIdentifier: replacement.targetBundleIdentifier,
windowTitle: replacement.context?.windowTitle,
screenContext: screenContext,
textBeforeSelection: replacement.context?.textBeforeSelection,
selectedText: replacement.context?.selectedText,
textAfterSelection: replacement.context?.textAfterSelection,
outputMode: .processed,
inputLanguage: inputLanguage,
source: .menuBar
)
}

private func immediateInsertText(
from raw: String,
inputLanguage: InputLanguage,
dictionarySnapshot: PersonalDictionarySnapshot
) -> String {
let cleaned = textProcessor.prepareForFormatting(
text: raw,
inputLanguage: inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
let fallback = textProcessor.basicClean(
text: raw,
inputLanguage: inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
if !cleaned.isEmpty { return cleaned }
if !fallback.isEmpty { return fallback }
return raw.trimmingCharacters(in: .whitespacesAndNewlines)
return ""
}

private func replacementCopyMessage(for reason: DeferredReplacementCopyReason) -> String {
Expand Down
5 changes: 5 additions & 0 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,6 +116,11 @@ final class VoicePipeline {
let micID = appState.settings.microphoneID
let language = appState.settings.inputLanguage.whisperCode
let streamingEnabled = appState.settings.enableStreamingRecognitionBeta
currentEngine?.configureRecognition(
context: SpeechRecognitionContext(
dictionaryEntries: PersonalDictionary.shared.entries
)
)
if streamingEnabled {
currentEngine?.startListening(language: language) { [weak self] partialText in
Task { @MainActor in
Expand Down
21 changes: 19 additions & 2 deletions Sources/App/VoicePipelinePolicy.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,9 +28,26 @@ enum VoicePipelinePolicy {
currentContext: InputContext? = nil,
recentContextProvider: ((Int, InputContext?) -> String)? = nil
) -> String {
guard settings.enableMemory else { return "" }
memoryContext(
for: outputMode,
enableMemory: settings.enableMemory,
memoryWindowMinutes: settings.memoryWindowMinutes,
currentContext: currentContext,
recentContextProvider: recentContextProvider
)
}

@MainActor
static func memoryContext(
for outputMode: OutputMode,
enableMemory: Bool,
memoryWindowMinutes: Int,
currentContext: InputContext? = nil,
recentContextProvider: ((Int, InputContext?) -> String)? = nil
) -> String {
guard enableMemory else { return "" }
guard outputMode != .direct else { return "" }
let provider = recentContextProvider ?? { MemoryStore.recentContext(windowMinutes: $0, currentContext: $1) }
return provider(settings.memoryWindowMinutes, currentContext)
return provider(memoryWindowMinutes, currentContext)
}
}
6 changes: 4 additions & 2 deletions Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,7 +224,8 @@ enum InputLanguage: String, Codable, CaseIterable {

var localeIdentifier: String {
switch self {
case .auto, .chinese: return "zh-CN"
case .auto: return Locale.current.identifier
case .chinese: return "zh-CN"
case .english: return "en-US"
case .japanese: return "ja-JP"
case .korean: return "ko-KR"
Expand All@@ -235,6 +236,7 @@ enum InputLanguage: String, Codable, CaseIterable {

final class AppSettings: ObservableObject {
static let shared = AppSettings()
static let defaultLLMModelID = "mlx-community/Qwen3.5-2B-4bit"

@Published var hotkeyType: HotkeyType {
didSet {
Expand DownExpand Up@@ -343,7 +345,7 @@ final class AppSettings: ObservableObject {
?? (savedEngine.contains("Whisper") || savedEngine.contains("whisper") ? .whisper : nil)
?? .apple
whisperModel = ud.string(forKey: Key.whisperModel.rawValue) ?? "large-v3"
llmModel = ud.string(forKey: Key.llmModel.rawValue) ?? "mlx-community/Qwen3.5-2B-4bit"
llmModel = ud.string(forKey: Key.llmModel.rawValue) ?? Self.defaultLLMModelID
microphoneID = ud.string(forKey: Key.microphoneID.rawValue)
let savedOutput = ud.string(forKey: Key.outputMode.rawValue) ?? ""
outputMode = OutputMode(rawValue: savedOutput)
Expand Down
23 changes: 15 additions & 8 deletions Sources/Config/ModelCatalog.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,11 +91,11 @@ final class ModelCatalog: ObservableObject {
let supported = Set(rec.supported)

whisperModels = Self.curatedWhisperVariants.compactMap { variant in
let fullName = rec.supported.first { name in
guard let range = name.range(of: variant) else { return false }
let after = name[range.upperBound...]
return after.isEmpty || after.first == "_"
}
let fullName = WhisperModelSelection.matches(defaultID, variant: variant)
? defaultID
: rec.supported.first {
WhisperModelSelection.matches($0, variant: variant)
}
guard let fullName, supported.contains(fullName) else { return nil }
return ModelEntry(
id: fullName,
Expand All@@ -106,16 +106,23 @@ final class ModelCatalog: ObservableObject {
}

appendLocalWhisperModels()
if !whisperModels.contains(where: { $0.id == settings.whisperModel }) {
settings.whisperModel = defaultID
let resolvedWhisperModel = WhisperModelSelection.resolve(
requested: settings.whisperModel,
available: whisperModels.map(\.id),
fallback: defaultID
)
if settings.whisperModel != resolvedWhisperModel {
settings.whisperModel = resolvedWhisperModel
}

llmModels = Self.defaultLLMModels.map {
ModelEntry(id: $0.0, displayName: $0.1, hint: $0.2, family: $0.3, tier: $0.4)
}
appendLocalLLMModels()
if !llmModels.contains(where: { $0.id == settings.llmModel }) {
settings.llmModel = llmModels.first?.id ?? ""
settings.llmModel = llmModels.first(where: {
$0.id == AppSettings.defaultLLMModelID
})?.id ?? llmModels.first?.id ?? ""
}

asrModels = Self.defaultASRModels.map {
Expand Down
5 changes: 5 additions & 0 deletions Sources/Integration/InputSessionCoordinator+AudioFile.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,11 @@ extension InputSessionCoordinator {
guard let engine = await engineProvider.engine(settings: settings), engine.isReady else {
throw IntegrationError.modelNotReady
}
engine.configureRecognition(
context: SpeechRecognitionContext(
dictionaryEntries: PersonalDictionary.shared.entries
)
)

do {
try service.emitAudioReceived(sessionID: sessionID, clientID: clientID)
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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
29 changes: 20 additions & 9 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,29 +154,34 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.formatting")

let started = CFAbsoluteTimeGetCurrent()
let processingOptions = TextProcessingOptions(settings: settings)
let dictionarySnapshot = PersonalDictionary.shared.snapshot()
let enableMemory = settings.enableMemory
let memoryWindowMinutes = settings.memoryWindowMinutes
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
guard !Task.isCancelled else { return VoicePipelineOutput(text: "", context: inputContext) }

let memoryContext = VoicePipelinePolicy.memoryContext(
for: .processed,
settings: settings,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)
let text = await textProcessor.process(
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext
inputContext: inputContext,
dictionarySnapshot: dictionarySnapshot
)
recordFormattingDuration(started, label: "Smart Format")
return VoicePipelineOutput(text: text, context: inputContext)
Expand All@@ -191,28 +196,34 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.formatting")

let started = CFAbsoluteTimeGetCurrent()
let processingOptions = TextProcessingOptions(settings: settings)
let dictionarySnapshot = PersonalDictionary.shared.snapshot()
let enableMemory = settings.enableMemory
let memoryWindowMinutes = settings.memoryWindowMinutes
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext.text,
outputMode: .command,
inputLanguage: settings.inputLanguage,
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
guard !Task.isCancelled else { return VoicePipelineOutput(text: "", context: inputContext) }

let memoryContext = VoicePipelinePolicy.memoryContext(
for: .command,
settings: settings,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)
let text = await textProcessor.processCommand(
text: raw,
model: settings.llmModel,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext
inputContext: inputContext,
dictionarySnapshot: dictionarySnapshot
)
recordFormattingDuration(started, label: "Voice Command formatting")
return VoicePipelineOutput(text: text, context: inputContext)
Expand Down
89 changes: 70 additions & 19 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,19 +38,35 @@ extension VoicePipeline {
settings: AppSettings,
targetApp: NSRunningApplication?
) async {
let quickText = immediateInsertText(from: raw, settings: settings)
let processingOptions = TextProcessingOptions(settings: settings)
let dictionarySnapshot = PersonalDictionary.shared.snapshot()
let enableMemory = settings.enableMemory
let memoryWindowMinutes = settings.memoryWindowMinutes
let quickText = immediateInsertText(
from: raw,
inputLanguage: processingOptions.inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
let quickContext = InputContext.capture(
targetApp: targetApp,
screenContext: "",
outputMode: .processed,
inputLanguage: settings.inputLanguage,
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
let ocrTask = screenOCRTask
let ocrStartedAt = screenOCRStartedAt
screenOCRTask = nil
screenOCRStartedAt = nil

guard !quickText.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
ocrTask?.cancel()
showNoSpeechDetected(
reason: "instant-insert preprocessing produced empty text"
)
return
}

appState.processedText = quickText
appState.phase = .inserting
appState.statusMessage = L("pipeline.inserting")
Expand DownExpand Up@@ -94,7 +110,10 @@ extension VoicePipeline {
await self?.finishDeferredSmartFormat(
replacementID: replacement.id,
raw: raw,
settings: settings,
processingOptions: processingOptions,
dictionarySnapshot: dictionarySnapshot,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
ocrTask: ocrTask,
ocrStartedAt: ocrStartedAt
)
Expand DownExpand Up@@ -153,7 +172,10 @@ extension VoicePipeline {
private func finishDeferredSmartFormat(
replacementID: UUID,
raw: String,
settings: AppSettings,
processingOptions: TextProcessingOptions,
dictionarySnapshot: PersonalDictionarySnapshot,
enableMemory: Bool,
memoryWindowMinutes: Int,
ocrTask: Task<ScreenContextSnapshot, Never>?,
ocrStartedAt: CFAbsoluteTime?
) async {
Expand All@@ -167,30 +189,28 @@ extension VoicePipeline {
guard !Task.isCancelled else { return }
guard let currentReplacement = appState.pendingReplacement, currentReplacement.id == replacementID else { return }

let inputContext = InputContext(
appName: currentReplacement.targetAppName,
bundleIdentifier: currentReplacement.targetBundleIdentifier,
windowTitle: currentReplacement.context?.windowTitle,
let inputContext = Self.deferredInputContext(
for: currentReplacement,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
inputLanguage: processingOptions.inputLanguage
)
let memoryContext = VoicePipelinePolicy.memoryContext(
for: .processed,
settings: settings,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)

let formattedText = await textProcessor.process(
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext,
allowsPreparedFallback: false
allowsPreparedFallback: false,
allowsGuardFallback: false,
dictionarySnapshot: dictionarySnapshot
)
let elapsed = CFAbsoluteTimeGetCurrent() - started
appState.lastFormattingDurationSeconds = elapsed
Expand All@@ -215,12 +235,43 @@ extension VoicePipeline {
appState.pendingReplacement = replacement
}

private func immediateInsertText(from raw: String, settings: AppSettings) -> String {
let cleaned = textProcessor.prepareForFormatting(text: raw, inputLanguage: settings.inputLanguage)
let fallback = textProcessor.basicClean(text: raw, inputLanguage: settings.inputLanguage)
static func deferredInputContext(
for replacement: DeferredReplacement,
screenContext: String,
inputLanguage: InputLanguage
) -> InputContext {
InputContext(
appName: replacement.targetAppName,
bundleIdentifier: replacement.targetBundleIdentifier,
windowTitle: replacement.context?.windowTitle,
screenContext: screenContext,
textBeforeSelection: replacement.context?.textBeforeSelection,
selectedText: replacement.context?.selectedText,
textAfterSelection: replacement.context?.textAfterSelection,
outputMode: .processed,
inputLanguage: inputLanguage,
source: .menuBar
)
}

private func immediateInsertText(
from raw: String,
inputLanguage: InputLanguage,
dictionarySnapshot: PersonalDictionarySnapshot
) -> String {
let cleaned = textProcessor.prepareForFormatting(
text: raw,
inputLanguage: inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
let fallback = textProcessor.basicClean(
text: raw,
inputLanguage: inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
if !cleaned.isEmpty { return cleaned }
if !fallback.isEmpty { return fallback }
return raw.trimmingCharacters(in: .whitespacesAndNewlines)
return ""
}

private func replacementCopyMessage(for reason: DeferredReplacementCopyReason) -> String {
Expand Down
5 changes: 5 additions & 0 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,6 +116,11 @@ final class VoicePipeline {
let micID = appState.settings.microphoneID
let language = appState.settings.inputLanguage.whisperCode
let streamingEnabled = appState.settings.enableStreamingRecognitionBeta
currentEngine?.configureRecognition(
context: SpeechRecognitionContext(
dictionaryEntries: PersonalDictionary.shared.entries
)
)
if streamingEnabled {
currentEngine?.startListening(language: language) { [weak self] partialText in
Task { @MainActor in
Expand Down
21 changes: 19 additions & 2 deletions Sources/App/VoicePipelinePolicy.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,9 +28,26 @@ enum VoicePipelinePolicy {
currentContext: InputContext? = nil,
recentContextProvider: ((Int, InputContext?) -> String)? = nil
) -> String {
guard settings.enableMemory else { return "" }
memoryContext(
for: outputMode,
enableMemory: settings.enableMemory,
memoryWindowMinutes: settings.memoryWindowMinutes,
currentContext: currentContext,
recentContextProvider: recentContextProvider
)
}

@MainActor
static func memoryContext(
for outputMode: OutputMode,
enableMemory: Bool,
memoryWindowMinutes: Int,
currentContext: InputContext? = nil,
recentContextProvider: ((Int, InputContext?) -> String)? = nil
) -> String {
guard enableMemory else { return "" }
guard outputMode != .direct else { return "" }
let provider = recentContextProvider ?? { MemoryStore.recentContext(windowMinutes: $0, currentContext: $1) }
return provider(settings.memoryWindowMinutes, currentContext)
return provider(memoryWindowMinutes, currentContext)
}
}
6 changes: 4 additions & 2 deletions Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,7 +224,8 @@ enum InputLanguage: String, Codable, CaseIterable {

var localeIdentifier: String {
switch self {
case .auto, .chinese: return "zh-CN"
case .auto: return Locale.current.identifier
case .chinese: return "zh-CN"
case .english: return "en-US"
case .japanese: return "ja-JP"
case .korean: return "ko-KR"
Expand All@@ -235,6 +236,7 @@ enum InputLanguage: String, Codable, CaseIterable {

final class AppSettings: ObservableObject {
static let shared = AppSettings()
static let defaultLLMModelID = "mlx-community/Qwen3.5-2B-4bit"

@Published var hotkeyType: HotkeyType {
didSet {
Expand DownExpand Up@@ -343,7 +345,7 @@ final class AppSettings: ObservableObject {
?? (savedEngine.contains("Whisper") || savedEngine.contains("whisper") ? .whisper : nil)
?? .apple
whisperModel = ud.string(forKey: Key.whisperModel.rawValue) ?? "large-v3"
llmModel = ud.string(forKey: Key.llmModel.rawValue) ?? "mlx-community/Qwen3.5-2B-4bit"
llmModel = ud.string(forKey: Key.llmModel.rawValue) ?? Self.defaultLLMModelID
microphoneID = ud.string(forKey: Key.microphoneID.rawValue)
let savedOutput = ud.string(forKey: Key.outputMode.rawValue) ?? ""
outputMode = OutputMode(rawValue: savedOutput)
Expand Down
23 changes: 15 additions & 8 deletions Sources/Config/ModelCatalog.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,11 +91,11 @@ final class ModelCatalog: ObservableObject {
let supported = Set(rec.supported)

whisperModels = Self.curatedWhisperVariants.compactMap { variant in
let fullName = rec.supported.first { name in
guard let range = name.range(of: variant) else { return false }
let after = name[range.upperBound...]
return after.isEmpty || after.first == "_"
}
let fullName = WhisperModelSelection.matches(defaultID, variant: variant)
? defaultID
: rec.supported.first {
WhisperModelSelection.matches($0, variant: variant)
}
guard let fullName, supported.contains(fullName) else { return nil }
return ModelEntry(
id: fullName,
Expand All@@ -106,16 +106,23 @@ final class ModelCatalog: ObservableObject {
}

appendLocalWhisperModels()
if !whisperModels.contains(where: { $0.id == settings.whisperModel }) {
settings.whisperModel = defaultID
let resolvedWhisperModel = WhisperModelSelection.resolve(
requested: settings.whisperModel,
available: whisperModels.map(\.id),
fallback: defaultID
)
if settings.whisperModel != resolvedWhisperModel {
settings.whisperModel = resolvedWhisperModel
}

llmModels = Self.defaultLLMModels.map {
ModelEntry(id: $0.0, displayName: $0.1, hint: $0.2, family: $0.3, tier: $0.4)
}
appendLocalLLMModels()
if !llmModels.contains(where: { $0.id == settings.llmModel }) {
settings.llmModel = llmModels.first?.id ?? ""
settings.llmModel = llmModels.first(where: {
$0.id == AppSettings.defaultLLMModelID
})?.id ?? llmModels.first?.id ?? ""
}

asrModels = Self.defaultASRModels.map {
Expand Down
5 changes: 5 additions & 0 deletions Sources/Integration/InputSessionCoordinator+AudioFile.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,11 @@ extension InputSessionCoordinator {
guard let engine = await engineProvider.engine(settings: settings), engine.isReady else {
throw IntegrationError.modelNotReady
}
engine.configureRecognition(
context: SpeechRecognitionContext(
dictionaryEntries: PersonalDictionary.shared.entries
)
)

do {
try service.emitAudioReceived(sessionID: sessionID, clientID: clientID)
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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
29 changes: 20 additions & 9 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,29 +154,34 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.formatting")

let started = CFAbsoluteTimeGetCurrent()
let processingOptions = TextProcessingOptions(settings: settings)
let dictionarySnapshot = PersonalDictionary.shared.snapshot()
let enableMemory = settings.enableMemory
let memoryWindowMinutes = settings.memoryWindowMinutes
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
guard !Task.isCancelled else { return VoicePipelineOutput(text: "", context: inputContext) }

let memoryContext = VoicePipelinePolicy.memoryContext(
for: .processed,
settings: settings,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)
let text = await textProcessor.process(
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext
inputContext: inputContext,
dictionarySnapshot: dictionarySnapshot
)
recordFormattingDuration(started, label: "Smart Format")
return VoicePipelineOutput(text: text, context: inputContext)
Expand All@@ -191,28 +196,34 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.formatting")

let started = CFAbsoluteTimeGetCurrent()
let processingOptions = TextProcessingOptions(settings: settings)
let dictionarySnapshot = PersonalDictionary.shared.snapshot()
let enableMemory = settings.enableMemory
let memoryWindowMinutes = settings.memoryWindowMinutes
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext.text,
outputMode: .command,
inputLanguage: settings.inputLanguage,
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
guard !Task.isCancelled else { return VoicePipelineOutput(text: "", context: inputContext) }

let memoryContext = VoicePipelinePolicy.memoryContext(
for: .command,
settings: settings,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)
let text = await textProcessor.processCommand(
text: raw,
model: settings.llmModel,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext
inputContext: inputContext,
dictionarySnapshot: dictionarySnapshot
)
recordFormattingDuration(started, label: "Voice Command formatting")
return VoicePipelineOutput(text: text, context: inputContext)
Expand Down
89 changes: 70 additions & 19 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,19 +38,35 @@ extension VoicePipeline {
settings: AppSettings,
targetApp: NSRunningApplication?
) async {
let quickText = immediateInsertText(from: raw, settings: settings)
let processingOptions = TextProcessingOptions(settings: settings)
let dictionarySnapshot = PersonalDictionary.shared.snapshot()
let enableMemory = settings.enableMemory
let memoryWindowMinutes = settings.memoryWindowMinutes
let quickText = immediateInsertText(
from: raw,
inputLanguage: processingOptions.inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
let quickContext = InputContext.capture(
targetApp: targetApp,
screenContext: "",
outputMode: .processed,
inputLanguage: settings.inputLanguage,
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
let ocrTask = screenOCRTask
let ocrStartedAt = screenOCRStartedAt
screenOCRTask = nil
screenOCRStartedAt = nil

guard !quickText.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
ocrTask?.cancel()
showNoSpeechDetected(
reason: "instant-insert preprocessing produced empty text"
)
return
}

appState.processedText = quickText
appState.phase = .inserting
appState.statusMessage = L("pipeline.inserting")
Expand DownExpand Up@@ -94,7 +110,10 @@ extension VoicePipeline {
await self?.finishDeferredSmartFormat(
replacementID: replacement.id,
raw: raw,
settings: settings,
processingOptions: processingOptions,
dictionarySnapshot: dictionarySnapshot,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
ocrTask: ocrTask,
ocrStartedAt: ocrStartedAt
)
Expand DownExpand Up@@ -153,7 +172,10 @@ extension VoicePipeline {
private func finishDeferredSmartFormat(
replacementID: UUID,
raw: String,
settings: AppSettings,
processingOptions: TextProcessingOptions,
dictionarySnapshot: PersonalDictionarySnapshot,
enableMemory: Bool,
memoryWindowMinutes: Int,
ocrTask: Task<ScreenContextSnapshot, Never>?,
ocrStartedAt: CFAbsoluteTime?
) async {
Expand All@@ -167,30 +189,28 @@ extension VoicePipeline {
guard !Task.isCancelled else { return }
guard let currentReplacement = appState.pendingReplacement, currentReplacement.id == replacementID else { return }

let inputContext = InputContext(
appName: currentReplacement.targetAppName,
bundleIdentifier: currentReplacement.targetBundleIdentifier,
windowTitle: currentReplacement.context?.windowTitle,
let inputContext = Self.deferredInputContext(
for: currentReplacement,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
inputLanguage: processingOptions.inputLanguage
)
let memoryContext = VoicePipelinePolicy.memoryContext(
for: .processed,
settings: settings,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)

let formattedText = await textProcessor.process(
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext,
allowsPreparedFallback: false
allowsPreparedFallback: false,
allowsGuardFallback: false,
dictionarySnapshot: dictionarySnapshot
)
let elapsed = CFAbsoluteTimeGetCurrent() - started
appState.lastFormattingDurationSeconds = elapsed
Expand All@@ -215,12 +235,43 @@ extension VoicePipeline {
appState.pendingReplacement = replacement
}

private func immediateInsertText(from raw: String, settings: AppSettings) -> String {
let cleaned = textProcessor.prepareForFormatting(text: raw, inputLanguage: settings.inputLanguage)
let fallback = textProcessor.basicClean(text: raw, inputLanguage: settings.inputLanguage)
static func deferredInputContext(
for replacement: DeferredReplacement,
screenContext: String,
inputLanguage: InputLanguage
) -> InputContext {
InputContext(
appName: replacement.targetAppName,
bundleIdentifier: replacement.targetBundleIdentifier,
windowTitle: replacement.context?.windowTitle,
screenContext: screenContext,
textBeforeSelection: replacement.context?.textBeforeSelection,
selectedText: replacement.context?.selectedText,
textAfterSelection: replacement.context?.textAfterSelection,
outputMode: .processed,
inputLanguage: inputLanguage,
source: .menuBar
)
}

private func immediateInsertText(
from raw: String,
inputLanguage: InputLanguage,
dictionarySnapshot: PersonalDictionarySnapshot
) -> String {
let cleaned = textProcessor.prepareForFormatting(
text: raw,
inputLanguage: inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
let fallback = textProcessor.basicClean(
text: raw,
inputLanguage: inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
if !cleaned.isEmpty { return cleaned }
if !fallback.isEmpty { return fallback }
return raw.trimmingCharacters(in: .whitespacesAndNewlines)
return ""
}

private func replacementCopyMessage(for reason: DeferredReplacementCopyReason) -> String {
Expand Down
5 changes: 5 additions & 0 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,6 +116,11 @@ final class VoicePipeline {
let micID = appState.settings.microphoneID
let language = appState.settings.inputLanguage.whisperCode
let streamingEnabled = appState.settings.enableStreamingRecognitionBeta
currentEngine?.configureRecognition(
context: SpeechRecognitionContext(
dictionaryEntries: PersonalDictionary.shared.entries
)
)
if streamingEnabled {
currentEngine?.startListening(language: language) { [weak self] partialText in
Task { @MainActor in
Expand Down
21 changes: 19 additions & 2 deletions Sources/App/VoicePipelinePolicy.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,9 +28,26 @@ enum VoicePipelinePolicy {
currentContext: InputContext? = nil,
recentContextProvider: ((Int, InputContext?) -> String)? = nil
) -> String {
guard settings.enableMemory else { return "" }
memoryContext(
for: outputMode,
enableMemory: settings.enableMemory,
memoryWindowMinutes: settings.memoryWindowMinutes,
currentContext: currentContext,
recentContextProvider: recentContextProvider
)
}

@MainActor
static func memoryContext(
for outputMode: OutputMode,
enableMemory: Bool,
memoryWindowMinutes: Int,
currentContext: InputContext? = nil,
recentContextProvider: ((Int, InputContext?) -> String)? = nil
) -> String {
guard enableMemory else { return "" }
guard outputMode != .direct else { return "" }
let provider = recentContextProvider ?? { MemoryStore.recentContext(windowMinutes: $0, currentContext: $1) }
return provider(settings.memoryWindowMinutes, currentContext)
return provider(memoryWindowMinutes, currentContext)
}
}
6 changes: 4 additions & 2 deletions Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,7 +224,8 @@ enum InputLanguage: String, Codable, CaseIterable {

var localeIdentifier: String {
switch self {
case .auto, .chinese: return "zh-CN"
case .auto: return Locale.current.identifier
case .chinese: return "zh-CN"
case .english: return "en-US"
case .japanese: return "ja-JP"
case .korean: return "ko-KR"
Expand All@@ -235,6 +236,7 @@ enum InputLanguage: String, Codable, CaseIterable {

final class AppSettings: ObservableObject {
static let shared = AppSettings()
static let defaultLLMModelID = "mlx-community/Qwen3.5-2B-4bit"

@Published var hotkeyType: HotkeyType {
didSet {
Expand DownExpand Up@@ -343,7 +345,7 @@ final class AppSettings: ObservableObject {
?? (savedEngine.contains("Whisper") || savedEngine.contains("whisper") ? .whisper : nil)
?? .apple
whisperModel = ud.string(forKey: Key.whisperModel.rawValue) ?? "large-v3"
llmModel = ud.string(forKey: Key.llmModel.rawValue) ?? "mlx-community/Qwen3.5-2B-4bit"
llmModel = ud.string(forKey: Key.llmModel.rawValue) ?? Self.defaultLLMModelID
microphoneID = ud.string(forKey: Key.microphoneID.rawValue)
let savedOutput = ud.string(forKey: Key.outputMode.rawValue) ?? ""
outputMode = OutputMode(rawValue: savedOutput)
Expand Down
23 changes: 15 additions & 8 deletions Sources/Config/ModelCatalog.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,11 +91,11 @@ final class ModelCatalog: ObservableObject {
let supported = Set(rec.supported)

whisperModels = Self.curatedWhisperVariants.compactMap { variant in
let fullName = rec.supported.first { name in
guard let range = name.range(of: variant) else { return false }
let after = name[range.upperBound...]
return after.isEmpty || after.first == "_"
}
let fullName = WhisperModelSelection.matches(defaultID, variant: variant)
? defaultID
: rec.supported.first {
WhisperModelSelection.matches($0, variant: variant)
}
guard let fullName, supported.contains(fullName) else { return nil }
return ModelEntry(
id: fullName,
Expand All@@ -106,16 +106,23 @@ final class ModelCatalog: ObservableObject {
}

appendLocalWhisperModels()
if !whisperModels.contains(where: { $0.id == settings.whisperModel }) {
settings.whisperModel = defaultID
let resolvedWhisperModel = WhisperModelSelection.resolve(
requested: settings.whisperModel,
available: whisperModels.map(\.id),
fallback: defaultID
)
if settings.whisperModel != resolvedWhisperModel {
settings.whisperModel = resolvedWhisperModel
}

llmModels = Self.defaultLLMModels.map {
ModelEntry(id: $0.0, displayName: $0.1, hint: $0.2, family: $0.3, tier: $0.4)
}
appendLocalLLMModels()
if !llmModels.contains(where: { $0.id == settings.llmModel }) {
settings.llmModel = llmModels.first?.id ?? ""
settings.llmModel = llmModels.first(where: {
$0.id == AppSettings.defaultLLMModelID
})?.id ?? llmModels.first?.id ?? ""
}

asrModels = Self.defaultASRModels.map {
Expand Down
5 changes: 5 additions & 0 deletions Sources/Integration/InputSessionCoordinator+AudioFile.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,11 @@ extension InputSessionCoordinator {
guard let engine = await engineProvider.engine(settings: settings), engine.isReady else {
throw IntegrationError.modelNotReady
}
engine.configureRecognition(
context: SpeechRecognitionContext(
dictionaryEntries: PersonalDictionary.shared.entries
)
)

do {
try service.emitAudioReceived(sessionID: sessionID, clientID: clientID)
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
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
29 changes: 20 additions & 9 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,29 +154,34 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.formatting")

let started = CFAbsoluteTimeGetCurrent()
let processingOptions = TextProcessingOptions(settings: settings)
let dictionarySnapshot = PersonalDictionary.shared.snapshot()
let enableMemory = settings.enableMemory
let memoryWindowMinutes = settings.memoryWindowMinutes
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
guard !Task.isCancelled else { return VoicePipelineOutput(text: "", context: inputContext) }

let memoryContext = VoicePipelinePolicy.memoryContext(
for: .processed,
settings: settings,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)
let text = await textProcessor.process(
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext
inputContext: inputContext,
dictionarySnapshot: dictionarySnapshot
)
recordFormattingDuration(started, label: "Smart Format")
return VoicePipelineOutput(text: text, context: inputContext)
Expand All@@ -191,28 +196,34 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.formatting")

let started = CFAbsoluteTimeGetCurrent()
let processingOptions = TextProcessingOptions(settings: settings)
let dictionarySnapshot = PersonalDictionary.shared.snapshot()
let enableMemory = settings.enableMemory
let memoryWindowMinutes = settings.memoryWindowMinutes
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext.text,
outputMode: .command,
inputLanguage: settings.inputLanguage,
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
guard !Task.isCancelled else { return VoicePipelineOutput(text: "", context: inputContext) }

let memoryContext = VoicePipelinePolicy.memoryContext(
for: .command,
settings: settings,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)
let text = await textProcessor.processCommand(
text: raw,
model: settings.llmModel,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext
inputContext: inputContext,
dictionarySnapshot: dictionarySnapshot
)
recordFormattingDuration(started, label: "Voice Command formatting")
return VoicePipelineOutput(text: text, context: inputContext)
Expand Down
89 changes: 70 additions & 19 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,19 +38,35 @@ extension VoicePipeline {
settings: AppSettings,
targetApp: NSRunningApplication?
) async {
let quickText = immediateInsertText(from: raw, settings: settings)
let processingOptions = TextProcessingOptions(settings: settings)
let dictionarySnapshot = PersonalDictionary.shared.snapshot()
let enableMemory = settings.enableMemory
let memoryWindowMinutes = settings.memoryWindowMinutes
let quickText = immediateInsertText(
from: raw,
inputLanguage: processingOptions.inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
let quickContext = InputContext.capture(
targetApp: targetApp,
screenContext: "",
outputMode: .processed,
inputLanguage: settings.inputLanguage,
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
let ocrTask = screenOCRTask
let ocrStartedAt = screenOCRStartedAt
screenOCRTask = nil
screenOCRStartedAt = nil

guard !quickText.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
ocrTask?.cancel()
showNoSpeechDetected(
reason: "instant-insert preprocessing produced empty text"
)
return
}

appState.processedText = quickText
appState.phase = .inserting
appState.statusMessage = L("pipeline.inserting")
Expand DownExpand Up@@ -94,7 +110,10 @@ extension VoicePipeline {
await self?.finishDeferredSmartFormat(
replacementID: replacement.id,
raw: raw,
settings: settings,
processingOptions: processingOptions,
dictionarySnapshot: dictionarySnapshot,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
ocrTask: ocrTask,
ocrStartedAt: ocrStartedAt
)
Expand DownExpand Up@@ -153,7 +172,10 @@ extension VoicePipeline {
private func finishDeferredSmartFormat(
replacementID: UUID,
raw: String,
settings: AppSettings,
processingOptions: TextProcessingOptions,
dictionarySnapshot: PersonalDictionarySnapshot,
enableMemory: Bool,
memoryWindowMinutes: Int,
ocrTask: Task<ScreenContextSnapshot, Never>?,
ocrStartedAt: CFAbsoluteTime?
) async {
Expand All@@ -167,30 +189,28 @@ extension VoicePipeline {
guard !Task.isCancelled else { return }
guard let currentReplacement = appState.pendingReplacement, currentReplacement.id == replacementID else { return }

let inputContext = InputContext(
appName: currentReplacement.targetAppName,
bundleIdentifier: currentReplacement.targetBundleIdentifier,
windowTitle: currentReplacement.context?.windowTitle,
let inputContext = Self.deferredInputContext(
for: currentReplacement,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
inputLanguage: processingOptions.inputLanguage
)
let memoryContext = VoicePipelinePolicy.memoryContext(
for: .processed,
settings: settings,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)

let formattedText = await textProcessor.process(
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext,
allowsPreparedFallback: false
allowsPreparedFallback: false,
allowsGuardFallback: false,
dictionarySnapshot: dictionarySnapshot
)
let elapsed = CFAbsoluteTimeGetCurrent() - started
appState.lastFormattingDurationSeconds = elapsed
Expand All@@ -215,12 +235,43 @@ extension VoicePipeline {
appState.pendingReplacement = replacement
}

private func immediateInsertText(from raw: String, settings: AppSettings) -> String {
let cleaned = textProcessor.prepareForFormatting(text: raw, inputLanguage: settings.inputLanguage)
let fallback = textProcessor.basicClean(text: raw, inputLanguage: settings.inputLanguage)
static func deferredInputContext(
for replacement: DeferredReplacement,
screenContext: String,
inputLanguage: InputLanguage
) -> InputContext {
InputContext(
appName: replacement.targetAppName,
bundleIdentifier: replacement.targetBundleIdentifier,
windowTitle: replacement.context?.windowTitle,
screenContext: screenContext,
textBeforeSelection: replacement.context?.textBeforeSelection,
selectedText: replacement.context?.selectedText,
textAfterSelection: replacement.context?.textAfterSelection,
outputMode: .processed,
inputLanguage: inputLanguage,
source: .menuBar
)
}

private func immediateInsertText(
from raw: String,
inputLanguage: InputLanguage,
dictionarySnapshot: PersonalDictionarySnapshot
) -> String {
let cleaned = textProcessor.prepareForFormatting(
text: raw,
inputLanguage: inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
let fallback = textProcessor.basicClean(
text: raw,
inputLanguage: inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
if !cleaned.isEmpty { return cleaned }
if !fallback.isEmpty { return fallback }
return raw.trimmingCharacters(in: .whitespacesAndNewlines)
return ""
}

private func replacementCopyMessage(for reason: DeferredReplacementCopyReason) -> String {
Expand Down
5 changes: 5 additions & 0 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,6 +116,11 @@ final class VoicePipeline {
let micID = appState.settings.microphoneID
let language = appState.settings.inputLanguage.whisperCode
let streamingEnabled = appState.settings.enableStreamingRecognitionBeta
currentEngine?.configureRecognition(
context: SpeechRecognitionContext(
dictionaryEntries: PersonalDictionary.shared.entries
)
)
if streamingEnabled {
currentEngine?.startListening(language: language) { [weak self] partialText in
Task { @MainActor in
Expand Down
21 changes: 19 additions & 2 deletions Sources/App/VoicePipelinePolicy.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,9 +28,26 @@ enum VoicePipelinePolicy {
currentContext: InputContext? = nil,
recentContextProvider: ((Int, InputContext?) -> String)? = nil
) -> String {
guard settings.enableMemory else { return "" }
memoryContext(
for: outputMode,
enableMemory: settings.enableMemory,
memoryWindowMinutes: settings.memoryWindowMinutes,
currentContext: currentContext,
recentContextProvider: recentContextProvider
)
}

@MainActor
static func memoryContext(
for outputMode: OutputMode,
enableMemory: Bool,
memoryWindowMinutes: Int,
currentContext: InputContext? = nil,
recentContextProvider: ((Int, InputContext?) -> String)? = nil
) -> String {
guard enableMemory else { return "" }
guard outputMode != .direct else { return "" }
let provider = recentContextProvider ?? { MemoryStore.recentContext(windowMinutes: $0, currentContext: $1) }
return provider(settings.memoryWindowMinutes, currentContext)
return provider(memoryWindowMinutes, currentContext)
}
}
6 changes: 4 additions & 2 deletions Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,7 +224,8 @@ enum InputLanguage: String, Codable, CaseIterable {

var localeIdentifier: String {
switch self {
case .auto, .chinese: return "zh-CN"
case .auto: return Locale.current.identifier
case .chinese: return "zh-CN"
case .english: return "en-US"
case .japanese: return "ja-JP"
case .korean: return "ko-KR"
Expand All@@ -235,6 +236,7 @@ enum InputLanguage: String, Codable, CaseIterable {

final class AppSettings: ObservableObject {
static let shared = AppSettings()
static let defaultLLMModelID = "mlx-community/Qwen3.5-2B-4bit"

@Published var hotkeyType: HotkeyType {
didSet {
Expand DownExpand Up@@ -343,7 +345,7 @@ final class AppSettings: ObservableObject {
?? (savedEngine.contains("Whisper") || savedEngine.contains("whisper") ? .whisper : nil)
?? .apple
whisperModel = ud.string(forKey: Key.whisperModel.rawValue) ?? "large-v3"
llmModel = ud.string(forKey: Key.llmModel.rawValue) ?? "mlx-community/Qwen3.5-2B-4bit"
llmModel = ud.string(forKey: Key.llmModel.rawValue) ?? Self.defaultLLMModelID
microphoneID = ud.string(forKey: Key.microphoneID.rawValue)
let savedOutput = ud.string(forKey: Key.outputMode.rawValue) ?? ""
outputMode = OutputMode(rawValue: savedOutput)
Expand Down
23 changes: 15 additions & 8 deletions Sources/Config/ModelCatalog.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,11 +91,11 @@ final class ModelCatalog: ObservableObject {
let supported = Set(rec.supported)

whisperModels = Self.curatedWhisperVariants.compactMap { variant in
let fullName = rec.supported.first { name in
guard let range = name.range(of: variant) else { return false }
let after = name[range.upperBound...]
return after.isEmpty || after.first == "_"
}
let fullName = WhisperModelSelection.matches(defaultID, variant: variant)
? defaultID
: rec.supported.first {
WhisperModelSelection.matches($0, variant: variant)
}
guard let fullName, supported.contains(fullName) else { return nil }
return ModelEntry(
id: fullName,
Expand All@@ -106,16 +106,23 @@ final class ModelCatalog: ObservableObject {
}

appendLocalWhisperModels()
if !whisperModels.contains(where: { $0.id == settings.whisperModel }) {
settings.whisperModel = defaultID
let resolvedWhisperModel = WhisperModelSelection.resolve(
requested: settings.whisperModel,
available: whisperModels.map(\.id),
fallback: defaultID
)
if settings.whisperModel != resolvedWhisperModel {
settings.whisperModel = resolvedWhisperModel
}

llmModels = Self.defaultLLMModels.map {
ModelEntry(id: $0.0, displayName: $0.1, hint: $0.2, family: $0.3, tier: $0.4)
}
appendLocalLLMModels()
if !llmModels.contains(where: { $0.id == settings.llmModel }) {
settings.llmModel = llmModels.first?.id ?? ""
settings.llmModel = llmModels.first(where: {
$0.id == AppSettings.defaultLLMModelID
})?.id ?? llmModels.first?.id ?? ""
}

asrModels = Self.defaultASRModels.map {
Expand Down
5 changes: 5 additions & 0 deletions Sources/Integration/InputSessionCoordinator+AudioFile.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,11 @@ extension InputSessionCoordinator {
guard let engine = await engineProvider.engine(settings: settings), engine.isReady else {
throw IntegrationError.modelNotReady
}
engine.configureRecognition(
context: SpeechRecognitionContext(
dictionaryEntries: PersonalDictionary.shared.entries
)
)

do {
try service.emitAudioReceived(sessionID: sessionID, clientID: clientID)
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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
29 changes: 20 additions & 9 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,29 +154,34 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.formatting")

let started = CFAbsoluteTimeGetCurrent()
let processingOptions = TextProcessingOptions(settings: settings)
let dictionarySnapshot = PersonalDictionary.shared.snapshot()
let enableMemory = settings.enableMemory
let memoryWindowMinutes = settings.memoryWindowMinutes
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
guard !Task.isCancelled else { return VoicePipelineOutput(text: "", context: inputContext) }

let memoryContext = VoicePipelinePolicy.memoryContext(
for: .processed,
settings: settings,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)
let text = await textProcessor.process(
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext
inputContext: inputContext,
dictionarySnapshot: dictionarySnapshot
)
recordFormattingDuration(started, label: "Smart Format")
return VoicePipelineOutput(text: text, context: inputContext)
Expand All@@ -191,28 +196,34 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.formatting")

let started = CFAbsoluteTimeGetCurrent()
let processingOptions = TextProcessingOptions(settings: settings)
let dictionarySnapshot = PersonalDictionary.shared.snapshot()
let enableMemory = settings.enableMemory
let memoryWindowMinutes = settings.memoryWindowMinutes
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext.text,
outputMode: .command,
inputLanguage: settings.inputLanguage,
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
guard !Task.isCancelled else { return VoicePipelineOutput(text: "", context: inputContext) }

let memoryContext = VoicePipelinePolicy.memoryContext(
for: .command,
settings: settings,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)
let text = await textProcessor.processCommand(
text: raw,
model: settings.llmModel,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext
inputContext: inputContext,
dictionarySnapshot: dictionarySnapshot
)
recordFormattingDuration(started, label: "Voice Command formatting")
return VoicePipelineOutput(text: text, context: inputContext)
Expand Down
89 changes: 70 additions & 19 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,19 +38,35 @@ extension VoicePipeline {
settings: AppSettings,
targetApp: NSRunningApplication?
) async {
let quickText = immediateInsertText(from: raw, settings: settings)
let processingOptions = TextProcessingOptions(settings: settings)
let dictionarySnapshot = PersonalDictionary.shared.snapshot()
let enableMemory = settings.enableMemory
let memoryWindowMinutes = settings.memoryWindowMinutes
let quickText = immediateInsertText(
from: raw,
inputLanguage: processingOptions.inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
let quickContext = InputContext.capture(
targetApp: targetApp,
screenContext: "",
outputMode: .processed,
inputLanguage: settings.inputLanguage,
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
let ocrTask = screenOCRTask
let ocrStartedAt = screenOCRStartedAt
screenOCRTask = nil
screenOCRStartedAt = nil

guard !quickText.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
ocrTask?.cancel()
showNoSpeechDetected(
reason: "instant-insert preprocessing produced empty text"
)
return
}

appState.processedText = quickText
appState.phase = .inserting
appState.statusMessage = L("pipeline.inserting")
Expand DownExpand Up@@ -94,7 +110,10 @@ extension VoicePipeline {
await self?.finishDeferredSmartFormat(
replacementID: replacement.id,
raw: raw,
settings: settings,
processingOptions: processingOptions,
dictionarySnapshot: dictionarySnapshot,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
ocrTask: ocrTask,
ocrStartedAt: ocrStartedAt
)
Expand DownExpand Up@@ -153,7 +172,10 @@ extension VoicePipeline {
private func finishDeferredSmartFormat(
replacementID: UUID,
raw: String,
settings: AppSettings,
processingOptions: TextProcessingOptions,
dictionarySnapshot: PersonalDictionarySnapshot,
enableMemory: Bool,
memoryWindowMinutes: Int,
ocrTask: Task<ScreenContextSnapshot, Never>?,
ocrStartedAt: CFAbsoluteTime?
) async {
Expand All@@ -167,30 +189,28 @@ extension VoicePipeline {
guard !Task.isCancelled else { return }
guard let currentReplacement = appState.pendingReplacement, currentReplacement.id == replacementID else { return }

let inputContext = InputContext(
appName: currentReplacement.targetAppName,
bundleIdentifier: currentReplacement.targetBundleIdentifier,
windowTitle: currentReplacement.context?.windowTitle,
let inputContext = Self.deferredInputContext(
for: currentReplacement,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
inputLanguage: processingOptions.inputLanguage
)
let memoryContext = VoicePipelinePolicy.memoryContext(
for: .processed,
settings: settings,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)

let formattedText = await textProcessor.process(
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext,
allowsPreparedFallback: false
allowsPreparedFallback: false,
allowsGuardFallback: false,
dictionarySnapshot: dictionarySnapshot
)
let elapsed = CFAbsoluteTimeGetCurrent() - started
appState.lastFormattingDurationSeconds = elapsed
Expand All@@ -215,12 +235,43 @@ extension VoicePipeline {
appState.pendingReplacement = replacement
}

private func immediateInsertText(from raw: String, settings: AppSettings) -> String {
let cleaned = textProcessor.prepareForFormatting(text: raw, inputLanguage: settings.inputLanguage)
let fallback = textProcessor.basicClean(text: raw, inputLanguage: settings.inputLanguage)
static func deferredInputContext(
for replacement: DeferredReplacement,
screenContext: String,
inputLanguage: InputLanguage
) -> InputContext {
InputContext(
appName: replacement.targetAppName,
bundleIdentifier: replacement.targetBundleIdentifier,
windowTitle: replacement.context?.windowTitle,
screenContext: screenContext,
textBeforeSelection: replacement.context?.textBeforeSelection,
selectedText: replacement.context?.selectedText,
textAfterSelection: replacement.context?.textAfterSelection,
outputMode: .processed,
inputLanguage: inputLanguage,
source: .menuBar
)
}

private func immediateInsertText(
from raw: String,
inputLanguage: InputLanguage,
dictionarySnapshot: PersonalDictionarySnapshot
) -> String {
let cleaned = textProcessor.prepareForFormatting(
text: raw,
inputLanguage: inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
let fallback = textProcessor.basicClean(
text: raw,
inputLanguage: inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
if !cleaned.isEmpty { return cleaned }
if !fallback.isEmpty { return fallback }
return raw.trimmingCharacters(in: .whitespacesAndNewlines)
return ""
}

private func replacementCopyMessage(for reason: DeferredReplacementCopyReason) -> String {
Expand Down
5 changes: 5 additions & 0 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,6 +116,11 @@ final class VoicePipeline {
let micID = appState.settings.microphoneID
let language = appState.settings.inputLanguage.whisperCode
let streamingEnabled = appState.settings.enableStreamingRecognitionBeta
currentEngine?.configureRecognition(
context: SpeechRecognitionContext(
dictionaryEntries: PersonalDictionary.shared.entries
)
)
if streamingEnabled {
currentEngine?.startListening(language: language) { [weak self] partialText in
Task { @MainActor in
Expand Down
21 changes: 19 additions & 2 deletions Sources/App/VoicePipelinePolicy.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,9 +28,26 @@ enum VoicePipelinePolicy {
currentContext: InputContext? = nil,
recentContextProvider: ((Int, InputContext?) -> String)? = nil
) -> String {
guard settings.enableMemory else { return "" }
memoryContext(
for: outputMode,
enableMemory: settings.enableMemory,
memoryWindowMinutes: settings.memoryWindowMinutes,
currentContext: currentContext,
recentContextProvider: recentContextProvider
)
}

@MainActor
static func memoryContext(
for outputMode: OutputMode,
enableMemory: Bool,
memoryWindowMinutes: Int,
currentContext: InputContext? = nil,
recentContextProvider: ((Int, InputContext?) -> String)? = nil
) -> String {
guard enableMemory else { return "" }
guard outputMode != .direct else { return "" }
let provider = recentContextProvider ?? { MemoryStore.recentContext(windowMinutes: $0, currentContext: $1) }
return provider(settings.memoryWindowMinutes, currentContext)
return provider(memoryWindowMinutes, currentContext)
}
}
6 changes: 4 additions & 2 deletions Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,7 +224,8 @@ enum InputLanguage: String, Codable, CaseIterable {

var localeIdentifier: String {
switch self {
case .auto, .chinese: return "zh-CN"
case .auto: return Locale.current.identifier
case .chinese: return "zh-CN"
case .english: return "en-US"
case .japanese: return "ja-JP"
case .korean: return "ko-KR"
Expand All@@ -235,6 +236,7 @@ enum InputLanguage: String, Codable, CaseIterable {

final class AppSettings: ObservableObject {
static let shared = AppSettings()
static let defaultLLMModelID = "mlx-community/Qwen3.5-2B-4bit"

@Published var hotkeyType: HotkeyType {
didSet {
Expand DownExpand Up@@ -343,7 +345,7 @@ final class AppSettings: ObservableObject {
?? (savedEngine.contains("Whisper") || savedEngine.contains("whisper") ? .whisper : nil)
?? .apple
whisperModel = ud.string(forKey: Key.whisperModel.rawValue) ?? "large-v3"
llmModel = ud.string(forKey: Key.llmModel.rawValue) ?? "mlx-community/Qwen3.5-2B-4bit"
llmModel = ud.string(forKey: Key.llmModel.rawValue) ?? Self.defaultLLMModelID
microphoneID = ud.string(forKey: Key.microphoneID.rawValue)
let savedOutput = ud.string(forKey: Key.outputMode.rawValue) ?? ""
outputMode = OutputMode(rawValue: savedOutput)
Expand Down
23 changes: 15 additions & 8 deletions Sources/Config/ModelCatalog.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,11 +91,11 @@ final class ModelCatalog: ObservableObject {
let supported = Set(rec.supported)

whisperModels = Self.curatedWhisperVariants.compactMap { variant in
let fullName = rec.supported.first { name in
guard let range = name.range(of: variant) else { return false }
let after = name[range.upperBound...]
return after.isEmpty || after.first == "_"
}
let fullName = WhisperModelSelection.matches(defaultID, variant: variant)
? defaultID
: rec.supported.first {
WhisperModelSelection.matches($0, variant: variant)
}
guard let fullName, supported.contains(fullName) else { return nil }
return ModelEntry(
id: fullName,
Expand All@@ -106,16 +106,23 @@ final class ModelCatalog: ObservableObject {
}

appendLocalWhisperModels()
if !whisperModels.contains(where: { $0.id == settings.whisperModel }) {
settings.whisperModel = defaultID
let resolvedWhisperModel = WhisperModelSelection.resolve(
requested: settings.whisperModel,
available: whisperModels.map(\.id),
fallback: defaultID
)
if settings.whisperModel != resolvedWhisperModel {
settings.whisperModel = resolvedWhisperModel
}

llmModels = Self.defaultLLMModels.map {
ModelEntry(id: $0.0, displayName: $0.1, hint: $0.2, family: $0.3, tier: $0.4)
}
appendLocalLLMModels()
if !llmModels.contains(where: { $0.id == settings.llmModel }) {
settings.llmModel = llmModels.first?.id ?? ""
settings.llmModel = llmModels.first(where: {
$0.id == AppSettings.defaultLLMModelID
})?.id ?? llmModels.first?.id ?? ""
}

asrModels = Self.defaultASRModels.map {
Expand Down
5 changes: 5 additions & 0 deletions Sources/Integration/InputSessionCoordinator+AudioFile.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,11 @@ extension InputSessionCoordinator {
guard let engine = await engineProvider.engine(settings: settings), engine.isReady else {
throw IntegrationError.modelNotReady
}
engine.configureRecognition(
context: SpeechRecognitionContext(
dictionaryEntries: PersonalDictionary.shared.entries
)
)

do {
try service.emitAudioReceived(sessionID: sessionID, clientID: clientID)
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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
29 changes: 20 additions & 9 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,29 +154,34 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.formatting")

let started = CFAbsoluteTimeGetCurrent()
let processingOptions = TextProcessingOptions(settings: settings)
let dictionarySnapshot = PersonalDictionary.shared.snapshot()
let enableMemory = settings.enableMemory
let memoryWindowMinutes = settings.memoryWindowMinutes
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
guard !Task.isCancelled else { return VoicePipelineOutput(text: "", context: inputContext) }

let memoryContext = VoicePipelinePolicy.memoryContext(
for: .processed,
settings: settings,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)
let text = await textProcessor.process(
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext
inputContext: inputContext,
dictionarySnapshot: dictionarySnapshot
)
recordFormattingDuration(started, label: "Smart Format")
return VoicePipelineOutput(text: text, context: inputContext)
Expand All@@ -191,28 +196,34 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.formatting")

let started = CFAbsoluteTimeGetCurrent()
let processingOptions = TextProcessingOptions(settings: settings)
let dictionarySnapshot = PersonalDictionary.shared.snapshot()
let enableMemory = settings.enableMemory
let memoryWindowMinutes = settings.memoryWindowMinutes
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext.text,
outputMode: .command,
inputLanguage: settings.inputLanguage,
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
guard !Task.isCancelled else { return VoicePipelineOutput(text: "", context: inputContext) }

let memoryContext = VoicePipelinePolicy.memoryContext(
for: .command,
settings: settings,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)
let text = await textProcessor.processCommand(
text: raw,
model: settings.llmModel,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext
inputContext: inputContext,
dictionarySnapshot: dictionarySnapshot
)
recordFormattingDuration(started, label: "Voice Command formatting")
return VoicePipelineOutput(text: text, context: inputContext)
Expand Down
89 changes: 70 additions & 19 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,19 +38,35 @@ extension VoicePipeline {
settings: AppSettings,
targetApp: NSRunningApplication?
) async {
let quickText = immediateInsertText(from: raw, settings: settings)
let processingOptions = TextProcessingOptions(settings: settings)
let dictionarySnapshot = PersonalDictionary.shared.snapshot()
let enableMemory = settings.enableMemory
let memoryWindowMinutes = settings.memoryWindowMinutes
let quickText = immediateInsertText(
from: raw,
inputLanguage: processingOptions.inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
let quickContext = InputContext.capture(
targetApp: targetApp,
screenContext: "",
outputMode: .processed,
inputLanguage: settings.inputLanguage,
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
let ocrTask = screenOCRTask
let ocrStartedAt = screenOCRStartedAt
screenOCRTask = nil
screenOCRStartedAt = nil

guard !quickText.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
ocrTask?.cancel()
showNoSpeechDetected(
reason: "instant-insert preprocessing produced empty text"
)
return
}

appState.processedText = quickText
appState.phase = .inserting
appState.statusMessage = L("pipeline.inserting")
Expand DownExpand Up@@ -94,7 +110,10 @@ extension VoicePipeline {
await self?.finishDeferredSmartFormat(
replacementID: replacement.id,
raw: raw,
settings: settings,
processingOptions: processingOptions,
dictionarySnapshot: dictionarySnapshot,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
ocrTask: ocrTask,
ocrStartedAt: ocrStartedAt
)
Expand DownExpand Up@@ -153,7 +172,10 @@ extension VoicePipeline {
private func finishDeferredSmartFormat(
replacementID: UUID,
raw: String,
settings: AppSettings,
processingOptions: TextProcessingOptions,
dictionarySnapshot: PersonalDictionarySnapshot,
enableMemory: Bool,
memoryWindowMinutes: Int,
ocrTask: Task<ScreenContextSnapshot, Never>?,
ocrStartedAt: CFAbsoluteTime?
) async {
Expand All@@ -167,30 +189,28 @@ extension VoicePipeline {
guard !Task.isCancelled else { return }
guard let currentReplacement = appState.pendingReplacement, currentReplacement.id == replacementID else { return }

let inputContext = InputContext(
appName: currentReplacement.targetAppName,
bundleIdentifier: currentReplacement.targetBundleIdentifier,
windowTitle: currentReplacement.context?.windowTitle,
let inputContext = Self.deferredInputContext(
for: currentReplacement,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
inputLanguage: processingOptions.inputLanguage
)
let memoryContext = VoicePipelinePolicy.memoryContext(
for: .processed,
settings: settings,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)

let formattedText = await textProcessor.process(
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext,
allowsPreparedFallback: false
allowsPreparedFallback: false,
allowsGuardFallback: false,
dictionarySnapshot: dictionarySnapshot
)
let elapsed = CFAbsoluteTimeGetCurrent() - started
appState.lastFormattingDurationSeconds = elapsed
Expand All@@ -215,12 +235,43 @@ extension VoicePipeline {
appState.pendingReplacement = replacement
}

private func immediateInsertText(from raw: String, settings: AppSettings) -> String {
let cleaned = textProcessor.prepareForFormatting(text: raw, inputLanguage: settings.inputLanguage)
let fallback = textProcessor.basicClean(text: raw, inputLanguage: settings.inputLanguage)
static func deferredInputContext(
for replacement: DeferredReplacement,
screenContext: String,
inputLanguage: InputLanguage
) -> InputContext {
InputContext(
appName: replacement.targetAppName,
bundleIdentifier: replacement.targetBundleIdentifier,
windowTitle: replacement.context?.windowTitle,
screenContext: screenContext,
textBeforeSelection: replacement.context?.textBeforeSelection,
selectedText: replacement.context?.selectedText,
textAfterSelection: replacement.context?.textAfterSelection,
outputMode: .processed,
inputLanguage: inputLanguage,
source: .menuBar
)
}

private func immediateInsertText(
from raw: String,
inputLanguage: InputLanguage,
dictionarySnapshot: PersonalDictionarySnapshot
) -> String {
let cleaned = textProcessor.prepareForFormatting(
text: raw,
inputLanguage: inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
let fallback = textProcessor.basicClean(
text: raw,
inputLanguage: inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
if !cleaned.isEmpty { return cleaned }
if !fallback.isEmpty { return fallback }
return raw.trimmingCharacters(in: .whitespacesAndNewlines)
return ""
}

private func replacementCopyMessage(for reason: DeferredReplacementCopyReason) -> String {
Expand Down
5 changes: 5 additions & 0 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,6 +116,11 @@ final class VoicePipeline {
let micID = appState.settings.microphoneID
let language = appState.settings.inputLanguage.whisperCode
let streamingEnabled = appState.settings.enableStreamingRecognitionBeta
currentEngine?.configureRecognition(
context: SpeechRecognitionContext(
dictionaryEntries: PersonalDictionary.shared.entries
)
)
if streamingEnabled {
currentEngine?.startListening(language: language) { [weak self] partialText in
Task { @MainActor in
Expand Down
21 changes: 19 additions & 2 deletions Sources/App/VoicePipelinePolicy.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,9 +28,26 @@ enum VoicePipelinePolicy {
currentContext: InputContext? = nil,
recentContextProvider: ((Int, InputContext?) -> String)? = nil
) -> String {
guard settings.enableMemory else { return "" }
memoryContext(
for: outputMode,
enableMemory: settings.enableMemory,
memoryWindowMinutes: settings.memoryWindowMinutes,
currentContext: currentContext,
recentContextProvider: recentContextProvider
)
}

@MainActor
static func memoryContext(
for outputMode: OutputMode,
enableMemory: Bool,
memoryWindowMinutes: Int,
currentContext: InputContext? = nil,
recentContextProvider: ((Int, InputContext?) -> String)? = nil
) -> String {
guard enableMemory else { return "" }
guard outputMode != .direct else { return "" }
let provider = recentContextProvider ?? { MemoryStore.recentContext(windowMinutes: $0, currentContext: $1) }
return provider(settings.memoryWindowMinutes, currentContext)
return provider(memoryWindowMinutes, currentContext)
}
}
6 changes: 4 additions & 2 deletions Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,7 +224,8 @@ enum InputLanguage: String, Codable, CaseIterable {

var localeIdentifier: String {
switch self {
case .auto, .chinese: return "zh-CN"
case .auto: return Locale.current.identifier
case .chinese: return "zh-CN"
case .english: return "en-US"
case .japanese: return "ja-JP"
case .korean: return "ko-KR"
Expand All@@ -235,6 +236,7 @@ enum InputLanguage: String, Codable, CaseIterable {

final class AppSettings: ObservableObject {
static let shared = AppSettings()
static let defaultLLMModelID = "mlx-community/Qwen3.5-2B-4bit"

@Published var hotkeyType: HotkeyType {
didSet {
Expand DownExpand Up@@ -343,7 +345,7 @@ final class AppSettings: ObservableObject {
?? (savedEngine.contains("Whisper") || savedEngine.contains("whisper") ? .whisper : nil)
?? .apple
whisperModel = ud.string(forKey: Key.whisperModel.rawValue) ?? "large-v3"
llmModel = ud.string(forKey: Key.llmModel.rawValue) ?? "mlx-community/Qwen3.5-2B-4bit"
llmModel = ud.string(forKey: Key.llmModel.rawValue) ?? Self.defaultLLMModelID
microphoneID = ud.string(forKey: Key.microphoneID.rawValue)
let savedOutput = ud.string(forKey: Key.outputMode.rawValue) ?? ""
outputMode = OutputMode(rawValue: savedOutput)
Expand Down
23 changes: 15 additions & 8 deletions Sources/Config/ModelCatalog.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,11 +91,11 @@ final class ModelCatalog: ObservableObject {
let supported = Set(rec.supported)

whisperModels = Self.curatedWhisperVariants.compactMap { variant in
let fullName = rec.supported.first { name in
guard let range = name.range(of: variant) else { return false }
let after = name[range.upperBound...]
return after.isEmpty || after.first == "_"
}
let fullName = WhisperModelSelection.matches(defaultID, variant: variant)
? defaultID
: rec.supported.first {
WhisperModelSelection.matches($0, variant: variant)
}
guard let fullName, supported.contains(fullName) else { return nil }
return ModelEntry(
id: fullName,
Expand All@@ -106,16 +106,23 @@ final class ModelCatalog: ObservableObject {
}

appendLocalWhisperModels()
if !whisperModels.contains(where: { $0.id == settings.whisperModel }) {
settings.whisperModel = defaultID
let resolvedWhisperModel = WhisperModelSelection.resolve(
requested: settings.whisperModel,
available: whisperModels.map(\.id),
fallback: defaultID
)
if settings.whisperModel != resolvedWhisperModel {
settings.whisperModel = resolvedWhisperModel
}

llmModels = Self.defaultLLMModels.map {
ModelEntry(id: $0.0, displayName: $0.1, hint: $0.2, family: $0.3, tier: $0.4)
}
appendLocalLLMModels()
if !llmModels.contains(where: { $0.id == settings.llmModel }) {
settings.llmModel = llmModels.first?.id ?? ""
settings.llmModel = llmModels.first(where: {
$0.id == AppSettings.defaultLLMModelID
})?.id ?? llmModels.first?.id ?? ""
}

asrModels = Self.defaultASRModels.map {
Expand Down
5 changes: 5 additions & 0 deletions Sources/Integration/InputSessionCoordinator+AudioFile.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,11 @@ extension InputSessionCoordinator {
guard let engine = await engineProvider.engine(settings: settings), engine.isReady else {
throw IntegrationError.modelNotReady
}
engine.configureRecognition(
context: SpeechRecognitionContext(
dictionaryEntries: PersonalDictionary.shared.entries
)
)

do {
try service.emitAudioReceived(sessionID: sessionID, clientID: clientID)
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
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
29 changes: 20 additions & 9 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,29 +154,34 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.formatting")

let started = CFAbsoluteTimeGetCurrent()
let processingOptions = TextProcessingOptions(settings: settings)
let dictionarySnapshot = PersonalDictionary.shared.snapshot()
let enableMemory = settings.enableMemory
let memoryWindowMinutes = settings.memoryWindowMinutes
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
guard !Task.isCancelled else { return VoicePipelineOutput(text: "", context: inputContext) }

let memoryContext = VoicePipelinePolicy.memoryContext(
for: .processed,
settings: settings,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)
let text = await textProcessor.process(
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext
inputContext: inputContext,
dictionarySnapshot: dictionarySnapshot
)
recordFormattingDuration(started, label: "Smart Format")
return VoicePipelineOutput(text: text, context: inputContext)
Expand All@@ -191,28 +196,34 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.formatting")

let started = CFAbsoluteTimeGetCurrent()
let processingOptions = TextProcessingOptions(settings: settings)
let dictionarySnapshot = PersonalDictionary.shared.snapshot()
let enableMemory = settings.enableMemory
let memoryWindowMinutes = settings.memoryWindowMinutes
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext.text,
outputMode: .command,
inputLanguage: settings.inputLanguage,
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
guard !Task.isCancelled else { return VoicePipelineOutput(text: "", context: inputContext) }

let memoryContext = VoicePipelinePolicy.memoryContext(
for: .command,
settings: settings,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)
let text = await textProcessor.processCommand(
text: raw,
model: settings.llmModel,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext
inputContext: inputContext,
dictionarySnapshot: dictionarySnapshot
)
recordFormattingDuration(started, label: "Voice Command formatting")
return VoicePipelineOutput(text: text, context: inputContext)
Expand Down
89 changes: 70 additions & 19 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,19 +38,35 @@ extension VoicePipeline {
settings: AppSettings,
targetApp: NSRunningApplication?
) async {
let quickText = immediateInsertText(from: raw, settings: settings)
let processingOptions = TextProcessingOptions(settings: settings)
let dictionarySnapshot = PersonalDictionary.shared.snapshot()
let enableMemory = settings.enableMemory
let memoryWindowMinutes = settings.memoryWindowMinutes
let quickText = immediateInsertText(
from: raw,
inputLanguage: processingOptions.inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
let quickContext = InputContext.capture(
targetApp: targetApp,
screenContext: "",
outputMode: .processed,
inputLanguage: settings.inputLanguage,
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
let ocrTask = screenOCRTask
let ocrStartedAt = screenOCRStartedAt
screenOCRTask = nil
screenOCRStartedAt = nil

guard !quickText.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
ocrTask?.cancel()
showNoSpeechDetected(
reason: "instant-insert preprocessing produced empty text"
)
return
}

appState.processedText = quickText
appState.phase = .inserting
appState.statusMessage = L("pipeline.inserting")
Expand DownExpand Up@@ -94,7 +110,10 @@ extension VoicePipeline {
await self?.finishDeferredSmartFormat(
replacementID: replacement.id,
raw: raw,
settings: settings,
processingOptions: processingOptions,
dictionarySnapshot: dictionarySnapshot,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
ocrTask: ocrTask,
ocrStartedAt: ocrStartedAt
)
Expand DownExpand Up@@ -153,7 +172,10 @@ extension VoicePipeline {
private func finishDeferredSmartFormat(
replacementID: UUID,
raw: String,
settings: AppSettings,
processingOptions: TextProcessingOptions,
dictionarySnapshot: PersonalDictionarySnapshot,
enableMemory: Bool,
memoryWindowMinutes: Int,
ocrTask: Task<ScreenContextSnapshot, Never>?,
ocrStartedAt: CFAbsoluteTime?
) async {
Expand All@@ -167,30 +189,28 @@ extension VoicePipeline {
guard !Task.isCancelled else { return }
guard let currentReplacement = appState.pendingReplacement, currentReplacement.id == replacementID else { return }

let inputContext = InputContext(
appName: currentReplacement.targetAppName,
bundleIdentifier: currentReplacement.targetBundleIdentifier,
windowTitle: currentReplacement.context?.windowTitle,
let inputContext = Self.deferredInputContext(
for: currentReplacement,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
inputLanguage: processingOptions.inputLanguage
)
let memoryContext = VoicePipelinePolicy.memoryContext(
for: .processed,
settings: settings,
enableMemory: enableMemory,
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)

let formattedText = await textProcessor.process(
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext,
allowsPreparedFallback: false
allowsPreparedFallback: false,
allowsGuardFallback: false,
dictionarySnapshot: dictionarySnapshot
)
let elapsed = CFAbsoluteTimeGetCurrent() - started
appState.lastFormattingDurationSeconds = elapsed
Expand All@@ -215,12 +235,43 @@ extension VoicePipeline {
appState.pendingReplacement = replacement
}

private func immediateInsertText(from raw: String, settings: AppSettings) -> String {
let cleaned = textProcessor.prepareForFormatting(text: raw, inputLanguage: settings.inputLanguage)
let fallback = textProcessor.basicClean(text: raw, inputLanguage: settings.inputLanguage)
static func deferredInputContext(
for replacement: DeferredReplacement,
screenContext: String,
inputLanguage: InputLanguage
) -> InputContext {
InputContext(
appName: replacement.targetAppName,
bundleIdentifier: replacement.targetBundleIdentifier,
windowTitle: replacement.context?.windowTitle,
screenContext: screenContext,
textBeforeSelection: replacement.context?.textBeforeSelection,
selectedText: replacement.context?.selectedText,
textAfterSelection: replacement.context?.textAfterSelection,
outputMode: .processed,
inputLanguage: inputLanguage,
source: .menuBar
)
}

private func immediateInsertText(
from raw: String,
inputLanguage: InputLanguage,
dictionarySnapshot: PersonalDictionarySnapshot
) -> String {
let cleaned = textProcessor.prepareForFormatting(
text: raw,
inputLanguage: inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
let fallback = textProcessor.basicClean(
text: raw,
inputLanguage: inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
if !cleaned.isEmpty { return cleaned }
if !fallback.isEmpty { return fallback }
return raw.trimmingCharacters(in: .whitespacesAndNewlines)
return ""
}

private func replacementCopyMessage(for reason: DeferredReplacementCopyReason) -> String {
Expand Down
5 changes: 5 additions & 0 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,6 +116,11 @@ final class VoicePipeline {
let micID = appState.settings.microphoneID
let language = appState.settings.inputLanguage.whisperCode
let streamingEnabled = appState.settings.enableStreamingRecognitionBeta
currentEngine?.configureRecognition(
context: SpeechRecognitionContext(
dictionaryEntries: PersonalDictionary.shared.entries
)
)
if streamingEnabled {
currentEngine?.startListening(language: language) { [weak self] partialText in
Task { @MainActor in
Expand Down
21 changes: 19 additions & 2 deletions Sources/App/VoicePipelinePolicy.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,9 +28,26 @@ enum VoicePipelinePolicy {
currentContext: InputContext? = nil,
recentContextProvider: ((Int, InputContext?) -> String)? = nil
) -> String {
guard settings.enableMemory else { return "" }
memoryContext(
for: outputMode,
enableMemory: settings.enableMemory,
memoryWindowMinutes: settings.memoryWindowMinutes,
currentContext: currentContext,
recentContextProvider: recentContextProvider
)
}

@MainActor
static func memoryContext(
for outputMode: OutputMode,
enableMemory: Bool,
memoryWindowMinutes: Int,
currentContext: InputContext? = nil,
recentContextProvider: ((Int, InputContext?) -> String)? = nil
) -> String {
guard enableMemory else { return "" }
guard outputMode != .direct else { return "" }
let provider = recentContextProvider ?? { MemoryStore.recentContext(windowMinutes: $0, currentContext: $1) }
return provider(settings.memoryWindowMinutes, currentContext)
return provider(memoryWindowMinutes, currentContext)
}
}
6 changes: 4 additions & 2 deletions Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,7 +224,8 @@ enum InputLanguage: String, Codable, CaseIterable {

var localeIdentifier: String {
switch self {
case .auto, .chinese: return "zh-CN"
case .auto: return Locale.current.identifier
case .chinese: return "zh-CN"
case .english: return "en-US"
case .japanese: return "ja-JP"
case .korean: return "ko-KR"
Expand All@@ -235,6 +236,7 @@ enum InputLanguage: String, Codable, CaseIterable {

final class AppSettings: ObservableObject {
static let shared = AppSettings()
static let defaultLLMModelID = "mlx-community/Qwen3.5-2B-4bit"

@Published var hotkeyType: HotkeyType {
didSet {
Expand DownExpand Up@@ -343,7 +345,7 @@ final class AppSettings: ObservableObject {
?? (savedEngine.contains("Whisper") || savedEngine.contains("whisper") ? .whisper : nil)
?? .apple
whisperModel = ud.string(forKey: Key.whisperModel.rawValue) ?? "large-v3"
llmModel = ud.string(forKey: Key.llmModel.rawValue) ?? "mlx-community/Qwen3.5-2B-4bit"
llmModel = ud.string(forKey: Key.llmModel.rawValue) ?? Self.defaultLLMModelID
microphoneID = ud.string(forKey: Key.microphoneID.rawValue)
let savedOutput = ud.string(forKey: Key.outputMode.rawValue) ?? ""
outputMode = OutputMode(rawValue: savedOutput)
Expand Down
23 changes: 15 additions & 8 deletions Sources/Config/ModelCatalog.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,11 +91,11 @@ final class ModelCatalog: ObservableObject {
let supported = Set(rec.supported)

whisperModels = Self.curatedWhisperVariants.compactMap { variant in
let fullName = rec.supported.first { name in
guard let range = name.range(of: variant) else { return false }
let after = name[range.upperBound...]
return after.isEmpty || after.first == "_"
}
let fullName = WhisperModelSelection.matches(defaultID, variant: variant)
? defaultID
: rec.supported.first {
WhisperModelSelection.matches($0, variant: variant)
}
guard let fullName, supported.contains(fullName) else { return nil }
return ModelEntry(
id: fullName,
Expand All@@ -106,16 +106,23 @@ final class ModelCatalog: ObservableObject {
}

appendLocalWhisperModels()
if !whisperModels.contains(where: { $0.id == settings.whisperModel }) {
settings.whisperModel = defaultID
let resolvedWhisperModel = WhisperModelSelection.resolve(
requested: settings.whisperModel,
available: whisperModels.map(\.id),
fallback: defaultID
)
if settings.whisperModel != resolvedWhisperModel {
settings.whisperModel = resolvedWhisperModel
}

llmModels = Self.defaultLLMModels.map {
ModelEntry(id: $0.0, displayName: $0.1, hint: $0.2, family: $0.3, tier: $0.4)
}
appendLocalLLMModels()
if !llmModels.contains(where: { $0.id == settings.llmModel }) {
settings.llmModel = llmModels.first?.id ?? ""
settings.llmModel = llmModels.first(where: {
$0.id == AppSettings.defaultLLMModelID
})?.id ?? llmModels.first?.id ?? ""
}

asrModels = Self.defaultASRModels.map {
Expand Down
5 changes: 5 additions & 0 deletions Sources/Integration/InputSessionCoordinator+AudioFile.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,11 @@ extension InputSessionCoordinator {
guard let engine = await engineProvider.engine(settings: settings), engine.isReady else {
throw IntegrationError.modelNotReady
}
engine.configureRecognition(
context: SpeechRecognitionContext(
dictionaryEntries: PersonalDictionary.shared.entries
)
)

do {
try service.emitAudioReceived(sessionID: sessionID, clientID: clientID)
Expand Down
Loading
Loading