/inject: auto-generate ID and fix argument description (#4253) * /inject: auto-generate ID and fix argument description * Fix default depth and role handling * Return ID of the new inject

febb02ffcb9149b364acd48a0fc1525010ba5d45

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

Signed

public/scripts/slash-commands.js+8 -13 Viewed

     }));
     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
         name: 'inject',
+        returns: 'injection ID',
         callback: injectCallback,
         namedArgumentList: [
             SlashCommandNamedArgument.fromProps({
                 name: 'id',
-                description: 'injection ID or variable name pointing to ID',
+                description: 'injection ID',
                 typeList: [ARGUMENT_TYPE.STRING],
-                isRequired: true,
+                isRequired: false,
                 enumProvider: commonEnumProviders.injects,
             }),
             new SlashCommandNamedArgument(

                 'text', [ARGUMENT_TYPE.STRING], false,
             ),
         ],
-        helpString: 'Injects a text into the LLM prompt for the current chat. Requires a unique injection ID. Positions: "before" main prompt, "after" main prompt, in-"chat", hidden with "none" (default: after). Depth: injection depth for the prompt (default: 4). Role: role for in-chat injections (default: system). Scan: include injection content into World Info scans (default: false). Hidden injects in "none" position are not inserted into the prompt but can be used for triggering WI entries.',
+        helpString: 'Injects a text into the LLM prompt for the current chat. Requires a unique injection ID (will be auto-generated if not provided). Positions: "before" main prompt, "after" main prompt, in-"chat", hidden with "none" (default: after). Depth: injection depth for the prompt (default: 4). Role: role for in-chat injections (default: system). Scan: include injection content into World Info scans (default: false). Hidden injects in "none" position are not inserted into the prompt but can be used for triggering WI entries. Returns the injection ID.',
     }));
     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
         name: 'listinjects',

         'assistant': extension_prompt_roles.ASSISTANT,
     };
-    const id = String(args?.id ?? '');
+    const id = String(args?.id ?? '') || Math.random().toString(36).substring(2);
     const ephemeral = isTrueBoolean(String(args?.ephemeral ?? ''));
-    if (!id) {
-        console.warn('WARN: No ID provided for /inject command');
-        toastr.warning('No ID provided for /inject command');
-        return '';
-    }
     const defaultPosition = 'after';
     const defaultDepth = 4;
     const positionValue = args?.position ?? defaultPosition;
     const position = positions[positionValue] ?? positions[defaultPosition];
-    const depthValue = Number(args?.depth) ?? defaultDepth;
+    const depthValue = Number(args?.depth ?? defaultDepth);
     const depth = isNaN(depthValue) ? defaultDepth : depthValue;
     const roleValue = typeof args?.role === 'string' ? args.role.toLowerCase().trim() : Number(args?.role ?? extension_prompt_roles.SYSTEM);
-    const role = roles[roleValue] ?? roles[extension_prompt_roles.SYSTEM];
+    const role = roles[roleValue] ?? extension_prompt_roles.SYSTEM;
     const scan = isTrueBoolean(String(args?.scan));
     const filter = args?.filter instanceof SlashCommandClosure ? args.filter.rawText : null;
     const filterFunction = args?.filter instanceof SlashCommandClosure ? closureToFilter(args.filter) : null;

@@ -3045,7 +3040,7 @@ function injectCallback(args, value) {
3045	eventSource.once(event_types.GENERATION_STOPPED, unsetInject);	3040	eventSource.once(event_types.GENERATION_STOPPED, unsetInject);
3046	}	3041	}
3047		3042
3048	return '';	3043	return id;
3049	}	3044	}
3050		3045
3051	async function listInjectsCallback(args) {	3046	async function listInjectsCallback(args) {