Merge branch 'staging' into parser-followup-2

public/scripts/slash-commands.js

@@ -2489,6 +2489,7 @@ async function triggerGenerationCallback(args, value) {
         } catch {
             console.warn('Timeout waiting for generation unlock');
             toastr.warning('Cannot run /trigger command while the reply is being generated.');
+            outerResolve(Promise.resolve(''));
             return '';
         }