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
55 changes: 35 additions & 20 deletions Sources/App/VoicePipeline+EditCommands.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,16 +83,12 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.replacing")

Log.sensitive("[VoicePipeline] voice edit replace \(replacementText.count) chars")
let result = await textInserter.replaceRecentInsertion(text: replacementText, targetApp: targetApp)

InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
let result = await textInserter.replaceRecentInsertion(
text: replacementText,
previouslyInserted: appState.lastInsertedText,
targetApp: targetApp
)

appState.lastInsertedText = replacementText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -101,7 +97,16 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit replacement probably failed: \(reason)")
TextInserter.copyToClipboard(replacementText)
showInsertionFailedAlert(text: replacementText, reason: reason)
return
}

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

private func replaceSelectedText(
Expand All@@ -126,14 +131,6 @@ extension VoicePipeline {
Log.sensitive("[VoicePipeline] voice edit replace selection \(replacementText.count) chars")
let result = await textInserter.replaceSelectedText(text: replacementText, targetApp: targetApp)

InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
)

appState.lastInsertedText = replacementText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -142,7 +139,16 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit selection replacement probably failed: \(reason)")
TextInserter.copyToClipboard(replacementText)
showInsertionFailedAlert(text: replacementText, reason: reason)
return
}

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

private func replacementInputContext(
Expand DownExpand Up@@ -203,7 +209,10 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.undoing")

Log.info("[VoicePipeline] voice edit undo last insertion")
let result = await textInserter.undoRecentInsertion(targetApp: targetApp)
let result = await textInserter.undoRecentInsertion(
previouslyInserted: appState.lastInsertedText,
targetApp: targetApp
)

if case .probablyFailed(let reason) = result {
Log.info("[VoicePipeline] voice edit undo probably failed: \(reason)")
Expand DownExpand Up@@ -267,9 +276,6 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.replacing")

let result = await textInserter.replaceSelectedText(text: rewrittenText, targetApp: targetApp)
InputHistory.shared.addRecord(rawText: raw, processedText: rewrittenText, wasProcessed: true, context: context)

appState.lastInsertedText = rewrittenText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -278,6 +284,15 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit selection rewrite probably failed: \(reason)")
TextInserter.copyToClipboard(rewrittenText)
showInsertionFailedAlert(text: rewrittenText, reason: reason)
return
}

InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
}
}
8 changes: 6 additions & 2 deletions Sources/App/VoicePipeline+Models.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,13 +120,15 @@ extension VoicePipeline {
markSpeechModelDownloadRequired(showInStatus: requestPermission)
return
}
qwenSpeechEngine = LocalASREngine(configuration: LocalASRConfiguration(
let engine = LocalASREngine(configuration: LocalASRConfiguration(
provider: .qwen3,
pythonPath: settings.localASRPythonPath,
modelPath: catalog.asrModelPath(for: settings.qwenASRModel),
tokenizerPath: "",
repoPath: ""
))
qwenSpeechEngine = engine
Task { await engine.prepare() }
case .mimo:
let settings = appState.settings
let catalog = ModelCatalog.shared
Expand All@@ -135,13 +137,15 @@ extension VoicePipeline {
markSpeechModelDownloadRequired(showInStatus: requestPermission)
return
}
mimoSpeechEngine = LocalASREngine(configuration: LocalASRConfiguration(
let engine = LocalASREngine(configuration: LocalASRConfiguration(
provider: .mimo,
pythonPath: settings.localASRPythonPath,
modelPath: catalog.asrModelPath(for: settings.mimoASRModel),
tokenizerPath: catalog.mimoTokenizerPath(),
repoPath: catalog.mimoRepositoryPath()
))
mimoSpeechEngine = engine
Task { await engine.prepare() }
}
}

Expand Down
19 changes: 10 additions & 9 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -219,15 +219,6 @@ extension VoicePipeline {
let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VoicePipeline] insert stage finished in \(String(format: "%.2f", elapsed))s")

let wasProcessed = settings.outputMode == .processed || settings.outputMode == .command
InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
wasProcessed: wasProcessed,
context: output.context
)

appState.lastInsertedText = finalText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -236,7 +227,17 @@ extension VoicePipeline {
Log.info("[VoicePipeline] insertion probably failed: \(reason)")
TextInserter.copyToClipboard(finalText)
showInsertionFailedAlert(text: finalText, reason: reason)
return
}

let wasProcessed = settings.outputMode == .processed || settings.outputMode == .command
InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
wasProcessed: wasProcessed,
context: output.context
)
appState.lastInsertedText = finalText
}
}

Expand Down
11 changes: 9 additions & 2 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,8 +61,6 @@ extension VoicePipeline {
let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VoicePipeline] instant insert stage finished in \(String(format: "%.2f", elapsed))s")

InputHistory.shared.addRecord(rawText: raw, processedText: quickText, wasProcessed: false, context: quickContext)
appState.lastInsertedText = quickText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -74,6 +72,14 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
rawText: raw,
processedText: quickText,
wasProcessed: false,
context: quickContext
)
appState.lastInsertedText = quickText

let replacement = DeferredReplacement(
rawText: raw,
insertedText: quickText,
Expand DownExpand Up@@ -108,6 +114,7 @@ extension VoicePipeline {

let result = await textInserter.replaceRecentInsertion(
text: formattedText,
previouslyInserted: replacement.insertedText,
targetApp: targetApp
)

Expand Down
18 changes: 14 additions & 4 deletions Sources/App/VoicePipeline+RewriteLast.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,10 +51,11 @@ extension VoicePipeline {
appState.phase = .inserting
appState.statusMessage = L("pipeline.replacing")

let result = await textInserter.replaceRecentInsertion(text: rewrittenText, targetApp: targetApp)
InputHistory.shared.addRecord(rawText: raw, processedText: rewrittenText, wasProcessed: true, context: context)

appState.lastInsertedText = rewrittenText
let result = await textInserter.replaceRecentInsertion(
text: rewrittenText,
previouslyInserted: appState.lastInsertedText,
targetApp: targetApp
)
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -63,6 +64,15 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit last insertion rewrite probably failed: \(reason)")
TextInserter.copyToClipboard(rewrittenText)
showInsertionFailedAlert(text: rewrittenText, reason: reason)
return
}

InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
}
}
5 changes: 5 additions & 0 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,11 @@ final class VoicePipeline {
return
}

// Warm the engine while the user is still speaking (no-op if already warm).
if let engine = currentEngine {
Task { await engine.prepare() }
}

clearInFlightWork()

appState.reset()
Expand Down
31 changes: 20 additions & 11 deletions Sources/LLM/LLMEngine.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,10 +65,14 @@ actor LLMEngine {

let t0 = CFAbsoluteTimeGetCurrent()

let effectivePrompt = Self.applyNoThink(prompt: prompt, modelID: currentModelID)
let params = GenerateParameters(maxTokens: maxTokens, temperature: Float(temperature))
let session = ChatSession(container, instructions: systemPrompt, generateParameters: params)
let result = try await session.respond(to: effectivePrompt)
let session = ChatSession(
container,
instructions: systemPrompt,
generateParameters: params,
additionalContext: Self.chatTemplateContext(modelID: currentModelID)
)
let result = try await session.respond(to: prompt)

let elapsed = CFAbsoluteTimeGetCurrent() - t0
Log.info("[LLMEngine] generated \(result.count) chars in \(String(format: "%.1f", elapsed))s")
Expand All@@ -89,10 +93,7 @@ actor LLMEngine {

guard let container else { throw LLMError.modelNotLoaded }

let testPrompt = Self.applyNoThink(
prompt: "将以下口述内容整理为书面文字:嗯那个就是我觉得我们首先应该把这个方案重新梳理一下然后呢第二个就是要确认一下时间节点第三呢就是把预算也算一下",
modelID: modelID
)
let testPrompt = "将以下口述内容整理为书面文字:嗯那个就是我觉得我们首先应该把这个方案重新梳理一下然后呢第二个就是要确认一下时间节点第三呢就是把预算也算一下"
let systemPrompt = "你是语音转文字后处理引擎。直接输出整理后的文本,不要任何解释。"
let params = GenerateParameters(maxTokens: 256, temperature: 0.3)
let genT0 = CFAbsoluteTimeGetCurrent()
Expand All@@ -101,7 +102,12 @@ actor LLMEngine {
["role": "system", "content": systemPrompt],
["role": "user", "content": testPrompt],
]
let lmInput = try await container.prepare(input: .init(messages: messages))
let lmInput = try await container.prepare(
input: .init(
messages: messages,
additionalContext: Self.chatTemplateContext(modelID: modelID)
)
)
let stream = try await container.generate(input: lmInput, parameters: params)

var tokenCount = 0
Expand DownExpand Up@@ -131,9 +137,12 @@ actor LLMEngine {
currentModelID = nil
}

private static func applyNoThink(prompt: String, modelID: String?) -> String {
guard let id = modelID?.lowercased(), id.contains("qwen3") else { return prompt }
return "/no_think\n\(prompt)"
/// Qwen3-family chat templates read `enable_thinking` from the template
/// context — the official switch for suppressing `<think>` blocks. The old
/// `/no_think` soft prefix is ignored by Qwen3.5 and only added prompt noise.
static func chatTemplateContext(modelID: String?) -> [String: any Sendable]? {
guard let id = modelID?.lowercased(), id.contains("qwen3") else { return nil }
return ["enable_thinking": false]
}

static func modelConfiguration(for id: String) -> ModelConfiguration {
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
55 changes: 35 additions & 20 deletions Sources/App/VoicePipeline+EditCommands.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,16 +83,12 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.replacing")

Log.sensitive("[VoicePipeline] voice edit replace \(replacementText.count) chars")
let result = await textInserter.replaceRecentInsertion(text: replacementText, targetApp: targetApp)

InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
let result = await textInserter.replaceRecentInsertion(
text: replacementText,
previouslyInserted: appState.lastInsertedText,
targetApp: targetApp
)

appState.lastInsertedText = replacementText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -101,7 +97,16 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit replacement probably failed: \(reason)")
TextInserter.copyToClipboard(replacementText)
showInsertionFailedAlert(text: replacementText, reason: reason)
return
}

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

private func replaceSelectedText(
Expand All@@ -126,14 +131,6 @@ extension VoicePipeline {
Log.sensitive("[VoicePipeline] voice edit replace selection \(replacementText.count) chars")
let result = await textInserter.replaceSelectedText(text: replacementText, targetApp: targetApp)

InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
)

appState.lastInsertedText = replacementText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -142,7 +139,16 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit selection replacement probably failed: \(reason)")
TextInserter.copyToClipboard(replacementText)
showInsertionFailedAlert(text: replacementText, reason: reason)
return
}

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

private func replacementInputContext(
Expand DownExpand Up@@ -203,7 +209,10 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.undoing")

Log.info("[VoicePipeline] voice edit undo last insertion")
let result = await textInserter.undoRecentInsertion(targetApp: targetApp)
let result = await textInserter.undoRecentInsertion(
previouslyInserted: appState.lastInsertedText,
targetApp: targetApp
)

if case .probablyFailed(let reason) = result {
Log.info("[VoicePipeline] voice edit undo probably failed: \(reason)")
Expand DownExpand Up@@ -267,9 +276,6 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.replacing")

let result = await textInserter.replaceSelectedText(text: rewrittenText, targetApp: targetApp)
InputHistory.shared.addRecord(rawText: raw, processedText: rewrittenText, wasProcessed: true, context: context)

appState.lastInsertedText = rewrittenText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -278,6 +284,15 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit selection rewrite probably failed: \(reason)")
TextInserter.copyToClipboard(rewrittenText)
showInsertionFailedAlert(text: rewrittenText, reason: reason)
return
}

InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
}
}
8 changes: 6 additions & 2 deletions Sources/App/VoicePipeline+Models.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,13 +120,15 @@ extension VoicePipeline {
markSpeechModelDownloadRequired(showInStatus: requestPermission)
return
}
qwenSpeechEngine = LocalASREngine(configuration: LocalASRConfiguration(
let engine = LocalASREngine(configuration: LocalASRConfiguration(
provider: .qwen3,
pythonPath: settings.localASRPythonPath,
modelPath: catalog.asrModelPath(for: settings.qwenASRModel),
tokenizerPath: "",
repoPath: ""
))
qwenSpeechEngine = engine
Task { await engine.prepare() }
case .mimo:
let settings = appState.settings
let catalog = ModelCatalog.shared
Expand All@@ -135,13 +137,15 @@ extension VoicePipeline {
markSpeechModelDownloadRequired(showInStatus: requestPermission)
return
}
mimoSpeechEngine = LocalASREngine(configuration: LocalASRConfiguration(
let engine = LocalASREngine(configuration: LocalASRConfiguration(
provider: .mimo,
pythonPath: settings.localASRPythonPath,
modelPath: catalog.asrModelPath(for: settings.mimoASRModel),
tokenizerPath: catalog.mimoTokenizerPath(),
repoPath: catalog.mimoRepositoryPath()
))
mimoSpeechEngine = engine
Task { await engine.prepare() }
}
}

Expand Down
19 changes: 10 additions & 9 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -219,15 +219,6 @@ extension VoicePipeline {
let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VoicePipeline] insert stage finished in \(String(format: "%.2f", elapsed))s")

let wasProcessed = settings.outputMode == .processed || settings.outputMode == .command
InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
wasProcessed: wasProcessed,
context: output.context
)

appState.lastInsertedText = finalText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -236,7 +227,17 @@ extension VoicePipeline {
Log.info("[VoicePipeline] insertion probably failed: \(reason)")
TextInserter.copyToClipboard(finalText)
showInsertionFailedAlert(text: finalText, reason: reason)
return
}

let wasProcessed = settings.outputMode == .processed || settings.outputMode == .command
InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
wasProcessed: wasProcessed,
context: output.context
)
appState.lastInsertedText = finalText
}
}

Expand Down
11 changes: 9 additions & 2 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,8 +61,6 @@ extension VoicePipeline {
let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VoicePipeline] instant insert stage finished in \(String(format: "%.2f", elapsed))s")

InputHistory.shared.addRecord(rawText: raw, processedText: quickText, wasProcessed: false, context: quickContext)
appState.lastInsertedText = quickText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -74,6 +72,14 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
rawText: raw,
processedText: quickText,
wasProcessed: false,
context: quickContext
)
appState.lastInsertedText = quickText

let replacement = DeferredReplacement(
rawText: raw,
insertedText: quickText,
Expand DownExpand Up@@ -108,6 +114,7 @@ extension VoicePipeline {

let result = await textInserter.replaceRecentInsertion(
text: formattedText,
previouslyInserted: replacement.insertedText,
targetApp: targetApp
)

Expand Down
18 changes: 14 additions & 4 deletions Sources/App/VoicePipeline+RewriteLast.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,10 +51,11 @@ extension VoicePipeline {
appState.phase = .inserting
appState.statusMessage = L("pipeline.replacing")

let result = await textInserter.replaceRecentInsertion(text: rewrittenText, targetApp: targetApp)
InputHistory.shared.addRecord(rawText: raw, processedText: rewrittenText, wasProcessed: true, context: context)

appState.lastInsertedText = rewrittenText
let result = await textInserter.replaceRecentInsertion(
text: rewrittenText,
previouslyInserted: appState.lastInsertedText,
targetApp: targetApp
)
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -63,6 +64,15 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit last insertion rewrite probably failed: \(reason)")
TextInserter.copyToClipboard(rewrittenText)
showInsertionFailedAlert(text: rewrittenText, reason: reason)
return
}

InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
}
}
5 changes: 5 additions & 0 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,11 @@ final class VoicePipeline {
return
}

// Warm the engine while the user is still speaking (no-op if already warm).
if let engine = currentEngine {
Task { await engine.prepare() }
}

clearInFlightWork()

appState.reset()
Expand Down
31 changes: 20 additions & 11 deletions Sources/LLM/LLMEngine.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,10 +65,14 @@ actor LLMEngine {

let t0 = CFAbsoluteTimeGetCurrent()

let effectivePrompt = Self.applyNoThink(prompt: prompt, modelID: currentModelID)
let params = GenerateParameters(maxTokens: maxTokens, temperature: Float(temperature))
let session = ChatSession(container, instructions: systemPrompt, generateParameters: params)
let result = try await session.respond(to: effectivePrompt)
let session = ChatSession(
container,
instructions: systemPrompt,
generateParameters: params,
additionalContext: Self.chatTemplateContext(modelID: currentModelID)
)
let result = try await session.respond(to: prompt)

let elapsed = CFAbsoluteTimeGetCurrent() - t0
Log.info("[LLMEngine] generated \(result.count) chars in \(String(format: "%.1f", elapsed))s")
Expand All@@ -89,10 +93,7 @@ actor LLMEngine {

guard let container else { throw LLMError.modelNotLoaded }

let testPrompt = Self.applyNoThink(
prompt: "将以下口述内容整理为书面文字:嗯那个就是我觉得我们首先应该把这个方案重新梳理一下然后呢第二个就是要确认一下时间节点第三呢就是把预算也算一下",
modelID: modelID
)
let testPrompt = "将以下口述内容整理为书面文字:嗯那个就是我觉得我们首先应该把这个方案重新梳理一下然后呢第二个就是要确认一下时间节点第三呢就是把预算也算一下"
let systemPrompt = "你是语音转文字后处理引擎。直接输出整理后的文本,不要任何解释。"
let params = GenerateParameters(maxTokens: 256, temperature: 0.3)
let genT0 = CFAbsoluteTimeGetCurrent()
Expand All@@ -101,7 +102,12 @@ actor LLMEngine {
["role": "system", "content": systemPrompt],
["role": "user", "content": testPrompt],
]
let lmInput = try await container.prepare(input: .init(messages: messages))
let lmInput = try await container.prepare(
input: .init(
messages: messages,
additionalContext: Self.chatTemplateContext(modelID: modelID)
)
)
let stream = try await container.generate(input: lmInput, parameters: params)

var tokenCount = 0
Expand DownExpand Up@@ -131,9 +137,12 @@ actor LLMEngine {
currentModelID = nil
}

private static func applyNoThink(prompt: String, modelID: String?) -> String {
guard let id = modelID?.lowercased(), id.contains("qwen3") else { return prompt }
return "/no_think\n\(prompt)"
/// Qwen3-family chat templates read `enable_thinking` from the template
/// context — the official switch for suppressing `<think>` blocks. The old
/// `/no_think` soft prefix is ignored by Qwen3.5 and only added prompt noise.
static func chatTemplateContext(modelID: String?) -> [String: any Sendable]? {
guard let id = modelID?.lowercased(), id.contains("qwen3") else { return nil }
return ["enable_thinking": false]
}

static func modelConfiguration(for id: String) -> ModelConfiguration {
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
55 changes: 35 additions & 20 deletions Sources/App/VoicePipeline+EditCommands.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,16 +83,12 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.replacing")

Log.sensitive("[VoicePipeline] voice edit replace \(replacementText.count) chars")
let result = await textInserter.replaceRecentInsertion(text: replacementText, targetApp: targetApp)

InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
let result = await textInserter.replaceRecentInsertion(
text: replacementText,
previouslyInserted: appState.lastInsertedText,
targetApp: targetApp
)

appState.lastInsertedText = replacementText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -101,7 +97,16 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit replacement probably failed: \(reason)")
TextInserter.copyToClipboard(replacementText)
showInsertionFailedAlert(text: replacementText, reason: reason)
return
}

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

private func replaceSelectedText(
Expand All@@ -126,14 +131,6 @@ extension VoicePipeline {
Log.sensitive("[VoicePipeline] voice edit replace selection \(replacementText.count) chars")
let result = await textInserter.replaceSelectedText(text: replacementText, targetApp: targetApp)

InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
)

appState.lastInsertedText = replacementText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -142,7 +139,16 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit selection replacement probably failed: \(reason)")
TextInserter.copyToClipboard(replacementText)
showInsertionFailedAlert(text: replacementText, reason: reason)
return
}

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

private func replacementInputContext(
Expand DownExpand Up@@ -203,7 +209,10 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.undoing")

Log.info("[VoicePipeline] voice edit undo last insertion")
let result = await textInserter.undoRecentInsertion(targetApp: targetApp)
let result = await textInserter.undoRecentInsertion(
previouslyInserted: appState.lastInsertedText,
targetApp: targetApp
)

if case .probablyFailed(let reason) = result {
Log.info("[VoicePipeline] voice edit undo probably failed: \(reason)")
Expand DownExpand Up@@ -267,9 +276,6 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.replacing")

let result = await textInserter.replaceSelectedText(text: rewrittenText, targetApp: targetApp)
InputHistory.shared.addRecord(rawText: raw, processedText: rewrittenText, wasProcessed: true, context: context)

appState.lastInsertedText = rewrittenText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -278,6 +284,15 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit selection rewrite probably failed: \(reason)")
TextInserter.copyToClipboard(rewrittenText)
showInsertionFailedAlert(text: rewrittenText, reason: reason)
return
}

InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
}
}
8 changes: 6 additions & 2 deletions Sources/App/VoicePipeline+Models.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,13 +120,15 @@ extension VoicePipeline {
markSpeechModelDownloadRequired(showInStatus: requestPermission)
return
}
qwenSpeechEngine = LocalASREngine(configuration: LocalASRConfiguration(
let engine = LocalASREngine(configuration: LocalASRConfiguration(
provider: .qwen3,
pythonPath: settings.localASRPythonPath,
modelPath: catalog.asrModelPath(for: settings.qwenASRModel),
tokenizerPath: "",
repoPath: ""
))
qwenSpeechEngine = engine
Task { await engine.prepare() }
case .mimo:
let settings = appState.settings
let catalog = ModelCatalog.shared
Expand All@@ -135,13 +137,15 @@ extension VoicePipeline {
markSpeechModelDownloadRequired(showInStatus: requestPermission)
return
}
mimoSpeechEngine = LocalASREngine(configuration: LocalASRConfiguration(
let engine = LocalASREngine(configuration: LocalASRConfiguration(
provider: .mimo,
pythonPath: settings.localASRPythonPath,
modelPath: catalog.asrModelPath(for: settings.mimoASRModel),
tokenizerPath: catalog.mimoTokenizerPath(),
repoPath: catalog.mimoRepositoryPath()
))
mimoSpeechEngine = engine
Task { await engine.prepare() }
}
}

Expand Down
19 changes: 10 additions & 9 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -219,15 +219,6 @@ extension VoicePipeline {
let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VoicePipeline] insert stage finished in \(String(format: "%.2f", elapsed))s")

let wasProcessed = settings.outputMode == .processed || settings.outputMode == .command
InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
wasProcessed: wasProcessed,
context: output.context
)

appState.lastInsertedText = finalText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -236,7 +227,17 @@ extension VoicePipeline {
Log.info("[VoicePipeline] insertion probably failed: \(reason)")
TextInserter.copyToClipboard(finalText)
showInsertionFailedAlert(text: finalText, reason: reason)
return
}

let wasProcessed = settings.outputMode == .processed || settings.outputMode == .command
InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
wasProcessed: wasProcessed,
context: output.context
)
appState.lastInsertedText = finalText
}
}

Expand Down
11 changes: 9 additions & 2 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,8 +61,6 @@ extension VoicePipeline {
let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VoicePipeline] instant insert stage finished in \(String(format: "%.2f", elapsed))s")

InputHistory.shared.addRecord(rawText: raw, processedText: quickText, wasProcessed: false, context: quickContext)
appState.lastInsertedText = quickText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -74,6 +72,14 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
rawText: raw,
processedText: quickText,
wasProcessed: false,
context: quickContext
)
appState.lastInsertedText = quickText

let replacement = DeferredReplacement(
rawText: raw,
insertedText: quickText,
Expand DownExpand Up@@ -108,6 +114,7 @@ extension VoicePipeline {

let result = await textInserter.replaceRecentInsertion(
text: formattedText,
previouslyInserted: replacement.insertedText,
targetApp: targetApp
)

Expand Down
18 changes: 14 additions & 4 deletions Sources/App/VoicePipeline+RewriteLast.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,10 +51,11 @@ extension VoicePipeline {
appState.phase = .inserting
appState.statusMessage = L("pipeline.replacing")

let result = await textInserter.replaceRecentInsertion(text: rewrittenText, targetApp: targetApp)
InputHistory.shared.addRecord(rawText: raw, processedText: rewrittenText, wasProcessed: true, context: context)

appState.lastInsertedText = rewrittenText
let result = await textInserter.replaceRecentInsertion(
text: rewrittenText,
previouslyInserted: appState.lastInsertedText,
targetApp: targetApp
)
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -63,6 +64,15 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit last insertion rewrite probably failed: \(reason)")
TextInserter.copyToClipboard(rewrittenText)
showInsertionFailedAlert(text: rewrittenText, reason: reason)
return
}

InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
}
}
5 changes: 5 additions & 0 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,11 @@ final class VoicePipeline {
return
}

// Warm the engine while the user is still speaking (no-op if already warm).
if let engine = currentEngine {
Task { await engine.prepare() }
}

clearInFlightWork()

appState.reset()
Expand Down
31 changes: 20 additions & 11 deletions Sources/LLM/LLMEngine.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,10 +65,14 @@ actor LLMEngine {

let t0 = CFAbsoluteTimeGetCurrent()

let effectivePrompt = Self.applyNoThink(prompt: prompt, modelID: currentModelID)
let params = GenerateParameters(maxTokens: maxTokens, temperature: Float(temperature))
let session = ChatSession(container, instructions: systemPrompt, generateParameters: params)
let result = try await session.respond(to: effectivePrompt)
let session = ChatSession(
container,
instructions: systemPrompt,
generateParameters: params,
additionalContext: Self.chatTemplateContext(modelID: currentModelID)
)
let result = try await session.respond(to: prompt)

let elapsed = CFAbsoluteTimeGetCurrent() - t0
Log.info("[LLMEngine] generated \(result.count) chars in \(String(format: "%.1f", elapsed))s")
Expand All@@ -89,10 +93,7 @@ actor LLMEngine {

guard let container else { throw LLMError.modelNotLoaded }

let testPrompt = Self.applyNoThink(
prompt: "将以下口述内容整理为书面文字:嗯那个就是我觉得我们首先应该把这个方案重新梳理一下然后呢第二个就是要确认一下时间节点第三呢就是把预算也算一下",
modelID: modelID
)
let testPrompt = "将以下口述内容整理为书面文字:嗯那个就是我觉得我们首先应该把这个方案重新梳理一下然后呢第二个就是要确认一下时间节点第三呢就是把预算也算一下"
let systemPrompt = "你是语音转文字后处理引擎。直接输出整理后的文本,不要任何解释。"
let params = GenerateParameters(maxTokens: 256, temperature: 0.3)
let genT0 = CFAbsoluteTimeGetCurrent()
Expand All@@ -101,7 +102,12 @@ actor LLMEngine {
["role": "system", "content": systemPrompt],
["role": "user", "content": testPrompt],
]
let lmInput = try await container.prepare(input: .init(messages: messages))
let lmInput = try await container.prepare(
input: .init(
messages: messages,
additionalContext: Self.chatTemplateContext(modelID: modelID)
)
)
let stream = try await container.generate(input: lmInput, parameters: params)

var tokenCount = 0
Expand DownExpand Up@@ -131,9 +137,12 @@ actor LLMEngine {
currentModelID = nil
}

private static func applyNoThink(prompt: String, modelID: String?) -> String {
guard let id = modelID?.lowercased(), id.contains("qwen3") else { return prompt }
return "/no_think\n\(prompt)"
/// Qwen3-family chat templates read `enable_thinking` from the template
/// context — the official switch for suppressing `<think>` blocks. The old
/// `/no_think` soft prefix is ignored by Qwen3.5 and only added prompt noise.
static func chatTemplateContext(modelID: String?) -> [String: any Sendable]? {
guard let id = modelID?.lowercased(), id.contains("qwen3") else { return nil }
return ["enable_thinking": false]
}

static func modelConfiguration(for id: String) -> ModelConfiguration {
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
55 changes: 35 additions & 20 deletions Sources/App/VoicePipeline+EditCommands.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,16 +83,12 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.replacing")

Log.sensitive("[VoicePipeline] voice edit replace \(replacementText.count) chars")
let result = await textInserter.replaceRecentInsertion(text: replacementText, targetApp: targetApp)

InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
let result = await textInserter.replaceRecentInsertion(
text: replacementText,
previouslyInserted: appState.lastInsertedText,
targetApp: targetApp
)

appState.lastInsertedText = replacementText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -101,7 +97,16 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit replacement probably failed: \(reason)")
TextInserter.copyToClipboard(replacementText)
showInsertionFailedAlert(text: replacementText, reason: reason)
return
}

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

private func replaceSelectedText(
Expand All@@ -126,14 +131,6 @@ extension VoicePipeline {
Log.sensitive("[VoicePipeline] voice edit replace selection \(replacementText.count) chars")
let result = await textInserter.replaceSelectedText(text: replacementText, targetApp: targetApp)

InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
)

appState.lastInsertedText = replacementText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -142,7 +139,16 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit selection replacement probably failed: \(reason)")
TextInserter.copyToClipboard(replacementText)
showInsertionFailedAlert(text: replacementText, reason: reason)
return
}

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

private func replacementInputContext(
Expand DownExpand Up@@ -203,7 +209,10 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.undoing")

Log.info("[VoicePipeline] voice edit undo last insertion")
let result = await textInserter.undoRecentInsertion(targetApp: targetApp)
let result = await textInserter.undoRecentInsertion(
previouslyInserted: appState.lastInsertedText,
targetApp: targetApp
)

if case .probablyFailed(let reason) = result {
Log.info("[VoicePipeline] voice edit undo probably failed: \(reason)")
Expand DownExpand Up@@ -267,9 +276,6 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.replacing")

let result = await textInserter.replaceSelectedText(text: rewrittenText, targetApp: targetApp)
InputHistory.shared.addRecord(rawText: raw, processedText: rewrittenText, wasProcessed: true, context: context)

appState.lastInsertedText = rewrittenText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -278,6 +284,15 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit selection rewrite probably failed: \(reason)")
TextInserter.copyToClipboard(rewrittenText)
showInsertionFailedAlert(text: rewrittenText, reason: reason)
return
}

InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
}
}
8 changes: 6 additions & 2 deletions Sources/App/VoicePipeline+Models.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,13 +120,15 @@ extension VoicePipeline {
markSpeechModelDownloadRequired(showInStatus: requestPermission)
return
}
qwenSpeechEngine = LocalASREngine(configuration: LocalASRConfiguration(
let engine = LocalASREngine(configuration: LocalASRConfiguration(
provider: .qwen3,
pythonPath: settings.localASRPythonPath,
modelPath: catalog.asrModelPath(for: settings.qwenASRModel),
tokenizerPath: "",
repoPath: ""
))
qwenSpeechEngine = engine
Task { await engine.prepare() }
case .mimo:
let settings = appState.settings
let catalog = ModelCatalog.shared
Expand All@@ -135,13 +137,15 @@ extension VoicePipeline {
markSpeechModelDownloadRequired(showInStatus: requestPermission)
return
}
mimoSpeechEngine = LocalASREngine(configuration: LocalASRConfiguration(
let engine = LocalASREngine(configuration: LocalASRConfiguration(
provider: .mimo,
pythonPath: settings.localASRPythonPath,
modelPath: catalog.asrModelPath(for: settings.mimoASRModel),
tokenizerPath: catalog.mimoTokenizerPath(),
repoPath: catalog.mimoRepositoryPath()
))
mimoSpeechEngine = engine
Task { await engine.prepare() }
}
}

Expand Down
19 changes: 10 additions & 9 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -219,15 +219,6 @@ extension VoicePipeline {
let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VoicePipeline] insert stage finished in \(String(format: "%.2f", elapsed))s")

let wasProcessed = settings.outputMode == .processed || settings.outputMode == .command
InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
wasProcessed: wasProcessed,
context: output.context
)

appState.lastInsertedText = finalText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -236,7 +227,17 @@ extension VoicePipeline {
Log.info("[VoicePipeline] insertion probably failed: \(reason)")
TextInserter.copyToClipboard(finalText)
showInsertionFailedAlert(text: finalText, reason: reason)
return
}

let wasProcessed = settings.outputMode == .processed || settings.outputMode == .command
InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
wasProcessed: wasProcessed,
context: output.context
)
appState.lastInsertedText = finalText
}
}

Expand Down
11 changes: 9 additions & 2 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,8 +61,6 @@ extension VoicePipeline {
let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VoicePipeline] instant insert stage finished in \(String(format: "%.2f", elapsed))s")

InputHistory.shared.addRecord(rawText: raw, processedText: quickText, wasProcessed: false, context: quickContext)
appState.lastInsertedText = quickText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -74,6 +72,14 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
rawText: raw,
processedText: quickText,
wasProcessed: false,
context: quickContext
)
appState.lastInsertedText = quickText

let replacement = DeferredReplacement(
rawText: raw,
insertedText: quickText,
Expand DownExpand Up@@ -108,6 +114,7 @@ extension VoicePipeline {

let result = await textInserter.replaceRecentInsertion(
text: formattedText,
previouslyInserted: replacement.insertedText,
targetApp: targetApp
)

Expand Down
18 changes: 14 additions & 4 deletions Sources/App/VoicePipeline+RewriteLast.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,10 +51,11 @@ extension VoicePipeline {
appState.phase = .inserting
appState.statusMessage = L("pipeline.replacing")

let result = await textInserter.replaceRecentInsertion(text: rewrittenText, targetApp: targetApp)
InputHistory.shared.addRecord(rawText: raw, processedText: rewrittenText, wasProcessed: true, context: context)

appState.lastInsertedText = rewrittenText
let result = await textInserter.replaceRecentInsertion(
text: rewrittenText,
previouslyInserted: appState.lastInsertedText,
targetApp: targetApp
)
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -63,6 +64,15 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit last insertion rewrite probably failed: \(reason)")
TextInserter.copyToClipboard(rewrittenText)
showInsertionFailedAlert(text: rewrittenText, reason: reason)
return
}

InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
}
}
5 changes: 5 additions & 0 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,11 @@ final class VoicePipeline {
return
}

// Warm the engine while the user is still speaking (no-op if already warm).
if let engine = currentEngine {
Task { await engine.prepare() }
}

clearInFlightWork()

appState.reset()
Expand Down
31 changes: 20 additions & 11 deletions Sources/LLM/LLMEngine.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,10 +65,14 @@ actor LLMEngine {

let t0 = CFAbsoluteTimeGetCurrent()

let effectivePrompt = Self.applyNoThink(prompt: prompt, modelID: currentModelID)
let params = GenerateParameters(maxTokens: maxTokens, temperature: Float(temperature))
let session = ChatSession(container, instructions: systemPrompt, generateParameters: params)
let result = try await session.respond(to: effectivePrompt)
let session = ChatSession(
container,
instructions: systemPrompt,
generateParameters: params,
additionalContext: Self.chatTemplateContext(modelID: currentModelID)
)
let result = try await session.respond(to: prompt)

let elapsed = CFAbsoluteTimeGetCurrent() - t0
Log.info("[LLMEngine] generated \(result.count) chars in \(String(format: "%.1f", elapsed))s")
Expand All@@ -89,10 +93,7 @@ actor LLMEngine {

guard let container else { throw LLMError.modelNotLoaded }

let testPrompt = Self.applyNoThink(
prompt: "将以下口述内容整理为书面文字:嗯那个就是我觉得我们首先应该把这个方案重新梳理一下然后呢第二个就是要确认一下时间节点第三呢就是把预算也算一下",
modelID: modelID
)
let testPrompt = "将以下口述内容整理为书面文字:嗯那个就是我觉得我们首先应该把这个方案重新梳理一下然后呢第二个就是要确认一下时间节点第三呢就是把预算也算一下"
let systemPrompt = "你是语音转文字后处理引擎。直接输出整理后的文本,不要任何解释。"
let params = GenerateParameters(maxTokens: 256, temperature: 0.3)
let genT0 = CFAbsoluteTimeGetCurrent()
Expand All@@ -101,7 +102,12 @@ actor LLMEngine {
["role": "system", "content": systemPrompt],
["role": "user", "content": testPrompt],
]
let lmInput = try await container.prepare(input: .init(messages: messages))
let lmInput = try await container.prepare(
input: .init(
messages: messages,
additionalContext: Self.chatTemplateContext(modelID: modelID)
)
)
let stream = try await container.generate(input: lmInput, parameters: params)

var tokenCount = 0
Expand DownExpand Up@@ -131,9 +137,12 @@ actor LLMEngine {
currentModelID = nil
}

private static func applyNoThink(prompt: String, modelID: String?) -> String {
guard let id = modelID?.lowercased(), id.contains("qwen3") else { return prompt }
return "/no_think\n\(prompt)"
/// Qwen3-family chat templates read `enable_thinking` from the template
/// context — the official switch for suppressing `<think>` blocks. The old
/// `/no_think` soft prefix is ignored by Qwen3.5 and only added prompt noise.
static func chatTemplateContext(modelID: String?) -> [String: any Sendable]? {
guard let id = modelID?.lowercased(), id.contains("qwen3") else { return nil }
return ["enable_thinking": false]
}

static func modelConfiguration(for id: String) -> ModelConfiguration {
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
55 changes: 35 additions & 20 deletions Sources/App/VoicePipeline+EditCommands.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,16 +83,12 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.replacing")

Log.sensitive("[VoicePipeline] voice edit replace \(replacementText.count) chars")
let result = await textInserter.replaceRecentInsertion(text: replacementText, targetApp: targetApp)

InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
let result = await textInserter.replaceRecentInsertion(
text: replacementText,
previouslyInserted: appState.lastInsertedText,
targetApp: targetApp
)

appState.lastInsertedText = replacementText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -101,7 +97,16 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit replacement probably failed: \(reason)")
TextInserter.copyToClipboard(replacementText)
showInsertionFailedAlert(text: replacementText, reason: reason)
return
}

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

private func replaceSelectedText(
Expand All@@ -126,14 +131,6 @@ extension VoicePipeline {
Log.sensitive("[VoicePipeline] voice edit replace selection \(replacementText.count) chars")
let result = await textInserter.replaceSelectedText(text: replacementText, targetApp: targetApp)

InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
)

appState.lastInsertedText = replacementText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -142,7 +139,16 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit selection replacement probably failed: \(reason)")
TextInserter.copyToClipboard(replacementText)
showInsertionFailedAlert(text: replacementText, reason: reason)
return
}

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

private func replacementInputContext(
Expand DownExpand Up@@ -203,7 +209,10 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.undoing")

Log.info("[VoicePipeline] voice edit undo last insertion")
let result = await textInserter.undoRecentInsertion(targetApp: targetApp)
let result = await textInserter.undoRecentInsertion(
previouslyInserted: appState.lastInsertedText,
targetApp: targetApp
)

if case .probablyFailed(let reason) = result {
Log.info("[VoicePipeline] voice edit undo probably failed: \(reason)")
Expand DownExpand Up@@ -267,9 +276,6 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.replacing")

let result = await textInserter.replaceSelectedText(text: rewrittenText, targetApp: targetApp)
InputHistory.shared.addRecord(rawText: raw, processedText: rewrittenText, wasProcessed: true, context: context)

appState.lastInsertedText = rewrittenText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -278,6 +284,15 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit selection rewrite probably failed: \(reason)")
TextInserter.copyToClipboard(rewrittenText)
showInsertionFailedAlert(text: rewrittenText, reason: reason)
return
}

InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
}
}
8 changes: 6 additions & 2 deletions Sources/App/VoicePipeline+Models.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,13 +120,15 @@ extension VoicePipeline {
markSpeechModelDownloadRequired(showInStatus: requestPermission)
return
}
qwenSpeechEngine = LocalASREngine(configuration: LocalASRConfiguration(
let engine = LocalASREngine(configuration: LocalASRConfiguration(
provider: .qwen3,
pythonPath: settings.localASRPythonPath,
modelPath: catalog.asrModelPath(for: settings.qwenASRModel),
tokenizerPath: "",
repoPath: ""
))
qwenSpeechEngine = engine
Task { await engine.prepare() }
case .mimo:
let settings = appState.settings
let catalog = ModelCatalog.shared
Expand All@@ -135,13 +137,15 @@ extension VoicePipeline {
markSpeechModelDownloadRequired(showInStatus: requestPermission)
return
}
mimoSpeechEngine = LocalASREngine(configuration: LocalASRConfiguration(
let engine = LocalASREngine(configuration: LocalASRConfiguration(
provider: .mimo,
pythonPath: settings.localASRPythonPath,
modelPath: catalog.asrModelPath(for: settings.mimoASRModel),
tokenizerPath: catalog.mimoTokenizerPath(),
repoPath: catalog.mimoRepositoryPath()
))
mimoSpeechEngine = engine
Task { await engine.prepare() }
}
}

Expand Down
19 changes: 10 additions & 9 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -219,15 +219,6 @@ extension VoicePipeline {
let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VoicePipeline] insert stage finished in \(String(format: "%.2f", elapsed))s")

let wasProcessed = settings.outputMode == .processed || settings.outputMode == .command
InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
wasProcessed: wasProcessed,
context: output.context
)

appState.lastInsertedText = finalText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -236,7 +227,17 @@ extension VoicePipeline {
Log.info("[VoicePipeline] insertion probably failed: \(reason)")
TextInserter.copyToClipboard(finalText)
showInsertionFailedAlert(text: finalText, reason: reason)
return
}

let wasProcessed = settings.outputMode == .processed || settings.outputMode == .command
InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
wasProcessed: wasProcessed,
context: output.context
)
appState.lastInsertedText = finalText
}
}

Expand Down
11 changes: 9 additions & 2 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,8 +61,6 @@ extension VoicePipeline {
let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VoicePipeline] instant insert stage finished in \(String(format: "%.2f", elapsed))s")

InputHistory.shared.addRecord(rawText: raw, processedText: quickText, wasProcessed: false, context: quickContext)
appState.lastInsertedText = quickText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -74,6 +72,14 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
rawText: raw,
processedText: quickText,
wasProcessed: false,
context: quickContext
)
appState.lastInsertedText = quickText

let replacement = DeferredReplacement(
rawText: raw,
insertedText: quickText,
Expand DownExpand Up@@ -108,6 +114,7 @@ extension VoicePipeline {

let result = await textInserter.replaceRecentInsertion(
text: formattedText,
previouslyInserted: replacement.insertedText,
targetApp: targetApp
)

Expand Down
18 changes: 14 additions & 4 deletions Sources/App/VoicePipeline+RewriteLast.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,10 +51,11 @@ extension VoicePipeline {
appState.phase = .inserting
appState.statusMessage = L("pipeline.replacing")

let result = await textInserter.replaceRecentInsertion(text: rewrittenText, targetApp: targetApp)
InputHistory.shared.addRecord(rawText: raw, processedText: rewrittenText, wasProcessed: true, context: context)

appState.lastInsertedText = rewrittenText
let result = await textInserter.replaceRecentInsertion(
text: rewrittenText,
previouslyInserted: appState.lastInsertedText,
targetApp: targetApp
)
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -63,6 +64,15 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit last insertion rewrite probably failed: \(reason)")
TextInserter.copyToClipboard(rewrittenText)
showInsertionFailedAlert(text: rewrittenText, reason: reason)
return
}

InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
}
}
5 changes: 5 additions & 0 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,11 @@ final class VoicePipeline {
return
}

// Warm the engine while the user is still speaking (no-op if already warm).
if let engine = currentEngine {
Task { await engine.prepare() }
}

clearInFlightWork()

appState.reset()
Expand Down
31 changes: 20 additions & 11 deletions Sources/LLM/LLMEngine.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,10 +65,14 @@ actor LLMEngine {

let t0 = CFAbsoluteTimeGetCurrent()

let effectivePrompt = Self.applyNoThink(prompt: prompt, modelID: currentModelID)
let params = GenerateParameters(maxTokens: maxTokens, temperature: Float(temperature))
let session = ChatSession(container, instructions: systemPrompt, generateParameters: params)
let result = try await session.respond(to: effectivePrompt)
let session = ChatSession(
container,
instructions: systemPrompt,
generateParameters: params,
additionalContext: Self.chatTemplateContext(modelID: currentModelID)
)
let result = try await session.respond(to: prompt)

let elapsed = CFAbsoluteTimeGetCurrent() - t0
Log.info("[LLMEngine] generated \(result.count) chars in \(String(format: "%.1f", elapsed))s")
Expand All@@ -89,10 +93,7 @@ actor LLMEngine {

guard let container else { throw LLMError.modelNotLoaded }

let testPrompt = Self.applyNoThink(
prompt: "将以下口述内容整理为书面文字:嗯那个就是我觉得我们首先应该把这个方案重新梳理一下然后呢第二个就是要确认一下时间节点第三呢就是把预算也算一下",
modelID: modelID
)
let testPrompt = "将以下口述内容整理为书面文字:嗯那个就是我觉得我们首先应该把这个方案重新梳理一下然后呢第二个就是要确认一下时间节点第三呢就是把预算也算一下"
let systemPrompt = "你是语音转文字后处理引擎。直接输出整理后的文本,不要任何解释。"
let params = GenerateParameters(maxTokens: 256, temperature: 0.3)
let genT0 = CFAbsoluteTimeGetCurrent()
Expand All@@ -101,7 +102,12 @@ actor LLMEngine {
["role": "system", "content": systemPrompt],
["role": "user", "content": testPrompt],
]
let lmInput = try await container.prepare(input: .init(messages: messages))
let lmInput = try await container.prepare(
input: .init(
messages: messages,
additionalContext: Self.chatTemplateContext(modelID: modelID)
)
)
let stream = try await container.generate(input: lmInput, parameters: params)

var tokenCount = 0
Expand DownExpand Up@@ -131,9 +137,12 @@ actor LLMEngine {
currentModelID = nil
}

private static func applyNoThink(prompt: String, modelID: String?) -> String {
guard let id = modelID?.lowercased(), id.contains("qwen3") else { return prompt }
return "/no_think\n\(prompt)"
/// Qwen3-family chat templates read `enable_thinking` from the template
/// context — the official switch for suppressing `<think>` blocks. The old
/// `/no_think` soft prefix is ignored by Qwen3.5 and only added prompt noise.
static func chatTemplateContext(modelID: String?) -> [String: any Sendable]? {
guard let id = modelID?.lowercased(), id.contains("qwen3") else { return nil }
return ["enable_thinking": false]
}

static func modelConfiguration(for id: String) -> ModelConfiguration {
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
55 changes: 35 additions & 20 deletions Sources/App/VoicePipeline+EditCommands.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,16 +83,12 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.replacing")

Log.sensitive("[VoicePipeline] voice edit replace \(replacementText.count) chars")
let result = await textInserter.replaceRecentInsertion(text: replacementText, targetApp: targetApp)

InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
let result = await textInserter.replaceRecentInsertion(
text: replacementText,
previouslyInserted: appState.lastInsertedText,
targetApp: targetApp
)

appState.lastInsertedText = replacementText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -101,7 +97,16 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit replacement probably failed: \(reason)")
TextInserter.copyToClipboard(replacementText)
showInsertionFailedAlert(text: replacementText, reason: reason)
return
}

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

private func replaceSelectedText(
Expand All@@ -126,14 +131,6 @@ extension VoicePipeline {
Log.sensitive("[VoicePipeline] voice edit replace selection \(replacementText.count) chars")
let result = await textInserter.replaceSelectedText(text: replacementText, targetApp: targetApp)

InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
)

appState.lastInsertedText = replacementText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -142,7 +139,16 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit selection replacement probably failed: \(reason)")
TextInserter.copyToClipboard(replacementText)
showInsertionFailedAlert(text: replacementText, reason: reason)
return
}

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

private func replacementInputContext(
Expand DownExpand Up@@ -203,7 +209,10 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.undoing")

Log.info("[VoicePipeline] voice edit undo last insertion")
let result = await textInserter.undoRecentInsertion(targetApp: targetApp)
let result = await textInserter.undoRecentInsertion(
previouslyInserted: appState.lastInsertedText,
targetApp: targetApp
)

if case .probablyFailed(let reason) = result {
Log.info("[VoicePipeline] voice edit undo probably failed: \(reason)")
Expand DownExpand Up@@ -267,9 +276,6 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.replacing")

let result = await textInserter.replaceSelectedText(text: rewrittenText, targetApp: targetApp)
InputHistory.shared.addRecord(rawText: raw, processedText: rewrittenText, wasProcessed: true, context: context)

appState.lastInsertedText = rewrittenText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -278,6 +284,15 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit selection rewrite probably failed: \(reason)")
TextInserter.copyToClipboard(rewrittenText)
showInsertionFailedAlert(text: rewrittenText, reason: reason)
return
}

InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
}
}
8 changes: 6 additions & 2 deletions Sources/App/VoicePipeline+Models.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,13 +120,15 @@ extension VoicePipeline {
markSpeechModelDownloadRequired(showInStatus: requestPermission)
return
}
qwenSpeechEngine = LocalASREngine(configuration: LocalASRConfiguration(
let engine = LocalASREngine(configuration: LocalASRConfiguration(
provider: .qwen3,
pythonPath: settings.localASRPythonPath,
modelPath: catalog.asrModelPath(for: settings.qwenASRModel),
tokenizerPath: "",
repoPath: ""
))
qwenSpeechEngine = engine
Task { await engine.prepare() }
case .mimo:
let settings = appState.settings
let catalog = ModelCatalog.shared
Expand All@@ -135,13 +137,15 @@ extension VoicePipeline {
markSpeechModelDownloadRequired(showInStatus: requestPermission)
return
}
mimoSpeechEngine = LocalASREngine(configuration: LocalASRConfiguration(
let engine = LocalASREngine(configuration: LocalASRConfiguration(
provider: .mimo,
pythonPath: settings.localASRPythonPath,
modelPath: catalog.asrModelPath(for: settings.mimoASRModel),
tokenizerPath: catalog.mimoTokenizerPath(),
repoPath: catalog.mimoRepositoryPath()
))
mimoSpeechEngine = engine
Task { await engine.prepare() }
}
}

Expand Down
19 changes: 10 additions & 9 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -219,15 +219,6 @@ extension VoicePipeline {
let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VoicePipeline] insert stage finished in \(String(format: "%.2f", elapsed))s")

let wasProcessed = settings.outputMode == .processed || settings.outputMode == .command
InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
wasProcessed: wasProcessed,
context: output.context
)

appState.lastInsertedText = finalText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -236,7 +227,17 @@ extension VoicePipeline {
Log.info("[VoicePipeline] insertion probably failed: \(reason)")
TextInserter.copyToClipboard(finalText)
showInsertionFailedAlert(text: finalText, reason: reason)
return
}

let wasProcessed = settings.outputMode == .processed || settings.outputMode == .command
InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
wasProcessed: wasProcessed,
context: output.context
)
appState.lastInsertedText = finalText
}
}

Expand Down
11 changes: 9 additions & 2 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,8 +61,6 @@ extension VoicePipeline {
let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VoicePipeline] instant insert stage finished in \(String(format: "%.2f", elapsed))s")

InputHistory.shared.addRecord(rawText: raw, processedText: quickText, wasProcessed: false, context: quickContext)
appState.lastInsertedText = quickText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -74,6 +72,14 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
rawText: raw,
processedText: quickText,
wasProcessed: false,
context: quickContext
)
appState.lastInsertedText = quickText

let replacement = DeferredReplacement(
rawText: raw,
insertedText: quickText,
Expand DownExpand Up@@ -108,6 +114,7 @@ extension VoicePipeline {

let result = await textInserter.replaceRecentInsertion(
text: formattedText,
previouslyInserted: replacement.insertedText,
targetApp: targetApp
)

Expand Down
18 changes: 14 additions & 4 deletions Sources/App/VoicePipeline+RewriteLast.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,10 +51,11 @@ extension VoicePipeline {
appState.phase = .inserting
appState.statusMessage = L("pipeline.replacing")

let result = await textInserter.replaceRecentInsertion(text: rewrittenText, targetApp: targetApp)
InputHistory.shared.addRecord(rawText: raw, processedText: rewrittenText, wasProcessed: true, context: context)

appState.lastInsertedText = rewrittenText
let result = await textInserter.replaceRecentInsertion(
text: rewrittenText,
previouslyInserted: appState.lastInsertedText,
targetApp: targetApp
)
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -63,6 +64,15 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit last insertion rewrite probably failed: \(reason)")
TextInserter.copyToClipboard(rewrittenText)
showInsertionFailedAlert(text: rewrittenText, reason: reason)
return
}

InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
}
}
5 changes: 5 additions & 0 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,11 @@ final class VoicePipeline {
return
}

// Warm the engine while the user is still speaking (no-op if already warm).
if let engine = currentEngine {
Task { await engine.prepare() }
}

clearInFlightWork()

appState.reset()
Expand Down
31 changes: 20 additions & 11 deletions Sources/LLM/LLMEngine.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,10 +65,14 @@ actor LLMEngine {

let t0 = CFAbsoluteTimeGetCurrent()

let effectivePrompt = Self.applyNoThink(prompt: prompt, modelID: currentModelID)
let params = GenerateParameters(maxTokens: maxTokens, temperature: Float(temperature))
let session = ChatSession(container, instructions: systemPrompt, generateParameters: params)
let result = try await session.respond(to: effectivePrompt)
let session = ChatSession(
container,
instructions: systemPrompt,
generateParameters: params,
additionalContext: Self.chatTemplateContext(modelID: currentModelID)
)
let result = try await session.respond(to: prompt)

let elapsed = CFAbsoluteTimeGetCurrent() - t0
Log.info("[LLMEngine] generated \(result.count) chars in \(String(format: "%.1f", elapsed))s")
Expand All@@ -89,10 +93,7 @@ actor LLMEngine {

guard let container else { throw LLMError.modelNotLoaded }

let testPrompt = Self.applyNoThink(
prompt: "将以下口述内容整理为书面文字:嗯那个就是我觉得我们首先应该把这个方案重新梳理一下然后呢第二个就是要确认一下时间节点第三呢就是把预算也算一下",
modelID: modelID
)
let testPrompt = "将以下口述内容整理为书面文字:嗯那个就是我觉得我们首先应该把这个方案重新梳理一下然后呢第二个就是要确认一下时间节点第三呢就是把预算也算一下"
let systemPrompt = "你是语音转文字后处理引擎。直接输出整理后的文本,不要任何解释。"
let params = GenerateParameters(maxTokens: 256, temperature: 0.3)
let genT0 = CFAbsoluteTimeGetCurrent()
Expand All@@ -101,7 +102,12 @@ actor LLMEngine {
["role": "system", "content": systemPrompt],
["role": "user", "content": testPrompt],
]
let lmInput = try await container.prepare(input: .init(messages: messages))
let lmInput = try await container.prepare(
input: .init(
messages: messages,
additionalContext: Self.chatTemplateContext(modelID: modelID)
)
)
let stream = try await container.generate(input: lmInput, parameters: params)

var tokenCount = 0
Expand DownExpand Up@@ -131,9 +137,12 @@ actor LLMEngine {
currentModelID = nil
}

private static func applyNoThink(prompt: String, modelID: String?) -> String {
guard let id = modelID?.lowercased(), id.contains("qwen3") else { return prompt }
return "/no_think\n\(prompt)"
/// Qwen3-family chat templates read `enable_thinking` from the template
/// context — the official switch for suppressing `<think>` blocks. The old
/// `/no_think` soft prefix is ignored by Qwen3.5 and only added prompt noise.
static func chatTemplateContext(modelID: String?) -> [String: any Sendable]? {
guard let id = modelID?.lowercased(), id.contains("qwen3") else { return nil }
return ["enable_thinking": false]
}

static func modelConfiguration(for id: String) -> ModelConfiguration {
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
55 changes: 35 additions & 20 deletions Sources/App/VoicePipeline+EditCommands.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,16 +83,12 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.replacing")

Log.sensitive("[VoicePipeline] voice edit replace \(replacementText.count) chars")
let result = await textInserter.replaceRecentInsertion(text: replacementText, targetApp: targetApp)

InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
let result = await textInserter.replaceRecentInsertion(
text: replacementText,
previouslyInserted: appState.lastInsertedText,
targetApp: targetApp
)

appState.lastInsertedText = replacementText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -101,7 +97,16 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit replacement probably failed: \(reason)")
TextInserter.copyToClipboard(replacementText)
showInsertionFailedAlert(text: replacementText, reason: reason)
return
}

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

private func replaceSelectedText(
Expand All@@ -126,14 +131,6 @@ extension VoicePipeline {
Log.sensitive("[VoicePipeline] voice edit replace selection \(replacementText.count) chars")
let result = await textInserter.replaceSelectedText(text: replacementText, targetApp: targetApp)

InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
)

appState.lastInsertedText = replacementText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -142,7 +139,16 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit selection replacement probably failed: \(reason)")
TextInserter.copyToClipboard(replacementText)
showInsertionFailedAlert(text: replacementText, reason: reason)
return
}

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

private func replacementInputContext(
Expand DownExpand Up@@ -203,7 +209,10 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.undoing")

Log.info("[VoicePipeline] voice edit undo last insertion")
let result = await textInserter.undoRecentInsertion(targetApp: targetApp)
let result = await textInserter.undoRecentInsertion(
previouslyInserted: appState.lastInsertedText,
targetApp: targetApp
)

if case .probablyFailed(let reason) = result {
Log.info("[VoicePipeline] voice edit undo probably failed: \(reason)")
Expand DownExpand Up@@ -267,9 +276,6 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.replacing")

let result = await textInserter.replaceSelectedText(text: rewrittenText, targetApp: targetApp)
InputHistory.shared.addRecord(rawText: raw, processedText: rewrittenText, wasProcessed: true, context: context)

appState.lastInsertedText = rewrittenText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -278,6 +284,15 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit selection rewrite probably failed: \(reason)")
TextInserter.copyToClipboard(rewrittenText)
showInsertionFailedAlert(text: rewrittenText, reason: reason)
return
}

InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
}
}
8 changes: 6 additions & 2 deletions Sources/App/VoicePipeline+Models.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,13 +120,15 @@ extension VoicePipeline {
markSpeechModelDownloadRequired(showInStatus: requestPermission)
return
}
qwenSpeechEngine = LocalASREngine(configuration: LocalASRConfiguration(
let engine = LocalASREngine(configuration: LocalASRConfiguration(
provider: .qwen3,
pythonPath: settings.localASRPythonPath,
modelPath: catalog.asrModelPath(for: settings.qwenASRModel),
tokenizerPath: "",
repoPath: ""
))
qwenSpeechEngine = engine
Task { await engine.prepare() }
case .mimo:
let settings = appState.settings
let catalog = ModelCatalog.shared
Expand All@@ -135,13 +137,15 @@ extension VoicePipeline {
markSpeechModelDownloadRequired(showInStatus: requestPermission)
return
}
mimoSpeechEngine = LocalASREngine(configuration: LocalASRConfiguration(
let engine = LocalASREngine(configuration: LocalASRConfiguration(
provider: .mimo,
pythonPath: settings.localASRPythonPath,
modelPath: catalog.asrModelPath(for: settings.mimoASRModel),
tokenizerPath: catalog.mimoTokenizerPath(),
repoPath: catalog.mimoRepositoryPath()
))
mimoSpeechEngine = engine
Task { await engine.prepare() }
}
}

Expand Down
19 changes: 10 additions & 9 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -219,15 +219,6 @@ extension VoicePipeline {
let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VoicePipeline] insert stage finished in \(String(format: "%.2f", elapsed))s")

let wasProcessed = settings.outputMode == .processed || settings.outputMode == .command
InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
wasProcessed: wasProcessed,
context: output.context
)

appState.lastInsertedText = finalText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -236,7 +227,17 @@ extension VoicePipeline {
Log.info("[VoicePipeline] insertion probably failed: \(reason)")
TextInserter.copyToClipboard(finalText)
showInsertionFailedAlert(text: finalText, reason: reason)
return
}

let wasProcessed = settings.outputMode == .processed || settings.outputMode == .command
InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
wasProcessed: wasProcessed,
context: output.context
)
appState.lastInsertedText = finalText
}
}

Expand Down
11 changes: 9 additions & 2 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,8 +61,6 @@ extension VoicePipeline {
let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VoicePipeline] instant insert stage finished in \(String(format: "%.2f", elapsed))s")

InputHistory.shared.addRecord(rawText: raw, processedText: quickText, wasProcessed: false, context: quickContext)
appState.lastInsertedText = quickText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -74,6 +72,14 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
rawText: raw,
processedText: quickText,
wasProcessed: false,
context: quickContext
)
appState.lastInsertedText = quickText

let replacement = DeferredReplacement(
rawText: raw,
insertedText: quickText,
Expand DownExpand Up@@ -108,6 +114,7 @@ extension VoicePipeline {

let result = await textInserter.replaceRecentInsertion(
text: formattedText,
previouslyInserted: replacement.insertedText,
targetApp: targetApp
)

Expand Down
18 changes: 14 additions & 4 deletions Sources/App/VoicePipeline+RewriteLast.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,10 +51,11 @@ extension VoicePipeline {
appState.phase = .inserting
appState.statusMessage = L("pipeline.replacing")

let result = await textInserter.replaceRecentInsertion(text: rewrittenText, targetApp: targetApp)
InputHistory.shared.addRecord(rawText: raw, processedText: rewrittenText, wasProcessed: true, context: context)

appState.lastInsertedText = rewrittenText
let result = await textInserter.replaceRecentInsertion(
text: rewrittenText,
previouslyInserted: appState.lastInsertedText,
targetApp: targetApp
)
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -63,6 +64,15 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit last insertion rewrite probably failed: \(reason)")
TextInserter.copyToClipboard(rewrittenText)
showInsertionFailedAlert(text: rewrittenText, reason: reason)
return
}

InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
}
}
5 changes: 5 additions & 0 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,11 @@ final class VoicePipeline {
return
}

// Warm the engine while the user is still speaking (no-op if already warm).
if let engine = currentEngine {
Task { await engine.prepare() }
}

clearInFlightWork()

appState.reset()
Expand Down
31 changes: 20 additions & 11 deletions Sources/LLM/LLMEngine.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,10 +65,14 @@ actor LLMEngine {

let t0 = CFAbsoluteTimeGetCurrent()

let effectivePrompt = Self.applyNoThink(prompt: prompt, modelID: currentModelID)
let params = GenerateParameters(maxTokens: maxTokens, temperature: Float(temperature))
let session = ChatSession(container, instructions: systemPrompt, generateParameters: params)
let result = try await session.respond(to: effectivePrompt)
let session = ChatSession(
container,
instructions: systemPrompt,
generateParameters: params,
additionalContext: Self.chatTemplateContext(modelID: currentModelID)
)
let result = try await session.respond(to: prompt)

let elapsed = CFAbsoluteTimeGetCurrent() - t0
Log.info("[LLMEngine] generated \(result.count) chars in \(String(format: "%.1f", elapsed))s")
Expand All@@ -89,10 +93,7 @@ actor LLMEngine {

guard let container else { throw LLMError.modelNotLoaded }

let testPrompt = Self.applyNoThink(
prompt: "将以下口述内容整理为书面文字:嗯那个就是我觉得我们首先应该把这个方案重新梳理一下然后呢第二个就是要确认一下时间节点第三呢就是把预算也算一下",
modelID: modelID
)
let testPrompt = "将以下口述内容整理为书面文字:嗯那个就是我觉得我们首先应该把这个方案重新梳理一下然后呢第二个就是要确认一下时间节点第三呢就是把预算也算一下"
let systemPrompt = "你是语音转文字后处理引擎。直接输出整理后的文本,不要任何解释。"
let params = GenerateParameters(maxTokens: 256, temperature: 0.3)
let genT0 = CFAbsoluteTimeGetCurrent()
Expand All@@ -101,7 +102,12 @@ actor LLMEngine {
["role": "system", "content": systemPrompt],
["role": "user", "content": testPrompt],
]
let lmInput = try await container.prepare(input: .init(messages: messages))
let lmInput = try await container.prepare(
input: .init(
messages: messages,
additionalContext: Self.chatTemplateContext(modelID: modelID)
)
)
let stream = try await container.generate(input: lmInput, parameters: params)

var tokenCount = 0
Expand DownExpand Up@@ -131,9 +137,12 @@ actor LLMEngine {
currentModelID = nil
}

private static func applyNoThink(prompt: String, modelID: String?) -> String {
guard let id = modelID?.lowercased(), id.contains("qwen3") else { return prompt }
return "/no_think\n\(prompt)"
/// Qwen3-family chat templates read `enable_thinking` from the template
/// context — the official switch for suppressing `<think>` blocks. The old
/// `/no_think` soft prefix is ignored by Qwen3.5 and only added prompt noise.
static func chatTemplateContext(modelID: String?) -> [String: any Sendable]? {
guard let id = modelID?.lowercased(), id.contains("qwen3") else { return nil }
return ["enable_thinking": false]
}

static func modelConfiguration(for id: String) -> ModelConfiguration {
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
55 changes: 35 additions & 20 deletions Sources/App/VoicePipeline+EditCommands.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,16 +83,12 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.replacing")

Log.sensitive("[VoicePipeline] voice edit replace \(replacementText.count) chars")
let result = await textInserter.replaceRecentInsertion(text: replacementText, targetApp: targetApp)

InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
let result = await textInserter.replaceRecentInsertion(
text: replacementText,
previouslyInserted: appState.lastInsertedText,
targetApp: targetApp
)

appState.lastInsertedText = replacementText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -101,7 +97,16 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit replacement probably failed: \(reason)")
TextInserter.copyToClipboard(replacementText)
showInsertionFailedAlert(text: replacementText, reason: reason)
return
}

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

private func replaceSelectedText(
Expand All@@ -126,14 +131,6 @@ extension VoicePipeline {
Log.sensitive("[VoicePipeline] voice edit replace selection \(replacementText.count) chars")
let result = await textInserter.replaceSelectedText(text: replacementText, targetApp: targetApp)

InputHistory.shared.addRecord(
rawText: raw,
processedText: replacementText,
wasProcessed: true,
context: context
)

appState.lastInsertedText = replacementText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -142,7 +139,16 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit selection replacement probably failed: \(reason)")
TextInserter.copyToClipboard(replacementText)
showInsertionFailedAlert(text: replacementText, reason: reason)
return
}

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

private func replacementInputContext(
Expand DownExpand Up@@ -203,7 +209,10 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.undoing")

Log.info("[VoicePipeline] voice edit undo last insertion")
let result = await textInserter.undoRecentInsertion(targetApp: targetApp)
let result = await textInserter.undoRecentInsertion(
previouslyInserted: appState.lastInsertedText,
targetApp: targetApp
)

if case .probablyFailed(let reason) = result {
Log.info("[VoicePipeline] voice edit undo probably failed: \(reason)")
Expand DownExpand Up@@ -267,9 +276,6 @@ extension VoicePipeline {
appState.statusMessage = L("pipeline.replacing")

let result = await textInserter.replaceSelectedText(text: rewrittenText, targetApp: targetApp)
InputHistory.shared.addRecord(rawText: raw, processedText: rewrittenText, wasProcessed: true, context: context)

appState.lastInsertedText = rewrittenText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -278,6 +284,15 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit selection rewrite probably failed: \(reason)")
TextInserter.copyToClipboard(rewrittenText)
showInsertionFailedAlert(text: rewrittenText, reason: reason)
return
}

InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
}
}
8 changes: 6 additions & 2 deletions Sources/App/VoicePipeline+Models.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,13 +120,15 @@ extension VoicePipeline {
markSpeechModelDownloadRequired(showInStatus: requestPermission)
return
}
qwenSpeechEngine = LocalASREngine(configuration: LocalASRConfiguration(
let engine = LocalASREngine(configuration: LocalASRConfiguration(
provider: .qwen3,
pythonPath: settings.localASRPythonPath,
modelPath: catalog.asrModelPath(for: settings.qwenASRModel),
tokenizerPath: "",
repoPath: ""
))
qwenSpeechEngine = engine
Task { await engine.prepare() }
case .mimo:
let settings = appState.settings
let catalog = ModelCatalog.shared
Expand All@@ -135,13 +137,15 @@ extension VoicePipeline {
markSpeechModelDownloadRequired(showInStatus: requestPermission)
return
}
mimoSpeechEngine = LocalASREngine(configuration: LocalASRConfiguration(
let engine = LocalASREngine(configuration: LocalASRConfiguration(
provider: .mimo,
pythonPath: settings.localASRPythonPath,
modelPath: catalog.asrModelPath(for: settings.mimoASRModel),
tokenizerPath: catalog.mimoTokenizerPath(),
repoPath: catalog.mimoRepositoryPath()
))
mimoSpeechEngine = engine
Task { await engine.prepare() }
}
}

Expand Down
19 changes: 10 additions & 9 deletions Sources/App/VoicePipeline+Processing.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -219,15 +219,6 @@ extension VoicePipeline {
let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VoicePipeline] insert stage finished in \(String(format: "%.2f", elapsed))s")

let wasProcessed = settings.outputMode == .processed || settings.outputMode == .command
InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
wasProcessed: wasProcessed,
context: output.context
)

appState.lastInsertedText = finalText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -236,7 +227,17 @@ extension VoicePipeline {
Log.info("[VoicePipeline] insertion probably failed: \(reason)")
TextInserter.copyToClipboard(finalText)
showInsertionFailedAlert(text: finalText, reason: reason)
return
}

let wasProcessed = settings.outputMode == .processed || settings.outputMode == .command
InputHistory.shared.addRecord(
rawText: raw,
processedText: finalText,
wasProcessed: wasProcessed,
context: output.context
)
appState.lastInsertedText = finalText
}
}

Expand Down
11 changes: 9 additions & 2 deletions Sources/App/VoicePipeline+Replacement.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,8 +61,6 @@ extension VoicePipeline {
let elapsed = CFAbsoluteTimeGetCurrent() - started
Log.info("[VoicePipeline] instant insert stage finished in \(String(format: "%.2f", elapsed))s")

InputHistory.shared.addRecord(rawText: raw, processedText: quickText, wasProcessed: false, context: quickContext)
appState.lastInsertedText = quickText
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -74,6 +72,14 @@ extension VoicePipeline {
return
}

InputHistory.shared.addRecord(
rawText: raw,
processedText: quickText,
wasProcessed: false,
context: quickContext
)
appState.lastInsertedText = quickText

let replacement = DeferredReplacement(
rawText: raw,
insertedText: quickText,
Expand DownExpand Up@@ -108,6 +114,7 @@ extension VoicePipeline {

let result = await textInserter.replaceRecentInsertion(
text: formattedText,
previouslyInserted: replacement.insertedText,
targetApp: targetApp
)

Expand Down
18 changes: 14 additions & 4 deletions Sources/App/VoicePipeline+RewriteLast.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,10 +51,11 @@ extension VoicePipeline {
appState.phase = .inserting
appState.statusMessage = L("pipeline.replacing")

let result = await textInserter.replaceRecentInsertion(text: rewrittenText, targetApp: targetApp)
InputHistory.shared.addRecord(rawText: raw, processedText: rewrittenText, wasProcessed: true, context: context)

appState.lastInsertedText = rewrittenText
let result = await textInserter.replaceRecentInsertion(
text: rewrittenText,
previouslyInserted: appState.lastInsertedText,
targetApp: targetApp
)
appState.phase = .done
appState.statusMessage = L("status.done")
hideOverlayAfterDelay()
Expand All@@ -63,6 +64,15 @@ extension VoicePipeline {
Log.info("[VoicePipeline] voice edit last insertion rewrite probably failed: \(reason)")
TextInserter.copyToClipboard(rewrittenText)
showInsertionFailedAlert(text: rewrittenText, reason: reason)
return
}

InputHistory.shared.addRecord(
rawText: raw,
processedText: rewrittenText,
wasProcessed: true,
context: context
)
appState.lastInsertedText = rewrittenText
}
}
5 changes: 5 additions & 0 deletions Sources/App/VoicePipeline.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,11 @@ final class VoicePipeline {
return
}

// Warm the engine while the user is still speaking (no-op if already warm).
if let engine = currentEngine {
Task { await engine.prepare() }
}

clearInFlightWork()

appState.reset()
Expand Down
31 changes: 20 additions & 11 deletions Sources/LLM/LLMEngine.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,10 +65,14 @@ actor LLMEngine {

let t0 = CFAbsoluteTimeGetCurrent()

let effectivePrompt = Self.applyNoThink(prompt: prompt, modelID: currentModelID)
let params = GenerateParameters(maxTokens: maxTokens, temperature: Float(temperature))
let session = ChatSession(container, instructions: systemPrompt, generateParameters: params)
let result = try await session.respond(to: effectivePrompt)
let session = ChatSession(
container,
instructions: systemPrompt,
generateParameters: params,
additionalContext: Self.chatTemplateContext(modelID: currentModelID)
)
let result = try await session.respond(to: prompt)

let elapsed = CFAbsoluteTimeGetCurrent() - t0
Log.info("[LLMEngine] generated \(result.count) chars in \(String(format: "%.1f", elapsed))s")
Expand All@@ -89,10 +93,7 @@ actor LLMEngine {

guard let container else { throw LLMError.modelNotLoaded }

let testPrompt = Self.applyNoThink(
prompt: "将以下口述内容整理为书面文字:嗯那个就是我觉得我们首先应该把这个方案重新梳理一下然后呢第二个就是要确认一下时间节点第三呢就是把预算也算一下",
modelID: modelID
)
let testPrompt = "将以下口述内容整理为书面文字:嗯那个就是我觉得我们首先应该把这个方案重新梳理一下然后呢第二个就是要确认一下时间节点第三呢就是把预算也算一下"
let systemPrompt = "你是语音转文字后处理引擎。直接输出整理后的文本,不要任何解释。"
let params = GenerateParameters(maxTokens: 256, temperature: 0.3)
let genT0 = CFAbsoluteTimeGetCurrent()
Expand All@@ -101,7 +102,12 @@ actor LLMEngine {
["role": "system", "content": systemPrompt],
["role": "user", "content": testPrompt],
]
let lmInput = try await container.prepare(input: .init(messages: messages))
let lmInput = try await container.prepare(
input: .init(
messages: messages,
additionalContext: Self.chatTemplateContext(modelID: modelID)
)
)
let stream = try await container.generate(input: lmInput, parameters: params)

var tokenCount = 0
Expand DownExpand Up@@ -131,9 +137,12 @@ actor LLMEngine {
currentModelID = nil
}

private static func applyNoThink(prompt: String, modelID: String?) -> String {
guard let id = modelID?.lowercased(), id.contains("qwen3") else { return prompt }
return "/no_think\n\(prompt)"
/// Qwen3-family chat templates read `enable_thinking` from the template
/// context — the official switch for suppressing `<think>` blocks. The old
/// `/no_think` soft prefix is ignored by Qwen3.5 and only added prompt noise.
static func chatTemplateContext(modelID: String?) -> [String: any Sendable]? {
guard let id = modelID?.lowercased(), id.contains("qwen3") else { return nil }
return ["enable_thinking": false]
}

static func modelConfiguration(for id: String) -> ModelConfiguration {
Expand Down
Loading
Loading