Centralize turn environment selection state (#38461)

## What changed

- Store `TurnEnvironmentSelection` directly on each resolved `TurnEnvironment`
  instead of copying its environment ID, working directory, and workspace roots
  into separate fields.
- Update environment resolution, tool execution, approvals, and related tests to
  access selection state through the retained value.

GitOrigin-RevId: ab723d21e112b8af5bcaf1f772a5e376553312bc
This commit is contained in:
sayan-oai authored and copyberry committed 2026-08-14 00:22:54 +00:00
1 parent 18bbb585e7
commit 535795f7d1
31 files changed
+159 -146

No files matched your search

+10 -20
View File
@@ -42,10 +42,8 @@ pub(crate) struct TurnEnvironmentConfig {
#[derive(Clone)]
pub(crate) struct TurnEnvironment {
pub(crate) environment_id: String,
pub(crate) selection: TurnEnvironmentSelection,
pub(crate) environment: Arc<Environment>,
cwd: PathUri,
workspace_roots: Vec<PathUri>,
pub(crate) shell: Option<shell::Shell>,
pub(crate) config: TurnEnvironmentConfig,
pub(crate) shell_snapshot: ShellSnapshotTask,
@@ -53,18 +51,14 @@ pub(crate) struct TurnEnvironment {
impl TurnEnvironment {
pub(crate) fn new(
environment_id: String,
selection: TurnEnvironmentSelection,
environment: Arc<Environment>,
cwd: PathUri,
workspace_roots: Vec<PathUri>,
shell: Option<shell::Shell>,
config: TurnEnvironmentConfig,
) -> Self {
Self {
environment_id,
selection,
environment,
cwd,
workspace_roots,
shell,
config,
shell_snapshot: futures::future::ready(None).boxed().shared(),
@@ -72,7 +66,7 @@ impl TurnEnvironment {
}
pub(crate) fn shell_snapshot(&self, cwd: &AbsolutePathBuf) -> Option<AbsolutePathBuf> {
if self.cwd != PathUri::from_abs_path(cwd) {
if self.selection.cwd != PathUri::from_abs_path(cwd) {
return None;
}
self.shell_snapshot
@@ -82,11 +76,11 @@ impl TurnEnvironment {
}
pub(crate) fn cwd(&self) -> &PathUri {
&self.cwd
&self.selection.cwd
}
pub(crate) fn workspace_roots(&self) -> &[PathUri] {
&self.workspace_roots
&self.selection.workspace_roots
}
pub(crate) fn permission_profile(&self) -> &PermissionProfile {
@@ -109,21 +103,17 @@ impl TurnEnvironment {
}
pub(crate) fn selection(&self) -> TurnEnvironmentSelection {
TurnEnvironmentSelection {
environment_id: self.environment_id.clone(),
cwd: self.cwd.clone(),
workspace_roots: self.workspace_roots.clone(),
}
self.selection.clone()
}
}
impl std::fmt::Debug for TurnEnvironment {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.debug_struct("TurnEnvironment")
.field("environment_id", &self.environment_id)
.field("environment_id", &self.selection.environment_id)
.field("environment", &self.environment)
.field("cwd", &self.cwd)
.field("workspace_roots", &self.workspace_roots)
.field("cwd", &self.selection.cwd)
.field("workspace_roots", &self.selection.workspace_roots)
.field("shell", &self.shell)
.field("config", &self.config)
.finish_non_exhaustive()