diff --git a/apps/macos/Sources/Clawdis/Utilities.swift b/apps/macos/Sources/Clawdis/Utilities.swift
index 336b3d5c3..fe9aca90a 100644
--- a/apps/macos/Sources/Clawdis/Utilities.swift
+++ b/apps/macos/Sources/Clawdis/Utilities.swift
@@ -319,7 +319,8 @@ enum CommandResolver {
         let quotedArgs = (["clawdis", subcommand] + extraArgs).map(self.shellQuote).joined(separator: " ")
         let cdPrefix = settings.projectRoot.isEmpty ? "" : "cd \(self.shellQuote(settings.projectRoot)) && "
         let scriptBody = "\(cdPrefix)\(quotedArgs)"
-        args.append(contentsOf: ["/bin/sh", "-c", scriptBody])
+        let wrapped = VoiceWakeForwarder.commandWithCliPath(scriptBody, target: settings.target)
+        args.append(contentsOf: ["/bin/sh", "-c", wrapped])
         return ["/usr/bin/ssh"] + args
     }
 
diff --git a/apps/macos/Tests/ClawdisIPCTests/CommandResolverTests.swift b/apps/macos/Tests/ClawdisIPCTests/CommandResolverTests.swift
index 6a7e61ed8..7ad02970b 100644
--- a/apps/macos/Tests/ClawdisIPCTests/CommandResolverTests.swift
+++ b/apps/macos/Tests/ClawdisIPCTests/CommandResolverTests.swift
@@ -101,6 +101,7 @@ import Testing
             #expect(script.contains("clawdis"))
             #expect(script.contains("status"))
             #expect(script.contains("--json"))
+            #expect(script.contains("CLI="))
         }
     }
 }