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

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

Browse Source
This commit is contained in:
Lifei Zhou
2026-01-12 09:49:01 +11:00
committed by GitHub
parent fa1d874269
commit 0afb6454a8
1 changed files with 52 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/goose-cli/src/session/builder.rs
+52 -26
View File
@@ -202,7 +202,7 @@ async fn offer_extension_debugging_help(
Ok(()) 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 let missing: Vec<_> = saved_extensions
.iter() .iter()
.filter(|ext| get_extension_by_name(&ext.name()).is_none()) .filter(|ext| get_extension_by_name(&ext.name()).is_none())
@@ -216,16 +216,27 @@ fn check_missing_extensions_or_exit(saved_extensions: &[ExtensionConfig]) {
.collect::<Vec<_>>() .collect::<Vec<_>>()
.join(", "); .join(", ");
if !cliclack::confirm(format!( if interactive {
"Extension(s) {} from previous session are no longer available. Restore for this session?", if !cliclack::confirm(format!(
names "Extension(s) {} from previous session are no longer available. Restore for this session?",
)) names
.initial_value(true) ))
.interact() .initial_value(true)
.unwrap_or(false) .interact()
{ .unwrap_or(false)
println!("{}", style("Resume cancelled.").yellow()); {
process::exit(0); 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()
);
} }
} }
} }
@@ -397,22 +408,34 @@ pub async fn build_session(session_config: SessionBuilderConfig) -> CliSession {
let current_workdir = let current_workdir =
std::env::current_dir().expect("Failed to get current working directory"); std::env::current_dir().expect("Failed to get current working directory");
if current_workdir != session.working_dir { 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())) if session_config.interactive {
.initial_value(true) 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()))
.interact().expect("Failed to get user input"); .initial_value(true)
.interact().expect("Failed to get user input");
if change_workdir { if change_workdir {
if !session.working_dir.exists() { if !session.working_dir.exists() {
output::render_error(&format!( output::render_error(&format!(
"Cannot switch to original working directory - {} no longer exists", "Cannot switch to original working directory - {} no longer exists",
style(session.working_dir.display()).cyan() style(session.working_dir.display()).cyan()
)); ));
} else if let Err(e) = std::env::set_current_dir(&session.working_dir) { } else if let Err(e) = std::env::set_current_dir(&session.working_dir) {
output::render_error(&format!( output::render_error(&format!(
"Failed to switch to original working directory: {}", "Failed to switch to original working directory: {}",
e 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()
);
} }
} }
} }
@@ -433,7 +456,10 @@ pub async fn build_session(session_config: SessionBuilderConfig) -> CliSession {
if let Some(saved_state) = if let Some(saved_state) =
EnabledExtensionsState::from_extension_data(&session_data.extension_data) 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 saved_state.extensions
} else { } else {
get_enabled_extensions() get_enabled_extensions()