hanzoai/dev
2
0
Fork 0
mirror of https://github.com/hanzoai/dev.git synced 2026-10-17 15:34:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(core/agents): keep cloud routing and review queue

Browse Source
This commit is contained in:
James Peter
2025-10-03 08:58:01 +10:00
parent c5cc4195f2
commit ca5c869271
2 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/core/src/agent_tool.rs
+14
View File
@@ -652,6 +652,20 @@ async fn execute_model_with_permissions(
cmd.args(defaults);
}
}
"cloud" => {
// The cloud agent CLI expects the prompt as a positional argument. If
// the configuration already provided explicit args for this mode, we
// append the prompt directly; otherwise we fall back to any shared
// defaults (if present) before adding the prompt.
let have_mode_args = config.as_ref().map(|c| if read_only { c.args_read_only.is_some() } else { c.args_write.is_some() }).unwrap_or(false);
if have_mode_args {
cmd.arg(prompt);
} else {
let mut defaults = crate::agent_defaults::default_params_for(model_name, read_only);
defaults.push(prompt.to_string());
cmd.args(defaults);
}
}
_ => { return Err(format!("Unknown model: {}", model)); }
}
codex-rs/core/src/codex.rs
+28 -10
View File
@@ -2465,8 +2465,14 @@ impl Session {
pub fn get_pending_input(&self) -> Vec<ResponseInputItem> {
self.get_pending_input_filtered(true)
}
pub fn get_pending_input_filtered(&self, drain_user_inputs: bool) -> Vec<ResponseInputItem> {
let mut state = self.state.lock().unwrap();
if state.pending_input.is_empty() && state.pending_user_input.is_empty() {
if state.pending_input.is_empty()
&& (drain_user_inputs || state.pending_user_input.is_empty())
{
Vec::with_capacity(0)
} else {
let mut ret = Vec::new();
@@ -2477,13 +2483,22 @@ impl Session {
}
if !state.pending_user_input.is_empty() {
let mut queued_user_inputs = Vec::new();
std::mem::swap(&mut queued_user_inputs, &mut state.pending_user_input);
ret.extend(
queued_user_inputs
.into_iter()
.map(|queued| queued.response_item),
);
if drain_user_inputs {
let mut queued_user_inputs = Vec::new();
std::mem::swap(&mut queued_user_inputs, &mut state.pending_user_input);
ret.extend(
queued_user_inputs
.into_iter()
.map(|queued| queued.response_item),
);
} else {
ret.extend(
state
.pending_user_input
.iter()
.map(|queued| queued.response_item.clone()),
);
}
}
ret
}
@@ -3861,8 +3876,11 @@ async fn run_agent(sess: Arc<Session>, turn_context: Arc<TurnContext>, sub_id: S
// Note that pending_input would be something like a message the user
// submitted through the UI while the model was running. Though the UI
// may support this, the model might not.
let pending_input = sess
.get_pending_input()
let pending_input = if is_review_mode {
sess.get_pending_input_filtered(false)
} else {
sess.get_pending_input()
}
.into_iter()
.map(ResponseItem::from)
.collect::<Vec<ResponseItem>>();