fix: Box::pin large futures and resolve merge conflicts with master
This commit is contained in:
parent
9804ee146a
commit
b5a4b421e0
@ -2685,7 +2685,7 @@ Ensure only one `zeroclaw` process is using this bot token."
|
||||
} else if let Some(m) = self.try_parse_attachment_message(update).await {
|
||||
m
|
||||
} else {
|
||||
self.handle_unauthorized_message(update).await;
|
||||
Box::pin(self.handle_unauthorized_message(update)).await;
|
||||
continue;
|
||||
};
|
||||
|
||||
|
||||
10
src/main.rs
10
src/main.rs
@ -806,13 +806,13 @@ async fn main() -> Result<()> {
|
||||
} else if is_tty && !has_provider_flags {
|
||||
Box::pin(onboard::run_wizard(force)).await
|
||||
} else {
|
||||
onboard::run_quick_setup(
|
||||
Box::pin(onboard::run_quick_setup(
|
||||
api_key.as_deref(),
|
||||
provider.as_deref(),
|
||||
model.as_deref(),
|
||||
memory.as_deref(),
|
||||
force,
|
||||
)
|
||||
))
|
||||
.await
|
||||
}?;
|
||||
|
||||
@ -1215,7 +1215,11 @@ async fn main() -> Result<()> {
|
||||
}
|
||||
|
||||
Commands::Peripheral { peripheral_command } => {
|
||||
peripherals::handle_command(peripheral_command.clone(), &config).await
|
||||
Box::pin(peripherals::handle_command(
|
||||
peripheral_command.clone(),
|
||||
&config,
|
||||
))
|
||||
.await
|
||||
}
|
||||
|
||||
Commands::Config { config_command } => match config_command {
|
||||
|
||||
@ -943,7 +943,7 @@ impl Tool for ModelRoutingConfigTool {
|
||||
"set_default" => self.handle_set_default(&args).await,
|
||||
"upsert_scenario" => self.handle_upsert_scenario(&args).await,
|
||||
"remove_scenario" => self.handle_remove_scenario(&args).await,
|
||||
"upsert_agent" => self.handle_upsert_agent(&args).await,
|
||||
"upsert_agent" => Box::pin(self.handle_upsert_agent(&args)).await,
|
||||
"remove_agent" => self.handle_remove_agent(&args).await,
|
||||
_ => unreachable!("validated above"),
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user