Skip to content

feat: include raw commands in pipeline handoffs #687

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
matt2e merged 1 commit into from
May 5, 2026
+14 −7
Merged

feat: include raw commands in pipeline handoffs #687

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 14 additions & 7 deletions apps/staged/src-tauri/src/session_runner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1032,8 +1032,9 @@ async fn run_pipeline(
idx,
&execution.steps[idx],
);
step_outputs
.push(format_step_output_for_prompt(label, &combined, false));
step_outputs.push(format_step_output_for_prompt(
label, command, &combined, false,
));
} else {
// Command failed — apply failure strategy.
execution.steps[idx].status = StepStatus::Failed;
Expand All @@ -1042,8 +1043,9 @@ async fn run_pipeline(
Some(format!("Exit code: {}", output.status));
execution.steps[idx].completed_at = Some(crate::store::now_timestamp());

step_outputs
.push(format_step_output_for_prompt(label, &combined, true));
step_outputs.push(format_step_output_for_prompt(
label, command, &combined, true,
));

match on_failure {
FailureStrategy::Abort { marker } => {
Expand Down Expand Up @@ -1303,14 +1305,14 @@ fn combine_normalized_command_output(stdout: &[u8], stderr: &[u8]) -> String {
}
}

fn format_step_output_for_prompt(label: &str, output: &str, failed: bool) -> String {
fn format_step_output_for_prompt(label: &str, command: &str, output: &str, failed: bool) -> String {
// Input is already display-normalized (from combine_normalized_command_output),
// so only strip hostile control chars without re-running CR/ANSI processing.
let output = crate::terminal_output::strip_prompt_hostile_chars(output);
let output =
crate::terminal_output::truncate_for_prompt(&output, PIPELINE_STEP_PROMPT_OUTPUT_MAX_CHARS);
let status = if failed { " (FAILED)" } else { "" };
format!("### {label}{status}\n```\n{output}\n```")
format!("### {label}{status}\nCommand: {command}\n```\n{output}\n```")
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot May 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Sanitize command text before adding to handoff prompt

format_step_output_for_prompt now interpolates command directly into the prompt, but unlike output it is neither passed through strip_prompt_hostile_chars nor truncated. Because pipeline commands are arbitrary strings from step config, a command containing control characters, Markdown fences, or very long text can break prompt structure or inject unintended instructions during AI handoff. Apply the same prompt-safety normalization/truncation to command before formatting.

Useful? React with 👍 / 👎.

}

fn spawn_pipe_reader<R>(mut pipe: R) -> tokio::task::JoinHandle<io::Result<Vec<u8>>>
Expand Down Expand Up @@ -2242,7 +2244,12 @@ mod tests {
let output = combine_normalized_command_output(b"10%\r20%\rdone\n", b"");
assert_eq!(output, "done");

let prompt_output = format_step_output_for_prompt("Build", &output, false);
let prompt_output =
format_step_output_for_prompt("Build", "just build --verbose", &output, false);
assert!(prompt_output.contains("### Build\nCommand: just build --verbose\n```\ndone\n```"));
let command_position = prompt_output.find("Command: just build --verbose").unwrap();
let output_position = prompt_output.find("done").unwrap();
assert!(command_position < output_position);
assert!(prompt_output.contains("```\ndone\n```"));
assert!(!prompt_output.contains("10%"));
assert!(!prompt_output.contains("20%"));
Expand Down