Skip to content

armgit / muxin

Public Imported from GitHub
0

All your machines, one app. For you and your AI agents: agent sessions, desktops, files, logs and GitHub across your Macs, Linux and Windows machines, with an MCP server.

Workspace commands: no "Killed" line from a login bash; the log test on Windows

Adib Hanna17e40f65d35d
diff --git a/agent/src/logs.rs b/agent/src/logs.rs
index 14103fb..0da1c4a 100644
--- a/agent/src/logs.rs
+++ b/agent/src/logs.rs
@@ -424,17 +424,22 @@ mod tests {
std::fs::write(&file, "one\ntwo\n").unwrap();
let path = file.display().to_string();
let (p, a) = command(&json!({ "kind": "file", "target": path }), 50, true).unwrap();
- assert_eq!(p, "tail");
- assert_eq!(a, ["-n", "50", "-F", "--", path.as_str()]);
- let read = read(&json!({ "source": { "kind": "file", "target": path }, "lines": 1 }));
- assert_eq!(read["lines"], json!(["two"]));
+ if cfg!(windows) {
+ // Windows reads files, its event logs and services with PowerShell (win::log_script).
+ assert_eq!(p, "powershell");
+ } else {
+ assert_eq!(p, "tail");
+ assert_eq!(a, ["-n", "50", "-F", "--", path.as_str()]);
+ let read = read(&json!({ "source": { "kind": "file", "target": path }, "lines": 1 }));
+ assert_eq!(read["lines"], json!(["two"]));
+ assert!(command(&json!({ "kind": "file", "target": "/nonexistent/x.log" }), 10, false).unwrap_err().contains("no /nonexistent"));
+ }
let (p, a) = command(&json!({ "kind": "docker", "target": "abc123" }), 10, false).unwrap();
- assert!(p.ends_with("docker"), "{p}");
+ assert!(p.trim_end_matches(".exe").ends_with("docker"), "{p}");
assert_eq!(a.join(" "), "logs --timestamps --tail 10 abc123");
assert!(command(&json!({ "kind": "docker", "target": "--privileged" }), 10, false).is_err());
- assert!(command(&json!({ "kind": "file", "target": "/nonexistent/x.log" }), 10, false).unwrap_err().contains("no /nonexistent"));
assert!(command(&json!({ "kind": "nope" }), 10, false).is_err());
- if !cfg!(target_os = "macos") {
+ if !cfg!(target_os = "macos") && !cfg!(windows) {
let (p, a) = command(&json!({ "kind": "service", "target": "nginx.service", "user": true }), 20, true).unwrap();
assert_eq!((p.as_str(), a.join(" ").as_str()), ("journalctl", "--no-pager -o short-iso -n 20 --user -u nginx.service -f"));
}
diff --git a/src/fleet/workspaces/scripts/exec.sh b/src/fleet/workspaces/scripts/exec.sh
index 1b0f565..cabc963 100644
--- a/src/fleet/workspaces/scripts/exec.sh
+++ b/src/fleet/workspaces/scripts/exec.sh
@@ -29,6 +29,9 @@ or_pid=$!
or_kill_tree "$or_pid" KILL
) < /dev/null > /dev/null &
or_watch=$!
+# Not a job of this shell: killing it later must not make bash print "Killed"
+# on stderr (a login bash reports it as it exits, e.g. from ~/.bash_logout).
+disown "$or_watch" 2>/dev/null || true
wait "$or_pid"
or_code=$?
or_kill_tree "$or_watch" KILL
diff --git a/src/fleet/workspaces/scripts/exec_docker.sh b/src/fleet/workspaces/scripts/exec_docker.sh
index a54ef78..d7849e0 100644
--- a/src/fleet/workspaces/scripts/exec_docker.sh
+++ b/src/fleet/workspaces/scripts/exec_docker.sh
@@ -63,6 +63,9 @@ kill -"$s" $all 2>/dev/null'
or_kill_tree "$or_pid" KILL
) < /dev/null > /dev/null &
or_watch=$!
+# Not a job of this shell: killing it later must not make bash print "Killed"
+# on stderr (a login bash reports it as it exits, e.g. from ~/.bash_logout).
+disown "$or_watch" 2>/dev/null || true
wait "$or_pid"
or_code=$?
or_kill_tree "$or_watch" KILL