mirror of
https://github.com/openai/codex.git
synced 2026-11-19 22:30:42 +00:00
Fix plan reasoning override sync
This commit is contained in:
@@ -306,7 +306,7 @@ impl ChatWidget {
|
||||
mask.mode = Some(ModeKind::Plan);
|
||||
mask.model = Some(model.clone());
|
||||
mask.reasoning_effort = Some(effort);
|
||||
let override_command = self.collaboration_mode_override_command(&mut mask);
|
||||
let override_command = self.explicit_collaboration_mode_override_command(&mask);
|
||||
move |tx| {
|
||||
tx.send(AppEvent::CodexOp(override_command.clone()));
|
||||
tx.send(AppEvent::UpdateModel(model.clone()));
|
||||
@@ -319,7 +319,7 @@ impl ChatWidget {
|
||||
mask.mode = Some(ModeKind::Plan);
|
||||
mask.model = Some(model.clone());
|
||||
mask.reasoning_effort = Some(effort);
|
||||
let override_command = self.collaboration_mode_override_command(&mut mask);
|
||||
let override_command = self.explicit_collaboration_mode_override_command(&mask);
|
||||
move |tx| {
|
||||
tx.send(AppEvent::CodexOp(override_command.clone()));
|
||||
tx.send(AppEvent::UpdateModel(model.clone()));
|
||||
|
||||
@@ -107,7 +107,7 @@ impl ChatWidget {
|
||||
mask.model = Some(current_model);
|
||||
mask.reasoning_effort = Some(Some(next_effort));
|
||||
self.app_event_tx.send(AppEvent::CodexOp(
|
||||
self.collaboration_mode_override_command(&mut mask),
|
||||
self.explicit_collaboration_mode_override_command(&mask),
|
||||
));
|
||||
self.app_event_tx
|
||||
.send(AppEvent::UpdatePlanModeReasoningEffort(Some(next_effort)));
|
||||
|
||||
@@ -565,6 +565,13 @@ impl ChatWidget {
|
||||
mask: &mut CollaborationModeMask,
|
||||
) -> AppCommand {
|
||||
self.apply_plan_reasoning_override_to_mask(mask);
|
||||
self.explicit_collaboration_mode_override_command(mask)
|
||||
}
|
||||
|
||||
pub(super) fn explicit_collaboration_mode_override_command(
|
||||
&self,
|
||||
mask: &CollaborationModeMask,
|
||||
) -> AppCommand {
|
||||
AppCommand::override_collaboration_mode(self.current_collaboration_mode.apply_mask(mask))
|
||||
}
|
||||
|
||||
|
||||
@@ -2,16 +2,20 @@ use super::*;
|
||||
use pretty_assertions::assert_eq;
|
||||
|
||||
fn assert_collaboration_override(events: &[AppEvent], expected: ModeKind) {
|
||||
assert!(
|
||||
events.iter().any(|event| match event {
|
||||
assert_eq!(collaboration_override(events).mode, expected);
|
||||
}
|
||||
|
||||
fn collaboration_override(events: &[AppEvent]) -> &CollaborationMode {
|
||||
events
|
||||
.iter()
|
||||
.find_map(|event| match event {
|
||||
AppEvent::CodexOp(Op::OverrideTurnContext {
|
||||
collaboration_mode: Some(CollaborationMode { mode, .. }),
|
||||
collaboration_mode: Some(mode),
|
||||
..
|
||||
}) => mode == &expected,
|
||||
_ => false,
|
||||
}),
|
||||
"expected {expected:?} mode next-turn state override; events: {events:?}"
|
||||
);
|
||||
}) => Some(mode),
|
||||
_ => None,
|
||||
})
|
||||
.unwrap_or_else(|| panic!("expected next-turn state override; events: {events:?}"))
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -683,12 +687,17 @@ async fn plan_reasoning_scope_popup_mentions_built_in_plan_default_when_no_overr
|
||||
#[tokio::test]
|
||||
async fn plan_reasoning_scope_popup_plan_only_does_not_update_all_modes_reasoning() {
|
||||
let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(Some("gpt-5.4")).await;
|
||||
chat.set_plan_mode_reasoning_effort(Some(ReasoningEffortConfig::Low));
|
||||
chat.open_plan_reasoning_scope_prompt("gpt-5.4".to_string(), Some(ReasoningEffortConfig::High));
|
||||
|
||||
chat.handle_key_event(KeyEvent::from(KeyCode::Enter));
|
||||
|
||||
let events = drain_app_events(&mut rx);
|
||||
assert_collaboration_override(&events, ModeKind::Plan);
|
||||
assert_eq!(
|
||||
collaboration_override(&events).settings.reasoning_effort,
|
||||
Some(ReasoningEffortConfig::High)
|
||||
);
|
||||
assert!(
|
||||
events.iter().any(|event| matches!(
|
||||
event,
|
||||
|
||||
Reference in New Issue
Block a user