fix(cli): configure unavailable default provider (#12842) (#13024)

This commit is contained in:
Stefan Kuhn
2026-10-22 23:23:37 +00:00
committed by GitHub
parent 9d408a446c
commit 8069dc4aa4
3 changed files with 39 additions and 23 deletions
+15 -4
View File
@@ -18,7 +18,7 @@ use goose_mcp::{AutoVisualiserRouter, ComputerControllerServer, MemoryServer, Tu
#[cfg(feature = "telemetry")]
use crate::commands::configure::configure_telemetry_consent_dialog;
use crate::commands::configure::handle_configure;
use crate::commands::configure::{configure_provider_dialog, handle_configure};
use crate::commands::info::handle_info;
use crate::commands::plugin::{handle_plugin_install, handle_plugin_update};
use crate::commands::recipe::{handle_deeplink, handle_list, handle_open, handle_validate};
@@ -38,7 +38,9 @@ use crate::commands::session::{handle_session_list, handle_session_remove, handl
use crate::commands::skills::handle_skills_list;
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};
use crate::session::{
build_session, is_provider_unavailable_error, try_build_session, SessionBuilderConfig,
};
use goose::agents::Container;
use goose::session::session_manager::SessionType;
use goose::session::SessionManager;
@@ -2781,7 +2783,7 @@ async fn handle_default_session() -> Result<()> {
let goose_mode = Config::global().get_goose_mode().unwrap_or_default();
let session_id = get_or_create_session_id(None, false, false, goose_mode).await?;
let mut session = build_session(SessionBuilderConfig {
let mut session = match try_build_session(SessionBuilderConfig {
session_id,
resume: false,
fork: false,
@@ -2804,7 +2806,16 @@ async fn handle_default_session() -> Result<()> {
container: None,
stats: false,
})
.await;
.await
{
Ok(session) => session,
Err(error) if is_provider_unavailable_error(&error) => loop {
if configure_provider_dialog().await? {
return Ok(());
}
},
Err(error) => return Err(error),
};
session.interactive(None).await
}
+20 -18
View File
@@ -646,6 +646,22 @@ async fn configure_session_prompts(
}
pub async fn build_session(session_config: SessionBuilderConfig) -> CliSession {
match try_build_session(session_config).await {
Ok(session) => session,
Err(error) => {
output::render_error(&format!(
"Error {}.\n\
Please check your system keychain and run 'goose configure' again.\n\
If your system is unable to use the keyring, please try setting secret key(s) via environment variables.\n\
For more info, see: https://goose-docs.ai/docs/troubleshooting/#keychainkeyring-errors",
error
));
process::exit(1);
}
}
}
pub async fn try_build_session(session_config: SessionBuilderConfig) -> anyhow::Result<CliSession> {
#[cfg(feature = "telemetry")]
goose::posthog::set_session_context("cli", session_config.resume);
@@ -774,26 +790,12 @@ pub async fn build_session(session_config: SessionBuilderConfig) -> CliSession {
fallback_model_config,
),
Err(e2) => {
output::render_error(&format!(
"Error {}.\n\
Please check your system keychain and run 'goose configure' again.\n\
If your system is unable to use the keyring, please try setting secret key(s) via environment variables.\n\
For more info, see: https://goose-docs.ai/docs/troubleshooting/#keychainkeyring-errors",
e2
));
process::exit(1);
return Err(e2);
}
}
}
Err(e) => {
output::render_error(&format!(
"Error {}.\n\
Please check your system keychain and run 'goose configure' again.\n\
If your system is unable to use the keyring, please try setting secret key(s) via environment variables.\n\
For more info, see: https://goose-docs.ai/docs/troubleshooting/#keychainkeyring-errors",
e
));
process::exit(1);
return Err(e);
}
};
tracing::info!("🤖 Using model: {}", effective_model_name);
@@ -898,10 +900,10 @@ pub async fn build_session(session_config: SessionBuilderConfig) -> CliSession {
&Some(session_id),
);
}
session
Ok(session)
}
fn is_provider_unavailable_error(e: &anyhow::Error) -> bool {
pub fn is_provider_unavailable_error(e: &anyhow::Error) -> bool {
let msg = e.to_string();
msg.contains("is not set")
|| msg.contains("not configured")
+4 -1
View File
@@ -20,7 +20,10 @@ use std::str::FromStr;
use tokio::signal::ctrl_c;
use tokio_util::task::AbortOnDropHandle;
pub use builder::{build_session, ExtensionFailure, SessionBuilderConfig};
pub use builder::{
build_session, is_provider_unavailable_error, try_build_session, ExtensionFailure,
SessionBuilderConfig,
};
use console::Color;
use goose::agents::platform_extensions::developer::shell::{