Merge pull request #2806 from SillyTavern/bypass-command-string-parser Execute profile commands callbacks directly

b2705d13964f79a96b8dea950d5d1af4c7909333

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

Signed

public/scripts/extensions/connection-manager/index.js+29 -11 Viewed

 import { event_types, eventSource, main_api, saveSettingsDebounced } from '../../../script.js';
 import { extension_settings, renderExtensionTemplateAsync } from '../../extensions.js';
 import { callGenericPopup, Popup, POPUP_TYPE } from '../../popup.js';
-import { executeSlashCommandsWithOptions } from '../../slash-commands.js';
 import { SlashCommand } from '../../slash-commands/SlashCommand.js';
+import { SlashCommandAbortController } from '../../slash-commands/SlashCommandAbortController.js';
 import { ARGUMENT_TYPE, SlashCommandArgument, SlashCommandNamedArgument } from '../../slash-commands/SlashCommandArgument.js';
 import { commonEnumProviders, enumIcons } from '../../slash-commands/SlashCommandCommonEnumsProvider.js';
+import { SlashCommandDebugController } from '../../slash-commands/SlashCommandDebugController.js';
 import { enumTypes, SlashCommandEnumValue } from '../../slash-commands/SlashCommandEnumValue.js';
 import { SlashCommandParser } from '../../slash-commands/SlashCommandParser.js';
+import { SlashCommandScope } from '../../slash-commands/SlashCommandScope.js';
 import { collapseSpaces, getUniqueName, isFalseBoolean, uuidv4 } from '../../utils.js';
 const MODULE_NAME = 'connection-manager';

+    }
+}
+/**
+ * Get named arguments for the command callback.
+ * @param {object} [args] Additional named arguments
+ * @returns {object} Named arguments
+ */
+function getNamedArguments(args = {}) {
+    // None of the commands here use underscored args, but better safe than sorry
+    return {
+        _scope: new SlashCommandScope(),
+        _abortController: new SlashCommandAbortController(),
+        _debugController: new SlashCommandDebugController(),
+        _parserFlags: {},
+        _hasUnnamedArgument: false,
+        quiet: 'true',
+        ...args,
+    };
+}
 /** @type {() => SlashCommandEnumValue[]} */
 const profilesProvider = () => [
     new SlashCommandEnumValue(NONE),

  * @property {string} [tokenizer] Tokenizer
  */
-const escapeArgument = (a) => a.replace(/"/g, '\\"').replace(/\|/g, '\\|');
 /**
  * Finds the best match for the search value.
  * @param {string} value Search value

     const commands = mode === 'cc' ? CC_COMMANDS : TC_COMMANDS;
     const opposingCommands = mode === 'cc' ? TC_COMMANDS : CC_COMMANDS;
     for (const command of commands) {
-        const commandText = `/${command} quiet=true`;
         try {
-            const result = await executeSlashCommandsWithOptions(commandText, { handleParserErrors: false, handleExecutionErrors: false });
+            const args = getNamedArguments();
-            if (result.pipe) {
+            const result = await SlashCommandParser.commands[command].callback(args, '');
-                profile[command] = result.pipe;
+            if (result) {
+                profile[command] = result;
                 continue;
+            }
         } catch (error) {
-            console.warn(`Failed to execute command: ${commandText}`, error);
+            console.error(`Failed to execute command: ${command}`, error);
+        }
+    }

@@ -273,11 +291,11 @@ async function applyConnectionProfile(profile) {
273	if (!argument) {	291	if (!argument) {
274	continue;	292	continue;
275	}	293	}
276	const commandText = `/${command} quiet=true ${escapeArgument(argument)}`;
277	try {	294	try {
278	await executeSlashCommandsWithOptions(commandText, { handleParserErrors: false, handleExecutionErrors: false });	295	const args = getNamedArguments();
		296	await SlashCommandParser.commands[command].callback(args, argument);
279	} catch (error) {	297	} catch (error) {
280	console.error(`Failed to execute command: ${commandText}`, error);	298	console.error(`Failed to execute command: ${command} ${argument}`, error);
281	}	299	}
282	}	300	}
283		301