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

VoiceWake: remove python hop; use escaped literal under /bin/sh

Browse Source
This commit is contained in:
Peter Steinberger
2025-12-07 18:03:25 +01:00
parent f3ebb2e9ce
commit b837c68df8
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
apps/macos/Sources/Clawdis/VoiceWakeForwarder.swift
View File

@@ -49,11 +49,11 @@ enum VoiceWakeForwarder {
steps.append("CLI=\"\"") steps.append("CLI=\"\"")
} }
steps.append("if [ -z \"$CLI\" ]; then CLI=$(command -v clawdis-mac 2>/dev/null || true); fi") steps.append("if [ -z \"${CLI:-}\" ]; then CLI=$(command -v clawdis-mac 2>/dev/null || true); fi")
steps steps
.append( .append(
"if [ -z \"$CLI\" ]; then for c in \(searchList); do [ -x \"$c\" ] && CLI=\"$c\" && break; done; fi") "if [ -z \"${CLI:-}\" ]; then for c in \(searchList); do [ -x \"$c\" ] && CLI=\"$c\" && break; done; fi")
steps.append("if [ -z \"$CLI\" ]; then echo 'clawdis-mac missing'; exit 127; fi") steps.append("if [ -z \"${CLI:-}\" ]; then echo 'clawdis-mac missing'; exit 127; fi")
if echoPath { if echoPath {
steps.append("echo __CLI:$CLI") steps.append("echo __CLI:$CLI")
@@ -138,17 +138,12 @@ enum VoiceWakeForwarder {
} }
args.append(userHost) args.append(userHost)
let cmdTemplate: String let escaped = Self.shellEscape(transcript) // single-quoted literal, safe for sh/zsh
if config.commandTemplate.contains("${text}") { let templated: String = config.commandTemplate.contains("${text}")
cmdTemplate = config.commandTemplate.replacingOccurrences(of: "${text}", with: "$CLAW_TEXT") ? config.commandTemplate.replacingOccurrences(of: "${text}", with: "$CLAW_TEXT")
} else { : Self.renderedCommand(template: config.commandTemplate, transcript: transcript)
cmdTemplate = config.commandTemplate let script = self.commandWithCliPath("CLAW_TEXT=\(escaped); \(templated)", target: destination)
} args.append(contentsOf: ["/bin/sh", "-c", script])
let b64 = transcript.data(using: .utf8)?.base64EncodedString() ?? ""
let pythonDecode = "PYBIN=$(command -v python3 || command -v python || true); if [ -z \\\"$PYBIN\\\" ]; then echo 'python missing'; exit 127; fi; CLAW_TEXT=$($PYBIN -c \\\"import base64; print(base64.b64decode('" + b64 + "').decode('utf-8'), end='')\\\");"
let shellCommand = "PATH=\(cliHelperSearchPaths.joined(separator: ":")); \(pythonDecode) \(self.commandWithCliPath(cmdTemplate, target: destination))"
args.append(contentsOf: ["sh", "-c", shellCommand])
let debugCmd = (["/usr/bin/ssh"] + args).joined(separator: " ") let debugCmd = (["/usr/bin/ssh"] + args).joined(separator: " ")
self.logger.info("voice wake ssh cmd=\(debugCmd, privacy: .public)") self.logger.info("voice wake ssh cmd=\(debugCmd, privacy: .public)")
@@ -180,7 +175,7 @@ enum VoiceWakeForwarder {
let clipped = out.isEmpty ? "(no output)" : String(out.prefix(240)) let clipped = out.isEmpty ? "(no output)" : String(out.prefix(240))
self.logger.error( self.logger.error(
"voice wake forward failed exit=\(process.terminationStatus) host=\(userHost, privacy: .public) out=\(clipped, privacy: .public) cmd=\(debugCmd, privacy: .public)") "voice wake forward failed exit=\(process.terminationStatus) host=\(userHost, privacy: .public) out=\(clipped, privacy: .public) cmd=\(debugCmd, privacy: .public)")
if process.terminationStatus == 127 { if process.terminationStatus == 126 || process.terminationStatus == 127 {
return .failure(.cliMissingOrFailed(process.terminationStatus, out)) return .failure(.cliMissingOrFailed(process.terminationStatus, out))
} }
return .failure(.nonZeroExit(process.terminationStatus, out)) return .failure(.nonZeroExit(process.terminationStatus, out))
@@ -229,7 +224,7 @@ enum VoiceWakeForwarder {
// Stage 2: ensure remote clawdis-mac is present and responsive. // Stage 2: ensure remote clawdis-mac is present and responsive.
var checkArgs = baseArgs var checkArgs = baseArgs
let statusCommand = self.commandWithCliPath("clawdis-mac status", target: destination, echoCliPath: true) let statusCommand = self.commandWithCliPath("clawdis-mac status", target: destination, echoCliPath: true)
checkArgs.append(contentsOf: [userHost, "sh", "-c", statusCommand]) checkArgs.append(contentsOf: [userHost, "/bin/sh", "-c", statusCommand])
let checkProc = Process() let checkProc = Process()
checkProc.executableURL = URL(fileURLWithPath: "/usr/bin/ssh") checkProc.executableURL = URL(fileURLWithPath: "/usr/bin/ssh")
checkProc.arguments = checkArgs checkProc.arguments = checkArgs