openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-10-22 17:58:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge e411b9357a into sapling-pr-archive-bolinfest

Browse Source
This commit is contained in:
Michael Bolin
2026-04-30 05:01:57 -07:00
committed by GitHub
parent 23b1a57bc0 e411b9357a
commit a826b14686
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/analytics/src/analytics_client_tests.rs
+9 -3
View File
@@ -66,7 +66,6 @@ use codex_app_server_protocol::InitializeParams;
use codex_app_server_protocol::JSONRPCErrorError;
use codex_app_server_protocol::NonSteerableTurnKind;
use codex_app_server_protocol::RequestId;
use codex_app_server_protocol::SandboxPolicy as AppServerSandboxPolicy;
use codex_app_server_protocol::ServerNotification;
use codex_app_server_protocol::SessionSource as AppServerSessionSource;
use codex_app_server_protocol::Thread;
@@ -106,6 +105,7 @@ use codex_utils_absolute_path::test_support::test_path_buf;
use pretty_assertions::assert_eq;
use serde_json::json;
use std::collections::HashSet;
use std::path::Path;
use std::path::PathBuf;
use std::sync::Arc;
use std::sync::Mutex;
@@ -155,7 +155,10 @@ fn sample_thread_start_response(
instruction_sources: Vec::new(),
approval_policy: AppServerAskForApproval::OnFailure,
approvals_reviewer: AppServerApprovalsReviewer::User,
sandbox: AppServerSandboxPolicy::DangerFullAccess,
sandbox: CorePermissionProfile::Disabled
.to_legacy_sandbox_policy(Path::new("/"))
.expect("disabled profile should project to legacy sandbox")
.into(),
permission_profile: None,
active_permission_profile: None,
reasoning_effort: None,
@@ -209,7 +212,10 @@ fn sample_thread_resume_response_with_source(
instruction_sources: Vec::new(),
approval_policy: AppServerAskForApproval::OnFailure,
approvals_reviewer: AppServerApprovalsReviewer::User,
sandbox: AppServerSandboxPolicy::DangerFullAccess,
sandbox: CorePermissionProfile::Disabled
.to_legacy_sandbox_policy(Path::new("/"))
.expect("disabled profile should project to legacy sandbox")
.into(),
permission_profile: None,
active_permission_profile: None,
reasoning_effort: None,
codex-rs/analytics/src/client_tests.rs
+13 -4
View File
@@ -7,7 +7,6 @@ use codex_app_server_protocol::ClientRequest;
use codex_app_server_protocol::ClientResponsePayload;
use codex_app_server_protocol::PermissionProfile as AppServerPermissionProfile;
use codex_app_server_protocol::RequestId;
use codex_app_server_protocol::SandboxPolicy as AppServerSandboxPolicy;
use codex_app_server_protocol::SessionSource as AppServerSessionSource;
use codex_app_server_protocol::Thread;
use codex_app_server_protocol::ThreadArchiveParams;
@@ -26,6 +25,7 @@ use codex_protocol::models::PermissionProfile as CorePermissionProfile;
use codex_utils_absolute_path::test_support::PathBufExt;
use codex_utils_absolute_path::test_support::test_path_buf;
use std::collections::HashSet;
use std::path::Path;
use std::sync::Arc;
use std::sync::Mutex;
use tokio::sync::mpsc;
@@ -109,7 +109,10 @@ fn sample_thread_start_response() -> ClientResponsePayload {
instruction_sources: Vec::new(),
approval_policy: AppServerAskForApproval::OnFailure,
approvals_reviewer: AppServerApprovalsReviewer::User,
sandbox: AppServerSandboxPolicy::DangerFullAccess,
sandbox: CorePermissionProfile::Disabled
.to_legacy_sandbox_policy(Path::new("/"))
.expect("disabled profile should project to legacy sandbox")
.into(),
permission_profile: Some(sample_permission_profile()),
active_permission_profile: None,
reasoning_effort: None,
@@ -126,7 +129,10 @@ fn sample_thread_resume_response() -> ClientResponsePayload {
instruction_sources: Vec::new(),
approval_policy: AppServerAskForApproval::OnFailure,
approvals_reviewer: AppServerApprovalsReviewer::User,
sandbox: AppServerSandboxPolicy::DangerFullAccess,
sandbox: CorePermissionProfile::Disabled
.to_legacy_sandbox_policy(Path::new("/"))
.expect("disabled profile should project to legacy sandbox")
.into(),
permission_profile: Some(sample_permission_profile()),
active_permission_profile: None,
reasoning_effort: None,
@@ -143,7 +149,10 @@ fn sample_thread_fork_response() -> ClientResponsePayload {
instruction_sources: Vec::new(),
approval_policy: AppServerAskForApproval::OnFailure,
approvals_reviewer: AppServerApprovalsReviewer::User,
sandbox: AppServerSandboxPolicy::DangerFullAccess,
sandbox: CorePermissionProfile::Disabled
.to_legacy_sandbox_policy(Path::new("/"))
.expect("disabled profile should project to legacy sandbox")
.into(),
permission_profile: Some(sample_permission_profile()),
active_permission_profile: None,
reasoning_effort: None,