Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Add safer TUI defaults for cyber models (#37055)

Won Park757c151a0e92
diff --git a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json
index 49e1ed3829..bc1a2c58ef 100644
--- a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json
+++ b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json
@@ -13540,6 +13540,13 @@
"model": {
"type": "string"
},
+ "modelSpecialty": {
+ "default": null,
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"serviceTiers": {
"default": [],
"items": {
diff --git a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json
index 650866067a..5b5ddf26ab 100644
--- a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json
+++ b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json
@@ -9877,6 +9877,13 @@
"model": {
"type": "string"
},
+ "modelSpecialty": {
+ "default": null,
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"serviceTiers": {
"default": [],
"items": {
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ModelListResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ModelListResponse.json
index c50a6bdfa0..46a0d255b1 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ModelListResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ModelListResponse.json
@@ -86,6 +86,13 @@
"model": {
"type": "string"
},
+ "modelSpecialty": {
+ "default": null,
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"serviceTiers": {
"default": [],
"items": {
diff --git a/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-experimental.json.zst b/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-experimental.json.zst
index 6c0f1b4cd9..9b0b5678b3 100644
Binary files a/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-experimental.json.zst and b/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-experimental.json.zst differ
diff --git a/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-stable.json.zst b/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-stable.json.zst
index 2bc2a19ea2..f4cdfa1bf8 100644
Binary files a/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-stable.json.zst and b/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-stable.json.zst differ
diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/Model.ts b/codex-rs/app-server-protocol/schema/typescript/v2/Model.ts
index e9dbf15b0b..cb15add8dc 100644
--- a/codex-rs/app-server-protocol/schema/typescript/v2/Model.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/Model.ts
@@ -8,7 +8,7 @@ import type { ModelServiceTier } from "./ModelServiceTier";
import type { ModelUpgradeInfo } from "./ModelUpgradeInfo";
import type { ReasoningEffortOption } from "./ReasoningEffortOption";
-export type Model = { id: string, model: string, upgrade: string | null, upgradeInfo: ModelUpgradeInfo | null, availabilityNux: ModelAvailabilityNux | null, displayName: string, description: string, hidden: boolean, supportedReasoningEfforts: Array<ReasoningEffortOption>, defaultReasoningEffort: ReasoningEffort, inputModalities: Array<InputModality>, supportsPersonality: boolean,
+export type Model = { id: string, model: string, upgrade: string | null, upgradeInfo: ModelUpgradeInfo | null, availabilityNux: ModelAvailabilityNux | null, displayName: string, description: string, modelSpecialty: string | null, hidden: boolean, supportedReasoningEfforts: Array<ReasoningEffortOption>, defaultReasoningEffort: ReasoningEffort, inputModalities: Array<InputModality>, supportsPersonality: boolean,
/**
* Deprecated: use `serviceTiers` instead.
*/
diff --git a/codex-rs/app-server-protocol/src/protocol/v2/model.rs b/codex-rs/app-server-protocol/src/protocol/v2/model.rs
index 7d9409136e..c299593c03 100644
--- a/codex-rs/app-server-protocol/src/protocol/v2/model.rs
+++ b/codex-rs/app-server-protocol/src/protocol/v2/model.rs
@@ -87,6 +87,8 @@ pub struct Model {
pub availability_nux: Option<ModelAvailabilityNux>,
pub display_name: String,
pub description: String,
+ #[serde(default)]
+ pub model_specialty: Option<String>,
pub hidden: bool,
pub supported_reasoning_efforts: Vec<ReasoningEffortOption>,
pub default_reasoning_effort: ReasoningEffort,
diff --git a/codex-rs/app-server/README.md b/codex-rs/app-server/README.md
index dbe090e54b..6ac0ccdfe5 100644
--- a/codex-rs/app-server/README.md
+++ b/codex-rs/app-server/README.md
@@ -228,7 +228,7 @@ Example with notification opt-out:
- `fs/watch` — subscribe this connection to filesystem change notifications for an absolute file or directory path and caller-provided `watchId`; returns the canonicalized `path`.
- `fs/unwatch` — stop sending notifications for a prior `fs/watch`; returns `{}`.
- `fs/changed` — notification emitted when watched paths change, including the `watchId` and `changedPaths`.
-- `model/list` — list available models (set `includeHidden: true` to include entries with `hidden: true`), with model-advertised string reasoning effort options in the catalog's intended progression order, `additionalSpeedTiers`, `serviceTiers`, optional `defaultServiceTier`, optional legacy `upgrade` model ids, optional `upgradeInfo` metadata (`model`, `upgradeCopy`, `modelLink`, `migrationMarkdown`), and optional `availabilityNux` metadata. Clients should preserve the `supportedReasoningEfforts` array order rather than deriving order from the effort names.
+- `model/list` — list available models (set `includeHidden: true` to include entries with `hidden: true`), with model-advertised string reasoning effort options in the catalog's intended progression order, optional `modelSpecialty`, `additionalSpeedTiers`, `serviceTiers`, optional `defaultServiceTier`, optional legacy `upgrade` model ids, optional `upgradeInfo` metadata (`model`, `upgradeCopy`, `modelLink`, `migrationMarkdown`), and optional `availabilityNux` metadata. Clients should preserve the `supportedReasoningEfforts` array order rather than deriving order from the effort names.
- `modelProvider/capabilities/read` — read provider-level capabilities for the currently configured model provider.
- `experimentalFeature/list` — list feature flags with stage metadata (`beta`, `underDevelopment`, `stable`, etc.), enabled/default-enabled state, and cursor pagination. Pass `threadId` when showing feature state for an existing loaded thread so `enabled` is computed from that thread's refreshed config, including project-local config for the thread's cwd; if omitted, the server uses its default config resolution context. For non-beta flags, `displayName`/`description`/`announcement` are `null`.
- `permissionProfile/list` — beta; list available permission profile ids with optional display `description` text and an `allowed` flag reflecting effective requirements, using cursor pagination. Pass `cwd` when the caller needs project-local `[permissions.<id>]` entries to be included in the current catalog view.
diff --git a/codex-rs/app-server/src/models.rs b/codex-rs/app-server/src/models.rs
index 36219e886f..30cebbf5ce 100644
--- a/codex-rs/app-server/src/models.rs
+++ b/codex-rs/app-server/src/models.rs
@@ -38,6 +38,7 @@ fn model_from_preset(preset: ModelPreset) -> Model {
availability_nux: preset.availability_nux.map(Into::into),
display_name: preset.display_name.to_string(),
description: preset.description.to_string(),
+ model_specialty: preset.model_specialty,
hidden: !preset.show_in_picker,
supported_reasoning_efforts: reasoning_efforts_from_preset(
preset.supported_reasoning_efforts,
diff --git a/codex-rs/app-server/tests/common/models_cache.rs b/codex-rs/app-server/tests/common/models_cache.rs
index 2b042ffc16..e26a5d1134 100644
--- a/codex-rs/app-server/tests/common/models_cache.rs
+++ b/codex-rs/app-server/tests/common/models_cache.rs
@@ -65,6 +65,7 @@ fn preset_to_info(preset: &ModelPreset, priority: i32) -> ModelInfo {
supports_search_tool: false,
use_responses_lite: false,
auto_review_model_override: None,
+ model_specialty: None,
tool_mode: None,
multi_agent_version: None,
}
diff --git a/codex-rs/app-server/tests/suite/v2/model_list.rs b/codex-rs/app-server/tests/suite/v2/model_list.rs
index e742b0da0b..4abbd333c2 100644
--- a/codex-rs/app-server/tests/suite/v2/model_list.rs
+++ b/codex-rs/app-server/tests/suite/v2/model_list.rs
@@ -43,6 +43,7 @@ fn model_from_preset(preset: &ModelPreset) -> Model {
availability_nux: preset.availability_nux.clone().map(Into::into),
display_name: preset.display_name.clone(),
description: preset.description.clone(),
+ model_specialty: preset.model_specialty.clone(),
hidden: !preset.show_in_picker,
supported_reasoning_efforts: preset
.supported_reasoning_efforts
@@ -156,6 +157,7 @@ async fn list_models_uses_chatgpt_remote_catalog_as_source_of_truth() -> Result<
"slug": "chatgpt-remote-only",
"display_name": "ChatGPT Remote Only",
"description": "Remote-only model for app-server model/list coverage",
+ "model_specialty": "cyber",
"default_reasoning_level": "max",
"supported_reasoning_levels": [
{"effort": "max", "description": "Maximum"},
diff --git a/codex-rs/codex-api/tests/models_integration.rs b/codex-rs/codex-api/tests/models_integration.rs
index df15f2844a..a484a5ca3c 100644
--- a/codex-rs/codex-api/tests/models_integration.rs
+++ b/codex-rs/codex-api/tests/models_integration.rs
@@ -103,6 +103,7 @@ async fn models_client_hits_models_endpoint() {
supports_search_tool: false,
use_responses_lite: false,
auto_review_model_override: None,
+ model_specialty: None,
tool_mode: None,
multi_agent_version: None,
}],
diff --git a/codex-rs/core/src/tools/handlers/multi_agents_spec_tests.rs b/codex-rs/core/src/tools/handlers/multi_agents_spec_tests.rs
index 13ff55db3e..43cc92572d 100644
--- a/codex-rs/core/src/tools/handlers/multi_agents_spec_tests.rs
+++ b/codex-rs/core/src/tools/handlers/multi_agents_spec_tests.rs
@@ -14,6 +14,7 @@ fn model_preset(id: &str, show_in_picker: bool) -> ModelPreset {
model: format!("{id}-model"),
display_name: format!("{id} display"),
description: format!("{id} description"),
+ model_specialty: None,
default_reasoning_effort: ReasoningEffort::Medium,
supported_reasoning_efforts: vec![ReasoningEffortPreset {
effort: ReasoningEffort::Medium,
diff --git a/codex-rs/core/tests/suite/auto_review.rs b/codex-rs/core/tests/suite/auto_review.rs
index 92fb340998..6fc6a17644 100644
--- a/codex-rs/core/tests/suite/auto_review.rs
+++ b/codex-rs/core/tests/suite/auto_review.rs
@@ -261,6 +261,7 @@ fn remote_model_with_auto_review_override(slug: &str, review_model: &str) -> Mod
supports_search_tool: false,
use_responses_lite: false,
auto_review_model_override: Some(review_model.to_string()),
+ model_specialty: None,
tool_mode: None,
multi_agent_version: None,
priority: 1,
diff --git a/codex-rs/core/tests/suite/model_switching.rs b/codex-rs/core/tests/suite/model_switching.rs
index 0994ad5861..08f42d8952 100644
--- a/codex-rs/core/tests/suite/model_switching.rs
+++ b/codex-rs/core/tests/suite/model_switching.rs
@@ -90,6 +90,7 @@ fn test_model_info(
supports_search_tool: false,
use_responses_lite: false,
auto_review_model_override: None,
+ model_specialty: None,
tool_mode: None,
multi_agent_version: None,
priority: 1,
@@ -954,6 +955,7 @@ async fn model_switch_to_smaller_model_updates_token_context_window() -> Result<
supports_search_tool: false,
use_responses_lite: false,
auto_review_model_override: None,
+ model_specialty: None,
tool_mode: None,
multi_agent_version: None,
priority: 1,
diff --git a/codex-rs/core/tests/suite/models_cache_ttl.rs b/codex-rs/core/tests/suite/models_cache_ttl.rs
index 4811e283f3..e777774cd9 100644
--- a/codex-rs/core/tests/suite/models_cache_ttl.rs
+++ b/codex-rs/core/tests/suite/models_cache_ttl.rs
@@ -534,6 +534,7 @@ fn test_remote_model(slug: &str, priority: i32) -> ModelInfo {
supports_search_tool: false,
use_responses_lite: false,
auto_review_model_override: None,
+ model_specialty: None,
tool_mode: None,
multi_agent_version: None,
}
diff --git a/codex-rs/core/tests/suite/personality.rs b/codex-rs/core/tests/suite/personality.rs
index 09b451780d..1f1a501f24 100644
--- a/codex-rs/core/tests/suite/personality.rs
+++ b/codex-rs/core/tests/suite/personality.rs
@@ -669,6 +669,7 @@ async fn remote_model_friendly_personality_instructions_with_feature() -> anyhow
supports_search_tool: false,
use_responses_lite: false,
auto_review_model_override: None,
+ model_specialty: None,
tool_mode: None,
multi_agent_version: None,
};
@@ -790,6 +791,7 @@ async fn user_turn_personality_remote_model_template_includes_update_message() -
supports_search_tool: false,
use_responses_lite: false,
auto_review_model_override: None,
+ model_specialty: None,
tool_mode: None,
multi_agent_version: None,
};
diff --git a/codex-rs/core/tests/suite/remote_models.rs b/codex-rs/core/tests/suite/remote_models.rs
index fffafee263..b59b7990c8 100644
--- a/codex-rs/core/tests/suite/remote_models.rs
+++ b/codex-rs/core/tests/suite/remote_models.rs
@@ -528,6 +528,7 @@ async fn remote_models_remote_model_uses_unified_exec() -> Result<()> {
supports_search_tool: false,
use_responses_lite: false,
auto_review_model_override: None,
+ model_specialty: None,
tool_mode: None,
multi_agent_version: None,
priority: 1,
@@ -782,6 +783,7 @@ async fn remote_models_apply_legacy_instructions() -> Result<()> {
supports_search_tool: false,
use_responses_lite: false,
auto_review_model_override: None,
+ model_specialty: None,
tool_mode: None,
multi_agent_version: None,
priority: 1,
@@ -1365,6 +1367,7 @@ fn test_remote_model_with_policy(
supports_search_tool: false,
use_responses_lite: false,
auto_review_model_override: None,
+ model_specialty: None,
tool_mode: None,
multi_agent_version: None,
priority,
diff --git a/codex-rs/core/tests/suite/rmcp_client.rs b/codex-rs/core/tests/suite/rmcp_client.rs
index 9de72267fb..4c6d2032d4 100644
--- a/codex-rs/core/tests/suite/rmcp_client.rs
+++ b/codex-rs/core/tests/suite/rmcp_client.rs
@@ -2231,6 +2231,7 @@ async fn stdio_image_responses_are_sanitized_for_text_only_model() -> anyhow::Re
supports_search_tool: false,
use_responses_lite: false,
auto_review_model_override: None,
+ model_specialty: None,
tool_mode: None,
multi_agent_version: None,
}],
diff --git a/codex-rs/core/tests/suite/spawn_agent_description.rs b/codex-rs/core/tests/suite/spawn_agent_description.rs
index be9e56fadf..20bd890519 100644
--- a/codex-rs/core/tests/suite/spawn_agent_description.rs
+++ b/codex-rs/core/tests/suite/spawn_agent_description.rs
@@ -71,6 +71,7 @@ fn test_model_info(
supports_search_tool: false,
use_responses_lite: false,
auto_review_model_override: None,
+ model_specialty: None,
tool_mode: None,
multi_agent_version: None,
priority: 1,
diff --git a/codex-rs/core/tests/suite/view_image.rs b/codex-rs/core/tests/suite/view_image.rs
index 2ed766a01a..d63e361698 100644
--- a/codex-rs/core/tests/suite/view_image.rs
+++ b/codex-rs/core/tests/suite/view_image.rs
@@ -1363,6 +1363,7 @@ async fn view_image_tool_returns_unsupported_message_for_text_only_model() -> an
supports_search_tool: false,
use_responses_lite: false,
auto_review_model_override: None,
+ model_specialty: None,
tool_mode: None,
multi_agent_version: None,
priority: 1,
diff --git a/codex-rs/models-manager/src/model_info.rs b/codex-rs/models-manager/src/model_info.rs
index f33fcadc59..9bb05872c7 100644
--- a/codex-rs/models-manager/src/model_info.rs
+++ b/codex-rs/models-manager/src/model_info.rs
@@ -175,6 +175,7 @@ pub fn model_info_from_slug(slug: &str) -> ModelInfo {
supports_search_tool: false,
use_responses_lite: false,
auto_review_model_override: None,
+ model_specialty: None,
tool_mode: None,
multi_agent_version: None,
}
diff --git a/codex-rs/protocol/src/openai_models.rs b/codex-rs/protocol/src/openai_models.rs
index b2d1dfbb72..34994ac970 100644
--- a/codex-rs/protocol/src/openai_models.rs
+++ b/codex-rs/protocol/src/openai_models.rs
@@ -210,6 +210,8 @@ pub struct ModelPreset {
pub display_name: String,
/// Short human description shown in UIs.
pub description: String,
+ #[serde(default, skip_serializing_if = "Option::is_none")]
+ pub model_specialty: Option<String>,
/// Reasoning effort applied when none is explicitly chosen.
pub default_reasoning_effort: ReasoningEffort,
/// Supported reasoning effort options.
@@ -438,6 +440,8 @@ pub struct ModelInfo {
pub use_responses_lite: bool,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub auto_review_model_override: Option<String>,
+ #[serde(default, skip_serializing_if = "Option::is_none")]
+ pub model_specialty: Option<String>,
#[serde(
default,
skip_serializing_if = "Option::is_none",
@@ -721,6 +725,7 @@ impl From<ModelInfo> for ModelPreset {
model: info.slug.clone(),
display_name: info.display_name,
description: info.description.unwrap_or_default(),
+ model_specialty: info.model_specialty,
default_reasoning_effort: info
.default_reasoning_level
.unwrap_or(ReasoningEffort::None),
@@ -846,6 +851,7 @@ mod tests {
supports_search_tool: false,
use_responses_lite: false,
auto_review_model_override: None,
+ model_specialty: None,
tool_mode: None,
multi_agent_version: None,
}
diff --git a/codex-rs/tools/src/tool_config_tests.rs b/codex-rs/tools/src/tool_config_tests.rs
index f181e688ed..efd4bb9158 100644
--- a/codex-rs/tools/src/tool_config_tests.rs
+++ b/codex-rs/tools/src/tool_config_tests.rs
@@ -48,6 +48,7 @@ fn model_with_shell_type(shell_type: ConfigShellToolType) -> ModelInfo {
supports_search_tool: false,
use_responses_lite: false,
auto_review_model_override: None,
+ model_specialty: None,
tool_mode: None,
multi_agent_version: None,
}
diff --git a/codex-rs/tui/src/app/event_dispatch.rs b/codex-rs/tui/src/app/event_dispatch.rs
index 1a29db4c55..95e8564638 100644
--- a/codex-rs/tui/src/app/event_dispatch.rs
+++ b/codex-rs/tui/src/app/event_dispatch.rs
@@ -1150,11 +1150,15 @@ impl App {
.await;
}
AppEvent::UpdateModel(model) => {
- self.chat_widget.set_model(&model);
- self.sync_active_thread_model_setting(app_server, model)
- .await;
- self.sync_active_thread_service_tier_to_cached_session()
- .await;
+ let model_changed = self.chat_widget.current_model() != model
+ || self.chat_widget.current_collaboration_mode().model() != model;
+ if model_changed {
+ self.chat_widget.set_model(&model);
+ self.sync_active_thread_model_setting(app_server, model, /*effort*/ None)
+ .await;
+ self.sync_active_thread_service_tier_to_cached_session()
+ .await;
+ }
}
AppEvent::UpdatePersonality(personality) => {
self.on_update_personality(personality);
@@ -1178,12 +1182,22 @@ impl App {
self.chat_widget.open_advanced_reasoning_popup(model);
}
AppEvent::ApplyAdvancedReasoning { model, effort } => {
+ let model_changed = self.chat_widget.current_model() != model
+ || self.chat_widget.current_collaboration_mode().model() != model;
let default_effort =
self.on_apply_advanced_reasoning(model.as_str(), effort.clone());
- if let Some(mut params) =
- self.active_thread_model_setting_update_params(model.clone())
+ if model_changed {
+ self.sync_active_thread_model_setting(
+ app_server,
+ model.clone(),
+ Some(effort.clone()),
+ )
+ .await;
+ } else if let Some(mut params) =
+ self.active_thread_reasoning_setting_update_params(Some(effort.clone()))
{
- params.effort = Some(effort.clone());
+ params.collaboration_mode =
+ Some(self.chat_widget.effective_collaboration_mode());
self.send_thread_settings_update(app_server, params).await;
}
self.sync_active_thread_service_tier_to_cached_session()
@@ -1756,6 +1770,11 @@ impl App {
}
}
}
+ AppEvent::CyberModelAutoReviewNotice => {
+ self.chat_widget.add_warning_message(
+ "Cyber models default to \"Approve for me\" for safety reasons.".to_string(),
+ );
+ }
AppEvent::PluginUninstallLoaded {
cwd,
plugin_id: _plugin_id,
diff --git a/codex-rs/tui/src/app/tests.rs b/codex-rs/tui/src/app/tests.rs
index d9f8ab36b5..2ef3387e32 100644
--- a/codex-rs/tui/src/app/tests.rs
+++ b/codex-rs/tui/src/app/tests.rs
@@ -260,6 +260,30 @@ fn bypass_hook_trust_startup_warning_snapshot() {
assert_app_snapshot!("bypass_hook_trust_startup_warning", rendered);
}
+
+#[tokio::test]
+async fn cyber_model_auto_review_notice_snapshot() -> Result<()> {
+ let (mut app, mut app_event_rx, _op_rx) = make_test_app_with_channels().await;
+ let mut app_server =
+ crate::start_embedded_app_server_for_picker(app.chat_widget.config_ref()).await?;
+ let mut tui = crate::tui::test_support::make_test_tui()?;
+
+ app.handle_event(
+ &mut tui,
+ &mut app_server,
+ AppEvent::CyberModelAutoReviewNotice,
+ )
+ .await?;
+
+ let cell = match app_event_rx.try_recv() {
+ Ok(AppEvent::InsertHistoryCell(cell)) => cell,
+ other => panic!("expected InsertHistoryCell event, got {other:?}"),
+ };
+ let rendered = lines_to_single_string(&cell.display_lines(/*width*/ 80));
+ assert_app_snapshot!("cyber_model_auto_review_notice", rendered);
+ Ok(())
+}
+
#[tokio::test]
async fn enqueue_primary_thread_session_replays_buffered_approval_after_attach() -> Result<()> {
let (mut app, mut app_event_rx, _op_rx) = make_test_app_with_channels().await;
@@ -7206,6 +7230,291 @@ async fn override_turn_context_sends_thread_settings_update() {
.await;
}
+#[tokio::test]
+async fn selecting_cyber_model_defaults_active_thread_to_auto_review() {
+ Box::pin(async {
+ let mut app = make_test_app().await;
+ app.config
+ .permissions
+ .approval_policy
+ .set(AskForApproval::UnlessTrusted.to_core())
+ .expect("set approval policy");
+ app.chat_widget
+ .set_approval_policy(AskForApproval::UnlessTrusted);
+ let mut model = app
+ .model_catalog
+ .try_list_models()
+ .expect("model catalog")
+ .into_iter()
+ .find(|model| model.model == "gpt-5.4")
+ .expect("gpt-5.4 model");
+ model.model_specialty = Some("cyber".to_string());
+ app.model_catalog = Arc::new(ModelCatalog::new(vec![model]));
+
+ let mut app_server =
+ crate::start_embedded_app_server_for_picker(app.chat_widget.config_ref())
+ .await
+ .expect("embedded app server");
+ let started = app_server
+ .start_thread(app.chat_widget.config_ref())
+ .await
+ .expect("thread/start should succeed");
+ assert_eq!(
+ started.session.approval_policy,
+ AskForApproval::UnlessTrusted
+ );
+ assert_eq!(started.session.approvals_reviewer, ApprovalsReviewer::User);
+ let thread_id = started.session.thread_id;
+ app.enqueue_primary_thread_session(started.session, started.turns)
+ .await
+ .expect("primary thread should be registered");
+
+ let mut tui = crate::tui::test_support::make_test_tui().expect("test tui");
+ app.handle_event(
+ &mut tui,
+ &mut app_server,
+ AppEvent::UpdateModel("gpt-5.4".to_string()),
+ )
+ .await
+ .expect("model selection should succeed");
+
+ let notification = next_thread_settings_updated(&mut app_server, thread_id).await;
+ assert_eq!(
+ notification.thread_settings.approval_policy,
+ AskForApproval::OnRequest
+ );
+ assert_eq!(
+ notification.thread_settings.approvals_reviewer.to_core(),
+ ApprovalsReviewer::AutoReview
+ );
+ assert_eq!(
+ notification
+ .thread_settings
+ .active_permission_profile
+ .expect("active permission profile")
+ .id,
+ codex_protocol::models::BUILT_IN_PERMISSION_PROFILE_WORKSPACE
+ );
+ })
+ .await;
+}
+
+#[tokio::test]
+async fn changing_cyber_model_reasoning_preserves_selected_permissions() {
+ Box::pin(async {
+ let mut app = make_test_app().await;
+ let model_name = app.chat_widget.current_model().to_string();
+ let mut model = app
+ .model_catalog
+ .try_list_models()
+ .expect("model catalog")
+ .into_iter()
+ .find(|model| model.model == model_name)
+ .expect("current model");
+ model.model_specialty = Some("cyber".to_string());
+ app.model_catalog = Arc::new(ModelCatalog::new(vec![model]));
+
+ assert!(
+ app.apply_permission_profile_selection(PermissionProfileSelection {
+ profile_id: codex_protocol::models::BUILT_IN_PERMISSION_PROFILE_READ_ONLY
+ .to_string(),
+ approval_policy: Some(AskForApproval::OnRequest),
+ approvals_reviewer: Some(ApprovalsReviewer::User),
+ display_label: "Read Only".to_string(),
+ })
+ .await
+ );
+
+ let mut app_server =
+ crate::start_embedded_app_server_for_picker(app.chat_widget.config_ref())
+ .await
+ .expect("embedded app server");
+ let started = app_server
+ .start_thread(app.chat_widget.config_ref())
+ .await
+ .expect("thread/start should succeed");
+ let thread_id = started.session.thread_id;
+ app.enqueue_primary_thread_session(started.session, started.turns)
+ .await
+ .expect("primary thread should be registered");
+
+ let mut tui = crate::tui::test_support::make_test_tui().expect("test tui");
+ for effort in [ReasoningEffortConfig::High, ReasoningEffortConfig::Ultra] {
+ if effort == ReasoningEffortConfig::Ultra {
+ app.chat_widget
+ .set_feature_enabled(Feature::CollaborationModes, /*enabled*/ true);
+ app.chat_widget
+ .set_collaboration_mask(CollaborationModeMask {
+ name: "Plan".to_string(),
+ mode: Some(ModeKind::Plan),
+ model: Some(model_name.clone()),
+ reasoning_effort: Some(Some(effort.clone())),
+ developer_instructions: None,
+ });
+ app.handle_event(
+ &mut tui,
+ &mut app_server,
+ AppEvent::ApplyAdvancedReasoning {
+ model: model_name.clone(),
+ effort: effort.clone(),
+ },
+ )
+ .await
+ .expect("advanced reasoning selection should succeed");
+ } else {
+ app.handle_event(
+ &mut tui,
+ &mut app_server,
+ AppEvent::UpdateModel(model_name.clone()),
+ )
+ .await
+ .expect("same-model selection should succeed");
+ app.handle_event(
+ &mut tui,
+ &mut app_server,
+ AppEvent::UpdateReasoningEffort(Some(effort.clone())),
+ )
+ .await
+ .expect("reasoning selection should succeed");
+ }
+
+ let settings = next_thread_settings_updated(&mut app_server, thread_id)
+ .await
+ .thread_settings;
+ assert_eq!(settings.effort, Some(effort));
+ assert_eq!(settings.approval_policy, AskForApproval::OnRequest);
+ assert_eq!(
+ settings.approvals_reviewer.to_core(),
+ ApprovalsReviewer::User
+ );
+ assert_eq!(
+ settings
+ .active_permission_profile
+ .expect("active permission profile")
+ .id,
+ codex_protocol::models::BUILT_IN_PERMISSION_PROFILE_READ_ONLY
+ );
+ assert_eq!(
+ settings.collaboration_mode.mode,
+ app.chat_widget.effective_collaboration_mode().mode
+ );
+ assert_eq!(settings.collaboration_mode.settings.model, model_name);
+ }
+ })
+ .await;
+}
+
+#[tokio::test]
+async fn selecting_cyber_model_falls_back_to_user_when_auto_review_is_unavailable() {
+ let mut app = make_test_app().await;
+ let mut model = app
+ .model_catalog
+ .try_list_models()
+ .expect("model catalog")
+ .into_iter()
+ .find(|model| model.model == "gpt-5.4")
+ .expect("gpt-5.4 model");
+ model.model_specialty = Some("cyber".to_string());
+ app.model_catalog = Arc::new(ModelCatalog::new(vec![model]));
+ let _ = app.config.features.disable(Feature::GuardianApproval);
+ app.chat_widget
+ .set_feature_enabled(Feature::GuardianApproval, /*enabled*/ false);
+ app.active_thread_id = Some(ThreadId::new());
+
+ let params = app
+ .active_thread_model_setting_update_params("gpt-5.4".to_string())
+ .expect("active thread should produce update params");
+
+ assert_eq!(
+ params.approval_policy,
+ Some(codex_app_server_protocol::AskForApproval::OnRequest)
+ );
+ assert_eq!(
+ params.approvals_reviewer,
+ Some(codex_app_server_protocol::ApprovalsReviewer::User)
+ );
+}
+
+#[tokio::test]
+async fn selecting_cyber_model_respects_auto_review_requirements() {
+ Box::pin(async {
+ let (mut app, mut app_event_rx, _op_rx) = make_test_app_with_channels().await;
+ let requirements_toml = codex_config::ConfigRequirementsToml {
+ allowed_approval_policies: Some(vec![AskForApproval::UnlessTrusted.to_core()]),
+ ..Default::default()
+ };
+ let mut requirements_with_sources = codex_config::ConfigRequirementsWithSources::default();
+ requirements_with_sources.merge_unset_fields(
+ codex_config::RequirementSource::Unknown,
+ requirements_toml.clone(),
+ );
+ let requirements = codex_config::ConfigRequirements::try_from(requirements_with_sources)
+ .expect("reviewer requirements");
+ app.config.config_layer_stack =
+ codex_config::ConfigLayerStack::new(Vec::new(), requirements, requirements_toml)
+ .expect("auto-review requirements stack");
+ app.config
+ .permissions
+ .approval_policy
+ .set(AskForApproval::UnlessTrusted.to_core())
+ .expect("set approval policy");
+ app.chat_widget
+ .set_approval_policy(AskForApproval::UnlessTrusted);
+ app.chat_widget.sync_plugin_mentions_config(&app.config);
+
+ let mut model = app
+ .model_catalog
+ .try_list_models()
+ .expect("model catalog")
+ .into_iter()
+ .find(|model| model.model == "gpt-5.4")
+ .expect("gpt-5.4 model");
+ model.model_specialty = Some("cyber".to_string());
+ app.model_catalog = Arc::new(ModelCatalog::new(vec![model]));
+
+ let mut app_server =
+ crate::start_embedded_app_server_for_picker(app.chat_widget.config_ref())
+ .await
+ .expect("embedded app server");
+ let started = app_server
+ .start_thread(app.chat_widget.config_ref())
+ .await
+ .expect("thread/start should succeed");
+ assert_eq!(
+ started.session.approval_policy,
+ AskForApproval::UnlessTrusted
+ );
+ let thread_id = started.session.thread_id;
+ app.enqueue_primary_thread_session(started.session, started.turns)
+ .await
+ .expect("primary thread should be registered");
+
+ let mut tui = crate::tui::test_support::make_test_tui().expect("test tui");
+ app.handle_event(
+ &mut tui,
+ &mut app_server,
+ AppEvent::UpdateModel("gpt-5.4".to_string()),
+ )
+ .await
+ .expect("model selection should succeed");
+
+ let notification = next_thread_settings_updated(&mut app_server, thread_id).await;
+ assert_eq!(
+ notification.thread_settings.approval_policy,
+ AskForApproval::UnlessTrusted
+ );
+ assert_eq!(
+ notification.thread_settings.approvals_reviewer.to_core(),
+ ApprovalsReviewer::User
+ );
+ assert!(
+ std::iter::from_fn(|| app_event_rx.try_recv().ok())
+ .all(|event| !matches!(event, AppEvent::CyberModelAutoReviewNotice))
+ );
+ })
+ .await;
+}
+
#[tokio::test]
async fn thread_setting_update_params_sync_model_and_default_reasoning() {
let mut app = make_test_app().await;
diff --git a/codex-rs/tui/src/app/thread_settings.rs b/codex-rs/tui/src/app/thread_settings.rs
index 1f96b1750e..8d3383880e 100644
--- a/codex-rs/tui/src/app/thread_settings.rs
+++ b/codex-rs/tui/src/app/thread_settings.rs
@@ -2,13 +2,18 @@
use super::App;
use crate::app_command::AppCommand;
+use crate::app_event::AppEvent;
use crate::app_server_session::AppServerSession;
+use crate::chatwidget::cyber_model_approval_reviewer;
use crate::session_state::ThreadSessionState;
use codex_app_server_protocol::ApprovalsReviewer as AppServerApprovalsReviewer;
+use codex_app_server_protocol::AskForApproval as AppServerAskForApproval;
use codex_app_server_protocol::ThreadSettings;
use codex_app_server_protocol::ThreadSettingsUpdateParams;
+use codex_config::types::ApprovalsReviewer;
use codex_protocol::ThreadId;
use codex_protocol::config_types::ModeKind;
+use codex_protocol::models::BUILT_IN_PERMISSION_PROFILE_WORKSPACE;
use codex_protocol::models::PermissionProfile;
impl App {
@@ -16,11 +21,26 @@ impl App {
&mut self,
app_server: &mut AppServerSession,
model: String,
+ effort: Option<codex_protocol::openai_models::ReasoningEffort>,
) {
- let Some(params) = self.active_thread_model_setting_update_params(model) else {
+ let Some(mut params) = self.active_thread_model_setting_update_params(model) else {
return;
};
- self.send_thread_settings_update(app_server, params).await;
+ params.effort = effort;
+ let defaulted_to_auto_review = params.approvals_reviewer
+ == Some(AppServerApprovalsReviewer::AutoReview)
+ && (self.chat_widget.config_ref().approvals_reviewer != ApprovalsReviewer::AutoReview
+ || AppServerAskForApproval::from(
+ self.chat_widget
+ .config_ref()
+ .permissions
+ .approval_policy
+ .value(),
+ ) != AppServerAskForApproval::OnRequest);
+ let settings_updated = self.send_thread_settings_update(app_server, params).await;
+ if defaulted_to_auto_review && settings_updated {
+ self.app_event_tx.send(AppEvent::CyberModelAutoReviewNotice);
+ }
}
pub(super) fn active_thread_model_setting_update_params(
@@ -28,12 +48,40 @@ impl App {
model: String,
) -> Option<ThreadSettingsUpdateParams> {
let thread_id = self.active_thread_id?;
- Some(ThreadSettingsUpdateParams {
+ let is_cyber_model = self.model_catalog.try_list_models().is_ok_and(|models| {
+ models.iter().any(|preset| {
+ preset.model == model && preset.model_specialty.as_deref() == Some("cyber")
+ })
+ });
+
+ let mut params = ThreadSettingsUpdateParams {
thread_id: thread_id.to_string(),
model: Some(model),
collaboration_mode: Some(self.chat_widget.effective_collaboration_mode()),
..ThreadSettingsUpdateParams::default()
- })
+ };
+
+ if is_cyber_model {
+ let workspace_profile = PermissionProfile::workspace_write();
+ let workspace_allowed = self
+ .config
+ .permissions
+ .can_set_permission_profile(&workspace_profile)
+ .is_ok()
+ && self.config.is_permission_profile_allowed(
+ BUILT_IN_PERMISSION_PROFILE_WORKSPACE,
+ &workspace_profile,
+ );
+
+ if workspace_allowed && let Some(reviewer) = cyber_model_approval_reviewer(&self.config)
+ {
+ params.permissions = Some(BUILT_IN_PERMISSION_PROFILE_WORKSPACE.to_string());
+ params.approval_policy = Some(AppServerAskForApproval::OnRequest);
+ params.approvals_reviewer = Some(reviewer.into());
+ }
+ }
+
+ Some(params)
}
pub(super) async fn sync_active_thread_reasoning_setting(
@@ -157,14 +205,18 @@ impl App {
&mut self,
app_server: &mut AppServerSession,
params: ThreadSettingsUpdateParams,
- ) {
+ ) -> bool {
if !thread_settings_update_has_changes(&params) {
- return;
+ return false;
}
- if let Err(err) = app_server.thread_settings_update(params).await {
- tracing::warn!("failed to update app-server thread settings from TUI: {err}");
- self.chat_widget
- .add_error_message(format!("Failed to update thread settings: {err}"));
+ match app_server.thread_settings_update(params).await {
+ Ok(settings_updated) => settings_updated,
+ Err(err) => {
+ tracing::warn!("failed to update app-server thread settings from TUI: {err}");
+ self.chat_widget
+ .add_error_message(format!("Failed to update thread settings: {err}"));
+ false
+ }
}
}
}
diff --git a/codex-rs/tui/src/app_event.rs b/codex-rs/tui/src/app_event.rs
index 92169d193b..4e55cca72c 100644
--- a/codex-rs/tui/src/app_event.rs
+++ b/codex-rs/tui/src/app_event.rs
@@ -805,6 +805,9 @@ pub(crate) enum AppEvent {
effort: Option<ReasoningEffort>,
},
+ /// Show the cyber auto-review notice after the model selection confirmation.
+ CyberModelAutoReviewNotice,
+
/// Persist the selected personality to the appropriate config.
PersistPersonalitySelection {
personality: Personality,
diff --git a/codex-rs/tui/src/app_server_session.rs b/codex-rs/tui/src/app_server_session.rs
index c9d18d4bbb..06166e5969 100644
--- a/codex-rs/tui/src/app_server_session.rs
+++ b/codex-rs/tui/src/app_server_session.rs
@@ -1025,9 +1025,9 @@ impl AppServerSession {
pub(crate) async fn thread_settings_update(
&mut self,
params: ThreadSettingsUpdateParams,
- ) -> Result<()> {
+ ) -> Result<bool> {
if !self.thread_settings_update_supported {
- return Ok(());
+ return Ok(false);
}
let request_id = self.next_request_id();
match self
@@ -1038,7 +1038,7 @@ impl AppServerSession {
})
.await
{
- Ok(_) => Ok(()),
+ Ok(_) => Ok(true),
Err(TypedRequestError::Server { source, .. })
if is_thread_settings_update_unsupported(&source) =>
{
@@ -1049,7 +1049,7 @@ impl AppServerSession {
// of showing an error every time the user changes model, effort,
// personality, or mode.
self.thread_settings_update_supported = false;
- Ok(())
+ Ok(false)
}
Err(err) => Err(err).wrap_err("thread/settings/update failed in TUI"),
}
@@ -1526,6 +1526,7 @@ fn model_preset_from_api_model(model: ApiModel) -> ModelPreset {
model: model.model,
display_name: model.display_name,
description: model.description,
+ model_specialty: model.model_specialty,
default_reasoning_effort: model.default_reasoning_effort,
supported_reasoning_efforts: model
.supported_reasoning_efforts
diff --git a/codex-rs/tui/src/chatwidget.rs b/codex-rs/tui/src/chatwidget.rs
index 7151ed0d50..bb1d3aac47 100644
--- a/codex-rs/tui/src/chatwidget.rs
+++ b/codex-rs/tui/src/chatwidget.rs
@@ -168,7 +168,6 @@ use crossterm::event::KeyModifiers;
use rand::Rng;
use ratatui::buffer::Buffer;
use ratatui::layout::Rect;
-use ratatui::style::Color;
use ratatui::style::Modifier;
use ratatui::style::Style;
use ratatui::style::Stylize;
@@ -389,6 +388,8 @@ mod notifications;
use self::notifications::Notification;
mod permission_popups;
mod permissions_menu;
+pub(crate) use self::permissions_menu::auto_review_available;
+pub(crate) use self::permissions_menu::cyber_model_approval_reviewer;
mod protocol;
mod protocol_requests;
mod rate_limits;
diff --git a/codex-rs/tui/src/chatwidget/permission_popups.rs b/codex-rs/tui/src/chatwidget/permission_popups.rs
index 6c667864d3..9bec7aa697 100644
--- a/codex-rs/tui/src/chatwidget/permission_popups.rs
+++ b/codex-rs/tui/src/chatwidget/permission_popups.rs
@@ -407,19 +407,45 @@ impl ChatWidget {
) {
let selected_name = preset.label.to_string();
let approval = AskForApproval::from(preset.approval);
- let mut header_children: Vec<Box<dyn Renderable>> = Vec::new();
+ let is_cyber_model = self.model_catalog.try_list_models().is_ok_and(|models| {
+ models.iter().any(|model| {
+ model.model == self.current_model()
+ && model.model_specialty.as_deref() == Some("cyber")
+ })
+ });
let title_line = Line::from("Enable full access?").bold();
- let info_line = Line::from(vec![
- "When Codex runs with full access, it can edit any file on your computer and run commands with network, without your approval. "
- .into(),
- "Exercise caution when enabling full access. This significantly increases the risk of data loss, leaks, or unexpected behavior."
- .fg(Color::Red),
- ]);
- header_children.push(Box::new(title_line));
- header_children.push(Box::new(
- Paragraph::new(vec![info_line]).wrap(Wrap { trim: false }),
- ));
- let header = ColumnRenderable::with(header_children);
+ let info_lines = if is_cyber_model {
+ let recommendation = if auto_review_available(&self.config) {
+ "We strongly recommend selecting \"Approve for me\" instead, and customizing the reviewer policy for your use case."
+ } else {
+ "We strongly recommend selecting \"Ask for approval\" instead."
+ };
+ vec![
+ Line::default(),
+ Line::from(
+ "When Codex runs with full access, it can edit any file on your computer and run commands with network, without your approval.",
+ ),
+ Line::default(),
+ Line::from(vec![
+ "Cyber models carry a higher risk of dangerous actions.".red(),
+ " Ensure proper safeguards are in place before granting full access. ".into(),
+ recommendation.into(),
+ ]),
+ ]
+ } else {
+ vec![Line::from(vec![
+ "When Codex runs with full access, it can edit any file on your computer and run commands with network, without your approval. "
+ .into(),
+ "Exercise caution when enabling full access. This significantly increases the risk of data loss, leaks, or unexpected behavior."
+ .red(),
+ ])]
+ };
+ let header = Paragraph::new(
+ std::iter::once(title_line)
+ .chain(info_lines)
+ .collect::<Vec<_>>(),
+ )
+ .wrap(Wrap { trim: false });
let accept_actions = profile_selection.map_or_else(
|| {
diff --git a/codex-rs/tui/src/chatwidget/permissions_menu.rs b/codex-rs/tui/src/chatwidget/permissions_menu.rs
index c97721819e..2bf0bf733e 100644
--- a/codex-rs/tui/src/chatwidget/permissions_menu.rs
+++ b/codex-rs/tui/src/chatwidget/permissions_menu.rs
@@ -1,6 +1,37 @@
use super::*;
use codex_protocol::models::BUILT_IN_PERMISSION_PROFILE_DANGER_FULL_ACCESS;
+pub(crate) fn auto_review_available(config: &Config) -> bool {
+ cyber_model_approval_reviewer(config) == Some(ApprovalsReviewer::AutoReview)
+}
+
+pub(crate) fn cyber_model_approval_reviewer(config: &Config) -> Option<ApprovalsReviewer> {
+ let requirements = config.config_layer_stack.requirements();
+ if requirements
+ .approval_policy
+ .can_set(&AskForApproval::OnRequest.to_core())
+ .is_err()
+ {
+ return None;
+ }
+
+ let reviewer = if config.features.enabled(Feature::GuardianApproval)
+ && requirements
+ .approvals_reviewer
+ .can_set(&ApprovalsReviewer::AutoReview)
+ .is_ok()
+ {
+ ApprovalsReviewer::AutoReview
+ } else {
+ ApprovalsReviewer::User
+ };
+ requirements
+ .approvals_reviewer
+ .can_set(&reviewer)
+ .is_ok()
+ .then_some(reviewer)
+}
+
impl ChatWidget {
pub(super) fn open_permission_profiles_popup(&mut self) {
let active_profile_id = self
diff --git a/codex-rs/tui/src/chatwidget/tests/popups_and_settings.rs b/codex-rs/tui/src/chatwidget/tests/popups_and_settings.rs
index 43c42e8ae4..a2b7d63be8 100644
--- a/codex-rs/tui/src/chatwidget/tests/popups_and_settings.rs
+++ b/codex-rs/tui/src/chatwidget/tests/popups_and_settings.rs
@@ -3141,6 +3141,7 @@ async fn model_picker_hides_show_in_picker_false_models_from_cache() {
model: slug.to_string(),
display_name: slug.to_string(),
description: format!("{slug} description"),
+ model_specialty: None,
default_reasoning_effort: ReasoningEffortConfig::Medium,
supported_reasoning_efforts: vec![ReasoningEffortPreset {
effort: ReasoningEffortConfig::Medium,
@@ -3635,6 +3636,7 @@ async fn single_reasoning_option_skips_selection() {
model: "model-with-single-reasoning".to_string(),
display_name: "model-with-single-reasoning".to_string(),
description: "".to_string(),
+ model_specialty: None,
default_reasoning_effort: ReasoningEffortConfig::High,
supported_reasoning_efforts: single_effort,
supports_personality: false,
diff --git a/codex-rs/tui/src/chatwidget/windows_sandbox_prompts.rs b/codex-rs/tui/src/chatwidget/windows_sandbox_prompts.rs
index 89ea3a9bc5..6bef4f93d1 100644
--- a/codex-rs/tui/src/chatwidget/windows_sandbox_prompts.rs
+++ b/codex-rs/tui/src/chatwidget/windows_sandbox_prompts.rs
@@ -106,8 +106,7 @@ impl ChatWidget {
Line::from(vec![
"We couldn't complete the world-writable scan, so protections cannot be verified. "
.into(),
- format!("The Windows sandbox cannot guarantee protection in {mode_label}.")
- .fg(Color::Red),
+ format!("The Windows sandbox cannot guarantee protection in {mode_label}.").red(),
])
} else {
Line::from(vec![
diff --git a/codex-rs/tui/src/snapshots/codex_tui__app__tests__cyber_model_auto_review_notice.snap b/codex-rs/tui/src/snapshots/codex_tui__app__tests__cyber_model_auto_review_notice.snap
new file mode 100644
index 0000000000..5811457def
--- /dev/null
+++ b/codex-rs/tui/src/snapshots/codex_tui__app__tests__cyber_model_auto_review_notice.snap
@@ -0,0 +1,5 @@
+---
+source: tui/src/app/tests.rs
+expression: rendered
+---
+⚠ Cyber models default to "Approve for me" for safety reasons.