fix(plugins): make plugin uninstall state consistent on failure
This commit is contained in:
1 parent
88dccd7cde
commit
8be259be5f
7 files changed
+430
-33
No files matched your search
@@ -353,22 +353,15 @@ pub async fn uninstall_plugin(
|
||||
}
|
||||
let plugin = state.app.plugins.find_plugin(&request.plugin_id).map_err(AppError::from)?;
|
||||
state.app.remove_plugin_connection_pools(&request.plugin_id).await;
|
||||
state.app.plugin_host.stop(&request.plugin_id).await;
|
||||
if let Some(plugin) = &plugin {
|
||||
stop_external_driver_pools(&state, plugin).await;
|
||||
}
|
||||
let root_dir = state.app.plugins.root_dir().to_path_buf();
|
||||
let app_version = state.app.plugins.app_version().to_string();
|
||||
let plugin_id = request.plugin_id.clone();
|
||||
tokio::task::spawn_blocking(move || {
|
||||
PluginPackageInstaller::new(root_dir, app_version)?.uninstall(&request.plugin_id)
|
||||
})
|
||||
.await
|
||||
.map_err(|error| AppError::internal(error.to_string()))?
|
||||
.map_err(AppError::bad_request)?;
|
||||
// Stops the runtime and uninstalls the store under one lifecycle update lease, so a plugin
|
||||
// call cannot re-activate the sidecar (and re-lock its container) in between.
|
||||
state.app.plugin_host.uninstall_plugin(&request.plugin_id).await.map_err(AppError::bad_request)?;
|
||||
// A reinstall must ask for AI tool access and data grants again.
|
||||
if let Err(error) = state.app.storage.forget_plugin_permissions(&plugin_id).await {
|
||||
log::warn!("Failed to clear permissions of uninstalled plugin {plugin_id}: {error}");
|
||||
if let Err(error) = state.app.storage.forget_plugin_permissions(&request.plugin_id).await {
|
||||
log::warn!("Failed to clear permissions of uninstalled plugin {}: {error}", request.plugin_id);
|
||||
}
|
||||
list_plugins(State(state)).await
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user