romtuck/openclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ios): unblock device builds

Browse Source
This commit is contained in:
Peter Steinberger 2025-12-30 11:16:15 +01:00
parent 0d95d63258
commit 312443235d
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/ios/Sources/Model/NodeAppModel.swift
View File

@ -43,7 +43,7 @@ final class NodeAppModel {
init() { init() {
self.voiceWake.configure { [weak self] cmd in self.voiceWake.configure { [weak self] cmd in
guard let self else { return } guard let self else { return }
let sessionKey = self.mainSessionKey let sessionKey = await MainActor.run { self.mainSessionKey }
do { do {
try await self.sendVoiceTranscript(text: cmd, sessionKey: sessionKey) try await self.sendVoiceTranscript(text: cmd, sessionKey: sessionKey)
} catch { } catch {

21
apps/ios/Sources/Voice/TalkModeManager.swift
View File

@ -231,12 +231,14 @@ final class TalkModeManager: NSObject {
let startedAt = Date().timeIntervalSince1970 let startedAt = Date().timeIntervalSince1970
let sessionKey = self.mainSessionKey let sessionKey = self.mainSessionKey
await self.subscribeChatIfNeeded(sessionKey: sessionKey) await self.subscribeChatIfNeeded(sessionKey: sessionKey)
self.logger.info("chat.send start sessionKey=\(sessionKey, privacy: .public) chars=\(prompt.count, privacy: .public)") self.logger.info(
"chat.send start sessionKey=\(sessionKey, privacy: .public) chars=\(prompt.count, privacy: .public)")
let runId = try await self.sendChat(prompt, bridge: bridge) let runId = try await self.sendChat(prompt, bridge: bridge)
self.logger.info("chat.send ok runId=\(runId, privacy: .public)") self.logger.info("chat.send ok runId=\(runId, privacy: .public)")
let completion = await self.waitForChatCompletion(runId: runId, bridge: bridge, timeoutSeconds: 120) let completion = await self.waitForChatCompletion(runId: runId, bridge: bridge, timeoutSeconds: 120)
if completion == .timeout { if completion == .timeout {
self.logger.warning("chat completion timeout runId=\(runId, privacy: .public); attempting history fallback") self.logger.warning(
"chat completion timeout runId=\(runId, privacy: .public); attempting history fallback")
} else if completion == .aborted { } else if completion == .aborted {
self.statusText = "Aborted" self.statusText = "Aborted"
self.logger.warning("chat completion aborted runId=\(runId, privacy: .public)") self.logger.warning("chat completion aborted runId=\(runId, privacy: .public)")
@ -450,7 +452,8 @@ final class TalkModeManager: NSObject {
let desiredOutputFormat = directive?.outputFormat ?? self.defaultOutputFormat let desiredOutputFormat = directive?.outputFormat ?? self.defaultOutputFormat
let outputFormat = ElevenLabsTTSClient.validatedOutputFormat(desiredOutputFormat) let outputFormat = ElevenLabsTTSClient.validatedOutputFormat(desiredOutputFormat)
if outputFormat == nil, let desiredOutputFormat, !desiredOutputFormat.isEmpty { if outputFormat == nil, let desiredOutputFormat, !desiredOutputFormat.isEmpty {
self.logger.warning("talk output_format unsupported for local playback: \(desiredOutputFormat, privacy: .public)") self.logger.warning(
"talk output_format unsupported for local playback: \(desiredOutputFormat, privacy: .public)")
} }
let request = ElevenLabsTTSRequest( let request = ElevenLabsTTSRequest(
@ -480,7 +483,8 @@ final class TalkModeManager: NSObject {
do { do {
try self.startRecognition() try self.startRecognition()
} catch { } catch {
self.logger.warning("startRecognition during speak failed: \(error.localizedDescription, privacy: .public)") self.logger.warning(
"startRecognition during speak failed: \(error.localizedDescription, privacy: .public)")
} }
} }
@ -492,20 +496,23 @@ final class TalkModeManager: NSObject {
do { do {
try self.startRecognition() try self.startRecognition()
} catch { } catch {
self.logger.warning("startRecognition during speak failed: \(error.localizedDescription, privacy: .public)") self.logger.warning(
"startRecognition during speak failed: \(error.localizedDescription, privacy: .public)")
} }
} }
self.statusText = "Speaking (System)…" self.statusText = "Speaking (System)…"
try await TalkSystemSpeechSynthesizer.shared.speak(text: cleaned, language: language) try await TalkSystemSpeechSynthesizer.shared.speak(text: cleaned, language: language)
} }
} catch { } catch {
self.logger.error("tts failed: \(error.localizedDescription, privacy: .public); falling back to system voice") self.logger.error(
"tts failed: \(error.localizedDescription, privacy: .public); falling back to system voice")
do { do {
if self.interruptOnSpeech { if self.interruptOnSpeech {
do { do {
try self.startRecognition() try self.startRecognition()
} catch { } catch {
self.logger.warning("startRecognition during speak failed: \(error.localizedDescription, privacy: .public)") self.logger.warning(
"startRecognition during speak failed: \(error.localizedDescription, privacy: .public)")
} }
} }
self.statusText = "Speaking (System)…" self.statusText = "Speaking (System)…"

2
apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatViewModel.swift
View File

@ -176,7 +176,7 @@ public final class ClawdisChatViewModel {
private static func dedupeKey(for message: ClawdisChatMessage) -> String? { private static func dedupeKey(for message: ClawdisChatMessage) -> String? {
guard let timestamp = message.timestamp else { return nil } guard let timestamp = message.timestamp else { return nil }
let text = message.content.compactMap { $0.text }.joined(separator: "\n") let text = message.content.compactMap(\.text).joined(separator: "\n")
.trimmingCharacters(in: .whitespacesAndNewlines) .trimmingCharacters(in: .whitespacesAndNewlines)
guard !text.isEmpty else { return nil } guard !text.isEmpty else { return nil }
return "\(message.role)|\(timestamp)|\(text)" return "\(message.role)|\(timestamp)|\(text)"