Skip to content

util: Fix stdin redirect for ShellBuilder #62078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Veykril merged 2 commits into from
Aug 5, 2026
Merged

util: Fix stdin redirect for ShellBuilder #62078

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3667dd
util: Restore fish's stdin redirect for the agent terminal
procr1337 Aug 2, 2026
d505914
util: Fix agent terminal hang on single-line shell syntax errors
procr1337 Aug 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions crates/util/src/shell_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,17 @@ impl ShellBuilder {
});
if self.redirect_stdin {
match self.kind {
ShellKind::Fish | ShellKind::Posix => {
combined_command.insert_str(0, "exec </dev/null; ");
ShellKind::Posix => {
// Perform the STDIN redirection prior to the actual
// command on a separate line, so that it is already
// active if the command contains a syntax error.
// Otherwise, with -i, dash will fall back to an
// interactive shell in this case.
combined_command.insert_str(0, "exec </dev/null\n");
}
ShellKind::Fish => {
combined_command.insert_str(0, "begin; ");
combined_command.push_str("; end </dev/null");
}
ShellKind::Nushell
| ShellKind::Csh
Expand Down Expand Up @@ -143,8 +152,12 @@ impl ShellBuilder {
});
if self.redirect_stdin {
match self.kind {
ShellKind::Fish | ShellKind::Posix => {
combined_command.insert_str(0, "exec </dev/null; ");
ShellKind::Posix => {
combined_command.insert_str(0, "exec </dev/null\n");
}
ShellKind::Fish => {
combined_command.insert_str(0, "begin; ");
combined_command.push_str("; end </dev/null");
}
ShellKind::Nushell
| ShellKind::Csh
Expand Down Expand Up @@ -282,7 +295,7 @@ mod test {
.build(Some("echo".into()), &["test".to_string()]);

assert_eq!(program, "fish");
assert_eq!(args, vec!["-i", "-c", "exec </dev/null; echo test"]);
assert_eq!(args, vec!["-i", "-c", "begin; echo test; end </dev/null"]);
}

#[test]
Expand All @@ -298,7 +311,7 @@ mod test {
assert_eq!(program, "sh");
assert_eq!(
args,
vec!["-i", "-c", "exec </dev/null; cat <<EOF\nhello\nEOF"]
vec!["-i", "-c", "exec </dev/null\ncat <<EOF\nhello\nEOF"]
);
}

Expand Down
Loading