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
1 change: 1 addition & 0 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ Three output modes are available:
| **Verbatim & Preview Boundary** | Verbatim mode, streaming HUD, integration partials, and instant-insert drafts keep ASR text close to raw output with only dictionary, whitespace, duplicate, and non-speech-artifact cleanup |
| **Remote LLM Support** | OpenAI, Claude (Anthropic format), Gemini, OpenRouter, SiliconFlow, Doubao, Bailian, MiniMax (CN & Global) |
| **Global Hotkey** | Configurable key (Fn/Ctrl/Shift/Option) with long-press, double-tap, or single-tap activation |
| **Translation Dictation** | Use a dedicated hotkey chord to speak in one language and insert an English, Chinese, Japanese, Korean, Spanish, French, or German translation |
| **Screen Context OCR** | Captures on-screen text via ScreenCaptureKit + Vision to help the LLM correct homophones |
| **Voice Command Mode** | Screen-aware voice assistant — summarize, reply, translate based on what's on screen |
| **Input Memory** | Recent input history injected as LLM context for better continuity |
Expand Down
1 change: 1 addition & 0 deletions README_zh.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@
| **直出与预览边界** | 原文直出、流式 HUD、集成 partial 和快速插入草稿尽量保留 ASR 原文,只做词库、空白、重复转写和非语音垃圾过滤 |
| **远程 LLM** | 支持 OpenAI、Claude(Anthropic 格式)、Gemini、OpenRouter、硅基流动、豆包、百炼、MiniMax(国内/海外) |
| **全局快捷键** | 可配置按键(Fn/Ctrl/Shift/Option),支持长按、双击、单击三种触发模式 |
| **翻译听写** | 使用独立组合键,说一种语言,直接输入英语、中日韩、西班牙语、法语或德语译文 |
| **屏幕上下文 OCR** | 通过 ScreenCaptureKit + Vision 截取屏幕文字,辅助 LLM 纠正同音字 |
| **语音指令模式** | 屏幕感知的语音助手 — 总结、回复、翻译屏幕内容 |
| **输入记忆** | 近期输入历史作为 LLM 上下文,提升连续输入准确度 |
Expand Down
2 changes: 2 additions & 0 deletions Sources/App/AppState.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ final class AppState: ObservableObject {
@Published var lastInsertedText: String = ""
@Published var lastFormattingDurationSeconds: Double = 0
@Published var pendingReplacement: DeferredReplacement?
@Published var activeInputMode: VoiceInputMode = .dictation

let settings = AppSettings.shared

Expand All@@ -51,6 +52,7 @@ final class AppState: ObservableObject {
statusMessage = L("status.ready")
resetDownloadProgress()
pendingReplacement = nil
activeInputMode = .dictation
}

func clearPendingReplacement() {
Expand Down
13 changes: 8 additions & 5 deletions Sources/App/OpenTypeApp.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,10 +101,10 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
private func setupHotkey() {
hotkeyManager = HotkeyManager(
settings: AppSettings.shared,
onStart: { [weak self] in
Task { @MainActor in self?.startRecording() }
onStart: { [weak self] action in
Task { @MainActor in self?.startRecording(action: action) }
},
onStop: { [weak self] in
onStop: { [weak self] _ in
Task { @MainActor in self?.stopRecording() }
}
)
Expand DownExpand Up@@ -134,14 +134,17 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
}
}

private func startRecording() {
private func startRecording(action: HotkeyAction) {
if integrationSessionCoordinator.isBusy {
pipeline?.showBusyHint()
return
}
savePreviousApp()
if popover.isShown { closePopover() }
Task { await pipeline?.start() }
let mode: VoiceInputMode = action == .translation
? .translation(AppSettings.shared.translationTargetLanguage)
: .dictation
Task { await pipeline?.start(mode: mode) }
}

private func stopRecording() {
Expand Down
18 changes: 0 additions & 18 deletions Sources/App/StartupModelPreloadPolicy.swift

This file was deleted.

11 changes: 11 additions & 0 deletions Sources/App/VoiceInputMode.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import Foundation

enum VoiceInputMode: Equatable {
case dictation
case translation(TranslationLanguage)

var isTranslation: Bool {
if case .translation = self { return true }
return false
}
}
6 changes: 5 additions & 1 deletion Sources/App/VoicePipeline+Models.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,11 @@ extension VoicePipeline {
guard let self, self.appState.isDownloading else { return }
self.appState.updateDownloadProgress(info)
self.appState.statusMessage = L("pipeline.downloading") + " \(info.percentText)"
catalog.updateLLMDownloadProgress(model, info: info)
if let index = catalog.llmModels.firstIndex(where: { $0.id == model }) {
catalog.llmModels[index].status = .downloading
catalog.llmModels[index].downloadProgress = info.fraction
catalog.llmModels[index].downloadDetail = info.detailText
}
}
}
let ready = await textProcessor.isLLMReady
Expand Down
59 changes: 45 additions & 14 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ extension VoicePipeline {
audioActivity: AudioCaptureActivity,
language: String?,
settings: AppSettings,
inputMode: VoiceInputMode,
targetApp: NSRunningApplication?
) async {
defer { audioCapture.cleanupLastRecording() }
Expand All@@ -30,26 +31,43 @@ extension VoicePipeline {
return
}

if await handleSpokenEditCommandIfNeeded(raw: preparedRaw, settings: settings, targetApp: targetApp) {
return
}
if !inputMode.isTranslation {
if await handleSpokenEditCommandIfNeeded(
raw: preparedRaw,
settings: settings,
targetApp: targetApp
) {
return
}

if DeferredReplacementPolicy.shouldUseDeferredReplacement(
outputMode: settings.outputMode,
enableInstantInsert: settings.enableInstantInsert
) {
await handleDeferredSmartFormat(raw: preparedRaw, settings: settings, targetApp: targetApp)
return
if DeferredReplacementPolicy.shouldUseDeferredReplacement(
outputMode: settings.outputMode,
enableInstantInsert: settings.enableInstantInsert
) {
await handleDeferredSmartFormat(raw: preparedRaw, settings: settings, targetApp: targetApp)
return
}
}

let output = await outputText(for: preparedRaw, settings: settings, targetApp: targetApp)
let output = await outputText(
for: preparedRaw,
settings: settings,
inputMode: inputMode,
targetApp: targetApp
)

guard !Task.isCancelled else {
resetToIdle()
return
}

await insertFinalText(output, raw: preparedRaw, settings: settings, targetApp: targetApp)
await insertFinalText(
output,
raw: preparedRaw,
settings: settings,
inputMode: inputMode,
targetApp: targetApp
)
} catch VoicePipelineStop.noSpeech {
return
} catch {
Expand DownExpand Up@@ -94,8 +112,18 @@ extension VoicePipeline {
private func outputText(
for raw: String,
settings: AppSettings,
inputMode: VoiceInputMode,
targetApp: NSRunningApplication?
) async -> VoicePipelineOutput {
if case .translation(let targetLanguage) = inputMode {
return await processTranslation(
raw,
targetLanguage: targetLanguage,
settings: settings,
targetApp: targetApp
)
}

switch settings.outputMode {
case .processed:
return await processSmartFormat(raw, settings: settings, targetApp: targetApp)
Expand DownExpand Up@@ -190,7 +218,7 @@ extension VoicePipeline {
return VoicePipelineOutput(text: text, context: inputContext)
}

private func recordFormattingDuration(_ started: CFAbsoluteTime, label: String) {
func recordFormattingDuration(_ started: CFAbsoluteTime, label: String) {
let elapsed = CFAbsoluteTimeGetCurrent() - started
appState.lastFormattingDurationSeconds = elapsed
Log.info("[VoicePipeline] \(label) completed in \(String(format: "%.2f", elapsed))s")
Expand All@@ -200,6 +228,7 @@ extension VoicePipeline {
_ output: VoicePipelineOutput,
raw: String,
settings: AppSettings,
inputMode: VoiceInputMode,
targetApp: NSRunningApplication?
) async {
let finalText = output.text
Expand DownExpand Up@@ -230,7 +259,9 @@ extension VoicePipeline {
return
}

let wasProcessed = settings.outputMode == .processed || settings.outputMode == .command
let wasProcessed = inputMode.isTranslation
|| settings.outputMode == .processed
|| settings.outputMode == .command
InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
Expand All@@ -241,7 +272,7 @@ extension VoicePipeline {
}
}

private struct VoicePipelineOutput {
struct VoicePipelineOutput {
let text: String
let context: InputContext
}
Expand Down
33 changes: 33 additions & 0 deletions Sources/App/VoicePipeline+Translation.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import AppKit
import Foundation

@MainActor
extension VoicePipeline {
func processTranslation(
_ raw: String,
targetLanguage: TranslationLanguage,
settings: AppSettings,
targetApp: NSRunningApplication?
) async -> VoicePipelineOutput {
appState.phase = .processing
appState.statusMessage = L("pipeline.translating")
cancelScreenContextCapture()

let started = CFAbsoluteTimeGetCurrent()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: "",
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
)
let options = TextProcessingOptions(settings: settings)
let text = await textProcessor.translate(
text: raw,
targetLanguage: targetLanguage,
options: options
)
recordFormattingDuration(started, label: "Translation")
return VoicePipelineOutput(text: text, context: inputContext)
}
}
34 changes: 30 additions & 4 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ final class VoicePipeline {

// MARK: - Recording

func start() async {
func start(mode: VoiceInputMode = .dictation) async {
if appState.isBusy {
Log.info("[VoicePipeline] start: busy (\(appState.phase)), ignoring")
showBusyHint()
Expand DownExpand Up@@ -88,10 +88,17 @@ final class VoicePipeline {
clearInFlightWork()

appState.reset()
appState.activeInputMode = mode
appState.phase = .recording
appState.statusMessage = L("pipeline.recording")

startScreenContextCaptureIfNeeded()
appState.statusMessage = mode.isTranslation
? L("pipeline.recording_translation")
: L("pipeline.recording")

if mode.isTranslation {
cancelScreenContextCapture()
} else {
startScreenContextCaptureIfNeeded()
}

soundPlayer.playStart()
overlay.show(appState: appState)
Expand DownExpand Up@@ -148,6 +155,7 @@ final class VoicePipeline {
let audioURL = audioCapture.lastRecordingURL
let audioActivity = audioCapture.lastActivity
let settings = appState.settings
let inputMode = appState.activeInputMode

processingTask = Task { @MainActor [weak self] in
guard let self else { return }
Expand All@@ -156,6 +164,7 @@ final class VoicePipeline {
audioActivity: audioActivity,
language: language,
settings: settings,
inputMode: inputMode,
targetApp: targetApp
)
}
Expand All@@ -171,3 +180,20 @@ final class VoicePipeline {
hideOverlayTask = nil
}
}

enum StartupModelPreloadPolicy {
static func shouldPreloadSpeechModel(
enabled: Bool,
speechEngine: SpeechEngineType
) -> Bool {
enabled && speechEngine == .whisper
}

static func shouldPreloadFormattingModel(
enabled: Bool,
useRemoteLLM: Bool,
modelID: String
) -> Bool {
enabled && !useRemoteLLM && !modelID.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
}
}
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
1 change: 1 addition & 0 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ Three output modes are available:
| **Verbatim & Preview Boundary** | Verbatim mode, streaming HUD, integration partials, and instant-insert drafts keep ASR text close to raw output with only dictionary, whitespace, duplicate, and non-speech-artifact cleanup |
| **Remote LLM Support** | OpenAI, Claude (Anthropic format), Gemini, OpenRouter, SiliconFlow, Doubao, Bailian, MiniMax (CN & Global) |
| **Global Hotkey** | Configurable key (Fn/Ctrl/Shift/Option) with long-press, double-tap, or single-tap activation |
| **Translation Dictation** | Use a dedicated hotkey chord to speak in one language and insert an English, Chinese, Japanese, Korean, Spanish, French, or German translation |
| **Screen Context OCR** | Captures on-screen text via ScreenCaptureKit + Vision to help the LLM correct homophones |
| **Voice Command Mode** | Screen-aware voice assistant — summarize, reply, translate based on what's on screen |
| **Input Memory** | Recent input history injected as LLM context for better continuity |
Expand Down
1 change: 1 addition & 0 deletions README_zh.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@
| **直出与预览边界** | 原文直出、流式 HUD、集成 partial 和快速插入草稿尽量保留 ASR 原文,只做词库、空白、重复转写和非语音垃圾过滤 |
| **远程 LLM** | 支持 OpenAI、Claude(Anthropic 格式)、Gemini、OpenRouter、硅基流动、豆包、百炼、MiniMax(国内/海外) |
| **全局快捷键** | 可配置按键(Fn/Ctrl/Shift/Option),支持长按、双击、单击三种触发模式 |
| **翻译听写** | 使用独立组合键,说一种语言,直接输入英语、中日韩、西班牙语、法语或德语译文 |
| **屏幕上下文 OCR** | 通过 ScreenCaptureKit + Vision 截取屏幕文字,辅助 LLM 纠正同音字 |
| **语音指令模式** | 屏幕感知的语音助手 — 总结、回复、翻译屏幕内容 |
| **输入记忆** | 近期输入历史作为 LLM 上下文,提升连续输入准确度 |
Expand Down
2 changes: 2 additions & 0 deletions Sources/App/AppState.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ final class AppState: ObservableObject {
@Published var lastInsertedText: String = ""
@Published var lastFormattingDurationSeconds: Double = 0
@Published var pendingReplacement: DeferredReplacement?
@Published var activeInputMode: VoiceInputMode = .dictation

let settings = AppSettings.shared

Expand All@@ -51,6 +52,7 @@ final class AppState: ObservableObject {
statusMessage = L("status.ready")
resetDownloadProgress()
pendingReplacement = nil
activeInputMode = .dictation
}

func clearPendingReplacement() {
Expand Down
13 changes: 8 additions & 5 deletions Sources/App/OpenTypeApp.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,10 +101,10 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
private func setupHotkey() {
hotkeyManager = HotkeyManager(
settings: AppSettings.shared,
onStart: { [weak self] in
Task { @MainActor in self?.startRecording() }
onStart: { [weak self] action in
Task { @MainActor in self?.startRecording(action: action) }
},
onStop: { [weak self] in
onStop: { [weak self] _ in
Task { @MainActor in self?.stopRecording() }
}
)
Expand DownExpand Up@@ -134,14 +134,17 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
}
}

private func startRecording() {
private func startRecording(action: HotkeyAction) {
if integrationSessionCoordinator.isBusy {
pipeline?.showBusyHint()
return
}
savePreviousApp()
if popover.isShown { closePopover() }
Task { await pipeline?.start() }
let mode: VoiceInputMode = action == .translation
? .translation(AppSettings.shared.translationTargetLanguage)
: .dictation
Task { await pipeline?.start(mode: mode) }
}

private func stopRecording() {
Expand Down
18 changes: 0 additions & 18 deletions Sources/App/StartupModelPreloadPolicy.swift

This file was deleted.

11 changes: 11 additions & 0 deletions Sources/App/VoiceInputMode.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import Foundation

enum VoiceInputMode: Equatable {
case dictation
case translation(TranslationLanguage)

var isTranslation: Bool {
if case .translation = self { return true }
return false
}
}
6 changes: 5 additions & 1 deletion Sources/App/VoicePipeline+Models.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,11 @@ extension VoicePipeline {
guard let self, self.appState.isDownloading else { return }
self.appState.updateDownloadProgress(info)
self.appState.statusMessage = L("pipeline.downloading") + " \(info.percentText)"
catalog.updateLLMDownloadProgress(model, info: info)
if let index = catalog.llmModels.firstIndex(where: { $0.id == model }) {
catalog.llmModels[index].status = .downloading
catalog.llmModels[index].downloadProgress = info.fraction
catalog.llmModels[index].downloadDetail = info.detailText
}
}
}
let ready = await textProcessor.isLLMReady
Expand Down
59 changes: 45 additions & 14 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ extension VoicePipeline {
audioActivity: AudioCaptureActivity,
language: String?,
settings: AppSettings,
inputMode: VoiceInputMode,
targetApp: NSRunningApplication?
) async {
defer { audioCapture.cleanupLastRecording() }
Expand All@@ -30,26 +31,43 @@ extension VoicePipeline {
return
}

if await handleSpokenEditCommandIfNeeded(raw: preparedRaw, settings: settings, targetApp: targetApp) {
return
}
if !inputMode.isTranslation {
if await handleSpokenEditCommandIfNeeded(
raw: preparedRaw,
settings: settings,
targetApp: targetApp
) {
return
}

if DeferredReplacementPolicy.shouldUseDeferredReplacement(
outputMode: settings.outputMode,
enableInstantInsert: settings.enableInstantInsert
) {
await handleDeferredSmartFormat(raw: preparedRaw, settings: settings, targetApp: targetApp)
return
if DeferredReplacementPolicy.shouldUseDeferredReplacement(
outputMode: settings.outputMode,
enableInstantInsert: settings.enableInstantInsert
) {
await handleDeferredSmartFormat(raw: preparedRaw, settings: settings, targetApp: targetApp)
return
}
}

let output = await outputText(for: preparedRaw, settings: settings, targetApp: targetApp)
let output = await outputText(
for: preparedRaw,
settings: settings,
inputMode: inputMode,
targetApp: targetApp
)

guard !Task.isCancelled else {
resetToIdle()
return
}

await insertFinalText(output, raw: preparedRaw, settings: settings, targetApp: targetApp)
await insertFinalText(
output,
raw: preparedRaw,
settings: settings,
inputMode: inputMode,
targetApp: targetApp
)
} catch VoicePipelineStop.noSpeech {
return
} catch {
Expand DownExpand Up@@ -94,8 +112,18 @@ extension VoicePipeline {
private func outputText(
for raw: String,
settings: AppSettings,
inputMode: VoiceInputMode,
targetApp: NSRunningApplication?
) async -> VoicePipelineOutput {
if case .translation(let targetLanguage) = inputMode {
return await processTranslation(
raw,
targetLanguage: targetLanguage,
settings: settings,
targetApp: targetApp
)
}

switch settings.outputMode {
case .processed:
return await processSmartFormat(raw, settings: settings, targetApp: targetApp)
Expand DownExpand Up@@ -190,7 +218,7 @@ extension VoicePipeline {
return VoicePipelineOutput(text: text, context: inputContext)
}

private func recordFormattingDuration(_ started: CFAbsoluteTime, label: String) {
func recordFormattingDuration(_ started: CFAbsoluteTime, label: String) {
let elapsed = CFAbsoluteTimeGetCurrent() - started
appState.lastFormattingDurationSeconds = elapsed
Log.info("[VoicePipeline] \(label) completed in \(String(format: "%.2f", elapsed))s")
Expand All@@ -200,6 +228,7 @@ extension VoicePipeline {
_ output: VoicePipelineOutput,
raw: String,
settings: AppSettings,
inputMode: VoiceInputMode,
targetApp: NSRunningApplication?
) async {
let finalText = output.text
Expand DownExpand Up@@ -230,7 +259,9 @@ extension VoicePipeline {
return
}

let wasProcessed = settings.outputMode == .processed || settings.outputMode == .command
let wasProcessed = inputMode.isTranslation
|| settings.outputMode == .processed
|| settings.outputMode == .command
InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
Expand All@@ -241,7 +272,7 @@ extension VoicePipeline {
}
}

private struct VoicePipelineOutput {
struct VoicePipelineOutput {
let text: String
let context: InputContext
}
Expand Down
33 changes: 33 additions & 0 deletions Sources/App/VoicePipeline+Translation.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import AppKit
import Foundation

@MainActor
extension VoicePipeline {
func processTranslation(
_ raw: String,
targetLanguage: TranslationLanguage,
settings: AppSettings,
targetApp: NSRunningApplication?
) async -> VoicePipelineOutput {
appState.phase = .processing
appState.statusMessage = L("pipeline.translating")
cancelScreenContextCapture()

let started = CFAbsoluteTimeGetCurrent()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: "",
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
)
let options = TextProcessingOptions(settings: settings)
let text = await textProcessor.translate(
text: raw,
targetLanguage: targetLanguage,
options: options
)
recordFormattingDuration(started, label: "Translation")
return VoicePipelineOutput(text: text, context: inputContext)
}
}
34 changes: 30 additions & 4 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ final class VoicePipeline {

// MARK: - Recording

func start() async {
func start(mode: VoiceInputMode = .dictation) async {
if appState.isBusy {
Log.info("[VoicePipeline] start: busy (\(appState.phase)), ignoring")
showBusyHint()
Expand DownExpand Up@@ -88,10 +88,17 @@ final class VoicePipeline {
clearInFlightWork()

appState.reset()
appState.activeInputMode = mode
appState.phase = .recording
appState.statusMessage = L("pipeline.recording")

startScreenContextCaptureIfNeeded()
appState.statusMessage = mode.isTranslation
? L("pipeline.recording_translation")
: L("pipeline.recording")

if mode.isTranslation {
cancelScreenContextCapture()
} else {
startScreenContextCaptureIfNeeded()
}

soundPlayer.playStart()
overlay.show(appState: appState)
Expand DownExpand Up@@ -148,6 +155,7 @@ final class VoicePipeline {
let audioURL = audioCapture.lastRecordingURL
let audioActivity = audioCapture.lastActivity
let settings = appState.settings
let inputMode = appState.activeInputMode

processingTask = Task { @MainActor [weak self] in
guard let self else { return }
Expand All@@ -156,6 +164,7 @@ final class VoicePipeline {
audioActivity: audioActivity,
language: language,
settings: settings,
inputMode: inputMode,
targetApp: targetApp
)
}
Expand All@@ -171,3 +180,20 @@ final class VoicePipeline {
hideOverlayTask = nil
}
}

enum StartupModelPreloadPolicy {
static func shouldPreloadSpeechModel(
enabled: Bool,
speechEngine: SpeechEngineType
) -> Bool {
enabled && speechEngine == .whisper
}

static func shouldPreloadFormattingModel(
enabled: Bool,
useRemoteLLM: Bool,
modelID: String
) -> Bool {
enabled && !useRemoteLLM && !modelID.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
}
}
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
1 change: 1 addition & 0 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ Three output modes are available:
| **Verbatim & Preview Boundary** | Verbatim mode, streaming HUD, integration partials, and instant-insert drafts keep ASR text close to raw output with only dictionary, whitespace, duplicate, and non-speech-artifact cleanup |
| **Remote LLM Support** | OpenAI, Claude (Anthropic format), Gemini, OpenRouter, SiliconFlow, Doubao, Bailian, MiniMax (CN & Global) |
| **Global Hotkey** | Configurable key (Fn/Ctrl/Shift/Option) with long-press, double-tap, or single-tap activation |
| **Translation Dictation** | Use a dedicated hotkey chord to speak in one language and insert an English, Chinese, Japanese, Korean, Spanish, French, or German translation |
| **Screen Context OCR** | Captures on-screen text via ScreenCaptureKit + Vision to help the LLM correct homophones |
| **Voice Command Mode** | Screen-aware voice assistant — summarize, reply, translate based on what's on screen |
| **Input Memory** | Recent input history injected as LLM context for better continuity |
Expand Down
1 change: 1 addition & 0 deletions README_zh.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@
| **直出与预览边界** | 原文直出、流式 HUD、集成 partial 和快速插入草稿尽量保留 ASR 原文,只做词库、空白、重复转写和非语音垃圾过滤 |
| **远程 LLM** | 支持 OpenAI、Claude(Anthropic 格式)、Gemini、OpenRouter、硅基流动、豆包、百炼、MiniMax(国内/海外) |
| **全局快捷键** | 可配置按键(Fn/Ctrl/Shift/Option),支持长按、双击、单击三种触发模式 |
| **翻译听写** | 使用独立组合键,说一种语言,直接输入英语、中日韩、西班牙语、法语或德语译文 |
| **屏幕上下文 OCR** | 通过 ScreenCaptureKit + Vision 截取屏幕文字,辅助 LLM 纠正同音字 |
| **语音指令模式** | 屏幕感知的语音助手 — 总结、回复、翻译屏幕内容 |
| **输入记忆** | 近期输入历史作为 LLM 上下文,提升连续输入准确度 |
Expand Down
2 changes: 2 additions & 0 deletions Sources/App/AppState.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ final class AppState: ObservableObject {
@Published var lastInsertedText: String = ""
@Published var lastFormattingDurationSeconds: Double = 0
@Published var pendingReplacement: DeferredReplacement?
@Published var activeInputMode: VoiceInputMode = .dictation

let settings = AppSettings.shared

Expand All@@ -51,6 +52,7 @@ final class AppState: ObservableObject {
statusMessage = L("status.ready")
resetDownloadProgress()
pendingReplacement = nil
activeInputMode = .dictation
}

func clearPendingReplacement() {
Expand Down
13 changes: 8 additions & 5 deletions Sources/App/OpenTypeApp.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,10 +101,10 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
private func setupHotkey() {
hotkeyManager = HotkeyManager(
settings: AppSettings.shared,
onStart: { [weak self] in
Task { @MainActor in self?.startRecording() }
onStart: { [weak self] action in
Task { @MainActor in self?.startRecording(action: action) }
},
onStop: { [weak self] in
onStop: { [weak self] _ in
Task { @MainActor in self?.stopRecording() }
}
)
Expand DownExpand Up@@ -134,14 +134,17 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
}
}

private func startRecording() {
private func startRecording(action: HotkeyAction) {
if integrationSessionCoordinator.isBusy {
pipeline?.showBusyHint()
return
}
savePreviousApp()
if popover.isShown { closePopover() }
Task { await pipeline?.start() }
let mode: VoiceInputMode = action == .translation
? .translation(AppSettings.shared.translationTargetLanguage)
: .dictation
Task { await pipeline?.start(mode: mode) }
}

private func stopRecording() {
Expand Down
18 changes: 0 additions & 18 deletions Sources/App/StartupModelPreloadPolicy.swift

This file was deleted.

11 changes: 11 additions & 0 deletions Sources/App/VoiceInputMode.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import Foundation

enum VoiceInputMode: Equatable {
case dictation
case translation(TranslationLanguage)

var isTranslation: Bool {
if case .translation = self { return true }
return false
}
}
6 changes: 5 additions & 1 deletion Sources/App/VoicePipeline+Models.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,11 @@ extension VoicePipeline {
guard let self, self.appState.isDownloading else { return }
self.appState.updateDownloadProgress(info)
self.appState.statusMessage = L("pipeline.downloading") + " \(info.percentText)"
catalog.updateLLMDownloadProgress(model, info: info)
if let index = catalog.llmModels.firstIndex(where: { $0.id == model }) {
catalog.llmModels[index].status = .downloading
catalog.llmModels[index].downloadProgress = info.fraction
catalog.llmModels[index].downloadDetail = info.detailText
}
}
}
let ready = await textProcessor.isLLMReady
Expand Down
59 changes: 45 additions & 14 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ extension VoicePipeline {
audioActivity: AudioCaptureActivity,
language: String?,
settings: AppSettings,
inputMode: VoiceInputMode,
targetApp: NSRunningApplication?
) async {
defer { audioCapture.cleanupLastRecording() }
Expand All@@ -30,26 +31,43 @@ extension VoicePipeline {
return
}

if await handleSpokenEditCommandIfNeeded(raw: preparedRaw, settings: settings, targetApp: targetApp) {
return
}
if !inputMode.isTranslation {
if await handleSpokenEditCommandIfNeeded(
raw: preparedRaw,
settings: settings,
targetApp: targetApp
) {
return
}

if DeferredReplacementPolicy.shouldUseDeferredReplacement(
outputMode: settings.outputMode,
enableInstantInsert: settings.enableInstantInsert
) {
await handleDeferredSmartFormat(raw: preparedRaw, settings: settings, targetApp: targetApp)
return
if DeferredReplacementPolicy.shouldUseDeferredReplacement(
outputMode: settings.outputMode,
enableInstantInsert: settings.enableInstantInsert
) {
await handleDeferredSmartFormat(raw: preparedRaw, settings: settings, targetApp: targetApp)
return
}
}

let output = await outputText(for: preparedRaw, settings: settings, targetApp: targetApp)
let output = await outputText(
for: preparedRaw,
settings: settings,
inputMode: inputMode,
targetApp: targetApp
)

guard !Task.isCancelled else {
resetToIdle()
return
}

await insertFinalText(output, raw: preparedRaw, settings: settings, targetApp: targetApp)
await insertFinalText(
output,
raw: preparedRaw,
settings: settings,
inputMode: inputMode,
targetApp: targetApp
)
} catch VoicePipelineStop.noSpeech {
return
} catch {
Expand DownExpand Up@@ -94,8 +112,18 @@ extension VoicePipeline {
private func outputText(
for raw: String,
settings: AppSettings,
inputMode: VoiceInputMode,
targetApp: NSRunningApplication?
) async -> VoicePipelineOutput {
if case .translation(let targetLanguage) = inputMode {
return await processTranslation(
raw,
targetLanguage: targetLanguage,
settings: settings,
targetApp: targetApp
)
}

switch settings.outputMode {
case .processed:
return await processSmartFormat(raw, settings: settings, targetApp: targetApp)
Expand DownExpand Up@@ -190,7 +218,7 @@ extension VoicePipeline {
return VoicePipelineOutput(text: text, context: inputContext)
}

private func recordFormattingDuration(_ started: CFAbsoluteTime, label: String) {
func recordFormattingDuration(_ started: CFAbsoluteTime, label: String) {
let elapsed = CFAbsoluteTimeGetCurrent() - started
appState.lastFormattingDurationSeconds = elapsed
Log.info("[VoicePipeline] \(label) completed in \(String(format: "%.2f", elapsed))s")
Expand All@@ -200,6 +228,7 @@ extension VoicePipeline {
_ output: VoicePipelineOutput,
raw: String,
settings: AppSettings,
inputMode: VoiceInputMode,
targetApp: NSRunningApplication?
) async {
let finalText = output.text
Expand DownExpand Up@@ -230,7 +259,9 @@ extension VoicePipeline {
return
}

let wasProcessed = settings.outputMode == .processed || settings.outputMode == .command
let wasProcessed = inputMode.isTranslation
|| settings.outputMode == .processed
|| settings.outputMode == .command
InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
Expand All@@ -241,7 +272,7 @@ extension VoicePipeline {
}
}

private struct VoicePipelineOutput {
struct VoicePipelineOutput {
let text: String
let context: InputContext
}
Expand Down
33 changes: 33 additions & 0 deletions Sources/App/VoicePipeline+Translation.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import AppKit
import Foundation

@MainActor
extension VoicePipeline {
func processTranslation(
_ raw: String,
targetLanguage: TranslationLanguage,
settings: AppSettings,
targetApp: NSRunningApplication?
) async -> VoicePipelineOutput {
appState.phase = .processing
appState.statusMessage = L("pipeline.translating")
cancelScreenContextCapture()

let started = CFAbsoluteTimeGetCurrent()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: "",
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
)
let options = TextProcessingOptions(settings: settings)
let text = await textProcessor.translate(
text: raw,
targetLanguage: targetLanguage,
options: options
)
recordFormattingDuration(started, label: "Translation")
return VoicePipelineOutput(text: text, context: inputContext)
}
}
34 changes: 30 additions & 4 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ final class VoicePipeline {

// MARK: - Recording

func start() async {
func start(mode: VoiceInputMode = .dictation) async {
if appState.isBusy {
Log.info("[VoicePipeline] start: busy (\(appState.phase)), ignoring")
showBusyHint()
Expand DownExpand Up@@ -88,10 +88,17 @@ final class VoicePipeline {
clearInFlightWork()

appState.reset()
appState.activeInputMode = mode
appState.phase = .recording
appState.statusMessage = L("pipeline.recording")

startScreenContextCaptureIfNeeded()
appState.statusMessage = mode.isTranslation
? L("pipeline.recording_translation")
: L("pipeline.recording")

if mode.isTranslation {
cancelScreenContextCapture()
} else {
startScreenContextCaptureIfNeeded()
}

soundPlayer.playStart()
overlay.show(appState: appState)
Expand DownExpand Up@@ -148,6 +155,7 @@ final class VoicePipeline {
let audioURL = audioCapture.lastRecordingURL
let audioActivity = audioCapture.lastActivity
let settings = appState.settings
let inputMode = appState.activeInputMode

processingTask = Task { @MainActor [weak self] in
guard let self else { return }
Expand All@@ -156,6 +164,7 @@ final class VoicePipeline {
audioActivity: audioActivity,
language: language,
settings: settings,
inputMode: inputMode,
targetApp: targetApp
)
}
Expand All@@ -171,3 +180,20 @@ final class VoicePipeline {
hideOverlayTask = nil
}
}

enum StartupModelPreloadPolicy {
static func shouldPreloadSpeechModel(
enabled: Bool,
speechEngine: SpeechEngineType
) -> Bool {
enabled && speechEngine == .whisper
}

static func shouldPreloadFormattingModel(
enabled: Bool,
useRemoteLLM: Bool,
modelID: String
) -> Bool {
enabled && !useRemoteLLM && !modelID.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
}
}
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
1 change: 1 addition & 0 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ Three output modes are available:
| **Verbatim & Preview Boundary** | Verbatim mode, streaming HUD, integration partials, and instant-insert drafts keep ASR text close to raw output with only dictionary, whitespace, duplicate, and non-speech-artifact cleanup |
| **Remote LLM Support** | OpenAI, Claude (Anthropic format), Gemini, OpenRouter, SiliconFlow, Doubao, Bailian, MiniMax (CN & Global) |
| **Global Hotkey** | Configurable key (Fn/Ctrl/Shift/Option) with long-press, double-tap, or single-tap activation |
| **Translation Dictation** | Use a dedicated hotkey chord to speak in one language and insert an English, Chinese, Japanese, Korean, Spanish, French, or German translation |
| **Screen Context OCR** | Captures on-screen text via ScreenCaptureKit + Vision to help the LLM correct homophones |
| **Voice Command Mode** | Screen-aware voice assistant — summarize, reply, translate based on what's on screen |
| **Input Memory** | Recent input history injected as LLM context for better continuity |
Expand Down
1 change: 1 addition & 0 deletions README_zh.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@
| **直出与预览边界** | 原文直出、流式 HUD、集成 partial 和快速插入草稿尽量保留 ASR 原文,只做词库、空白、重复转写和非语音垃圾过滤 |
| **远程 LLM** | 支持 OpenAI、Claude(Anthropic 格式)、Gemini、OpenRouter、硅基流动、豆包、百炼、MiniMax(国内/海外) |
| **全局快捷键** | 可配置按键(Fn/Ctrl/Shift/Option),支持长按、双击、单击三种触发模式 |
| **翻译听写** | 使用独立组合键,说一种语言,直接输入英语、中日韩、西班牙语、法语或德语译文 |
| **屏幕上下文 OCR** | 通过 ScreenCaptureKit + Vision 截取屏幕文字,辅助 LLM 纠正同音字 |
| **语音指令模式** | 屏幕感知的语音助手 — 总结、回复、翻译屏幕内容 |
| **输入记忆** | 近期输入历史作为 LLM 上下文,提升连续输入准确度 |
Expand Down
2 changes: 2 additions & 0 deletions Sources/App/AppState.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ final class AppState: ObservableObject {
@Published var lastInsertedText: String = ""
@Published var lastFormattingDurationSeconds: Double = 0
@Published var pendingReplacement: DeferredReplacement?
@Published var activeInputMode: VoiceInputMode = .dictation

let settings = AppSettings.shared

Expand All@@ -51,6 +52,7 @@ final class AppState: ObservableObject {
statusMessage = L("status.ready")
resetDownloadProgress()
pendingReplacement = nil
activeInputMode = .dictation
}

func clearPendingReplacement() {
Expand Down
13 changes: 8 additions & 5 deletions Sources/App/OpenTypeApp.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,10 +101,10 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
private func setupHotkey() {
hotkeyManager = HotkeyManager(
settings: AppSettings.shared,
onStart: { [weak self] in
Task { @MainActor in self?.startRecording() }
onStart: { [weak self] action in
Task { @MainActor in self?.startRecording(action: action) }
},
onStop: { [weak self] in
onStop: { [weak self] _ in
Task { @MainActor in self?.stopRecording() }
}
)
Expand DownExpand Up@@ -134,14 +134,17 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
}
}

private func startRecording() {
private func startRecording(action: HotkeyAction) {
if integrationSessionCoordinator.isBusy {
pipeline?.showBusyHint()
return
}
savePreviousApp()
if popover.isShown { closePopover() }
Task { await pipeline?.start() }
let mode: VoiceInputMode = action == .translation
? .translation(AppSettings.shared.translationTargetLanguage)
: .dictation
Task { await pipeline?.start(mode: mode) }
}

private func stopRecording() {
Expand Down
18 changes: 0 additions & 18 deletions Sources/App/StartupModelPreloadPolicy.swift

This file was deleted.

11 changes: 11 additions & 0 deletions Sources/App/VoiceInputMode.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import Foundation

enum VoiceInputMode: Equatable {
case dictation
case translation(TranslationLanguage)

var isTranslation: Bool {
if case .translation = self { return true }
return false
}
}
6 changes: 5 additions & 1 deletion Sources/App/VoicePipeline+Models.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,11 @@ extension VoicePipeline {
guard let self, self.appState.isDownloading else { return }
self.appState.updateDownloadProgress(info)
self.appState.statusMessage = L("pipeline.downloading") + " \(info.percentText)"
catalog.updateLLMDownloadProgress(model, info: info)
if let index = catalog.llmModels.firstIndex(where: { $0.id == model }) {
catalog.llmModels[index].status = .downloading
catalog.llmModels[index].downloadProgress = info.fraction
catalog.llmModels[index].downloadDetail = info.detailText
}
}
}
let ready = await textProcessor.isLLMReady
Expand Down
59 changes: 45 additions & 14 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ extension VoicePipeline {
audioActivity: AudioCaptureActivity,
language: String?,
settings: AppSettings,
inputMode: VoiceInputMode,
targetApp: NSRunningApplication?
) async {
defer { audioCapture.cleanupLastRecording() }
Expand All@@ -30,26 +31,43 @@ extension VoicePipeline {
return
}

if await handleSpokenEditCommandIfNeeded(raw: preparedRaw, settings: settings, targetApp: targetApp) {
return
}
if !inputMode.isTranslation {
if await handleSpokenEditCommandIfNeeded(
raw: preparedRaw,
settings: settings,
targetApp: targetApp
) {
return
}

if DeferredReplacementPolicy.shouldUseDeferredReplacement(
outputMode: settings.outputMode,
enableInstantInsert: settings.enableInstantInsert
) {
await handleDeferredSmartFormat(raw: preparedRaw, settings: settings, targetApp: targetApp)
return
if DeferredReplacementPolicy.shouldUseDeferredReplacement(
outputMode: settings.outputMode,
enableInstantInsert: settings.enableInstantInsert
) {
await handleDeferredSmartFormat(raw: preparedRaw, settings: settings, targetApp: targetApp)
return
}
}

let output = await outputText(for: preparedRaw, settings: settings, targetApp: targetApp)
let output = await outputText(
for: preparedRaw,
settings: settings,
inputMode: inputMode,
targetApp: targetApp
)

guard !Task.isCancelled else {
resetToIdle()
return
}

await insertFinalText(output, raw: preparedRaw, settings: settings, targetApp: targetApp)
await insertFinalText(
output,
raw: preparedRaw,
settings: settings,
inputMode: inputMode,
targetApp: targetApp
)
} catch VoicePipelineStop.noSpeech {
return
} catch {
Expand DownExpand Up@@ -94,8 +112,18 @@ extension VoicePipeline {
private func outputText(
for raw: String,
settings: AppSettings,
inputMode: VoiceInputMode,
targetApp: NSRunningApplication?
) async -> VoicePipelineOutput {
if case .translation(let targetLanguage) = inputMode {
return await processTranslation(
raw,
targetLanguage: targetLanguage,
settings: settings,
targetApp: targetApp
)
}

switch settings.outputMode {
case .processed:
return await processSmartFormat(raw, settings: settings, targetApp: targetApp)
Expand DownExpand Up@@ -190,7 +218,7 @@ extension VoicePipeline {
return VoicePipelineOutput(text: text, context: inputContext)
}

private func recordFormattingDuration(_ started: CFAbsoluteTime, label: String) {
func recordFormattingDuration(_ started: CFAbsoluteTime, label: String) {
let elapsed = CFAbsoluteTimeGetCurrent() - started
appState.lastFormattingDurationSeconds = elapsed
Log.info("[VoicePipeline] \(label) completed in \(String(format: "%.2f", elapsed))s")
Expand All@@ -200,6 +228,7 @@ extension VoicePipeline {
_ output: VoicePipelineOutput,
raw: String,
settings: AppSettings,
inputMode: VoiceInputMode,
targetApp: NSRunningApplication?
) async {
let finalText = output.text
Expand DownExpand Up@@ -230,7 +259,9 @@ extension VoicePipeline {
return
}

let wasProcessed = settings.outputMode == .processed || settings.outputMode == .command
let wasProcessed = inputMode.isTranslation
|| settings.outputMode == .processed
|| settings.outputMode == .command
InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
Expand All@@ -241,7 +272,7 @@ extension VoicePipeline {
}
}

private struct VoicePipelineOutput {
struct VoicePipelineOutput {
let text: String
let context: InputContext
}
Expand Down
33 changes: 33 additions & 0 deletions Sources/App/VoicePipeline+Translation.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import AppKit
import Foundation

@MainActor
extension VoicePipeline {
func processTranslation(
_ raw: String,
targetLanguage: TranslationLanguage,
settings: AppSettings,
targetApp: NSRunningApplication?
) async -> VoicePipelineOutput {
appState.phase = .processing
appState.statusMessage = L("pipeline.translating")
cancelScreenContextCapture()

let started = CFAbsoluteTimeGetCurrent()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: "",
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
)
let options = TextProcessingOptions(settings: settings)
let text = await textProcessor.translate(
text: raw,
targetLanguage: targetLanguage,
options: options
)
recordFormattingDuration(started, label: "Translation")
return VoicePipelineOutput(text: text, context: inputContext)
}
}
34 changes: 30 additions & 4 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ final class VoicePipeline {

// MARK: - Recording

func start() async {
func start(mode: VoiceInputMode = .dictation) async {
if appState.isBusy {
Log.info("[VoicePipeline] start: busy (\(appState.phase)), ignoring")
showBusyHint()
Expand DownExpand Up@@ -88,10 +88,17 @@ final class VoicePipeline {
clearInFlightWork()

appState.reset()
appState.activeInputMode = mode
appState.phase = .recording
appState.statusMessage = L("pipeline.recording")

startScreenContextCaptureIfNeeded()
appState.statusMessage = mode.isTranslation
? L("pipeline.recording_translation")
: L("pipeline.recording")

if mode.isTranslation {
cancelScreenContextCapture()
} else {
startScreenContextCaptureIfNeeded()
}

soundPlayer.playStart()
overlay.show(appState: appState)
Expand DownExpand Up@@ -148,6 +155,7 @@ final class VoicePipeline {
let audioURL = audioCapture.lastRecordingURL
let audioActivity = audioCapture.lastActivity
let settings = appState.settings
let inputMode = appState.activeInputMode

processingTask = Task { @MainActor [weak self] in
guard let self else { return }
Expand All@@ -156,6 +164,7 @@ final class VoicePipeline {
audioActivity: audioActivity,
language: language,
settings: settings,
inputMode: inputMode,
targetApp: targetApp
)
}
Expand All@@ -171,3 +180,20 @@ final class VoicePipeline {
hideOverlayTask = nil
}
}

enum StartupModelPreloadPolicy {
static func shouldPreloadSpeechModel(
enabled: Bool,
speechEngine: SpeechEngineType
) -> Bool {
enabled && speechEngine == .whisper
}

static func shouldPreloadFormattingModel(
enabled: Bool,
useRemoteLLM: Bool,
modelID: String
) -> Bool {
enabled && !useRemoteLLM && !modelID.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
}
}
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
1 change: 1 addition & 0 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ Three output modes are available:
| **Verbatim & Preview Boundary** | Verbatim mode, streaming HUD, integration partials, and instant-insert drafts keep ASR text close to raw output with only dictionary, whitespace, duplicate, and non-speech-artifact cleanup |
| **Remote LLM Support** | OpenAI, Claude (Anthropic format), Gemini, OpenRouter, SiliconFlow, Doubao, Bailian, MiniMax (CN & Global) |
| **Global Hotkey** | Configurable key (Fn/Ctrl/Shift/Option) with long-press, double-tap, or single-tap activation |
| **Translation Dictation** | Use a dedicated hotkey chord to speak in one language and insert an English, Chinese, Japanese, Korean, Spanish, French, or German translation |
| **Screen Context OCR** | Captures on-screen text via ScreenCaptureKit + Vision to help the LLM correct homophones |
| **Voice Command Mode** | Screen-aware voice assistant — summarize, reply, translate based on what's on screen |
| **Input Memory** | Recent input history injected as LLM context for better continuity |
Expand Down
1 change: 1 addition & 0 deletions README_zh.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@
| **直出与预览边界** | 原文直出、流式 HUD、集成 partial 和快速插入草稿尽量保留 ASR 原文,只做词库、空白、重复转写和非语音垃圾过滤 |
| **远程 LLM** | 支持 OpenAI、Claude(Anthropic 格式)、Gemini、OpenRouter、硅基流动、豆包、百炼、MiniMax(国内/海外) |
| **全局快捷键** | 可配置按键(Fn/Ctrl/Shift/Option),支持长按、双击、单击三种触发模式 |
| **翻译听写** | 使用独立组合键,说一种语言,直接输入英语、中日韩、西班牙语、法语或德语译文 |
| **屏幕上下文 OCR** | 通过 ScreenCaptureKit + Vision 截取屏幕文字,辅助 LLM 纠正同音字 |
| **语音指令模式** | 屏幕感知的语音助手 — 总结、回复、翻译屏幕内容 |
| **输入记忆** | 近期输入历史作为 LLM 上下文,提升连续输入准确度 |
Expand Down
2 changes: 2 additions & 0 deletions Sources/App/AppState.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ final class AppState: ObservableObject {
@Published var lastInsertedText: String = ""
@Published var lastFormattingDurationSeconds: Double = 0
@Published var pendingReplacement: DeferredReplacement?
@Published var activeInputMode: VoiceInputMode = .dictation

let settings = AppSettings.shared

Expand All@@ -51,6 +52,7 @@ final class AppState: ObservableObject {
statusMessage = L("status.ready")
resetDownloadProgress()
pendingReplacement = nil
activeInputMode = .dictation
}

func clearPendingReplacement() {
Expand Down
13 changes: 8 additions & 5 deletions Sources/App/OpenTypeApp.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,10 +101,10 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
private func setupHotkey() {
hotkeyManager = HotkeyManager(
settings: AppSettings.shared,
onStart: { [weak self] in
Task { @MainActor in self?.startRecording() }
onStart: { [weak self] action in
Task { @MainActor in self?.startRecording(action: action) }
},
onStop: { [weak self] in
onStop: { [weak self] _ in
Task { @MainActor in self?.stopRecording() }
}
)
Expand DownExpand Up@@ -134,14 +134,17 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
}
}

private func startRecording() {
private func startRecording(action: HotkeyAction) {
if integrationSessionCoordinator.isBusy {
pipeline?.showBusyHint()
return
}
savePreviousApp()
if popover.isShown { closePopover() }
Task { await pipeline?.start() }
let mode: VoiceInputMode = action == .translation
? .translation(AppSettings.shared.translationTargetLanguage)
: .dictation
Task { await pipeline?.start(mode: mode) }
}

private func stopRecording() {
Expand Down
18 changes: 0 additions & 18 deletions Sources/App/StartupModelPreloadPolicy.swift

This file was deleted.

11 changes: 11 additions & 0 deletions Sources/App/VoiceInputMode.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import Foundation

enum VoiceInputMode: Equatable {
case dictation
case translation(TranslationLanguage)

var isTranslation: Bool {
if case .translation = self { return true }
return false
}
}
6 changes: 5 additions & 1 deletion Sources/App/VoicePipeline+Models.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,11 @@ extension VoicePipeline {
guard let self, self.appState.isDownloading else { return }
self.appState.updateDownloadProgress(info)
self.appState.statusMessage = L("pipeline.downloading") + " \(info.percentText)"
catalog.updateLLMDownloadProgress(model, info: info)
if let index = catalog.llmModels.firstIndex(where: { $0.id == model }) {
catalog.llmModels[index].status = .downloading
catalog.llmModels[index].downloadProgress = info.fraction
catalog.llmModels[index].downloadDetail = info.detailText
}
}
}
let ready = await textProcessor.isLLMReady
Expand Down
59 changes: 45 additions & 14 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ extension VoicePipeline {
audioActivity: AudioCaptureActivity,
language: String?,
settings: AppSettings,
inputMode: VoiceInputMode,
targetApp: NSRunningApplication?
) async {
defer { audioCapture.cleanupLastRecording() }
Expand All@@ -30,26 +31,43 @@ extension VoicePipeline {
return
}

if await handleSpokenEditCommandIfNeeded(raw: preparedRaw, settings: settings, targetApp: targetApp) {
return
}
if !inputMode.isTranslation {
if await handleSpokenEditCommandIfNeeded(
raw: preparedRaw,
settings: settings,
targetApp: targetApp
) {
return
}

if DeferredReplacementPolicy.shouldUseDeferredReplacement(
outputMode: settings.outputMode,
enableInstantInsert: settings.enableInstantInsert
) {
await handleDeferredSmartFormat(raw: preparedRaw, settings: settings, targetApp: targetApp)
return
if DeferredReplacementPolicy.shouldUseDeferredReplacement(
outputMode: settings.outputMode,
enableInstantInsert: settings.enableInstantInsert
) {
await handleDeferredSmartFormat(raw: preparedRaw, settings: settings, targetApp: targetApp)
return
}
}

let output = await outputText(for: preparedRaw, settings: settings, targetApp: targetApp)
let output = await outputText(
for: preparedRaw,
settings: settings,
inputMode: inputMode,
targetApp: targetApp
)

guard !Task.isCancelled else {
resetToIdle()
return
}

await insertFinalText(output, raw: preparedRaw, settings: settings, targetApp: targetApp)
await insertFinalText(
output,
raw: preparedRaw,
settings: settings,
inputMode: inputMode,
targetApp: targetApp
)
} catch VoicePipelineStop.noSpeech {
return
} catch {
Expand DownExpand Up@@ -94,8 +112,18 @@ extension VoicePipeline {
private func outputText(
for raw: String,
settings: AppSettings,
inputMode: VoiceInputMode,
targetApp: NSRunningApplication?
) async -> VoicePipelineOutput {
if case .translation(let targetLanguage) = inputMode {
return await processTranslation(
raw,
targetLanguage: targetLanguage,
settings: settings,
targetApp: targetApp
)
}

switch settings.outputMode {
case .processed:
return await processSmartFormat(raw, settings: settings, targetApp: targetApp)
Expand DownExpand Up@@ -190,7 +218,7 @@ extension VoicePipeline {
return VoicePipelineOutput(text: text, context: inputContext)
}

private func recordFormattingDuration(_ started: CFAbsoluteTime, label: String) {
func recordFormattingDuration(_ started: CFAbsoluteTime, label: String) {
let elapsed = CFAbsoluteTimeGetCurrent() - started
appState.lastFormattingDurationSeconds = elapsed
Log.info("[VoicePipeline] \(label) completed in \(String(format: "%.2f", elapsed))s")
Expand All@@ -200,6 +228,7 @@ extension VoicePipeline {
_ output: VoicePipelineOutput,
raw: String,
settings: AppSettings,
inputMode: VoiceInputMode,
targetApp: NSRunningApplication?
) async {
let finalText = output.text
Expand DownExpand Up@@ -230,7 +259,9 @@ extension VoicePipeline {
return
}

let wasProcessed = settings.outputMode == .processed || settings.outputMode == .command
let wasProcessed = inputMode.isTranslation
|| settings.outputMode == .processed
|| settings.outputMode == .command
InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
Expand All@@ -241,7 +272,7 @@ extension VoicePipeline {
}
}

private struct VoicePipelineOutput {
struct VoicePipelineOutput {
let text: String
let context: InputContext
}
Expand Down
33 changes: 33 additions & 0 deletions Sources/App/VoicePipeline+Translation.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import AppKit
import Foundation

@MainActor
extension VoicePipeline {
func processTranslation(
_ raw: String,
targetLanguage: TranslationLanguage,
settings: AppSettings,
targetApp: NSRunningApplication?
) async -> VoicePipelineOutput {
appState.phase = .processing
appState.statusMessage = L("pipeline.translating")
cancelScreenContextCapture()

let started = CFAbsoluteTimeGetCurrent()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: "",
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
)
let options = TextProcessingOptions(settings: settings)
let text = await textProcessor.translate(
text: raw,
targetLanguage: targetLanguage,
options: options
)
recordFormattingDuration(started, label: "Translation")
return VoicePipelineOutput(text: text, context: inputContext)
}
}
34 changes: 30 additions & 4 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ final class VoicePipeline {

// MARK: - Recording

func start() async {
func start(mode: VoiceInputMode = .dictation) async {
if appState.isBusy {
Log.info("[VoicePipeline] start: busy (\(appState.phase)), ignoring")
showBusyHint()
Expand DownExpand Up@@ -88,10 +88,17 @@ final class VoicePipeline {
clearInFlightWork()

appState.reset()
appState.activeInputMode = mode
appState.phase = .recording
appState.statusMessage = L("pipeline.recording")

startScreenContextCaptureIfNeeded()
appState.statusMessage = mode.isTranslation
? L("pipeline.recording_translation")
: L("pipeline.recording")

if mode.isTranslation {
cancelScreenContextCapture()
} else {
startScreenContextCaptureIfNeeded()
}

soundPlayer.playStart()
overlay.show(appState: appState)
Expand DownExpand Up@@ -148,6 +155,7 @@ final class VoicePipeline {
let audioURL = audioCapture.lastRecordingURL
let audioActivity = audioCapture.lastActivity
let settings = appState.settings
let inputMode = appState.activeInputMode

processingTask = Task { @MainActor [weak self] in
guard let self else { return }
Expand All@@ -156,6 +164,7 @@ final class VoicePipeline {
audioActivity: audioActivity,
language: language,
settings: settings,
inputMode: inputMode,
targetApp: targetApp
)
}
Expand All@@ -171,3 +180,20 @@ final class VoicePipeline {
hideOverlayTask = nil
}
}

enum StartupModelPreloadPolicy {
static func shouldPreloadSpeechModel(
enabled: Bool,
speechEngine: SpeechEngineType
) -> Bool {
enabled && speechEngine == .whisper
}

static func shouldPreloadFormattingModel(
enabled: Bool,
useRemoteLLM: Bool,
modelID: String
) -> Bool {
enabled && !useRemoteLLM && !modelID.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
}
}
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
1 change: 1 addition & 0 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ Three output modes are available:
| **Verbatim & Preview Boundary** | Verbatim mode, streaming HUD, integration partials, and instant-insert drafts keep ASR text close to raw output with only dictionary, whitespace, duplicate, and non-speech-artifact cleanup |
| **Remote LLM Support** | OpenAI, Claude (Anthropic format), Gemini, OpenRouter, SiliconFlow, Doubao, Bailian, MiniMax (CN & Global) |
| **Global Hotkey** | Configurable key (Fn/Ctrl/Shift/Option) with long-press, double-tap, or single-tap activation |
| **Translation Dictation** | Use a dedicated hotkey chord to speak in one language and insert an English, Chinese, Japanese, Korean, Spanish, French, or German translation |
| **Screen Context OCR** | Captures on-screen text via ScreenCaptureKit + Vision to help the LLM correct homophones |
| **Voice Command Mode** | Screen-aware voice assistant — summarize, reply, translate based on what's on screen |
| **Input Memory** | Recent input history injected as LLM context for better continuity |
Expand Down
1 change: 1 addition & 0 deletions README_zh.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@
| **直出与预览边界** | 原文直出、流式 HUD、集成 partial 和快速插入草稿尽量保留 ASR 原文,只做词库、空白、重复转写和非语音垃圾过滤 |
| **远程 LLM** | 支持 OpenAI、Claude(Anthropic 格式)、Gemini、OpenRouter、硅基流动、豆包、百炼、MiniMax(国内/海外) |
| **全局快捷键** | 可配置按键(Fn/Ctrl/Shift/Option),支持长按、双击、单击三种触发模式 |
| **翻译听写** | 使用独立组合键,说一种语言,直接输入英语、中日韩、西班牙语、法语或德语译文 |
| **屏幕上下文 OCR** | 通过 ScreenCaptureKit + Vision 截取屏幕文字,辅助 LLM 纠正同音字 |
| **语音指令模式** | 屏幕感知的语音助手 — 总结、回复、翻译屏幕内容 |
| **输入记忆** | 近期输入历史作为 LLM 上下文,提升连续输入准确度 |
Expand Down
2 changes: 2 additions & 0 deletions Sources/App/AppState.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ final class AppState: ObservableObject {
@Published var lastInsertedText: String = ""
@Published var lastFormattingDurationSeconds: Double = 0
@Published var pendingReplacement: DeferredReplacement?
@Published var activeInputMode: VoiceInputMode = .dictation

let settings = AppSettings.shared

Expand All@@ -51,6 +52,7 @@ final class AppState: ObservableObject {
statusMessage = L("status.ready")
resetDownloadProgress()
pendingReplacement = nil
activeInputMode = .dictation
}

func clearPendingReplacement() {
Expand Down
13 changes: 8 additions & 5 deletions Sources/App/OpenTypeApp.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,10 +101,10 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
private func setupHotkey() {
hotkeyManager = HotkeyManager(
settings: AppSettings.shared,
onStart: { [weak self] in
Task { @MainActor in self?.startRecording() }
onStart: { [weak self] action in
Task { @MainActor in self?.startRecording(action: action) }
},
onStop: { [weak self] in
onStop: { [weak self] _ in
Task { @MainActor in self?.stopRecording() }
}
)
Expand DownExpand Up@@ -134,14 +134,17 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
}
}

private func startRecording() {
private func startRecording(action: HotkeyAction) {
if integrationSessionCoordinator.isBusy {
pipeline?.showBusyHint()
return
}
savePreviousApp()
if popover.isShown { closePopover() }
Task { await pipeline?.start() }
let mode: VoiceInputMode = action == .translation
? .translation(AppSettings.shared.translationTargetLanguage)
: .dictation
Task { await pipeline?.start(mode: mode) }
}

private func stopRecording() {
Expand Down
18 changes: 0 additions & 18 deletions Sources/App/StartupModelPreloadPolicy.swift

This file was deleted.

11 changes: 11 additions & 0 deletions Sources/App/VoiceInputMode.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import Foundation

enum VoiceInputMode: Equatable {
case dictation
case translation(TranslationLanguage)

var isTranslation: Bool {
if case .translation = self { return true }
return false
}
}
6 changes: 5 additions & 1 deletion Sources/App/VoicePipeline+Models.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,11 @@ extension VoicePipeline {
guard let self, self.appState.isDownloading else { return }
self.appState.updateDownloadProgress(info)
self.appState.statusMessage = L("pipeline.downloading") + " \(info.percentText)"
catalog.updateLLMDownloadProgress(model, info: info)
if let index = catalog.llmModels.firstIndex(where: { $0.id == model }) {
catalog.llmModels[index].status = .downloading
catalog.llmModels[index].downloadProgress = info.fraction
catalog.llmModels[index].downloadDetail = info.detailText
}
}
}
let ready = await textProcessor.isLLMReady
Expand Down
59 changes: 45 additions & 14 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ extension VoicePipeline {
audioActivity: AudioCaptureActivity,
language: String?,
settings: AppSettings,
inputMode: VoiceInputMode,
targetApp: NSRunningApplication?
) async {
defer { audioCapture.cleanupLastRecording() }
Expand All@@ -30,26 +31,43 @@ extension VoicePipeline {
return
}

if await handleSpokenEditCommandIfNeeded(raw: preparedRaw, settings: settings, targetApp: targetApp) {
return
}
if !inputMode.isTranslation {
if await handleSpokenEditCommandIfNeeded(
raw: preparedRaw,
settings: settings,
targetApp: targetApp
) {
return
}

if DeferredReplacementPolicy.shouldUseDeferredReplacement(
outputMode: settings.outputMode,
enableInstantInsert: settings.enableInstantInsert
) {
await handleDeferredSmartFormat(raw: preparedRaw, settings: settings, targetApp: targetApp)
return
if DeferredReplacementPolicy.shouldUseDeferredReplacement(
outputMode: settings.outputMode,
enableInstantInsert: settings.enableInstantInsert
) {
await handleDeferredSmartFormat(raw: preparedRaw, settings: settings, targetApp: targetApp)
return
}
}

let output = await outputText(for: preparedRaw, settings: settings, targetApp: targetApp)
let output = await outputText(
for: preparedRaw,
settings: settings,
inputMode: inputMode,
targetApp: targetApp
)

guard !Task.isCancelled else {
resetToIdle()
return
}

await insertFinalText(output, raw: preparedRaw, settings: settings, targetApp: targetApp)
await insertFinalText(
output,
raw: preparedRaw,
settings: settings,
inputMode: inputMode,
targetApp: targetApp
)
} catch VoicePipelineStop.noSpeech {
return
} catch {
Expand DownExpand Up@@ -94,8 +112,18 @@ extension VoicePipeline {
private func outputText(
for raw: String,
settings: AppSettings,
inputMode: VoiceInputMode,
targetApp: NSRunningApplication?
) async -> VoicePipelineOutput {
if case .translation(let targetLanguage) = inputMode {
return await processTranslation(
raw,
targetLanguage: targetLanguage,
settings: settings,
targetApp: targetApp
)
}

switch settings.outputMode {
case .processed:
return await processSmartFormat(raw, settings: settings, targetApp: targetApp)
Expand DownExpand Up@@ -190,7 +218,7 @@ extension VoicePipeline {
return VoicePipelineOutput(text: text, context: inputContext)
}

private func recordFormattingDuration(_ started: CFAbsoluteTime, label: String) {
func recordFormattingDuration(_ started: CFAbsoluteTime, label: String) {
let elapsed = CFAbsoluteTimeGetCurrent() - started
appState.lastFormattingDurationSeconds = elapsed
Log.info("[VoicePipeline] \(label) completed in \(String(format: "%.2f", elapsed))s")
Expand All@@ -200,6 +228,7 @@ extension VoicePipeline {
_ output: VoicePipelineOutput,
raw: String,
settings: AppSettings,
inputMode: VoiceInputMode,
targetApp: NSRunningApplication?
) async {
let finalText = output.text
Expand DownExpand Up@@ -230,7 +259,9 @@ extension VoicePipeline {
return
}

let wasProcessed = settings.outputMode == .processed || settings.outputMode == .command
let wasProcessed = inputMode.isTranslation
|| settings.outputMode == .processed
|| settings.outputMode == .command
InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
Expand All@@ -241,7 +272,7 @@ extension VoicePipeline {
}
}

private struct VoicePipelineOutput {
struct VoicePipelineOutput {
let text: String
let context: InputContext
}
Expand Down
33 changes: 33 additions & 0 deletions Sources/App/VoicePipeline+Translation.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import AppKit
import Foundation

@MainActor
extension VoicePipeline {
func processTranslation(
_ raw: String,
targetLanguage: TranslationLanguage,
settings: AppSettings,
targetApp: NSRunningApplication?
) async -> VoicePipelineOutput {
appState.phase = .processing
appState.statusMessage = L("pipeline.translating")
cancelScreenContextCapture()

let started = CFAbsoluteTimeGetCurrent()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: "",
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
)
let options = TextProcessingOptions(settings: settings)
let text = await textProcessor.translate(
text: raw,
targetLanguage: targetLanguage,
options: options
)
recordFormattingDuration(started, label: "Translation")
return VoicePipelineOutput(text: text, context: inputContext)
}
}
34 changes: 30 additions & 4 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ final class VoicePipeline {

// MARK: - Recording

func start() async {
func start(mode: VoiceInputMode = .dictation) async {
if appState.isBusy {
Log.info("[VoicePipeline] start: busy (\(appState.phase)), ignoring")
showBusyHint()
Expand DownExpand Up@@ -88,10 +88,17 @@ final class VoicePipeline {
clearInFlightWork()

appState.reset()
appState.activeInputMode = mode
appState.phase = .recording
appState.statusMessage = L("pipeline.recording")

startScreenContextCaptureIfNeeded()
appState.statusMessage = mode.isTranslation
? L("pipeline.recording_translation")
: L("pipeline.recording")

if mode.isTranslation {
cancelScreenContextCapture()
} else {
startScreenContextCaptureIfNeeded()
}

soundPlayer.playStart()
overlay.show(appState: appState)
Expand DownExpand Up@@ -148,6 +155,7 @@ final class VoicePipeline {
let audioURL = audioCapture.lastRecordingURL
let audioActivity = audioCapture.lastActivity
let settings = appState.settings
let inputMode = appState.activeInputMode

processingTask = Task { @MainActor [weak self] in
guard let self else { return }
Expand All@@ -156,6 +164,7 @@ final class VoicePipeline {
audioActivity: audioActivity,
language: language,
settings: settings,
inputMode: inputMode,
targetApp: targetApp
)
}
Expand All@@ -171,3 +180,20 @@ final class VoicePipeline {
hideOverlayTask = nil
}
}

enum StartupModelPreloadPolicy {
static func shouldPreloadSpeechModel(
enabled: Bool,
speechEngine: SpeechEngineType
) -> Bool {
enabled && speechEngine == .whisper
}

static func shouldPreloadFormattingModel(
enabled: Bool,
useRemoteLLM: Bool,
modelID: String
) -> Bool {
enabled && !useRemoteLLM && !modelID.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
}
}
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
1 change: 1 addition & 0 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ Three output modes are available:
| **Verbatim & Preview Boundary** | Verbatim mode, streaming HUD, integration partials, and instant-insert drafts keep ASR text close to raw output with only dictionary, whitespace, duplicate, and non-speech-artifact cleanup |
| **Remote LLM Support** | OpenAI, Claude (Anthropic format), Gemini, OpenRouter, SiliconFlow, Doubao, Bailian, MiniMax (CN & Global) |
| **Global Hotkey** | Configurable key (Fn/Ctrl/Shift/Option) with long-press, double-tap, or single-tap activation |
| **Translation Dictation** | Use a dedicated hotkey chord to speak in one language and insert an English, Chinese, Japanese, Korean, Spanish, French, or German translation |
| **Screen Context OCR** | Captures on-screen text via ScreenCaptureKit + Vision to help the LLM correct homophones |
| **Voice Command Mode** | Screen-aware voice assistant — summarize, reply, translate based on what's on screen |
| **Input Memory** | Recent input history injected as LLM context for better continuity |
Expand Down
1 change: 1 addition & 0 deletions README_zh.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@
| **直出与预览边界** | 原文直出、流式 HUD、集成 partial 和快速插入草稿尽量保留 ASR 原文,只做词库、空白、重复转写和非语音垃圾过滤 |
| **远程 LLM** | 支持 OpenAI、Claude(Anthropic 格式)、Gemini、OpenRouter、硅基流动、豆包、百炼、MiniMax(国内/海外) |
| **全局快捷键** | 可配置按键(Fn/Ctrl/Shift/Option),支持长按、双击、单击三种触发模式 |
| **翻译听写** | 使用独立组合键,说一种语言,直接输入英语、中日韩、西班牙语、法语或德语译文 |
| **屏幕上下文 OCR** | 通过 ScreenCaptureKit + Vision 截取屏幕文字,辅助 LLM 纠正同音字 |
| **语音指令模式** | 屏幕感知的语音助手 — 总结、回复、翻译屏幕内容 |
| **输入记忆** | 近期输入历史作为 LLM 上下文,提升连续输入准确度 |
Expand Down
2 changes: 2 additions & 0 deletions Sources/App/AppState.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ final class AppState: ObservableObject {
@Published var lastInsertedText: String = ""
@Published var lastFormattingDurationSeconds: Double = 0
@Published var pendingReplacement: DeferredReplacement?
@Published var activeInputMode: VoiceInputMode = .dictation

let settings = AppSettings.shared

Expand All@@ -51,6 +52,7 @@ final class AppState: ObservableObject {
statusMessage = L("status.ready")
resetDownloadProgress()
pendingReplacement = nil
activeInputMode = .dictation
}

func clearPendingReplacement() {
Expand Down
13 changes: 8 additions & 5 deletions Sources/App/OpenTypeApp.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,10 +101,10 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
private func setupHotkey() {
hotkeyManager = HotkeyManager(
settings: AppSettings.shared,
onStart: { [weak self] in
Task { @MainActor in self?.startRecording() }
onStart: { [weak self] action in
Task { @MainActor in self?.startRecording(action: action) }
},
onStop: { [weak self] in
onStop: { [weak self] _ in
Task { @MainActor in self?.stopRecording() }
}
)
Expand DownExpand Up@@ -134,14 +134,17 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
}
}

private func startRecording() {
private func startRecording(action: HotkeyAction) {
if integrationSessionCoordinator.isBusy {
pipeline?.showBusyHint()
return
}
savePreviousApp()
if popover.isShown { closePopover() }
Task { await pipeline?.start() }
let mode: VoiceInputMode = action == .translation
? .translation(AppSettings.shared.translationTargetLanguage)
: .dictation
Task { await pipeline?.start(mode: mode) }
}

private func stopRecording() {
Expand Down
18 changes: 0 additions & 18 deletions Sources/App/StartupModelPreloadPolicy.swift

This file was deleted.

11 changes: 11 additions & 0 deletions Sources/App/VoiceInputMode.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import Foundation

enum VoiceInputMode: Equatable {
case dictation
case translation(TranslationLanguage)

var isTranslation: Bool {
if case .translation = self { return true }
return false
}
}
6 changes: 5 additions & 1 deletion Sources/App/VoicePipeline+Models.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,11 @@ extension VoicePipeline {
guard let self, self.appState.isDownloading else { return }
self.appState.updateDownloadProgress(info)
self.appState.statusMessage = L("pipeline.downloading") + " \(info.percentText)"
catalog.updateLLMDownloadProgress(model, info: info)
if let index = catalog.llmModels.firstIndex(where: { $0.id == model }) {
catalog.llmModels[index].status = .downloading
catalog.llmModels[index].downloadProgress = info.fraction
catalog.llmModels[index].downloadDetail = info.detailText
}
}
}
let ready = await textProcessor.isLLMReady
Expand Down
59 changes: 45 additions & 14 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ extension VoicePipeline {
audioActivity: AudioCaptureActivity,
language: String?,
settings: AppSettings,
inputMode: VoiceInputMode,
targetApp: NSRunningApplication?
) async {
defer { audioCapture.cleanupLastRecording() }
Expand All@@ -30,26 +31,43 @@ extension VoicePipeline {
return
}

if await handleSpokenEditCommandIfNeeded(raw: preparedRaw, settings: settings, targetApp: targetApp) {
return
}
if !inputMode.isTranslation {
if await handleSpokenEditCommandIfNeeded(
raw: preparedRaw,
settings: settings,
targetApp: targetApp
) {
return
}

if DeferredReplacementPolicy.shouldUseDeferredReplacement(
outputMode: settings.outputMode,
enableInstantInsert: settings.enableInstantInsert
) {
await handleDeferredSmartFormat(raw: preparedRaw, settings: settings, targetApp: targetApp)
return
if DeferredReplacementPolicy.shouldUseDeferredReplacement(
outputMode: settings.outputMode,
enableInstantInsert: settings.enableInstantInsert
) {
await handleDeferredSmartFormat(raw: preparedRaw, settings: settings, targetApp: targetApp)
return
}
}

let output = await outputText(for: preparedRaw, settings: settings, targetApp: targetApp)
let output = await outputText(
for: preparedRaw,
settings: settings,
inputMode: inputMode,
targetApp: targetApp
)

guard !Task.isCancelled else {
resetToIdle()
return
}

await insertFinalText(output, raw: preparedRaw, settings: settings, targetApp: targetApp)
await insertFinalText(
output,
raw: preparedRaw,
settings: settings,
inputMode: inputMode,
targetApp: targetApp
)
} catch VoicePipelineStop.noSpeech {
return
} catch {
Expand DownExpand Up@@ -94,8 +112,18 @@ extension VoicePipeline {
private func outputText(
for raw: String,
settings: AppSettings,
inputMode: VoiceInputMode,
targetApp: NSRunningApplication?
) async -> VoicePipelineOutput {
if case .translation(let targetLanguage) = inputMode {
return await processTranslation(
raw,
targetLanguage: targetLanguage,
settings: settings,
targetApp: targetApp
)
}

switch settings.outputMode {
case .processed:
return await processSmartFormat(raw, settings: settings, targetApp: targetApp)
Expand DownExpand Up@@ -190,7 +218,7 @@ extension VoicePipeline {
return VoicePipelineOutput(text: text, context: inputContext)
}

private func recordFormattingDuration(_ started: CFAbsoluteTime, label: String) {
func recordFormattingDuration(_ started: CFAbsoluteTime, label: String) {
let elapsed = CFAbsoluteTimeGetCurrent() - started
appState.lastFormattingDurationSeconds = elapsed
Log.info("[VoicePipeline] \(label) completed in \(String(format: "%.2f", elapsed))s")
Expand All@@ -200,6 +228,7 @@ extension VoicePipeline {
_ output: VoicePipelineOutput,
raw: String,
settings: AppSettings,
inputMode: VoiceInputMode,
targetApp: NSRunningApplication?
) async {
let finalText = output.text
Expand DownExpand Up@@ -230,7 +259,9 @@ extension VoicePipeline {
return
}

let wasProcessed = settings.outputMode == .processed || settings.outputMode == .command
let wasProcessed = inputMode.isTranslation
|| settings.outputMode == .processed
|| settings.outputMode == .command
InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
Expand All@@ -241,7 +272,7 @@ extension VoicePipeline {
}
}

private struct VoicePipelineOutput {
struct VoicePipelineOutput {
let text: String
let context: InputContext
}
Expand Down
33 changes: 33 additions & 0 deletions Sources/App/VoicePipeline+Translation.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import AppKit
import Foundation

@MainActor
extension VoicePipeline {
func processTranslation(
_ raw: String,
targetLanguage: TranslationLanguage,
settings: AppSettings,
targetApp: NSRunningApplication?
) async -> VoicePipelineOutput {
appState.phase = .processing
appState.statusMessage = L("pipeline.translating")
cancelScreenContextCapture()

let started = CFAbsoluteTimeGetCurrent()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: "",
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
)
let options = TextProcessingOptions(settings: settings)
let text = await textProcessor.translate(
text: raw,
targetLanguage: targetLanguage,
options: options
)
recordFormattingDuration(started, label: "Translation")
return VoicePipelineOutput(text: text, context: inputContext)
}
}
34 changes: 30 additions & 4 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ final class VoicePipeline {

// MARK: - Recording

func start() async {
func start(mode: VoiceInputMode = .dictation) async {
if appState.isBusy {
Log.info("[VoicePipeline] start: busy (\(appState.phase)), ignoring")
showBusyHint()
Expand DownExpand Up@@ -88,10 +88,17 @@ final class VoicePipeline {
clearInFlightWork()

appState.reset()
appState.activeInputMode = mode
appState.phase = .recording
appState.statusMessage = L("pipeline.recording")

startScreenContextCaptureIfNeeded()
appState.statusMessage = mode.isTranslation
? L("pipeline.recording_translation")
: L("pipeline.recording")

if mode.isTranslation {
cancelScreenContextCapture()
} else {
startScreenContextCaptureIfNeeded()
}

soundPlayer.playStart()
overlay.show(appState: appState)
Expand DownExpand Up@@ -148,6 +155,7 @@ final class VoicePipeline {
let audioURL = audioCapture.lastRecordingURL
let audioActivity = audioCapture.lastActivity
let settings = appState.settings
let inputMode = appState.activeInputMode

processingTask = Task { @MainActor [weak self] in
guard let self else { return }
Expand All@@ -156,6 +164,7 @@ final class VoicePipeline {
audioActivity: audioActivity,
language: language,
settings: settings,
inputMode: inputMode,
targetApp: targetApp
)
}
Expand All@@ -171,3 +180,20 @@ final class VoicePipeline {
hideOverlayTask = nil
}
}

enum StartupModelPreloadPolicy {
static func shouldPreloadSpeechModel(
enabled: Bool,
speechEngine: SpeechEngineType
) -> Bool {
enabled && speechEngine == .whisper
}

static func shouldPreloadFormattingModel(
enabled: Bool,
useRemoteLLM: Bool,
modelID: String
) -> Bool {
enabled && !useRemoteLLM && !modelID.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
}
}
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
1 change: 1 addition & 0 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ Three output modes are available:
| **Verbatim & Preview Boundary** | Verbatim mode, streaming HUD, integration partials, and instant-insert drafts keep ASR text close to raw output with only dictionary, whitespace, duplicate, and non-speech-artifact cleanup |
| **Remote LLM Support** | OpenAI, Claude (Anthropic format), Gemini, OpenRouter, SiliconFlow, Doubao, Bailian, MiniMax (CN & Global) |
| **Global Hotkey** | Configurable key (Fn/Ctrl/Shift/Option) with long-press, double-tap, or single-tap activation |
| **Translation Dictation** | Use a dedicated hotkey chord to speak in one language and insert an English, Chinese, Japanese, Korean, Spanish, French, or German translation |
| **Screen Context OCR** | Captures on-screen text via ScreenCaptureKit + Vision to help the LLM correct homophones |
| **Voice Command Mode** | Screen-aware voice assistant — summarize, reply, translate based on what's on screen |
| **Input Memory** | Recent input history injected as LLM context for better continuity |
Expand Down
1 change: 1 addition & 0 deletions README_zh.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@
| **直出与预览边界** | 原文直出、流式 HUD、集成 partial 和快速插入草稿尽量保留 ASR 原文,只做词库、空白、重复转写和非语音垃圾过滤 |
| **远程 LLM** | 支持 OpenAI、Claude(Anthropic 格式)、Gemini、OpenRouter、硅基流动、豆包、百炼、MiniMax(国内/海外) |
| **全局快捷键** | 可配置按键(Fn/Ctrl/Shift/Option),支持长按、双击、单击三种触发模式 |
| **翻译听写** | 使用独立组合键,说一种语言,直接输入英语、中日韩、西班牙语、法语或德语译文 |
| **屏幕上下文 OCR** | 通过 ScreenCaptureKit + Vision 截取屏幕文字,辅助 LLM 纠正同音字 |
| **语音指令模式** | 屏幕感知的语音助手 — 总结、回复、翻译屏幕内容 |
| **输入记忆** | 近期输入历史作为 LLM 上下文,提升连续输入准确度 |
Expand Down
2 changes: 2 additions & 0 deletions Sources/App/AppState.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ final class AppState: ObservableObject {
@Published var lastInsertedText: String = ""
@Published var lastFormattingDurationSeconds: Double = 0
@Published var pendingReplacement: DeferredReplacement?
@Published var activeInputMode: VoiceInputMode = .dictation

let settings = AppSettings.shared

Expand All@@ -51,6 +52,7 @@ final class AppState: ObservableObject {
statusMessage = L("status.ready")
resetDownloadProgress()
pendingReplacement = nil
activeInputMode = .dictation
}

func clearPendingReplacement() {
Expand Down
13 changes: 8 additions & 5 deletions Sources/App/OpenTypeApp.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,10 +101,10 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
private func setupHotkey() {
hotkeyManager = HotkeyManager(
settings: AppSettings.shared,
onStart: { [weak self] in
Task { @MainActor in self?.startRecording() }
onStart: { [weak self] action in
Task { @MainActor in self?.startRecording(action: action) }
},
onStop: { [weak self] in
onStop: { [weak self] _ in
Task { @MainActor in self?.stopRecording() }
}
)
Expand DownExpand Up@@ -134,14 +134,17 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
}
}

private func startRecording() {
private func startRecording(action: HotkeyAction) {
if integrationSessionCoordinator.isBusy {
pipeline?.showBusyHint()
return
}
savePreviousApp()
if popover.isShown { closePopover() }
Task { await pipeline?.start() }
let mode: VoiceInputMode = action == .translation
? .translation(AppSettings.shared.translationTargetLanguage)
: .dictation
Task { await pipeline?.start(mode: mode) }
}

private func stopRecording() {
Expand Down
18 changes: 0 additions & 18 deletions Sources/App/StartupModelPreloadPolicy.swift

This file was deleted.

11 changes: 11 additions & 0 deletions Sources/App/VoiceInputMode.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import Foundation

enum VoiceInputMode: Equatable {
case dictation
case translation(TranslationLanguage)

var isTranslation: Bool {
if case .translation = self { return true }
return false
}
}
6 changes: 5 additions & 1 deletion Sources/App/VoicePipeline+Models.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,11 @@ extension VoicePipeline {
guard let self, self.appState.isDownloading else { return }
self.appState.updateDownloadProgress(info)
self.appState.statusMessage = L("pipeline.downloading") + " \(info.percentText)"
catalog.updateLLMDownloadProgress(model, info: info)
if let index = catalog.llmModels.firstIndex(where: { $0.id == model }) {
catalog.llmModels[index].status = .downloading
catalog.llmModels[index].downloadProgress = info.fraction
catalog.llmModels[index].downloadDetail = info.detailText
}
}
}
let ready = await textProcessor.isLLMReady
Expand Down
59 changes: 45 additions & 14 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ extension VoicePipeline {
audioActivity: AudioCaptureActivity,
language: String?,
settings: AppSettings,
inputMode: VoiceInputMode,
targetApp: NSRunningApplication?
) async {
defer { audioCapture.cleanupLastRecording() }
Expand All@@ -30,26 +31,43 @@ extension VoicePipeline {
return
}

if await handleSpokenEditCommandIfNeeded(raw: preparedRaw, settings: settings, targetApp: targetApp) {
return
}
if !inputMode.isTranslation {
if await handleSpokenEditCommandIfNeeded(
raw: preparedRaw,
settings: settings,
targetApp: targetApp
) {
return
}

if DeferredReplacementPolicy.shouldUseDeferredReplacement(
outputMode: settings.outputMode,
enableInstantInsert: settings.enableInstantInsert
) {
await handleDeferredSmartFormat(raw: preparedRaw, settings: settings, targetApp: targetApp)
return
if DeferredReplacementPolicy.shouldUseDeferredReplacement(
outputMode: settings.outputMode,
enableInstantInsert: settings.enableInstantInsert
) {
await handleDeferredSmartFormat(raw: preparedRaw, settings: settings, targetApp: targetApp)
return
}
}

let output = await outputText(for: preparedRaw, settings: settings, targetApp: targetApp)
let output = await outputText(
for: preparedRaw,
settings: settings,
inputMode: inputMode,
targetApp: targetApp
)

guard !Task.isCancelled else {
resetToIdle()
return
}

await insertFinalText(output, raw: preparedRaw, settings: settings, targetApp: targetApp)
await insertFinalText(
output,
raw: preparedRaw,
settings: settings,
inputMode: inputMode,
targetApp: targetApp
)
} catch VoicePipelineStop.noSpeech {
return
} catch {
Expand DownExpand Up@@ -94,8 +112,18 @@ extension VoicePipeline {
private func outputText(
for raw: String,
settings: AppSettings,
inputMode: VoiceInputMode,
targetApp: NSRunningApplication?
) async -> VoicePipelineOutput {
if case .translation(let targetLanguage) = inputMode {
return await processTranslation(
raw,
targetLanguage: targetLanguage,
settings: settings,
targetApp: targetApp
)
}

switch settings.outputMode {
case .processed:
return await processSmartFormat(raw, settings: settings, targetApp: targetApp)
Expand DownExpand Up@@ -190,7 +218,7 @@ extension VoicePipeline {
return VoicePipelineOutput(text: text, context: inputContext)
}

private func recordFormattingDuration(_ started: CFAbsoluteTime, label: String) {
func recordFormattingDuration(_ started: CFAbsoluteTime, label: String) {
let elapsed = CFAbsoluteTimeGetCurrent() - started
appState.lastFormattingDurationSeconds = elapsed
Log.info("[VoicePipeline] \(label) completed in \(String(format: "%.2f", elapsed))s")
Expand All@@ -200,6 +228,7 @@ extension VoicePipeline {
_ output: VoicePipelineOutput,
raw: String,
settings: AppSettings,
inputMode: VoiceInputMode,
targetApp: NSRunningApplication?
) async {
let finalText = output.text
Expand DownExpand Up@@ -230,7 +259,9 @@ extension VoicePipeline {
return
}

let wasProcessed = settings.outputMode == .processed || settings.outputMode == .command
let wasProcessed = inputMode.isTranslation
|| settings.outputMode == .processed
|| settings.outputMode == .command
InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
Expand All@@ -241,7 +272,7 @@ extension VoicePipeline {
}
}

private struct VoicePipelineOutput {
struct VoicePipelineOutput {
let text: String
let context: InputContext
}
Expand Down
33 changes: 33 additions & 0 deletions Sources/App/VoicePipeline+Translation.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import AppKit
import Foundation

@MainActor
extension VoicePipeline {
func processTranslation(
_ raw: String,
targetLanguage: TranslationLanguage,
settings: AppSettings,
targetApp: NSRunningApplication?
) async -> VoicePipelineOutput {
appState.phase = .processing
appState.statusMessage = L("pipeline.translating")
cancelScreenContextCapture()

let started = CFAbsoluteTimeGetCurrent()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: "",
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
)
let options = TextProcessingOptions(settings: settings)
let text = await textProcessor.translate(
text: raw,
targetLanguage: targetLanguage,
options: options
)
recordFormattingDuration(started, label: "Translation")
return VoicePipelineOutput(text: text, context: inputContext)
}
}
34 changes: 30 additions & 4 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ final class VoicePipeline {

// MARK: - Recording

func start() async {
func start(mode: VoiceInputMode = .dictation) async {
if appState.isBusy {
Log.info("[VoicePipeline] start: busy (\(appState.phase)), ignoring")
showBusyHint()
Expand DownExpand Up@@ -88,10 +88,17 @@ final class VoicePipeline {
clearInFlightWork()

appState.reset()
appState.activeInputMode = mode
appState.phase = .recording
appState.statusMessage = L("pipeline.recording")

startScreenContextCaptureIfNeeded()
appState.statusMessage = mode.isTranslation
? L("pipeline.recording_translation")
: L("pipeline.recording")

if mode.isTranslation {
cancelScreenContextCapture()
} else {
startScreenContextCaptureIfNeeded()
}

soundPlayer.playStart()
overlay.show(appState: appState)
Expand DownExpand Up@@ -148,6 +155,7 @@ final class VoicePipeline {
let audioURL = audioCapture.lastRecordingURL
let audioActivity = audioCapture.lastActivity
let settings = appState.settings
let inputMode = appState.activeInputMode

processingTask = Task { @MainActor [weak self] in
guard let self else { return }
Expand All@@ -156,6 +164,7 @@ final class VoicePipeline {
audioActivity: audioActivity,
language: language,
settings: settings,
inputMode: inputMode,
targetApp: targetApp
)
}
Expand All@@ -171,3 +180,20 @@ final class VoicePipeline {
hideOverlayTask = nil
}
}

enum StartupModelPreloadPolicy {
static func shouldPreloadSpeechModel(
enabled: Bool,
speechEngine: SpeechEngineType
) -> Bool {
enabled && speechEngine == .whisper
}

static func shouldPreloadFormattingModel(
enabled: Bool,
useRemoteLLM: Bool,
modelID: String
) -> Bool {
enabled && !useRemoteLLM && !modelID.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
}
}
Loading
Loading