MindWorkAI/AI-Studio
MindWorkAI/AI-Studio
1
0
Fork 0
mirror of https://github.com/MindWorkAI/AI-Studio.git synced 2026-08-11 19:52:10 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed left-over plugin activation state after deleting a plugin

Browse Source
This commit is contained in:
Thorsten Sommer 2026-08-09 16:32:05 +02:00
parent b45f55cfe1
commit 1efc1a9247
Signed by untrusted user who does not match committer: tsommer
GPG Key ID: 371BBA77A02C0108
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/MindWork AI Studio/Tools/Services/PluginInstallService.Delete.cs
View File

@ -158,7 +158,10 @@ public sealed partial class PluginInstallService
/// For a configuration plugin, we do not remove its providers, data sources, chat templates, /// For a configuration plugin, we do not remove its providers, data sources, chat templates,
/// profiles, or locked settings ourselves. The reload does that: it recognizes them as left over /// profiles, or locked settings ourselves. The reload does that: it recognizes them as left over
/// once their configuration plugin is gone, and it also deletes the related secrets from the OS /// once their configuration plugin is gone, and it also deletes the related secrets from the OS
/// keyring. /// keyring.<br/><br/>
/// What the reload cannot recognize as left over is everything the user decided about the plugin
/// itself: its activation state and, for a language plugin, the language choice. Those are
/// removed here.
/// </remarks> /// </remarks>
/// <param name="plugin">Plugin metadata of the configuration or language plugin.</param> /// <param name="plugin">Plugin metadata of the configuration or language plugin.</param>
/// <param name="token">Cancellation token for settings storage and plugin reload.</param> /// <param name="token">Cancellation token for settings storage and plugin reload.</param>
@ -175,6 +178,7 @@ public sealed partial class PluginInstallService
await this.installSemaphore.WaitAsync(token); await this.installSemaphore.WaitAsync(token);
var pluginDirectory = plugin.LocalPath; var pluginDirectory = plugin.LocalPath;
var backupDirectory = string.Empty; var backupDirectory = string.Empty;
var wasEnabled = false;
var wasChosenLanguage = false; var wasChosenLanguage = false;
try try
@ -189,6 +193,14 @@ public sealed partial class PluginInstallService
Directory.CreateDirectory(Path.GetDirectoryName(backupDirectory)!); Directory.CreateDirectory(Path.GetDirectoryName(backupDirectory)!);
Directory.Move(pluginDirectory, backupDirectory); Directory.Move(pluginDirectory, backupDirectory);
//
// Nothing removes the activation state of a plugin which is gone. Should the user install
// a plugin with the same ID again later, it would start enabled without ever having been
// switched on. We ask for removal regardless of the plugin type: a configuration plugin
// is never listed there, so this simply does nothing for it:
//
wasEnabled = this.settingsManager.ConfigurationData.EnabledPlugins.Remove(plugin.Id);
// //
// When the user had chosen this language plugin, the app would silently fall back to // When the user had chosen this language plugin, the app would silently fall back to
// English while the settings still point to the deleted plugin. We return the language // English while the settings still point to the deleted plugin. We return the language
@ -199,9 +211,11 @@ public sealed partial class PluginInstallService
{ {
this.settingsManager.ConfigurationData.App.LanguageBehavior = LangBehavior.AUTO; this.settingsManager.ConfigurationData.App.LanguageBehavior = LangBehavior.AUTO;
this.settingsManager.ConfigurationData.App.LanguagePluginId = Guid.Empty; this.settingsManager.ConfigurationData.App.LanguagePluginId = Guid.Empty;
await this.settingsManager.StoreSettings();
} }
if (wasEnabled || wasChosenLanguage)
await this.settingsManager.StoreSettings();
await PluginFactory.LoadAll(token); await PluginFactory.LoadAll(token);
TryDeleteDirectory(backupDirectory, "local plugin delete backup", this.logger); TryDeleteDirectory(backupDirectory, "local plugin delete backup", this.logger);
@ -212,7 +226,7 @@ public sealed partial class PluginInstallService
{ {
this.logger.LogError(e, $"Failed to delete {plugin.Type} plugin '{plugin.Name}' ({plugin.Id}) from '{pluginDirectory}'."); this.logger.LogError(e, $"Failed to delete {plugin.Type} plugin '{plugin.Name}' ({plugin.Id}) from '{pluginDirectory}'.");
await this.TryRestoreDeletedLocalPluginAsync(plugin, pluginDirectory, backupDirectory, wasChosenLanguage, token); await this.TryRestoreDeletedLocalPluginAsync(plugin, pluginDirectory, backupDirectory, wasEnabled, wasChosenLanguage, token);
return DeleteError(plugin, pluginDirectory, string.Format(TB("Unexpected error: {0}"), e.Message)); return DeleteError(plugin, pluginDirectory, string.Format(TB("Unexpected error: {0}"), e.Message));
} }
finally finally
@ -310,20 +324,25 @@ public sealed partial class PluginInstallService
} }
} }
private async Task TryRestoreDeletedLocalPluginAsync(IAvailablePlugin plugin, string pluginDirectory, string backupDirectory, bool wasChosenLanguage, CancellationToken token) private async Task TryRestoreDeletedLocalPluginAsync(IAvailablePlugin plugin, string pluginDirectory, string backupDirectory, bool wasEnabled, bool wasChosenLanguage, CancellationToken token)
{ {
try try
{ {
if (!Directory.Exists(pluginDirectory) && Directory.Exists(backupDirectory)) if (!Directory.Exists(pluginDirectory) && Directory.Exists(backupDirectory))
Directory.Move(backupDirectory, pluginDirectory); Directory.Move(backupDirectory, pluginDirectory);
if (wasEnabled && !this.settingsManager.ConfigurationData.EnabledPlugins.Contains(plugin.Id))
this.settingsManager.ConfigurationData.EnabledPlugins.Add(plugin.Id);
if (wasChosenLanguage) if (wasChosenLanguage)
{ {
this.settingsManager.ConfigurationData.App.LanguageBehavior = LangBehavior.MANUAL; this.settingsManager.ConfigurationData.App.LanguageBehavior = LangBehavior.MANUAL;
this.settingsManager.ConfigurationData.App.LanguagePluginId = plugin.Id; this.settingsManager.ConfigurationData.App.LanguagePluginId = plugin.Id;
await this.settingsManager.StoreSettings();
} }
if (wasEnabled || wasChosenLanguage)
await this.settingsManager.StoreSettings();
// The reload restores everything the plugin configured, because it is back in place: // The reload restores everything the plugin configured, because it is back in place:
await PluginFactory.LoadAll(token); await PluginFactory.LoadAll(token);
} }