Skip to content
Merged
Show file tree
Hide file tree
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
8 changes: 2 additions & 6 deletions codex-rs/core/src/features.rs
Original file line number Diff line number Diff line change
Expand Up @@ -464,12 +464,8 @@ pub const FEATURES: &[FeatureSpec] = &[
FeatureSpec {
id: Feature::RequestRule,
key: "request_rule",
stage: Stage::Experimental {
name: "Smart approvals",
menu_description: "Get smarter \"Don't ask again\" rule requests.",
announcement: "NEW: Try Smart approvals to get smarter \"Don't ask again\" requests. Enable in /experimental!",
},
default_enabled: false,
stage: Stage::Stable,
default_enabled: true,
},
FeatureSpec {
id: Feature::WindowsSandbox,
Expand Down
6 changes: 3 additions & 3 deletions codex-rs/core/src/tools/spec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1576,7 +1576,7 @@ mod tests {
// Build expected from the same helpers used by the builder.
let mut expected: BTreeMap<String, ToolSpec> = BTreeMap::from([]);
for spec in [
create_exec_command_tool(false),
create_exec_command_tool(true),
create_write_stdin_tool(),
create_list_mcp_resources_tool(),
create_list_mcp_resource_templates_tool(),
Expand Down Expand Up @@ -2410,7 +2410,7 @@ mod tests {

#[test]
fn test_shell_tool() {
let tool = super::create_shell_tool(false);
let tool = super::create_shell_tool(true);
let ToolSpec::Function(ResponsesApiTool {
description, name, ..
}) = &tool
Expand Down Expand Up @@ -2440,7 +2440,7 @@ Examples of valid command strings:

#[test]
fn test_shell_command_tool() {
let tool = super::create_shell_command_tool(false);
let tool = super::create_shell_command_tool(true);
let ToolSpec::Function(ResponsesApiTool {
description, name, ..
}) = &tool
Expand Down
2 changes: 1 addition & 1 deletion codex-rs/core/tests/suite/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ async fn resume_includes_initial_messages_and_sends_prior_items() {
.expect("prior assistant message");
let pos_permissions = messages
.iter()
.position(|(role, text)| role == "developer" && text.contains("`approval_policy`"))
.position(|(role, text)| role == "developer" && text.contains("<permissions instructions>"))
.expect("permissions message");
let pos_user_instructions = messages
.iter()
Expand Down
2 changes: 1 addition & 1 deletion codex-rs/core/tests/suite/collaboration_instructions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ async fn no_collaboration_instructions_by_default() -> Result<()> {
let input = req.single_request().input();
let dev_texts = developer_texts(&input);
assert_eq!(dev_texts.len(), 1);
assert!(dev_texts[0].contains("`approval_policy`"));
assert!(dev_texts[0].contains("<permissions instructions>"));

Ok(())
}
Expand Down
4 changes: 2 additions & 2 deletions codex-rs/core/tests/suite/permissions_messages.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ fn permissions_texts(input: &[serde_json::Value]) -> Vec<String> {
.first()?
.get("text")?
.as_str()?;
if text.contains("`approval_policy`") {
if text.contains("<permissions instructions>") {
Some(text.to_string())
} else {
None
Expand Down Expand Up @@ -439,7 +439,7 @@ async fn permissions_message_includes_writable_roots() -> Result<()> {
&sandbox_policy,
AskForApproval::OnRequest,
&Policy::empty(),
false,
true,
test.config.cwd.as_path(),
)
.into_text();
Expand Down
Loading