removing is_user_shell_command

Author: zhao-oai

codex-rs/core/src/exec.rs

@@ -577,7 +577,6 @@ async fn read_capped<R: AsyncRead + Unpin + Send + 'static>(
             let chunk = tmp[..n].to_vec();
             let msg = EventMsg::ExecCommandOutputDelta(ExecCommandOutputDeltaEvent {
                 call_id: stream.call_id.clone(),
-                is_user_shell_command: false,
                 stream: if is_stderr {
                     ExecOutputStream::Stderr
                 } else {

codex-rs/core/src/tools/events.rs

@@ -140,7 +140,6 @@ impl ToolEmitter {
                     output.exit_code,
                     output.duration,
                     format_exec_output_str(&output),
-                    false,
                 )
                 .await;
             }
@@ -153,7 +152,6 @@ impl ToolEmitter {
                     output.exit_code,
                     output.duration,
                     format_exec_output_str(&output),
-                    false,
                 )
                 .await;
             }
@@ -166,7 +164,6 @@ impl ToolEmitter {
                     -1,
                     Duration::ZERO,
                     message.clone(),
-                    false,
                 )
                 .await;
             }
@@ -232,7 +229,6 @@ impl ToolEmitter {
                     output.exit_code,
                     output.duration,
                     format_exec_output_str(&output),
-                    false,
                 )
                 .await;
             }
@@ -248,7 +244,6 @@ impl ToolEmitter {
                     output.exit_code,
                     output.duration,
                     format_exec_output_str(&output),
-                    false,
                 )
                 .await;
             }
@@ -264,7 +259,6 @@ impl ToolEmitter {
                     -1,
                     Duration::ZERO,
                     message.clone(),
-                    false,
                 )
                 .await;
             }
@@ -323,7 +317,6 @@ impl ToolEmitter {
     }
 }
 
-#[allow(clippy::too_many_arguments)]
 async fn emit_exec_end(
     ctx: ToolEventCtx<'_>,
     stdout: String,
@@ -332,14 +325,12 @@ async fn emit_exec_end(
     exit_code: i32,
     duration: Duration,
     formatted_output: String,
-    is_user_shell_command: bool,
 ) {
     ctx.session
         .send_event(
             ctx.turn,
             EventMsg::ExecCommandEnd(ExecCommandEndEvent {
                 call_id: ctx.call_id.to_string(),
-                is_user_shell_command,
                 stdout,
                 stderr,
                 aggregated_output,

codex-rs/core/src/tools/handlers/unified_exec.rs

@@ -152,7 +152,6 @@ impl ToolHandler for UnifiedExecHandler {
         if !response.output.is_empty() {
             let delta = ExecCommandOutputDeltaEvent {
                 call_id: response.event_call_id.clone(),
-                is_user_shell_command: false,
                 stream: ExecOutputStream::Stdout,
                 chunk: response.output.as_bytes().to_vec(),
             };

codex-rs/exec/tests/event_processor_with_json_output.rs

@@ -650,7 +650,6 @@ fn exec_command_end_success_produces_completed_command_item() {
         "c2",
         EventMsg::ExecCommandEnd(ExecCommandEndEvent {
             call_id: "1".to_string(),
-            is_user_shell_command: false,
             stdout: String::new(),
             stderr: String::new(),
             aggregated_output: "hi\n".to_string(),
@@ -711,7 +710,6 @@ fn exec_command_end_failure_produces_failed_command_item() {
         "c2",
         EventMsg::ExecCommandEnd(ExecCommandEndEvent {
             call_id: "2".to_string(),
-            is_user_shell_command: false,
             stdout: String::new(),
             stderr: String::new(),
             aggregated_output: String::new(),
@@ -746,7 +744,6 @@ fn exec_command_end_without_begin_is_ignored() {
         "c1",
         EventMsg::ExecCommandEnd(ExecCommandEndEvent {
             call_id: "no-begin".to_string(),
-            is_user_shell_command: false,
             stdout: String::new(),
             stderr: String::new(),
             aggregated_output: String::new(),

codex-rs/protocol/src/protocol.rs

@@ -1222,10 +1222,6 @@ pub struct ExecCommandBeginEvent {
 pub struct ExecCommandEndEvent {
     /// Identifier for the ExecCommandBegin that finished.
     pub call_id: String,
-    /// True when this exec was initiated directly by the user (e.g. bang command),
-    /// not by the agent/model. Defaults to false for backwards compatibility.
-    #[serde(default)]
-    pub is_user_shell_command: bool,
     /// Captured stdout
     pub stdout: String,
     /// Captured stderr
@@ -1262,10 +1258,6 @@ pub enum ExecOutputStream {
 pub struct ExecCommandOutputDeltaEvent {
     /// Identifier for the ExecCommandBegin that produced this chunk.
     pub call_id: String,
-    /// True when this exec was initiated directly by the user (e.g. bang command),
-    /// not by the agent/model. Defaults to false for backwards compatibility.
-    #[serde(default)]
-    pub is_user_shell_command: bool,
     /// Which stream produced this chunk.
     pub stream: ExecOutputStream,
     /// Raw bytes from the stream (may not be valid UTF-8).
@@ -1552,13 +1544,12 @@ mod tests {
     fn vec_u8_as_base64_serialization_and_deserialization() -> Result<()> {
         let event = ExecCommandOutputDeltaEvent {
             call_id: "call21".to_string(),
-            is_user_shell_command: false,
             stream: ExecOutputStream::Stdout,
             chunk: vec![1, 2, 3, 4, 5],
         };
         let serialized = serde_json::to_string(&event)?;
         assert_eq!(
-            r#"{"call_id":"call21","is_user_shell_command":false,"stream":"stdout","chunk":"AQIDBAU="}"#,
+            r#"{"call_id":"call21","stream":"stdout","chunk":"AQIDBAU="}"#,
             serialized,
         );
 

codex-rs/tui/src/chatwidget.rs

@@ -824,7 +824,7 @@ impl ChatWidget {
         let running = self.running_commands.remove(&ev.call_id);
         let (command, parsed, is_user_shell_command) = match running {
             Some(rc) => (rc.command, rc.parsed_cmd, rc.is_user_shell_command),
-            None => (vec![ev.call_id.clone()], Vec::new(), ev.is_user_shell_command),
+            None => (vec![ev.call_id.clone()], Vec::new(), false),
         };
 
         let needs_new = self

codex-rs/tui/src/chatwidget/tests.rs

@@ -640,7 +640,6 @@ fn end_exec(chat: &mut ChatWidget, call_id: &str, stdout: &str, stderr: &str, ex
         id: call_id.to_string(),
         msg: EventMsg::ExecCommandEnd(ExecCommandEndEvent {
             call_id: call_id.to_string(),
-            is_user_shell_command: false,
             stdout: stdout.to_string(),
             stderr: stderr.to_string(),
             aggregated_output: aggregated.clone(),
@@ -2775,7 +2774,6 @@ fn chatwidget_exec_and_status_layout_vt100_snapshot() {
         id: "c1".into(),
         msg: EventMsg::ExecCommandEnd(ExecCommandEndEvent {
             call_id: "c1".into(),
-            is_user_shell_command: false,
             stdout: String::new(),
             stderr: String::new(),
             aggregated_output: String::new(),