diff --git a/codex-rs/tui/src/app/event_dispatch.rs b/codex-rs/tui/src/app/event_dispatch.rs index 7ca0458d16..9f148b5a83 100644 --- a/codex-rs/tui/src/app/event_dispatch.rs +++ b/codex-rs/tui/src/app/event_dispatch.rs @@ -2292,6 +2292,7 @@ impl App { env_map, logs_base_dir, permission_profile, + self.session_telemetry.clone(), tx, /*startup_scan*/ false, ); diff --git a/codex-rs/tui/src/app/platform_actions.rs b/codex-rs/tui/src/app/platform_actions.rs index a745209dfa..bf84728fa6 100644 --- a/codex-rs/tui/src/app/platform_actions.rs +++ b/codex-rs/tui/src/app/platform_actions.rs @@ -16,12 +16,14 @@ pub(super) struct WindowsSandboxState { impl App { #[cfg(target_os = "windows")] + #[allow(clippy::too_many_arguments)] pub(super) fn spawn_world_writable_scan( cwd: AbsolutePathBuf, workspace_roots: Vec, env_map: std::collections::HashMap, logs_base_dir: AbsolutePathBuf, permission_profile: PermissionProfile, + session_telemetry: SessionTelemetry, tx: AppEventSender, startup_scan: bool, ) { @@ -47,6 +49,7 @@ impl App { &permissions, Some(logs_base_dir_path), ); + crate::windows_sandbox::record_world_writable_scan_result(&session_telemetry, &result); if result.is_err() { // Scan failed: warn without examples. send_world_writable_scan_failed(&tx); diff --git a/codex-rs/tui/src/app/startup.rs b/codex-rs/tui/src/app/startup.rs index 62e8d838ab..3f9e665a6c 100644 --- a/codex-rs/tui/src/app/startup.rs +++ b/codex-rs/tui/src/app/startup.rs @@ -611,6 +611,7 @@ See the Codex keymap documentation for supported actions and examples." env_map, logs_base_dir, startup_permission_profile, + app.session_telemetry.clone(), tx, /*startup_scan*/ true, ); diff --git a/codex-rs/tui/src/chatwidget/windows_sandbox_prompts.rs b/codex-rs/tui/src/chatwidget/windows_sandbox_prompts.rs index 15ebd816be..e11bc47d82 100644 --- a/codex-rs/tui/src/chatwidget/windows_sandbox_prompts.rs +++ b/codex-rs/tui/src/chatwidget/windows_sandbox_prompts.rs @@ -48,13 +48,15 @@ impl ChatWidget { else { return None; }; - match codex_windows_sandbox::apply_world_writable_scan_and_denies_for_permissions( + let result = codex_windows_sandbox::apply_world_writable_scan_and_denies_for_permissions( self.config.codex_home.as_path(), cwd.as_path(), &env_map, &permissions, Some(self.config.codex_home.as_path()), - ) { + ); + crate::windows_sandbox::record_world_writable_scan_result(&self.session_telemetry, &result); + match result { Ok(_) => None, Err(_) => Some((Vec::new(), 0, true)), } diff --git a/codex-rs/tui/src/windows_sandbox.rs b/codex-rs/tui/src/windows_sandbox.rs index ec586e7b1b..dd8ff22383 100644 --- a/codex-rs/tui/src/windows_sandbox.rs +++ b/codex-rs/tui/src/windows_sandbox.rs @@ -9,6 +9,8 @@ use crate::legacy_core::config::Config; use codex_config::types::WindowsSandboxModeToml; use codex_features::Feature; +#[cfg(target_os = "windows")] +use codex_otel::SessionTelemetry; use codex_protocol::config_types::WindowsSandboxLevel; #[cfg(target_os = "windows")] use codex_protocol::models::PermissionProfile; @@ -20,6 +22,22 @@ use std::path::Path; #[cfg(target_os = "windows")] use std::path::PathBuf; +#[cfg(target_os = "windows")] +pub(crate) fn record_world_writable_scan_result( + session_telemetry: &SessionTelemetry, + result: &anyhow::Result, +) { + let (flagged_count, result) = match result { + Ok(flagged_count) => (*flagged_count as i64, "success"), + Err(_) => (0, "error"), + }; + session_telemetry.histogram( + "codex.windows_sandbox.world_writable_scan_flagged_directories", + flagged_count, + &[("result", result)], + ); +} + pub(crate) fn level_from_config(config: &Config) -> WindowsSandboxLevel { match config.permissions.windows_sandbox_mode { Some(WindowsSandboxModeToml::Elevated) => WindowsSandboxLevel::Elevated, diff --git a/codex-rs/windows-sandbox-rs/src/audit.rs b/codex-rs/windows-sandbox-rs/src/audit.rs index 5dd2a58466..e4451f1781 100644 --- a/codex-rs/windows-sandbox-rs/src/audit.rs +++ b/codex-rs/windows-sandbox-rs/src/audit.rs @@ -224,11 +224,12 @@ pub fn apply_world_writable_scan_and_denies_for_permissions( env_map: &std::collections::HashMap, permissions: &ResolvedWindowsSandboxPermissions, logs_base_dir: Option<&Path>, -) -> Result<()> { +) -> Result { let flagged = audit_everyone_writable(cwd, env_map, logs_base_dir)?; if flagged.is_empty() { - return Ok(()); + return Ok(0); } + let flagged_count = flagged.len(); let result = apply_capability_denies_for_world_writable_for_permissions( codex_home, &flagged, @@ -243,7 +244,7 @@ pub fn apply_world_writable_scan_and_denies_for_permissions( logs_base_dir, ); } - result + result.map(|()| flagged_count) } fn apply_capability_denies_for_world_writable_for_permissions(