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

rpc: surface raw error lines and auto-start worker

Browse Source
This commit is contained in:
Peter Steinberger
2025-12-07 15:46:26 +01:00
parent 75234da135
commit ee845376b5
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apps/macos/Sources/Clawdis/AgentRPC.swift
View File

@@ -10,6 +10,7 @@ actor AgentRPC {
private var buffer = Data() private var buffer = Data()
private var waiters: [CheckedContinuation<String, Error>] = [] private var waiters: [CheckedContinuation<String, Error>] = []
private let logger = Logger(subsystem: "com.steipete.clawdis", category: "agent.rpc") private let logger = Logger(subsystem: "com.steipete.clawdis", category: "agent.rpc")
private var starting = false
private struct RpcError: Error { let message: String } private struct RpcError: Error { let message: String }
@@ -20,8 +21,12 @@ actor AgentRPC {
deliver: Bool, deliver: Bool,
to: String?) async -> (ok: Bool, text: String?, error: String?) to: String?) async -> (ok: Bool, text: String?, error: String?)
{ {
guard process?.isRunning == true else { if process?.isRunning != true {
return (false, nil, "rpc worker not running") do {
try await self.start()
} catch {
return (false, nil, "rpc worker not running: \(error.localizedDescription)")
}
} }
do { do {
var payload: [String: Any] = [ var payload: [String: Any] = [
@@ -55,7 +60,7 @@ actor AgentRPC {
if let err = parsed["error"] as? String { if let err = parsed["error"] as? String {
return (false, nil, err) return (false, nil, err)
} }
return (false, nil, "rpc returned unexpected response") return (false, nil, "rpc returned unexpected response: \(line)")
} catch { } catch {
logger.error("rpc send failed: \(error.localizedDescription, privacy: .public)") logger.error("rpc send failed: \(error.localizedDescription, privacy: .public)")
await stop() await stop()
@@ -64,8 +69,12 @@ actor AgentRPC {
} }
func status() async -> (ok: Bool, error: String?) { func status() async -> (ok: Bool, error: String?) {
guard process?.isRunning == true else { if process?.isRunning != true {
return (false, "rpc worker not running") do {
try await self.start()
} catch {
return (false, "rpc worker not running: \(error.localizedDescription)")
}
} }
do { do {
let payload: [String: Any] = ["type": "status"] let payload: [String: Any] = ["type": "status"]
@@ -77,7 +86,7 @@ actor AgentRPC {
let line = try await nextLine() let line = try await nextLine()
let parsed = try JSONSerialization.jsonObject(with: Data(line.utf8)) as? [String: Any] let parsed = try JSONSerialization.jsonObject(with: Data(line.utf8)) as? [String: Any]
if let ok = parsed?["ok"] as? Bool, ok { return (true, nil) } if let ok = parsed?["ok"] as? Bool, ok { return (true, nil) }
return (false, parsed?["error"] as? String ?? "rpc status failed") return (false, parsed?["error"] as? String ?? "rpc status failed: \(line)")
} catch { } catch {
logger.error("rpc status failed: \(error.localizedDescription, privacy: .public)") logger.error("rpc status failed: \(error.localizedDescription, privacy: .public)")
await stop() await stop()
@@ -108,6 +117,9 @@ actor AgentRPC {
// MARK: - Process lifecycle // MARK: - Process lifecycle
func start() async throws { func start() async throws {
if self.starting { return }
self.starting = true
defer { self.starting = false }
let process = Process() let process = Process()
let command = CommandResolver.clawdisCommand(subcommand: "rpc") let command = CommandResolver.clawdisCommand(subcommand: "rpc")
process.executableURL = URL(fileURLWithPath: command.first ?? "/usr/bin/env") process.executableURL = URL(fileURLWithPath: command.first ?? "/usr/bin/env")