From 29e651721e1b26ab10a3e33c1e2da6bfcffb3510 Mon Sep 17 00:00:00 2001 From: Thorsten Sommer Date: Sat, 7 Mar 2026 13:59:19 +0100 Subject: [PATCH] Improved global shortcut reliability --- .../Tools/Services/GlobalShortcutService.cs | 120 ++++++++++++++---- .../wwwroot/changelog/v26.3.1.md | 1 + 2 files changed, 96 insertions(+), 25 deletions(-) diff --git a/app/MindWork AI Studio/Tools/Services/GlobalShortcutService.cs b/app/MindWork AI Studio/Tools/Services/GlobalShortcutService.cs index 4515b78b..3e452684 100644 --- a/app/MindWork AI Studio/Tools/Services/GlobalShortcutService.cs +++ b/app/MindWork AI Studio/Tools/Services/GlobalShortcutService.cs @@ -9,11 +9,21 @@ namespace AIStudio.Tools.Services; public sealed class GlobalShortcutService : BackgroundService, IMessageBusReceiver { private static bool IS_INITIALIZED; + private static readonly TimeSpan STARTUP_RECOVERY_WINDOW = TimeSpan.FromSeconds(15); + private enum ShortcutSyncSource + { + STARTUP, + CONFIGURATION_CHANGED, + PLUGINS_RELOADED, + } + + private readonly SemaphoreSlim registrationSemaphore = new(1, 1); private readonly ILogger logger; private readonly SettingsManager settingsManager; private readonly MessageBus messageBus; private readonly RustService rustService; + private readonly DateTimeOffset serviceStartedAt = DateTimeOffset.UtcNow; public GlobalShortcutService( ILogger logger, @@ -27,7 +37,7 @@ public sealed class GlobalShortcutService : BackgroundService, IMessageBusReceiv this.rustService = rustService; this.messageBus.RegisterComponent(this); - this.ApplyFilters([], [Event.CONFIGURATION_CHANGED]); + this.ApplyFilters([], [Event.CONFIGURATION_CHANGED, Event.PLUGINS_RELOADED]); } protected override async Task ExecuteAsync(CancellationToken stoppingToken) @@ -37,12 +47,13 @@ public sealed class GlobalShortcutService : BackgroundService, IMessageBusReceiv await Task.Delay(TimeSpan.FromSeconds(1), stoppingToken); // Register shortcuts on startup: - await this.RegisterAllShortcuts(); + await this.RegisterAllShortcuts(ShortcutSyncSource.STARTUP); } public override async Task StopAsync(CancellationToken cancellationToken) { this.messageBus.Unregister(this); + this.registrationSemaphore.Dispose(); await base.StopAsync(cancellationToken); } @@ -53,7 +64,11 @@ public sealed class GlobalShortcutService : BackgroundService, IMessageBusReceiv switch (triggeredEvent) { case Event.CONFIGURATION_CHANGED: - await this.RegisterAllShortcuts(); + await this.RegisterAllShortcuts(ShortcutSyncSource.CONFIGURATION_CHANGED); + break; + + case Event.PLUGINS_RELOADED: + await this.RegisterAllShortcuts(ShortcutSyncSource.PLUGINS_RELOADED); break; } } @@ -62,33 +77,62 @@ public sealed class GlobalShortcutService : BackgroundService, IMessageBusReceiv #endregion - private async Task RegisterAllShortcuts() + private async Task RegisterAllShortcuts(ShortcutSyncSource source) { - this.logger.LogInformation("Registering global shortcuts."); - foreach (var shortcutId in Enum.GetValues()) + await this.registrationSemaphore.WaitAsync(); + try { - if(shortcutId is Shortcut.NONE) - continue; - - var shortcut = this.GetShortcutValue(shortcutId); - var isEnabled = this.IsShortcutAllowed(shortcutId); - - if (isEnabled && !string.IsNullOrWhiteSpace(shortcut)) + this.logger.LogInformation("Registering global shortcuts (source='{Source}').", source); + foreach (var shortcutId in Enum.GetValues()) { - var success = await this.rustService.UpdateGlobalShortcut(shortcutId, shortcut); - if (success) - this.logger.LogInformation("Global shortcut '{ShortcutId}' ({Shortcut}) registered.", shortcutId, shortcut); + if(shortcutId is Shortcut.NONE) + continue; + + var (shortcut, isEnabled, usesPersistedFallback) = await this.GetShortcutState(shortcutId); + this.logger.LogInformation( + "Sync shortcut '{ShortcutId}' (source='{Source}', enabled={IsEnabled}, configured='{Shortcut}').", + shortcutId, + source, + isEnabled, + shortcut); + + if (usesPersistedFallback) + { + this.logger.LogWarning( + "Using persisted shortcut fallback for '{ShortcutId}' during startup recovery (source='{Source}', configured='{Shortcut}').", + shortcutId, + source, + shortcut); + } + + if (isEnabled && !string.IsNullOrWhiteSpace(shortcut)) + { + var success = await this.rustService.UpdateGlobalShortcut(shortcutId, shortcut); + if (success) + this.logger.LogInformation("Global shortcut '{ShortcutId}' ({Shortcut}) registered.", shortcutId, shortcut); + else + this.logger.LogWarning("Failed to register global shortcut '{ShortcutId}' ({Shortcut}).", shortcutId, shortcut); + } else - this.logger.LogWarning("Failed to register global shortcut '{ShortcutId}' ({Shortcut}).", shortcutId, shortcut); - } - else - { - // Disable the shortcut when empty or feature is disabled: - await this.rustService.UpdateGlobalShortcut(shortcutId, string.Empty); - } - } + { + this.logger.LogInformation( + "Disabling global shortcut '{ShortcutId}' (source='{Source}', enabled={IsEnabled}, configured='{Shortcut}').", + shortcutId, + source, + isEnabled, + shortcut); - this.logger.LogInformation("Global shortcuts registration completed."); + // Disable the shortcut when empty or feature is disabled: + await this.rustService.UpdateGlobalShortcut(shortcutId, string.Empty); + } + } + + this.logger.LogInformation("Global shortcuts registration completed (source='{Source}').", source); + } + finally + { + this.registrationSemaphore.Release(); + } } private string GetShortcutValue(Shortcut name) => name switch @@ -107,5 +151,31 @@ public sealed class GlobalShortcutService : BackgroundService, IMessageBusReceiv _ => true, }; + private async Task GetShortcutState(Shortcut shortcutId) + { + var shortcut = this.GetShortcutValue(shortcutId); + var isEnabled = this.IsShortcutAllowed(shortcutId); + if (isEnabled && !string.IsNullOrWhiteSpace(shortcut)) + return new(shortcut, true, false); + + if (!this.IsWithinStartupRecoveryWindow() || shortcutId is not Shortcut.VOICE_RECORDING_TOGGLE) + return new(shortcut, isEnabled, false); + + var settingsSnapshot = await this.settingsManager.TryReadSettingsSnapshot(); + if (settingsSnapshot is null) + return new(shortcut, isEnabled, false); + + var fallbackShortcut = settingsSnapshot.App.ShortcutVoiceRecording; + var fallbackEnabled = settingsSnapshot.App.EnabledPreviewFeatures.Contains(PreviewFeatures.PRE_SPEECH_TO_TEXT_2026); + if (!fallbackEnabled || string.IsNullOrWhiteSpace(fallbackShortcut)) + return new(shortcut, isEnabled, false); + + return new(fallbackShortcut, true, true); + } + + private bool IsWithinStartupRecoveryWindow() => DateTimeOffset.UtcNow - this.serviceStartedAt <= STARTUP_RECOVERY_WINDOW; + + private readonly record struct ShortcutState(string Shortcut, bool IsEnabled, bool UsesPersistedFallback); + public static void Initialize() => IS_INITIALIZED = true; } diff --git a/app/MindWork AI Studio/wwwroot/changelog/v26.3.1.md b/app/MindWork AI Studio/wwwroot/changelog/v26.3.1.md index 2dd6c538..25d39938 100644 --- a/app/MindWork AI Studio/wwwroot/changelog/v26.3.1.md +++ b/app/MindWork AI Studio/wwwroot/changelog/v26.3.1.md @@ -2,6 +2,7 @@ - Improved the performance by caching the OS language detection and requesting the user language only once per app start. - Improved the chat performance by reducing unnecessary UI updates, making chats smoother and more responsive, especially in longer conversations. - Improved the workspace loading experience: when opening the chat for the first time, your workspaces now appear faster and load step by step in the background, with placeholder rows so the app feels responsive right away. +- Improved the reliability of the global voice recording shortcut so it stays available more consistently. - Improved the user-language logging by limiting language detection logs to a single entry per app start. - Improved the logbook readability by removing non-readable special characters from log entries. - Improved the logbook reliability by significantly reducing duplicate log entries.