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
8 changes: 4 additions & 4 deletions Package.resolved

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

1 change: 1 addition & 0 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ let package = Package(
.product(name: "Hub", package: "swift-transformers"),
.product(name: "Tokenizers", package: "swift-transformers"),
.product(name: "MLXLLM", package: "mlx-swift-lm"),
.product(name: "MLXVLM", package: "mlx-swift-lm"),
.product(name: "MLXLMCommon", package: "mlx-swift-lm"),
],
path: "Sources",
Expand Down
10 changes: 6 additions & 4 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -122,7 +122,7 @@ extension VoicePipeline {
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
Expand All@@ -138,7 +138,8 @@ extension VoicePipeline {
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
recordFormattingDuration(started, label: "Smart Format")
Expand All@@ -157,7 +158,7 @@ extension VoicePipeline {
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext,
screenContext: screenContext.text,
outputMode: .command,
inputLanguage: settings.inputLanguage,
source: .menuBar
Expand All@@ -172,7 +173,8 @@ extension VoicePipeline {
let text = await textProcessor.processCommand(
text: raw,
model: settings.llmModel,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
recordFormattingDuration(started, label: "Voice Command formatting")
Expand Down
11 changes: 6 additions & 5 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,14 +147,14 @@ extension VoicePipeline {
replacementID: UUID,
raw: String,
settings: AppSettings,
ocrTask: Task<String, Never>?,
ocrTask: Task<ScreenContextSnapshot, Never>?,
ocrStartedAt: CFAbsoluteTime?
) async {
let started = CFAbsoluteTimeGetCurrent()
let screenContext = await ocrTask?.value ?? ""
let screenContext = await ocrTask?.value ?? .empty
if let ocrStartedAt {
let elapsed = CFAbsoluteTimeGetCurrent() - ocrStartedAt
Log.info("[VoicePipeline] OCR stage finished in \(String(format: "%.2f", elapsed))s")
Log.info("[VoicePipeline] screen context stage finished in \(String(format: "%.2f", elapsed))s")
}

guard !Task.isCancelled else { return }
Expand All@@ -164,7 +164,7 @@ extension VoicePipeline {
appName: currentReplacement.targetAppName,
bundleIdentifier: currentReplacement.targetBundleIdentifier,
windowTitle: currentReplacement.context?.windowTitle,
screenContext: screenContext,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
Expand All@@ -179,7 +179,8 @@ extension VoicePipeline {
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
let elapsed = CFAbsoluteTimeGetCurrent() - started
Expand Down
19 changes: 9 additions & 10 deletions Sources/App/VoicePipeline+ScreenContext.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,23 +12,22 @@ extension VoicePipeline {
return
}

guard ScreenOCR.hasScreenCapturePermission else {
Log.info("[VoicePipeline] screen capture permission not granted, skipping OCR")
cancelScreenContextCapture()
return
}

screenOCRStartedAt = CFAbsoluteTimeGetCurrent()
let mode = ScreenContextMode.effectiveCaptureMode(
preference: appState.settings.screenContextMode,
useRemoteLLM: appState.settings.useRemoteLLM,
modelID: appState.settings.llmModel
)
screenOCRTask = Task.detached(priority: .utility) {
await ScreenOCR.captureAndRecognize()
await ScreenOCR.capture(mode: mode)
}
}

func finishScreenContextCapture() async -> String {
let context = await screenOCRTask?.value ?? ""
func finishScreenContextCapture() async -> ScreenContextSnapshot {
let context = await screenOCRTask?.value ?? .empty
if let screenOCRStartedAt {
let elapsed = CFAbsoluteTimeGetCurrent() - screenOCRStartedAt
Log.info("[VoicePipeline] OCR stage finished in \(String(format: "%.2f", elapsed))s")
Log.info("[VoicePipeline] screen context stage finished in \(String(format: "%.2f", elapsed))s")
}
screenOCRTask = nil
screenOCRStartedAt = nil
Expand Down
2 changes: 1 addition & 1 deletion Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ final class VoicePipeline {
var volcSpeechEngine: VolcSpeechEngine?
var qwenSpeechEngine: LocalASREngine?
var mimoSpeechEngine: LocalASREngine?
var screenOCRTask: Task<String, Never>?
var screenOCRTask: Task<ScreenContextSnapshot, Never>?
var screenOCRStartedAt: CFAbsoluteTime?
var processingTask: Task<Void, Never>?
var replacementTask: Task<Void, Never>?
Expand Down
5 changes: 4 additions & 1 deletion Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -250,6 +250,7 @@ final class AppSettings: ObservableObject {
@Published var enableStreamingRecognitionBeta: Bool
@Published var inputLanguage: InputLanguage
@Published var useScreenContext: Bool
@Published var screenContextMode: ScreenContextMode
@Published var enableInstantInsert: Bool
@Published var hasCompletedOnboarding: Bool
@Published var uiLanguage: UILanguage {
Expand DownExpand Up@@ -290,7 +291,7 @@ final class AppSettings: ObservableObject {
case hotkeyType, activationMode, tapInterval, speechEngine, whisperModel, llmModel
case microphoneID, outputMode, languageStyle, customStylePrompt, playSounds
case enableStreamingRecognitionBeta
case inputLanguage, useScreenContext, enableInstantInsert, hasCompletedOnboarding, uiLanguage, historyRetention
case inputLanguage, useScreenContext, screenContextMode, enableInstantInsert, hasCompletedOnboarding, uiLanguage, historyRetention
case enableMemory, memoryWindowMinutes
case useCustomSystemPrompt, customSystemPrompt
case useRemoteLLM, remoteProvider, remoteAPIKey, remoteBaseURL, remoteModel
Expand DownExpand Up@@ -338,6 +339,7 @@ final class AppSettings: ObservableObject {
enableStreamingRecognitionBeta = ud.object(forKey: Key.enableStreamingRecognitionBeta.rawValue) as? Bool ?? true
inputLanguage = InputLanguage(rawValue: ud.string(forKey: Key.inputLanguage.rawValue) ?? "") ?? .chinese
useScreenContext = ud.object(forKey: Key.useScreenContext.rawValue) as? Bool ?? false
screenContextMode = ScreenContextMode(rawValue: ud.string(forKey: Key.screenContextMode.rawValue) ?? "") ?? .ocr
enableInstantInsert = ud.object(forKey: Key.enableInstantInsert.rawValue) as? Bool ?? false
hasCompletedOnboarding = ud.bool(forKey: Key.hasCompletedOnboarding.rawValue)
uiLanguage = loadedUILanguage
Expand DownExpand Up@@ -397,6 +399,7 @@ final class AppSettings: ObservableObject {
$enableStreamingRecognitionBeta.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.enableStreamingRecognitionBeta.rawValue) }.store(in: &cancellables)
$inputLanguage.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.inputLanguage.rawValue) }.store(in: &cancellables)
$useScreenContext.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.useScreenContext.rawValue) }.store(in: &cancellables)
$screenContextMode.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.screenContextMode.rawValue) }.store(in: &cancellables)
$enableInstantInsert.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.enableInstantInsert.rawValue) }.store(in: &cancellables)
$hasCompletedOnboarding.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.hasCompletedOnboarding.rawValue) }.store(in: &cancellables)
$uiLanguage.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.uiLanguage.rawValue) }.store(in: &cancellables)
Expand Down
41 changes: 41 additions & 0 deletions Sources/Config/ScreenContextMode.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import Foundation

enum ScreenContextMode: String, Codable, CaseIterable {
case ocr = "ocr"
case multimodal = "multimodal"

static func effectiveCaptureMode(
preference: ScreenContextMode,
useRemoteLLM: Bool,
modelID: String
) -> ScreenContextMode {
guard preference == .multimodal,
!useRemoteLLM,
supportsScreenImageContext(modelID: modelID)
else {
return .ocr
}
return .multimodal
}

static func supportsScreenImageContext(modelID: String) -> Bool {
let id = modelID.lowercased()
return id.contains("gemma-4")
|| id.contains("gemma4")
|| id.contains("gemma_4")
|| id.contains("-vl")
|| id.contains("_vl")
|| id.contains("paligemma")
|| id.contains("smolvlm")
|| id.contains("fastvlm")
|| id.contains("pixtral")
|| id.contains("idefics")
}

var label: String {
switch self {
case .ocr: return L("screen_context_mode.ocr")
case .multimodal: return L("screen_context_mode.multimodal")
}
}
}
14 changes: 8 additions & 6 deletions Sources/Integration/InputSessionCoordinator+Output.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ extension InputSessionCoordinator {
text = textProcessor.basicClean(text: raw)
case .processed:
let screenContext = await screenContext(from: active)
context = inputContext(for: active, screenContext: screenContext, mode: .processed)
context = inputContext(for: active, screenContext: screenContext.text, mode: .processed)
let memoryContext = VoicePipelinePolicy.memoryContext(
for: .processed,
settings: settings,
Expand All@@ -23,12 +23,13 @@ extension InputSessionCoordinator {
text = await textProcessor.process(
text: raw,
options: options,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
case .command:
let screenContext = await screenContext(from: active)
context = inputContext(for: active, screenContext: screenContext, mode: .command)
context = inputContext(for: active, screenContext: screenContext.text, mode: .command)
let memoryContext = VoicePipelinePolicy.memoryContext(
for: .command,
settings: settings,
Expand All@@ -37,7 +38,8 @@ extension InputSessionCoordinator {
text = await textProcessor.processCommand(
text: raw,
options: options,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
}
Expand DownExpand Up@@ -66,7 +68,7 @@ extension InputSessionCoordinator {
)
}

private func screenContext(from active: ActiveSession) async -> String {
await active.screenContextTask?.value ?? ""
private func screenContext(from active: ActiveSession) async -> ScreenContextSnapshot {
await active.screenContextTask?.value ?? .empty
}
}
15 changes: 8 additions & 7 deletions Sources/Integration/InputSessionCoordinator.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ final class InputSessionCoordinator {
let inputLanguage: InputLanguage
let useScreenContext: Bool
let streamingEnabled: Bool
let screenContextTask: Task<String, Never>?
let screenContextTask: Task<ScreenContextSnapshot, Never>?
let client: IntegrationClient?
}

Expand DownExpand Up@@ -213,19 +213,20 @@ final class InputSessionCoordinator {
func startScreenContextCaptureIfNeeded(
mode: OutputMode,
useScreenContext: Bool
) -> Task<String, Never>? {
) -> Task<ScreenContextSnapshot, Never>? {
guard VoicePipelinePolicy.shouldCaptureScreenContext(
outputMode: mode,
useScreenContext: useScreenContext
) else {
return nil
}
guard ScreenOCR.hasScreenCapturePermission else {
Log.info("[InputSessionCoordinator] screen capture permission not granted, skipping OCR")
return nil
}
let contextMode = ScreenContextMode.effectiveCaptureMode(
preference: settings.screenContextMode,
useRemoteLLM: settings.useRemoteLLM,
modelID: settings.llmModel
)
return Task.detached(priority: .utility) {
await ScreenOCR.captureAndRecognize()
await ScreenOCR.capture(mode: contextMode)
}
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/LLM/LLMEngine.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,7 +136,7 @@ actor LLMEngine {
return "/no_think\n\(prompt)"
}

private static func modelConfiguration(for id: String) -> ModelConfiguration {
static func modelConfiguration(for id: String) -> ModelConfiguration {
let extraEOSTokens: Set<String> = id.lowercased().contains("gemma-4") ? ["<turn|>"] : []
return ModelConfiguration(id: id, extraEOSTokens: extraEOSTokens)
}
Expand Down
69 changes: 69 additions & 0 deletions Sources/LLM/VLMEngine.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
import CoreGraphics
import CoreImage
import Foundation
import MLXLMCommon
import MLXVLM

actor VLMEngine {
private var container: ModelContainer?
private var currentModelID: String?

func loadModel(id: String) async throws {
if currentModelID == id, container != nil { return }

Log.info("[VLMEngine] loading model: \(id)")
let started = CFAbsoluteTimeGetCurrent()

if let localURL = ModelStorage.localLLMURL(id) {
container = try await VLMModelFactory.shared.loadContainer(
from: localURL,
using: MLXModelLoading.tokenizerLoader
)
} else {
let config = LLMEngine.modelConfiguration(for: id)
container = try await VLMModelFactory.shared.loadContainer(
from: MLXModelLoading.downloader,
using: MLXModelLoading.tokenizerLoader,
configuration: config
)
}

currentModelID = id
let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VLMEngine] model loaded in \(String(format: "%.1f", elapsed))s")
}

func generate(
prompt: String,
systemPrompt: String? = nil,
image: CGImage,
maxTokens: Int = 2048,
temperature: Double = 0.3
) async throws -> String {
guard let container else {
throw LLMError.modelNotLoaded
}

let started = CFAbsoluteTimeGetCurrent()
let params = GenerateParameters(maxTokens: maxTokens, temperature: Float(temperature))
let session = ChatSession(
container,
instructions: systemPrompt,
generateParameters: params,
processing: .init()
)
let ciImage = CIImage(cgImage: image)
let result = try await session.respond(to: prompt, image: .ciImage(ciImage))

let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VLMEngine] generated \(result.count) chars in \(String(format: "%.1f", elapsed))s")
return result
}

var isLoaded: Bool { container != nil }

func unload() {
container = nil
currentModelID = nil
}
}
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
8 changes: 4 additions & 4 deletions Package.resolved

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

1 change: 1 addition & 0 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ let package = Package(
.product(name: "Hub", package: "swift-transformers"),
.product(name: "Tokenizers", package: "swift-transformers"),
.product(name: "MLXLLM", package: "mlx-swift-lm"),
.product(name: "MLXVLM", package: "mlx-swift-lm"),
.product(name: "MLXLMCommon", package: "mlx-swift-lm"),
],
path: "Sources",
Expand Down
10 changes: 6 additions & 4 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -122,7 +122,7 @@ extension VoicePipeline {
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
Expand All@@ -138,7 +138,8 @@ extension VoicePipeline {
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
recordFormattingDuration(started, label: "Smart Format")
Expand All@@ -157,7 +158,7 @@ extension VoicePipeline {
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext,
screenContext: screenContext.text,
outputMode: .command,
inputLanguage: settings.inputLanguage,
source: .menuBar
Expand All@@ -172,7 +173,8 @@ extension VoicePipeline {
let text = await textProcessor.processCommand(
text: raw,
model: settings.llmModel,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
recordFormattingDuration(started, label: "Voice Command formatting")
Expand Down
11 changes: 6 additions & 5 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,14 +147,14 @@ extension VoicePipeline {
replacementID: UUID,
raw: String,
settings: AppSettings,
ocrTask: Task<String, Never>?,
ocrTask: Task<ScreenContextSnapshot, Never>?,
ocrStartedAt: CFAbsoluteTime?
) async {
let started = CFAbsoluteTimeGetCurrent()
let screenContext = await ocrTask?.value ?? ""
let screenContext = await ocrTask?.value ?? .empty
if let ocrStartedAt {
let elapsed = CFAbsoluteTimeGetCurrent() - ocrStartedAt
Log.info("[VoicePipeline] OCR stage finished in \(String(format: "%.2f", elapsed))s")
Log.info("[VoicePipeline] screen context stage finished in \(String(format: "%.2f", elapsed))s")
}

guard !Task.isCancelled else { return }
Expand All@@ -164,7 +164,7 @@ extension VoicePipeline {
appName: currentReplacement.targetAppName,
bundleIdentifier: currentReplacement.targetBundleIdentifier,
windowTitle: currentReplacement.context?.windowTitle,
screenContext: screenContext,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
Expand All@@ -179,7 +179,8 @@ extension VoicePipeline {
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
let elapsed = CFAbsoluteTimeGetCurrent() - started
Expand Down
19 changes: 9 additions & 10 deletions Sources/App/VoicePipeline+ScreenContext.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,23 +12,22 @@ extension VoicePipeline {
return
}

guard ScreenOCR.hasScreenCapturePermission else {
Log.info("[VoicePipeline] screen capture permission not granted, skipping OCR")
cancelScreenContextCapture()
return
}

screenOCRStartedAt = CFAbsoluteTimeGetCurrent()
let mode = ScreenContextMode.effectiveCaptureMode(
preference: appState.settings.screenContextMode,
useRemoteLLM: appState.settings.useRemoteLLM,
modelID: appState.settings.llmModel
)
screenOCRTask = Task.detached(priority: .utility) {
await ScreenOCR.captureAndRecognize()
await ScreenOCR.capture(mode: mode)
}
}

func finishScreenContextCapture() async -> String {
let context = await screenOCRTask?.value ?? ""
func finishScreenContextCapture() async -> ScreenContextSnapshot {
let context = await screenOCRTask?.value ?? .empty
if let screenOCRStartedAt {
let elapsed = CFAbsoluteTimeGetCurrent() - screenOCRStartedAt
Log.info("[VoicePipeline] OCR stage finished in \(String(format: "%.2f", elapsed))s")
Log.info("[VoicePipeline] screen context stage finished in \(String(format: "%.2f", elapsed))s")
}
screenOCRTask = nil
screenOCRStartedAt = nil
Expand Down
2 changes: 1 addition & 1 deletion Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ final class VoicePipeline {
var volcSpeechEngine: VolcSpeechEngine?
var qwenSpeechEngine: LocalASREngine?
var mimoSpeechEngine: LocalASREngine?
var screenOCRTask: Task<String, Never>?
var screenOCRTask: Task<ScreenContextSnapshot, Never>?
var screenOCRStartedAt: CFAbsoluteTime?
var processingTask: Task<Void, Never>?
var replacementTask: Task<Void, Never>?
Expand Down
5 changes: 4 additions & 1 deletion Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -250,6 +250,7 @@ final class AppSettings: ObservableObject {
@Published var enableStreamingRecognitionBeta: Bool
@Published var inputLanguage: InputLanguage
@Published var useScreenContext: Bool
@Published var screenContextMode: ScreenContextMode
@Published var enableInstantInsert: Bool
@Published var hasCompletedOnboarding: Bool
@Published var uiLanguage: UILanguage {
Expand DownExpand Up@@ -290,7 +291,7 @@ final class AppSettings: ObservableObject {
case hotkeyType, activationMode, tapInterval, speechEngine, whisperModel, llmModel
case microphoneID, outputMode, languageStyle, customStylePrompt, playSounds
case enableStreamingRecognitionBeta
case inputLanguage, useScreenContext, enableInstantInsert, hasCompletedOnboarding, uiLanguage, historyRetention
case inputLanguage, useScreenContext, screenContextMode, enableInstantInsert, hasCompletedOnboarding, uiLanguage, historyRetention
case enableMemory, memoryWindowMinutes
case useCustomSystemPrompt, customSystemPrompt
case useRemoteLLM, remoteProvider, remoteAPIKey, remoteBaseURL, remoteModel
Expand DownExpand Up@@ -338,6 +339,7 @@ final class AppSettings: ObservableObject {
enableStreamingRecognitionBeta = ud.object(forKey: Key.enableStreamingRecognitionBeta.rawValue) as? Bool ?? true
inputLanguage = InputLanguage(rawValue: ud.string(forKey: Key.inputLanguage.rawValue) ?? "") ?? .chinese
useScreenContext = ud.object(forKey: Key.useScreenContext.rawValue) as? Bool ?? false
screenContextMode = ScreenContextMode(rawValue: ud.string(forKey: Key.screenContextMode.rawValue) ?? "") ?? .ocr
enableInstantInsert = ud.object(forKey: Key.enableInstantInsert.rawValue) as? Bool ?? false
hasCompletedOnboarding = ud.bool(forKey: Key.hasCompletedOnboarding.rawValue)
uiLanguage = loadedUILanguage
Expand DownExpand Up@@ -397,6 +399,7 @@ final class AppSettings: ObservableObject {
$enableStreamingRecognitionBeta.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.enableStreamingRecognitionBeta.rawValue) }.store(in: &cancellables)
$inputLanguage.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.inputLanguage.rawValue) }.store(in: &cancellables)
$useScreenContext.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.useScreenContext.rawValue) }.store(in: &cancellables)
$screenContextMode.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.screenContextMode.rawValue) }.store(in: &cancellables)
$enableInstantInsert.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.enableInstantInsert.rawValue) }.store(in: &cancellables)
$hasCompletedOnboarding.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.hasCompletedOnboarding.rawValue) }.store(in: &cancellables)
$uiLanguage.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.uiLanguage.rawValue) }.store(in: &cancellables)
Expand Down
41 changes: 41 additions & 0 deletions Sources/Config/ScreenContextMode.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import Foundation

enum ScreenContextMode: String, Codable, CaseIterable {
case ocr = "ocr"
case multimodal = "multimodal"

static func effectiveCaptureMode(
preference: ScreenContextMode,
useRemoteLLM: Bool,
modelID: String
) -> ScreenContextMode {
guard preference == .multimodal,
!useRemoteLLM,
supportsScreenImageContext(modelID: modelID)
else {
return .ocr
}
return .multimodal
}

static func supportsScreenImageContext(modelID: String) -> Bool {
let id = modelID.lowercased()
return id.contains("gemma-4")
|| id.contains("gemma4")
|| id.contains("gemma_4")
|| id.contains("-vl")
|| id.contains("_vl")
|| id.contains("paligemma")
|| id.contains("smolvlm")
|| id.contains("fastvlm")
|| id.contains("pixtral")
|| id.contains("idefics")
}

var label: String {
switch self {
case .ocr: return L("screen_context_mode.ocr")
case .multimodal: return L("screen_context_mode.multimodal")
}
}
}
14 changes: 8 additions & 6 deletions Sources/Integration/InputSessionCoordinator+Output.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ extension InputSessionCoordinator {
text = textProcessor.basicClean(text: raw)
case .processed:
let screenContext = await screenContext(from: active)
context = inputContext(for: active, screenContext: screenContext, mode: .processed)
context = inputContext(for: active, screenContext: screenContext.text, mode: .processed)
let memoryContext = VoicePipelinePolicy.memoryContext(
for: .processed,
settings: settings,
Expand All@@ -23,12 +23,13 @@ extension InputSessionCoordinator {
text = await textProcessor.process(
text: raw,
options: options,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
case .command:
let screenContext = await screenContext(from: active)
context = inputContext(for: active, screenContext: screenContext, mode: .command)
context = inputContext(for: active, screenContext: screenContext.text, mode: .command)
let memoryContext = VoicePipelinePolicy.memoryContext(
for: .command,
settings: settings,
Expand All@@ -37,7 +38,8 @@ extension InputSessionCoordinator {
text = await textProcessor.processCommand(
text: raw,
options: options,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
}
Expand DownExpand Up@@ -66,7 +68,7 @@ extension InputSessionCoordinator {
)
}

private func screenContext(from active: ActiveSession) async -> String {
await active.screenContextTask?.value ?? ""
private func screenContext(from active: ActiveSession) async -> ScreenContextSnapshot {
await active.screenContextTask?.value ?? .empty
}
}
15 changes: 8 additions & 7 deletions Sources/Integration/InputSessionCoordinator.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ final class InputSessionCoordinator {
let inputLanguage: InputLanguage
let useScreenContext: Bool
let streamingEnabled: Bool
let screenContextTask: Task<String, Never>?
let screenContextTask: Task<ScreenContextSnapshot, Never>?
let client: IntegrationClient?
}

Expand DownExpand Up@@ -213,19 +213,20 @@ final class InputSessionCoordinator {
func startScreenContextCaptureIfNeeded(
mode: OutputMode,
useScreenContext: Bool
) -> Task<String, Never>? {
) -> Task<ScreenContextSnapshot, Never>? {
guard VoicePipelinePolicy.shouldCaptureScreenContext(
outputMode: mode,
useScreenContext: useScreenContext
) else {
return nil
}
guard ScreenOCR.hasScreenCapturePermission else {
Log.info("[InputSessionCoordinator] screen capture permission not granted, skipping OCR")
return nil
}
let contextMode = ScreenContextMode.effectiveCaptureMode(
preference: settings.screenContextMode,
useRemoteLLM: settings.useRemoteLLM,
modelID: settings.llmModel
)
return Task.detached(priority: .utility) {
await ScreenOCR.captureAndRecognize()
await ScreenOCR.capture(mode: contextMode)
}
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/LLM/LLMEngine.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,7 +136,7 @@ actor LLMEngine {
return "/no_think\n\(prompt)"
}

private static func modelConfiguration(for id: String) -> ModelConfiguration {
static func modelConfiguration(for id: String) -> ModelConfiguration {
let extraEOSTokens: Set<String> = id.lowercased().contains("gemma-4") ? ["<turn|>"] : []
return ModelConfiguration(id: id, extraEOSTokens: extraEOSTokens)
}
Expand Down
69 changes: 69 additions & 0 deletions Sources/LLM/VLMEngine.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
import CoreGraphics
import CoreImage
import Foundation
import MLXLMCommon
import MLXVLM

actor VLMEngine {
private var container: ModelContainer?
private var currentModelID: String?

func loadModel(id: String) async throws {
if currentModelID == id, container != nil { return }

Log.info("[VLMEngine] loading model: \(id)")
let started = CFAbsoluteTimeGetCurrent()

if let localURL = ModelStorage.localLLMURL(id) {
container = try await VLMModelFactory.shared.loadContainer(
from: localURL,
using: MLXModelLoading.tokenizerLoader
)
} else {
let config = LLMEngine.modelConfiguration(for: id)
container = try await VLMModelFactory.shared.loadContainer(
from: MLXModelLoading.downloader,
using: MLXModelLoading.tokenizerLoader,
configuration: config
)
}

currentModelID = id
let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VLMEngine] model loaded in \(String(format: "%.1f", elapsed))s")
}

func generate(
prompt: String,
systemPrompt: String? = nil,
image: CGImage,
maxTokens: Int = 2048,
temperature: Double = 0.3
) async throws -> String {
guard let container else {
throw LLMError.modelNotLoaded
}

let started = CFAbsoluteTimeGetCurrent()
let params = GenerateParameters(maxTokens: maxTokens, temperature: Float(temperature))
let session = ChatSession(
container,
instructions: systemPrompt,
generateParameters: params,
processing: .init()
)
let ciImage = CIImage(cgImage: image)
let result = try await session.respond(to: prompt, image: .ciImage(ciImage))

let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VLMEngine] generated \(result.count) chars in \(String(format: "%.1f", elapsed))s")
return result
}

var isLoaded: Bool { container != nil }

func unload() {
container = nil
currentModelID = nil
}
}
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
8 changes: 4 additions & 4 deletions Package.resolved

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

1 change: 1 addition & 0 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ let package = Package(
.product(name: "Hub", package: "swift-transformers"),
.product(name: "Tokenizers", package: "swift-transformers"),
.product(name: "MLXLLM", package: "mlx-swift-lm"),
.product(name: "MLXVLM", package: "mlx-swift-lm"),
.product(name: "MLXLMCommon", package: "mlx-swift-lm"),
],
path: "Sources",
Expand Down
10 changes: 6 additions & 4 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -122,7 +122,7 @@ extension VoicePipeline {
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
Expand All@@ -138,7 +138,8 @@ extension VoicePipeline {
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
recordFormattingDuration(started, label: "Smart Format")
Expand All@@ -157,7 +158,7 @@ extension VoicePipeline {
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext,
screenContext: screenContext.text,
outputMode: .command,
inputLanguage: settings.inputLanguage,
source: .menuBar
Expand All@@ -172,7 +173,8 @@ extension VoicePipeline {
let text = await textProcessor.processCommand(
text: raw,
model: settings.llmModel,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
recordFormattingDuration(started, label: "Voice Command formatting")
Expand Down
11 changes: 6 additions & 5 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,14 +147,14 @@ extension VoicePipeline {
replacementID: UUID,
raw: String,
settings: AppSettings,
ocrTask: Task<String, Never>?,
ocrTask: Task<ScreenContextSnapshot, Never>?,
ocrStartedAt: CFAbsoluteTime?
) async {
let started = CFAbsoluteTimeGetCurrent()
let screenContext = await ocrTask?.value ?? ""
let screenContext = await ocrTask?.value ?? .empty
if let ocrStartedAt {
let elapsed = CFAbsoluteTimeGetCurrent() - ocrStartedAt
Log.info("[VoicePipeline] OCR stage finished in \(String(format: "%.2f", elapsed))s")
Log.info("[VoicePipeline] screen context stage finished in \(String(format: "%.2f", elapsed))s")
}

guard !Task.isCancelled else { return }
Expand All@@ -164,7 +164,7 @@ extension VoicePipeline {
appName: currentReplacement.targetAppName,
bundleIdentifier: currentReplacement.targetBundleIdentifier,
windowTitle: currentReplacement.context?.windowTitle,
screenContext: screenContext,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
Expand All@@ -179,7 +179,8 @@ extension VoicePipeline {
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
let elapsed = CFAbsoluteTimeGetCurrent() - started
Expand Down
19 changes: 9 additions & 10 deletions Sources/App/VoicePipeline+ScreenContext.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,23 +12,22 @@ extension VoicePipeline {
return
}

guard ScreenOCR.hasScreenCapturePermission else {
Log.info("[VoicePipeline] screen capture permission not granted, skipping OCR")
cancelScreenContextCapture()
return
}

screenOCRStartedAt = CFAbsoluteTimeGetCurrent()
let mode = ScreenContextMode.effectiveCaptureMode(
preference: appState.settings.screenContextMode,
useRemoteLLM: appState.settings.useRemoteLLM,
modelID: appState.settings.llmModel
)
screenOCRTask = Task.detached(priority: .utility) {
await ScreenOCR.captureAndRecognize()
await ScreenOCR.capture(mode: mode)
}
}

func finishScreenContextCapture() async -> String {
let context = await screenOCRTask?.value ?? ""
func finishScreenContextCapture() async -> ScreenContextSnapshot {
let context = await screenOCRTask?.value ?? .empty
if let screenOCRStartedAt {
let elapsed = CFAbsoluteTimeGetCurrent() - screenOCRStartedAt
Log.info("[VoicePipeline] OCR stage finished in \(String(format: "%.2f", elapsed))s")
Log.info("[VoicePipeline] screen context stage finished in \(String(format: "%.2f", elapsed))s")
}
screenOCRTask = nil
screenOCRStartedAt = nil
Expand Down
2 changes: 1 addition & 1 deletion Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ final class VoicePipeline {
var volcSpeechEngine: VolcSpeechEngine?
var qwenSpeechEngine: LocalASREngine?
var mimoSpeechEngine: LocalASREngine?
var screenOCRTask: Task<String, Never>?
var screenOCRTask: Task<ScreenContextSnapshot, Never>?
var screenOCRStartedAt: CFAbsoluteTime?
var processingTask: Task<Void, Never>?
var replacementTask: Task<Void, Never>?
Expand Down
5 changes: 4 additions & 1 deletion Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -250,6 +250,7 @@ final class AppSettings: ObservableObject {
@Published var enableStreamingRecognitionBeta: Bool
@Published var inputLanguage: InputLanguage
@Published var useScreenContext: Bool
@Published var screenContextMode: ScreenContextMode
@Published var enableInstantInsert: Bool
@Published var hasCompletedOnboarding: Bool
@Published var uiLanguage: UILanguage {
Expand DownExpand Up@@ -290,7 +291,7 @@ final class AppSettings: ObservableObject {
case hotkeyType, activationMode, tapInterval, speechEngine, whisperModel, llmModel
case microphoneID, outputMode, languageStyle, customStylePrompt, playSounds
case enableStreamingRecognitionBeta
case inputLanguage, useScreenContext, enableInstantInsert, hasCompletedOnboarding, uiLanguage, historyRetention
case inputLanguage, useScreenContext, screenContextMode, enableInstantInsert, hasCompletedOnboarding, uiLanguage, historyRetention
case enableMemory, memoryWindowMinutes
case useCustomSystemPrompt, customSystemPrompt
case useRemoteLLM, remoteProvider, remoteAPIKey, remoteBaseURL, remoteModel
Expand DownExpand Up@@ -338,6 +339,7 @@ final class AppSettings: ObservableObject {
enableStreamingRecognitionBeta = ud.object(forKey: Key.enableStreamingRecognitionBeta.rawValue) as? Bool ?? true
inputLanguage = InputLanguage(rawValue: ud.string(forKey: Key.inputLanguage.rawValue) ?? "") ?? .chinese
useScreenContext = ud.object(forKey: Key.useScreenContext.rawValue) as? Bool ?? false
screenContextMode = ScreenContextMode(rawValue: ud.string(forKey: Key.screenContextMode.rawValue) ?? "") ?? .ocr
enableInstantInsert = ud.object(forKey: Key.enableInstantInsert.rawValue) as? Bool ?? false
hasCompletedOnboarding = ud.bool(forKey: Key.hasCompletedOnboarding.rawValue)
uiLanguage = loadedUILanguage
Expand DownExpand Up@@ -397,6 +399,7 @@ final class AppSettings: ObservableObject {
$enableStreamingRecognitionBeta.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.enableStreamingRecognitionBeta.rawValue) }.store(in: &cancellables)
$inputLanguage.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.inputLanguage.rawValue) }.store(in: &cancellables)
$useScreenContext.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.useScreenContext.rawValue) }.store(in: &cancellables)
$screenContextMode.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.screenContextMode.rawValue) }.store(in: &cancellables)
$enableInstantInsert.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.enableInstantInsert.rawValue) }.store(in: &cancellables)
$hasCompletedOnboarding.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.hasCompletedOnboarding.rawValue) }.store(in: &cancellables)
$uiLanguage.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.uiLanguage.rawValue) }.store(in: &cancellables)
Expand Down
41 changes: 41 additions & 0 deletions Sources/Config/ScreenContextMode.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import Foundation

enum ScreenContextMode: String, Codable, CaseIterable {
case ocr = "ocr"
case multimodal = "multimodal"

static func effectiveCaptureMode(
preference: ScreenContextMode,
useRemoteLLM: Bool,
modelID: String
) -> ScreenContextMode {
guard preference == .multimodal,
!useRemoteLLM,
supportsScreenImageContext(modelID: modelID)
else {
return .ocr
}
return .multimodal
}

static func supportsScreenImageContext(modelID: String) -> Bool {
let id = modelID.lowercased()
return id.contains("gemma-4")
|| id.contains("gemma4")
|| id.contains("gemma_4")
|| id.contains("-vl")
|| id.contains("_vl")
|| id.contains("paligemma")
|| id.contains("smolvlm")
|| id.contains("fastvlm")
|| id.contains("pixtral")
|| id.contains("idefics")
}

var label: String {
switch self {
case .ocr: return L("screen_context_mode.ocr")
case .multimodal: return L("screen_context_mode.multimodal")
}
}
}
14 changes: 8 additions & 6 deletions Sources/Integration/InputSessionCoordinator+Output.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ extension InputSessionCoordinator {
text = textProcessor.basicClean(text: raw)
case .processed:
let screenContext = await screenContext(from: active)
context = inputContext(for: active, screenContext: screenContext, mode: .processed)
context = inputContext(for: active, screenContext: screenContext.text, mode: .processed)
let memoryContext = VoicePipelinePolicy.memoryContext(
for: .processed,
settings: settings,
Expand All@@ -23,12 +23,13 @@ extension InputSessionCoordinator {
text = await textProcessor.process(
text: raw,
options: options,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
case .command:
let screenContext = await screenContext(from: active)
context = inputContext(for: active, screenContext: screenContext, mode: .command)
context = inputContext(for: active, screenContext: screenContext.text, mode: .command)
let memoryContext = VoicePipelinePolicy.memoryContext(
for: .command,
settings: settings,
Expand All@@ -37,7 +38,8 @@ extension InputSessionCoordinator {
text = await textProcessor.processCommand(
text: raw,
options: options,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
}
Expand DownExpand Up@@ -66,7 +68,7 @@ extension InputSessionCoordinator {
)
}

private func screenContext(from active: ActiveSession) async -> String {
await active.screenContextTask?.value ?? ""
private func screenContext(from active: ActiveSession) async -> ScreenContextSnapshot {
await active.screenContextTask?.value ?? .empty
}
}
15 changes: 8 additions & 7 deletions Sources/Integration/InputSessionCoordinator.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ final class InputSessionCoordinator {
let inputLanguage: InputLanguage
let useScreenContext: Bool
let streamingEnabled: Bool
let screenContextTask: Task<String, Never>?
let screenContextTask: Task<ScreenContextSnapshot, Never>?
let client: IntegrationClient?
}

Expand DownExpand Up@@ -213,19 +213,20 @@ final class InputSessionCoordinator {
func startScreenContextCaptureIfNeeded(
mode: OutputMode,
useScreenContext: Bool
) -> Task<String, Never>? {
) -> Task<ScreenContextSnapshot, Never>? {
guard VoicePipelinePolicy.shouldCaptureScreenContext(
outputMode: mode,
useScreenContext: useScreenContext
) else {
return nil
}
guard ScreenOCR.hasScreenCapturePermission else {
Log.info("[InputSessionCoordinator] screen capture permission not granted, skipping OCR")
return nil
}
let contextMode = ScreenContextMode.effectiveCaptureMode(
preference: settings.screenContextMode,
useRemoteLLM: settings.useRemoteLLM,
modelID: settings.llmModel
)
return Task.detached(priority: .utility) {
await ScreenOCR.captureAndRecognize()
await ScreenOCR.capture(mode: contextMode)
}
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/LLM/LLMEngine.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,7 +136,7 @@ actor LLMEngine {
return "/no_think\n\(prompt)"
}

private static func modelConfiguration(for id: String) -> ModelConfiguration {
static func modelConfiguration(for id: String) -> ModelConfiguration {
let extraEOSTokens: Set<String> = id.lowercased().contains("gemma-4") ? ["<turn|>"] : []
return ModelConfiguration(id: id, extraEOSTokens: extraEOSTokens)
}
Expand Down
69 changes: 69 additions & 0 deletions Sources/LLM/VLMEngine.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
import CoreGraphics
import CoreImage
import Foundation
import MLXLMCommon
import MLXVLM

actor VLMEngine {
private var container: ModelContainer?
private var currentModelID: String?

func loadModel(id: String) async throws {
if currentModelID == id, container != nil { return }

Log.info("[VLMEngine] loading model: \(id)")
let started = CFAbsoluteTimeGetCurrent()

if let localURL = ModelStorage.localLLMURL(id) {
container = try await VLMModelFactory.shared.loadContainer(
from: localURL,
using: MLXModelLoading.tokenizerLoader
)
} else {
let config = LLMEngine.modelConfiguration(for: id)
container = try await VLMModelFactory.shared.loadContainer(
from: MLXModelLoading.downloader,
using: MLXModelLoading.tokenizerLoader,
configuration: config
)
}

currentModelID = id
let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VLMEngine] model loaded in \(String(format: "%.1f", elapsed))s")
}

func generate(
prompt: String,
systemPrompt: String? = nil,
image: CGImage,
maxTokens: Int = 2048,
temperature: Double = 0.3
) async throws -> String {
guard let container else {
throw LLMError.modelNotLoaded
}

let started = CFAbsoluteTimeGetCurrent()
let params = GenerateParameters(maxTokens: maxTokens, temperature: Float(temperature))
let session = ChatSession(
container,
instructions: systemPrompt,
generateParameters: params,
processing: .init()
)
let ciImage = CIImage(cgImage: image)
let result = try await session.respond(to: prompt, image: .ciImage(ciImage))

let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VLMEngine] generated \(result.count) chars in \(String(format: "%.1f", elapsed))s")
return result
}

var isLoaded: Bool { container != nil }

func unload() {
container = nil
currentModelID = nil
}
}
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
8 changes: 4 additions & 4 deletions Package.resolved

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

1 change: 1 addition & 0 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ let package = Package(
.product(name: "Hub", package: "swift-transformers"),
.product(name: "Tokenizers", package: "swift-transformers"),
.product(name: "MLXLLM", package: "mlx-swift-lm"),
.product(name: "MLXVLM", package: "mlx-swift-lm"),
.product(name: "MLXLMCommon", package: "mlx-swift-lm"),
],
path: "Sources",
Expand Down
10 changes: 6 additions & 4 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -122,7 +122,7 @@ extension VoicePipeline {
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
Expand All@@ -138,7 +138,8 @@ extension VoicePipeline {
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
recordFormattingDuration(started, label: "Smart Format")
Expand All@@ -157,7 +158,7 @@ extension VoicePipeline {
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext,
screenContext: screenContext.text,
outputMode: .command,
inputLanguage: settings.inputLanguage,
source: .menuBar
Expand All@@ -172,7 +173,8 @@ extension VoicePipeline {
let text = await textProcessor.processCommand(
text: raw,
model: settings.llmModel,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
recordFormattingDuration(started, label: "Voice Command formatting")
Expand Down
11 changes: 6 additions & 5 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,14 +147,14 @@ extension VoicePipeline {
replacementID: UUID,
raw: String,
settings: AppSettings,
ocrTask: Task<String, Never>?,
ocrTask: Task<ScreenContextSnapshot, Never>?,
ocrStartedAt: CFAbsoluteTime?
) async {
let started = CFAbsoluteTimeGetCurrent()
let screenContext = await ocrTask?.value ?? ""
let screenContext = await ocrTask?.value ?? .empty
if let ocrStartedAt {
let elapsed = CFAbsoluteTimeGetCurrent() - ocrStartedAt
Log.info("[VoicePipeline] OCR stage finished in \(String(format: "%.2f", elapsed))s")
Log.info("[VoicePipeline] screen context stage finished in \(String(format: "%.2f", elapsed))s")
}

guard !Task.isCancelled else { return }
Expand All@@ -164,7 +164,7 @@ extension VoicePipeline {
appName: currentReplacement.targetAppName,
bundleIdentifier: currentReplacement.targetBundleIdentifier,
windowTitle: currentReplacement.context?.windowTitle,
screenContext: screenContext,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
Expand All@@ -179,7 +179,8 @@ extension VoicePipeline {
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
let elapsed = CFAbsoluteTimeGetCurrent() - started
Expand Down
19 changes: 9 additions & 10 deletions Sources/App/VoicePipeline+ScreenContext.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,23 +12,22 @@ extension VoicePipeline {
return
}

guard ScreenOCR.hasScreenCapturePermission else {
Log.info("[VoicePipeline] screen capture permission not granted, skipping OCR")
cancelScreenContextCapture()
return
}

screenOCRStartedAt = CFAbsoluteTimeGetCurrent()
let mode = ScreenContextMode.effectiveCaptureMode(
preference: appState.settings.screenContextMode,
useRemoteLLM: appState.settings.useRemoteLLM,
modelID: appState.settings.llmModel
)
screenOCRTask = Task.detached(priority: .utility) {
await ScreenOCR.captureAndRecognize()
await ScreenOCR.capture(mode: mode)
}
}

func finishScreenContextCapture() async -> String {
let context = await screenOCRTask?.value ?? ""
func finishScreenContextCapture() async -> ScreenContextSnapshot {
let context = await screenOCRTask?.value ?? .empty
if let screenOCRStartedAt {
let elapsed = CFAbsoluteTimeGetCurrent() - screenOCRStartedAt
Log.info("[VoicePipeline] OCR stage finished in \(String(format: "%.2f", elapsed))s")
Log.info("[VoicePipeline] screen context stage finished in \(String(format: "%.2f", elapsed))s")
}
screenOCRTask = nil
screenOCRStartedAt = nil
Expand Down
2 changes: 1 addition & 1 deletion Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ final class VoicePipeline {
var volcSpeechEngine: VolcSpeechEngine?
var qwenSpeechEngine: LocalASREngine?
var mimoSpeechEngine: LocalASREngine?
var screenOCRTask: Task<String, Never>?
var screenOCRTask: Task<ScreenContextSnapshot, Never>?
var screenOCRStartedAt: CFAbsoluteTime?
var processingTask: Task<Void, Never>?
var replacementTask: Task<Void, Never>?
Expand Down
5 changes: 4 additions & 1 deletion Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -250,6 +250,7 @@ final class AppSettings: ObservableObject {
@Published var enableStreamingRecognitionBeta: Bool
@Published var inputLanguage: InputLanguage
@Published var useScreenContext: Bool
@Published var screenContextMode: ScreenContextMode
@Published var enableInstantInsert: Bool
@Published var hasCompletedOnboarding: Bool
@Published var uiLanguage: UILanguage {
Expand DownExpand Up@@ -290,7 +291,7 @@ final class AppSettings: ObservableObject {
case hotkeyType, activationMode, tapInterval, speechEngine, whisperModel, llmModel
case microphoneID, outputMode, languageStyle, customStylePrompt, playSounds
case enableStreamingRecognitionBeta
case inputLanguage, useScreenContext, enableInstantInsert, hasCompletedOnboarding, uiLanguage, historyRetention
case inputLanguage, useScreenContext, screenContextMode, enableInstantInsert, hasCompletedOnboarding, uiLanguage, historyRetention
case enableMemory, memoryWindowMinutes
case useCustomSystemPrompt, customSystemPrompt
case useRemoteLLM, remoteProvider, remoteAPIKey, remoteBaseURL, remoteModel
Expand DownExpand Up@@ -338,6 +339,7 @@ final class AppSettings: ObservableObject {
enableStreamingRecognitionBeta = ud.object(forKey: Key.enableStreamingRecognitionBeta.rawValue) as? Bool ?? true
inputLanguage = InputLanguage(rawValue: ud.string(forKey: Key.inputLanguage.rawValue) ?? "") ?? .chinese
useScreenContext = ud.object(forKey: Key.useScreenContext.rawValue) as? Bool ?? false
screenContextMode = ScreenContextMode(rawValue: ud.string(forKey: Key.screenContextMode.rawValue) ?? "") ?? .ocr
enableInstantInsert = ud.object(forKey: Key.enableInstantInsert.rawValue) as? Bool ?? false
hasCompletedOnboarding = ud.bool(forKey: Key.hasCompletedOnboarding.rawValue)
uiLanguage = loadedUILanguage
Expand DownExpand Up@@ -397,6 +399,7 @@ final class AppSettings: ObservableObject {
$enableStreamingRecognitionBeta.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.enableStreamingRecognitionBeta.rawValue) }.store(in: &cancellables)
$inputLanguage.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.inputLanguage.rawValue) }.store(in: &cancellables)
$useScreenContext.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.useScreenContext.rawValue) }.store(in: &cancellables)
$screenContextMode.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.screenContextMode.rawValue) }.store(in: &cancellables)
$enableInstantInsert.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.enableInstantInsert.rawValue) }.store(in: &cancellables)
$hasCompletedOnboarding.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.hasCompletedOnboarding.rawValue) }.store(in: &cancellables)
$uiLanguage.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.uiLanguage.rawValue) }.store(in: &cancellables)
Expand Down
41 changes: 41 additions & 0 deletions Sources/Config/ScreenContextMode.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import Foundation

enum ScreenContextMode: String, Codable, CaseIterable {
case ocr = "ocr"
case multimodal = "multimodal"

static func effectiveCaptureMode(
preference: ScreenContextMode,
useRemoteLLM: Bool,
modelID: String
) -> ScreenContextMode {
guard preference == .multimodal,
!useRemoteLLM,
supportsScreenImageContext(modelID: modelID)
else {
return .ocr
}
return .multimodal
}

static func supportsScreenImageContext(modelID: String) -> Bool {
let id = modelID.lowercased()
return id.contains("gemma-4")
|| id.contains("gemma4")
|| id.contains("gemma_4")
|| id.contains("-vl")
|| id.contains("_vl")
|| id.contains("paligemma")
|| id.contains("smolvlm")
|| id.contains("fastvlm")
|| id.contains("pixtral")
|| id.contains("idefics")
}

var label: String {
switch self {
case .ocr: return L("screen_context_mode.ocr")
case .multimodal: return L("screen_context_mode.multimodal")
}
}
}
14 changes: 8 additions & 6 deletions Sources/Integration/InputSessionCoordinator+Output.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ extension InputSessionCoordinator {
text = textProcessor.basicClean(text: raw)
case .processed:
let screenContext = await screenContext(from: active)
context = inputContext(for: active, screenContext: screenContext, mode: .processed)
context = inputContext(for: active, screenContext: screenContext.text, mode: .processed)
let memoryContext = VoicePipelinePolicy.memoryContext(
for: .processed,
settings: settings,
Expand All@@ -23,12 +23,13 @@ extension InputSessionCoordinator {
text = await textProcessor.process(
text: raw,
options: options,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
case .command:
let screenContext = await screenContext(from: active)
context = inputContext(for: active, screenContext: screenContext, mode: .command)
context = inputContext(for: active, screenContext: screenContext.text, mode: .command)
let memoryContext = VoicePipelinePolicy.memoryContext(
for: .command,
settings: settings,
Expand All@@ -37,7 +38,8 @@ extension InputSessionCoordinator {
text = await textProcessor.processCommand(
text: raw,
options: options,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
}
Expand DownExpand Up@@ -66,7 +68,7 @@ extension InputSessionCoordinator {
)
}

private func screenContext(from active: ActiveSession) async -> String {
await active.screenContextTask?.value ?? ""
private func screenContext(from active: ActiveSession) async -> ScreenContextSnapshot {
await active.screenContextTask?.value ?? .empty
}
}
15 changes: 8 additions & 7 deletions Sources/Integration/InputSessionCoordinator.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ final class InputSessionCoordinator {
let inputLanguage: InputLanguage
let useScreenContext: Bool
let streamingEnabled: Bool
let screenContextTask: Task<String, Never>?
let screenContextTask: Task<ScreenContextSnapshot, Never>?
let client: IntegrationClient?
}

Expand DownExpand Up@@ -213,19 +213,20 @@ final class InputSessionCoordinator {
func startScreenContextCaptureIfNeeded(
mode: OutputMode,
useScreenContext: Bool
) -> Task<String, Never>? {
) -> Task<ScreenContextSnapshot, Never>? {
guard VoicePipelinePolicy.shouldCaptureScreenContext(
outputMode: mode,
useScreenContext: useScreenContext
) else {
return nil
}
guard ScreenOCR.hasScreenCapturePermission else {
Log.info("[InputSessionCoordinator] screen capture permission not granted, skipping OCR")
return nil
}
let contextMode = ScreenContextMode.effectiveCaptureMode(
preference: settings.screenContextMode,
useRemoteLLM: settings.useRemoteLLM,
modelID: settings.llmModel
)
return Task.detached(priority: .utility) {
await ScreenOCR.captureAndRecognize()
await ScreenOCR.capture(mode: contextMode)
}
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/LLM/LLMEngine.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,7 +136,7 @@ actor LLMEngine {
return "/no_think\n\(prompt)"
}

private static func modelConfiguration(for id: String) -> ModelConfiguration {
static func modelConfiguration(for id: String) -> ModelConfiguration {
let extraEOSTokens: Set<String> = id.lowercased().contains("gemma-4") ? ["<turn|>"] : []
return ModelConfiguration(id: id, extraEOSTokens: extraEOSTokens)
}
Expand Down
69 changes: 69 additions & 0 deletions Sources/LLM/VLMEngine.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
import CoreGraphics
import CoreImage
import Foundation
import MLXLMCommon
import MLXVLM

actor VLMEngine {
private var container: ModelContainer?
private var currentModelID: String?

func loadModel(id: String) async throws {
if currentModelID == id, container != nil { return }

Log.info("[VLMEngine] loading model: \(id)")
let started = CFAbsoluteTimeGetCurrent()

if let localURL = ModelStorage.localLLMURL(id) {
container = try await VLMModelFactory.shared.loadContainer(
from: localURL,
using: MLXModelLoading.tokenizerLoader
)
} else {
let config = LLMEngine.modelConfiguration(for: id)
container = try await VLMModelFactory.shared.loadContainer(
from: MLXModelLoading.downloader,
using: MLXModelLoading.tokenizerLoader,
configuration: config
)
}

currentModelID = id
let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VLMEngine] model loaded in \(String(format: "%.1f", elapsed))s")
}

func generate(
prompt: String,
systemPrompt: String? = nil,
image: CGImage,
maxTokens: Int = 2048,
temperature: Double = 0.3
) async throws -> String {
guard let container else {
throw LLMError.modelNotLoaded
}

let started = CFAbsoluteTimeGetCurrent()
let params = GenerateParameters(maxTokens: maxTokens, temperature: Float(temperature))
let session = ChatSession(
container,
instructions: systemPrompt,
generateParameters: params,
processing: .init()
)
let ciImage = CIImage(cgImage: image)
let result = try await session.respond(to: prompt, image: .ciImage(ciImage))

let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VLMEngine] generated \(result.count) chars in \(String(format: "%.1f", elapsed))s")
return result
}

var isLoaded: Bool { container != nil }

func unload() {
container = nil
currentModelID = nil
}
}
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
8 changes: 4 additions & 4 deletions Package.resolved

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

1 change: 1 addition & 0 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ let package = Package(
.product(name: "Hub", package: "swift-transformers"),
.product(name: "Tokenizers", package: "swift-transformers"),
.product(name: "MLXLLM", package: "mlx-swift-lm"),
.product(name: "MLXVLM", package: "mlx-swift-lm"),
.product(name: "MLXLMCommon", package: "mlx-swift-lm"),
],
path: "Sources",
Expand Down
10 changes: 6 additions & 4 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -122,7 +122,7 @@ extension VoicePipeline {
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
Expand All@@ -138,7 +138,8 @@ extension VoicePipeline {
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
recordFormattingDuration(started, label: "Smart Format")
Expand All@@ -157,7 +158,7 @@ extension VoicePipeline {
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext,
screenContext: screenContext.text,
outputMode: .command,
inputLanguage: settings.inputLanguage,
source: .menuBar
Expand All@@ -172,7 +173,8 @@ extension VoicePipeline {
let text = await textProcessor.processCommand(
text: raw,
model: settings.llmModel,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
recordFormattingDuration(started, label: "Voice Command formatting")
Expand Down
11 changes: 6 additions & 5 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,14 +147,14 @@ extension VoicePipeline {
replacementID: UUID,
raw: String,
settings: AppSettings,
ocrTask: Task<String, Never>?,
ocrTask: Task<ScreenContextSnapshot, Never>?,
ocrStartedAt: CFAbsoluteTime?
) async {
let started = CFAbsoluteTimeGetCurrent()
let screenContext = await ocrTask?.value ?? ""
let screenContext = await ocrTask?.value ?? .empty
if let ocrStartedAt {
let elapsed = CFAbsoluteTimeGetCurrent() - ocrStartedAt
Log.info("[VoicePipeline] OCR stage finished in \(String(format: "%.2f", elapsed))s")
Log.info("[VoicePipeline] screen context stage finished in \(String(format: "%.2f", elapsed))s")
}

guard !Task.isCancelled else { return }
Expand All@@ -164,7 +164,7 @@ extension VoicePipeline {
appName: currentReplacement.targetAppName,
bundleIdentifier: currentReplacement.targetBundleIdentifier,
windowTitle: currentReplacement.context?.windowTitle,
screenContext: screenContext,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
Expand All@@ -179,7 +179,8 @@ extension VoicePipeline {
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
let elapsed = CFAbsoluteTimeGetCurrent() - started
Expand Down
19 changes: 9 additions & 10 deletions Sources/App/VoicePipeline+ScreenContext.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,23 +12,22 @@ extension VoicePipeline {
return
}

guard ScreenOCR.hasScreenCapturePermission else {
Log.info("[VoicePipeline] screen capture permission not granted, skipping OCR")
cancelScreenContextCapture()
return
}

screenOCRStartedAt = CFAbsoluteTimeGetCurrent()
let mode = ScreenContextMode.effectiveCaptureMode(
preference: appState.settings.screenContextMode,
useRemoteLLM: appState.settings.useRemoteLLM,
modelID: appState.settings.llmModel
)
screenOCRTask = Task.detached(priority: .utility) {
await ScreenOCR.captureAndRecognize()
await ScreenOCR.capture(mode: mode)
}
}

func finishScreenContextCapture() async -> String {
let context = await screenOCRTask?.value ?? ""
func finishScreenContextCapture() async -> ScreenContextSnapshot {
let context = await screenOCRTask?.value ?? .empty
if let screenOCRStartedAt {
let elapsed = CFAbsoluteTimeGetCurrent() - screenOCRStartedAt
Log.info("[VoicePipeline] OCR stage finished in \(String(format: "%.2f", elapsed))s")
Log.info("[VoicePipeline] screen context stage finished in \(String(format: "%.2f", elapsed))s")
}
screenOCRTask = nil
screenOCRStartedAt = nil
Expand Down
2 changes: 1 addition & 1 deletion Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ final class VoicePipeline {
var volcSpeechEngine: VolcSpeechEngine?
var qwenSpeechEngine: LocalASREngine?
var mimoSpeechEngine: LocalASREngine?
var screenOCRTask: Task<String, Never>?
var screenOCRTask: Task<ScreenContextSnapshot, Never>?
var screenOCRStartedAt: CFAbsoluteTime?
var processingTask: Task<Void, Never>?
var replacementTask: Task<Void, Never>?
Expand Down
5 changes: 4 additions & 1 deletion Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -250,6 +250,7 @@ final class AppSettings: ObservableObject {
@Published var enableStreamingRecognitionBeta: Bool
@Published var inputLanguage: InputLanguage
@Published var useScreenContext: Bool
@Published var screenContextMode: ScreenContextMode
@Published var enableInstantInsert: Bool
@Published var hasCompletedOnboarding: Bool
@Published var uiLanguage: UILanguage {
Expand DownExpand Up@@ -290,7 +291,7 @@ final class AppSettings: ObservableObject {
case hotkeyType, activationMode, tapInterval, speechEngine, whisperModel, llmModel
case microphoneID, outputMode, languageStyle, customStylePrompt, playSounds
case enableStreamingRecognitionBeta
case inputLanguage, useScreenContext, enableInstantInsert, hasCompletedOnboarding, uiLanguage, historyRetention
case inputLanguage, useScreenContext, screenContextMode, enableInstantInsert, hasCompletedOnboarding, uiLanguage, historyRetention
case enableMemory, memoryWindowMinutes
case useCustomSystemPrompt, customSystemPrompt
case useRemoteLLM, remoteProvider, remoteAPIKey, remoteBaseURL, remoteModel
Expand DownExpand Up@@ -338,6 +339,7 @@ final class AppSettings: ObservableObject {
enableStreamingRecognitionBeta = ud.object(forKey: Key.enableStreamingRecognitionBeta.rawValue) as? Bool ?? true
inputLanguage = InputLanguage(rawValue: ud.string(forKey: Key.inputLanguage.rawValue) ?? "") ?? .chinese
useScreenContext = ud.object(forKey: Key.useScreenContext.rawValue) as? Bool ?? false
screenContextMode = ScreenContextMode(rawValue: ud.string(forKey: Key.screenContextMode.rawValue) ?? "") ?? .ocr
enableInstantInsert = ud.object(forKey: Key.enableInstantInsert.rawValue) as? Bool ?? false
hasCompletedOnboarding = ud.bool(forKey: Key.hasCompletedOnboarding.rawValue)
uiLanguage = loadedUILanguage
Expand DownExpand Up@@ -397,6 +399,7 @@ final class AppSettings: ObservableObject {
$enableStreamingRecognitionBeta.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.enableStreamingRecognitionBeta.rawValue) }.store(in: &cancellables)
$inputLanguage.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.inputLanguage.rawValue) }.store(in: &cancellables)
$useScreenContext.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.useScreenContext.rawValue) }.store(in: &cancellables)
$screenContextMode.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.screenContextMode.rawValue) }.store(in: &cancellables)
$enableInstantInsert.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.enableInstantInsert.rawValue) }.store(in: &cancellables)
$hasCompletedOnboarding.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.hasCompletedOnboarding.rawValue) }.store(in: &cancellables)
$uiLanguage.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.uiLanguage.rawValue) }.store(in: &cancellables)
Expand Down
41 changes: 41 additions & 0 deletions Sources/Config/ScreenContextMode.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import Foundation

enum ScreenContextMode: String, Codable, CaseIterable {
case ocr = "ocr"
case multimodal = "multimodal"

static func effectiveCaptureMode(
preference: ScreenContextMode,
useRemoteLLM: Bool,
modelID: String
) -> ScreenContextMode {
guard preference == .multimodal,
!useRemoteLLM,
supportsScreenImageContext(modelID: modelID)
else {
return .ocr
}
return .multimodal
}

static func supportsScreenImageContext(modelID: String) -> Bool {
let id = modelID.lowercased()
return id.contains("gemma-4")
|| id.contains("gemma4")
|| id.contains("gemma_4")
|| id.contains("-vl")
|| id.contains("_vl")
|| id.contains("paligemma")
|| id.contains("smolvlm")
|| id.contains("fastvlm")
|| id.contains("pixtral")
|| id.contains("idefics")
}

var label: String {
switch self {
case .ocr: return L("screen_context_mode.ocr")
case .multimodal: return L("screen_context_mode.multimodal")
}
}
}
14 changes: 8 additions & 6 deletions Sources/Integration/InputSessionCoordinator+Output.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ extension InputSessionCoordinator {
text = textProcessor.basicClean(text: raw)
case .processed:
let screenContext = await screenContext(from: active)
context = inputContext(for: active, screenContext: screenContext, mode: .processed)
context = inputContext(for: active, screenContext: screenContext.text, mode: .processed)
let memoryContext = VoicePipelinePolicy.memoryContext(
for: .processed,
settings: settings,
Expand All@@ -23,12 +23,13 @@ extension InputSessionCoordinator {
text = await textProcessor.process(
text: raw,
options: options,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
case .command:
let screenContext = await screenContext(from: active)
context = inputContext(for: active, screenContext: screenContext, mode: .command)
context = inputContext(for: active, screenContext: screenContext.text, mode: .command)
let memoryContext = VoicePipelinePolicy.memoryContext(
for: .command,
settings: settings,
Expand All@@ -37,7 +38,8 @@ extension InputSessionCoordinator {
text = await textProcessor.processCommand(
text: raw,
options: options,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
}
Expand DownExpand Up@@ -66,7 +68,7 @@ extension InputSessionCoordinator {
)
}

private func screenContext(from active: ActiveSession) async -> String {
await active.screenContextTask?.value ?? ""
private func screenContext(from active: ActiveSession) async -> ScreenContextSnapshot {
await active.screenContextTask?.value ?? .empty
}
}
15 changes: 8 additions & 7 deletions Sources/Integration/InputSessionCoordinator.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ final class InputSessionCoordinator {
let inputLanguage: InputLanguage
let useScreenContext: Bool
let streamingEnabled: Bool
let screenContextTask: Task<String, Never>?
let screenContextTask: Task<ScreenContextSnapshot, Never>?
let client: IntegrationClient?
}

Expand DownExpand Up@@ -213,19 +213,20 @@ final class InputSessionCoordinator {
func startScreenContextCaptureIfNeeded(
mode: OutputMode,
useScreenContext: Bool
) -> Task<String, Never>? {
) -> Task<ScreenContextSnapshot, Never>? {
guard VoicePipelinePolicy.shouldCaptureScreenContext(
outputMode: mode,
useScreenContext: useScreenContext
) else {
return nil
}
guard ScreenOCR.hasScreenCapturePermission else {
Log.info("[InputSessionCoordinator] screen capture permission not granted, skipping OCR")
return nil
}
let contextMode = ScreenContextMode.effectiveCaptureMode(
preference: settings.screenContextMode,
useRemoteLLM: settings.useRemoteLLM,
modelID: settings.llmModel
)
return Task.detached(priority: .utility) {
await ScreenOCR.captureAndRecognize()
await ScreenOCR.capture(mode: contextMode)
}
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/LLM/LLMEngine.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,7 +136,7 @@ actor LLMEngine {
return "/no_think\n\(prompt)"
}

private static func modelConfiguration(for id: String) -> ModelConfiguration {
static func modelConfiguration(for id: String) -> ModelConfiguration {
let extraEOSTokens: Set<String> = id.lowercased().contains("gemma-4") ? ["<turn|>"] : []
return ModelConfiguration(id: id, extraEOSTokens: extraEOSTokens)
}
Expand Down
69 changes: 69 additions & 0 deletions Sources/LLM/VLMEngine.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
import CoreGraphics
import CoreImage
import Foundation
import MLXLMCommon
import MLXVLM

actor VLMEngine {
private var container: ModelContainer?
private var currentModelID: String?

func loadModel(id: String) async throws {
if currentModelID == id, container != nil { return }

Log.info("[VLMEngine] loading model: \(id)")
let started = CFAbsoluteTimeGetCurrent()

if let localURL = ModelStorage.localLLMURL(id) {
container = try await VLMModelFactory.shared.loadContainer(
from: localURL,
using: MLXModelLoading.tokenizerLoader
)
} else {
let config = LLMEngine.modelConfiguration(for: id)
container = try await VLMModelFactory.shared.loadContainer(
from: MLXModelLoading.downloader,
using: MLXModelLoading.tokenizerLoader,
configuration: config
)
}

currentModelID = id
let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VLMEngine] model loaded in \(String(format: "%.1f", elapsed))s")
}

func generate(
prompt: String,
systemPrompt: String? = nil,
image: CGImage,
maxTokens: Int = 2048,
temperature: Double = 0.3
) async throws -> String {
guard let container else {
throw LLMError.modelNotLoaded
}

let started = CFAbsoluteTimeGetCurrent()
let params = GenerateParameters(maxTokens: maxTokens, temperature: Float(temperature))
let session = ChatSession(
container,
instructions: systemPrompt,
generateParameters: params,
processing: .init()
)
let ciImage = CIImage(cgImage: image)
let result = try await session.respond(to: prompt, image: .ciImage(ciImage))

let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VLMEngine] generated \(result.count) chars in \(String(format: "%.1f", elapsed))s")
return result
}

var isLoaded: Bool { container != nil }

func unload() {
container = nil
currentModelID = nil
}
}
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
8 changes: 4 additions & 4 deletions Package.resolved

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

1 change: 1 addition & 0 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ let package = Package(
.product(name: "Hub", package: "swift-transformers"),
.product(name: "Tokenizers", package: "swift-transformers"),
.product(name: "MLXLLM", package: "mlx-swift-lm"),
.product(name: "MLXVLM", package: "mlx-swift-lm"),
.product(name: "MLXLMCommon", package: "mlx-swift-lm"),
],
path: "Sources",
Expand Down
10 changes: 6 additions & 4 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -122,7 +122,7 @@ extension VoicePipeline {
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
Expand All@@ -138,7 +138,8 @@ extension VoicePipeline {
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
recordFormattingDuration(started, label: "Smart Format")
Expand All@@ -157,7 +158,7 @@ extension VoicePipeline {
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext,
screenContext: screenContext.text,
outputMode: .command,
inputLanguage: settings.inputLanguage,
source: .menuBar
Expand All@@ -172,7 +173,8 @@ extension VoicePipeline {
let text = await textProcessor.processCommand(
text: raw,
model: settings.llmModel,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
recordFormattingDuration(started, label: "Voice Command formatting")
Expand Down
11 changes: 6 additions & 5 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,14 +147,14 @@ extension VoicePipeline {
replacementID: UUID,
raw: String,
settings: AppSettings,
ocrTask: Task<String, Never>?,
ocrTask: Task<ScreenContextSnapshot, Never>?,
ocrStartedAt: CFAbsoluteTime?
) async {
let started = CFAbsoluteTimeGetCurrent()
let screenContext = await ocrTask?.value ?? ""
let screenContext = await ocrTask?.value ?? .empty
if let ocrStartedAt {
let elapsed = CFAbsoluteTimeGetCurrent() - ocrStartedAt
Log.info("[VoicePipeline] OCR stage finished in \(String(format: "%.2f", elapsed))s")
Log.info("[VoicePipeline] screen context stage finished in \(String(format: "%.2f", elapsed))s")
}

guard !Task.isCancelled else { return }
Expand All@@ -164,7 +164,7 @@ extension VoicePipeline {
appName: currentReplacement.targetAppName,
bundleIdentifier: currentReplacement.targetBundleIdentifier,
windowTitle: currentReplacement.context?.windowTitle,
screenContext: screenContext,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
Expand All@@ -179,7 +179,8 @@ extension VoicePipeline {
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
let elapsed = CFAbsoluteTimeGetCurrent() - started
Expand Down
19 changes: 9 additions & 10 deletions Sources/App/VoicePipeline+ScreenContext.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,23 +12,22 @@ extension VoicePipeline {
return
}

guard ScreenOCR.hasScreenCapturePermission else {
Log.info("[VoicePipeline] screen capture permission not granted, skipping OCR")
cancelScreenContextCapture()
return
}

screenOCRStartedAt = CFAbsoluteTimeGetCurrent()
let mode = ScreenContextMode.effectiveCaptureMode(
preference: appState.settings.screenContextMode,
useRemoteLLM: appState.settings.useRemoteLLM,
modelID: appState.settings.llmModel
)
screenOCRTask = Task.detached(priority: .utility) {
await ScreenOCR.captureAndRecognize()
await ScreenOCR.capture(mode: mode)
}
}

func finishScreenContextCapture() async -> String {
let context = await screenOCRTask?.value ?? ""
func finishScreenContextCapture() async -> ScreenContextSnapshot {
let context = await screenOCRTask?.value ?? .empty
if let screenOCRStartedAt {
let elapsed = CFAbsoluteTimeGetCurrent() - screenOCRStartedAt
Log.info("[VoicePipeline] OCR stage finished in \(String(format: "%.2f", elapsed))s")
Log.info("[VoicePipeline] screen context stage finished in \(String(format: "%.2f", elapsed))s")
}
screenOCRTask = nil
screenOCRStartedAt = nil
Expand Down
2 changes: 1 addition & 1 deletion Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ final class VoicePipeline {
var volcSpeechEngine: VolcSpeechEngine?
var qwenSpeechEngine: LocalASREngine?
var mimoSpeechEngine: LocalASREngine?
var screenOCRTask: Task<String, Never>?
var screenOCRTask: Task<ScreenContextSnapshot, Never>?
var screenOCRStartedAt: CFAbsoluteTime?
var processingTask: Task<Void, Never>?
var replacementTask: Task<Void, Never>?
Expand Down
5 changes: 4 additions & 1 deletion Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -250,6 +250,7 @@ final class AppSettings: ObservableObject {
@Published var enableStreamingRecognitionBeta: Bool
@Published var inputLanguage: InputLanguage
@Published var useScreenContext: Bool
@Published var screenContextMode: ScreenContextMode
@Published var enableInstantInsert: Bool
@Published var hasCompletedOnboarding: Bool
@Published var uiLanguage: UILanguage {
Expand DownExpand Up@@ -290,7 +291,7 @@ final class AppSettings: ObservableObject {
case hotkeyType, activationMode, tapInterval, speechEngine, whisperModel, llmModel
case microphoneID, outputMode, languageStyle, customStylePrompt, playSounds
case enableStreamingRecognitionBeta
case inputLanguage, useScreenContext, enableInstantInsert, hasCompletedOnboarding, uiLanguage, historyRetention
case inputLanguage, useScreenContext, screenContextMode, enableInstantInsert, hasCompletedOnboarding, uiLanguage, historyRetention
case enableMemory, memoryWindowMinutes
case useCustomSystemPrompt, customSystemPrompt
case useRemoteLLM, remoteProvider, remoteAPIKey, remoteBaseURL, remoteModel
Expand DownExpand Up@@ -338,6 +339,7 @@ final class AppSettings: ObservableObject {
enableStreamingRecognitionBeta = ud.object(forKey: Key.enableStreamingRecognitionBeta.rawValue) as? Bool ?? true
inputLanguage = InputLanguage(rawValue: ud.string(forKey: Key.inputLanguage.rawValue) ?? "") ?? .chinese
useScreenContext = ud.object(forKey: Key.useScreenContext.rawValue) as? Bool ?? false
screenContextMode = ScreenContextMode(rawValue: ud.string(forKey: Key.screenContextMode.rawValue) ?? "") ?? .ocr
enableInstantInsert = ud.object(forKey: Key.enableInstantInsert.rawValue) as? Bool ?? false
hasCompletedOnboarding = ud.bool(forKey: Key.hasCompletedOnboarding.rawValue)
uiLanguage = loadedUILanguage
Expand DownExpand Up@@ -397,6 +399,7 @@ final class AppSettings: ObservableObject {
$enableStreamingRecognitionBeta.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.enableStreamingRecognitionBeta.rawValue) }.store(in: &cancellables)
$inputLanguage.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.inputLanguage.rawValue) }.store(in: &cancellables)
$useScreenContext.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.useScreenContext.rawValue) }.store(in: &cancellables)
$screenContextMode.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.screenContextMode.rawValue) }.store(in: &cancellables)
$enableInstantInsert.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.enableInstantInsert.rawValue) }.store(in: &cancellables)
$hasCompletedOnboarding.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.hasCompletedOnboarding.rawValue) }.store(in: &cancellables)
$uiLanguage.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.uiLanguage.rawValue) }.store(in: &cancellables)
Expand Down
41 changes: 41 additions & 0 deletions Sources/Config/ScreenContextMode.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import Foundation

enum ScreenContextMode: String, Codable, CaseIterable {
case ocr = "ocr"
case multimodal = "multimodal"

static func effectiveCaptureMode(
preference: ScreenContextMode,
useRemoteLLM: Bool,
modelID: String
) -> ScreenContextMode {
guard preference == .multimodal,
!useRemoteLLM,
supportsScreenImageContext(modelID: modelID)
else {
return .ocr
}
return .multimodal
}

static func supportsScreenImageContext(modelID: String) -> Bool {
let id = modelID.lowercased()
return id.contains("gemma-4")
|| id.contains("gemma4")
|| id.contains("gemma_4")
|| id.contains("-vl")
|| id.contains("_vl")
|| id.contains("paligemma")
|| id.contains("smolvlm")
|| id.contains("fastvlm")
|| id.contains("pixtral")
|| id.contains("idefics")
}

var label: String {
switch self {
case .ocr: return L("screen_context_mode.ocr")
case .multimodal: return L("screen_context_mode.multimodal")
}
}
}
14 changes: 8 additions & 6 deletions Sources/Integration/InputSessionCoordinator+Output.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ extension InputSessionCoordinator {
text = textProcessor.basicClean(text: raw)
case .processed:
let screenContext = await screenContext(from: active)
context = inputContext(for: active, screenContext: screenContext, mode: .processed)
context = inputContext(for: active, screenContext: screenContext.text, mode: .processed)
let memoryContext = VoicePipelinePolicy.memoryContext(
for: .processed,
settings: settings,
Expand All@@ -23,12 +23,13 @@ extension InputSessionCoordinator {
text = await textProcessor.process(
text: raw,
options: options,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
case .command:
let screenContext = await screenContext(from: active)
context = inputContext(for: active, screenContext: screenContext, mode: .command)
context = inputContext(for: active, screenContext: screenContext.text, mode: .command)
let memoryContext = VoicePipelinePolicy.memoryContext(
for: .command,
settings: settings,
Expand All@@ -37,7 +38,8 @@ extension InputSessionCoordinator {
text = await textProcessor.processCommand(
text: raw,
options: options,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
}
Expand DownExpand Up@@ -66,7 +68,7 @@ extension InputSessionCoordinator {
)
}

private func screenContext(from active: ActiveSession) async -> String {
await active.screenContextTask?.value ?? ""
private func screenContext(from active: ActiveSession) async -> ScreenContextSnapshot {
await active.screenContextTask?.value ?? .empty
}
}
15 changes: 8 additions & 7 deletions Sources/Integration/InputSessionCoordinator.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ final class InputSessionCoordinator {
let inputLanguage: InputLanguage
let useScreenContext: Bool
let streamingEnabled: Bool
let screenContextTask: Task<String, Never>?
let screenContextTask: Task<ScreenContextSnapshot, Never>?
let client: IntegrationClient?
}

Expand DownExpand Up@@ -213,19 +213,20 @@ final class InputSessionCoordinator {
func startScreenContextCaptureIfNeeded(
mode: OutputMode,
useScreenContext: Bool
) -> Task<String, Never>? {
) -> Task<ScreenContextSnapshot, Never>? {
guard VoicePipelinePolicy.shouldCaptureScreenContext(
outputMode: mode,
useScreenContext: useScreenContext
) else {
return nil
}
guard ScreenOCR.hasScreenCapturePermission else {
Log.info("[InputSessionCoordinator] screen capture permission not granted, skipping OCR")
return nil
}
let contextMode = ScreenContextMode.effectiveCaptureMode(
preference: settings.screenContextMode,
useRemoteLLM: settings.useRemoteLLM,
modelID: settings.llmModel
)
return Task.detached(priority: .utility) {
await ScreenOCR.captureAndRecognize()
await ScreenOCR.capture(mode: contextMode)
}
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/LLM/LLMEngine.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,7 +136,7 @@ actor LLMEngine {
return "/no_think\n\(prompt)"
}

private static func modelConfiguration(for id: String) -> ModelConfiguration {
static func modelConfiguration(for id: String) -> ModelConfiguration {
let extraEOSTokens: Set<String> = id.lowercased().contains("gemma-4") ? ["<turn|>"] : []
return ModelConfiguration(id: id, extraEOSTokens: extraEOSTokens)
}
Expand Down
69 changes: 69 additions & 0 deletions Sources/LLM/VLMEngine.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
import CoreGraphics
import CoreImage
import Foundation
import MLXLMCommon
import MLXVLM

actor VLMEngine {
private var container: ModelContainer?
private var currentModelID: String?

func loadModel(id: String) async throws {
if currentModelID == id, container != nil { return }

Log.info("[VLMEngine] loading model: \(id)")
let started = CFAbsoluteTimeGetCurrent()

if let localURL = ModelStorage.localLLMURL(id) {
container = try await VLMModelFactory.shared.loadContainer(
from: localURL,
using: MLXModelLoading.tokenizerLoader
)
} else {
let config = LLMEngine.modelConfiguration(for: id)
container = try await VLMModelFactory.shared.loadContainer(
from: MLXModelLoading.downloader,
using: MLXModelLoading.tokenizerLoader,
configuration: config
)
}

currentModelID = id
let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VLMEngine] model loaded in \(String(format: "%.1f", elapsed))s")
}

func generate(
prompt: String,
systemPrompt: String? = nil,
image: CGImage,
maxTokens: Int = 2048,
temperature: Double = 0.3
) async throws -> String {
guard let container else {
throw LLMError.modelNotLoaded
}

let started = CFAbsoluteTimeGetCurrent()
let params = GenerateParameters(maxTokens: maxTokens, temperature: Float(temperature))
let session = ChatSession(
container,
instructions: systemPrompt,
generateParameters: params,
processing: .init()
)
let ciImage = CIImage(cgImage: image)
let result = try await session.respond(to: prompt, image: .ciImage(ciImage))

let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VLMEngine] generated \(result.count) chars in \(String(format: "%.1f", elapsed))s")
return result
}

var isLoaded: Bool { container != nil }

func unload() {
container = nil
currentModelID = nil
}
}
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
8 changes: 4 additions & 4 deletions Package.resolved

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

1 change: 1 addition & 0 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ let package = Package(
.product(name: "Hub", package: "swift-transformers"),
.product(name: "Tokenizers", package: "swift-transformers"),
.product(name: "MLXLLM", package: "mlx-swift-lm"),
.product(name: "MLXVLM", package: "mlx-swift-lm"),
.product(name: "MLXLMCommon", package: "mlx-swift-lm"),
],
path: "Sources",
Expand Down
10 changes: 6 additions & 4 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -122,7 +122,7 @@ extension VoicePipeline {
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
Expand All@@ -138,7 +138,8 @@ extension VoicePipeline {
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
recordFormattingDuration(started, label: "Smart Format")
Expand All@@ -157,7 +158,7 @@ extension VoicePipeline {
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext,
screenContext: screenContext.text,
outputMode: .command,
inputLanguage: settings.inputLanguage,
source: .menuBar
Expand All@@ -172,7 +173,8 @@ extension VoicePipeline {
let text = await textProcessor.processCommand(
text: raw,
model: settings.llmModel,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
recordFormattingDuration(started, label: "Voice Command formatting")
Expand Down
11 changes: 6 additions & 5 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,14 +147,14 @@ extension VoicePipeline {
replacementID: UUID,
raw: String,
settings: AppSettings,
ocrTask: Task<String, Never>?,
ocrTask: Task<ScreenContextSnapshot, Never>?,
ocrStartedAt: CFAbsoluteTime?
) async {
let started = CFAbsoluteTimeGetCurrent()
let screenContext = await ocrTask?.value ?? ""
let screenContext = await ocrTask?.value ?? .empty
if let ocrStartedAt {
let elapsed = CFAbsoluteTimeGetCurrent() - ocrStartedAt
Log.info("[VoicePipeline] OCR stage finished in \(String(format: "%.2f", elapsed))s")
Log.info("[VoicePipeline] screen context stage finished in \(String(format: "%.2f", elapsed))s")
}

guard !Task.isCancelled else { return }
Expand All@@ -164,7 +164,7 @@ extension VoicePipeline {
appName: currentReplacement.targetAppName,
bundleIdentifier: currentReplacement.targetBundleIdentifier,
windowTitle: currentReplacement.context?.windowTitle,
screenContext: screenContext,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
Expand All@@ -179,7 +179,8 @@ extension VoicePipeline {
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
let elapsed = CFAbsoluteTimeGetCurrent() - started
Expand Down
19 changes: 9 additions & 10 deletions Sources/App/VoicePipeline+ScreenContext.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,23 +12,22 @@ extension VoicePipeline {
return
}

guard ScreenOCR.hasScreenCapturePermission else {
Log.info("[VoicePipeline] screen capture permission not granted, skipping OCR")
cancelScreenContextCapture()
return
}

screenOCRStartedAt = CFAbsoluteTimeGetCurrent()
let mode = ScreenContextMode.effectiveCaptureMode(
preference: appState.settings.screenContextMode,
useRemoteLLM: appState.settings.useRemoteLLM,
modelID: appState.settings.llmModel
)
screenOCRTask = Task.detached(priority: .utility) {
await ScreenOCR.captureAndRecognize()
await ScreenOCR.capture(mode: mode)
}
}

func finishScreenContextCapture() async -> String {
let context = await screenOCRTask?.value ?? ""
func finishScreenContextCapture() async -> ScreenContextSnapshot {
let context = await screenOCRTask?.value ?? .empty
if let screenOCRStartedAt {
let elapsed = CFAbsoluteTimeGetCurrent() - screenOCRStartedAt
Log.info("[VoicePipeline] OCR stage finished in \(String(format: "%.2f", elapsed))s")
Log.info("[VoicePipeline] screen context stage finished in \(String(format: "%.2f", elapsed))s")
}
screenOCRTask = nil
screenOCRStartedAt = nil
Expand Down
2 changes: 1 addition & 1 deletion Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ final class VoicePipeline {
var volcSpeechEngine: VolcSpeechEngine?
var qwenSpeechEngine: LocalASREngine?
var mimoSpeechEngine: LocalASREngine?
var screenOCRTask: Task<String, Never>?
var screenOCRTask: Task<ScreenContextSnapshot, Never>?
var screenOCRStartedAt: CFAbsoluteTime?
var processingTask: Task<Void, Never>?
var replacementTask: Task<Void, Never>?
Expand Down
5 changes: 4 additions & 1 deletion Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -250,6 +250,7 @@ final class AppSettings: ObservableObject {
@Published var enableStreamingRecognitionBeta: Bool
@Published var inputLanguage: InputLanguage
@Published var useScreenContext: Bool
@Published var screenContextMode: ScreenContextMode
@Published var enableInstantInsert: Bool
@Published var hasCompletedOnboarding: Bool
@Published var uiLanguage: UILanguage {
Expand DownExpand Up@@ -290,7 +291,7 @@ final class AppSettings: ObservableObject {
case hotkeyType, activationMode, tapInterval, speechEngine, whisperModel, llmModel
case microphoneID, outputMode, languageStyle, customStylePrompt, playSounds
case enableStreamingRecognitionBeta
case inputLanguage, useScreenContext, enableInstantInsert, hasCompletedOnboarding, uiLanguage, historyRetention
case inputLanguage, useScreenContext, screenContextMode, enableInstantInsert, hasCompletedOnboarding, uiLanguage, historyRetention
case enableMemory, memoryWindowMinutes
case useCustomSystemPrompt, customSystemPrompt
case useRemoteLLM, remoteProvider, remoteAPIKey, remoteBaseURL, remoteModel
Expand DownExpand Up@@ -338,6 +339,7 @@ final class AppSettings: ObservableObject {
enableStreamingRecognitionBeta = ud.object(forKey: Key.enableStreamingRecognitionBeta.rawValue) as? Bool ?? true
inputLanguage = InputLanguage(rawValue: ud.string(forKey: Key.inputLanguage.rawValue) ?? "") ?? .chinese
useScreenContext = ud.object(forKey: Key.useScreenContext.rawValue) as? Bool ?? false
screenContextMode = ScreenContextMode(rawValue: ud.string(forKey: Key.screenContextMode.rawValue) ?? "") ?? .ocr
enableInstantInsert = ud.object(forKey: Key.enableInstantInsert.rawValue) as? Bool ?? false
hasCompletedOnboarding = ud.bool(forKey: Key.hasCompletedOnboarding.rawValue)
uiLanguage = loadedUILanguage
Expand DownExpand Up@@ -397,6 +399,7 @@ final class AppSettings: ObservableObject {
$enableStreamingRecognitionBeta.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.enableStreamingRecognitionBeta.rawValue) }.store(in: &cancellables)
$inputLanguage.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.inputLanguage.rawValue) }.store(in: &cancellables)
$useScreenContext.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.useScreenContext.rawValue) }.store(in: &cancellables)
$screenContextMode.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.screenContextMode.rawValue) }.store(in: &cancellables)
$enableInstantInsert.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.enableInstantInsert.rawValue) }.store(in: &cancellables)
$hasCompletedOnboarding.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.hasCompletedOnboarding.rawValue) }.store(in: &cancellables)
$uiLanguage.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.uiLanguage.rawValue) }.store(in: &cancellables)
Expand Down
41 changes: 41 additions & 0 deletions Sources/Config/ScreenContextMode.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import Foundation

enum ScreenContextMode: String, Codable, CaseIterable {
case ocr = "ocr"
case multimodal = "multimodal"

static func effectiveCaptureMode(
preference: ScreenContextMode,
useRemoteLLM: Bool,
modelID: String
) -> ScreenContextMode {
guard preference == .multimodal,
!useRemoteLLM,
supportsScreenImageContext(modelID: modelID)
else {
return .ocr
}
return .multimodal
}

static func supportsScreenImageContext(modelID: String) -> Bool {
let id = modelID.lowercased()
return id.contains("gemma-4")
|| id.contains("gemma4")
|| id.contains("gemma_4")
|| id.contains("-vl")
|| id.contains("_vl")
|| id.contains("paligemma")
|| id.contains("smolvlm")
|| id.contains("fastvlm")
|| id.contains("pixtral")
|| id.contains("idefics")
}

var label: String {
switch self {
case .ocr: return L("screen_context_mode.ocr")
case .multimodal: return L("screen_context_mode.multimodal")
}
}
}
14 changes: 8 additions & 6 deletions Sources/Integration/InputSessionCoordinator+Output.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ extension InputSessionCoordinator {
text = textProcessor.basicClean(text: raw)
case .processed:
let screenContext = await screenContext(from: active)
context = inputContext(for: active, screenContext: screenContext, mode: .processed)
context = inputContext(for: active, screenContext: screenContext.text, mode: .processed)
let memoryContext = VoicePipelinePolicy.memoryContext(
for: .processed,
settings: settings,
Expand All@@ -23,12 +23,13 @@ extension InputSessionCoordinator {
text = await textProcessor.process(
text: raw,
options: options,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
case .command:
let screenContext = await screenContext(from: active)
context = inputContext(for: active, screenContext: screenContext, mode: .command)
context = inputContext(for: active, screenContext: screenContext.text, mode: .command)
let memoryContext = VoicePipelinePolicy.memoryContext(
for: .command,
settings: settings,
Expand All@@ -37,7 +38,8 @@ extension InputSessionCoordinator {
text = await textProcessor.processCommand(
text: raw,
options: options,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
}
Expand DownExpand Up@@ -66,7 +68,7 @@ extension InputSessionCoordinator {
)
}

private func screenContext(from active: ActiveSession) async -> String {
await active.screenContextTask?.value ?? ""
private func screenContext(from active: ActiveSession) async -> ScreenContextSnapshot {
await active.screenContextTask?.value ?? .empty
}
}
15 changes: 8 additions & 7 deletions Sources/Integration/InputSessionCoordinator.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ final class InputSessionCoordinator {
let inputLanguage: InputLanguage
let useScreenContext: Bool
let streamingEnabled: Bool
let screenContextTask: Task<String, Never>?
let screenContextTask: Task<ScreenContextSnapshot, Never>?
let client: IntegrationClient?
}

Expand DownExpand Up@@ -213,19 +213,20 @@ final class InputSessionCoordinator {
func startScreenContextCaptureIfNeeded(
mode: OutputMode,
useScreenContext: Bool
) -> Task<String, Never>? {
) -> Task<ScreenContextSnapshot, Never>? {
guard VoicePipelinePolicy.shouldCaptureScreenContext(
outputMode: mode,
useScreenContext: useScreenContext
) else {
return nil
}
guard ScreenOCR.hasScreenCapturePermission else {
Log.info("[InputSessionCoordinator] screen capture permission not granted, skipping OCR")
return nil
}
let contextMode = ScreenContextMode.effectiveCaptureMode(
preference: settings.screenContextMode,
useRemoteLLM: settings.useRemoteLLM,
modelID: settings.llmModel
)
return Task.detached(priority: .utility) {
await ScreenOCR.captureAndRecognize()
await ScreenOCR.capture(mode: contextMode)
}
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/LLM/LLMEngine.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,7 +136,7 @@ actor LLMEngine {
return "/no_think\n\(prompt)"
}

private static func modelConfiguration(for id: String) -> ModelConfiguration {
static func modelConfiguration(for id: String) -> ModelConfiguration {
let extraEOSTokens: Set<String> = id.lowercased().contains("gemma-4") ? ["<turn|>"] : []
return ModelConfiguration(id: id, extraEOSTokens: extraEOSTokens)
}
Expand Down
69 changes: 69 additions & 0 deletions Sources/LLM/VLMEngine.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
import CoreGraphics
import CoreImage
import Foundation
import MLXLMCommon
import MLXVLM

actor VLMEngine {
private var container: ModelContainer?
private var currentModelID: String?

func loadModel(id: String) async throws {
if currentModelID == id, container != nil { return }

Log.info("[VLMEngine] loading model: \(id)")
let started = CFAbsoluteTimeGetCurrent()

if let localURL = ModelStorage.localLLMURL(id) {
container = try await VLMModelFactory.shared.loadContainer(
from: localURL,
using: MLXModelLoading.tokenizerLoader
)
} else {
let config = LLMEngine.modelConfiguration(for: id)
container = try await VLMModelFactory.shared.loadContainer(
from: MLXModelLoading.downloader,
using: MLXModelLoading.tokenizerLoader,
configuration: config
)
}

currentModelID = id
let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VLMEngine] model loaded in \(String(format: "%.1f", elapsed))s")
}

func generate(
prompt: String,
systemPrompt: String? = nil,
image: CGImage,
maxTokens: Int = 2048,
temperature: Double = 0.3
) async throws -> String {
guard let container else {
throw LLMError.modelNotLoaded
}

let started = CFAbsoluteTimeGetCurrent()
let params = GenerateParameters(maxTokens: maxTokens, temperature: Float(temperature))
let session = ChatSession(
container,
instructions: systemPrompt,
generateParameters: params,
processing: .init()
)
let ciImage = CIImage(cgImage: image)
let result = try await session.respond(to: prompt, image: .ciImage(ciImage))

let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VLMEngine] generated \(result.count) chars in \(String(format: "%.1f", elapsed))s")
return result
}

var isLoaded: Bool { container != nil }

func unload() {
container = nil
currentModelID = nil
}
}
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
8 changes: 4 additions & 4 deletions Package.resolved

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

1 change: 1 addition & 0 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ let package = Package(
.product(name: "Hub", package: "swift-transformers"),
.product(name: "Tokenizers", package: "swift-transformers"),
.product(name: "MLXLLM", package: "mlx-swift-lm"),
.product(name: "MLXVLM", package: "mlx-swift-lm"),
.product(name: "MLXLMCommon", package: "mlx-swift-lm"),
],
path: "Sources",
Expand Down
10 changes: 6 additions & 4 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -122,7 +122,7 @@ extension VoicePipeline {
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
Expand All@@ -138,7 +138,8 @@ extension VoicePipeline {
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
recordFormattingDuration(started, label: "Smart Format")
Expand All@@ -157,7 +158,7 @@ extension VoicePipeline {
let screenContext = await finishScreenContextCapture()
let inputContext = InputContext.capture(
targetApp: targetApp,
screenContext: screenContext,
screenContext: screenContext.text,
outputMode: .command,
inputLanguage: settings.inputLanguage,
source: .menuBar
Expand All@@ -172,7 +173,8 @@ extension VoicePipeline {
let text = await textProcessor.processCommand(
text: raw,
model: settings.llmModel,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
recordFormattingDuration(started, label: "Voice Command formatting")
Expand Down
11 changes: 6 additions & 5 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,14 +147,14 @@ extension VoicePipeline {
replacementID: UUID,
raw: String,
settings: AppSettings,
ocrTask: Task<String, Never>?,
ocrTask: Task<ScreenContextSnapshot, Never>?,
ocrStartedAt: CFAbsoluteTime?
) async {
let started = CFAbsoluteTimeGetCurrent()
let screenContext = await ocrTask?.value ?? ""
let screenContext = await ocrTask?.value ?? .empty
if let ocrStartedAt {
let elapsed = CFAbsoluteTimeGetCurrent() - ocrStartedAt
Log.info("[VoicePipeline] OCR stage finished in \(String(format: "%.2f", elapsed))s")
Log.info("[VoicePipeline] screen context stage finished in \(String(format: "%.2f", elapsed))s")
}

guard !Task.isCancelled else { return }
Expand All@@ -164,7 +164,7 @@ extension VoicePipeline {
appName: currentReplacement.targetAppName,
bundleIdentifier: currentReplacement.targetBundleIdentifier,
windowTitle: currentReplacement.context?.windowTitle,
screenContext: screenContext,
screenContext: screenContext.text,
outputMode: .processed,
inputLanguage: settings.inputLanguage,
source: .menuBar
Expand All@@ -179,7 +179,8 @@ extension VoicePipeline {
text: raw,
stylePrompt: settings.customStylePrompt,
model: settings.llmModel,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
let elapsed = CFAbsoluteTimeGetCurrent() - started
Expand Down
19 changes: 9 additions & 10 deletions Sources/App/VoicePipeline+ScreenContext.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,23 +12,22 @@ extension VoicePipeline {
return
}

guard ScreenOCR.hasScreenCapturePermission else {
Log.info("[VoicePipeline] screen capture permission not granted, skipping OCR")
cancelScreenContextCapture()
return
}

screenOCRStartedAt = CFAbsoluteTimeGetCurrent()
let mode = ScreenContextMode.effectiveCaptureMode(
preference: appState.settings.screenContextMode,
useRemoteLLM: appState.settings.useRemoteLLM,
modelID: appState.settings.llmModel
)
screenOCRTask = Task.detached(priority: .utility) {
await ScreenOCR.captureAndRecognize()
await ScreenOCR.capture(mode: mode)
}
}

func finishScreenContextCapture() async -> String {
let context = await screenOCRTask?.value ?? ""
func finishScreenContextCapture() async -> ScreenContextSnapshot {
let context = await screenOCRTask?.value ?? .empty
if let screenOCRStartedAt {
let elapsed = CFAbsoluteTimeGetCurrent() - screenOCRStartedAt
Log.info("[VoicePipeline] OCR stage finished in \(String(format: "%.2f", elapsed))s")
Log.info("[VoicePipeline] screen context stage finished in \(String(format: "%.2f", elapsed))s")
}
screenOCRTask = nil
screenOCRStartedAt = nil
Expand Down
2 changes: 1 addition & 1 deletion Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ final class VoicePipeline {
var volcSpeechEngine: VolcSpeechEngine?
var qwenSpeechEngine: LocalASREngine?
var mimoSpeechEngine: LocalASREngine?
var screenOCRTask: Task<String, Never>?
var screenOCRTask: Task<ScreenContextSnapshot, Never>?
var screenOCRStartedAt: CFAbsoluteTime?
var processingTask: Task<Void, Never>?
var replacementTask: Task<Void, Never>?
Expand Down
5 changes: 4 additions & 1 deletion Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -250,6 +250,7 @@ final class AppSettings: ObservableObject {
@Published var enableStreamingRecognitionBeta: Bool
@Published var inputLanguage: InputLanguage
@Published var useScreenContext: Bool
@Published var screenContextMode: ScreenContextMode
@Published var enableInstantInsert: Bool
@Published var hasCompletedOnboarding: Bool
@Published var uiLanguage: UILanguage {
Expand DownExpand Up@@ -290,7 +291,7 @@ final class AppSettings: ObservableObject {
case hotkeyType, activationMode, tapInterval, speechEngine, whisperModel, llmModel
case microphoneID, outputMode, languageStyle, customStylePrompt, playSounds
case enableStreamingRecognitionBeta
case inputLanguage, useScreenContext, enableInstantInsert, hasCompletedOnboarding, uiLanguage, historyRetention
case inputLanguage, useScreenContext, screenContextMode, enableInstantInsert, hasCompletedOnboarding, uiLanguage, historyRetention
case enableMemory, memoryWindowMinutes
case useCustomSystemPrompt, customSystemPrompt
case useRemoteLLM, remoteProvider, remoteAPIKey, remoteBaseURL, remoteModel
Expand DownExpand Up@@ -338,6 +339,7 @@ final class AppSettings: ObservableObject {
enableStreamingRecognitionBeta = ud.object(forKey: Key.enableStreamingRecognitionBeta.rawValue) as? Bool ?? true
inputLanguage = InputLanguage(rawValue: ud.string(forKey: Key.inputLanguage.rawValue) ?? "") ?? .chinese
useScreenContext = ud.object(forKey: Key.useScreenContext.rawValue) as? Bool ?? false
screenContextMode = ScreenContextMode(rawValue: ud.string(forKey: Key.screenContextMode.rawValue) ?? "") ?? .ocr
enableInstantInsert = ud.object(forKey: Key.enableInstantInsert.rawValue) as? Bool ?? false
hasCompletedOnboarding = ud.bool(forKey: Key.hasCompletedOnboarding.rawValue)
uiLanguage = loadedUILanguage
Expand DownExpand Up@@ -397,6 +399,7 @@ final class AppSettings: ObservableObject {
$enableStreamingRecognitionBeta.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.enableStreamingRecognitionBeta.rawValue) }.store(in: &cancellables)
$inputLanguage.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.inputLanguage.rawValue) }.store(in: &cancellables)
$useScreenContext.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.useScreenContext.rawValue) }.store(in: &cancellables)
$screenContextMode.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.screenContextMode.rawValue) }.store(in: &cancellables)
$enableInstantInsert.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.enableInstantInsert.rawValue) }.store(in: &cancellables)
$hasCompletedOnboarding.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.hasCompletedOnboarding.rawValue) }.store(in: &cancellables)
$uiLanguage.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.uiLanguage.rawValue) }.store(in: &cancellables)
Expand Down
41 changes: 41 additions & 0 deletions Sources/Config/ScreenContextMode.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import Foundation

enum ScreenContextMode: String, Codable, CaseIterable {
case ocr = "ocr"
case multimodal = "multimodal"

static func effectiveCaptureMode(
preference: ScreenContextMode,
useRemoteLLM: Bool,
modelID: String
) -> ScreenContextMode {
guard preference == .multimodal,
!useRemoteLLM,
supportsScreenImageContext(modelID: modelID)
else {
return .ocr
}
return .multimodal
}

static func supportsScreenImageContext(modelID: String) -> Bool {
let id = modelID.lowercased()
return id.contains("gemma-4")
|| id.contains("gemma4")
|| id.contains("gemma_4")
|| id.contains("-vl")
|| id.contains("_vl")
|| id.contains("paligemma")
|| id.contains("smolvlm")
|| id.contains("fastvlm")
|| id.contains("pixtral")
|| id.contains("idefics")
}

var label: String {
switch self {
case .ocr: return L("screen_context_mode.ocr")
case .multimodal: return L("screen_context_mode.multimodal")
}
}
}
14 changes: 8 additions & 6 deletions Sources/Integration/InputSessionCoordinator+Output.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ extension InputSessionCoordinator {
text = textProcessor.basicClean(text: raw)
case .processed:
let screenContext = await screenContext(from: active)
context = inputContext(for: active, screenContext: screenContext, mode: .processed)
context = inputContext(for: active, screenContext: screenContext.text, mode: .processed)
let memoryContext = VoicePipelinePolicy.memoryContext(
for: .processed,
settings: settings,
Expand All@@ -23,12 +23,13 @@ extension InputSessionCoordinator {
text = await textProcessor.process(
text: raw,
options: options,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
case .command:
let screenContext = await screenContext(from: active)
context = inputContext(for: active, screenContext: screenContext, mode: .command)
context = inputContext(for: active, screenContext: screenContext.text, mode: .command)
let memoryContext = VoicePipelinePolicy.memoryContext(
for: .command,
settings: settings,
Expand All@@ -37,7 +38,8 @@ extension InputSessionCoordinator {
text = await textProcessor.processCommand(
text: raw,
options: options,
screenContext: screenContext,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext
)
}
Expand DownExpand Up@@ -66,7 +68,7 @@ extension InputSessionCoordinator {
)
}

private func screenContext(from active: ActiveSession) async -> String {
await active.screenContextTask?.value ?? ""
private func screenContext(from active: ActiveSession) async -> ScreenContextSnapshot {
await active.screenContextTask?.value ?? .empty
}
}
15 changes: 8 additions & 7 deletions Sources/Integration/InputSessionCoordinator.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ final class InputSessionCoordinator {
let inputLanguage: InputLanguage
let useScreenContext: Bool
let streamingEnabled: Bool
let screenContextTask: Task<String, Never>?
let screenContextTask: Task<ScreenContextSnapshot, Never>?
let client: IntegrationClient?
}

Expand DownExpand Up@@ -213,19 +213,20 @@ final class InputSessionCoordinator {
func startScreenContextCaptureIfNeeded(
mode: OutputMode,
useScreenContext: Bool
) -> Task<String, Never>? {
) -> Task<ScreenContextSnapshot, Never>? {
guard VoicePipelinePolicy.shouldCaptureScreenContext(
outputMode: mode,
useScreenContext: useScreenContext
) else {
return nil
}
guard ScreenOCR.hasScreenCapturePermission else {
Log.info("[InputSessionCoordinator] screen capture permission not granted, skipping OCR")
return nil
}
let contextMode = ScreenContextMode.effectiveCaptureMode(
preference: settings.screenContextMode,
useRemoteLLM: settings.useRemoteLLM,
modelID: settings.llmModel
)
return Task.detached(priority: .utility) {
await ScreenOCR.captureAndRecognize()
await ScreenOCR.capture(mode: contextMode)
}
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/LLM/LLMEngine.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,7 +136,7 @@ actor LLMEngine {
return "/no_think\n\(prompt)"
}

private static func modelConfiguration(for id: String) -> ModelConfiguration {
static func modelConfiguration(for id: String) -> ModelConfiguration {
let extraEOSTokens: Set<String> = id.lowercased().contains("gemma-4") ? ["<turn|>"] : []
return ModelConfiguration(id: id, extraEOSTokens: extraEOSTokens)
}
Expand Down
69 changes: 69 additions & 0 deletions Sources/LLM/VLMEngine.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
import CoreGraphics
import CoreImage
import Foundation
import MLXLMCommon
import MLXVLM

actor VLMEngine {
private var container: ModelContainer?
private var currentModelID: String?

func loadModel(id: String) async throws {
if currentModelID == id, container != nil { return }

Log.info("[VLMEngine] loading model: \(id)")
let started = CFAbsoluteTimeGetCurrent()

if let localURL = ModelStorage.localLLMURL(id) {
container = try await VLMModelFactory.shared.loadContainer(
from: localURL,
using: MLXModelLoading.tokenizerLoader
)
} else {
let config = LLMEngine.modelConfiguration(for: id)
container = try await VLMModelFactory.shared.loadContainer(
from: MLXModelLoading.downloader,
using: MLXModelLoading.tokenizerLoader,
configuration: config
)
}

currentModelID = id
let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VLMEngine] model loaded in \(String(format: "%.1f", elapsed))s")
}

func generate(
prompt: String,
systemPrompt: String? = nil,
image: CGImage,
maxTokens: Int = 2048,
temperature: Double = 0.3
) async throws -> String {
guard let container else {
throw LLMError.modelNotLoaded
}

let started = CFAbsoluteTimeGetCurrent()
let params = GenerateParameters(maxTokens: maxTokens, temperature: Float(temperature))
let session = ChatSession(
container,
instructions: systemPrompt,
generateParameters: params,
processing: .init()
)
let ciImage = CIImage(cgImage: image)
let result = try await session.respond(to: prompt, image: .ciImage(ciImage))

let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VLMEngine] generated \(result.count) chars in \(String(format: "%.1f", elapsed))s")
return result
}

var isLoaded: Bool { container != nil }

func unload() {
container = nil
currentModelID = nil
}
}
Loading
Loading