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

fmt

Browse Source
This commit is contained in:
kevin zhao
2025-11-04 15:58:26 -08:00
parent 459c53c45a
commit 1771759de9
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
codex-rs/core/src/event_mapping.rs
View File

@@ -18,7 +18,8 @@ use crate::user_instructions::UserInstructions;
fn is_user_shell_command_prefix(text: &str) -> bool {
let trimmed = text.trim_start();
let lowered = trimmed.to_ascii_lowercase();
lowered.starts_with("<user_shell_command>") || lowered.starts_with("<user_shell_command_output>")
lowered.starts_with("<user_shell_command>")
|| lowered.starts_with("<user_shell_command_output>")
}
fn is_session_prefix(text: &str) -> bool {

19
codex-rs/core/src/tasks/user_shell.rs
View File

@@ -96,9 +96,7 @@ impl SessionTask for UserShellCommandTask {
let call_id = Uuid::new_v4().to_string();
let raw_command = self.command.clone();
let command_text = format!(
"<user_shell_command>\n{raw_command}\n</user_shell_command>"
);
let command_text = format!("<user_shell_command>\n{raw_command}\n</user_shell_command>");
let command_items = [build_user_message(command_text)];
session
.record_conversation_items(turn_context.as_ref(), &command_items)
@@ -151,8 +149,9 @@ impl SessionTask for UserShellCommandTask {
match exec_result {
None => {
let aborted_message = "command aborted by user".to_string();
let aborted_text =
format!("<user_shell_command_output>\n{aborted_message}\n</user_shell_command_output>");
let aborted_text = format!(
"<user_shell_command_output>\n{aborted_message}\n</user_shell_command_output>"
);
let output_items = [build_user_message(aborted_text)];
session
.record_conversation_items(turn_context.as_ref(), &output_items)
@@ -189,8 +188,9 @@ impl SessionTask for UserShellCommandTask {
.await;
let output_payload = format_exec_output_for_model(&output);
let output_text =
format!("<user_shell_command_output>\n{output_payload}\n</user_shell_command_output>");
let output_text = format!(
"<user_shell_command_output>\n{output_payload}\n</user_shell_command_output>"
);
let output_items = [build_user_message(output_text)];
session
.record_conversation_items(turn_context.as_ref(), &output_items)
@@ -222,8 +222,9 @@ impl SessionTask for UserShellCommandTask {
)
.await;
let output_payload = format_exec_output_for_model(&exec_output);
let output_text =
format!("<user_shell_command_output>\n{output_payload}\n</user_shell_command_output>");
let output_text = format!(
"<user_shell_command_output>\n{output_payload}\n</user_shell_command_output>"
);
let output_items = [build_user_message(output_text)];
session
.record_conversation_items(turn_context.as_ref(), &output_items)