ai-space/goose
3
0
Fork 0
mirror of https://github.com/aaif-goose/goose.git synced 2026-06-02 06:14:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix scheduled recipe session params (#9553)

Browse Source 
Signed-off-by: Angie Jones <jones.angie@gmail.com>
This commit is contained in:
Angie Jones
2026-06-01 18:28:58 -05:00
committed by GitHub
parent f69a1780da
commit cd8f718bbb
3 changed files with 68 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/goose-server/src/routes/agent.rs
+56 -40
View File
@@ -468,27 +468,35 @@ async fn update_from_session(
status: StatusCode::INTERNAL_SERVER_ERROR,
})?;
if let Some(recipe) = session.recipe {
match build_recipe_with_parameter_values(
&recipe,
session.user_recipe_values.unwrap_or_default(),
)
.await
{
Ok(Some(recipe)) => {
if let Some(prompt) = apply_recipe_to_agent(&agent, &recipe, true).await {
agent
.extend_system_prompt("recipe".to_string(), prompt)
.await;
if session.session_type == SessionType::Scheduled {
if let Some(prompt) = apply_recipe_to_agent(&agent, &recipe, true).await {
agent
.extend_system_prompt("recipe".to_string(), prompt)
.await;
}
} else {
match build_recipe_with_parameter_values(
&recipe,
session.user_recipe_values.unwrap_or_default(),
)
.await
{
Ok(Some(recipe)) => {
if let Some(prompt) = apply_recipe_to_agent(&agent, &recipe, true).await {
agent
.extend_system_prompt("recipe".to_string(), prompt)
.await;
}
}
Ok(None) => {
// Recipe has missing parameters
}
Err(e) => {
return Err(ErrorResponse {
message: e.to_string(),
status: StatusCode::INTERNAL_SERVER_ERROR,
});
}
}
Ok(None) => {
// Recipe has missing parameters
}
Err(e) => {
return Err(ErrorResponse {
message: e.to_string(),
status: StatusCode::INTERNAL_SERVER_ERROR,
});
}
}
}
@@ -758,27 +766,35 @@ async fn restart_agent_internal(
})?;
if let Some(ref recipe) = session.recipe {
match build_recipe_with_parameter_values(
recipe,
session.user_recipe_values.clone().unwrap_or_default(),
)
.await
{
Ok(Some(recipe)) => {
if let Some(prompt) = apply_recipe_to_agent(&agent, &recipe, true).await {
agent
.extend_system_prompt("recipe".to_string(), prompt)
.await;
if session.session_type == SessionType::Scheduled {
if let Some(prompt) = apply_recipe_to_agent(&agent, recipe, true).await {
agent
.extend_system_prompt("recipe".to_string(), prompt)
.await;
}
} else {
match build_recipe_with_parameter_values(
recipe,
session.user_recipe_values.clone().unwrap_or_default(),
)
.await
{
Ok(Some(recipe)) => {
if let Some(prompt) = apply_recipe_to_agent(&agent, &recipe, true).await {
agent
.extend_system_prompt("recipe".to_string(), prompt)
.await;
}
}
Ok(None) => {
// Recipe has missing parameters
}
Err(e) => {
return Err(ErrorResponse {
message: e.to_string(),
status: StatusCode::INTERNAL_SERVER_ERROR,
});
}
}
Ok(None) => {
// Recipe has missing parameters
}
Err(e) => {
return Err(ErrorResponse {
message: e.to_string(),
status: StatusCode::INTERNAL_SERVER_ERROR,
});
}
}
}
ui/desktop/src/components/BaseChat.tsx
+8 -5
View File
@@ -135,7 +135,7 @@ export default function BaseChat({
return initialMessage;
}, [initialMessage, recipe?.prompt, session?.user_recipe_values]);
const canAutoSubmit = !recipe || hasNotAcceptedRecipe === false;
const canAutoSubmit = session?.session_type === 'scheduled' || !recipe || hasNotAcceptedRecipe === false;
useAutoSubmit({
sessionId,
@@ -208,7 +208,7 @@ export default function BaseChat({
}, [messages]);
useEffect(() => {
if (!recipe || !isActiveSession) return;
if (!recipe || !isActiveSession || session?.session_type === 'scheduled') return;
(async () => {
const accepted = await window.electron.hasAcceptedRecipeBefore(recipe);
@@ -219,7 +219,7 @@ export default function BaseChat({
setHasRecipeSecurityWarnings(scanResult.has_security_warnings);
}
})();
}, [recipe, isActiveSession]);
}, [recipe, isActiveSession, session?.session_type]);
const handleRecipeAccept = async (accept: boolean) => {
if (recipe && accept) {
@@ -527,7 +527,7 @@ export default function BaseChat({
</ChatInputCard>
</MainPanelLayout>
{recipe && isActiveSession && (
{recipe && isActiveSession && session?.session_type !== 'scheduled' && (
<RecipeWarningModal
isOpen={!!hasNotAcceptedRecipe}
onConfirm={() => handleRecipeAccept(true)}
@@ -541,7 +541,10 @@ export default function BaseChat({
/>
)}
{recipe?.parameters && recipe.parameters.length > 0 && !session?.user_recipe_values && (
{recipe?.parameters &&
recipe.parameters.length > 0 &&
!session?.user_recipe_values &&
session?.session_type !== 'scheduled' && (
<ParameterInputModal
parameters={recipe.parameters}
onSubmit={setRecipeUserParams}
ui/desktop/src/hooks/useAutoSubmit.ts
+4
View File
@@ -53,6 +53,10 @@ export function useAutoSubmit({
}, [sessionId]);
const hasUnfilledParameters = useCallback((session: Session) => {
if (session.session_type === 'scheduled') {
return false;
}
const recipe = session.recipe;
return recipe?.parameters && recipe.parameters.length > 0 && !session.user_recipe_values;
}, []);