fix(code-mode): keep recipe final_output tool for the model (#13102)
This commit is contained in:
@@ -188,9 +188,13 @@ pub(crate) fn prepare_inference_tools(
|
||||
#[cfg(feature = "code-mode")]
|
||||
if code_execution_active {
|
||||
tools.retain(|tool| {
|
||||
crate::agents::extension_manager::get_tool_owner(tool).is_some_and(|owner| {
|
||||
crate::agents::extension_manager::is_first_class_extension(&owner)
|
||||
}) || crate::agents::extension_manager::get_tool_resource_uri(tool).is_some()
|
||||
let owner = crate::agents::extension_manager::get_tool_owner(tool);
|
||||
(tool.name == crate::agents::final_output_tool::FINAL_OUTPUT_TOOL_NAME
|
||||
&& owner.is_none())
|
||||
|| owner.is_some_and(|owner| {
|
||||
crate::agents::extension_manager::is_first_class_extension(&owner)
|
||||
})
|
||||
|| crate::agents::extension_manager::get_tool_resource_uri(tool).is_some()
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1455,7 +1459,13 @@ mod tests {
|
||||
}
|
||||
#[cfg(feature = "code-mode")]
|
||||
#[test]
|
||||
fn code_mode_keeps_first_class_and_resource_tools() {
|
||||
fn code_mode_keeps_first_class_resource_and_final_output_tools() {
|
||||
use crate::agents::final_output_tool::FINAL_OUTPUT_TOOL_NAME;
|
||||
let mut final_output = make_tool_with_meta(None);
|
||||
final_output.name = FINAL_OUTPUT_TOOL_NAME.into();
|
||||
let mut extension_final_output =
|
||||
make_tool_with_meta(Some(serde_json::json!({"goose_extension": "recipe"})));
|
||||
extension_final_output.name = FINAL_OUTPUT_TOOL_NAME.into();
|
||||
let mut first_class =
|
||||
make_tool_with_meta(Some(serde_json::json!({"goose_extension": "developer"})));
|
||||
first_class.name = "shell".into();
|
||||
@@ -1467,12 +1477,22 @@ mod tests {
|
||||
let hidden = make_tool_with_meta(Some(
|
||||
serde_json::json!({"goose_extension": "developer", "ui": {"visibility": ["app"]}}),
|
||||
));
|
||||
let filtered = prepare_inference_tools(vec![ordinary, first_class, resource, hidden], true);
|
||||
let filtered = prepare_inference_tools(
|
||||
vec![
|
||||
ordinary,
|
||||
first_class,
|
||||
resource,
|
||||
hidden,
|
||||
final_output,
|
||||
extension_final_output,
|
||||
],
|
||||
true,
|
||||
);
|
||||
let names = filtered
|
||||
.iter()
|
||||
.map(|tool| tool.name.as_ref())
|
||||
.collect::<Vec<_>>();
|
||||
assert_eq!(names, ["resource__view", "shell"]);
|
||||
assert_eq!(names, [FINAL_OUTPUT_TOOL_NAME, "resource__view", "shell"]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -14,16 +14,10 @@ use crate::agents::extension::ExtensionConfig;
|
||||
use crate::agents::final_output_tool::{FINAL_OUTPUT_CONTINUATION_MESSAGE, FINAL_OUTPUT_TOOL_NAME};
|
||||
#[cfg(feature = "scheduler")]
|
||||
use crate::agents::platform_extensions::scheduler::MANAGE_SCHEDULE_TOOL_NAME_COMPLETE;
|
||||
#[cfg(feature = "code-mode")]
|
||||
use crate::agents::state_machine::ops_tool_approval::TOOL_EXECUTABLE_KEY;
|
||||
use crate::agents::tool_execution::CHAT_MODE_TOOL_SKIPPED_RESPONSE;
|
||||
use crate::agents::types::{RetryConfig, SuccessCheck};
|
||||
#[cfg(feature = "code-mode")]
|
||||
use crate::config::permission::PermissionLevel;
|
||||
use crate::config::GooseMode;
|
||||
use crate::conversation::message::Message;
|
||||
#[cfg(feature = "code-mode")]
|
||||
use crate::conversation::message::MessageContent;
|
||||
#[cfg(feature = "tree-sitter")]
|
||||
use crate::recipe::build_recipe::build_recipe_from_template;
|
||||
use crate::recipe::{Recipe, Response, SubRecipe};
|
||||
@@ -506,12 +500,12 @@ async fn empty_responses_hand_the_turn_to_recipe_operations() -> Result<()> {
|
||||
|
||||
#[cfg(feature = "code-mode")]
|
||||
#[tokio::test]
|
||||
async fn unadvertised_final_output_is_neither_approved_nor_executed() -> Result<()> {
|
||||
async fn code_mode_advertises_and_accepts_final_output() -> Result<()> {
|
||||
let (pipeline, api) = test_pipeline().await?;
|
||||
let recipe = Recipe::builder()
|
||||
.title("Structured output boundary")
|
||||
.description("Structured output boundary")
|
||||
.instructions("Return structured output")
|
||||
.title("Structured output")
|
||||
.description("Return structured output")
|
||||
.instructions("Compute the answer")
|
||||
.response(Response {
|
||||
json_schema: Some(json!({
|
||||
"type": "object",
|
||||
@@ -523,59 +517,16 @@ async fn unadvertised_final_output_is_neither_approved_nor_executed() -> Result<
|
||||
.expect("valid recipe");
|
||||
pipeline.set_recipe(recipe).await?;
|
||||
pipeline.add_extension("code_execution").await?;
|
||||
pipeline.set_permission(FINAL_OUTPUT_TOOL_NAME, PermissionLevel::AlwaysAllow);
|
||||
let pipeline = pipeline
|
||||
.with_max_turns(2)
|
||||
.with_goose_mode(GooseMode::Approve)
|
||||
.await;
|
||||
api.on("try the hidden final output")
|
||||
.unadvertised_call(FINAL_OUTPUT_TOOL_NAME, json!({ "result": "escaped" }));
|
||||
api.on("not available").reply("recipe call blocked");
|
||||
api.on("compute the answer")
|
||||
.call(FINAL_OUTPUT_TOOL_NAME, json!({ "result": "42" }));
|
||||
|
||||
let result = pipeline.run(["try the hidden final output"]).await?;
|
||||
let result = pipeline.run(["compute the answer"]).await?;
|
||||
|
||||
assert!(!api.calls()[0].advertises_tool(FINAL_OUTPUT_TOOL_NAME));
|
||||
assert!(result.conversation().messages().iter().any(|message| {
|
||||
message.content.iter().any(|content| {
|
||||
matches!(content, MessageContent::ToolResponse(response)
|
||||
if response.tool_result.as_ref().is_ok_and(|result| {
|
||||
result.content.iter().any(|content| {
|
||||
content.as_text().is_some_and(|text| {
|
||||
text.text.contains("Tool 'recipe__final_output' is not available")
|
||||
})
|
||||
})
|
||||
}))
|
||||
})
|
||||
}));
|
||||
assert!(result.conversation().messages().iter().any(|message| {
|
||||
message.content.iter().any(|content| {
|
||||
matches!(content, MessageContent::Text(text) if text.text == "recipe call blocked")
|
||||
})
|
||||
}));
|
||||
assert!(!result.conversation().messages().iter().any(|message| {
|
||||
message
|
||||
.content
|
||||
.iter()
|
||||
.any(|content| matches!(content, MessageContent::ActionRequired(_)))
|
||||
}));
|
||||
let request = result
|
||||
.conversation()
|
||||
.messages()
|
||||
.iter()
|
||||
.flat_map(|message| &message.content)
|
||||
.filter_map(MessageContent::as_tool_request)
|
||||
.find(|request| {
|
||||
request
|
||||
.tool_call
|
||||
.as_ref()
|
||||
.is_ok_and(|tool_call| tool_call.name == FINAL_OUTPUT_TOOL_NAME)
|
||||
})
|
||||
.expect("final_output request");
|
||||
assert!(request
|
||||
.tool_meta
|
||||
.as_ref()
|
||||
.and_then(|metadata| metadata.get(TOOL_EXECUTABLE_KEY))
|
||||
.is_none());
|
||||
assert_eq!(api.call_count(), 1);
|
||||
assert!(api.calls()[0].advertises_tool("execute_javascript"));
|
||||
assert!(api.calls()[0].system_contains("You MUST use the `final_output` tool"));
|
||||
assert!(api.calls()[0].advertises_tool(FINAL_OUTPUT_TOOL_NAME));
|
||||
result.assert_message(-1, Agent, r#"{"result":"42"}"#);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user