mirror of
https://github.com/openai/codex.git
synced 2026-11-05 20:10:33 +00:00
session: localize legacy sandbox turn fallback
This commit is contained in:
@@ -323,10 +323,14 @@ async fn permission_profile_with_legacy_fallback(
|
||||
) -> Option<PermissionProfile> {
|
||||
match (permission_profile, sandbox_policy) {
|
||||
(Some(permission_profile), _) => Some(permission_profile),
|
||||
(None, Some(sandbox_policy)) => Some(
|
||||
sess.permission_profile_from_legacy_sandbox_update(sandbox_policy, cwd)
|
||||
.await,
|
||||
),
|
||||
(None, Some(sandbox_policy)) => {
|
||||
let state = sess.state.lock().await;
|
||||
Some(
|
||||
state
|
||||
.session_configuration
|
||||
.permission_profile_from_legacy_sandbox_update(sandbox_policy, cwd),
|
||||
)
|
||||
}
|
||||
(None, None) => None,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -338,7 +338,6 @@ use codex_protocol::protocol::Op;
|
||||
use codex_protocol::protocol::RateLimitSnapshot;
|
||||
use codex_protocol::protocol::RequestUserInputEvent;
|
||||
use codex_protocol::protocol::ReviewDecision;
|
||||
use codex_protocol::protocol::SandboxPolicy;
|
||||
use codex_protocol::protocol::SessionConfiguredEvent;
|
||||
use codex_protocol::protocol::SessionNetworkProxyRuntime;
|
||||
use codex_protocol::protocol::SkillDependencies as ProtocolSkillDependencies;
|
||||
@@ -1354,17 +1353,6 @@ impl Session {
|
||||
state.session_configuration.apply(updates).map(|_| ())
|
||||
}
|
||||
|
||||
pub(crate) async fn permission_profile_from_legacy_sandbox_update(
|
||||
&self,
|
||||
sandbox_policy: &SandboxPolicy,
|
||||
cwd: Option<&Path>,
|
||||
) -> PermissionProfile {
|
||||
let state = self.state.lock().await;
|
||||
state
|
||||
.session_configuration
|
||||
.permission_profile_from_legacy_sandbox_update(sandbox_policy, cwd)
|
||||
}
|
||||
|
||||
pub(crate) async fn set_session_startup_prewarm(
|
||||
&self,
|
||||
startup_prewarm: SessionStartupPrewarmHandle,
|
||||
|
||||
@@ -2,6 +2,7 @@ use super::*;
|
||||
use crate::goals::GoalRuntimeState;
|
||||
use codex_protocol::permissions::FileSystemPath;
|
||||
use codex_protocol::permissions::FileSystemSpecialPath;
|
||||
use codex_protocol::protocol::SandboxPolicy;
|
||||
use tokio::sync::Semaphore;
|
||||
|
||||
/// Context for an initialized model agent
|
||||
|
||||
Reference in New Issue
Block a user