tkmind/tkmind_go
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

resolved all the extensions to load in cli (#6464)

Browse Source
This commit is contained in:
Lifei Zhou
2026-01-19 13:13:54 +11:00
committed by GitHub
parent f3c2f8e803
commit 73a878821d
9 changed files with 315 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/goose-cli/src/cli.rs
+11 -42
View File
@@ -1,8 +1,9 @@
use anyhow::Result;
use clap::{Args, CommandFactory, Parser, Subcommand};
use clap_complete::{generate, Shell as ClapShell};
use goose::config::{Config, ExtensionConfig};
use goose::config::Config;
use goose::posthog::get_telemetry_choice;
use goose::recipe::Recipe;
use goose_mcp::mcp_server_runner::{serve, McpCommand};
use goose_mcp::{
AutoVisualiserRouter, ComputerControllerServer, DeveloperServer, MemoryServer, TutorialServer,
@@ -25,7 +26,7 @@ use crate::commands::schedule::{
use crate::commands::session::{handle_session_list, handle_session_remove};
use crate::recipes::extract_from_cli::extract_recipe_info_from_cli;
use crate::recipes::recipe::{explain_recipe, render_recipe_as_yaml};
use crate::session::{build_session, SessionBuilderConfig, SessionSettings};
use crate::session::{build_session, SessionBuilderConfig};
use goose::session::session_manager::SessionType;
use goose::session::SessionManager;
use goose_bench::bench_config::BenchRunConfig;
@@ -941,18 +942,9 @@ enum CliProviderVariant {
#[derive(Debug)]
pub struct InputConfig {
pub contents: Option<String>,
pub extensions_override: Option<Vec<ExtensionConfig>>,
pub additional_system_prompt: Option<String>,
}
#[derive(Debug)]
pub struct RecipeInfo {
pub session_settings: Option<SessionSettings>,
pub sub_recipes: Option<Vec<goose::recipe::SubRecipe>>,
pub final_output_response: Option<goose::recipe::Response>,
pub retry_config: Option<goose::agents::types::RetryConfig>,
}
fn get_command_name(command: &Option<Command>) -> &'static str {
match command {
Some(Command::Configure {}) => "configure",
@@ -1093,9 +1085,8 @@ async fn handle_interactive_session(
extensions: extension_opts.extensions,
streamable_http_extensions: extension_opts.streamable_http_extensions,
builtins: extension_opts.builtins,
extensions_override: None,
recipe: None,
additional_system_prompt: None,
settings: None,
provider: None,
model: None,
debug: session_opts.debug,
@@ -1104,9 +1095,6 @@ async fn handle_interactive_session(
scheduled_job_id: None,
interactive: true,
quiet: false,
sub_recipes: None,
final_output_response: None,
retry_config: None,
output_format: "text".to_string(),
})
.await;
@@ -1163,7 +1151,7 @@ async fn log_session_completion(
fn parse_run_input(
input_opts: &InputOptions,
quiet: bool,
) -> Result<Option<(InputConfig, Option<RecipeInfo>)>> {
) -> Result<Option<(InputConfig, Option<Recipe>)>> {
match (
&input_opts.instructions,
&input_opts.input_text,
@@ -1177,7 +1165,6 @@ fn parse_run_input(
Ok(Some((
InputConfig {
contents: Some(contents),
extensions_override: None,
additional_system_prompt: input_opts.system.clone(),
},
None,
@@ -1194,7 +1181,6 @@ fn parse_run_input(
Ok(Some((
InputConfig {
contents: Some(contents),
extensions_override: None,
additional_system_prompt: None,
},
None,
@@ -1203,7 +1189,6 @@ fn parse_run_input(
(_, Some(text), _) => Ok(Some((
InputConfig {
contents: Some(text.clone()),
extensions_override: None,
additional_system_prompt: input_opts.system.clone(),
},
None,
@@ -1247,13 +1232,13 @@ fn parse_run_input(
"Recipe execution started"
);
let (input_config, recipe_info) = extract_recipe_info_from_cli(
let (input_config, recipe) = extract_recipe_info_from_cli(
recipe_name.clone(),
input_opts.params.clone(),
input_opts.additional_sub_recipes.clone(),
quiet,
)?;
Ok(Some((input_config, Some(recipe_info))))
Ok(Some((input_config, Some(recipe))))
}
(None, None, None) => {
eprintln!("Error: Must provide either --instructions (-i), --text (-t), or --recipe. Use -i - for stdin.");
@@ -1277,7 +1262,7 @@ async fn handle_run_command(
let parsed = parse_run_input(&input_opts, output_opts.quiet)?;
let Some((input_config, recipe_info)) = parsed else {
let Some((input_config, recipe)) = parsed else {
return Ok(());
};
@@ -1302,11 +1287,8 @@ async fn handle_run_command(
extensions: extension_opts.extensions,
streamable_http_extensions: extension_opts.streamable_http_extensions,
builtins: extension_opts.builtins,
extensions_override: input_config.extensions_override,
recipe: recipe.clone(),
additional_system_prompt: input_config.additional_system_prompt,
settings: recipe_info
.as_ref()
.and_then(|r| r.session_settings.clone()),
provider: model_opts.provider,
model: model_opts.model,
debug: session_opts.debug,
@@ -1315,11 +1297,6 @@ async fn handle_run_command(
scheduled_job_id: run_behavior.scheduled_job_id,
interactive: run_behavior.interactive,
quiet: output_opts.quiet,
sub_recipes: recipe_info.as_ref().and_then(|r| r.sub_recipes.clone()),
final_output_response: recipe_info
.as_ref()
.and_then(|r| r.final_output_response.clone()),
retry_config: recipe_info.as_ref().and_then(|r| r.retry_config.clone()),
output_format: output_opts.output_format,
})
.await;
@@ -1328,11 +1305,7 @@ async fn handle_run_command(
session.interactive(input_config.contents).await
} else if let Some(contents) = input_config.contents {
let session_start = std::time::Instant::now();
let session_type = if recipe_info.is_some() {
"recipe"
} else {
"run"
};
let session_type = if recipe.is_some() { "recipe" } else { "run" };
tracing::info!(
counter.goose.session_starts = 1,
@@ -1438,9 +1411,8 @@ async fn handle_default_session() -> Result<()> {
extensions: Vec::new(),
streamable_http_extensions: Vec::new(),
builtins: Vec::new(),
extensions_override: None,
recipe: None,
additional_system_prompt: None,
settings: None::<SessionSettings>,
provider: None,
model: None,
debug: false,
@@ -1449,9 +1421,6 @@ async fn handle_default_session() -> Result<()> {
scheduled_job_id: None,
interactive: true,
quiet: false,
sub_recipes: None,
final_output_response: None,
retry_config: None,
output_format: "text".to_string(),
})
.await;