openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-11-12 21:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into jif/review-as-collab

Browse Source 
# Conflicts:
#	codex-rs/core/src/agent/control.rs
#	codex-rs/core/src/codex_delegate.rs
This commit is contained in:
jif-oai
2026-01-20 12:34:32 +00:00
parent 8df6d0d4ee 9ec20ba065
commit 7e10dd25cf
102 changed files with 6597 additions and 918 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/exec/src/event_processor_with_human_output.rs
+2 -1
View File
@@ -606,7 +606,8 @@ impl EventProcessor for EventProcessorWithHumanOutput {
| EventMsg::SkillsUpdateAvailable
| EventMsg::UndoCompleted(_)
| EventMsg::UndoStarted(_)
| EventMsg::ThreadRolledBack(_) => {}
| EventMsg::ThreadRolledBack(_)
| EventMsg::RequestUserInput(_) => {}
}
CodexStatus::Running
}
codex-rs/exec/src/lib.rs
+2
View File
@@ -360,6 +360,7 @@ pub async fn run_main(cli: Cli, codex_linux_sandbox_exe: Option<PathBuf>) -> any
.collect();
items.push(UserInput::Text {
text: prompt_text.clone(),
// CLI input doesn't track UI element ranges, so none are available here.
text_elements: Vec::new(),
});
let output_schema = load_output_schema(output_schema_path.clone());
@@ -379,6 +380,7 @@ pub async fn run_main(cli: Cli, codex_linux_sandbox_exe: Option<PathBuf>) -> any
.collect();
items.push(UserInput::Text {
text: prompt_text.clone(),
// CLI input doesn't track UI element ranges, so none are available here.
text_elements: Vec::new(),
});
let output_schema = load_output_schema(output_schema_path);