vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-06 02:10:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(macos): stabilize shell timeouts and command resolution tests

Browse Source
This commit is contained in:
Peter Steinberger
2026-04-09 03:52:59 +01:00
parent a12b8a7258
commit 0fbaef799f
3 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/macos/Sources/OpenClaw/CommandResolver.swift
View File

@@ -235,7 +235,8 @@ enum CommandResolver {
extraArgs: [String] = [],
defaults: UserDefaults = .standard,
configRoot: [String: Any]? = nil,
searchPaths: [String]? = nil) -> [String]
searchPaths: [String]? = nil,
projectRoot: URL? = nil) -> [String]
{
let settings = self.connectionSettings(defaults: defaults, configRoot: configRoot)
if settings.mode == .remote, let ssh = self.sshNodeCommand(
@@ -246,7 +247,7 @@ enum CommandResolver {
return ssh
}
let root = self.projectRoot()
let root = projectRoot ?? self.projectRoot()
if let openclawPath = self.projectOpenClawExecutable(projectRoot: root) {
return [openclawPath, subcommand] + extraArgs
}
@@ -289,14 +290,16 @@ enum CommandResolver {
extraArgs: [String] = [],
defaults: UserDefaults = .standard,
configRoot: [String: Any]? = nil,
searchPaths: [String]? = nil) -> [String]
searchPaths: [String]? = nil,
projectRoot: URL? = nil) -> [String]
{
self.openclawNodeCommand(
subcommand: subcommand,
extraArgs: extraArgs,
defaults: defaults,
configRoot: configRoot,
searchPaths: searchPaths)
searchPaths: searchPaths,
projectRoot: projectRoot)
}
// MARK: - SSH helpers

6
apps/macos/Sources/OpenClaw/ShellExecutor.swift
View File

@@ -73,8 +73,10 @@ enum ShellExecutor {
group.addTask { await waitTask.value }
group.addTask {
try? await Task.sleep(nanoseconds: nanos)
if process.isRunning { process.terminate() }
_ = await waitTask.value // drain pipes after termination
guard process.isRunning else {
return await waitTask.value
}
process.terminate()
return ShellResult(
stdout: "",
stderr: "",