Merge pull request #2494 from SillyTavern/continue-command-await-arg Added /continue "await" arg

8a154e7abf5a5ddc21973015ebd531eb7bc9e925

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

public/scripts/slash-commands.js+38 -9 Viewed

         name: 'continue',
         callback: continueChatCallback,
         aliases: ['cont'],
+        namedArgumentList: [
+            new SlashCommandNamedArgument(
+                'await',
+                'Whether to await for the continued generation before proceeding',
+                [ARGUMENT_TYPE.BOOLEAN],
+                false,
+                false,
+                'false',
+            ),
+        ],
         unnamedArgumentList: [
             new SlashCommandArgument(
                 'prompt', [ARGUMENT_TYPE.STRING], false,

             Continues the last message in the chat, with an optional additional prompt.
         </div>
         <div>
+            If <code>await=true</code> named argument is passed, the command will await for the continued generation before proceeding.
+        </div>
+        <div>
             <strong>Example:</strong>
             <ul>
                 <li>
                     <pre><code>/continue</code></pre>
-                    Continues the chat with no additional prompt.
+                    Continues the chat with no additional prompt and immediately proceeds to the next command.
                 </li>
                 <li>
-                    <pre><code>/continue Let's explore this further...</code></pre>
+                    <pre><code>/continue await=true Let's explore this further...</code></pre>
-                    Continues the chat with the provided prompt.
+                    Continues the chat with the provided prompt and waits for the generation to finish.
                 </li>
             </ul>
         </div>

     await reloadCurrentChat();
+}
-function continueChatCallback(_, prompt) {
+async function continueChatCallback(args, prompt) {
-    setTimeout(async () => {
+    const shouldAwait = isTrueBoolean(args?.await);
+    const outerPromise = new Promise(async (resolve, reject) => {
         try {
             await waitUntilCondition(() => !is_send_press && !is_group_generating, 10000, 100);
         } catch {
             console.warn('Timeout waiting for generation unlock');
             toastr.warning('Cannot run /continue command while the reply is being generated.');
+            return reject();
+        }
-        // Prevent infinite recursion
+        try {
-        $('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles: true }));
+            // Prevent infinite recursion
-        $('#option_continue').trigger('click', { fromSlashCommand: true, additionalPrompt: prompt });
+            $('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles: true }));
-    }, 1);
+            const options = prompt?.trim() ? { quiet_prompt: prompt.trim(), quietToLoud: true } : {};
+            await Generate('continue', options);
+            resolve();
+        } catch (error) {
+            console.error('Error running /continue command:', error);
+            reject();
+        }
+    });
+    if (shouldAwait) {
+        await outerPromise;
+    }
     return '';
+}