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
3 changes: 3 additions & 0 deletions Sources/App/DeferredReplacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,13 +22,15 @@ struct DeferredReplacement {
var state: DeferredReplacementState
var message: String
var context: InputContext?
let formatKind: TextFormatKind

init(
rawText: String,
insertedText: String,
targetApp: NSRunningApplication?,
message: String,
context: InputContext? = nil,
formatKind: TextFormatKind = .plainParagraph,
createdAt: Date = Date(),
expirationInterval: TimeInterval = DeferredReplacementPolicy.expirationInterval
) {
Expand All@@ -44,6 +46,7 @@ struct DeferredReplacement {
self.state = .formatting
self.message = message
self.context = context
self.formatKind = formatKind
}

var targetApplication: NSRunningApplication? {
Expand Down
19 changes: 19 additions & 0 deletions Sources/App/VoicePipeline+CorrectionCapture.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import Foundation

@MainActor
extension VoicePipeline {
func beginCorrectionCapture(
recordID: UUID,
insertedText: String,
context: InputContext
) {
guard appState.settings.enableCorrectionLearning,
let seed = textInserter.correctionCaptureSeed(
expectedText: insertedText,
context: context
) else {
return
}
correctionCapture.start(seed: seed, recordID: recordID)
}
}
21 changes: 18 additions & 3 deletions Sources/App/VoicePipeline+EditCommands.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,13 +100,18 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = replacementText
beginCorrectionCapture(
recordID: recordID,
insertedText: replacementText,
context: context
)
}

private func replaceSelectedText(
Expand DownExpand Up@@ -142,13 +147,18 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = replacementText
beginCorrectionCapture(
recordID: recordID,
insertedText: replacementText,
context: context
)
}

private func replacementInputContext(
Expand DownExpand Up@@ -287,12 +297,17 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
beginCorrectionCapture(
recordID: recordID,
insertedText: rewrittenText,
context: context
)
}
}
24 changes: 21 additions & 3 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -174,17 +174,20 @@ extension VoicePipeline {
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)
let formatDecision = TextFormatClassifier.classify(text: raw, context: inputContext)
Log.info("[VoicePipeline] format kind \(formatDecision.kind.rawValue) (\(formatDecision.reason.rawValue))")
let text = await textProcessor.process(
text: raw,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext,
formatKind: formatDecision.kind,
dictionarySnapshot: dictionarySnapshot
)
recordFormattingDuration(started, label: "Smart Format")
return VoicePipelineOutput(text: text, context: inputContext)
return VoicePipelineOutput(text: text, context: inputContext, formatKind: formatDecision.kind)
}

private func processCommand(
Expand DownExpand Up@@ -273,19 +276,34 @@ extension VoicePipeline {
let wasProcessed = inputMode.isTranslation
|| settings.outputMode == .processed
|| settings.outputMode == .command
InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
wasProcessed: wasProcessed,
context: output.context
context: output.context,
formatKind: output.formatKind
)
appState.lastInsertedText = finalText
if !inputMode.isTranslation {
beginCorrectionCapture(
recordID: recordID,
insertedText: finalText,
context: output.context
)
}
}
}

struct VoicePipelineOutput {
let text: String
let context: InputContext
let formatKind: TextFormatKind?

init(text: String, context: InputContext, formatKind: TextFormatKind? = nil) {
self.text = text
self.context = context
self.formatKind = formatKind
}
}

private enum VoicePipelineStop: Error {
Expand Down
33 changes: 28 additions & 5 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,7 @@ extension VoicePipeline {
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
let formatDecision = TextFormatClassifier.classify(text: raw, context: quickContext)
let ocrTask = screenOCRTask
let ocrStartedAt = screenOCRStartedAt
screenOCRTask = nil
Expand DownExpand Up@@ -88,20 +89,27 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: quickText,
wasProcessed: false,
context: quickContext
context: quickContext,
formatKind: formatDecision.kind
)
appState.lastInsertedText = quickText
beginCorrectionCapture(
recordID: recordID,
insertedText: quickText,
context: quickContext
)

let replacement = DeferredReplacement(
rawText: raw,
insertedText: quickText,
targetApp: targetApp,
message: L("pipeline.background_formatting"),
context: quickContext
context: quickContext,
formatKind: formatDecision.kind
)
appState.pendingReplacement = replacement

Expand DownExpand Up@@ -131,6 +139,8 @@ extension VoicePipeline {
appState.phase = .inserting
appState.statusMessage = L("pipeline.replacing")

correctionCapture.finishCurrentSession()

let result = await textInserter.replaceRecentInsertion(
text: formattedText,
previouslyInserted: replacement.insertedText,
Expand All@@ -150,11 +160,23 @@ extension VoicePipeline {

appState.processedText = formattedText
appState.lastInsertedText = formattedText
InputHistory.shared.replaceLatestRecord(
let recordID = InputHistory.shared.replaceLatestRecord(
rawText: replacement.rawText,
processedText: formattedText,
wasProcessed: true,
context: replacement.context
context: replacement.context,
formatKind: replacement.formatKind
)
beginCorrectionCapture(
recordID: recordID,
insertedText: formattedText,
context: replacement.context ?? InputContext(
appName: replacement.targetAppName,
bundleIdentifier: replacement.targetBundleIdentifier,
outputMode: .processed,
inputLanguage: appState.settings.inputLanguage,
source: .menuBar
)
)
appState.clearPendingReplacement()
appState.phase = .done
Expand DownExpand Up@@ -208,6 +230,7 @@ extension VoicePipeline {
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext,
formatKind: currentReplacement.formatKind,
allowsPreparedFallback: false,
allowsGuardFallback: false,
dictionarySnapshot: dictionarySnapshot
Expand Down
7 changes: 6 additions & 1 deletion Sources/App/VoicePipeline+RewriteLast.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,12 +67,17 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
beginCorrectionCapture(
recordID: recordID,
insertedText: rewrittenText,
context: context
)
}
}
3 changes: 3 additions & 0 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ final class VoicePipeline {
let soundPlayer = SoundPlayer()
let audioCapture = AudioCaptureManager()
let textInserter = TextInserter()
let correctionCapture = CorrectionCaptureService()
let textProcessor = TextProcessor()
let overlay = OverlayPanel()
var whisperEngine: WhisperEngine?
Expand DownExpand Up@@ -77,6 +78,8 @@ final class VoicePipeline {

if appState.isDownloading { return }

correctionCapture.finishCurrentSession()

if !(currentEngine?.isReady ?? false) {
await ensureEngineLoaded(requestPermission: true)
}
Expand Down
7 changes: 6 additions & 1 deletion Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -275,6 +275,7 @@ final class AppSettings: ObservableObject {
@Published var historyRetention: HistoryRetention
@Published var enableMemory: Bool
@Published var memoryWindowMinutes: Int
@Published var enableCorrectionLearning: Bool
@Published var useCustomSystemPrompt: Bool
@Published var customSystemPrompt: String
@Published var useRemoteLLM: Bool
Expand DownExpand Up@@ -309,7 +310,7 @@ final class AppSettings: ObservableObject {
case enableStreamingRecognitionBeta
case inputLanguage, translationTargetLanguage
case useScreenContext, screenContextMode, enableInstantInsert, hasCompletedOnboarding, uiLanguage, historyRetention
case enableMemory, memoryWindowMinutes
case enableMemory, memoryWindowMinutes, enableCorrectionLearning
case useCustomSystemPrompt, customSystemPrompt
case useRemoteLLM, remoteProvider, remoteAPIKey, remoteBaseURL, remoteModel
case menuBarIcon, appIconAppearance
Expand DownExpand Up@@ -373,6 +374,7 @@ final class AppSettings: ObservableObject {
historyRetention = HistoryRetention(rawValue: ud.string(forKey: Key.historyRetention.rawValue) ?? "") ?? .forever
enableMemory = ud.object(forKey: Key.enableMemory.rawValue) as? Bool ?? true
memoryWindowMinutes = (ud.integer(forKey: Key.memoryWindowMinutes.rawValue)).nonZeroInt ?? 30
enableCorrectionLearning = ud.object(forKey: Key.enableCorrectionLearning.rawValue) as? Bool ?? true
useCustomSystemPrompt = ud.bool(forKey: Key.useCustomSystemPrompt.rawValue)
customSystemPrompt = ud.string(forKey: Key.customSystemPrompt.rawValue) ?? ""
useRemoteLLM = ud.bool(forKey: Key.useRemoteLLM.rawValue)
Expand DownExpand Up@@ -439,6 +441,9 @@ final class AppSettings: ObservableObject {
$historyRetention.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.historyRetention.rawValue) }.store(in: &cancellables)
$enableMemory.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.enableMemory.rawValue) }.store(in: &cancellables)
$memoryWindowMinutes.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.memoryWindowMinutes.rawValue) }.store(in: &cancellables)
$enableCorrectionLearning.dropFirst().sink {
[defaults] in defaults.set($0, forKey: Key.enableCorrectionLearning.rawValue)
}.store(in: &cancellables)
$useCustomSystemPrompt.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.useCustomSystemPrompt.rawValue) }.store(in: &cancellables)
$customSystemPrompt.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.customSystemPrompt.rawValue) }.store(in: &cancellables)
$useRemoteLLM.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.useRemoteLLM.rawValue) }.store(in: &cancellables)
Expand Down
9 changes: 8 additions & 1 deletion Sources/Integration/InputSessionCoordinator+Output.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ extension InputSessionCoordinator {
let memoryWindowMinutes = settings.memoryWindowMinutes
let text: String
let context: InputContext
let formatKind: TextFormatKind?

switch active.mode {
case .direct:
Expand All@@ -19,6 +20,7 @@ extension InputSessionCoordinator {
inputLanguage: active.inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
formatKind = nil
case .processed:
let screenContext = await screenContext(from: active)
context = inputContext(for: active, screenContext: screenContext.text, mode: .processed)
Expand All@@ -28,13 +30,16 @@ extension InputSessionCoordinator {
memoryWindowMinutes: memoryWindowMinutes,
currentContext: context
)
let decision = TextFormatClassifier.classify(text: raw, context: context)
formatKind = decision.kind
text = await textProcessor.process(
text: raw,
options: options,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: context,
formatKind: decision.kind,
dictionarySnapshot: dictionarySnapshot
)
case .command:
Expand All@@ -46,6 +51,7 @@ extension InputSessionCoordinator {
memoryWindowMinutes: memoryWindowMinutes,
currentContext: context
)
formatKind = nil
text = await textProcessor.processCommand(
text: raw,
options: options,
Expand All@@ -66,7 +72,8 @@ extension InputSessionCoordinator {
rawText: raw,
processedText: text,
wasProcessed: active.mode != .direct,
context: context
context: context,
formatKind: formatKind
)
return text
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Sources/App/DeferredReplacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,13 +22,15 @@ struct DeferredReplacement {
var state: DeferredReplacementState
var message: String
var context: InputContext?
let formatKind: TextFormatKind

init(
rawText: String,
insertedText: String,
targetApp: NSRunningApplication?,
message: String,
context: InputContext? = nil,
formatKind: TextFormatKind = .plainParagraph,
createdAt: Date = Date(),
expirationInterval: TimeInterval = DeferredReplacementPolicy.expirationInterval
) {
Expand All@@ -44,6 +46,7 @@ struct DeferredReplacement {
self.state = .formatting
self.message = message
self.context = context
self.formatKind = formatKind
}

var targetApplication: NSRunningApplication? {
Expand Down
19 changes: 19 additions & 0 deletions Sources/App/VoicePipeline+CorrectionCapture.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import Foundation

@MainActor
extension VoicePipeline {
func beginCorrectionCapture(
recordID: UUID,
insertedText: String,
context: InputContext
) {
guard appState.settings.enableCorrectionLearning,
let seed = textInserter.correctionCaptureSeed(
expectedText: insertedText,
context: context
) else {
return
}
correctionCapture.start(seed: seed, recordID: recordID)
}
}
21 changes: 18 additions & 3 deletions Sources/App/VoicePipeline+EditCommands.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,13 +100,18 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = replacementText
beginCorrectionCapture(
recordID: recordID,
insertedText: replacementText,
context: context
)
}

private func replaceSelectedText(
Expand DownExpand Up@@ -142,13 +147,18 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = replacementText
beginCorrectionCapture(
recordID: recordID,
insertedText: replacementText,
context: context
)
}

private func replacementInputContext(
Expand DownExpand Up@@ -287,12 +297,17 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
beginCorrectionCapture(
recordID: recordID,
insertedText: rewrittenText,
context: context
)
}
}
24 changes: 21 additions & 3 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -174,17 +174,20 @@ extension VoicePipeline {
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)
let formatDecision = TextFormatClassifier.classify(text: raw, context: inputContext)
Log.info("[VoicePipeline] format kind \(formatDecision.kind.rawValue) (\(formatDecision.reason.rawValue))")
let text = await textProcessor.process(
text: raw,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext,
formatKind: formatDecision.kind,
dictionarySnapshot: dictionarySnapshot
)
recordFormattingDuration(started, label: "Smart Format")
return VoicePipelineOutput(text: text, context: inputContext)
return VoicePipelineOutput(text: text, context: inputContext, formatKind: formatDecision.kind)
}

private func processCommand(
Expand DownExpand Up@@ -273,19 +276,34 @@ extension VoicePipeline {
let wasProcessed = inputMode.isTranslation
|| settings.outputMode == .processed
|| settings.outputMode == .command
InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
wasProcessed: wasProcessed,
context: output.context
context: output.context,
formatKind: output.formatKind
)
appState.lastInsertedText = finalText
if !inputMode.isTranslation {
beginCorrectionCapture(
recordID: recordID,
insertedText: finalText,
context: output.context
)
}
}
}

struct VoicePipelineOutput {
let text: String
let context: InputContext
let formatKind: TextFormatKind?

init(text: String, context: InputContext, formatKind: TextFormatKind? = nil) {
self.text = text
self.context = context
self.formatKind = formatKind
}
}

private enum VoicePipelineStop: Error {
Expand Down
33 changes: 28 additions & 5 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,7 @@ extension VoicePipeline {
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
let formatDecision = TextFormatClassifier.classify(text: raw, context: quickContext)
let ocrTask = screenOCRTask
let ocrStartedAt = screenOCRStartedAt
screenOCRTask = nil
Expand DownExpand Up@@ -88,20 +89,27 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: quickText,
wasProcessed: false,
context: quickContext
context: quickContext,
formatKind: formatDecision.kind
)
appState.lastInsertedText = quickText
beginCorrectionCapture(
recordID: recordID,
insertedText: quickText,
context: quickContext
)

let replacement = DeferredReplacement(
rawText: raw,
insertedText: quickText,
targetApp: targetApp,
message: L("pipeline.background_formatting"),
context: quickContext
context: quickContext,
formatKind: formatDecision.kind
)
appState.pendingReplacement = replacement

Expand DownExpand Up@@ -131,6 +139,8 @@ extension VoicePipeline {
appState.phase = .inserting
appState.statusMessage = L("pipeline.replacing")

correctionCapture.finishCurrentSession()

let result = await textInserter.replaceRecentInsertion(
text: formattedText,
previouslyInserted: replacement.insertedText,
Expand All@@ -150,11 +160,23 @@ extension VoicePipeline {

appState.processedText = formattedText
appState.lastInsertedText = formattedText
InputHistory.shared.replaceLatestRecord(
let recordID = InputHistory.shared.replaceLatestRecord(
rawText: replacement.rawText,
processedText: formattedText,
wasProcessed: true,
context: replacement.context
context: replacement.context,
formatKind: replacement.formatKind
)
beginCorrectionCapture(
recordID: recordID,
insertedText: formattedText,
context: replacement.context ?? InputContext(
appName: replacement.targetAppName,
bundleIdentifier: replacement.targetBundleIdentifier,
outputMode: .processed,
inputLanguage: appState.settings.inputLanguage,
source: .menuBar
)
)
appState.clearPendingReplacement()
appState.phase = .done
Expand DownExpand Up@@ -208,6 +230,7 @@ extension VoicePipeline {
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext,
formatKind: currentReplacement.formatKind,
allowsPreparedFallback: false,
allowsGuardFallback: false,
dictionarySnapshot: dictionarySnapshot
Expand Down
7 changes: 6 additions & 1 deletion Sources/App/VoicePipeline+RewriteLast.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,12 +67,17 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
beginCorrectionCapture(
recordID: recordID,
insertedText: rewrittenText,
context: context
)
}
}
3 changes: 3 additions & 0 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ final class VoicePipeline {
let soundPlayer = SoundPlayer()
let audioCapture = AudioCaptureManager()
let textInserter = TextInserter()
let correctionCapture = CorrectionCaptureService()
let textProcessor = TextProcessor()
let overlay = OverlayPanel()
var whisperEngine: WhisperEngine?
Expand DownExpand Up@@ -77,6 +78,8 @@ final class VoicePipeline {

if appState.isDownloading { return }

correctionCapture.finishCurrentSession()

if !(currentEngine?.isReady ?? false) {
await ensureEngineLoaded(requestPermission: true)
}
Expand Down
7 changes: 6 additions & 1 deletion Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -275,6 +275,7 @@ final class AppSettings: ObservableObject {
@Published var historyRetention: HistoryRetention
@Published var enableMemory: Bool
@Published var memoryWindowMinutes: Int
@Published var enableCorrectionLearning: Bool
@Published var useCustomSystemPrompt: Bool
@Published var customSystemPrompt: String
@Published var useRemoteLLM: Bool
Expand DownExpand Up@@ -309,7 +310,7 @@ final class AppSettings: ObservableObject {
case enableStreamingRecognitionBeta
case inputLanguage, translationTargetLanguage
case useScreenContext, screenContextMode, enableInstantInsert, hasCompletedOnboarding, uiLanguage, historyRetention
case enableMemory, memoryWindowMinutes
case enableMemory, memoryWindowMinutes, enableCorrectionLearning
case useCustomSystemPrompt, customSystemPrompt
case useRemoteLLM, remoteProvider, remoteAPIKey, remoteBaseURL, remoteModel
case menuBarIcon, appIconAppearance
Expand DownExpand Up@@ -373,6 +374,7 @@ final class AppSettings: ObservableObject {
historyRetention = HistoryRetention(rawValue: ud.string(forKey: Key.historyRetention.rawValue) ?? "") ?? .forever
enableMemory = ud.object(forKey: Key.enableMemory.rawValue) as? Bool ?? true
memoryWindowMinutes = (ud.integer(forKey: Key.memoryWindowMinutes.rawValue)).nonZeroInt ?? 30
enableCorrectionLearning = ud.object(forKey: Key.enableCorrectionLearning.rawValue) as? Bool ?? true
useCustomSystemPrompt = ud.bool(forKey: Key.useCustomSystemPrompt.rawValue)
customSystemPrompt = ud.string(forKey: Key.customSystemPrompt.rawValue) ?? ""
useRemoteLLM = ud.bool(forKey: Key.useRemoteLLM.rawValue)
Expand DownExpand Up@@ -439,6 +441,9 @@ final class AppSettings: ObservableObject {
$historyRetention.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.historyRetention.rawValue) }.store(in: &cancellables)
$enableMemory.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.enableMemory.rawValue) }.store(in: &cancellables)
$memoryWindowMinutes.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.memoryWindowMinutes.rawValue) }.store(in: &cancellables)
$enableCorrectionLearning.dropFirst().sink {
[defaults] in defaults.set($0, forKey: Key.enableCorrectionLearning.rawValue)
}.store(in: &cancellables)
$useCustomSystemPrompt.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.useCustomSystemPrompt.rawValue) }.store(in: &cancellables)
$customSystemPrompt.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.customSystemPrompt.rawValue) }.store(in: &cancellables)
$useRemoteLLM.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.useRemoteLLM.rawValue) }.store(in: &cancellables)
Expand Down
9 changes: 8 additions & 1 deletion Sources/Integration/InputSessionCoordinator+Output.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ extension InputSessionCoordinator {
let memoryWindowMinutes = settings.memoryWindowMinutes
let text: String
let context: InputContext
let formatKind: TextFormatKind?

switch active.mode {
case .direct:
Expand All@@ -19,6 +20,7 @@ extension InputSessionCoordinator {
inputLanguage: active.inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
formatKind = nil
case .processed:
let screenContext = await screenContext(from: active)
context = inputContext(for: active, screenContext: screenContext.text, mode: .processed)
Expand All@@ -28,13 +30,16 @@ extension InputSessionCoordinator {
memoryWindowMinutes: memoryWindowMinutes,
currentContext: context
)
let decision = TextFormatClassifier.classify(text: raw, context: context)
formatKind = decision.kind
text = await textProcessor.process(
text: raw,
options: options,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: context,
formatKind: decision.kind,
dictionarySnapshot: dictionarySnapshot
)
case .command:
Expand All@@ -46,6 +51,7 @@ extension InputSessionCoordinator {
memoryWindowMinutes: memoryWindowMinutes,
currentContext: context
)
formatKind = nil
text = await textProcessor.processCommand(
text: raw,
options: options,
Expand All@@ -66,7 +72,8 @@ extension InputSessionCoordinator {
rawText: raw,
processedText: text,
wasProcessed: active.mode != .direct,
context: context
context: context,
formatKind: formatKind
)
return text
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Sources/App/DeferredReplacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,13 +22,15 @@ struct DeferredReplacement {
var state: DeferredReplacementState
var message: String
var context: InputContext?
let formatKind: TextFormatKind

init(
rawText: String,
insertedText: String,
targetApp: NSRunningApplication?,
message: String,
context: InputContext? = nil,
formatKind: TextFormatKind = .plainParagraph,
createdAt: Date = Date(),
expirationInterval: TimeInterval = DeferredReplacementPolicy.expirationInterval
) {
Expand All@@ -44,6 +46,7 @@ struct DeferredReplacement {
self.state = .formatting
self.message = message
self.context = context
self.formatKind = formatKind
}

var targetApplication: NSRunningApplication? {
Expand Down
19 changes: 19 additions & 0 deletions Sources/App/VoicePipeline+CorrectionCapture.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import Foundation

@MainActor
extension VoicePipeline {
func beginCorrectionCapture(
recordID: UUID,
insertedText: String,
context: InputContext
) {
guard appState.settings.enableCorrectionLearning,
let seed = textInserter.correctionCaptureSeed(
expectedText: insertedText,
context: context
) else {
return
}
correctionCapture.start(seed: seed, recordID: recordID)
}
}
21 changes: 18 additions & 3 deletions Sources/App/VoicePipeline+EditCommands.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,13 +100,18 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = replacementText
beginCorrectionCapture(
recordID: recordID,
insertedText: replacementText,
context: context
)
}

private func replaceSelectedText(
Expand DownExpand Up@@ -142,13 +147,18 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = replacementText
beginCorrectionCapture(
recordID: recordID,
insertedText: replacementText,
context: context
)
}

private func replacementInputContext(
Expand DownExpand Up@@ -287,12 +297,17 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
beginCorrectionCapture(
recordID: recordID,
insertedText: rewrittenText,
context: context
)
}
}
24 changes: 21 additions & 3 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -174,17 +174,20 @@ extension VoicePipeline {
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)
let formatDecision = TextFormatClassifier.classify(text: raw, context: inputContext)
Log.info("[VoicePipeline] format kind \(formatDecision.kind.rawValue) (\(formatDecision.reason.rawValue))")
let text = await textProcessor.process(
text: raw,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext,
formatKind: formatDecision.kind,
dictionarySnapshot: dictionarySnapshot
)
recordFormattingDuration(started, label: "Smart Format")
return VoicePipelineOutput(text: text, context: inputContext)
return VoicePipelineOutput(text: text, context: inputContext, formatKind: formatDecision.kind)
}

private func processCommand(
Expand DownExpand Up@@ -273,19 +276,34 @@ extension VoicePipeline {
let wasProcessed = inputMode.isTranslation
|| settings.outputMode == .processed
|| settings.outputMode == .command
InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
wasProcessed: wasProcessed,
context: output.context
context: output.context,
formatKind: output.formatKind
)
appState.lastInsertedText = finalText
if !inputMode.isTranslation {
beginCorrectionCapture(
recordID: recordID,
insertedText: finalText,
context: output.context
)
}
}
}

struct VoicePipelineOutput {
let text: String
let context: InputContext
let formatKind: TextFormatKind?

init(text: String, context: InputContext, formatKind: TextFormatKind? = nil) {
self.text = text
self.context = context
self.formatKind = formatKind
}
}

private enum VoicePipelineStop: Error {
Expand Down
33 changes: 28 additions & 5 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,7 @@ extension VoicePipeline {
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
let formatDecision = TextFormatClassifier.classify(text: raw, context: quickContext)
let ocrTask = screenOCRTask
let ocrStartedAt = screenOCRStartedAt
screenOCRTask = nil
Expand DownExpand Up@@ -88,20 +89,27 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: quickText,
wasProcessed: false,
context: quickContext
context: quickContext,
formatKind: formatDecision.kind
)
appState.lastInsertedText = quickText
beginCorrectionCapture(
recordID: recordID,
insertedText: quickText,
context: quickContext
)

let replacement = DeferredReplacement(
rawText: raw,
insertedText: quickText,
targetApp: targetApp,
message: L("pipeline.background_formatting"),
context: quickContext
context: quickContext,
formatKind: formatDecision.kind
)
appState.pendingReplacement = replacement

Expand DownExpand Up@@ -131,6 +139,8 @@ extension VoicePipeline {
appState.phase = .inserting
appState.statusMessage = L("pipeline.replacing")

correctionCapture.finishCurrentSession()

let result = await textInserter.replaceRecentInsertion(
text: formattedText,
previouslyInserted: replacement.insertedText,
Expand All@@ -150,11 +160,23 @@ extension VoicePipeline {

appState.processedText = formattedText
appState.lastInsertedText = formattedText
InputHistory.shared.replaceLatestRecord(
let recordID = InputHistory.shared.replaceLatestRecord(
rawText: replacement.rawText,
processedText: formattedText,
wasProcessed: true,
context: replacement.context
context: replacement.context,
formatKind: replacement.formatKind
)
beginCorrectionCapture(
recordID: recordID,
insertedText: formattedText,
context: replacement.context ?? InputContext(
appName: replacement.targetAppName,
bundleIdentifier: replacement.targetBundleIdentifier,
outputMode: .processed,
inputLanguage: appState.settings.inputLanguage,
source: .menuBar
)
)
appState.clearPendingReplacement()
appState.phase = .done
Expand DownExpand Up@@ -208,6 +230,7 @@ extension VoicePipeline {
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext,
formatKind: currentReplacement.formatKind,
allowsPreparedFallback: false,
allowsGuardFallback: false,
dictionarySnapshot: dictionarySnapshot
Expand Down
7 changes: 6 additions & 1 deletion Sources/App/VoicePipeline+RewriteLast.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,12 +67,17 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
beginCorrectionCapture(
recordID: recordID,
insertedText: rewrittenText,
context: context
)
}
}
3 changes: 3 additions & 0 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ final class VoicePipeline {
let soundPlayer = SoundPlayer()
let audioCapture = AudioCaptureManager()
let textInserter = TextInserter()
let correctionCapture = CorrectionCaptureService()
let textProcessor = TextProcessor()
let overlay = OverlayPanel()
var whisperEngine: WhisperEngine?
Expand DownExpand Up@@ -77,6 +78,8 @@ final class VoicePipeline {

if appState.isDownloading { return }

correctionCapture.finishCurrentSession()

if !(currentEngine?.isReady ?? false) {
await ensureEngineLoaded(requestPermission: true)
}
Expand Down
7 changes: 6 additions & 1 deletion Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -275,6 +275,7 @@ final class AppSettings: ObservableObject {
@Published var historyRetention: HistoryRetention
@Published var enableMemory: Bool
@Published var memoryWindowMinutes: Int
@Published var enableCorrectionLearning: Bool
@Published var useCustomSystemPrompt: Bool
@Published var customSystemPrompt: String
@Published var useRemoteLLM: Bool
Expand DownExpand Up@@ -309,7 +310,7 @@ final class AppSettings: ObservableObject {
case enableStreamingRecognitionBeta
case inputLanguage, translationTargetLanguage
case useScreenContext, screenContextMode, enableInstantInsert, hasCompletedOnboarding, uiLanguage, historyRetention
case enableMemory, memoryWindowMinutes
case enableMemory, memoryWindowMinutes, enableCorrectionLearning
case useCustomSystemPrompt, customSystemPrompt
case useRemoteLLM, remoteProvider, remoteAPIKey, remoteBaseURL, remoteModel
case menuBarIcon, appIconAppearance
Expand DownExpand Up@@ -373,6 +374,7 @@ final class AppSettings: ObservableObject {
historyRetention = HistoryRetention(rawValue: ud.string(forKey: Key.historyRetention.rawValue) ?? "") ?? .forever
enableMemory = ud.object(forKey: Key.enableMemory.rawValue) as? Bool ?? true
memoryWindowMinutes = (ud.integer(forKey: Key.memoryWindowMinutes.rawValue)).nonZeroInt ?? 30
enableCorrectionLearning = ud.object(forKey: Key.enableCorrectionLearning.rawValue) as? Bool ?? true
useCustomSystemPrompt = ud.bool(forKey: Key.useCustomSystemPrompt.rawValue)
customSystemPrompt = ud.string(forKey: Key.customSystemPrompt.rawValue) ?? ""
useRemoteLLM = ud.bool(forKey: Key.useRemoteLLM.rawValue)
Expand DownExpand Up@@ -439,6 +441,9 @@ final class AppSettings: ObservableObject {
$historyRetention.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.historyRetention.rawValue) }.store(in: &cancellables)
$enableMemory.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.enableMemory.rawValue) }.store(in: &cancellables)
$memoryWindowMinutes.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.memoryWindowMinutes.rawValue) }.store(in: &cancellables)
$enableCorrectionLearning.dropFirst().sink {
[defaults] in defaults.set($0, forKey: Key.enableCorrectionLearning.rawValue)
}.store(in: &cancellables)
$useCustomSystemPrompt.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.useCustomSystemPrompt.rawValue) }.store(in: &cancellables)
$customSystemPrompt.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.customSystemPrompt.rawValue) }.store(in: &cancellables)
$useRemoteLLM.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.useRemoteLLM.rawValue) }.store(in: &cancellables)
Expand Down
9 changes: 8 additions & 1 deletion Sources/Integration/InputSessionCoordinator+Output.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ extension InputSessionCoordinator {
let memoryWindowMinutes = settings.memoryWindowMinutes
let text: String
let context: InputContext
let formatKind: TextFormatKind?

switch active.mode {
case .direct:
Expand All@@ -19,6 +20,7 @@ extension InputSessionCoordinator {
inputLanguage: active.inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
formatKind = nil
case .processed:
let screenContext = await screenContext(from: active)
context = inputContext(for: active, screenContext: screenContext.text, mode: .processed)
Expand All@@ -28,13 +30,16 @@ extension InputSessionCoordinator {
memoryWindowMinutes: memoryWindowMinutes,
currentContext: context
)
let decision = TextFormatClassifier.classify(text: raw, context: context)
formatKind = decision.kind
text = await textProcessor.process(
text: raw,
options: options,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: context,
formatKind: decision.kind,
dictionarySnapshot: dictionarySnapshot
)
case .command:
Expand All@@ -46,6 +51,7 @@ extension InputSessionCoordinator {
memoryWindowMinutes: memoryWindowMinutes,
currentContext: context
)
formatKind = nil
text = await textProcessor.processCommand(
text: raw,
options: options,
Expand All@@ -66,7 +72,8 @@ extension InputSessionCoordinator {
rawText: raw,
processedText: text,
wasProcessed: active.mode != .direct,
context: context
context: context,
formatKind: formatKind
)
return text
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Sources/App/DeferredReplacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,13 +22,15 @@ struct DeferredReplacement {
var state: DeferredReplacementState
var message: String
var context: InputContext?
let formatKind: TextFormatKind

init(
rawText: String,
insertedText: String,
targetApp: NSRunningApplication?,
message: String,
context: InputContext? = nil,
formatKind: TextFormatKind = .plainParagraph,
createdAt: Date = Date(),
expirationInterval: TimeInterval = DeferredReplacementPolicy.expirationInterval
) {
Expand All@@ -44,6 +46,7 @@ struct DeferredReplacement {
self.state = .formatting
self.message = message
self.context = context
self.formatKind = formatKind
}

var targetApplication: NSRunningApplication? {
Expand Down
19 changes: 19 additions & 0 deletions Sources/App/VoicePipeline+CorrectionCapture.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import Foundation

@MainActor
extension VoicePipeline {
func beginCorrectionCapture(
recordID: UUID,
insertedText: String,
context: InputContext
) {
guard appState.settings.enableCorrectionLearning,
let seed = textInserter.correctionCaptureSeed(
expectedText: insertedText,
context: context
) else {
return
}
correctionCapture.start(seed: seed, recordID: recordID)
}
}
21 changes: 18 additions & 3 deletions Sources/App/VoicePipeline+EditCommands.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,13 +100,18 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = replacementText
beginCorrectionCapture(
recordID: recordID,
insertedText: replacementText,
context: context
)
}

private func replaceSelectedText(
Expand DownExpand Up@@ -142,13 +147,18 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = replacementText
beginCorrectionCapture(
recordID: recordID,
insertedText: replacementText,
context: context
)
}

private func replacementInputContext(
Expand DownExpand Up@@ -287,12 +297,17 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
beginCorrectionCapture(
recordID: recordID,
insertedText: rewrittenText,
context: context
)
}
}
24 changes: 21 additions & 3 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -174,17 +174,20 @@ extension VoicePipeline {
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)
let formatDecision = TextFormatClassifier.classify(text: raw, context: inputContext)
Log.info("[VoicePipeline] format kind \(formatDecision.kind.rawValue) (\(formatDecision.reason.rawValue))")
let text = await textProcessor.process(
text: raw,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext,
formatKind: formatDecision.kind,
dictionarySnapshot: dictionarySnapshot
)
recordFormattingDuration(started, label: "Smart Format")
return VoicePipelineOutput(text: text, context: inputContext)
return VoicePipelineOutput(text: text, context: inputContext, formatKind: formatDecision.kind)
}

private func processCommand(
Expand DownExpand Up@@ -273,19 +276,34 @@ extension VoicePipeline {
let wasProcessed = inputMode.isTranslation
|| settings.outputMode == .processed
|| settings.outputMode == .command
InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
wasProcessed: wasProcessed,
context: output.context
context: output.context,
formatKind: output.formatKind
)
appState.lastInsertedText = finalText
if !inputMode.isTranslation {
beginCorrectionCapture(
recordID: recordID,
insertedText: finalText,
context: output.context
)
}
}
}

struct VoicePipelineOutput {
let text: String
let context: InputContext
let formatKind: TextFormatKind?

init(text: String, context: InputContext, formatKind: TextFormatKind? = nil) {
self.text = text
self.context = context
self.formatKind = formatKind
}
}

private enum VoicePipelineStop: Error {
Expand Down
33 changes: 28 additions & 5 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,7 @@ extension VoicePipeline {
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
let formatDecision = TextFormatClassifier.classify(text: raw, context: quickContext)
let ocrTask = screenOCRTask
let ocrStartedAt = screenOCRStartedAt
screenOCRTask = nil
Expand DownExpand Up@@ -88,20 +89,27 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: quickText,
wasProcessed: false,
context: quickContext
context: quickContext,
formatKind: formatDecision.kind
)
appState.lastInsertedText = quickText
beginCorrectionCapture(
recordID: recordID,
insertedText: quickText,
context: quickContext
)

let replacement = DeferredReplacement(
rawText: raw,
insertedText: quickText,
targetApp: targetApp,
message: L("pipeline.background_formatting"),
context: quickContext
context: quickContext,
formatKind: formatDecision.kind
)
appState.pendingReplacement = replacement

Expand DownExpand Up@@ -131,6 +139,8 @@ extension VoicePipeline {
appState.phase = .inserting
appState.statusMessage = L("pipeline.replacing")

correctionCapture.finishCurrentSession()

let result = await textInserter.replaceRecentInsertion(
text: formattedText,
previouslyInserted: replacement.insertedText,
Expand All@@ -150,11 +160,23 @@ extension VoicePipeline {

appState.processedText = formattedText
appState.lastInsertedText = formattedText
InputHistory.shared.replaceLatestRecord(
let recordID = InputHistory.shared.replaceLatestRecord(
rawText: replacement.rawText,
processedText: formattedText,
wasProcessed: true,
context: replacement.context
context: replacement.context,
formatKind: replacement.formatKind
)
beginCorrectionCapture(
recordID: recordID,
insertedText: formattedText,
context: replacement.context ?? InputContext(
appName: replacement.targetAppName,
bundleIdentifier: replacement.targetBundleIdentifier,
outputMode: .processed,
inputLanguage: appState.settings.inputLanguage,
source: .menuBar
)
)
appState.clearPendingReplacement()
appState.phase = .done
Expand DownExpand Up@@ -208,6 +230,7 @@ extension VoicePipeline {
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext,
formatKind: currentReplacement.formatKind,
allowsPreparedFallback: false,
allowsGuardFallback: false,
dictionarySnapshot: dictionarySnapshot
Expand Down
7 changes: 6 additions & 1 deletion Sources/App/VoicePipeline+RewriteLast.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,12 +67,17 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
beginCorrectionCapture(
recordID: recordID,
insertedText: rewrittenText,
context: context
)
}
}
3 changes: 3 additions & 0 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ final class VoicePipeline {
let soundPlayer = SoundPlayer()
let audioCapture = AudioCaptureManager()
let textInserter = TextInserter()
let correctionCapture = CorrectionCaptureService()
let textProcessor = TextProcessor()
let overlay = OverlayPanel()
var whisperEngine: WhisperEngine?
Expand DownExpand Up@@ -77,6 +78,8 @@ final class VoicePipeline {

if appState.isDownloading { return }

correctionCapture.finishCurrentSession()

if !(currentEngine?.isReady ?? false) {
await ensureEngineLoaded(requestPermission: true)
}
Expand Down
7 changes: 6 additions & 1 deletion Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -275,6 +275,7 @@ final class AppSettings: ObservableObject {
@Published var historyRetention: HistoryRetention
@Published var enableMemory: Bool
@Published var memoryWindowMinutes: Int
@Published var enableCorrectionLearning: Bool
@Published var useCustomSystemPrompt: Bool
@Published var customSystemPrompt: String
@Published var useRemoteLLM: Bool
Expand DownExpand Up@@ -309,7 +310,7 @@ final class AppSettings: ObservableObject {
case enableStreamingRecognitionBeta
case inputLanguage, translationTargetLanguage
case useScreenContext, screenContextMode, enableInstantInsert, hasCompletedOnboarding, uiLanguage, historyRetention
case enableMemory, memoryWindowMinutes
case enableMemory, memoryWindowMinutes, enableCorrectionLearning
case useCustomSystemPrompt, customSystemPrompt
case useRemoteLLM, remoteProvider, remoteAPIKey, remoteBaseURL, remoteModel
case menuBarIcon, appIconAppearance
Expand DownExpand Up@@ -373,6 +374,7 @@ final class AppSettings: ObservableObject {
historyRetention = HistoryRetention(rawValue: ud.string(forKey: Key.historyRetention.rawValue) ?? "") ?? .forever
enableMemory = ud.object(forKey: Key.enableMemory.rawValue) as? Bool ?? true
memoryWindowMinutes = (ud.integer(forKey: Key.memoryWindowMinutes.rawValue)).nonZeroInt ?? 30
enableCorrectionLearning = ud.object(forKey: Key.enableCorrectionLearning.rawValue) as? Bool ?? true
useCustomSystemPrompt = ud.bool(forKey: Key.useCustomSystemPrompt.rawValue)
customSystemPrompt = ud.string(forKey: Key.customSystemPrompt.rawValue) ?? ""
useRemoteLLM = ud.bool(forKey: Key.useRemoteLLM.rawValue)
Expand DownExpand Up@@ -439,6 +441,9 @@ final class AppSettings: ObservableObject {
$historyRetention.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.historyRetention.rawValue) }.store(in: &cancellables)
$enableMemory.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.enableMemory.rawValue) }.store(in: &cancellables)
$memoryWindowMinutes.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.memoryWindowMinutes.rawValue) }.store(in: &cancellables)
$enableCorrectionLearning.dropFirst().sink {
[defaults] in defaults.set($0, forKey: Key.enableCorrectionLearning.rawValue)
}.store(in: &cancellables)
$useCustomSystemPrompt.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.useCustomSystemPrompt.rawValue) }.store(in: &cancellables)
$customSystemPrompt.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.customSystemPrompt.rawValue) }.store(in: &cancellables)
$useRemoteLLM.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.useRemoteLLM.rawValue) }.store(in: &cancellables)
Expand Down
9 changes: 8 additions & 1 deletion Sources/Integration/InputSessionCoordinator+Output.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ extension InputSessionCoordinator {
let memoryWindowMinutes = settings.memoryWindowMinutes
let text: String
let context: InputContext
let formatKind: TextFormatKind?

switch active.mode {
case .direct:
Expand All@@ -19,6 +20,7 @@ extension InputSessionCoordinator {
inputLanguage: active.inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
formatKind = nil
case .processed:
let screenContext = await screenContext(from: active)
context = inputContext(for: active, screenContext: screenContext.text, mode: .processed)
Expand All@@ -28,13 +30,16 @@ extension InputSessionCoordinator {
memoryWindowMinutes: memoryWindowMinutes,
currentContext: context
)
let decision = TextFormatClassifier.classify(text: raw, context: context)
formatKind = decision.kind
text = await textProcessor.process(
text: raw,
options: options,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: context,
formatKind: decision.kind,
dictionarySnapshot: dictionarySnapshot
)
case .command:
Expand All@@ -46,6 +51,7 @@ extension InputSessionCoordinator {
memoryWindowMinutes: memoryWindowMinutes,
currentContext: context
)
formatKind = nil
text = await textProcessor.processCommand(
text: raw,
options: options,
Expand All@@ -66,7 +72,8 @@ extension InputSessionCoordinator {
rawText: raw,
processedText: text,
wasProcessed: active.mode != .direct,
context: context
context: context,
formatKind: formatKind
)
return text
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Sources/App/DeferredReplacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,13 +22,15 @@ struct DeferredReplacement {
var state: DeferredReplacementState
var message: String
var context: InputContext?
let formatKind: TextFormatKind

init(
rawText: String,
insertedText: String,
targetApp: NSRunningApplication?,
message: String,
context: InputContext? = nil,
formatKind: TextFormatKind = .plainParagraph,
createdAt: Date = Date(),
expirationInterval: TimeInterval = DeferredReplacementPolicy.expirationInterval
) {
Expand All@@ -44,6 +46,7 @@ struct DeferredReplacement {
self.state = .formatting
self.message = message
self.context = context
self.formatKind = formatKind
}

var targetApplication: NSRunningApplication? {
Expand Down
19 changes: 19 additions & 0 deletions Sources/App/VoicePipeline+CorrectionCapture.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import Foundation

@MainActor
extension VoicePipeline {
func beginCorrectionCapture(
recordID: UUID,
insertedText: String,
context: InputContext
) {
guard appState.settings.enableCorrectionLearning,
let seed = textInserter.correctionCaptureSeed(
expectedText: insertedText,
context: context
) else {
return
}
correctionCapture.start(seed: seed, recordID: recordID)
}
}
21 changes: 18 additions & 3 deletions Sources/App/VoicePipeline+EditCommands.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,13 +100,18 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = replacementText
beginCorrectionCapture(
recordID: recordID,
insertedText: replacementText,
context: context
)
}

private func replaceSelectedText(
Expand DownExpand Up@@ -142,13 +147,18 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = replacementText
beginCorrectionCapture(
recordID: recordID,
insertedText: replacementText,
context: context
)
}

private func replacementInputContext(
Expand DownExpand Up@@ -287,12 +297,17 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
beginCorrectionCapture(
recordID: recordID,
insertedText: rewrittenText,
context: context
)
}
}
24 changes: 21 additions & 3 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -174,17 +174,20 @@ extension VoicePipeline {
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)
let formatDecision = TextFormatClassifier.classify(text: raw, context: inputContext)
Log.info("[VoicePipeline] format kind \(formatDecision.kind.rawValue) (\(formatDecision.reason.rawValue))")
let text = await textProcessor.process(
text: raw,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext,
formatKind: formatDecision.kind,
dictionarySnapshot: dictionarySnapshot
)
recordFormattingDuration(started, label: "Smart Format")
return VoicePipelineOutput(text: text, context: inputContext)
return VoicePipelineOutput(text: text, context: inputContext, formatKind: formatDecision.kind)
}

private func processCommand(
Expand DownExpand Up@@ -273,19 +276,34 @@ extension VoicePipeline {
let wasProcessed = inputMode.isTranslation
|| settings.outputMode == .processed
|| settings.outputMode == .command
InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
wasProcessed: wasProcessed,
context: output.context
context: output.context,
formatKind: output.formatKind
)
appState.lastInsertedText = finalText
if !inputMode.isTranslation {
beginCorrectionCapture(
recordID: recordID,
insertedText: finalText,
context: output.context
)
}
}
}

struct VoicePipelineOutput {
let text: String
let context: InputContext
let formatKind: TextFormatKind?

init(text: String, context: InputContext, formatKind: TextFormatKind? = nil) {
self.text = text
self.context = context
self.formatKind = formatKind
}
}

private enum VoicePipelineStop: Error {
Expand Down
33 changes: 28 additions & 5 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,7 @@ extension VoicePipeline {
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
let formatDecision = TextFormatClassifier.classify(text: raw, context: quickContext)
let ocrTask = screenOCRTask
let ocrStartedAt = screenOCRStartedAt
screenOCRTask = nil
Expand DownExpand Up@@ -88,20 +89,27 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: quickText,
wasProcessed: false,
context: quickContext
context: quickContext,
formatKind: formatDecision.kind
)
appState.lastInsertedText = quickText
beginCorrectionCapture(
recordID: recordID,
insertedText: quickText,
context: quickContext
)

let replacement = DeferredReplacement(
rawText: raw,
insertedText: quickText,
targetApp: targetApp,
message: L("pipeline.background_formatting"),
context: quickContext
context: quickContext,
formatKind: formatDecision.kind
)
appState.pendingReplacement = replacement

Expand DownExpand Up@@ -131,6 +139,8 @@ extension VoicePipeline {
appState.phase = .inserting
appState.statusMessage = L("pipeline.replacing")

correctionCapture.finishCurrentSession()

let result = await textInserter.replaceRecentInsertion(
text: formattedText,
previouslyInserted: replacement.insertedText,
Expand All@@ -150,11 +160,23 @@ extension VoicePipeline {

appState.processedText = formattedText
appState.lastInsertedText = formattedText
InputHistory.shared.replaceLatestRecord(
let recordID = InputHistory.shared.replaceLatestRecord(
rawText: replacement.rawText,
processedText: formattedText,
wasProcessed: true,
context: replacement.context
context: replacement.context,
formatKind: replacement.formatKind
)
beginCorrectionCapture(
recordID: recordID,
insertedText: formattedText,
context: replacement.context ?? InputContext(
appName: replacement.targetAppName,
bundleIdentifier: replacement.targetBundleIdentifier,
outputMode: .processed,
inputLanguage: appState.settings.inputLanguage,
source: .menuBar
)
)
appState.clearPendingReplacement()
appState.phase = .done
Expand DownExpand Up@@ -208,6 +230,7 @@ extension VoicePipeline {
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext,
formatKind: currentReplacement.formatKind,
allowsPreparedFallback: false,
allowsGuardFallback: false,
dictionarySnapshot: dictionarySnapshot
Expand Down
7 changes: 6 additions & 1 deletion Sources/App/VoicePipeline+RewriteLast.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,12 +67,17 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
beginCorrectionCapture(
recordID: recordID,
insertedText: rewrittenText,
context: context
)
}
}
3 changes: 3 additions & 0 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ final class VoicePipeline {
let soundPlayer = SoundPlayer()
let audioCapture = AudioCaptureManager()
let textInserter = TextInserter()
let correctionCapture = CorrectionCaptureService()
let textProcessor = TextProcessor()
let overlay = OverlayPanel()
var whisperEngine: WhisperEngine?
Expand DownExpand Up@@ -77,6 +78,8 @@ final class VoicePipeline {

if appState.isDownloading { return }

correctionCapture.finishCurrentSession()

if !(currentEngine?.isReady ?? false) {
await ensureEngineLoaded(requestPermission: true)
}
Expand Down
7 changes: 6 additions & 1 deletion Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -275,6 +275,7 @@ final class AppSettings: ObservableObject {
@Published var historyRetention: HistoryRetention
@Published var enableMemory: Bool
@Published var memoryWindowMinutes: Int
@Published var enableCorrectionLearning: Bool
@Published var useCustomSystemPrompt: Bool
@Published var customSystemPrompt: String
@Published var useRemoteLLM: Bool
Expand DownExpand Up@@ -309,7 +310,7 @@ final class AppSettings: ObservableObject {
case enableStreamingRecognitionBeta
case inputLanguage, translationTargetLanguage
case useScreenContext, screenContextMode, enableInstantInsert, hasCompletedOnboarding, uiLanguage, historyRetention
case enableMemory, memoryWindowMinutes
case enableMemory, memoryWindowMinutes, enableCorrectionLearning
case useCustomSystemPrompt, customSystemPrompt
case useRemoteLLM, remoteProvider, remoteAPIKey, remoteBaseURL, remoteModel
case menuBarIcon, appIconAppearance
Expand DownExpand Up@@ -373,6 +374,7 @@ final class AppSettings: ObservableObject {
historyRetention = HistoryRetention(rawValue: ud.string(forKey: Key.historyRetention.rawValue) ?? "") ?? .forever
enableMemory = ud.object(forKey: Key.enableMemory.rawValue) as? Bool ?? true
memoryWindowMinutes = (ud.integer(forKey: Key.memoryWindowMinutes.rawValue)).nonZeroInt ?? 30
enableCorrectionLearning = ud.object(forKey: Key.enableCorrectionLearning.rawValue) as? Bool ?? true
useCustomSystemPrompt = ud.bool(forKey: Key.useCustomSystemPrompt.rawValue)
customSystemPrompt = ud.string(forKey: Key.customSystemPrompt.rawValue) ?? ""
useRemoteLLM = ud.bool(forKey: Key.useRemoteLLM.rawValue)
Expand DownExpand Up@@ -439,6 +441,9 @@ final class AppSettings: ObservableObject {
$historyRetention.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.historyRetention.rawValue) }.store(in: &cancellables)
$enableMemory.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.enableMemory.rawValue) }.store(in: &cancellables)
$memoryWindowMinutes.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.memoryWindowMinutes.rawValue) }.store(in: &cancellables)
$enableCorrectionLearning.dropFirst().sink {
[defaults] in defaults.set($0, forKey: Key.enableCorrectionLearning.rawValue)
}.store(in: &cancellables)
$useCustomSystemPrompt.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.useCustomSystemPrompt.rawValue) }.store(in: &cancellables)
$customSystemPrompt.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.customSystemPrompt.rawValue) }.store(in: &cancellables)
$useRemoteLLM.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.useRemoteLLM.rawValue) }.store(in: &cancellables)
Expand Down
9 changes: 8 additions & 1 deletion Sources/Integration/InputSessionCoordinator+Output.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ extension InputSessionCoordinator {
let memoryWindowMinutes = settings.memoryWindowMinutes
let text: String
let context: InputContext
let formatKind: TextFormatKind?

switch active.mode {
case .direct:
Expand All@@ -19,6 +20,7 @@ extension InputSessionCoordinator {
inputLanguage: active.inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
formatKind = nil
case .processed:
let screenContext = await screenContext(from: active)
context = inputContext(for: active, screenContext: screenContext.text, mode: .processed)
Expand All@@ -28,13 +30,16 @@ extension InputSessionCoordinator {
memoryWindowMinutes: memoryWindowMinutes,
currentContext: context
)
let decision = TextFormatClassifier.classify(text: raw, context: context)
formatKind = decision.kind
text = await textProcessor.process(
text: raw,
options: options,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: context,
formatKind: decision.kind,
dictionarySnapshot: dictionarySnapshot
)
case .command:
Expand All@@ -46,6 +51,7 @@ extension InputSessionCoordinator {
memoryWindowMinutes: memoryWindowMinutes,
currentContext: context
)
formatKind = nil
text = await textProcessor.processCommand(
text: raw,
options: options,
Expand All@@ -66,7 +72,8 @@ extension InputSessionCoordinator {
rawText: raw,
processedText: text,
wasProcessed: active.mode != .direct,
context: context
context: context,
formatKind: formatKind
)
return text
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Sources/App/DeferredReplacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,13 +22,15 @@ struct DeferredReplacement {
var state: DeferredReplacementState
var message: String
var context: InputContext?
let formatKind: TextFormatKind

init(
rawText: String,
insertedText: String,
targetApp: NSRunningApplication?,
message: String,
context: InputContext? = nil,
formatKind: TextFormatKind = .plainParagraph,
createdAt: Date = Date(),
expirationInterval: TimeInterval = DeferredReplacementPolicy.expirationInterval
) {
Expand All@@ -44,6 +46,7 @@ struct DeferredReplacement {
self.state = .formatting
self.message = message
self.context = context
self.formatKind = formatKind
}

var targetApplication: NSRunningApplication? {
Expand Down
19 changes: 19 additions & 0 deletions Sources/App/VoicePipeline+CorrectionCapture.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import Foundation

@MainActor
extension VoicePipeline {
func beginCorrectionCapture(
recordID: UUID,
insertedText: String,
context: InputContext
) {
guard appState.settings.enableCorrectionLearning,
let seed = textInserter.correctionCaptureSeed(
expectedText: insertedText,
context: context
) else {
return
}
correctionCapture.start(seed: seed, recordID: recordID)
}
}
21 changes: 18 additions & 3 deletions Sources/App/VoicePipeline+EditCommands.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,13 +100,18 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = replacementText
beginCorrectionCapture(
recordID: recordID,
insertedText: replacementText,
context: context
)
}

private func replaceSelectedText(
Expand DownExpand Up@@ -142,13 +147,18 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = replacementText
beginCorrectionCapture(
recordID: recordID,
insertedText: replacementText,
context: context
)
}

private func replacementInputContext(
Expand DownExpand Up@@ -287,12 +297,17 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
beginCorrectionCapture(
recordID: recordID,
insertedText: rewrittenText,
context: context
)
}
}
24 changes: 21 additions & 3 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -174,17 +174,20 @@ extension VoicePipeline {
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)
let formatDecision = TextFormatClassifier.classify(text: raw, context: inputContext)
Log.info("[VoicePipeline] format kind \(formatDecision.kind.rawValue) (\(formatDecision.reason.rawValue))")
let text = await textProcessor.process(
text: raw,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext,
formatKind: formatDecision.kind,
dictionarySnapshot: dictionarySnapshot
)
recordFormattingDuration(started, label: "Smart Format")
return VoicePipelineOutput(text: text, context: inputContext)
return VoicePipelineOutput(text: text, context: inputContext, formatKind: formatDecision.kind)
}

private func processCommand(
Expand DownExpand Up@@ -273,19 +276,34 @@ extension VoicePipeline {
let wasProcessed = inputMode.isTranslation
|| settings.outputMode == .processed
|| settings.outputMode == .command
InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
wasProcessed: wasProcessed,
context: output.context
context: output.context,
formatKind: output.formatKind
)
appState.lastInsertedText = finalText
if !inputMode.isTranslation {
beginCorrectionCapture(
recordID: recordID,
insertedText: finalText,
context: output.context
)
}
}
}

struct VoicePipelineOutput {
let text: String
let context: InputContext
let formatKind: TextFormatKind?

init(text: String, context: InputContext, formatKind: TextFormatKind? = nil) {
self.text = text
self.context = context
self.formatKind = formatKind
}
}

private enum VoicePipelineStop: Error {
Expand Down
33 changes: 28 additions & 5 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,7 @@ extension VoicePipeline {
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
let formatDecision = TextFormatClassifier.classify(text: raw, context: quickContext)
let ocrTask = screenOCRTask
let ocrStartedAt = screenOCRStartedAt
screenOCRTask = nil
Expand DownExpand Up@@ -88,20 +89,27 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: quickText,
wasProcessed: false,
context: quickContext
context: quickContext,
formatKind: formatDecision.kind
)
appState.lastInsertedText = quickText
beginCorrectionCapture(
recordID: recordID,
insertedText: quickText,
context: quickContext
)

let replacement = DeferredReplacement(
rawText: raw,
insertedText: quickText,
targetApp: targetApp,
message: L("pipeline.background_formatting"),
context: quickContext
context: quickContext,
formatKind: formatDecision.kind
)
appState.pendingReplacement = replacement

Expand DownExpand Up@@ -131,6 +139,8 @@ extension VoicePipeline {
appState.phase = .inserting
appState.statusMessage = L("pipeline.replacing")

correctionCapture.finishCurrentSession()

let result = await textInserter.replaceRecentInsertion(
text: formattedText,
previouslyInserted: replacement.insertedText,
Expand All@@ -150,11 +160,23 @@ extension VoicePipeline {

appState.processedText = formattedText
appState.lastInsertedText = formattedText
InputHistory.shared.replaceLatestRecord(
let recordID = InputHistory.shared.replaceLatestRecord(
rawText: replacement.rawText,
processedText: formattedText,
wasProcessed: true,
context: replacement.context
context: replacement.context,
formatKind: replacement.formatKind
)
beginCorrectionCapture(
recordID: recordID,
insertedText: formattedText,
context: replacement.context ?? InputContext(
appName: replacement.targetAppName,
bundleIdentifier: replacement.targetBundleIdentifier,
outputMode: .processed,
inputLanguage: appState.settings.inputLanguage,
source: .menuBar
)
)
appState.clearPendingReplacement()
appState.phase = .done
Expand DownExpand Up@@ -208,6 +230,7 @@ extension VoicePipeline {
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext,
formatKind: currentReplacement.formatKind,
allowsPreparedFallback: false,
allowsGuardFallback: false,
dictionarySnapshot: dictionarySnapshot
Expand Down
7 changes: 6 additions & 1 deletion Sources/App/VoicePipeline+RewriteLast.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,12 +67,17 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
beginCorrectionCapture(
recordID: recordID,
insertedText: rewrittenText,
context: context
)
}
}
3 changes: 3 additions & 0 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ final class VoicePipeline {
let soundPlayer = SoundPlayer()
let audioCapture = AudioCaptureManager()
let textInserter = TextInserter()
let correctionCapture = CorrectionCaptureService()
let textProcessor = TextProcessor()
let overlay = OverlayPanel()
var whisperEngine: WhisperEngine?
Expand DownExpand Up@@ -77,6 +78,8 @@ final class VoicePipeline {

if appState.isDownloading { return }

correctionCapture.finishCurrentSession()

if !(currentEngine?.isReady ?? false) {
await ensureEngineLoaded(requestPermission: true)
}
Expand Down
7 changes: 6 additions & 1 deletion Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -275,6 +275,7 @@ final class AppSettings: ObservableObject {
@Published var historyRetention: HistoryRetention
@Published var enableMemory: Bool
@Published var memoryWindowMinutes: Int
@Published var enableCorrectionLearning: Bool
@Published var useCustomSystemPrompt: Bool
@Published var customSystemPrompt: String
@Published var useRemoteLLM: Bool
Expand DownExpand Up@@ -309,7 +310,7 @@ final class AppSettings: ObservableObject {
case enableStreamingRecognitionBeta
case inputLanguage, translationTargetLanguage
case useScreenContext, screenContextMode, enableInstantInsert, hasCompletedOnboarding, uiLanguage, historyRetention
case enableMemory, memoryWindowMinutes
case enableMemory, memoryWindowMinutes, enableCorrectionLearning
case useCustomSystemPrompt, customSystemPrompt
case useRemoteLLM, remoteProvider, remoteAPIKey, remoteBaseURL, remoteModel
case menuBarIcon, appIconAppearance
Expand DownExpand Up@@ -373,6 +374,7 @@ final class AppSettings: ObservableObject {
historyRetention = HistoryRetention(rawValue: ud.string(forKey: Key.historyRetention.rawValue) ?? "") ?? .forever
enableMemory = ud.object(forKey: Key.enableMemory.rawValue) as? Bool ?? true
memoryWindowMinutes = (ud.integer(forKey: Key.memoryWindowMinutes.rawValue)).nonZeroInt ?? 30
enableCorrectionLearning = ud.object(forKey: Key.enableCorrectionLearning.rawValue) as? Bool ?? true
useCustomSystemPrompt = ud.bool(forKey: Key.useCustomSystemPrompt.rawValue)
customSystemPrompt = ud.string(forKey: Key.customSystemPrompt.rawValue) ?? ""
useRemoteLLM = ud.bool(forKey: Key.useRemoteLLM.rawValue)
Expand DownExpand Up@@ -439,6 +441,9 @@ final class AppSettings: ObservableObject {
$historyRetention.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.historyRetention.rawValue) }.store(in: &cancellables)
$enableMemory.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.enableMemory.rawValue) }.store(in: &cancellables)
$memoryWindowMinutes.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.memoryWindowMinutes.rawValue) }.store(in: &cancellables)
$enableCorrectionLearning.dropFirst().sink {
[defaults] in defaults.set($0, forKey: Key.enableCorrectionLearning.rawValue)
}.store(in: &cancellables)
$useCustomSystemPrompt.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.useCustomSystemPrompt.rawValue) }.store(in: &cancellables)
$customSystemPrompt.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.customSystemPrompt.rawValue) }.store(in: &cancellables)
$useRemoteLLM.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.useRemoteLLM.rawValue) }.store(in: &cancellables)
Expand Down
9 changes: 8 additions & 1 deletion Sources/Integration/InputSessionCoordinator+Output.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ extension InputSessionCoordinator {
let memoryWindowMinutes = settings.memoryWindowMinutes
let text: String
let context: InputContext
let formatKind: TextFormatKind?

switch active.mode {
case .direct:
Expand All@@ -19,6 +20,7 @@ extension InputSessionCoordinator {
inputLanguage: active.inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
formatKind = nil
case .processed:
let screenContext = await screenContext(from: active)
context = inputContext(for: active, screenContext: screenContext.text, mode: .processed)
Expand All@@ -28,13 +30,16 @@ extension InputSessionCoordinator {
memoryWindowMinutes: memoryWindowMinutes,
currentContext: context
)
let decision = TextFormatClassifier.classify(text: raw, context: context)
formatKind = decision.kind
text = await textProcessor.process(
text: raw,
options: options,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: context,
formatKind: decision.kind,
dictionarySnapshot: dictionarySnapshot
)
case .command:
Expand All@@ -46,6 +51,7 @@ extension InputSessionCoordinator {
memoryWindowMinutes: memoryWindowMinutes,
currentContext: context
)
formatKind = nil
text = await textProcessor.processCommand(
text: raw,
options: options,
Expand All@@ -66,7 +72,8 @@ extension InputSessionCoordinator {
rawText: raw,
processedText: text,
wasProcessed: active.mode != .direct,
context: context
context: context,
formatKind: formatKind
)
return text
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Sources/App/DeferredReplacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,13 +22,15 @@ struct DeferredReplacement {
var state: DeferredReplacementState
var message: String
var context: InputContext?
let formatKind: TextFormatKind

init(
rawText: String,
insertedText: String,
targetApp: NSRunningApplication?,
message: String,
context: InputContext? = nil,
formatKind: TextFormatKind = .plainParagraph,
createdAt: Date = Date(),
expirationInterval: TimeInterval = DeferredReplacementPolicy.expirationInterval
) {
Expand All@@ -44,6 +46,7 @@ struct DeferredReplacement {
self.state = .formatting
self.message = message
self.context = context
self.formatKind = formatKind
}

var targetApplication: NSRunningApplication? {
Expand Down
19 changes: 19 additions & 0 deletions Sources/App/VoicePipeline+CorrectionCapture.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import Foundation

@MainActor
extension VoicePipeline {
func beginCorrectionCapture(
recordID: UUID,
insertedText: String,
context: InputContext
) {
guard appState.settings.enableCorrectionLearning,
let seed = textInserter.correctionCaptureSeed(
expectedText: insertedText,
context: context
) else {
return
}
correctionCapture.start(seed: seed, recordID: recordID)
}
}
21 changes: 18 additions & 3 deletions Sources/App/VoicePipeline+EditCommands.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,13 +100,18 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = replacementText
beginCorrectionCapture(
recordID: recordID,
insertedText: replacementText,
context: context
)
}

private func replaceSelectedText(
Expand DownExpand Up@@ -142,13 +147,18 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = replacementText
beginCorrectionCapture(
recordID: recordID,
insertedText: replacementText,
context: context
)
}

private func replacementInputContext(
Expand DownExpand Up@@ -287,12 +297,17 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
beginCorrectionCapture(
recordID: recordID,
insertedText: rewrittenText,
context: context
)
}
}
24 changes: 21 additions & 3 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -174,17 +174,20 @@ extension VoicePipeline {
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)
let formatDecision = TextFormatClassifier.classify(text: raw, context: inputContext)
Log.info("[VoicePipeline] format kind \(formatDecision.kind.rawValue) (\(formatDecision.reason.rawValue))")
let text = await textProcessor.process(
text: raw,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext,
formatKind: formatDecision.kind,
dictionarySnapshot: dictionarySnapshot
)
recordFormattingDuration(started, label: "Smart Format")
return VoicePipelineOutput(text: text, context: inputContext)
return VoicePipelineOutput(text: text, context: inputContext, formatKind: formatDecision.kind)
}

private func processCommand(
Expand DownExpand Up@@ -273,19 +276,34 @@ extension VoicePipeline {
let wasProcessed = inputMode.isTranslation
|| settings.outputMode == .processed
|| settings.outputMode == .command
InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
wasProcessed: wasProcessed,
context: output.context
context: output.context,
formatKind: output.formatKind
)
appState.lastInsertedText = finalText
if !inputMode.isTranslation {
beginCorrectionCapture(
recordID: recordID,
insertedText: finalText,
context: output.context
)
}
}
}

struct VoicePipelineOutput {
let text: String
let context: InputContext
let formatKind: TextFormatKind?

init(text: String, context: InputContext, formatKind: TextFormatKind? = nil) {
self.text = text
self.context = context
self.formatKind = formatKind
}
}

private enum VoicePipelineStop: Error {
Expand Down
33 changes: 28 additions & 5 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,7 @@ extension VoicePipeline {
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
let formatDecision = TextFormatClassifier.classify(text: raw, context: quickContext)
let ocrTask = screenOCRTask
let ocrStartedAt = screenOCRStartedAt
screenOCRTask = nil
Expand DownExpand Up@@ -88,20 +89,27 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: quickText,
wasProcessed: false,
context: quickContext
context: quickContext,
formatKind: formatDecision.kind
)
appState.lastInsertedText = quickText
beginCorrectionCapture(
recordID: recordID,
insertedText: quickText,
context: quickContext
)

let replacement = DeferredReplacement(
rawText: raw,
insertedText: quickText,
targetApp: targetApp,
message: L("pipeline.background_formatting"),
context: quickContext
context: quickContext,
formatKind: formatDecision.kind
)
appState.pendingReplacement = replacement

Expand DownExpand Up@@ -131,6 +139,8 @@ extension VoicePipeline {
appState.phase = .inserting
appState.statusMessage = L("pipeline.replacing")

correctionCapture.finishCurrentSession()

let result = await textInserter.replaceRecentInsertion(
text: formattedText,
previouslyInserted: replacement.insertedText,
Expand All@@ -150,11 +160,23 @@ extension VoicePipeline {

appState.processedText = formattedText
appState.lastInsertedText = formattedText
InputHistory.shared.replaceLatestRecord(
let recordID = InputHistory.shared.replaceLatestRecord(
rawText: replacement.rawText,
processedText: formattedText,
wasProcessed: true,
context: replacement.context
context: replacement.context,
formatKind: replacement.formatKind
)
beginCorrectionCapture(
recordID: recordID,
insertedText: formattedText,
context: replacement.context ?? InputContext(
appName: replacement.targetAppName,
bundleIdentifier: replacement.targetBundleIdentifier,
outputMode: .processed,
inputLanguage: appState.settings.inputLanguage,
source: .menuBar
)
)
appState.clearPendingReplacement()
appState.phase = .done
Expand DownExpand Up@@ -208,6 +230,7 @@ extension VoicePipeline {
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext,
formatKind: currentReplacement.formatKind,
allowsPreparedFallback: false,
allowsGuardFallback: false,
dictionarySnapshot: dictionarySnapshot
Expand Down
7 changes: 6 additions & 1 deletion Sources/App/VoicePipeline+RewriteLast.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,12 +67,17 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
beginCorrectionCapture(
recordID: recordID,
insertedText: rewrittenText,
context: context
)
}
}
3 changes: 3 additions & 0 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ final class VoicePipeline {
let soundPlayer = SoundPlayer()
let audioCapture = AudioCaptureManager()
let textInserter = TextInserter()
let correctionCapture = CorrectionCaptureService()
let textProcessor = TextProcessor()
let overlay = OverlayPanel()
var whisperEngine: WhisperEngine?
Expand DownExpand Up@@ -77,6 +78,8 @@ final class VoicePipeline {

if appState.isDownloading { return }

correctionCapture.finishCurrentSession()

if !(currentEngine?.isReady ?? false) {
await ensureEngineLoaded(requestPermission: true)
}
Expand Down
7 changes: 6 additions & 1 deletion Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -275,6 +275,7 @@ final class AppSettings: ObservableObject {
@Published var historyRetention: HistoryRetention
@Published var enableMemory: Bool
@Published var memoryWindowMinutes: Int
@Published var enableCorrectionLearning: Bool
@Published var useCustomSystemPrompt: Bool
@Published var customSystemPrompt: String
@Published var useRemoteLLM: Bool
Expand DownExpand Up@@ -309,7 +310,7 @@ final class AppSettings: ObservableObject {
case enableStreamingRecognitionBeta
case inputLanguage, translationTargetLanguage
case useScreenContext, screenContextMode, enableInstantInsert, hasCompletedOnboarding, uiLanguage, historyRetention
case enableMemory, memoryWindowMinutes
case enableMemory, memoryWindowMinutes, enableCorrectionLearning
case useCustomSystemPrompt, customSystemPrompt
case useRemoteLLM, remoteProvider, remoteAPIKey, remoteBaseURL, remoteModel
case menuBarIcon, appIconAppearance
Expand DownExpand Up@@ -373,6 +374,7 @@ final class AppSettings: ObservableObject {
historyRetention = HistoryRetention(rawValue: ud.string(forKey: Key.historyRetention.rawValue) ?? "") ?? .forever
enableMemory = ud.object(forKey: Key.enableMemory.rawValue) as? Bool ?? true
memoryWindowMinutes = (ud.integer(forKey: Key.memoryWindowMinutes.rawValue)).nonZeroInt ?? 30
enableCorrectionLearning = ud.object(forKey: Key.enableCorrectionLearning.rawValue) as? Bool ?? true
useCustomSystemPrompt = ud.bool(forKey: Key.useCustomSystemPrompt.rawValue)
customSystemPrompt = ud.string(forKey: Key.customSystemPrompt.rawValue) ?? ""
useRemoteLLM = ud.bool(forKey: Key.useRemoteLLM.rawValue)
Expand DownExpand Up@@ -439,6 +441,9 @@ final class AppSettings: ObservableObject {
$historyRetention.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.historyRetention.rawValue) }.store(in: &cancellables)
$enableMemory.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.enableMemory.rawValue) }.store(in: &cancellables)
$memoryWindowMinutes.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.memoryWindowMinutes.rawValue) }.store(in: &cancellables)
$enableCorrectionLearning.dropFirst().sink {
[defaults] in defaults.set($0, forKey: Key.enableCorrectionLearning.rawValue)
}.store(in: &cancellables)
$useCustomSystemPrompt.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.useCustomSystemPrompt.rawValue) }.store(in: &cancellables)
$customSystemPrompt.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.customSystemPrompt.rawValue) }.store(in: &cancellables)
$useRemoteLLM.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.useRemoteLLM.rawValue) }.store(in: &cancellables)
Expand Down
9 changes: 8 additions & 1 deletion Sources/Integration/InputSessionCoordinator+Output.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ extension InputSessionCoordinator {
let memoryWindowMinutes = settings.memoryWindowMinutes
let text: String
let context: InputContext
let formatKind: TextFormatKind?

switch active.mode {
case .direct:
Expand All@@ -19,6 +20,7 @@ extension InputSessionCoordinator {
inputLanguage: active.inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
formatKind = nil
case .processed:
let screenContext = await screenContext(from: active)
context = inputContext(for: active, screenContext: screenContext.text, mode: .processed)
Expand All@@ -28,13 +30,16 @@ extension InputSessionCoordinator {
memoryWindowMinutes: memoryWindowMinutes,
currentContext: context
)
let decision = TextFormatClassifier.classify(text: raw, context: context)
formatKind = decision.kind
text = await textProcessor.process(
text: raw,
options: options,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: context,
formatKind: decision.kind,
dictionarySnapshot: dictionarySnapshot
)
case .command:
Expand All@@ -46,6 +51,7 @@ extension InputSessionCoordinator {
memoryWindowMinutes: memoryWindowMinutes,
currentContext: context
)
formatKind = nil
text = await textProcessor.processCommand(
text: raw,
options: options,
Expand All@@ -66,7 +72,8 @@ extension InputSessionCoordinator {
rawText: raw,
processedText: text,
wasProcessed: active.mode != .direct,
context: context
context: context,
formatKind: formatKind
)
return text
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Sources/App/DeferredReplacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,13 +22,15 @@ struct DeferredReplacement {
var state: DeferredReplacementState
var message: String
var context: InputContext?
let formatKind: TextFormatKind

init(
rawText: String,
insertedText: String,
targetApp: NSRunningApplication?,
message: String,
context: InputContext? = nil,
formatKind: TextFormatKind = .plainParagraph,
createdAt: Date = Date(),
expirationInterval: TimeInterval = DeferredReplacementPolicy.expirationInterval
) {
Expand All@@ -44,6 +46,7 @@ struct DeferredReplacement {
self.state = .formatting
self.message = message
self.context = context
self.formatKind = formatKind
}

var targetApplication: NSRunningApplication? {
Expand Down
19 changes: 19 additions & 0 deletions Sources/App/VoicePipeline+CorrectionCapture.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import Foundation

@MainActor
extension VoicePipeline {
func beginCorrectionCapture(
recordID: UUID,
insertedText: String,
context: InputContext
) {
guard appState.settings.enableCorrectionLearning,
let seed = textInserter.correctionCaptureSeed(
expectedText: insertedText,
context: context
) else {
return
}
correctionCapture.start(seed: seed, recordID: recordID)
}
}
21 changes: 18 additions & 3 deletions Sources/App/VoicePipeline+EditCommands.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,13 +100,18 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = replacementText
beginCorrectionCapture(
recordID: recordID,
insertedText: replacementText,
context: context
)
}

private func replaceSelectedText(
Expand DownExpand Up@@ -142,13 +147,18 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = replacementText
beginCorrectionCapture(
recordID: recordID,
insertedText: replacementText,
context: context
)
}

private func replacementInputContext(
Expand DownExpand Up@@ -287,12 +297,17 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
beginCorrectionCapture(
recordID: recordID,
insertedText: rewrittenText,
context: context
)
}
}
24 changes: 21 additions & 3 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -174,17 +174,20 @@ extension VoicePipeline {
memoryWindowMinutes: memoryWindowMinutes,
currentContext: inputContext
)
let formatDecision = TextFormatClassifier.classify(text: raw, context: inputContext)
Log.info("[VoicePipeline] format kind \(formatDecision.kind.rawValue) (\(formatDecision.reason.rawValue))")
let text = await textProcessor.process(
text: raw,
options: processingOptions,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext,
formatKind: formatDecision.kind,
dictionarySnapshot: dictionarySnapshot
)
recordFormattingDuration(started, label: "Smart Format")
return VoicePipelineOutput(text: text, context: inputContext)
return VoicePipelineOutput(text: text, context: inputContext, formatKind: formatDecision.kind)
}

private func processCommand(
Expand DownExpand Up@@ -273,19 +276,34 @@ extension VoicePipeline {
let wasProcessed = inputMode.isTranslation
|| settings.outputMode == .processed
|| settings.outputMode == .command
InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
wasProcessed: wasProcessed,
context: output.context
context: output.context,
formatKind: output.formatKind
)
appState.lastInsertedText = finalText
if !inputMode.isTranslation {
beginCorrectionCapture(
recordID: recordID,
insertedText: finalText,
context: output.context
)
}
}
}

struct VoicePipelineOutput {
let text: String
let context: InputContext
let formatKind: TextFormatKind?

init(text: String, context: InputContext, formatKind: TextFormatKind? = nil) {
self.text = text
self.context = context
self.formatKind = formatKind
}
}

private enum VoicePipelineStop: Error {
Expand Down
33 changes: 28 additions & 5 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,7 @@ extension VoicePipeline {
inputLanguage: processingOptions.inputLanguage,
source: .menuBar
)
let formatDecision = TextFormatClassifier.classify(text: raw, context: quickContext)
let ocrTask = screenOCRTask
let ocrStartedAt = screenOCRStartedAt
screenOCRTask = nil
Expand DownExpand Up@@ -88,20 +89,27 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: quickText,
wasProcessed: false,
context: quickContext
context: quickContext,
formatKind: formatDecision.kind
)
appState.lastInsertedText = quickText
beginCorrectionCapture(
recordID: recordID,
insertedText: quickText,
context: quickContext
)

let replacement = DeferredReplacement(
rawText: raw,
insertedText: quickText,
targetApp: targetApp,
message: L("pipeline.background_formatting"),
context: quickContext
context: quickContext,
formatKind: formatDecision.kind
)
appState.pendingReplacement = replacement

Expand DownExpand Up@@ -131,6 +139,8 @@ extension VoicePipeline {
appState.phase = .inserting
appState.statusMessage = L("pipeline.replacing")

correctionCapture.finishCurrentSession()

let result = await textInserter.replaceRecentInsertion(
text: formattedText,
previouslyInserted: replacement.insertedText,
Expand All@@ -150,11 +160,23 @@ extension VoicePipeline {

appState.processedText = formattedText
appState.lastInsertedText = formattedText
InputHistory.shared.replaceLatestRecord(
let recordID = InputHistory.shared.replaceLatestRecord(
rawText: replacement.rawText,
processedText: formattedText,
wasProcessed: true,
context: replacement.context
context: replacement.context,
formatKind: replacement.formatKind
)
beginCorrectionCapture(
recordID: recordID,
insertedText: formattedText,
context: replacement.context ?? InputContext(
appName: replacement.targetAppName,
bundleIdentifier: replacement.targetBundleIdentifier,
outputMode: .processed,
inputLanguage: appState.settings.inputLanguage,
source: .menuBar
)
)
appState.clearPendingReplacement()
appState.phase = .done
Expand DownExpand Up@@ -208,6 +230,7 @@ extension VoicePipeline {
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: inputContext,
formatKind: currentReplacement.formatKind,
allowsPreparedFallback: false,
allowsGuardFallback: false,
dictionarySnapshot: dictionarySnapshot
Expand Down
7 changes: 6 additions & 1 deletion Sources/App/VoicePipeline+RewriteLast.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,12 +67,17 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
let recordID = InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
beginCorrectionCapture(
recordID: recordID,
insertedText: rewrittenText,
context: context
)
}
}
3 changes: 3 additions & 0 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ final class VoicePipeline {
let soundPlayer = SoundPlayer()
let audioCapture = AudioCaptureManager()
let textInserter = TextInserter()
let correctionCapture = CorrectionCaptureService()
let textProcessor = TextProcessor()
let overlay = OverlayPanel()
var whisperEngine: WhisperEngine?
Expand DownExpand Up@@ -77,6 +78,8 @@ final class VoicePipeline {

if appState.isDownloading { return }

correctionCapture.finishCurrentSession()

if !(currentEngine?.isReady ?? false) {
await ensureEngineLoaded(requestPermission: true)
}
Expand Down
7 changes: 6 additions & 1 deletion Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -275,6 +275,7 @@ final class AppSettings: ObservableObject {
@Published var historyRetention: HistoryRetention
@Published var enableMemory: Bool
@Published var memoryWindowMinutes: Int
@Published var enableCorrectionLearning: Bool
@Published var useCustomSystemPrompt: Bool
@Published var customSystemPrompt: String
@Published var useRemoteLLM: Bool
Expand DownExpand Up@@ -309,7 +310,7 @@ final class AppSettings: ObservableObject {
case enableStreamingRecognitionBeta
case inputLanguage, translationTargetLanguage
case useScreenContext, screenContextMode, enableInstantInsert, hasCompletedOnboarding, uiLanguage, historyRetention
case enableMemory, memoryWindowMinutes
case enableMemory, memoryWindowMinutes, enableCorrectionLearning
case useCustomSystemPrompt, customSystemPrompt
case useRemoteLLM, remoteProvider, remoteAPIKey, remoteBaseURL, remoteModel
case menuBarIcon, appIconAppearance
Expand DownExpand Up@@ -373,6 +374,7 @@ final class AppSettings: ObservableObject {
historyRetention = HistoryRetention(rawValue: ud.string(forKey: Key.historyRetention.rawValue) ?? "") ?? .forever
enableMemory = ud.object(forKey: Key.enableMemory.rawValue) as? Bool ?? true
memoryWindowMinutes = (ud.integer(forKey: Key.memoryWindowMinutes.rawValue)).nonZeroInt ?? 30
enableCorrectionLearning = ud.object(forKey: Key.enableCorrectionLearning.rawValue) as? Bool ?? true
useCustomSystemPrompt = ud.bool(forKey: Key.useCustomSystemPrompt.rawValue)
customSystemPrompt = ud.string(forKey: Key.customSystemPrompt.rawValue) ?? ""
useRemoteLLM = ud.bool(forKey: Key.useRemoteLLM.rawValue)
Expand DownExpand Up@@ -439,6 +441,9 @@ final class AppSettings: ObservableObject {
$historyRetention.dropFirst().sink { [defaults] in defaults.set($0.rawValue, forKey: Key.historyRetention.rawValue) }.store(in: &cancellables)
$enableMemory.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.enableMemory.rawValue) }.store(in: &cancellables)
$memoryWindowMinutes.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.memoryWindowMinutes.rawValue) }.store(in: &cancellables)
$enableCorrectionLearning.dropFirst().sink {
[defaults] in defaults.set($0, forKey: Key.enableCorrectionLearning.rawValue)
}.store(in: &cancellables)
$useCustomSystemPrompt.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.useCustomSystemPrompt.rawValue) }.store(in: &cancellables)
$customSystemPrompt.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.customSystemPrompt.rawValue) }.store(in: &cancellables)
$useRemoteLLM.dropFirst().sink { [defaults] in defaults.set($0, forKey: Key.useRemoteLLM.rawValue) }.store(in: &cancellables)
Expand Down
9 changes: 8 additions & 1 deletion Sources/Integration/InputSessionCoordinator+Output.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ extension InputSessionCoordinator {
let memoryWindowMinutes = settings.memoryWindowMinutes
let text: String
let context: InputContext
let formatKind: TextFormatKind?

switch active.mode {
case .direct:
Expand All@@ -19,6 +20,7 @@ extension InputSessionCoordinator {
inputLanguage: active.inputLanguage,
dictionarySnapshot: dictionarySnapshot
)
formatKind = nil
case .processed:
let screenContext = await screenContext(from: active)
context = inputContext(for: active, screenContext: screenContext.text, mode: .processed)
Expand All@@ -28,13 +30,16 @@ extension InputSessionCoordinator {
memoryWindowMinutes: memoryWindowMinutes,
currentContext: context
)
let decision = TextFormatClassifier.classify(text: raw, context: context)
formatKind = decision.kind
text = await textProcessor.process(
text: raw,
options: options,
screenContext: screenContext.text,
screenImage: screenContext.image,
memoryContext: memoryContext,
inputContext: context,
formatKind: decision.kind,
dictionarySnapshot: dictionarySnapshot
)
case .command:
Expand All@@ -46,6 +51,7 @@ extension InputSessionCoordinator {
memoryWindowMinutes: memoryWindowMinutes,
currentContext: context
)
formatKind = nil
text = await textProcessor.processCommand(
text: raw,
options: options,
Expand All@@ -66,7 +72,8 @@ extension InputSessionCoordinator {
rawText: raw,
processedText: text,
wasProcessed: active.mode != .direct,
context: context
context: context,
formatKind: formatKind
)
return text
}
Expand Down
Loading
Loading