Persona settings for auto-lock & multi connection - Add setting to auto-lock persona to chat. Triggered on chat changed (creation/loaded) and on persona selection. - Add setting to allow multiple persona<->char connections, which then triggers the popup to select one - If no multi connections allowed, the connect toggle will remove all existing connections from personas to that character

776dedea8230811a937828922759d0bdcd85bb4e

Wolfsblvt <wolfsblvt@gmail.com>

Parents: 08a4cee48fe7d6e6b4645a0391a5d8bc18a1ff89
3 files changed, +75 -10Ignore whitespace
public/index.html+17 -1
@@ -4984,7 +4984,7 @@
49844984 <div class="persona_management_global_settings">
49854985 <h4 class="standoutHeader" data-i18n="Global Settings">Global Settings</h4>
49864986
49874987 <div class="persona_management_show_notifications range-block">
49884988 <label for="persona_show_notifications" class="checkbox_label">
49894989 <input id="persona_show_notifications" type="checkbox" />
49904990 <span data-i18n="Show notifications on switching personas">
@@ -4992,6 +4992,22 @@
49924992 </span>
49934993 </label>
49944994 </div>
4995+ <div class="range-block">
4996+ <label for="persona_allow_multi_connections" class="checkbox_label" title="When multiple personas are connected to a character, a popup will appear to select which one to use." data-i18n="[title]When multiple personas are connected to a character, a popup will appear to select which one to use">
4997+ <input id="persona_allow_multi_connections" type="checkbox" />
4998+ <span data-i18n="Allow multiple persona connections per character">
4999+ Allow multiple persona connections per character
5000+ </span>
5001+ </label>
5002+ </div>
5003+ <div class="range-block">
5004+ <label for="persona_auto_lock" class="checkbox_label" title="Whenever a persona is selected, it will be locked to the current chat and automatically selected when the chat is opened." data-i18n="[title]Whenever a persona is selected, it will be locked to the current chat and automatically selected when the chat is opened.">
5005+ <input id="persona_auto_lock" type="checkbox" />
5006+ <span data-i18n="Auto-lock a chosen persona to the chat">
5007+ Auto-lock a chosen persona to the chat
5008+ </span>
5009+ </label>
5010+ </div>
49955011 </div>
49965012 </div>
49975013 </div>
public/scripts/personas.js+46 -9
@@ -30,6 +30,7 @@ import { POPUP_RESULT, POPUP_TYPE, Popup, callGenericPopup } from './popup.js';
3030import { t } from './i18n.js';
3131import { openWorldInfoEditor, world_names } from './world-info.js';
3232import { renderTemplateAsync } from './templates.js';
33+import { saveMetadataDebounced } from './extensions.js';
3334
3435/**
3536 * @typedef {object} PersonaConnection A connection between a character and a character or group entity
@@ -552,6 +553,7 @@ export async function askForPersonaSelection(title, text, personas) {
552553 content.appendChild(titleElement);
553554
554555 const textElement = document.createElement('div');
556+ textElement.classList.add('m-b-1');
555557 textElement.textContent = text;
556558 content.appendChild(textElement);
557559
@@ -567,7 +569,7 @@ export async function askForPersonaSelection(title, text, personas) {
567569 block.dataset.result = String(100 + personas.indexOf(block.dataset.pid));
568570 });
569571
570572 const popup = new Popup(content, POPUP_TYPE.TEXT, '', { okButton: 'None' });
571573 const result = await popup.show();
572574 return Number(result) > 100 ? personas[Number(result) - 100] : null;
573575}
@@ -702,10 +704,21 @@ function selectCurrentPersona() {
702704 depth: DEFAULT_DEPTH,
703705 role: DEFAULT_ROLE,
704706 lorebook: '',
707+ connections: [],
705708 };
706709 }
707710
708711 setPersonaDescription();
712+
713+ // Update the locked persona if setting is enabled
714+ if (power_user.persona_auto_lock && personaName && user_avatar !== chat_metadata['persona']) {
715+ chat_metadata['persona'] = user_avatar;
716+ console.log(`Auto locked persona to ${user_avatar}`);
717+ if (power_user.persona_show_notifications) {
718+ toastr.info(`Auto locked persona ${personaName} to current chat`);
719+ }
720+ saveMetadataDebounced();
721+ }
709722 }
710723}
711724
@@ -834,8 +847,7 @@ async function lockPersona(type = 'chat') {
834847 case 'chat': {
835848 console.log(`Locking persona ${user_avatar} to this chat`);
836849 chat_metadata['persona'] = user_avatar;
837850 await saveMetadatasaveMetadataDebounced();
838- saveSettingsDebounced();
839851 if (power_user.persona_show_notifications) {
840852 toastr.success(t`User persona ${name1} is locked to ${name2} in this chat`);
841853 }
@@ -849,10 +861,27 @@ async function lockPersona(type = 'chat') {
849861 if (newConnection && newConnection.id) {
850862 console.log(`Locking persona ${user_avatar} to this character ${name2}`);
851863 power_user.persona_descriptions[user_avatar].connections = [...connections, newConnection];
864+
865+ const unlinkedCharacters = [];
866+ if (!power_user.persona_allow_multi_connections) {
867+ for (const [avatarId, description] of Object.entries(power_user.persona_descriptions)) {
868+ if (avatarId === user_avatar) continue;
869+
870+ const filteredConnections = description.connections?.filter(c => !(c.type === newConnection.type && c.id === newConnection.id)) ?? [];
871+ if (filteredConnections.length !== description.connections?.length) {
872+ description.connections = filteredConnections;
873+ unlinkedCharacters.push(power_user.personas[avatarId]);
874+ }
875+ }
876+ }
877+
852878 saveSettingsDebounced();
853879 updatePersonaConnectionsAvatarList();
854880 if (power_user.persona_show_notifications) {
855- toastr.success(t`User persona ${name1} is locked to character ${name2}`);
881+ let additional = '';
882+ if (unlinkedCharacters.length)
883+ additional += `<br /><br />${t`Unlinked existing persona${unlinkedCharacters.length > 1 ? 's' : ''}: ${unlinkedCharacters.join(', ')}`}`;
884+ toastr.success(t`User persona ${name1} is locked to character ${name2}${additional}`, null, { escapeHtml: false });
856885 }
857886 }
858887 break;
@@ -1136,6 +1165,9 @@ async function setChatLockedPersona() {
11361165 // Define a persona for this chat
11371166 let chatPersona = '';
11381167
1168+ /** @type {'chat' | 'character' | 'default' | null} */
1169+ let connectType = null;
1170+
11391171 // If persona is locked in chat metadata, select it
11401172 if (chat_metadata['persona']) {
11411173 console.log(`Using locked persona ${chat_metadata['persona']}`);
@@ -1145,15 +1177,12 @@ async function setChatLockedPersona() {
11451177 if (!userAvatars.includes(chatPersona)) {
11461178 console.warn('Chat-locked persona avatar not found, unlocking persona');
11471179 delete chat_metadata['persona'];
11481180 updatePersonaLockIconssaveSettingsDebounced();
11491181 chatPersona = '';
1150- return;
11511182 }
1183+ if (chatPersona) connectType = 'chat';
11521184 }
11531185
1154- // TODO: TEMP
1155- power_user.persona_allow_multi_connections = true;
1156-
11571186 // Check if we have any persona connected to the current character
11581187 if (!chatPersona) {
11591188 const characterKey = menu_type === 'group_edit' ? selected_group : characters[this_chid]?.avatar;
@@ -1171,12 +1200,16 @@ async function setChatLockedPersona() {
11711200 connectedPersonas);
11721201 }
11731202 }
1203+
1204+ if (chatPersona) connectType = 'character';
11741205 }
11751206
11761207 // Last check if default persona is set, select it
11771208 if (!chatPersona && power_user.default_persona) {
11781209 console.log(`Using default persona ${power_user.default_persona}`);
11791210 chatPersona = power_user.default_persona;
1211+
1212+ if (chatPersona) connectType = 'default';
11801213 }
11811214
11821215 // Whatever way we selected a persona, if it doesn't exist, unlock this chat
@@ -1195,6 +1228,10 @@ async function setChatLockedPersona() {
11951228 // Persona avatar found, select it
11961229 if (chatPersona) {
11971230 setUserAvatar(chatPersona);
1231+
1232+ if (power_user.persona_show_notifications) {
1233+ toastr.info(t`Auto-selected persona ${power_user.personas[chatPersona]} based on ${connectType} connection.`, t`Persona Management`);
1234+ }
11981235 }
11991236
12001237 updatePersonaLockIcons();
public/scripts/power-user.js+12 -0
@@ -1477,6 +1477,8 @@ async function loadPowerUserSettings(settings, data) {
14771477 $('#custom_stopping_strings_macro').prop('checked', power_user.custom_stopping_strings_macro);
14781478 $('#fuzzy_search_checkbox').prop('checked', power_user.fuzzy_search);
14791479 $('#persona_show_notifications').prop('checked', power_user.persona_show_notifications);
1480+ $('#persona_allow_multi_connections').prop('checked', power_user.persona_allow_multi_connections);
1481+ $('#persona_auto_lock').prop('checked', power_user.persona_auto_lock);
14801482 $('#encode_tags').prop('checked', power_user.encode_tags);
14811483 $('#example_messages_behavior').val(getExampleMessagesBehavior());
14821484 $(`#example_messages_behavior option[value="${getExampleMessagesBehavior()}"]`).prop('selected', true);
@@ -3652,6 +3654,16 @@ $(document).ready(() => {
36523654 saveSettingsDebounced();
36533655 });
36543656
3657+ $('#persona_allow_multi_connections').on('input', function () {
3658+ power_user.persona_allow_multi_connections = !!$(this).prop('checked');
3659+ saveSettingsDebounced();
3660+ });
3661+
3662+ $('#persona_auto_lock').on('input', function () {
3663+ power_user.persona_auto_lock = !!$(this).prop('checked');
3664+ saveSettingsDebounced();
3665+ });
3666+
36553667 $('#encode_tags').on('input', async function () {
36563668 power_user.encode_tags = !!$(this).prop('checked');
36573669 await reloadCurrentChat();