Scope environment readiness config to thread attachments (#38067)

## Why

Threads that share an executor environment can require different capability roots and login-shell policies. Treating readiness configuration as executor-wide can expose one thread's settings to another.

## What changed

- Add `CodexThread::environment_ready` and `EnvironmentConfig` so hosts can install capability roots and login-shell policy for an exact thread, environment, and working-directory attachment.
- Validate attachment readiness updates, merge ready attachment roots with persisted thread roots, and refresh MCP capabilities when those roots change.
- Preserve installed environment policy across thread settings updates and child-thread inheritance while resetting it when the selected working directory changes.

## Testing

- Cover attachment config inheritance and reset behavior.
- Verify that threads sharing an executor retain independent model-visible capability roots and login-shell tool schemas across updates.

GitOrigin-RevId: 60e7a296b3e41b835b0413aa2837451e8a55c230
This commit is contained in:
sayan-oai authored and copyberry committed 2026-08-11 19:58:10 +00:00
1 parent c8f673fddc
commit b43de77679
18 files changed
+459 -18

No files matched your search

+55
View File
@@ -0,0 +1,55 @@
use std::collections::HashSet;
use codex_exec_server::MAX_SELECTED_CAPABILITY_ROOTS;
use codex_exec_server::SelectedCapabilityRootsStatus;
use codex_protocol::capabilities::CapabilityRootLocation;
use codex_protocol::error::CodexErr;
use codex_protocol::error::Result as CodexResult;
use codex_protocol::protocol::TurnEnvironmentSelection;
use crate::environment_config::EnvironmentConfig;
use crate::session::session::Session;
impl Session {
pub(crate) async fn environment_ready(
&self,
selection: &TurnEnvironmentSelection,
config: EnvironmentConfig,
) -> CodexResult<()> {
if config.selected_capability_roots.len() > MAX_SELECTED_CAPABILITY_ROOTS {
return Err(CodexErr::InvalidRequest(format!(
"environment readiness contains more than {MAX_SELECTED_CAPABILITY_ROOTS} selected capability roots"
)));
}
let mut root_ids = HashSet::with_capacity(config.selected_capability_roots.len());
for root in &config.selected_capability_roots {
let CapabilityRootLocation::Environment { environment_id, .. } = &root.location;
if root.id.trim().is_empty()
|| environment_id != &selection.environment_id
|| !root_ids.insert(root.id.as_str())
{
return Err(CodexErr::InvalidRequest(format!(
"selected capability roots must have unique non-empty IDs and belong to environment `{}`",
selection.environment_id
)));
}
}
// grab session lock so installation can't race w/ thread settings updates
let _state = self.state.lock().await;
self.services
.turn_environments
.environment_ready(selection, config)?;
// mark mcp runtime for refresh because available capabilities could've changed
self.mark_mcp_runtime_dirty();
Ok(())
}
/// Combines this session's persisted roots with ready environment attachments.
pub(crate) fn inspect_selected_capability_roots(&self) -> SelectedCapabilityRootsStatus {
self.services
.turn_environments
.inspect_selected_capability_roots(&self.services.selected_capability_roots)
}
}