Skip to content

Avoid using cliclack.confirm in non-interactive session #6412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lifeizhou-ap merged 2 commits into from
Jan 11, 2026
Merged

Avoid using cliclack.confirm in non-interactive session #6412

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81eb7a8
avoid using cliclack.confirm in non-interactive session
lifeizhou-ap Jan 9, 2026
b4c568d
removed unnecessary comment
lifeizhou-ap Jan 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 53 additions & 27 deletions crates/goose-cli/src/session/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ async fn offer_extension_debugging_help(
Ok(())
}

fn check_missing_extensions_or_exit(saved_extensions: &[ExtensionConfig]) {
fn check_missing_extensions_or_exit(saved_extensions: &[ExtensionConfig], interactive: bool) {
let missing: Vec<_> = saved_extensions
.iter()
.filter(|ext| get_extension_by_name(&ext.name()).is_none())
Expand All @@ -216,16 +216,27 @@ fn check_missing_extensions_or_exit(saved_extensions: &[ExtensionConfig]) {
.collect::<Vec<_>>()
.join(", ");

if !cliclack::confirm(format!(
"Extension(s) {} from previous session are no longer available. Restore for this session?",
names
))
.initial_value(true)
.interact()
.unwrap_or(false)
{
println!("{}", style("Resume cancelled.").yellow());
process::exit(0);
if interactive {
if !cliclack::confirm(format!(
"Extension(s) {} from previous session are no longer available. Restore for this session?",
names
))
.initial_value(true)
.interact()
.unwrap_or(false)
{
println!("{}", style("Resume cancelled.").yellow());
process::exit(0);
}
} else {
eprintln!(
"{}",
style(format!(
"Warning: Extension(s) {} from previous session are no longer available, continuing without them.",
names
))
.yellow()
);
}
}
}
Expand Down Expand Up @@ -397,22 +408,34 @@ pub async fn build_session(session_config: SessionBuilderConfig) -> CliSession {
let current_workdir =
std::env::current_dir().expect("Failed to get current working directory");
if current_workdir != session.working_dir {
let change_workdir = cliclack::confirm(format!("{} The original working directory of this session was set to {}. Your current directory is {}. Do you want to switch back to the original working directory?", style("WARNING:").yellow(), style(session.working_dir.display()).cyan(), style(current_workdir.display()).cyan()))
.initial_value(true)
.interact().expect("Failed to get user input");

if change_workdir {
if !session.working_dir.exists() {
output::render_error(&format!(
"Cannot switch to original working directory - {} no longer exists",
style(session.working_dir.display()).cyan()
));
} else if let Err(e) = std::env::set_current_dir(&session.working_dir) {
output::render_error(&format!(
"Failed to switch to original working directory: {}",
e
));
if session_config.interactive {
let change_workdir = cliclack::confirm(format!("{} The original working directory of this session was set to {}. Your current directory is {}. Do you want to switch back to the original working directory?", style("WARNING:").yellow(), style(session.working_dir.display()).cyan(), style(current_workdir.display()).cyan()))
.initial_value(true)
.interact().expect("Failed to get user input");

if change_workdir {
if !session.working_dir.exists() {
output::render_error(&format!(
"Cannot switch to original working directory - {} no longer exists",
style(session.working_dir.display()).cyan()
));
} else if let Err(e) = std::env::set_current_dir(&session.working_dir) {
output::render_error(&format!(
"Failed to switch to original working directory: {}",
e
));
}
}
} else {
eprintln!(
"{}",
style(format!(
"Warning: Working directory differs from session (current: {}, session: {}). Staying in current directory.",
current_workdir.display(),
session.working_dir.display()
))
.yellow()
);
}
}
}
Expand All @@ -433,7 +456,10 @@ pub async fn build_session(session_config: SessionBuilderConfig) -> CliSession {
if let Some(saved_state) =
EnabledExtensionsState::from_extension_data(&session_data.extension_data)
{
check_missing_extensions_or_exit(&saved_state.extensions);
check_missing_extensions_or_exit(
&saved_state.extensions,
session_config.interactive,
);
saved_state.extensions
} else {
get_enabled_extensions()
Expand Down
Loading