fix: surface filesystem permission profiles in prompts

This commit is contained in:
Michael Bolin
2026-05-28 13:57:08 -07:00
parent 2e0c4f4977
commit 12e87f56a3
17 changed files with 639 additions and 30 deletions
+37 -4
View File
@@ -46,10 +46,7 @@ fn text_user_input_parts(texts: Vec<String>) -> serde_json::Value {
}
fn assert_default_env_context(text: &str, cwd: &str) {
assert!(
text.starts_with(ENVIRONMENT_CONTEXT_OPEN_TAG),
"expected environment context fragment: {text}"
);
assert_env_context_fragment(text);
assert!(
text.contains(&format!("<cwd>{cwd}</cwd>")),
"expected cwd in environment context: {text}"
@@ -58,6 +55,13 @@ fn assert_default_env_context(text: &str, cwd: &str) {
text.contains(&format!("<shell>{}</shell>", default_user_shell().name())),
"expected shell in environment context: {text}"
);
}
fn assert_env_context_fragment(text: &str) {
assert!(
text.starts_with(ENVIRONMENT_CONTEXT_OPEN_TAG),
"expected environment context fragment: {text}"
);
assert!(
text.contains("<current_date>") && text.contains("</current_date>"),
"expected current_date in environment context: {text}"
@@ -502,8 +506,24 @@ async fn overrides_turn_context_but_keeps_cached_prefix_and_key_constant() -> an
expected_permissions_msg_2, expected_permissions_msg,
"expected updated permissions message after override"
);
let expected_env_msg_2 = body2["input"][body1_input.len() + 1].clone();
assert_eq!(expected_env_msg_2["role"].as_str(), Some("user"));
let env_text = expected_env_msg_2["content"][0]["text"]
.as_str()
.expect("environment context text");
assert_env_context_fragment(env_text);
assert!(
env_text.contains("<permission_profile type=\"managed\">")
&& env_text.contains("<file_system type=\"restricted\">")
&& env_text.contains(&format!(
"<entry access=\"write\"><path>{}</path></entry>",
writable.abs().display()
)),
"expected workspace-write filesystem profile in environment context: {env_text}"
);
let mut expected_body2 = body1_input.to_vec();
expected_body2.push(expected_permissions_msg_2);
expected_body2.push(expected_env_msg_2);
expected_body2.push(expected_user_message_2);
assert_eq!(body2["input"], serde_json::Value::Array(expected_body2));
@@ -1086,12 +1106,25 @@ async fn send_user_turn_with_changes_sends_environment_context() -> anyhow::Resu
}),
"expected model switch section after model override: {expected_settings_update_msg:?}"
);
let expected_env_update_msg = body2["input"][body1_input.len() + 1].clone();
assert_eq!(expected_env_update_msg["role"].as_str(), Some("user"));
let expected_env_update_text = expected_env_update_msg["content"][0]["text"]
.as_str()
.expect("environment context text");
assert_env_context_fragment(expected_env_update_text);
assert!(
expected_env_update_text.contains(
"<permission_profile type=\"disabled\"><file_system type=\"unrestricted\" /></permission_profile>",
),
"expected disabled filesystem profile in environment context: {expected_env_update_text}"
);
let expected_user_message_2 = text_user_input("hello 2".to_string());
let expected_input_2 = serde_json::Value::Array(vec![
expected_permissions_msg,
expected_contextual_user_msg_1,
expected_user_message_1,
expected_settings_update_msg,
expected_env_update_msg,
expected_user_message_2,
]);
assert_eq!(body2["input"], expected_input_2);
@@ -28,6 +28,7 @@ fn resume_history(
let turn_ctx = TurnContextItem {
turn_id: Some(turn_id.clone()),
cwd: config.cwd.to_path_buf(),
workspace_roots: None,
current_date: None,
timezone: None,
approval_policy: config.permissions.approval_policy.value(),