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

SSH remote uses clawdis only

main
Peter Steinberger 2025-12-08 13:20:55 +01:00
parent 92457f7fab
commit a6ff62c79c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/macos/Sources/Clawdis/Utilities.swift
View File

@ -319,18 +319,20 @@ enum CommandResolver {
let userHost = parsed.user.map { "\($0)@\(parsed.host)" } ?? parsed.host let userHost = parsed.user.map { "\($0)@\(parsed.host)" } ?? parsed.host
args.append(userHost) args.append(userHost)
// Prefer the Node CLI ("clawdis") on the remote host; fall back to pnpm or the mac helper if present. // Run the real clawdis CLI on the remote host; do not fall back to clawdis-mac.
let exportedPath = "/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/steipete/Library/pnpm:$PATH" let exportedPath = "/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/steipete/Library/pnpm:$PATH"
let cdPrefix = settings.projectRoot.isEmpty ? "" : "cd \(self.shellQuote(settings.projectRoot)) && " let cdPrefix = settings.projectRoot.isEmpty ? "" : "cd \(self.shellQuote(settings.projectRoot)) && "
let prjVar = settings.projectRoot.isEmpty ? "" : "PRJ=\(self.shellQuote(settings.projectRoot)); "
let quotedArgs = ([subcommand] + extraArgs).map(self.shellQuote).joined(separator: " ") let quotedArgs = ([subcommand] + extraArgs).map(self.shellQuote).joined(separator: " ")
let scriptBody = """ let scriptBody = """
PATH=\(exportedPath); PATH=\(exportedPath);
\(prjVar)
CLI=""; CLI="";
if command -v clawdis >/dev/null 2>&1; then CLI="clawdis"; if command -v clawdis >/dev/null 2>&1; then CLI="clawdis";
elif [ -n "${PRJ:-}" ] && [ -f "$PRJ/bin/clawdis.js" ] && command -v node >/dev/null 2>&1; then CLI="node $PRJ/bin/clawdis.js";
elif command -v pnpm >/dev/null 2>&1; then CLI="pnpm --silent clawdis"; elif command -v pnpm >/dev/null 2>&1; then CLI="pnpm --silent clawdis";
elif command -v clawdis-mac >/dev/null 2>&1; then CLI="clawdis-mac";
fi; fi;
if [ -z "$CLI" ]; then echo "clawdis missing on remote host"; exit 127; fi; if [ -z "$CLI" ]; then echo "clawdis CLI missing on remote host"; exit 127; fi;
\(cdPrefix)$CLI \(quotedArgs) \(cdPrefix)$CLI \(quotedArgs)
""" """
args.append(contentsOf: ["/bin/sh", "-c", scriptBody]) args.append(contentsOf: ["/bin/sh", "-c", scriptBody])