Merge pull request #3916 from SillyTavern/fix-instruct-regex Check instruct activation regex before selecting context template

37c97db96980f63357aeca393cfa0d1d553de7b0

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

Signed

public/scripts/instruct-mode.js+15 -13 Viewed

     // Select matching instruct preset
     let foundMatch = false;
 -    for (const instruct_preset of instruct_presets) {
++
 -        // If instruct preset matches the context template
 -        if (power_user.instruct.bind_to_context && instruct_preset.name === power_user.context.preset) {
 -            foundMatch = true;
 -            selectInstructPreset(instruct_preset.name, { isAuto: true });
 -            break;
 -        }
 -    }
 -    // If no match was found, auto-select instruct preset
 -    if (!foundMatch) {
     for (const preset of instruct_presets) {
         // If activation regex is set, check if it matches the model id
         if (preset.activation_regex) {

                 // Stop on first match so it won't cycle back and forth between presets if multiple regexes match
                 if (regex instanceof RegExp && regex.test(modelId)) {
                     selectInstructPreset(preset.name, { isAuto: true });
+-
 +                    foundMatch = true;
 -                        return true;
 +                    break;
+                }
             } catch {
                 // If regex is invalid, ignore it

@@ -236,9 +227,20 @@ export function autoSelectInstructPreset(modelId) {
236	227	}
237	228	}
238	229	}
	230	+
	231	+ // If no match was found, auto-select instruct preset
	232	+ if (!foundMatch && power_user.instruct.bind_to_context) {
	233	+ for (const instruct_preset of instruct_presets) {
	234	+ // If instruct preset matches the context template
	235	+ if (instruct_preset.name === power_user.context.preset) {
	236	+ selectInstructPreset(instruct_preset.name, { isAuto: true });
	237	+ foundMatch = true;
	238	+ break;
	239	+ }
	240	+ }
239	241	}
240	242
241	243	return falsefoundMatch;
242	244	}
243	245
244	246	/**