From 1d38f5a4d572d32569b9731e3d6e88a51acbeaf1 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sun, 7 Dec 2025 05:54:47 +0100
Subject: [PATCH] Revert "fix: auto-start rpc worker for agent calls"

This reverts commit e70f8471a8594d70cb3389417a82cb47f9f6ef88.
---
 apps/macos/Sources/Clawdis/AgentRPC.swift  | 18 ++++--------------
 apps/macos/Sources/Clawdis/Constants.swift |  2 +-
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/apps/macos/Sources/Clawdis/AgentRPC.swift b/apps/macos/Sources/Clawdis/AgentRPC.swift
index 5dbc3a8b0..ef81df76e 100644
--- a/apps/macos/Sources/Clawdis/AgentRPC.swift
+++ b/apps/macos/Sources/Clawdis/AgentRPC.swift
@@ -14,10 +14,8 @@ actor AgentRPC {
     private struct RpcError: Error { let message: String }
 
     func send(text: String, thinking: String?, session: String) async -> (ok: Bool, text: String?, error: String?) {
-        if process?.isRunning != true {
-            do { try await ensureRunning() } catch {
-                return (false, nil, "rpc worker not running")
-            }
+        guard process?.isRunning == true else {
+            return (false, nil, "rpc worker not running")
         }
         do {
             let payload: [String: Any] = [
@@ -25,7 +23,6 @@ actor AgentRPC {
                 "text": text,
                 "session": session,
                 "thinking": thinking ?? "default",
-                "deliver": true,
             ]
             let data = try JSONSerialization.data(withJSONObject: payload)
             guard let stdinHandle else { throw RpcError(message: "stdin missing") }
@@ -59,10 +56,8 @@ actor AgentRPC {
     }
 
     func status() async -> (ok: Bool, error: String?) {
-        if process?.isRunning != true {
-            do { try await ensureRunning() } catch {
-                return (false, "rpc worker not running")
-            }
+        guard process?.isRunning == true else {
+            return (false, "rpc worker not running")
         }
         do {
             let payload: [String: Any] = ["type": "status"]
@@ -119,11 +114,6 @@ actor AgentRPC {
         }
     }
 
-    private func ensureRunning() async throws {
-        if let process, process.isRunning { return }
-        try await start()
-    }
-
     private func stop() async {
         stdoutHandle?.readabilityHandler = nil
         process?.terminate()
diff --git a/apps/macos/Sources/Clawdis/Constants.swift b/apps/macos/Sources/Clawdis/Constants.swift
index c8c260594..f177b00c0 100644
--- a/apps/macos/Sources/Clawdis/Constants.swift
+++ b/apps/macos/Sources/Clawdis/Constants.swift
@@ -24,7 +24,7 @@ let modelCatalogPathKey = "clawdis.modelCatalogPath"
 let modelCatalogReloadKey = "clawdis.modelCatalogReload"
 let voiceWakeSupported: Bool = ProcessInfo.processInfo.operatingSystemVersion.majorVersion >= 26
 let cliHelperSearchPaths = ["/usr/local/bin", "/opt/homebrew/bin"]
-let defaultVoiceWakeForwardCommand = "clawdis-mac agent --message \"${text}\" --thinking low --session main --deliver"
+let defaultVoiceWakeForwardCommand = "clawdis-mac agent --message \"${text}\" --thinking low"
 let defaultVoiceWakeForwardPort = 22
 // Allow enough time for remote agent responses (LLM replies often take >10s).
 let defaultVoiceWakeForwardTimeout: TimeInterval = 30