Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions src/crates/assembly/core/src/agentic/tools/tool_context_runtime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ use bitfun_agent_runtime::checkpoint::GitStatusCheckpointFacts;
use bitfun_agent_runtime::checkpoint::{
build_light_checkpoint as build_runtime_light_checkpoint, LightCheckpointWorkspaceFacts,
};
use bitfun_agent_runtime::permission::AUTO_APPROVE_ASK_CONTEXT_KEY;
use bitfun_agent_runtime::permission::{AUTO_APPROVE_ASK_CONTEXT_KEY, PERMISSION_MODE_CONTEXT_KEY};
use bitfun_agent_runtime::remote_file_delivery::TOOL_CONTEXT_REMOTE_FILE_DELIVERY_KEY;
use bitfun_agent_runtime::user_questions::{
USER_INPUT_AVAILABLE_CONTEXT_KEY, USER_INPUT_MODEL_ROUND_CONTEXT_KEY,
Expand All @@ -47,7 +47,9 @@ use bitfun_agent_tools::{
};
#[cfg(feature = "canvas-runtime")]
use bitfun_product_domains::canvas::CanvasStoragePort;
use bitfun_runtime_ports::{DelegationPolicy, RemoteExecPort, TerminalPort, ToolRuntimeHandles};
use bitfun_runtime_ports::{
DelegationPolicy, PermissionMode, RemoteExecPort, TerminalPort, ToolRuntimeHandles,
};
#[cfg(feature = "canvas-runtime")]
use bitfun_services_integrations::canvas::CanvasService;
#[cfg(feature = "git")]
Expand Down Expand Up @@ -346,6 +348,19 @@ fn build_tool_context_custom_data(context: &ToolExecutionContext) -> HashMap<Str
deep_review_parent,
&mut extension_custom_data,
);
// Preserve the turn's already-resolved permission mode for Task
// delegation. Without this projection, Task sees only the global default
// when it forwards permission context to a fresh subagent.
if let Some(mode) = context
.context_vars
.get(PERMISSION_MODE_CONTEXT_KEY)
.and_then(|value| PermissionMode::parse(value))
{
extension_custom_data.insert(
PERMISSION_MODE_CONTEXT_KEY.to_string(),
Value::String(mode.as_str().to_string()),
);
}
for key in [
USER_INPUT_AVAILABLE_CONTEXT_KEY,
AUTO_APPROVE_ASK_CONTEXT_KEY,
Expand Down Expand Up @@ -1460,6 +1475,7 @@ mod task_context_tests {
};
use crate::agentic::tools::ToolRuntimeRestrictions;
use bitfun_agent_runtime::permission::AUTO_APPROVE_ASK_CONTEXT_KEY;
use bitfun_agent_runtime::permission::PERMISSION_MODE_CONTEXT_KEY;
use bitfun_agent_runtime::user_questions::{
USER_INPUT_AVAILABLE_CONTEXT_KEY, USER_INPUT_MODEL_ROUND_CONTEXT_KEY,
};
Expand Down Expand Up @@ -1489,6 +1505,10 @@ mod task_context_tests {
AUTO_APPROVE_ASK_CONTEXT_KEY.to_string(),
"false".to_string(),
);
context_vars.insert(
PERMISSION_MODE_CONTEXT_KEY.to_string(),
"auto_approve".to_string(),
);
context_vars.insert(
"deep_review_run_manifest".to_string(),
r#"{"run_id":"run-1"}"#.to_string(),
Expand Down Expand Up @@ -1593,6 +1613,10 @@ mod task_context_tests {
context.custom_data[AUTO_APPROVE_ASK_CONTEXT_KEY],
json!(false)
);
assert_eq!(
context.custom_data[PERMISSION_MODE_CONTEXT_KEY],
json!("auto_approve")
);
assert_eq!(
context.custom_data["deep_review_run_manifest"],
json!({ "run_id": "run-1" })
Expand Down