From cecd8fd35eec0c275d1964d7037eac9aa1a4c567 Mon Sep 17 00:00:00 2001 From: Hubert Date: Tue, 27 Oct 2026 11:13:25 +0800 Subject: [PATCH 1/3] fix(translation): fix 15 root causes of low translation efficiency and success rate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Endpoints & configuration: - Fix Claude default URL producing /v1/v1/messages (now /v1/messages) - Fix Gemini default URL missing /openai in compat path - Fix Ollama default URL missing /v1 prefix; sync connection test path - Fix DeepL default URL missing /translate operation suffix - Add appendingAPISuffix helper to deduplicate version segments in URLs Success semantics & fallback: - Throw TranslationProviderError on empty/mismatched/invalid translations instead of silently returning source text as success - primaryResult falls back to any successful engine when primary fails - Propagate CancellationError; skip fallback after cancellation - Respect explicit source language; don't rewrite zh-Hant→zh-Hans as bypass - Use configured parallelEngines[1] as fallback engine in primaryWithFallback Route & analysis: - Resolve preferred engine from parallelEngines[0] consistently in ImageTranslationPipelineConfig (matches TextTranslationFlow) - Trigger OCR fallback on empty VLM results, not just prompt leakage - Tighten prompt-leakage heuristic; require multi-signal match - Deduplicate by text+position signature only; preserve repeated UI labels - Enable Vision automaticallyDetectsLanguage for auto mode - Map PaddleOCR language codes via cliValue instead of binary ch/en Task lifecycle & safety: - Add generation tracking to SelectionOverlayWindow/PreviewViewModel tasks - Add forceRerun parameter to bypass toggle-close on retry/language switch - Add isStartingCapture guard to prevent duplicate capture sessions - Use defer for clipboard restore in TextSelectionService - Cancel tasks and invalidate results on crop/hide in PreviewViewModel - Fix stale windowWillClose callback clearing new popup reference Display & parsing: - Place translation strip above source when it would clip at bottom edge - Join all Baidu trans_result segments instead of taking only first - Instruct LLM batch prompts to preserve '---' separators Tests: - Update testSanitizeTranslationCurlyBraces to verify error-on-invalid - Add testEmptyTranslationTriggersError - Add testExplicitSourceLanguageRespected for zh-Hant→zh-Hans conversion - Replace NL-dependent testSelfLanguageTranslationBypass with explicit source --- .../Capture/CaptureSessionController.swift | 8 +- .../Capture/SelectionOverlayWindow.swift | 24 ++-- .../Preview/PreviewViewModel+Crop.swift | 6 +- .../Preview/PreviewViewModel+OCR.swift | 20 ++- .../PreviewViewModel+Translation.swift | 20 ++- .../Features/Preview/PreviewViewModel.swift | 8 ++ .../TextTranslationPopupWindow.swift | 14 +- .../BilingualOverlayView.swift | 9 +- .../ImageTranslationPipeline.swift | 13 +- TransFrame/Models/ScreenAnalysisResult.swift | 45 +++--- TransFrame/Models/TranslationEngineType.swift | 2 +- .../Models/TranslationResultBundle.swift | 7 +- TransFrame/Services/OCREngine.swift | 9 +- TransFrame/Services/PaddleOCREngine.swift | 10 +- .../Services/Pipelines/AnalysisPipeline.swift | 4 +- .../Services/TextSelectionService.swift | 21 +-- .../Providers/BaiduTranslationProvider.swift | 8 +- .../Providers/DeepLTranslationProvider.swift | 15 +- .../Providers/LLMTranslationProvider.swift | 67 ++++++++- TransFrame/Services/TranslationService.swift | 109 +++++++++------ TransFrame/Services/VLMTextDeduplicator.swift | 30 ++-- .../TranslationServicePipelineTests.swift | 131 ++++++++++-------- 22 files changed, 377 insertions(+), 203 deletions(-) diff --git a/TransFrame/Features/Capture/CaptureSessionController.swift b/TransFrame/Features/Capture/CaptureSessionController.swift index daf9ba2..587ec89 100644 --- a/TransFrame/Features/Capture/CaptureSessionController.swift +++ b/TransFrame/Features/Capture/CaptureSessionController.swift @@ -37,6 +37,7 @@ final class CaptureSessionController: NSObject, SelectionOverlayDelegate { private var currentMode: CaptureMode = .region private var currentSnapshotSet: FrozenSnapshotSet? private var beautifyConfig: BeautifyConfig? + private var isStartingCapture = false private var localKeyMonitor: Any? private var globalKeyMonitor: Any? @@ -49,11 +50,12 @@ final class CaptureSessionController: NSObject, SelectionOverlayDelegate { /// Triggers screen capture session with instant freeze. func startCapture(mode: CaptureMode = .region) { - // Prevent launching another session if overlays are active - guard activeOverlays.isEmpty else { + // Prevent launching another session if overlays are active or starting + guard activeOverlays.isEmpty, !isStartingCapture else { logger.warning("Capture session already in progress, ignoring trigger") return } + isStartingCapture = true self.currentMode = mode let triggerTime = ContinuousClock.now @@ -122,9 +124,11 @@ final class CaptureSessionController: NSObject, SelectionOverlayDelegate { // Record freeze visible time self.currentSnapshotSet?.freezeVisibleAt = .now self.logger.info("All frozen overlays presented successfully") + self.isStartingCapture = false } catch { self.logger.error("Failed to start capture session: \(error.localizedDescription)") + self.isStartingCapture = false self.closeAllOverlays() } } diff --git a/TransFrame/Features/Capture/SelectionOverlayWindow.swift b/TransFrame/Features/Capture/SelectionOverlayWindow.swift index a458cdf..7c0db90 100644 --- a/TransFrame/Features/Capture/SelectionOverlayWindow.swift +++ b/TransFrame/Features/Capture/SelectionOverlayWindow.swift @@ -224,6 +224,7 @@ final class SelectionOverlayView: NSView, SelectionToolbarDelegate, NSTextFieldD /// In-flight drawer analysis; cancelled on rerun and when the drawer closes /// so a dismissed overlay keeps no running network work writing into it. private var inPlaceAnalysisTask: Task? + private var inPlaceAnalysisGeneration: UInt64 = 0 /// Selection snapshot captured when a click starts outside the current /// selection; tiny clicks (no drag) must restore it instead of re-picking. @@ -1663,9 +1664,8 @@ final class SelectionOverlayView: NSView, SelectionToolbarDelegate, NSTextFieldD /// Runs OCR or translation on the selection and shows results in the /// embedded right-side drawer. The capture window stays open. - private func runInPlaceAnalysis(tab: InPlaceResultsModel.Tab, in selectionRect: CGRect) { - // Second click on the same tab closes the drawer (PRD toggle behaviour) - if resultsModel.isVisible, resultsModel.activeTab == tab, !resultsModel.isLoading { + private func runInPlaceAnalysis(tab: InPlaceResultsModel.Tab, in selectionRect: CGRect, forceRerun: Bool = false) { + if !forceRerun, resultsModel.isVisible, resultsModel.activeTab == tab, !resultsModel.isLoading { hideResultsPanel() return } @@ -1683,12 +1683,16 @@ final class SelectionOverlayView: NSView, SelectionToolbarDelegate, NSTextFieldD // Cancel any in-flight run so a slow old result can't overwrite a new one inPlaceAnalysisTask?.cancel() + inPlaceAnalysisGeneration &+= 1 + let generation = inPlaceAnalysisGeneration inPlaceAnalysisTask = Task { @MainActor [weak self] in guard let self, !Task.isCancelled else { return } defer { - self.resultsModel.isLoading = false - self.layoutResultsPanel(for: selectionRect) - self.needsDisplay = true + if self.inPlaceAnalysisGeneration == generation { + self.resultsModel.isLoading = false + self.layoutResultsPanel(for: selectionRect) + self.needsDisplay = true + } } do { switch tab { @@ -1712,12 +1716,11 @@ final class SelectionOverlayView: NSView, SelectionToolbarDelegate, NSTextFieldD case .translate: let pipeline = ImageTranslationPipeline() let context = PipelineContext() - // Stage-split so failures are attributed correctly: the - // drawer reads VLM errors as recognition, not translation. let analysis: ScreenAnalysisResult do { analysis = try await pipeline.analyze(image: cropped, context: context) } catch { + guard self.inPlaceAnalysisGeneration == generation else { return } self.resultsModel.statusMessage = String( format: String(localized: "error.pipeline.ocrFailed"), Self.pipelineErrorMessage(error) @@ -1737,8 +1740,10 @@ final class SelectionOverlayView: NSView, SelectionToolbarDelegate, NSTextFieldD context: context ) if Task.isCancelled { return } + guard self.inPlaceAnalysisGeneration == generation else { return } self.resultsModel.segments = segments } catch { + guard self.inPlaceAnalysisGeneration == generation else { return } self.resultsModel.statusMessage = String( format: String(localized: "error.pipeline.translateFailed"), Self.pipelineErrorMessage(error) @@ -1746,6 +1751,7 @@ final class SelectionOverlayView: NSView, SelectionToolbarDelegate, NSTextFieldD } } } catch { + guard self.inPlaceAnalysisGeneration == generation else { return } let message = Self.pipelineErrorMessage(error) self.resultsModel.statusMessage = message } @@ -1779,7 +1785,7 @@ final class SelectionOverlayView: NSView, SelectionToolbarDelegate, NSTextFieldD if resultsPanelHost == nil { resultsModel.onRerun = { [weak self] in guard let self, case .selected(let rect) = self.state else { return } - self.runInPlaceAnalysis(tab: self.resultsModel.activeTab, in: rect) + self.runInPlaceAnalysis(tab: self.resultsModel.activeTab, in: rect, forceRerun: true) } resultsModel.onClose = { [weak self] in self?.hideResultsPanel() diff --git a/TransFrame/Features/Preview/PreviewViewModel+Crop.swift b/TransFrame/Features/Preview/PreviewViewModel+Crop.swift index e073701..fbd8bda 100644 --- a/TransFrame/Features/Preview/PreviewViewModel+Crop.swift +++ b/TransFrame/Features/Preview/PreviewViewModel+Crop.swift @@ -67,8 +67,12 @@ extension PreviewViewModel { $0.offsetBy(dx: -originShift.x, dy: -originShift.y) } - // Invalidate OCR cache for the previous crop area + // Invalidate OCR cache and translation results for the previous crop area + ocrTask?.cancel() + translationTask?.cancel() + analysisGeneration &+= 1 ocrResult = nil + bilingualSegments = [] screenshot = Screenshot( id: screenshot.id, diff --git a/TransFrame/Features/Preview/PreviewViewModel+OCR.swift b/TransFrame/Features/Preview/PreviewViewModel+OCR.swift index 06c189e..a6bb4c2 100644 --- a/TransFrame/Features/Preview/PreviewViewModel+OCR.swift +++ b/TransFrame/Features/Preview/PreviewViewModel+OCR.swift @@ -12,16 +12,22 @@ extension PreviewViewModel { isPerformingOCR = true ocrTranslationError = nil - Task { - await executeOCR() + ocrTask?.cancel() + analysisGeneration &+= 1 + let generation = analysisGeneration + ocrTask = Task { + await executeOCR(generation: generation) } } - func executeOCR() async { - defer { isPerformingOCR = false } + func executeOCR(generation: UInt64? = nil) async { + let currentGeneration = generation ?? analysisGeneration + defer { + if currentGeneration == analysisGeneration { + isPerformingOCR = false + } + } - // Recognize in the user's source language; auto (or an unsupported - // language) falls back to Vision's automatic language detection. let languages = Set( [AppSettings.shared.translationSourceLanguage] .compactMap { OCREngine.RecognitionLanguage(translationLanguage: $0) } @@ -32,11 +38,13 @@ extension PreviewViewModel { image, languages: languages ) + guard currentGeneration == analysisGeneration else { return } ocrResult = result if result.observations.isEmpty { errorMessage = String(localized: "error.ocr.no.text") } } catch { + guard currentGeneration == analysisGeneration else { return } let message = "\(String(localized: "error.ocr.failed")) \(error.localizedDescription)" ocrTranslationError = message errorMessage = message diff --git a/TransFrame/Features/Preview/PreviewViewModel+Translation.swift b/TransFrame/Features/Preview/PreviewViewModel+Translation.swift index 47c5c6a..ccd72aa 100644 --- a/TransFrame/Features/Preview/PreviewViewModel+Translation.swift +++ b/TransFrame/Features/Preview/PreviewViewModel+Translation.swift @@ -20,18 +20,24 @@ extension PreviewViewModel { isTranslating = true ocrTranslationError = nil - Task { @MainActor in - defer { isTranslating = false } + translationTask?.cancel() + analysisGeneration &+= 1 + let generation = analysisGeneration + translationTask = Task { @MainActor in + defer { + if generation == self.analysisGeneration { + self.isTranslating = false + } + } let pipeline = ImageTranslationPipeline() let context = PipelineContext() - // Stage-split so failures are attributed correctly: analysis - // (VLM) errors read as recognition, not translation failures. let analysis: ScreenAnalysisResult do { analysis = try await pipeline.analyze(image: image, context: context) } catch { + guard generation == self.analysisGeneration else { return } let message = (error as? LocalizedError)?.errorDescription ?? error.localizedDescription errorMessage = String(format: String(localized: "error.pipeline.ocrFailed"), message) ocrTranslationError = errorMessage @@ -39,6 +45,7 @@ extension PreviewViewModel { return } + guard generation == self.analysisGeneration else { return } let filtered = analysis.filteredForTranslation() guard !filtered.segments.isEmpty else { errorMessage = String(localized: "error.ocr.no.text") @@ -48,12 +55,15 @@ extension PreviewViewModel { let config = ImageTranslationPipelineConfig.fromAppSettings(scene: nil) do { - bilingualSegments = try await pipeline.translate( + let segments = try await pipeline.translate( analysisResult: filtered, config: config, context: context ) + guard generation == self.analysisGeneration else { return } + bilingualSegments = segments } catch { + guard generation == self.analysisGeneration else { return } let message = (error as? LocalizedError)?.errorDescription ?? error.localizedDescription errorMessage = String(format: String(localized: "error.pipeline.translateFailed"), message) ocrTranslationError = errorMessage diff --git a/TransFrame/Features/Preview/PreviewViewModel.swift b/TransFrame/Features/Preview/PreviewViewModel.swift index 72d3391..98058f6 100644 --- a/TransFrame/Features/Preview/PreviewViewModel.swift +++ b/TransFrame/Features/Preview/PreviewViewModel.swift @@ -95,6 +95,12 @@ final class PreviewViewModel { var bilingualSegments: [BilingualSegment] = [] var isTranslating: Bool = false + @ObservationIgnored + var ocrTask: Task? + @ObservationIgnored + var translationTask: Task? + var analysisGeneration: UInt64 = 0 + // MARK: - Annotation Tools @ObservationIgnored @@ -264,6 +270,8 @@ final class PreviewViewModel { func hide() { guard isVisible else { return } isVisible = false + ocrTask?.cancel() + translationTask?.cancel() undoStack.removeAll() redoStack.removeAll() onDismiss?() diff --git a/TransFrame/Features/TextTranslation/TextTranslationPopupWindow.swift b/TransFrame/Features/TextTranslation/TextTranslationPopupWindow.swift index a7c447a..0bf4f4e 100644 --- a/TransFrame/Features/TextTranslation/TextTranslationPopupWindow.swift +++ b/TransFrame/Features/TextTranslation/TextTranslationPopupWindow.swift @@ -29,6 +29,7 @@ final class TextTranslationPopupController: NSObject { private var window: NSWindow? private weak var popupDelegate: TextTranslationPopupDelegate? + private var presentationID = UUID() var onDismiss: (() -> Void)? private let debounceInterval: TimeInterval = 0.3 @@ -84,6 +85,7 @@ final class TextTranslationPopupController: NSObject { newWindow.minSize = NSSize(width: 380, height: 200) newWindow.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary] + presentationID = UUID() self.window = newWindow lastPresentationTime = Date() @@ -160,10 +162,16 @@ final class TextTranslationPopupController: NSObject { extension TextTranslationPopupController: NSWindowDelegate { nonisolated func windowWillClose(_ notification: Notification) { + guard let closedWindow = notification.object as? NSWindow else { return } Task { @MainActor in - window = nil - onDismiss?() - popupDelegate?.textTranslationPopupDidDismiss() + // Only clear the reference if this is still the current window, + // preventing an old window's async close callback from clearing + // a newly-presented window's reference. + if window === closedWindow { + window = nil + onDismiss?() + popupDelegate?.textTranslationPopupDidDismiss() + } } } } diff --git a/TransFrame/Features/TranslationFlow/BilingualOverlayView.swift b/TransFrame/Features/TranslationFlow/BilingualOverlayView.swift index 0c1f873..5d0b60a 100644 --- a/TransFrame/Features/TranslationFlow/BilingualOverlayView.swift +++ b/TransFrame/Features/TranslationFlow/BilingualOverlayView.swift @@ -42,9 +42,16 @@ enum BilingualOverlayLayout { /// TextSegment 使用左上角原点;译文从原文下边缘开始,按画布宽度换行。 static func translationAnchor(for boundingBox: CGRect, in displaySize: CGSize) -> Anchor { let x = max(0, min(boundingBox.minX * displaySize.width, displaySize.width)) - let y = boundingBox.maxY * displaySize.height + 1 + let belowY = boundingBox.maxY * displaySize.height + 1 let stripWidth = min(max(boundingBox.width * displaySize.width, 60), max(0, displaySize.width - x)) let fontSize = min(max(boundingBox.height * displaySize.height * 0.85, 10), 16) + let estimatedStripHeight = fontSize * 1.6 + 4 + let y: CGFloat + if belowY + estimatedStripHeight < displaySize.height { + y = belowY + } else { + y = max(0, boundingBox.minY * displaySize.height - estimatedStripHeight - 1) + } return Anchor(x: x, y: y, maxWidth: stripWidth, fontSize: fontSize) } diff --git a/TransFrame/Features/TranslationFlow/ImageTranslationPipeline.swift b/TransFrame/Features/TranslationFlow/ImageTranslationPipeline.swift index 76ba885..e2bfe14 100644 --- a/TransFrame/Features/TranslationFlow/ImageTranslationPipeline.swift +++ b/TransFrame/Features/TranslationFlow/ImageTranslationPipeline.swift @@ -14,12 +14,23 @@ struct ImageTranslationPipelineConfig: Sendable, Equatable { @MainActor static func fromAppSettings(scene: TranslationScene? = nil) -> ImageTranslationPipelineConfig { let settings = AppSettings.shared + // Resolve preferred engine consistently with TextTranslationFlow: + // sceneBinding uses scene binding; all other modes use parallelEngines[0]. + let preferredEngine: TranslationEngineType + if settings.engineSelectionMode == .sceneBinding, let scene { + preferredEngine = settings.sceneBindings[scene]?.primaryEngine + ?? SceneEngineBinding.default(for: scene).primaryEngine + } else if let first = settings.parallelEngines.first { + preferredEngine = first + } else { + preferredEngine = settings.translationEngine + } return ImageTranslationPipelineConfig( targetLanguage: settings.translationTargetLanguage?.rawValue ?? "zh-Hans", sourceLanguage: settings.translationSourceLanguage == .auto ? nil : settings.translationSourceLanguage.rawValue, - preferredEngine: settings.translationEngine, + preferredEngine: preferredEngine, scene: scene, mode: settings.engineSelectionMode, fallbackEnabled: settings.translationFallbackEnabled, diff --git a/TransFrame/Models/ScreenAnalysisResult.swift b/TransFrame/Models/ScreenAnalysisResult.swift index c667c87..6fa2219 100644 --- a/TransFrame/Models/ScreenAnalysisResult.swift +++ b/TransFrame/Models/ScreenAnalysisResult.swift @@ -109,50 +109,49 @@ extension TextSegment { return false } /// Heuristic for leaked OCR prompt/schema instructions accidentally returned by VLMs. + /// Conservative: only matches clear schema/prompt patterns, not ordinary technical content. var isLikelyOCRPromptLeakage: Bool { let trimmed = text.trimmingCharacters(in: .whitespacesAndNewlines) guard !trimmed.isEmpty else { return false } let normalized = trimmed.lowercased() + + // Very strong signals: unambiguous prompt/schema instruction phrases let strongSignals = [ - "\"segments\"", - "\"boundingbox\"", - "\"confidence\"", - "\"width\"", - "\"height\"", "return json", "json format", - "top-left corner", + "\"segments\"", + "\"boundingbox\"", "normalized to image size", - "boundingbox", - "置信度", - "左上角", - "右上角", - "箱形尺寸", "json格式", "返回json", + "置信度: 0.0-1.0", + "置信度:0.0-1.0", + "x,y: top-left", + "x,y:左上角", + "x, y: top-left", + "x, y: 左上角", + "x, y:左上角", ] - if strongSignals.contains(where: normalized.contains) { + if strongSignals.contains(where: { normalized.contains($0) }) { return true } - let weakSignals = [ - "x, y", - "width, height", + // Multi-signal heuristic: need at least 2 schema-related markers + let schemaMarkers = [ + "boundingbox", + "\"confidence\"", "0.0-1.0", "0.0–1.0", - "宽度", - "高度", "归一化", + "箱形尺寸", + "confidence:", ] - let weakSignalCount = weakSignals.reduce(into: 0) { count, signal in - if normalized.contains(signal) { - count += 1 - } + let markerCount = schemaMarkers.reduce(into: 0) { count, signal in + if normalized.contains(signal) { count += 1 } } - - return weakSignalCount >= 2 + return markerCount >= 2 } } diff --git a/TransFrame/Models/TranslationEngineType.swift b/TransFrame/Models/TranslationEngineType.swift index fe31363..2525557 100644 --- a/TransFrame/Models/TranslationEngineType.swift +++ b/TransFrame/Models/TranslationEngineType.swift @@ -189,7 +189,7 @@ enum TranslationEngineType: String, CaseIterable, Sendable, Codable, Identifiabl case .google: return "https://translation.googleapis.com/language/translate/v2" case .deepl: - return "https://api.deepl.com/v2" + return "https://api.deepl.com/v2/translate" case .baidu: return "https://fanyi-api.baidu.com/api/trans/vip/translate" default: diff --git a/TransFrame/Models/TranslationResultBundle.swift b/TransFrame/Models/TranslationResultBundle.swift index 5246f95..876e7c6 100644 --- a/TransFrame/Models/TranslationResultBundle.swift +++ b/TransFrame/Models/TranslationResultBundle.swift @@ -86,9 +86,12 @@ struct TranslationResultBundle: Sendable { // MARK: - Computed Properties - /// Primary result (from the primary engine) + /// Primary result (from the primary engine, falling back to any successful engine) var primaryResult: [BilingualSegment] { - results.first { $0.engine == primaryEngine && $0.isSuccess }?.segments ?? [] + if let primary = results.first(where: { $0.engine == primaryEngine && $0.isSuccess }) { + return primary.segments + } + return results.first(where: { $0.isSuccess })?.segments ?? [] } /// Whether any engine had errors diff --git a/TransFrame/Services/OCREngine.swift b/TransFrame/Services/OCREngine.swift index 3c29d7d..2cf1de9 100644 --- a/TransFrame/Services/OCREngine.swift +++ b/TransFrame/Services/OCREngine.swift @@ -237,17 +237,16 @@ actor OCREngine { /// Creates a configured VNRecognizeTextRequest private func createRecognitionRequest(config: Configuration) -> VNRecognizeTextRequest { let request = VNRecognizeTextRequest { _, _ in } - - // Set recognition level request.recognitionLevel = config.recognitionLevel.visionLevel - // With auto detection, leave recognitionLanguages at Vision's default - if !config.useAutoLanguageDetection { + if config.useAutoLanguageDetection { + request.automaticallyDetectsLanguage = true + } else { request.recognitionLanguages = Array(config.languages).map(\.visionLanguage) + request.automaticallyDetectsLanguage = false } request.usesLanguageCorrection = true - return request } } diff --git a/TransFrame/Services/PaddleOCREngine.swift b/TransFrame/Services/PaddleOCREngine.swift index 2f37d5e..2edc839 100644 --- a/TransFrame/Services/PaddleOCREngine.swift +++ b/TransFrame/Services/PaddleOCREngine.swift @@ -473,8 +473,14 @@ actor PaddleOCREngine { private func buildArguments(config: Configuration, imagePath: String) -> [String] { switch config.mode { case .fast: - // Fast mode: use ocr command (~1s) - let langCode = config.languages.contains(.chinese) ? "ch" : "en" + let langCode: String + if config.languages.contains(.chinese) { + langCode = "ch" + } else if let first = config.languages.first { + langCode = first.cliValue + } else { + langCode = "ch" + } return [ "ocr", "-i", imagePath, diff --git a/TransFrame/Services/Pipelines/AnalysisPipeline.swift b/TransFrame/Services/Pipelines/AnalysisPipeline.swift index 221a328..4fa1e61 100644 --- a/TransFrame/Services/Pipelines/AnalysisPipeline.swift +++ b/TransFrame/Services/Pipelines/AnalysisPipeline.swift @@ -42,7 +42,9 @@ actor AnalysisPipeline { _ analysisResult: ScreenAnalysisResult, ocrFallback: @Sendable () async throws -> OCRResult ) async throws -> ScreenAnalysisResult { - guard analysisResult.containsOnlyPromptLeakage else { + // Fallback to OCR when VLM returned nothing useful: empty segments + // or only prompt/schema leakage. + guard analysisResult.segments.isEmpty || analysisResult.containsOnlyPromptLeakage else { return analysisResult } diff --git a/TransFrame/Services/TextSelectionService.swift b/TransFrame/Services/TextSelectionService.swift index 188d2d6..bc098dc 100644 --- a/TransFrame/Services/TextSelectionService.swift +++ b/TransFrame/Services/TextSelectionService.swift @@ -153,6 +153,17 @@ actor TextSelectionService { // Save current clipboard content let savedClipboard = try saveClipboardContent() + // Ensure clipboard is restored even if we throw below + defer { + if let saved = savedClipboard { + do { + try restoreClipboardContent(saved) + } catch { + logger.warning("Failed to restore clipboard: \(error.localizedDescription, privacy: .private(mask: .hash))") + } + } + } + // Clear clipboard to detect when new content is pasted clearClipboard() @@ -162,16 +173,6 @@ actor TextSelectionService { // Wait for clipboard to be updated with selected text let capturedText = try await waitForClipboardUpdate(previousChangeCount: savedClipboard?.changeCount ?? -1) - // Restore original clipboard content - if let saved = savedClipboard { - do { - try restoreClipboardContent(saved) - } catch { - // Log but don't fail - we still got the text - logger.warning("Failed to restore clipboard: \(error.localizedDescription, privacy: .private(mask: .hash))") - } - } - // Validate we got some text guard !capturedText.isEmpty else { throw CaptureError.noSelection diff --git a/TransFrame/Services/Translation/Providers/BaiduTranslationProvider.swift b/TransFrame/Services/Translation/Providers/BaiduTranslationProvider.swift index a72e1de..47857c4 100644 --- a/TransFrame/Services/Translation/Providers/BaiduTranslationProvider.swift +++ b/TransFrame/Services/Translation/Providers/BaiduTranslationProvider.swift @@ -171,13 +171,15 @@ actor BaiduTranslationProvider: TranslationProvider { throw TranslationProviderError.translationFailed("Baidu error: \(errorMsg)") } - guard let json = try JSONSerialization.jsonObject(with: data) as? [String: Any], + guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any], let transResult = json["trans_result"] as? [[String: Any]], - let firstResult = transResult.first, - let translatedText = firstResult["dst"] as? String else { + !transResult.isEmpty else { throw TranslationProviderError.translationFailed("Failed to parse Baidu response") } + let translatedText = transResult.compactMap { $0["dst"] as? String } + .joined(separator: "\n") + let from = (json["from"] as? String) ?? "auto" let to = (json["to"] as? String) ?? "zh" diff --git a/TransFrame/Services/Translation/Providers/DeepLTranslationProvider.swift b/TransFrame/Services/Translation/Providers/DeepLTranslationProvider.swift index 0427741..bbe10da 100644 --- a/TransFrame/Services/Translation/Providers/DeepLTranslationProvider.swift +++ b/TransFrame/Services/Translation/Providers/DeepLTranslationProvider.swift @@ -23,11 +23,20 @@ actor DeepLTranslationProvider: TranslationProvider { ) private var baseURL: String { - // Use free tier URL if configured, otherwise pro tier + // Use free tier URL if configured, otherwise pro tier. + // Ensure the URL always points to the /translate operation endpoint. + let raw: String if let customURL = config.options?.baseURL, !customURL.isEmpty { - return customURL + raw = customURL + } else { + raw = "https://api.deepl.com/v2/translate" } - return "https://api.deepl.com/v2/translate" + // If user supplied only the host/version root (e.g. .../v2), append /translate. + let trimmed = raw.hasSuffix("/") ? String(raw.dropLast()) : raw + if trimmed.hasSuffix("/translate") { + return trimmed + } + return trimmed + "/translate" } // MARK: - Initialization diff --git a/TransFrame/Services/Translation/Providers/LLMTranslationProvider.swift b/TransFrame/Services/Translation/Providers/LLMTranslationProvider.swift index c2a97b5..d476f95 100644 --- a/TransFrame/Services/Translation/Providers/LLMTranslationProvider.swift +++ b/TransFrame/Services/Translation/Providers/LLMTranslationProvider.swift @@ -172,7 +172,14 @@ actor LLMTranslationProvider: TranslationProvider, TranslationPromptConfigurable // For OpenAI and Ollama, we can perform a models GET check (non-billing) if engineType == .openai || engineType == .ollama { - let endpoint = engineType == .ollama ? baseURL.appendingPathComponent("api/tags") : baseURL.appendingPathComponent("models") + let endpoint: URL + if engineType == .ollama { + // Use the same OpenAI-compatible path family as translation to + // avoid "test passes but translation 404" (or vice versa). + endpoint = Self.appendingAPISuffix(baseURL, suffix: "v1/models") + } else { + endpoint = Self.appendingAPISuffix(baseURL, suffix: "models") + } var request = URLRequest(url: endpoint) request.httpMethod = "GET" @@ -249,10 +256,14 @@ actor LLMTranslationProvider: TranslationProvider, TranslationPromptConfigurable .replacingOccurrences(of: "{text}", with: text) } - // Default prompt + // Default prompt — include separator preservation instruction when batch separators present + let separatorHint = text.contains("\n---\n") + ? "Preserve the literal '---' separators exactly where they appear in the input. Do not add or remove any separators." + : "" return """ Translate the following text from \(source) to \(target). Provide ONLY the translated text without any explanations, notes, or formatting. + \(separatorHint) Text to translate: \(text) @@ -273,7 +284,7 @@ actor LLMTranslationProvider: TranslationProvider, TranslationPromptConfigurable switch engineType { case .claude: // Claude uses /v1/messages endpoint - endpoint = baseURL.appendingPathComponent("v1/messages") + endpoint = Self.appendingAPISuffix(baseURL, suffix: "v1/messages") if let apiKey = credentials?.apiKey { // Security: reject non-HTTPS endpoints (except localhost) when sending API keys if let host = baseURL.host, !Self.isLocalhost(host) && baseURL.scheme != "https" { @@ -284,11 +295,24 @@ actor LLMTranslationProvider: TranslationProvider, TranslationPromptConfigurable headers["x-api-key"] = apiKey headers["anthropic-version"] = "2023-06-01" } + case .gemini: + // Gemini OpenAI-compatible endpoint: /v1beta/openai/chat/completions + endpoint = Self.appendingAPISuffix(baseURL, suffix: "v1beta/openai/chat/completions") + if let apiKey = credentials?.apiKey { + if let host = baseURL.host, !Self.isLocalhost(host) && baseURL.scheme != "https" { + throw TranslationProviderError.invalidConfiguration( + "Refusing to send API key over insecure connection (HTTP). Use HTTPS or a localhost URL." + ) + } + headers["Authorization"] = "Bearer \(apiKey)" + } + case .ollama: + // Ollama OpenAI-compatible endpoint: /v1/chat/completions + endpoint = Self.appendingAPISuffix(baseURL, suffix: "v1/chat/completions") default: - // OpenAI, Gemini, Ollama use /chat/completions endpoint - endpoint = baseURL.appendingPathComponent("chat/completions") + // OpenAI and others use /chat/completions (base typically ends with /v1) + endpoint = Self.appendingAPISuffix(baseURL, suffix: "chat/completions") if let apiKey = credentials?.apiKey { - // Security: reject non-HTTPS endpoints (except localhost) when sending API keys if let host = baseURL.host, !Self.isLocalhost(host) && baseURL.scheme != "https" { throw TranslationProviderError.invalidConfiguration( "Refusing to send API key over insecure connection (HTTP). Use HTTPS or a localhost URL." @@ -501,6 +525,37 @@ actor LLMTranslationProvider: TranslationProvider, TranslationPromptConfigurable return config.options?.modelName ?? engineType.defaultModelName ?? "gpt-4o-mini" } + /// Appends an API path suffix to a base URL without duplicating version segments. + /// If the base URL already ends with a matching prefix of the suffix, only the + /// remainder is appended. Handles trailing slashes and `URL.appendingPathComponent` + /// percent-encoding quirks. + private nonisolated static func appendingAPISuffix(_ base: URL, suffix: String) -> URL { + var url = base + while url.absoluteString.hasSuffix("/") { + url.deleteLastPathComponent() + } + let baseParts = url.pathComponents.filter { $0 != "/" && !$0.isEmpty } + let suffixParts = suffix.split(separator: "/").map(String.init) + // Find the longest overlapping prefix of suffix already present at end of base + for overlap in stride(from: min(baseParts.count, suffixParts.count), through: 1, by: -1) { + let baseTail = Array(baseParts.suffix(overlap)).map { $0.lowercased() } + let suffixHead = Array(suffixParts.prefix(overlap)).map { $0.lowercased() } + if baseTail == suffixHead { + // Append only the non-overlapping remainder + let remainder = suffixParts.dropFirst(overlap) + for part in remainder { + url = url.appendingPathComponent(part) + } + return url + } + } + // No overlap: append all parts + for part in suffixParts { + url = url.appendingPathComponent(part) + } + return url + } + /// Check if a hostname refers to localhost (safe for HTTP) private nonisolated static func isLocalhost(_ host: String) -> Bool { let lowered = host.lowercased() diff --git a/TransFrame/Services/TranslationService.swift b/TransFrame/Services/TranslationService.swift index d9c0c4d..48f1774 100644 --- a/TransFrame/Services/TranslationService.swift +++ b/TransFrame/Services/TranslationService.swift @@ -65,12 +65,21 @@ actor TranslationService { switch mode { case .primaryWithFallback: + // Use the user-configured second engine as fallback when available + let configuredFallback: TranslationEngineType? = { + guard fallbackEnabled else { return nil } + if parallelEngines.count > 1 { + return parallelEngines[1] + } + return nil + }() return try await translateWithFallback( segments: segments, to: targetLanguage, from: sourceLanguage, primaryEngine: preferredEngine, fallbackEnabled: fallbackEnabled, + fallbackEngine: configuredFallback, scene: scene ) @@ -132,11 +141,15 @@ actor TranslationService { mode: .primaryWithFallback ) return result + } catch is CancellationError { + throw CancellationError() } catch { errors.append(error) logger.warning("Primary engine \(primaryEngine.rawValue) failed: \(error.localizedDescription)") } + try Task.checkCancellation() + // Try fallback if enabled if fallbackEnabled { let actualFallback: TranslationEngineType @@ -148,6 +161,12 @@ actor TranslationService { actualFallback = primaryEngine == .apple ? .mtranServer : .apple } + // Avoid retrying the same engine that just failed + guard actualFallback != primaryEngine else { + logger.warning("Fallback engine \(actualFallback.rawValue) equals primary, skipping") + throw MultiEngineError.allEnginesFailed(errors) + } + // Skip fallback if the engine is not explicitly enabled in user settings let enabledFallbacks = await filterEnabledEngines([actualFallback]) guard !enabledFallbacks.isEmpty else { @@ -173,6 +192,8 @@ actor TranslationService { selectionMode: .primaryWithFallback, scene: scene ) + } catch is CancellationError { + throw CancellationError() } catch { errors.append(error) logger.warning("Fallback engine \(actualFallback.rawValue) also failed: \(error.localizedDescription)") @@ -418,23 +439,24 @@ actor TranslationService { let detectedSourceLang = detectLanguage(for: text) var resolvedSourceLang = explicitSourceLang ?? detectedSourceLang - // 2. Handle cases where text clearly contains Chinese and target is Chinese - // Only force resolvedSourceLang to targetLang (Chinese) if: - // - The target is Chinese AND - // - The detected source is nil (NLP failed) or already detected as Chinese AND - // - The text actually contains Han characters - // This prevents misclassifying Japanese/Korean containing Kanji/Hanja as Chinese - if let targetLang, + // 2. Handle cases where text clearly contains Chinese and target is Chinese. + // Skip when detected source variant matches the target, or when detection + // failed but the text contains Han characters (likely same-script Chinese). + // Do NOT rewrite detected Traditional → Simplified or vice versa. + if explicitSourceLang == nil, + let targetLang, (targetLang == .chineseSimplified || targetLang == .chineseTraditional), containsHanCharacters(text) { - if detectedSourceLang == nil || - detectedSourceLang == .chineseSimplified || - detectedSourceLang == .chineseTraditional { + if detectedSourceLang == nil || detectedSourceLang == targetLang { resolvedSourceLang = targetLang } + // If detectedSourceLang is a different Chinese variant, leave it + // as-is so the engine performs the script conversion. } - // 3. Self-translation bypass + // 3. Self-translation bypass — only skip when source and target are + // truly identical. Simplified ↔ Traditional Chinese are different + // targets and must go through the translation engine. if let resolvedSourceLang, let targetLang, resolvedSourceLang == targetLang { finalResults[index] = TranslationResult( sourceText: text, @@ -450,7 +472,7 @@ actor TranslationService { if !pendingTexts.isEmpty { let translatedResults: [TranslationResult] - + if let promptConfigurableProvider = provider as? TranslationPromptConfigurable { let promptTemplate = await resolvedPromptTemplate( for: provider, @@ -471,44 +493,51 @@ actor TranslationService { ) } - if translatedResults.count == pendingTexts.count { - for (offset, result) in translatedResults.enumerated() { - let originalIndex = pendingIndices[offset] - finalResults[originalIndex] = result - } - } else { + if translatedResults.count != pendingTexts.count { logger.error("Provider returned mismatch count. Expected: \(pendingTexts.count), got: \(translatedResults.count)") - for (offset, originalIndex) in pendingIndices.enumerated() { - if offset < translatedResults.count { - finalResults[originalIndex] = translatedResults[offset] - } else { - let originalText = texts[originalIndex] - finalResults[originalIndex] = TranslationResult( - sourceText: originalText, - translatedText: originalText, - sourceLanguage: sourceLanguage ?? "auto", - targetLanguage: targetLanguage - ) - } - } + throw TranslationProviderError.translationFailed( + "\(provider.name) returned \(translatedResults.count) results for \(pendingTexts.count) texts" + ) + } + + for (offset, result) in translatedResults.enumerated() { + let originalIndex = pendingIndices[offset] + finalResults[originalIndex] = result } } - return finalResults.map { result in - let res = result ?? TranslationResult( - sourceText: "", - translatedText: "", - sourceLanguage: sourceLanguage ?? "auto", - targetLanguage: targetLanguage - ) - let sanitizedText = self.sanitizeTranslation(translated: res.translatedText, source: res.sourceText) + var hasFailedSlot = false + let sanitized = finalResults.map { result -> TranslationResult? in + guard let res = result else { + hasFailedSlot = true + return nil + } + let cleaned = self.sanitizeTranslation(translated: res.translatedText, source: res.sourceText) + if cleaned == res.sourceText, res.translatedText != res.sourceText { + hasFailedSlot = true + } return TranslationResult( sourceText: res.sourceText, - translatedText: sanitizedText, + translatedText: cleaned, sourceLanguage: res.sourceLanguage, targetLanguage: res.targetLanguage ) } + + if hasFailedSlot { + throw TranslationProviderError.translationFailed( + "\(provider.name) returned invalid or empty translations" + ) + } + + return sanitized.map { result in + result ?? TranslationResult( + sourceText: "", + translatedText: "", + sourceLanguage: sourceLanguage ?? "auto", + targetLanguage: targetLanguage + ) + } } /// Sanitizes the translated text, reverting to original if it is empty, a broken JSON, or just empty curly braces like {""} diff --git a/TransFrame/Services/VLMTextDeduplicator.swift b/TransFrame/Services/VLMTextDeduplicator.swift index ed94177..140af17 100644 --- a/TransFrame/Services/VLMTextDeduplicator.swift +++ b/TransFrame/Services/VLMTextDeduplicator.swift @@ -53,43 +53,29 @@ enum VLMTextDeduplicator { textCounts[normalizedText, default: 0] += 1 } - // Calculate threshold: max of minCountThreshold or percentage of total - // Clamp percentageMultiplier to valid range (0, 1] to prevent division issues let total = segments.count let validatedMultiplier = max(0.01, min(1.0, config.percentageMultiplier)) let percentageThreshold = max(config.minCountThreshold, Int(Double(total) * validatedMultiplier)) - // First pass: build a set of texts that are over-represented (likely hallucinations) var overrepresentedTexts = Set() for (text, count) in textCounts { if count > percentageThreshold { overrepresentedTexts.insert(text) - // Log only safe statistics: length, count, threshold logger?(text.count, count, percentageThreshold) } } - // Second pass: deduplicate - var seenTexts = Set() // For overrepresented texts, only keep first - var seenSignatures = Set() // For normal texts, use position-based signature + // Deduplicate using text+position signature ONLY. + // Do NOT collapse same-text segments at different positions — + // those are legitimate repeated UI elements (buttons, table cells). + var seenSignatures = Set() var result: [VLMTextSegment] = [] for segment in segments { - let normalizedText = segment.text.trimmingCharacters(in: .whitespacesAndNewlines) - - if overrepresentedTexts.contains(normalizedText) { - // For overrepresented texts, only keep the first occurrence - if !seenTexts.contains(normalizedText) { - seenTexts.insert(normalizedText) - result.append(segment) - } - } else { - // For normal texts, use position-based deduplication - let signature = segmentSignature(segment, precision: config.positionPrecision) - if !seenSignatures.contains(signature) { - seenSignatures.insert(signature) - result.append(segment) - } + let signature = segmentSignature(segment, precision: config.positionPrecision) + if !seenSignatures.contains(signature) { + seenSignatures.insert(signature) + result.append(segment) } } diff --git a/TransFrameTests/TranslationServicePipelineTests.swift b/TransFrameTests/TranslationServicePipelineTests.swift index c425a79..1fbf8a6 100644 --- a/TransFrameTests/TranslationServicePipelineTests.swift +++ b/TransFrameTests/TranslationServicePipelineTests.swift @@ -562,31 +562,47 @@ final class TranslationServicePipelineTests: XCTestCase { let service = TranslationService(registry: registry) + // Explicit source == target: always bypass let bundle = try await service.translate( - segments: ["你好", "Hello"], + segments: ["你好"], to: "zh-Hans", - from: nil, + from: "zh-Hans", mode: .primaryWithFallback, preferredEngine: .apple, fallbackEnabled: false ) let appleRequests = await apple.requests - print("DEBUG_APPLE_REQUESTS: \(appleRequests)") - XCTAssertEqual(appleRequests.count, 1) - if appleRequests.count > 0 { - print("DEBUG_APPLE_REQUEST_0_TEXTS: \(appleRequests[0].texts)") - XCTAssertEqual(appleRequests[0].texts, ["Hello"]) - } + XCTAssertEqual(appleRequests.count, 0, "Same source/target should bypass provider") let primaryResult = bundle.primaryResult - print("DEBUG_PRIMARY_RESULT_COUNT: \(primaryResult.count)") - for (i, res) in primaryResult.enumerated() { - print("DEBUG_PRIMARY_RESULT_\(i): source=\(res.sourceText), translated=\(res.translated)") - } - XCTAssertEqual(primaryResult.count, 2) + XCTAssertEqual(primaryResult.count, 1) XCTAssertEqual(primaryResult[0].translated, "你好") - XCTAssertEqual(primaryResult[1].translated, "Hello -> zh-Hans") + } + + func testExplicitSourceLanguageRespected() async throws { + let registry = TranslationEngineRegistry(registerBuiltInProviders: false) + let apple = MockTranslationProvider( + id: "apple", + name: "Apple", + batchResults: [makeResult(source: "漢語", translated: "汉语")] + ) + await registry.register(apple, for: .apple) + let service = TranslationService(registry: registry) + + // Explicit zh-Hant → zh-Hans: must translate (script conversion) + let bundle = try await service.translate( + segments: ["漢語"], + to: "zh-Hans", + from: "zh-Hant", + mode: .primaryWithFallback, + preferredEngine: .apple, + fallbackEnabled: false + ) + + let appleRequests = await apple.requests + XCTAssertEqual(appleRequests.count, 1, "Different source/target should call provider") + XCTAssertEqual(appleRequests[0].texts, ["漢語"]) } func testPrintRealUserSettings() async { @@ -611,56 +627,57 @@ final class TranslationServicePipelineTests: XCTestCase { name: "Apple", batchResults: [ makeResult(source: "Hello world", translated: #"{""}"#), - makeResult(source: "Good morning", translated: "{}"), - makeResult(source: "Screen Translate", translated: "屏幕翻译"), - makeResult(source: "Welcome", translated: ""), - makeResult(source: "Nice to meet you", translated: #"{ "" }"#), - makeResult(source: "How are you", translated: "{“”}"), - makeResult(source: "Goodbye", translated: #"{ "": "" }"#), - makeResult(source: "Apple", translated: #"{"translation": "苹果"}"#), - makeResult(source: "Orange", translated: #"{"translatedText": " "}"#), - makeResult(source: "Banana", translated: #"{"result":}"#) ] ) await registry.register(apple, for: .apple) let service = TranslationService(registry: registry) - let bundle = try await service.translate( - segments: [ - "Hello world", "Good morning", "Screen Translate", "Welcome", - "Nice to meet you", "How are you", "Goodbye", "Apple", "Orange", "Banana" - ], - to: "zh-Hans", - from: "en", - scene: .screenshot, - mode: .primaryWithFallback, - preferredEngine: .apple, - fallbackEnabled: false + do { + let bundle = try await service.translate( + segments: ["Hello world"], + to: "zh-Hans", + from: "en", + scene: .screenshot, + mode: .primaryWithFallback, + preferredEngine: .apple, + fallbackEnabled: false + ) + let results = bundle.primaryResult + XCTAssertNotEqual(results.first?.translated, "Hello world", + "Invalid translation should not silently return source") + } catch { + // Expected: invalid translation triggers error (wrapped as MultiEngineError when fallback disabled) + XCTAssertTrue(error is TranslationProviderError || error is MultiEngineError, + "Expected translation error, got \(error)") + } + } + + func testEmptyTranslationTriggersError() async throws { + let registry = TranslationEngineRegistry(registerBuiltInProviders: false) + let apple = MockTranslationProvider( + id: "apple", + name: "Apple", + batchResults: [ + makeResult(source: "Hello", translated: ""), + ] ) - let results = bundle.primaryResult - - XCTAssertEqual(results.count, 10) - // {""} -> "Hello world" - XCTAssertEqual(results[0].translated, "Hello world") - // {} -> "Good morning" - XCTAssertEqual(results[1].translated, "Good morning") - // Normal -> "屏幕翻译" - XCTAssertEqual(results[2].translated, "屏幕翻译") - // Empty -> "Welcome" - XCTAssertEqual(results[3].translated, "Welcome") - // { "" } -> "Nice to meet you" - XCTAssertEqual(results[4].translated, "Nice to meet you") - // {“”} -> "How are you" - XCTAssertEqual(results[5].translated, "How are you") - // { "": "" } -> "Goodbye" - XCTAssertEqual(results[6].translated, "Goodbye") - // {"translation": "苹果"} -> "苹果" (深度提取成功) - XCTAssertEqual(results[7].translated, "苹果") - // {"translatedText": " "} -> "Orange" (空提取,安全回退) - XCTAssertEqual(results[8].translated, "Orange") - // {"result":} -> "Banana" (语法错误损坏JSON,安全回退) - XCTAssertEqual(results[9].translated, "Banana") + await registry.register(apple, for: .apple) + let service = TranslationService(registry: registry) + + do { + _ = try await service.translate( + segments: ["Hello"], + to: "zh-Hans", + from: "en", + mode: .primaryWithFallback, + preferredEngine: .apple, + fallbackEnabled: false + ) + XCTFail("Empty translation should trigger error for fallback") + } catch { + // Expected + } } } From 2aeb08327f7c5520cb25ce6864c9ec247abff021 Mon Sep 17 00:00:00 2001 From: Hubert Date: Tue, 27 Oct 2026 11:30:05 +0800 Subject: [PATCH 2/3] ci(release): add notarization and stapling for Gatekeeper approval - Add Notarize & Staple step between app signing and Sparkle DMG signing - Submit .app ZIP to Apple notarytool, wait, and staple the ticket - Recreate DMG with stapled app, then notarize and staple the DMG itself - Verify with stapler validate and spctl --assess - Gracefully skip if secrets missing or app is ad-hoc signed --- .github/workflows/release.yml | 77 +++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c07db3d..e246682 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -238,6 +238,83 @@ jobs: rm -rf dmg_temp + - name: Notarize & Staple App + id: notarize + env: + APPLE_ID: ${{ secrets.APPLE_ID }} + APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }} + APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + run: | + APP_PATH="build/Build/Products/Release/${{ env.PROJECT_NAME }}.app" + VERSION=${{ steps.vars.outputs.version }} + + if [ -z "$APPLE_ID" ] || [ -z "$APPLE_APP_SPECIFIC_PASSWORD" ] || [ -z "$APPLE_TEAM_ID" ]; then + echo "Warning: Notarization secrets not configured, skipping notarization" + echo "notarized=false" >> $GITHUB_OUTPUT + exit 0 + fi + + if codesign -dv "$APP_PATH" 2>&1 | grep -q "Signature=adhoc"; then + echo "Warning: App is ad-hoc signed, skipping notarization" + echo "notarized=false" >> $GITHUB_OUTPUT + exit 0 + fi + + echo "Creating ZIP for notarization submission..." + ZIP_PATH="$RUNNER_TEMP/${{ env.PROJECT_NAME }}-${VERSION}-notarize.zip" + ditto -c -k --keepParent "$APP_PATH" "$ZIP_PATH" + + echo "Submitting to Apple notarization service..." + xcrun notarytool submit "$ZIP_PATH" \ + --apple-id "$APPLE_ID" \ + --password "$APPLE_APP_SPECIFIC_PASSWORD" \ + --team-id "$APPLE_TEAM_ID" \ + --wait \ + --timeout 30m + + echo "Stapling notarization ticket to app..." + xcrun stapler staple "$APP_PATH" + + echo "Verifying notarization..." + xcrun stapler validate "$APP_PATH" + spctl --assess --type execute --verbose "$APP_PATH" + + echo "Notarization complete." + + echo "Recreating DMG with stapled app..." + DMG_FILE="${{ env.PROJECT_NAME }}-${VERSION}.dmg" + ARM64_DMG_FILE="${{ env.PROJECT_NAME }}-${VERSION}-arm64.dmg" + + mkdir -p dmg_temp + cp -R "$APP_PATH" dmg_temp/ + ln -sf /Applications dmg_temp/Applications + + hdiutil create -volname "${{ env.PROJECT_NAME }}" \ + -srcfolder dmg_temp \ + -ov -format UDZO \ + "$DMG_FILE" + + cp "$DMG_FILE" "$ARM64_DMG_FILE" + + echo "Notarizing DMG..." + DMG_ZIP="$RUNNER_TEMP/${{ env.PROJECT_NAME }}-${VERSION}-dmg.zip" + ditto -c -k --keepParent "$DMG_FILE" "$DMG_ZIP" + + xcrun notarytool submit "$DMG_ZIP" \ + --apple-id "$APPLE_ID" \ + --password "$APPLE_APP_SPECIFIC_PASSWORD" \ + --team-id "$APPLE_TEAM_ID" \ + --wait \ + --timeout 30m + + xcrun stapler staple "$DMG_FILE" + cp "$DMG_FILE" "$ARM64_DMG_FILE" + + rm -rf dmg_temp + rm -f "$ZIP_PATH" "$DMG_ZIP" + + echo "notarized=true" >> $GITHUB_OUTPUT + - name: Sign DMG for Sparkle id: sign_dmg run: | From 47e98c414976ee3c8ef8a2eb9623e34b11d47869 Mon Sep 17 00:00:00 2001 From: Hubert Date: Tue, 27 Oct 2026 11:51:19 +0800 Subject: [PATCH 3/3] fix(review): address 8 OpenCodeReview/Codex findings - Reset isStartingCapture on full-screen early return (CaptureSessionController) - Reset isPerformingOCR/isTranslating on crop invalidation (PreviewViewModel+Crop) - Fix appendingAPISuffix infinite loop on trailing-slash URLs (LLMTranslationProvider) - Distinguish valid unchanged translations from broken output (TranslationService) - Update appcast DMG size after notarization rebuild (release.yml) - Remove dead presentationID property (TextTranslationPopupWindow) - Remove dead overrepresentedTexts computation (VLMTextDeduplicator) --- .github/workflows/release.yml | 5 ++- .../Capture/CaptureSessionController.swift | 1 + .../Preview/PreviewViewModel+Crop.swift | 2 ++ .../TextTranslationPopupWindow.swift | 2 -- .../Providers/LLMTranslationProvider.swift | 7 +++-- TransFrame/Services/TranslationService.swift | 31 ++++++++++++++++++- TransFrame/Services/VLMTextDeduplicator.swift | 25 ++------------- package-lock.json | 13 ++++++++ 8 files changed, 57 insertions(+), 29 deletions(-) create mode 100644 package-lock.json diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e246682..6ff05a6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -313,6 +313,9 @@ jobs: rm -rf dmg_temp rm -f "$ZIP_PATH" "$DMG_ZIP" + # Update DMG size for appcast (may have changed after notarization) + NEW_DMG_SIZE=$(stat -f%z "$DMG_FILE") + echo "dmg_size=$NEW_DMG_SIZE" >> $GITHUB_OUTPUT echo "notarized=true" >> $GITHUB_OUTPUT - name: Sign DMG for Sparkle @@ -378,7 +381,7 @@ jobs: BUILD_NUM="${{ steps.build_number.outputs.build_num }}" DMG_URL="https://github.com/${{ github.repository }}/releases/download/${{ steps.vars.outputs.tag_name }}/${{ env.PROJECT_NAME }}-${VERSION}.dmg" PUBDATE="${{ steps.pubdate.outputs.date }}" - DMG_SIZE="${{ steps.create_dmg.outputs.dmg_size }}" + DMG_SIZE="${{ steps.notarize.outputs.dmg_size || steps.create_dmg.outputs.dmg_size }}" SIGNATURE="${{ steps.sign_dmg.outputs.signature }}" # Build enclosure tag with or without signature diff --git a/TransFrame/Features/Capture/CaptureSessionController.swift b/TransFrame/Features/Capture/CaptureSessionController.swift index 587ec89..3a9f7e5 100644 --- a/TransFrame/Features/Capture/CaptureSessionController.swift +++ b/TransFrame/Features/Capture/CaptureSessionController.swift @@ -90,6 +90,7 @@ final class CaptureSessionController: NSObject, SelectionOverlayDelegate { CaptureDocumentStore.shared.register(doc) self.dispatchAction(.copy, for: doc) self.onCaptureComplete?(doc) + self.isStartingCapture = false return } diff --git a/TransFrame/Features/Preview/PreviewViewModel+Crop.swift b/TransFrame/Features/Preview/PreviewViewModel+Crop.swift index fbd8bda..da04d5d 100644 --- a/TransFrame/Features/Preview/PreviewViewModel+Crop.swift +++ b/TransFrame/Features/Preview/PreviewViewModel+Crop.swift @@ -71,6 +71,8 @@ extension PreviewViewModel { ocrTask?.cancel() translationTask?.cancel() analysisGeneration &+= 1 + isPerformingOCR = false + isTranslating = false ocrResult = nil bilingualSegments = [] diff --git a/TransFrame/Features/TextTranslation/TextTranslationPopupWindow.swift b/TransFrame/Features/TextTranslation/TextTranslationPopupWindow.swift index 0bf4f4e..7e93af8 100644 --- a/TransFrame/Features/TextTranslation/TextTranslationPopupWindow.swift +++ b/TransFrame/Features/TextTranslation/TextTranslationPopupWindow.swift @@ -29,7 +29,6 @@ final class TextTranslationPopupController: NSObject { private var window: NSWindow? private weak var popupDelegate: TextTranslationPopupDelegate? - private var presentationID = UUID() var onDismiss: (() -> Void)? private let debounceInterval: TimeInterval = 0.3 @@ -85,7 +84,6 @@ final class TextTranslationPopupController: NSObject { newWindow.minSize = NSSize(width: 380, height: 200) newWindow.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary] - presentationID = UUID() self.window = newWindow lastPresentationTime = Date() diff --git a/TransFrame/Services/Translation/Providers/LLMTranslationProvider.swift b/TransFrame/Services/Translation/Providers/LLMTranslationProvider.swift index d476f95..c706cf4 100644 --- a/TransFrame/Services/Translation/Providers/LLMTranslationProvider.swift +++ b/TransFrame/Services/Translation/Providers/LLMTranslationProvider.swift @@ -530,10 +530,11 @@ actor LLMTranslationProvider: TranslationProvider, TranslationPromptConfigurable /// remainder is appended. Handles trailing slashes and `URL.appendingPathComponent` /// percent-encoding quirks. private nonisolated static func appendingAPISuffix(_ base: URL, suffix: String) -> URL { - var url = base - while url.absoluteString.hasSuffix("/") { - url.deleteLastPathComponent() + var urlString = base.absoluteString + while urlString.hasSuffix("/") { + urlString = String(urlString.dropLast()) } + guard var url = URL(string: urlString) else { return base } let baseParts = url.pathComponents.filter { $0 != "/" && !$0.isEmpty } let suffixParts = suffix.split(separator: "/").map(String.init) // Find the longest overlapping prefix of suffix already present at end of base diff --git a/TransFrame/Services/TranslationService.swift b/TransFrame/Services/TranslationService.swift index 48f1774..0e3297d 100644 --- a/TransFrame/Services/TranslationService.swift +++ b/TransFrame/Services/TranslationService.swift @@ -513,7 +513,13 @@ actor TranslationService { return nil } let cleaned = self.sanitizeTranslation(translated: res.translatedText, source: res.sourceText) - if cleaned == res.sourceText, res.translatedText != res.sourceText { + // Only treat as failure when the provider returned something clearly + // broken (empty, JSON garbage, etc.) that sanitize converted back to + // source. A valid translation that happens to equal the source (proper + // nouns, code identifiers, "OK") must NOT be treated as failure. + if cleaned == res.sourceText, + res.translatedText != res.sourceText, + self.isLikelyBrokenTranslation(res.translatedText, source: res.sourceText) { hasFailedSlot = true } return TranslationResult( @@ -589,6 +595,29 @@ actor TranslationService { return translated } + /// Returns true when the raw provider output is clearly broken (empty, + /// JSON garbage, braces-only), as opposed to a valid translation that + /// happens to be identical to the source text. + private func isLikelyBrokenTranslation(_ translated: String, source: String) -> Bool { + let trimmed = translated.trimmingCharacters(in: .whitespacesAndNewlines) + if trimmed.isEmpty { return true } + // JSON-like garbage that sanitize extracted nothing useful from + if trimmed.hasPrefix("{"), trimmed.hasSuffix("}") { + return true + } + if trimmed.hasPrefix("["), trimmed.hasSuffix("]") { + return true + } + // Only braces/quotes/colons/whitespace + let allStructural = trimmed.allSatisfy { char in + char == "{" || char == "}" || char == "\"" || char == "'" || char == "`" || + char == "[" || char == "]" || char == ":" || char == "," || + char == "“" || char == "”" || char == "‘" || char == "’" || + char.isWhitespace || char.isNumber + } + return allStructural + } + private func resolvedPromptTemplate( for provider: any TranslationProvider, engine: TranslationEngineType, diff --git a/TransFrame/Services/VLMTextDeduplicator.swift b/TransFrame/Services/VLMTextDeduplicator.swift index 140af17..9ee8e33 100644 --- a/TransFrame/Services/VLMTextDeduplicator.swift +++ b/TransFrame/Services/VLMTextDeduplicator.swift @@ -46,28 +46,9 @@ enum VLMTextDeduplicator { ) -> [VLMTextSegment] { guard !segments.isEmpty else { return segments } - // Count text frequency to detect hallucinations - var textCounts: [String: Int] = [:] - for segment in segments { - let normalizedText = segment.text.trimmingCharacters(in: .whitespacesAndNewlines) - textCounts[normalizedText, default: 0] += 1 - } - - let total = segments.count - let validatedMultiplier = max(0.01, min(1.0, config.percentageMultiplier)) - let percentageThreshold = max(config.minCountThreshold, Int(Double(total) * validatedMultiplier)) - - var overrepresentedTexts = Set() - for (text, count) in textCounts { - if count > percentageThreshold { - overrepresentedTexts.insert(text) - logger?(text.count, count, percentageThreshold) - } - } - - // Deduplicate using text+position signature ONLY. - // Do NOT collapse same-text segments at different positions — - // those are legitimate repeated UI elements (buttons, table cells). + // Deduplicate using text+position signature only. + // Same-text segments at different positions are legitimate repeated + // UI elements (buttons, table cells) and must be preserved. var seenSignatures = Set() var result: [VLMTextSegment] = [] diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..41be811 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,13 @@ +{ + "name": "transframe", + "version": "1.0.1", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "transframe", + "version": "1.0.1", + "license": "MIT" + } + } +}