let5see/clawdbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Peter Steinberger
2025-12-12 19:28:10 +00:00
parent f1320b79ce bf41197b97
commit c0abab226d
4 changed files with 63 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
apps/macos/Sources/Clawdis/PermissionManager.swift
View File

@@ -67,12 +67,27 @@ enum PermissionManager {
results[cap] = ScreenRecordingProbe.isAuthorized()
case .microphone:
let granted = AVCaptureDevice.authorizationStatus(for: .audio) == .authorized
if interactive, !granted {
let ok = await AVCaptureDevice.requestAccess(for: .audio)
results[cap] = ok
} else {
results[cap] = granted
let status = AVCaptureDevice.authorizationStatus(for: .audio)
switch status {
case .authorized:
results[cap] = true
case .notDetermined:
if interactive {
let ok = await AVCaptureDevice.requestAccess(for: .audio)
results[cap] = ok
} else {
results[cap] = false
}
case .denied, .restricted:
results[cap] = false
if interactive {
MicrophonePermissionHelper.openSettings()
}
@unknown default:
results[cap] = false
}
case .speechRecognition:
@@ -150,6 +165,21 @@ enum NotificationPermissionHelper {
}
}
enum MicrophonePermissionHelper {
static func openSettings() {
let candidates = [
"x-apple.systempreferences:com.apple.preference.security?Privacy_Microphone",
"x-apple.systempreferences:com.apple.preference.security",
]
for candidate in candidates {
if let url = URL(string: candidate), NSWorkspace.shared.open(url) {
return
}
}
}
}
enum AppleScriptPermission {
private static let logger = Logger(subsystem: "com.steipete.clawdis", category: "AppleScriptPermission")

13
apps/macos/Sources/Clawdis/WebChatWindow.swift
View File

@@ -388,11 +388,19 @@ final class WebChatWindowController: NSWindowController, WKNavigationDelegate, N
}
func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
if Self.shouldIgnoreNavigationError(error) {
webChatLogger.debug("webchat navigation cancelled (provisional)")
return
}
webChatLogger.error("webchat navigation failed (provisional): \(error.localizedDescription, privacy: .public)")
self.showError(error.localizedDescription)
}
func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
if Self.shouldIgnoreNavigationError(error) {
webChatLogger.debug("webchat navigation cancelled")
return
}
webChatLogger.error("webchat navigation failed: \(error.localizedDescription, privacy: .public)")
self.showError(error.localizedDescription)
}
@@ -483,6 +491,11 @@ final class WebChatWindowController: NSWindowController, WKNavigationDelegate, N
if let url = Bundle.module.url(forResource: "WebChat", withExtension: nil) { return url }
throw NSError(domain: "WebChat", code: 10, userInfo: [NSLocalizedDescriptionKey: "WebChat assets missing"])
}
private static func shouldIgnoreNavigationError(_ error: Error) -> Bool {
let ns = error as NSError
return ns.domain == NSURLErrorDomain && ns.code == NSURLErrorCancelled
}
}
extension WebChatWindowController {