Hare/yoi
1
1
Fork 0
Code Actions Packages Releases Activity

fix: retain child-local bash output scope

Browse Source
This commit is contained in:
Hare
2026-09-05 22:29:19 +09:00
parent a7056702e8
commit d2fa0787d8
1 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/worker/src/spawn/tool.rs
+11 -19
View File
@@ -491,19 +491,17 @@ impl Tool for SubWorkerSpawnTool {
.await .await
.map_err(|error| ToolError::ExecutionFailed(format!("build Internal Worker: {error}")))?; .map_err(|error| ToolError::ExecutionFailed(format!("build Internal Worker: {error}")))?;
child.bind_workdir_session(Some(workdir_delegation.scoped_session.clone())); child.bind_workdir_session(Some(workdir_delegation.scoped_session.clone()));
if !transports_delegation_context { child
child .add_scope_rules([ScopeRule {
.add_scope_rules([ScopeRule { target: child_bash_output_dir.clone(),
target: child_bash_output_dir.clone(), permission: manifest::Permission::Read,
permission: manifest::Permission::Read, recursive: true,
recursive: true, }])
}]) .map_err(|error| {
.map_err(|error| { ToolError::ExecutionFailed(format!(
ToolError::ExecutionFailed(format!( "grant Internal Worker Bash output scope: {error}"
"grant Internal Worker Bash output scope: {error}" ))
)) })?;
})?;
}
let child_scope = child.scope().clone(); let child_scope = child.scope().clone();
let child_registry = SpawnedWorkerRegistry::new_internal(input.name.clone(), child_scope); let child_registry = SpawnedWorkerRegistry::new_internal(input.name.clone(), child_scope);
register_worker_tools( register_worker_tools(
@@ -1489,12 +1487,6 @@ enabled = false
); );
let child_bash_output_dir = bash_output_dir.join("sub-workers").join("remote-child"); let child_bash_output_dir = bash_output_dir.join("sub-workers").join("remote-child");
assert!(child_bash_output_dir.is_dir()); assert!(child_bash_output_dir.is_dir());
assert!(
record
.scope_delegated
.iter()
.all(|rule| rule.target != child_bash_output_dir)
);
for required in ["Read", "Write", "Edit", "Glob", "Grep", "Bash"] { for required in ["Read", "Write", "Edit", "Glob", "Grep", "Bash"] {
assert!( assert!(
record.installed_tools.iter().any(|name| name == required), record.installed_tools.iter().any(|name| name == required),