Skip to content
Merged
61 changes: 41 additions & 20 deletions crates/goose-cli/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use crate::commands::session::{handle_session_list, handle_session_remove};
use crate::logging::setup_logging;
use crate::recipes::recipe::{explain_recipe_with_parameters, load_recipe_as_template};
use crate::session;
use crate::session::{build_session, SessionBuilderConfig};
use crate::session::{build_session, SessionBuilderConfig, SessionSettings};
use goose_bench::bench_config::BenchRunConfig;
use goose_bench::runners::bench_runner::BenchRunner;
use goose_bench::runners::eval_runner::EvalRunner;
Expand Down Expand Up @@ -552,6 +552,7 @@ enum CliProviderVariant {
Ollama,
}

#[derive(Debug)]
struct InputConfig {
contents: Option<String>,
extensions_override: Option<Vec<ExtensionConfig>>,
Expand Down Expand Up @@ -630,6 +631,7 @@ pub async fn cli() -> Result<()> {
builtins,
extensions_override: None,
additional_system_prompt: None,
settings: None,
debug,
max_tool_repetitions,
interactive: true, // Session command is always interactive
Expand Down Expand Up @@ -676,18 +678,22 @@ pub async fn cli() -> Result<()> {
params,
explain,
}) => {
let input_config = match (instructions, input_text, recipe, explain) {
let (input_config, session_settings) = match (instructions, input_text, recipe, explain)
{
(Some(file), _, _, _) if file == "-" => {
let mut input = String::new();
std::io::stdin()
.read_to_string(&mut input)
.expect("Failed to read from stdin");

InputConfig {
contents: Some(input),
extensions_override: None,
additional_system_prompt: None,
}
(
InputConfig {
contents: Some(input),
extensions_override: None,
additional_system_prompt: None,
},
None,
)
}
(Some(file), _, _, _) => {
let contents = std::fs::read_to_string(&file).unwrap_or_else(|err| {
Expand All @@ -697,17 +703,23 @@ pub async fn cli() -> Result<()> {
);
std::process::exit(1);
});
(
InputConfig {
contents: Some(contents),
extensions_override: None,
additional_system_prompt: None,
},
None,
)
}
(_, Some(text), _, _) => (
InputConfig {
contents: Some(contents),
contents: Some(text),
extensions_override: None,
additional_system_prompt: None,
}
}
(_, Some(text), _, _) => InputConfig {
contents: Some(text),
extensions_override: None,
additional_system_prompt: None,
},
},
None,
),
(_, _, Some(recipe_name), explain) => {
if explain {
explain_recipe_with_parameters(&recipe_name, params)?;
Expand All @@ -718,11 +730,18 @@ pub async fn cli() -> Result<()> {
eprintln!("{}: {}", console::style("Error").red().bold(), err);
std::process::exit(1);
});
InputConfig {
contents: recipe.prompt,
extensions_override: recipe.extensions,
additional_system_prompt: recipe.instructions,
}
(
InputConfig {
contents: recipe.prompt,
extensions_override: recipe.extensions,
additional_system_prompt: recipe.instructions,
},
recipe.settings.map(|s| SessionSettings {
goose_provider: s.goose_provider,
goose_model: s.goose_model,
temperature: s.temperature,
}),
)
}
(None, None, None, _) => {
eprintln!("Error: Must provide either --instructions (-i), --text (-t), or --recipe. Use -i - for stdin.");
Expand All @@ -739,6 +758,7 @@ pub async fn cli() -> Result<()> {
builtins,
extensions_override: input_config.extensions_override,
additional_system_prompt: input_config.additional_system_prompt,
settings: session_settings,
debug,
max_tool_repetitions,
interactive, // Use the interactive flag from the Run command
Expand Down Expand Up @@ -854,6 +874,7 @@ pub async fn cli() -> Result<()> {
builtins: Vec::new(),
extensions_override: None,
additional_system_prompt: None,
settings: None::<SessionSettings>,
debug: false,
max_tool_repetitions: None,
interactive: true, // Default case is always interactive
Expand Down
1 change: 1 addition & 0 deletions crates/goose-cli/src/commands/bench.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ pub async fn agent_generator(
builtins: requirements.builtin,
extensions_override: None,
additional_system_prompt: None,
settings: None,
debug: false,
max_tool_repetitions: None,
interactive: false, // Benchmarking is non-interactive
Expand Down
34 changes: 27 additions & 7 deletions crates/goose-cli/src/session/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ pub struct SessionBuilderConfig {
pub extensions_override: Option<Vec<ExtensionConfig>>,
/// Any additional system prompt to append to the default
pub additional_system_prompt: Option<String>,
/// Settings to override the global Goose settings
pub settings: Option<SessionSettings>,
/// Enable debug printing
pub debug: bool,
/// Maximum number of consecutive identical tool calls allowed
Expand Down Expand Up @@ -136,18 +138,35 @@ async fn offer_extension_debugging_help(
Ok(())
}

#[derive(Clone, Debug, Default)]
pub struct SessionSettings {
pub goose_model: Option<String>,
pub goose_provider: Option<String>,
pub temperature: Option<f32>,
}

pub async fn build_session(session_config: SessionBuilderConfig) -> Session {
// Load config and get provider/model
let config = Config::global();

let provider_name: String = config
.get_param("GOOSE_PROVIDER")
let provider_name = session_config
.settings
.as_ref()
.and_then(|s| s.goose_provider.clone())
.or_else(|| config.get_param("GOOSE_PROVIDER").ok())
.expect("No provider configured. Run 'goose configure' first");

let model: String = config
.get_param("GOOSE_MODEL")
let model_name = session_config
.settings
.as_ref()
.and_then(|s| s.goose_model.clone())
.or_else(|| config.get_param("GOOSE_MODEL").ok())
.expect("No model configured. Run 'goose configure' first");
let model_config = goose::model::ModelConfig::new(model.clone());

let temperature = session_config.settings.as_ref().and_then(|s| s.temperature);

let model_config =
goose::model::ModelConfig::new(model_name.clone()).with_temperature(temperature);

// Create the agent
let agent: Agent = Agent::new();
Expand All @@ -165,7 +184,7 @@ pub async fn build_session(session_config: SessionBuilderConfig) -> Session {
worker_model
);
} else {
tracing::info!("🤖 Using model: {}", model);
tracing::info!("🤖 Using model: {}", model_name);
}

agent
Expand Down Expand Up @@ -430,7 +449,7 @@ pub async fn build_session(session_config: SessionBuilderConfig) -> Session {
output::display_session_info(
session_config.resume,
&provider_name,
&model,
&model_name,
&session_file,
Some(&provider_for_display),
);
Expand All @@ -452,6 +471,7 @@ mod tests {
builtins: vec!["developer".to_string()],
extensions_override: None,
additional_system_prompt: Some("Test prompt".to_string()),
settings: None,
debug: true,
max_tool_repetitions: Some(5),
interactive: true,
Expand Down
2 changes: 1 addition & 1 deletion crates/goose-cli/src/session/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ mod prompt;
mod thinking;

pub use self::export::message_to_markdown;
pub use builder::{build_session, SessionBuilderConfig};
pub use builder::{build_session, SessionBuilderConfig, SessionSettings};
use console::Color;
use goose::agents::AgentEvent;
use goose::permission::permission_confirmation::PrincipalType;
Expand Down
16 changes: 15 additions & 1 deletion crates/goose/src/agents/agent.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use crate::permission::permission_judge::check_tool_permissions;
use crate::permission::PermissionConfirmation;
use crate::providers::base::Provider;
use crate::providers::errors::ProviderError;
use crate::recipe::{Author, Recipe};
use crate::recipe::{Author, Recipe, Settings};
use crate::tool_monitor::{ToolCall, ToolMonitor};
use regex::Regex;
use serde_json::Value;
Expand Down Expand Up @@ -973,12 +973,26 @@ impl Agent {
metadata: None,
};

// Ideally we'd get the name of the provider we are using from the provider itself
// but it doesn't know and the plumbing looks complicated.
let config = Config::global();
let provider_name: String = config
.get_param("GOOSE_PROVIDER")
.expect("No provider configured. Run 'goose configure' first");

let settings = Settings {
goose_provider: Some(provider_name.clone()),
goose_model: Some(model_name.clone()),
temperature: Some(model_config.temperature.unwrap_or(0.0)),
};

let recipe = Recipe::builder()
.title("Custom recipe from chat")
.description("a custom recipe instance from this chat session")
.instructions(instructions)
.activities(activities)
.extensions(extension_configs)
.settings(settings)
.author(author)
.build()
.expect("valid recipe");
Expand Down
1 change: 0 additions & 1 deletion crates/goose/src/agents/prompt_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@ impl PromptManager {
}
}

/// Get the recipe prompt
pub async fn get_recipe_prompt(&self) -> String {
let context: HashMap<&str, Value> = HashMap::new();
prompt_template::render_global_file("recipe.md", &context).expect("Prompt should render")
Expand Down
24 changes: 24 additions & 0 deletions crates/goose/src/recipe/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ fn default_version() -> String {
/// context: None,
/// activities: None,
/// author: None,
/// settings: None,
/// parameters: None,
/// };
///
Expand Down Expand Up @@ -77,6 +78,9 @@ pub struct Recipe {
#[serde(skip_serializing_if = "Option::is_none")]
pub context: Option<Vec<String>>, // any additional context

#[serde(skip_serializing_if = "Option::is_none")]
pub settings: Option<Settings>, // settings for the recipe

#[serde(skip_serializing_if = "Option::is_none")]
pub activities: Option<Vec<String>>, // the activity pills that show up when loading the

Expand All @@ -96,6 +100,18 @@ pub struct Author {
pub metadata: Option<String>, // any additional metadata for the author
}

#[derive(Serialize, Deserialize, Debug)]
pub struct Settings {
#[serde(skip_serializing_if = "Option::is_none")]
pub goose_provider: Option<String>,

#[serde(skip_serializing_if = "Option::is_none")]
pub goose_model: Option<String>,

#[serde(skip_serializing_if = "Option::is_none")]
pub temperature: Option<f32>,
}

#[derive(Serialize, Deserialize, Debug)]
#[serde(rename_all = "snake_case")]
pub enum RecipeParameterRequirement {
Expand Down Expand Up @@ -156,6 +172,7 @@ pub struct RecipeBuilder {
prompt: Option<String>,
extensions: Option<Vec<ExtensionConfig>>,
context: Option<Vec<String>>,
settings: Option<Settings>,
activities: Option<Vec<String>>,
author: Option<Author>,
parameters: Option<Vec<RecipeParameter>>,
Expand Down Expand Up @@ -185,6 +202,7 @@ impl Recipe {
prompt: None,
extensions: None,
context: None,
settings: None,
activities: None,
author: None,
parameters: None,
Expand Down Expand Up @@ -234,6 +252,11 @@ impl RecipeBuilder {
self
}

pub fn settings(mut self, settings: Settings) -> Self {
self.settings = Some(settings);
self
}

/// Sets the activities for the Recipe
pub fn activities(mut self, activities: Vec<String>) -> Self {
self.activities = Some(activities);
Expand Down Expand Up @@ -271,6 +294,7 @@ impl RecipeBuilder {
prompt: self.prompt,
extensions: self.extensions,
context: self.context,
settings: self.settings,
activities: self.activities,
author: self.author,
parameters: self.parameters,
Expand Down
1 change: 1 addition & 0 deletions crates/goose/src/scheduler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1300,6 +1300,7 @@ mod tests {
activities: None,
author: None,
parameters: None,
settings: None,
};
let mut recipe_file = File::create(&recipe_filename)?;
writeln!(
Expand Down
Loading