clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-24 06:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(windows) parse powershell commands

Browse Source
This commit is contained in:
Dylan Hurd
2025-11-19 04:08:18 -08:00
parent a75321a64c
commit cff47cb1d5
1 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
codex-rs/core/src/parse_command.rs
View File

@@ -919,6 +919,51 @@ mod tests {
}],
);
}
#[test]
fn powershell_cd_is_stripped() {
assert_parsed(
&vec_str(&["powershell", "-Command", "cd foo; Get-ChildItem"]),
vec![ParsedCommand::Unknown {
cmd: "Get-ChildItem".to_string(),
}],
);
}
#[test]
fn powershell_pipes_are_preserved() {
assert_parsed(
&vec_str(&[
"powershell",
"-Command",
"Get-Content core/src/parse_command.rs | Select-Object -First 980 | Select-Object -Last 140",
]),
vec![
ParsedCommand::Unknown {
cmd: "Get-Content core/src/parse_command.rs".to_string(),
},
ParsedCommand::Unknown {
cmd: "Select-Object -First 980".to_string(),
},
ParsedCommand::Unknown {
cmd: "Select-Object -Last 140".to_string(),
},
],
);
}
#[test]
fn powershell_at_escaping_is_preserved() {
assert_parsed(
&vec_str(&[
"powershell",
"-Command",
"@'\\nprint('Hello, world!')\\n'@ | python -",
]),
vec![ParsedCommand::Unknown {
cmd: "@'\\nprint('Hello, world!')\\n'@ | python -".to_string(),
}],
);
}
}
pub fn parse_command_impl(command: &[String]) -> Vec<ParsedCommand> {
@@ -926,12 +971,6 @@ pub fn parse_command_impl(command: &[String]) -> Vec<ParsedCommand> {
return commands;
}
if let Some((_, script)) = extract_powershell_command(command) {
return vec![ParsedCommand::Unknown {
cmd: script.to_string(),
}];
}
let normalized = normalize_tokens(command);
let parts = if contains_connectors(&normalized) {
@@ -1238,8 +1277,8 @@ fn parse_find_query_and_path(tail: &[String]) -> (Option<String>, Option<String>
}
fn parse_shell_lc_commands(original: &[String]) -> Option<Vec<ParsedCommand>> {
// Only handle bash/zsh here; PowerShell is stripped separately without bash parsing.
let (_, script) = extract_bash_command(original)?;
let (_, script) =
extract_bash_command(original).or_else(|| extract_powershell_command(original))?;
if let Some(tree) = try_parse_shell(script)
&& let Some(all_commands) = try_parse_word_only_commands_sequence(&tree, script)