mirror of
https://github.com/openai/codex.git
synced 2026-11-18 23:02:23 +00:00
Preserve restored permission profiles in TUI sessions (#41192)
## Why Restored app-server threads can carry permission profiles that cannot be represented without loss as legacy sandbox-mode overrides. Sending those profiles as per-turn overrides can discard their original permission details. ## What changed - Distinguish restored permission profiles from legacy per-turn sandbox overrides. - Preserve restored profiles while routing turns and changing to compatible working directories. - Reject `/cd` when a restored profile cannot be represented safely by a legacy sandbox mode. ## Testing - Cover retaining a restored read-only profile across `/cd` without a turn override. - Verify that lossy sandbox-mode projections are detected. GitOrigin-RevId: 6143dca4b83ab4f59bab05f6a59b4fe841c56192
This commit is contained in:
1 parent
8935ff19db
commit
c29bc99949
9 files changed
+167
-12
No files matched your search
@@ -642,6 +642,13 @@ struct RuntimePermissionProfileOverride {
|
||||
permission_profile: PermissionProfile,
|
||||
active_permission_profile: Option<ActivePermissionProfile>,
|
||||
network: Option<crate::legacy_core::config::NetworkProxySpec>,
|
||||
turn_override: RuntimePermissionProfileTurnOverride,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
enum RuntimePermissionProfileTurnOverride {
|
||||
Preserve,
|
||||
LegacySandbox,
|
||||
}
|
||||
|
||||
impl RuntimePermissionProfileOverride {
|
||||
@@ -650,8 +657,30 @@ impl RuntimePermissionProfileOverride {
|
||||
permission_profile: config.permissions.permission_profile().clone(),
|
||||
active_permission_profile: config.permissions.active_permission_profile(),
|
||||
network: config.permissions.network.clone(),
|
||||
turn_override: RuntimePermissionProfileTurnOverride::LegacySandbox,
|
||||
}
|
||||
}
|
||||
|
||||
fn from_restored_config(config: &Config) -> Self {
|
||||
Self {
|
||||
turn_override: RuntimePermissionProfileTurnOverride::Preserve,
|
||||
..Self::from_config(config)
|
||||
}
|
||||
}
|
||||
|
||||
fn matches_config(&self, config: &Config) -> bool {
|
||||
self.permission_profile == *config.permissions.permission_profile()
|
||||
&& self.active_permission_profile == config.permissions.active_permission_profile()
|
||||
&& self.network == config.permissions.network
|
||||
}
|
||||
|
||||
fn turn_permission_profile(&self) -> Option<&PermissionProfile> {
|
||||
matches!(
|
||||
self.turn_override,
|
||||
RuntimePermissionProfileTurnOverride::LegacySandbox
|
||||
)
|
||||
.then_some(&self.permission_profile)
|
||||
}
|
||||
}
|
||||
|
||||
fn active_turn_not_steerable_turn_error(error: &TypedRequestError) -> Option<AppServerTurnError> {
|
||||
|
||||
Reference in new issue
Block a user