Merge branch 'staging' into delete-newbie-mode

4de3b10af2d1ffb792f1c65ec282e3c743ae2ff9

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

Parents: 9a8a958165878a324c57716920bc72a8501d384f e3b62523ea51ad05a23e302b95264ebc161be6d6
14 files changed, +689 -581Showing whitespace changes
public/css/mobile-styles.css+0 -1
@@ -344,7 +344,6 @@
344344
345345@media screen and (min-width: 1001px) {
346346
347- #PygOverrides,
348347 #ContextFormatting,
349348 #UI-Theme-Block,
350349 #UI-Customization,
public/css/st-tailwind.css+6 -1
@@ -360,6 +360,10 @@
360360 margin-right: 2px;
361361}
362362
363+.flexAuto {
364+ flex: auto;
365+}
366+
363367.flex0 {
364368 flex: 0;
365369}
@@ -490,7 +494,8 @@
490494}
491495
492496input:disabled,
493497textarea:disabled {,
498+.disabled {
494499 cursor: not-allowed;
495500 filter: brightness(0.5);
496501}
public/index.html+431 -521
@@ -1488,7 +1488,7 @@
14881488 </div>
14891489 <div data-tg-type="mancer, ooba, koboldcpp, vllm, aphrodite, llamacpp, ollama, infermaticai, huggingface" data-newbie-hidden class="flex-container flexFlowColumn alignitemscenter flexBasis48p flexGrow flexShrink gap0">
14901490 <small data-i18n="Seed" class="textAlignCenter">Seed</small>
14911491 <input type="number" id="seed_textgenerationwebui" class="text_pole textAlignCenter" min="-1" value="-1" maxlength="100" />
14921492 </div>
14931493 <div id="banned_tokens_block_ooba" data-newbie-hidden class="wide100p">
14941494 <hr data-newbie-hidden class="width100p">
@@ -1820,12 +1820,12 @@
18201820 <span id="claude_assistant_prefill_text" data-i18n="Assistant Prefill">Assistant Prefill</span>
18211821 <i class="editor_maximize fa-solid fa-maximize right_menu_button" data-for="claude_assistant_prefill" title="Expand the editor" data-i18n="[title]Expand the editor"></i>
18221822 </div>
18231823 <textarea id="claude_assistant_prefill" class="text_pole textarea_compact" name="assistant_prefill" rows="6" maxlength="100000" data-i18n="[placeholder]Start Claude's answer with..." placeholder="Start Claude's answer with..."></textarea>
18241824 <div class="flex-container alignItemsCenter">
18251825 <span id="claude_assistant_impersonation_text" data-i18n="Assistant Impersonation Prefill">Assistant Impersonation Prefill</span>
18261826 <i class="editor_maximize fa-solid fa-maximize right_menu_button" data-for="claude_assistant_impersonation" title="Expand the editor" data-i18n="[title]Expand the editor"></i>
18271827 </div>
18281828 <textarea id="claude_assistant_impersonation" class="text_pole textarea_compact" name="assistant_impersonation" rows="6" maxlength="100000" data-i18n="[placeholder]Start Claude's answer with..." placeholder="Start Claude's answer with..."></textarea>
18291829 </div>
18301830 <label for="claude_use_sysprompt" class="checkbox_label widthFreeExpand">
18311831 <input id="claude_use_sysprompt" type="checkbox" />
@@ -1951,7 +1951,7 @@
19511951 <a id="horde_kudos" href="javascript:void(0);">View my Kudos</a>
19521952 </div> -->
19531953 <div class="flex-container">
19541954 <input id="horde_api_key" name="horde_api_key" class="text_pole flex1" maxlength="500" type="text" placeholder="0000000000" autocomplete="off">
19551955 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_horde"></div>
19561956 </div>
19571957 <div data-for="horde_api_key" class="neutral_warning" data-i18n="For privacy reasons, your API key will be hidden after you reload the page.">
@@ -1978,7 +1978,7 @@
19781978 <div id="kobold_api_block">
19791979 <h4 data-i18n="API url">API url</h4>
19801980 <small data-i18n="Example: http://127.0.0.1:5000/api ">Example: http://127.0.0.1:5000/api </small>
19811981 <input id="api_url_text" name="api_url" class="text_pole" placeholder="http://127.0.0.1:5000/api" maxlength="500" value="" autocomplete="off" data-server-history="kobold">
19821982 <div id="koboldcpp_hint" class="neutral_warning displayNone">
19831983 KoboldCpp works better when you select the Text Completion API and then KoboldCpp as a type!
19841984 </div>
@@ -2006,7 +2006,7 @@
20062006 </ol>
20072007 </span>
20082008 <div class="flex-container">
20092009 <input id="api_key_novel" name="api_key_novel" class="text_pole flex1 wide100p" maxlength="500" size="35" type="text" autocomplete="off">
20102010 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_novel">
20112011 </div>
20122012 </div>
@@ -2056,7 +2056,7 @@
20562056 <div data-tg-type="togetherai" class="flex-container flexFlowColumn">
20572057 <h4 data-i18n="TogetherAI API Key">TogetherAI API Key</h4>
20582058 <div class="flex-container">
20592059 <input id="api_key_togetherai" name="api_key_togetherai" class="text_pole flex1" maxlength="500" value="" type="text" autocomplete="off">
20602060 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_togetherai"></div>
20612061 </div>
20622062 <div data-for="api_key_togetherai" class="neutral_warning" data-i18n="For privacy reasons, your API key will be hidden after you reload the page.">
@@ -2080,7 +2080,7 @@
20802080 <a href="https://openrouter.ai/account" target="_blank" data-i18n="View Remaining Credits">View Remaining Credits</a>
20812081 </div>
20822082 <div class="flex-container">
20832083 <input id="api_key_openrouter-tg" name="api_key_openrouter" class="text_pole flex1 api_key_openrouter" maxlength="500" value="" type="text" autocomplete="off">
20842084 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_openrouter"></div>
20852085 </div>
20862086 <div data-for="api_key_openrouter" class="neutral_warning" data-i18n="For privacy reasons, your API key will be hidden after you reload the page.">
@@ -2107,7 +2107,7 @@
21072107 <div data-tg-type="infermaticai" class="flex-container flexFlowColumn">
21082108 <h4 data-i18n="InfermaticAI API Key">InfermaticAI API Key</h4>
21092109 <div class="flex-container">
21102110 <input id="api_key_infermaticai" name="api_key_infermaticai" class="text_pole flex1" maxlength="500" value="" type="text" autocomplete="off">
21112111 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_infermaticai"></div>
21122112 </div>
21132113 <div data-for="api_key_infermaticai" class="neutral_warning" data-i18n="For privacy reasons, your API key will be hidden after you reload the page.">
@@ -2130,7 +2130,7 @@
21302130 </a>
21312131 </h4>
21322132 <div class="flex-container">
21332133 <input id="api_key_dreamgen" name="api_key_dreamgen" class="text_pole flex1" maxlength="500" value="" type="text" autocomplete="off">
21342134 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_dreamgen"></div>
21352135 </div>
21362136 <div data-for="api_key_dreamgen" class="neutral_warning" data-i18n="For privacy reasons, your API key will be hidden after you reload the page.">
@@ -2155,7 +2155,7 @@
21552155 </a>
21562156 </h4>
21572157 <div class="flex-container">
21582158 <input id="api_key_mancer" name="api_key_mancer" class="text_pole flex1 wide100p" maxlength="500" size="35" type="text" autocomplete="off">
21592159 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_mancer">
21602160 </div>
21612161 </div>
@@ -2185,7 +2185,7 @@
21852185 </div>
21862186 <h4 data-i18n="API key (optional)">API key (optional)</h4>
21872187 <div class="flex-container">
21882188 <input id="api_key_ooba" name="api_key_ooba" class="text_pole flex1 wide100p" maxlength="500" size="35" type="text" autocomplete="off">
21892189 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_ooba">
21902190 </div>
21912191 </div>
@@ -2195,9 +2195,9 @@
21952195 <div class="flex1">
21962196 <h4 data-i18n="Server url">Server URL</h4>
21972197 <small data-i18n="Example: 127.0.0.1:5000">Example: http://127.0.0.1:5000</small>
21982198 <input id="textgenerationwebui_api_url_text" name="textgenerationwebui_api_url" class="text_pole wide100p" maxlength="500" value="" autocomplete="off" data-server-history="ooba_blocking">
21992199 </div>
22002200 <input id="custom_model_textgenerationwebui" class="text_pole wide100p" maxlength="500" placeholder="Custom model (optional)" data-i18n="[placeholder]Custom model (optional)" type="text">
22012201 </div>
22022202 <div data-tg-type="featherless" class="flex-container flexFlowColumn">
22032203 <div class="flex-container flexFlowColumn">
@@ -2207,7 +2207,7 @@
22072207 </div>
22082208 <h4 data-i18n="API key (optional)">API key</h4>
22092209 <div class="flex-container">
22102210 <input id="api_key_featherless" name="api_key_featherless" class="text_pole flex1 wide100p" maxlength="500" size="35" type="text" autocomplete="off">
22112211 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_featherless">
22122212 </div>
22132213 </div>
@@ -2228,7 +2228,7 @@
22282228 </div>
22292229 <h4 data-i18n="vLLM API key">vLLM API key</h4>
22302230 <div class="flex-container">
22312231 <input id="api_key_vllm" name="api_key_vllm" class="text_pole flex1 wide100p" maxlength="500" size="35" type="text" autocomplete="off">
22322232 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_vllm">
22332233 </div>
22342234 </div>
@@ -2238,7 +2238,7 @@
22382238 <div class="flex1">
22392239 <h4 data-i18n="API url">API URL</h4>
22402240 <small data-i18n="Example: 127.0.0.1:8000">Example: http://127.0.0.1:8000</small>
22412241 <input id="vllm_api_url_text" class="text_pole wide100p" maxlength="500" value="" autocomplete="off" data-server-history="vllm">
22422242 </div>
22432243 <div>
22442244 <h4 data-i18n="vLLM Model">vLLM Model</h4>
@@ -2252,7 +2252,7 @@
22522252 <div data-tg-type="huggingface">
22532253 <h4 data-i18n="HuggingFace Token">HuggingFace Token</h4>
22542254 <div class="flex-container">
22552255 <input id="api_key_huggingface" name="api_key_huggingface" class="text_pole flex1 wide100p" maxlength="500" size="35" type="text" autocomplete="off">
22562256 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_huggingface">
22572257 </div>
22582258 </div>
@@ -2262,7 +2262,7 @@
22622262 <div class="flex1">
22632263 <h4 data-i18n="Endpoint URL">Endpoint URL</h4>
22642264 <small data-i18n="Example: https://****.endpoints.huggingface.cloud">Example: https://****.endpoints.huggingface.cloud</small>
22652265 <input id="huggingface_api_url_text" class="text_pole wide100p" maxlength="500" value="" autocomplete="off" data-server-history="huggingface">
22662266 </div>
22672267 </div>
22682268
@@ -2274,7 +2274,7 @@
22742274 </div>
22752275 <h4 data-i18n="Aphrodite API key">Aphrodite API key</h4>
22762276 <div class="flex-container">
22772277 <input id="api_key_aphrodite" name="api_key_aphrodite" class="text_pole flex1 wide100p" maxlength="500" size="35" type="text" autocomplete="off">
22782278 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_aphrodite">
22792279 </div>
22802280 </div>
@@ -2284,7 +2284,7 @@
22842284 <div class="flex1">
22852285 <h4 data-i18n="API url">API URL</h4>
22862286 <small data-i18n="Example: 127.0.0.1:5000">Example: http://127.0.0.1:5000</small>
22872287 <input id="aphrodite_api_url_text" class="text_pole wide100p" maxlength="500" value="" autocomplete="off" data-server-history="aphrodite">
22882288 </div>
22892289 <div>
22902290 <h4 data-i18n="Aphrodite Model">Aphrodite Model</h4>
@@ -2303,7 +2303,7 @@
23032303 </div>
23042304 <h4 data-i18n="API key (optional)">API key (optional)</h4>
23052305 <div class="flex-container">
23062306 <input id="api_key_llamacpp" name="api_key_llamacpp" class="text_pole flex1 wide100p" maxlength="500" size="35" type="text" autocomplete="off">
23072307 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_llamacpp">
23082308 </div>
23092309 </div>
@@ -2313,7 +2313,7 @@
23132313 <div class="flex1">
23142314 <h4 data-i18n="API url">API URL</h4>
23152315 <small data-i18n="Example: 127.0.0.1:8080">Example: http://127.0.0.1:8080</small>
23162316 <input id="llamacpp_api_url_text" class="text_pole wide100p" maxlength="500" value="" autocomplete="off" data-server-history="llamacpp">
23172317 </div>
23182318 </div>
23192319 <div data-tg-type="ollama">
@@ -2325,7 +2325,7 @@
23252325 <div class="flex1">
23262326 <h4 data-i18n="API url">API URL</h4>
23272327 <small data-i18n="Example: 127.0.0.1:11434">Example: http://127.0.0.1:11434</small>
23282328 <input id="ollama_api_url_text" class="text_pole wide100p" maxlength="500" value="" autocomplete="off" data-server-history="ollama">
23292329 </div>
23302330 <div class="flex1">
23312331 <h4>
@@ -2351,7 +2351,7 @@
23512351 </div>
23522352 <h4 data-i18n="Tabby API key">Tabby API key</h4>
23532353 <div class="flex-container">
23542354 <input id="api_key_tabby" name="api_key_tabby" class="text_pole flex1 wide100p" maxlength="500" size="35" type="text" autocomplete="off">
23552355 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_tabby">
23562356 </div>
23572357 </div>
@@ -2361,7 +2361,7 @@
23612361 <div class="flex1">
23622362 <h4 data-i18n="API url">API URL</h4>
23632363 <small data-i18n="Example: 127.0.0.1:5000">Example: http://127.0.0.1:5000</small>
23642364 <input id="tabby_api_url_text" class="text_pole wide100p" maxlength="500" value="" autocomplete="off" data-server-history="tabby">
23652365 </div>
23662366 <div class="flex1">
23672367 <h4>
@@ -2382,7 +2382,7 @@
23822382 </div>
23832383 <h4 data-i18n="koboldcpp API key (optional)">koboldcpp API key (optional)</h4>
23842384 <div class="flex-container">
23852385 <input id="api_key_koboldcpp" name="api_key_koboldcpp" class="text_pole flex1 wide100p" maxlength="500" size="35" type="text" autocomplete="off">
23862386 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_koboldcpp">
23872387 </div>
23882388 </div>
@@ -2392,7 +2392,7 @@
23922392 <div class="flex1">
23932393 <h4 data-i18n="API url">API URL</h4>
23942394 <small data-i18n="Example: 127.0.0.1:5001">Example: http://127.0.0.1:5001</small>
23952395 <input id="koboldcpp_api_url_text" class="text_pole wide100p" maxlength="500" value="" autocomplete="off" data-server-history="koboldcpp">
23962396 </div>
23972397 </div>
23982398 <div class="flex-container">
@@ -2467,7 +2467,7 @@
24672467 </span>
24682468 </div>
24692469 <div class="wide100p">
24702470 <input id="openai_reverse_proxy_name" type="text" class="text_pole" placeholder="..." maxlength="100" />
24712471 </div>
24722472 <div class="range-block-title justifyLeft" data-i18n="Proxy Server URL">
24732473 Proxy Server URL
@@ -2478,7 +2478,7 @@
24782478 </span>
24792479 </div>
24802480 <div class="wide100p">
24812481 <input id="openai_reverse_proxy" type="text" class="text_pole" placeholder="https://api.openai.com/v1" maxlength="5000" />
24822482 <small class="reverse_proxy_warning">
24832483 <span data-i18n="Doesn't work? Try adding">Doesn't work? Try adding</span> <code>/v1</code> <span data-i18n="at the end!">at the end!</span>
24842484 </small>
@@ -2492,7 +2492,7 @@
24922492 </span>
24932493 </div>
24942494 <div class="flex-container width100p">
24952495 <input id="openai_proxy_password" type="password" class="text_pole flex1" placeholder="" maxlength="5000" form="openai_form" autocomplete="off" />
24962496 <div id="openai_proxy_password_show" title="Peek a password" data-i18n="[title]Peek a password" class="menu_button fa-solid fa-eye-slash fa-fw"></div>
24972497 </div>
24982498 </div>
@@ -2533,7 +2533,7 @@
25332533 </ol>
25342534 </span>
25352535 <div class="flex-container">
25362536 <input id="api_key_openai" name="api_key_openai" class="text_pole flex1" maxlength="500" value="" type="text" autocomplete="off">
25372537 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_openai"></div>
25382538 </div>
25392539 <div id="ReverseProxyWarningMessage2" class="reverse_proxy_warning">
@@ -2618,7 +2618,7 @@
26182618 </b>
26192619 </div>
26202620 <div class="flex-container">
26212621 <input id="api_key_claude" name="api_key_claude" class="text_pole flex1" maxlength="500" value="" type="text" autocomplete="off">
26222622 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_claude"></div>
26232623 </div>
26242624 <div data-for="api_key_claude" class="neutral_warning" data-i18n="For privacy reasons, your API key will be hidden after you reload the page.">
@@ -2670,7 +2670,7 @@
26702670 <a href="https://openrouter.ai/account" target="_blank" data-i18n="View Remaining Credits">View Remaining Credits</a>
26712671 </div>
26722672 <div class="flex-container">
26732673 <input id="api_key_openrouter" name="api_key_openrouter" class="text_pole flex1 api_key_openrouter" maxlength="500" value="" type="text" autocomplete="off">
26742674 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_openrouter"></div>
26752675 </div>
26762676 <div data-for="api_key_openrouter" class="neutral_warning" data-i18n="For privacy reasons, your API key will be hidden after you reload the page.">
@@ -2746,19 +2746,19 @@
27462746 <div id="normal_scale_form">
27472747 <h4 data-i18n="Scale API Key">Scale API Key</h4>
27482748 <div class="flex-container">
27492749 <input id="api_key_scale" name="api_key_scale" class="text_pole flex1" maxlength="500" value="" autocomplete="off">
27502750 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_scale"></div>
27512751 </div>
27522752 <div data-for="api_key_scale" class="neutral_warning" data-i18n="For privacy reasons, your API key will be hidden after you reload the page.">
27532753 For privacy reasons, your API key will be hidden after you reload the page.
27542754 </div>
27552755 <h4>Scale API URL</h4>
27562756 <input id="api_url_scale" name="api_url_scale" class="text_pole" maxlength="500" value="" autocomplete="off" placeholder="https://dashboard.scale.com/spellbook/api/v2/deploy/xxxxxxx">
27572757 </div>
27582758 <div id="alt_scale_form">
27592759 <h4>Scale Cookie (_jwt)</h4>
27602760 <div class="flex-container">
27612761 <input id="scale_cookie" name="scale_cookie" class="text_pole flex1" maxlength="500" value="" autocomplete="off">
27622762 <div title="Clear your cookie" data-i18n="[title]Clear your cookie" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="scale_cookie"></div>
27632763 </div>
27642764 <div data-for="scale_cookie" class="neutral_warning">
@@ -2775,7 +2775,7 @@
27752775 <form id="ai21_form" data-source="ai21" action="javascript:void(null);" method="post" enctype="multipart/form-data">
27762776 <h4 data-i18n="AI21 API Key">AI21 API Key</h4>
27772777 <div class="flex-container">
27782778 <input id="api_key_ai21" name="api_key_ai21" class="text_pole flex1" maxlength="500" value="" type="text" autocomplete="off">
27792779 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_ai21"></div>
27802780 </div>
27812781 <div data-for="api_key_ai21" class="neutral_warning" data-i18n="For privacy reasons, your API key will be hidden after you reload the page.">
@@ -2797,7 +2797,7 @@
27972797 <form id="makersuite_form" data-source="makersuite" action="javascript:void(null);" method="post" enctype="multipart/form-data">
27982798 <h4 data-i18n="Google AI Studio API Key">Google AI Studio API Key</h4>
27992799 <div class="flex-container">
28002800 <input id="api_key_makersuite" name="api_key_makersuite" class="text_pole flex1" maxlength="500" value="" type="text" autocomplete="off">
28012801 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_makersuite"></div>
28022802 </div>
28032803 <div data-for="api_key_makersuite" class="neutral_warning" data-i18n="For privacy reasons, your API key will be hidden after you reload the page.">
@@ -2836,7 +2836,7 @@
28362836 <form id="mistralai_form" data-source="mistralai" action="javascript:void(null);" method="post" enctype="multipart/form-data">
28372837 <h4 data-i18n="MistralAI API Key">MistralAI API Key</h4>
28382838 <div class="flex-container">
28392839 <input id="api_key_mistralai" name="api_key_mistralai" class="text_pole flex1" maxlength="500" value="" type="text" autocomplete="off">
28402840 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_mistralai"></div>
28412841 </div>
28422842 <div data-for="api_key_mistralai" class="neutral_warning" data-i18n="For privacy reasons, your API key will be hidden after you reload the page.">
@@ -2875,7 +2875,7 @@
28752875 <div id="groq_form" data-source="groq">
28762876 <h4 data-i18n="Groq API Key">Groq API Key</h4>
28772877 <div class="flex-container">
28782878 <input id="api_key_groq" name="api_key_groq" class="text_pole flex1" maxlength="500" value="" type="text" autocomplete="off">
28792879 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_groq"></div>
28802880 </div>
28812881 <div data-for="api_key_groq" class="neutral_warning" data-i18n="For privacy reasons, your API key will be hidden after you reload the page.">
@@ -2898,7 +2898,7 @@
28982898 <div id="perplexity_form" data-source="perplexity">
28992899 <h4 data-i18n="Perplexity API Key">Perplexity API Key</h4>
29002900 <div class="flex-container">
29012901 <input id="api_key_perplexity" name="api_key_perplexity" class="text_pole flex1" maxlength="500" value="" type="text" autocomplete="off">
29022902 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_perplexity"></div>
29032903 </div>
29042904 <div data-for="api_key_perplexity" class="neutral_warning" data-i18n="For privacy reasons, your API key will be hidden after you reload the page.">
@@ -2938,7 +2938,7 @@
29382938 <form id="cohere_form" data-source="cohere" action="javascript:void(null);" method="post" enctype="multipart/form-data">
29392939 <h4 data-i18n="Cohere API Key">Cohere API Key</h4>
29402940 <div class="flex-container">
29412941 <input id="api_key_cohere" name="api_key_cohere" class="text_pole flex1" maxlength="500" value="" type="text" autocomplete="off">
29422942 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_cohere"></div>
29432943 </div>
29442944 <div data-for="api_key_cohere" class="neutral_warning" data-i18n="For privacy reasons, your API key will be hidden after you reload the page.">
@@ -2966,7 +2966,7 @@
29662966 <form id="blockentropy_form" data-source="blockentropy">
29672967 <h4 data-i18n="Block Entropy API Key">Block Entropy API Key</h4>
29682968 <div class="flex-container">
29692969 <input id="api_key_blockentropy" name="api_key_blockentropy" class="text_pole flex1" maxlength="500" value="" type="text" autocomplete="off">
29702970 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_blockentropy"></div>
29712971 </div>
29722972 <div data-for="api_key_blockentropy" class="neutral_warning" data-i18n="For privacy reasons, your API key will be hidden after you reload the page.">
@@ -2980,7 +2980,7 @@
29802980 <form id="custom_form" data-source="custom">
29812981 <h4 data-i18n="Custom Endpoint (Base URL)">Custom Endpoint (Base URL)</h4>
29822982 <div class="flex-container">
29832983 <input id="custom_api_url_text" class="text_pole wide100p" maxlength="5000" value="" autocomplete="off" data-i18n="[placeholder]Example: http://localhost:1234/v1" placeholder="Example: http://localhost:1234/v1">
29842984 </div>
29852985 <div>
29862986 <small>
@@ -2992,7 +2992,7 @@
29922992 <small data-i18n="(Optional)">(Optional)</small>
29932993 </h4>
29942994 <div class="flex-container">
29952995 <input id="api_key_custom" name="api_key_custom" class="text_pole flex1" maxlength="5000" value="" type="text" autocomplete="off">
29962996 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_custom"></div>
29972997 </div>
29982998 <div data-for="api_key_custom" class="neutral_warning" data-i18n="For privacy reasons, your API key will be hidden after you reload the page.">
@@ -3000,7 +3000,7 @@
30003000 </div>
30013001 <h4 data-i18n="Enter a Model ID">Enter a Model ID</h4>
30023002 <div class="flex-container">
30033003 <input list="model_custom_select_fill" id="custom_model_id" class="text_pole wide100p" maxlength="500" value="" autocomplete="off" data-i18n="[placeholder]Example: gpt-3.5-turbo" placeholder="Example: gpt-3.5-turbo">
30043004 <datalist id="model_custom_select_fill" class="text_pole model_custom_select"></datalist>
30053005 </div>
30063006 <h4 data-i18n="Available Models">Available Models</h4>
@@ -3020,7 +3020,7 @@
30203020 </a>
30213021 </h4>
30223022 <div class="flex-container">
30233023 <input id="api_key_01ai" name="api_key_01ai" class="text_pole flex1" maxlength="500" value="" type="text" autocomplete="off">
30243024 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_01ai"></div>
30253025 </div>
30263026 <div data-for="api_key_01ai" class="neutral_warning" data-i18n="For privacy reasons, your API key will be hidden after you reload the page.">
@@ -3059,8 +3059,8 @@
30593059 <h3 class="margin0" data-i18n="Advanced Formatting">
30603060 Advanced Formatting
30613061 </h3>
30623062 <div class="flex-container spaceEvenly">
30633063 <div id="PygOverridesContextSettings" class="flex-container flexNoGap flexFlowColumn flex1">
30643064 <div>
30653065 <h4 class="standoutHeader title_restorable">
30663066 <div>
@@ -3069,32 +3069,32 @@
30693069 <span class="fa-solid fa-circle-question note-link-span"></span>
30703070 </a>
30713071 </div>
3072- <div class="flex-container">
3073- <i data-newbie-hidden data-preset-manager-import="context" class="margin0 menu_button fa-solid fa-file-import" title="Import preset" data-i18n="[title]Import preset"></i>
3074- <i data-newbie-hidden data-preset-manager-export="context" class="margin0 menu_button fa-solid fa-file-export" title="Export preset" data-i18n="[title]Export preset"></i>
3075- <i data-newbie-hidden data-preset-manager-restore="context" class="margin0 menu_button fa-solid fa-recycle" title="Restore current preset" data-i18n="[title]Restore current preset"></i>
3076- <i data-newbie-hidden id="context_delete_preset" data-preset-manager-delete="context" class="margin0 menu_button fa-solid fa-trash-can" title="Delete the preset" data-i18n="[title]Delete the preset"></i>
3077- </div>
30783072 </h4>
30793073 <div class="flex-container justifyCenter">
3080- <select id="context_presets" data-preset-manager-for="context" class="flex1 text_pole"></select>
30813074 <input type="file" hidden data-preset-manager-file="context" accept=".json, .settings">
30823075 <i id="context_set_default" class="menu_button fa-solid fa-heart" title="Auto-select this preset for Instruct Mode." data-i18n="[title]Auto-select this preset for Instruct Mode"></i>
30833076 <i data-newbie-hidden data-preset-manager-update="context" class="menu_button fa-solid fa-save" title="Update current preset" data-i18n="[title]Update current preset"></i>
30843077 <i data-newbie-hidden data-preset-manager-new="context" class="menu_button fa-solid fa-file-circle-plus" title="Save preset as" data-i18n="[title]Save preset as"></i>
3078+ <i data-preset-manager-import="context" class="menu_button fa-solid fa-file-import" title="Import preset" data-i18n="[title]Import preset"></i>
3079+ <i data-preset-manager-export="context" class="menu_button fa-solid fa-file-export" title="Export preset" data-i18n="[title]Export preset"></i>
3080+ <i data-newbie-hidden data-preset-manager-restore="context" class="menu_button fa-solid fa-recycle" title="Restore current preset" data-i18n="[title]Restore current preset"></i>
3081+ <i id="context_delete_preset" data-preset-manager-delete="context" class="menu_button fa-solid fa-trash-can" title="Delete the preset" data-i18n="[title]Delete the preset"></i>
3082+ </div>
3083+ <div class="flex-container">
3084+ <select id="context_presets" data-preset-manager-for="context" class="flex1 text_pole"></select>
30853085 </div>
30863086 <div data-newbie-hidden>
30873087 <label for="context_story_string">
30883088 <small data-i18n="Story String">Story String</small>
30893089 </label>
30903090 <textareadiv contenteditable="true" id="context_story_string" class="text_pole textarea_compact autoSetHeight" rows="1"></textareadiv>
30913091 <div class="flex-container">
30923092 <div class="flex1">
30933093 <label for="context_example_separator">
30943094 <small data-i18n="Example Separator">Example Separator</small>
30953095 </label>
30963096 <div>
30973097 <textareadiv contenteditable="true" id="context_example_separator" class="text_pole textarea_compact autoSetHeight" maxlength="500" rows="1"></textareadiv>
30983098 </div>
30993099 </div>
31003100 <div class="flex1">
@@ -3102,10 +3102,53 @@
31023102 <small data-i18n="Chat Start">Chat Start</small>
31033103 </label>
31043104 <div>
31053105 <textareadiv contenteditable="true" id="context_chat_start" class="text_pole textarea_compact autoSetHeight" maxlength="500" rows="1"></textareadiv>
31063106 </div>
31073107 </div>
31083108 </div>
3109+ <div>
3110+ <h4 class="standoutHeader">
3111+ <span data-i18n="Context Formatting">
3112+ Context Formatting
3113+ </span>
3114+ <small data-i18n="(Saves to Template)">
3115+ (Saves to Template)
3116+ </small>
3117+ </h4>
3118+
3119+ <label class="checkbox_label" for="always-force-name2-checkbox">
3120+ <input id="always-force-name2-checkbox" type="checkbox" />
3121+ <small data-i18n="Always add character's name to prompt">
3122+ Always add character's name to prompt
3123+ </small>
3124+ </label>
3125+ <label class="checkbox_label" for="single_line">
3126+ <input id="single_line" type="checkbox" />
3127+ <small data-i18n="Generate only one line per request">
3128+ Generate only one line per request
3129+ </small>
3130+ </label>
3131+ <label class="checkbox_label" for="collapse-newlines-checkbox">
3132+ <input id="collapse-newlines-checkbox" type="checkbox" />
3133+ <small data-i18n="Collapse Consecutive Newlines">
3134+ Collapse Consecutive Newlines
3135+ </small>
3136+ </label>
3137+ <label data-newbie-hidden class="checkbox_label" for="trim_spaces">
3138+ <input id="trim_spaces" type="checkbox" />
3139+ <small data-i18n="Trim spaces">Trim spaces</small>
3140+ </label>
3141+ <label class="checkbox_label" for="trim_sentences_checkbox">
3142+ <input id="trim_sentences_checkbox" type="checkbox" />
3143+ <small data-i18n="Trim Incomplete Sentences">
3144+ Trim Incomplete Sentences
3145+ </small>
3146+ </label>
3147+ <!-- Add margin since this is a child of above -->
3148+ <label data-newbie-hidden class="checkbox_label indent20p" for="include_newline_checkbox">
3149+ <input id="include_newline_checkbox" type="checkbox" />
3150+ <small data-i18n="Include Newline">Include Newline</small>
3151+ </label>
31093152 <label class="checkbox_label" title="Add Chat Start and Example Separator to a list of stopping strings." data-i18n="[title]Add Chat Start and Example Separator to a list of stopping strings.">
31103153 <input id="context_use_stop_strings" type="checkbox" />
31113154 <small data-i18n="Separators as Stop Strings">Separators as Stop Strings</small>
@@ -3114,201 +3157,238 @@
31143157 <input id="context_names_as_stop_strings" type="checkbox" />
31153158 <small data-i18n="Names as Stop Strings">Names as Stop Strings</small>
31163159 </label>
3160+ </div>
3161+
31173162 <label class="checkbox_label" title="Includes Post-History Instructions at the end of the prompt, if defined in the character card AND ''Prefer Char. Instructions'' is enabled.&#10;THIS IS NOT RECOMMENDED FOR TEXT COMPLETION MODELS, CAN LEAD TO BAD OUTPUT." data-i18n="[title]context_allow_post_history_instructions">
31183163 <input id="context_allow_jailbreak" type="checkbox" />
31193164 <small data-i18n="Allow Post-History Instructions">Allow Post-History Instructions</small>
31203165 </label>
31213166 </div>
3122-
3167+ <div>
3123- <div data-newbie-hidden class="inline-drawer wide100p flexFlowColumn margin-bot-10px" style="display:none;">
3168+ <h4 class="range-block-title justifyLeft standoutHeader">
3124- <div class="inline-drawer-toggle inline-drawer-header">
3169+ <span data-i18n="Custom Stopping Strings">
3125- <b><span data-i18n="Context Order">Context Order</span></b>
3170+ Custom Stopping Strings
3126- <div class="fa-solid fa-circle-chevron-down inline-drawer-icon down"></div>
3171+ </span>
3127- </div>
3172+ <a href="https://docs.sillytavern.app/usage/core-concepts/advancedformatting/#custom-stopping-strings" class="notes-link" target="_blank">
3128- <div class="inline-drawer-content">
3173+ <span class="fa-solid fa-circle-question note-link-span"></span>
3129- <div id="context_order" class="prompt_order">
3174+ </a>
3130- <div data-id="0">
3175+ </h4>
3131- <span data-i18n="Story String">Story String</span>
3176+ <div>
3132- <small>0</small>
3177+ <small>
3133- </div>
3178+ <span data-i18n="JSON serialized array of strings">JSON serialized array of strings</span>
3134- <div data-id="1">
3179+ <i class="fa-solid fa-question-circle opacity50p" title="e.g: [&quot;Ford&quot;, &quot;BMW&quot;, &quot;Fiat&quot;]"></i>
3135- <span data-i18n="Summary">Summary</span>
3180+ </small>
3136- <small>1</small>
3137- </div>
3138- <div data-id="2">
3139- <span data-i18n="Author's Note">Author's Note</span>
3140- <small>2</small>
3141- </div>
3142- <div data-id="3">
3143- <span data-i18n="Example Dialogues">Example Dialogues</span>
3144- <small>3</small>
3145- </div>
3146- <div data-id="4">
3147- <span data-i18n="Chat Start">Chat History</span>
3148- <small>4</small>
31493181 </div>
3182+ <div>
3183+ <div contenteditable="true" id="custom_stopping_strings" class="text_pole textarea_compact monospace"></div>
31503184 </div>
3151- <small>
3185+ <label class="checkbox_label" for="custom_stopping_strings_macro">
3152- <b data-i18n="Hint">Hint:</b>
3186+ <input id="custom_stopping_strings_macro" type="checkbox" checked>
31533187 <spansmall data-i18n="In-ChatReplace PositionMacro notin affectedCustom Stopping Strings">
3154- Summary and Author's Note orders are only affected when they don't have an In-Chat position set.
3188+ Replace Macro in Custom Stopping Strings
3155- </span>
31563189 </small>
3190+ </label>
31573191 </div>
31583192 </div>
31593193 </div>
3160- <div>
3194+ <div id="InstructSettingsColumn" class="flex-container flexNoGap flexFlowColumn flex1">
31613195 <h4div classid="standoutHeader title_restorableinstructSettingsBlock">
3162- <div>
3196+ <h4 class="standoutHeader title_restorable justifySpaceBetween">
3197+ <div class="flex-container">
31633198 <span data-i18n="Instruct Mode">Instruct Mode</span>
31643199 <a href="https://docs.sillytavern.app/usage/core-concepts/instructmode/" class="notes-link" target="_blank">
31653200 <span class="fa-solid fa-circle-question note-link-span"></span>
31663201 </a>
31673202 </div>
31683203 <div class="flex-container">
3169- <i data-newbie-hidden data-preset-manager-import="instruct" class="margin0 menu_button fa-solid fa-file-import" title="Import preset" data-i18n="[title]Import preset"></i>
3170- <i data-newbie-hidden data-preset-manager-export="instruct" class="margin0 menu_button fa-solid fa-file-export" title="Export preset" data-i18n="[title]Export preset"></i>
3171- <i data-newbie-hidden data-preset-manager-restore="instruct" class="margin0 menu_button fa-solid fa-recycle" title="Restore current preset" data-i18n="[title]Restore current preset"></i>
3172- <i data-newbie-hidden data-preset-manager-delete="instruct" class="margin0 menu_button fa-solid fa-trash-can" title="Delete the preset" data-i18n="[title]Delete the preset"></i>
3173- </div>
3174- </h4>
3175- <div class="flex-container">
31763204 <label for="instruct_enabled" class="checkbox_label flex1">
31773205 <input id="instruct_enabled" type="checkbox" style="display:none;" />
3178- <span data-i18n="Enabled">Enabled</span>
3206+ <small><i class="fa-solid fa-power-off menu_button margin0"></i></small>
31793207 </label>
31803208 <label for="instruct_bind_to_context" class="checkbox_label flex1" title="If enabled, Context templates will be automatically selected based on selected Instruct template name or by preference." data-i18n="[title]instruct_bind_to_context">
31813209 <input id="instruct_bind_to_context" type="checkbox" style="display:none;" />
3182- <span data-i18n="Bind to Context">Bind to Context</span>
3210+ <small><i class="fa-solid fa-link menu_button margin0" title="If enabled, Context templates will be automatically selected based on selected Instruct template name or by preference."></i></small>
31833211 </label>
31843212 </div>
3185- <label for="instruct_presets">
3213+ </h4>
3186- <span data-i18n="Presets">Presets</span>
3214+ <div class="flex-container margin0 justifyCenter">
3187- </label>
3188- <div class="flex-container">
3189- <select id="instruct_presets" data-preset-manager-for="instruct" class="flex1 text_pole"></select>
31903215 <input type="file" hidden data-preset-manager-file="instruct" accept=".json, .settings">
31913216 <i id="instruct_set_default" class="menu_button fa-solid fa-heart" title="Auto-select this preset on API connection." data-i18n="[title]Auto-select this preset on API connection"></i>
31923217 <i data-newbie-hidden data-preset-manager-update="instruct" class="menu_button fa-solid fa-save" title="Update current preset" data-i18n="[title]Update current preset"></i>
31933218 <i data-newbie-hidden data-preset-manager-new="instruct" class="menu_button fa-solid fa-file-circle-plus" title="Save preset as" data-i18n="[title]Save preset as"></i>
3219+ <i data-preset-manager-import="instruct" class=" menu_button fa-solid fa-file-import" title="Import preset" data-i18n="[title]Import preset"></i>
3220+ <i data-preset-manager-export="instruct" class=" menu_button fa-solid fa-file-export" title="Export preset" data-i18n="[title]Export preset"></i>
3221+ <i data-newbie-hidden data-preset-manager-restore="instruct" class=" menu_button fa-solid fa-recycle" title="Restore current preset" data-i18n="[title]Restore current preset"></i>
3222+ <i data-preset-manager-delete="instruct" class=" menu_button fa-solid fa-trash-can" title="Delete the preset" data-i18n="[title]Delete the preset"></i>
3223+ </div>
3224+
3225+ <div class="flex-container">
3226+ <select id="instruct_presets" data-preset-manager-for="instruct" class="flex1 text_pole"></select>
31943227 </div>
31953228 <label data-newbie-hidden>
31963229 <small data-i18n="Activation Regex">
3197- Activation Regex
3230+ Activation Regex <span class="fa-solid fa-circle-question" title="When connecting to an API or choosing a model, automatically activate this Instruct Mode template if the model name matches the provided regular expression."></span>
31983231 </small>
31993232 </label>
32003233 <div data-newbie-hidden>
32013234 <textareainput type="text" id="instruct_activation_regex" class="text_pole textarea_compact autoSetHeight" maxlengthplaceholder="5000"e.g. rows="/llama(-)?[3|3.1]/i"></textareainput>
3235+ </div>
3236+ <div data-newbie-hidden>
3237+ <label>
3238+ <small data-i18n="System Prompt">System Prompt</small>
3239+ </label>
3240+ <div contenteditable="true" id="instruct_system_prompt" class="text_pole textarea_compact"></div>
32023241 </div>
3242+
32033243 <div data-newbie-hidden>
32043244 <label for="instruct_wrap" class="checkbox_label">
32053245 <input id="instruct_wrap" type="checkbox" />
32063246 <spansmall data-i18n="Wrap Sequences with Newline">Wrap Sequences with Newline</spansmall>
32073247 </label>
32083248 <label for="instruct_macro" class="checkbox_label">
32093249 <input id="instruct_macro" type="checkbox" />
32103250 <spansmall data-i18n="Replace Macro in Sequences">Replace Macro in Sequences</spansmall>
32113251 </label>
32123252 <label for="instruct_skip_examples" class="checkbox_label">
32133253 <input id="instruct_skip_examples" type="checkbox" />
32143254 <spansmall data-i18n="Skip Example Dialogues Formatting">Skip Example Dialogues Formatting</spansmall>
32153255 </label>
32163256 <label for="instruct_names" class="checkbox_label">
32173257 <input id="instruct_names" type="checkbox" />
32183258 <spansmall data-i18n="Include Names">Include Names</spansmall>
32193259 </label>
32203260 <label for="instruct_names_force_groups" class="checkbox_label indent20p">
32213261 <input id="instruct_names_force_groups" type="checkbox" />
32223262 <spansmall data-i18n="Force for Groups and Personas">Force for Groups and Personas</spansmall>
32233263 </label>
32243264 </div>
3225- <div data-newbie-hidden>
3226- <label>
3227- <small data-i18n="System Prompt">System Prompt</small>
3228- </label>
3229- <textarea id="instruct_system_prompt" class="text_pole textarea_compact autoSetHeight" rows="1"></textarea>
32303265 </div>
3231- <div data-newbie-hidden class="inline-drawer wide100p flexFlowColumn">
3266+ <div name="tokenizerSettingsBlock">
3232- <div class="inline-drawer-toggle inline-drawer-header">
3267+ <div data-newbie-hidden name="tokenizerSelectorBlock">
32333268 <bh4 class="standoutHeader"><span data-i18n="Instruct Mode SequencesTokenizer">Instruct Mode SequencesTokenizer</span></b>
3234- <div class="fa-solid fa-circle-chevron-down inline-drawer-icon down"></div>
3269+ <a href="https://docs.sillytavern.app/usage/core-concepts/advancedformatting/#tokenizer" class="notes-link" target="_blank">
3270+ <span class="fa-solid fa-circle-question note-link-span"></span>
3271+ </a>
3272+ </h4>
3273+ <select id="tokenizer">
3274+ <option value="99">Best match (recommended)</option>
3275+ <option value="0">None / Estimated</option>
3276+ <option value="1">GPT-2</option>
3277+ <!-- Option #2 was a legacy GPT-2/3 tokenizer -->
3278+ <option value="3">Llama 1/2</option>
3279+ <option value="12">Llama 3</option>
3280+ <option value="13">Gemma / Gemini</option>
3281+ <option value="14">Jamba</option>
3282+ <option value="4">NerdStash (NovelAI Clio)</option>
3283+ <option value="5">NerdStash v2 (NovelAI Kayra)</option>
3284+ <option value="7">Mistral</option>
3285+ <option value="8">Yi</option>
3286+ <option value="11">Claude 1/2</option>
3287+ <option value="6">API (WebUI / koboldcpp)</option>
3288+ </select>
32353289 </div>
3236- <div class="inline-drawer-content">
3290+ <div class="range-block flex-container flexnowrap" data-newbie-hidden name="tokenPaddingBlock">
3237- <h5 class="textAlignCenter" data-i18n="System Prompt Wrapping">
3291+ <div class="range-block-title justifyLeft">
3238- System Prompt Wrapping
3292+ <small data-i18n="Token Padding" class="flex-container">Token Padding
3239- </h5>
3293+ <a href="https://docs.sillytavern.app/usage/core-concepts/advancedformatting/#token-padding" class="notes-link" target="_blank">
3240- <div class="flex-container">
3294+ <span class="fa-solid fa-circle-question note-link-span"></span>
3241- <div class="flex1" title="Inserted before a System prompt." data-i18n="[title]Inserted before a System prompt.">
3295+ </a>
3242- <label for="instruct_system_sequence_prefix">
3296+ </small>
3243- <small data-i18n="System Prompt Prefix">System Prompt Prefix</small>
3297+ </div>
3244- </label>
3298+ <input id="token_padding" class="text_pole textarea_compact" type="number" min="-2048" max="2048" />
3299+ </div>
3300+ </div>
3301+ <div>
3302+ <h4 class="standoutHeader" data-i18n="Miscellaneous">Miscellaneous</h4>
3303+ <div>
3304+ <small>
3305+ <span data-i18n="Non-markdown strings">
3306+ Non-markdown strings
3307+ </span>
3308+ </small>
32453309 <div>
32463310 <textareainput id="instruct_system_sequence_prefixmarkdown_escape_strings" class="text_pole textarea_compact autoSetHeight" maxlengthtype="2000text" placeholderdata-i18n="&mdash;[placeholder]comma delimited,no spaces between" rowsplaceholder="1comma delimited,no spaces between">< /textarea>
32473311 </div>
32483312 </div>
3249- <div class="flex1" title="Inserted after a System prompt." data-i18n="[title]Inserted after a System prompt.">
3313+
3250- <label for="instruct_system_sequence_suffix">
3314+ <div data-newbie-hidden name="startReplyWithBlock">
3251- <small data-i18n="System Prompt Suffix">System Prompt Suffix</small>
3315+ <div>
3252- </label>
3316+ <small>
3317+ <span data-i18n="Start Reply With">
3318+ Start Reply With
3319+ </span>
3320+ </small>
32533321 <div>
3254- <textarea id="instruct_system_sequence_suffix" class="text_pole wide100p textarea_compact autoSetHeight" maxlength="2000" placeholder="&mdash;" rows="1"></textarea>
3322+ <div contenteditable="true" id="start_reply_with" class="text_pole textarea_compact"></div>
32553323 </div>
3324+ <label class="checkbox_label" for="chat-show-reply-prefix-checkbox">
3325+ <input id="chat-show-reply-prefix-checkbox" type="checkbox" />
3326+ <small data-i18n="Show reply prefix in chat">
3327+ Show reply prefix in chat
3328+ </small>
3329+ </label>
32563330 </div>
32573331 </div>
3258- <h5 class="textAlignCenter" data-i18n="Chat Messages Wrapping">
3332+ </div>
3259- Chat Messages Wrapping
3333+ </div>
3260- </h5>
3334+ <div id="InstructSequencesColumn" class="flex-container flexNoGap flexFlowColumn flex1">
3335+ <div data-newbie-hidden class="wide100p flexFlowColumn">
3336+ <h4 class="standoutHeader title_restorable">
3337+ <b>
3338+ <span data-i18n="Instruct Sequences">
3339+ Instruct Sequences
3340+ </span>
3341+ <small data-i18n="(Saves to Template)">
3342+ (Saves to Template)
3343+ </small>
3344+ </b>
3345+ </h4>
32613346 <div class="flex-container">
32623347 <div class="flex1flexAuto" title="Inserted before a User message and as a lastSystem prompt line when impersonating." data-i18n="[title]Inserted before a User message and as a lastSystem prompt line when impersonating.">
32633348 <label for="instruct_input_sequenceinstruct_system_sequence_prefix">
32643349 <small data-i18n="UserSystem MessagePrompt Prefix">UserSystem MessagePrompt Prefix</small>
32653350 </label>
32663351 <div>
32673352 <textarea id="instruct_input_sequence"div classcontenteditable="text_pole textarea_compact autoSetHeighttrue" maxlengthid="2000instruct_system_sequence_prefix" placeholderclass="&mdash;"text_pole rows="1textarea_compact"></textareadiv>
32683353 </div>
32693354 </div>
32703355 <div class="flex1flexAuto" title="Inserted after a UserSystem messageprompt." data-i18n="[title]Inserted after a UserSystem messageprompt.">
32713356 <label for="instruct_input_suffixinstruct_system_sequence_suffix">
32723357 <small data-i18n="UserSystem MessagePrompt Suffix">UserSystem MessagePrompt Suffix</small>
32733358 </label>
32743359 <div>
32753360 <textareadiv contenteditable="true" id="instruct_input_suffixinstruct_system_sequence_suffix" class="text_pole wide100p textarea_compact autoSetHeight" maxlength="2000" placeholder="&mdash;" rows="1"></textareadiv>
32763361 </div>
32773362 </div>
32783363 </div>
32793364 <div class="flex-container">
32803365 <div class="flex1flexAuto" title="Inserted before ana AssistantUser message and as a last prompt line when generating an AI replyimpersonating." data-i18n="[title]Inserted before ana AssistantUser message and as a last prompt line when generating an AI replyimpersonating.">
3281- <label for="instruct_output_sequence">
3366+ <small data-i18n="User Prefix">User Message Prefix</small>
3282- <small data-i18n="Assistant Message Prefix">Assistant Message Prefix</small>
3367+ <div contenteditable="true" id="instruct_input_sequence" class="text_pole textarea_compact"></div>
3283- </label>
3284- <div>
3285- <textarea id="instruct_output_sequence" class="text_pole wide100p textarea_compact autoSetHeight" maxlength="2000" placeholder="&mdash;" rows="1"></textarea>
32863368 </div>
3369+ <div class="flexAuto" title="Inserted after a User message." data-i18n="[title]Inserted after a User message.">
3370+ <small data-i18n="User Suffix">User Message Suffix</small>
3371+ <div contenteditable="true" id="instruct_input_suffix" class="text_pole wide100p textarea_compact"></div>
32873372 </div>
3288- <div class="flex1" title="Inserted after an Assistant message." data-i18n="[title]Inserted after an Assistant message.">
3289- <label for="instruct_output_suffix">
3290- <small data-i18n="Assistant Message Suffix">Assistant Message Suffix</small>
3291- </label>
3292- <div>
3293- <textarea id="instruct_output_suffix" class="text_pole wide100p textarea_compact autoSetHeight" maxlength="2000" placeholder="&mdash;" rows="1"></textarea>
32943373 </div>
3374+ <div class="flex-container">
3375+ <div class="flexAuto" title="Inserted before an Assistant message and as a last prompt line when generating an AI reply." data-i18n="[title]Inserted before an Assistant message and as a last prompt line when generating an AI reply.">
3376+ <small data-i18n="Assistant Prefix">Assistant Message Prefix</small>
3377+ <div contenteditable="true" id="instruct_output_sequence" class="text_pole wide100p textarea_compact"></div>
32953378 </div>
3379+ <div class="flexAuto" title="Inserted after an Assistant message." data-i18n="[title]Inserted after an Assistant message.">
3380+ <small data-i18n="Assistant Suffix">Assistant Message Suffix</small>
3381+ <div contenteditable="true" id="instruct_output_suffix" class="text_pole wide100p textarea_compact"></div>
32963382 </div>
3297- <div class="flex-container">
3298- <div class="flex1" title="Inserted before a System (added by slash commands or extensions) message." data-i18n="[title]Inserted before a System (added by slash commands or extensions) message.">
3299- <label for="instruct_system_sequence">
3300- <small data-i18n="System Message Prefix">System Message Prefix</small>
3301- </label>
3302- <div>
3303- <textarea id="instruct_system_sequence" class="text_pole textarea_compact autoSetHeight" maxlength="2000" placeholder="&mdash;" rows="1"></textarea>
33043383 </div>
3384+ <div class="flex-container">
3385+ <div class="flexAuto" id="instruct_system_sequence_block" title="Inserted before a System (added by slash commands or extensions) message." data-i18n="[title]Inserted before a System (added by slash commands or extensions) message.">
3386+ <small data-i18n="System Prefix">System Message Prefix</small>
3387+ <div contenteditable="true" id="instruct_system_sequence" class="text_pole textarea_compact"></div>
33053388 </div>
33063389 <div class="flex1flexAuto" id="instruct_system_suffix_block" title="Inserted after a System message." data-i18n="[title]Inserted after a System message.">
3307- <label for="instruct_system_suffix">
3390+ <small data-i18n="System Suffix">System Message Suffix</small>
3308- <small data-i18n="System Message Suffix">System Message Suffix</small>
3391+ <div contenteditable="true" id="instruct_system_suffix" class="text_pole wide100p textarea_compact"></div>
3309- </label>
3310- <div>
3311- <textarea id="instruct_system_suffix" class="text_pole wide100p textarea_compact autoSetHeight" maxlength="2000" placeholder="&mdash;" rows="1"></textarea>
33123392 </div>
33133393 </div>
33143394 <div class="flexBasis100p" title="If enabled, System Sequences will be the same as User Sequences." data-i18n="[title]If enabled, System Sequences will be the same as User Sequences.">
@@ -3317,238 +3397,50 @@
33173397 <small data-i18n="System same as User">System same as User</small>
33183398 </label>
33193399 </div>
3320- </div>
3400+
33213401 <h5 class="textAlignCenter" data-i18n="Misc. Sequences">
33223402 Misc. Sequences
33233403 </h5>
33243404 <div class="flex-container">
33253405 <div class="flex1flexAuto" title="Inserted before the first Assistant's message." data-i18n="[title]Inserted before the first Assistant's message.">
3326- <label for="instruct_first_output_sequence">
33273406 <small data-i18n="First Assistant Prefix">First Assistant Prefix</small>
3328- </label>
3407+ <div contenteditable="true" id="instruct_first_output_sequence" class="text_pole textarea_compact"></div>
3329- <div>
3330- <textarea id="instruct_first_output_sequence" class="text_pole textarea_compact autoSetHeight" maxlength="2000" placeholder="&mdash;" rows="1"></textarea>
3331- </div>
33323408 </div>
33333409 <div class="flex1flexAuto" title="Inserted before the last Assistant's message or as a last prompt line when generating an AI reply (except a neutral/system role)." data-i18n="[title]instruct_last_output_sequence">
3334- <label for="instruct_last_output_sequence">
33353410 <small data-i18n="Last Assistant Prefix">Last Assistant Prefix</small>
3336- </label>
3411+ <div contenteditable="true" id="instruct_last_output_sequence" class="text_pole wide100p textarea_compact"></div>
3337- <div>
3338- <textarea id="instruct_last_output_sequence" class="text_pole wide100p textarea_compact autoSetHeight" maxlength="2000" placeholder="&mdash;" rows="1"></textarea>
3339- </div>
33403412 </div>
33413413 </div>
33423414 <div class="flex-container">
33433415 <div class="flex1flexAuto" title="Inserted before the first User's message." data-i18n="[title]Inserted before the first User's message.">
3344- <label for="instruct_first_input_sequence">
33453416 <small data-i18n="First User Prefix">First User Prefix</small>
3346- </label>
3417+ <div contenteditable="true" id="instruct_first_input_sequence" class="text_pole textarea_compact"></div>
3347- <div>
3348- <textarea id="instruct_first_input_sequence" class="text_pole textarea_compact autoSetHeight" maxlength="2000" placeholder="&mdash;" rows="1"></textarea>
3349- </div>
33503418 </div>
33513419 <div class="flex1flexAuto" title="Inserted before the last User's message." data-i18n="[title]instruct_last_input_sequence">
3352- <label for="instruct_last_input_sequence">
33533420 <small data-i18n="Last User Prefix">Last User Prefix</small>
3354- </label>
3421+ <div contenteditable="true" id="instruct_last_input_sequence" class="text_pole wide100p textarea_compact"></div>
3355- <div>
3356- <textarea id="instruct_last_input_sequence" class="text_pole wide100p textarea_compact autoSetHeight" maxlength="2000" placeholder="&mdash;" rows="1"></textarea>
3357- </div>
33583422 </div>
33593423 </div>
33603424 <div class="flex-container">
33613425 <div class="flex1flexAuto" title="Will be inserted as a last prompt line when using system/neutral generation." data-i18n="[title]Will be inserted as a last prompt line when using system/neutral generation.">
3362- <label for="instruct_last_system_sequence">
33633426 <small data-i18n="System Instruction Prefix">System Instruction Prefix</small>
3364- </label>
3427+ <div contenteditable="true" id="instruct_last_system_sequence" class="text_pole textarea_compact"></div>
3365- <div>
3366- <textarea id="instruct_last_system_sequence" class="text_pole textarea_compact autoSetHeight" maxlength="2000" placeholder="&mdash;" rows="1"></textarea>
3367- </div>
33683428 </div>
33693429 <div class="flex1flexAuto" title="If a stop sequence is generated, everything past it will be removed from the output (inclusive)." data-i18n="[title]If a stop sequence is generated, everything past it will be removed from the output (inclusive).">
3370- <label for="instruct_stop_sequence">
33713430 <small data-i18n="Stop Sequence">Stop Sequence</small>
3372- </label>
3431+ <div contenteditable="true" id="instruct_stop_sequence" class="text_pole textarea_compact"></div>
3373- <div>
3374- <textarea id="instruct_stop_sequence" class="text_pole textarea_compact autoSetHeight" maxlength="2000" placeholder="&mdash;" rows="1"></textarea>
3375- </div>
33763432 </div>
33773433 </div>
33783434 <div class="flex-container">
33793435 <div class="flex1flexAuto" title="Will be inserted at the start of the chat history if it doesn't start with a User message." data-i18n="[title]Will be inserted at the start of the chat history if it doesn't start with a User message.">
3380- <label for="instruct_user_alignment_message">
33813436 <small data-i18n="User Filler Message">User Filler Message</small>
3382- </label>
3437+ <div contenteditable="true" id="instruct_user_alignment_message" class="text_pole textarea_compact"></div>
3383- <div>
3384- <textarea id="instruct_user_alignment_message" class="text_pole textarea_compact autoSetHeight" maxlength="2000" placeholder="&mdash;" rows="1"></textarea>
3385- </div>
33863438 </div>
33873439 </div>
33883440 </div>
33893441 </div>
33903442 </div>
33913443 </div>
3392- <div id="ContextFormatting">
3393- <div>
3394- <div class="flex-container alignItemsBaseline">
3395- <h4 data-i18n="Context Formatting">
3396- Context Formatting
3397- </h4>
3398- <small data-i18n="(Saved to Context Template)">
3399- &nbsp;(Saved to Context Template)
3400- </small>
3401- </div>
3402- <label class="checkbox_label" for="always-force-name2-checkbox">
3403- <input id="always-force-name2-checkbox" type="checkbox" />
3404- <span data-i18n="Always add character's name to prompt">
3405- Always add character's name to prompt
3406- </span>
3407- </label>
3408- <label class="checkbox_label" for="single_line">
3409- <input id="single_line" type="checkbox" />
3410- <span data-i18n="Generate only one line per request">
3411- Generate only one line per request
3412- </span>
3413- </label>
3414- <label class="checkbox_label" for="trim_sentences_checkbox">
3415- <input id="trim_sentences_checkbox" type="checkbox" />
3416- <span data-i18n="Trim Incomplete Sentences">
3417- Trim Incomplete Sentences
3418- </span>
3419- </label>
3420- <!-- Add margin since this is a child of above -->
3421- <label data-newbie-hidden class="checkbox_label indent20p" for="include_newline_checkbox">
3422- <input id="include_newline_checkbox" type="checkbox" />
3423- <span data-i18n="Include Newline">Include Newline</span>
3424- </label>
3425- </div>
3426- <h4 data-i18n="Misc. Settings">
3427- Misc. Settings
3428- </h4>
3429- <label class="checkbox_label" for="collapse-newlines-checkbox">
3430- <input id="collapse-newlines-checkbox" type="checkbox" />
3431- <span data-i18n="Collapse Consecutive Newlines">
3432- Collapse Consecutive Newlines
3433- </span>
3434- </label>
3435- <label data-newbie-hidden class="checkbox_label" for="trim_spaces">
3436- <input id="trim_spaces" type="checkbox" />
3437- <span data-i18n="Trim spaces">Trim spaces</span>
3438- </label>
3439- <div data-newbie-hidden>
3440- <h4><span data-i18n="Tokenizer">Tokenizer</span>
3441- <a href="https://docs.sillytavern.app/usage/core-concepts/advancedformatting/#tokenizer" class="notes-link" target="_blank">
3442- <span class="fa-solid fa-circle-question note-link-span"></span>
3443- </a>
3444- </h4>
3445- <select id="tokenizer">
3446- <option value="99">Best match (recommended)</option>
3447- <option value="0">None / Estimated</option>
3448- <option value="1">GPT-2</option>
3449- <!-- Option #2 was a legacy GPT-2/3 tokenizer -->
3450- <option value="3">Llama 1/2</option>
3451- <option value="12">Llama 3</option>
3452- <option value="13">Gemma / Gemini</option>
3453- <option value="14">Jamba</option>
3454- <option value="4">NerdStash (NovelAI Clio)</option>
3455- <option value="5">NerdStash v2 (NovelAI Kayra)</option>
3456- <option value="7">Mistral</option>
3457- <option value="8">Yi</option>
3458- <option value="11">Claude 1/2</option>
3459- <option value="6">API (WebUI / koboldcpp)</option>
3460- </select>
3461- </div>
3462- <div class="range-block" data-newbie-hidden>
3463- <div class="range-block-title justifyLeft">
3464- <span data-i18n="Token Padding">Token Padding</span>
3465- <a href="https://docs.sillytavern.app/usage/core-concepts/advancedformatting/#token-padding" class="notes-link" target="_blank">
3466- <span class="fa-solid fa-circle-question note-link-span"></span>
3467- </a>
3468- </div>
3469- <input id="token_padding" class="text_pole textarea_compact" type="number" min="-2048" max="2048" />
3470- </div>
3471- <div class="flex-container flexFlowColumn" data-newbie-hidden>
3472- <div>
3473- <h4 class="range-block-title justifyLeft">
3474- <span data-i18n="Start Reply With">
3475- Start Reply With
3476- </span>
3477- </h4>
3478- <div>
3479- <textarea id="start_reply_with" rows="2" class="text_pole textarea_compact" data-i18n="[placeholder]AI reply prefix" placeholder="AI reply prefix"></textarea>
3480- </div>
3481- <label class="checkbox_label" for="chat-show-reply-prefix-checkbox">
3482- <input id="chat-show-reply-prefix-checkbox" type="checkbox" />
3483- <span data-i18n="Show reply prefix in chat">
3484- Show reply prefix in chat
3485- </span>
3486- </label>
3487- </div>
3488- <div>
3489- <h4 class="range-block-title justifyLeft">
3490- <span data-i18n="Non-markdown strings">
3491- Non-markdown strings
3492- </span>
3493- </h4>
3494- <div>
3495- <input id="markdown_escape_strings" class="text_pole textarea_compact" type="text" data-i18n="[placeholder]separate with commas w/o space between" placeholder="separate with commas w/o space between" maxlength="100" />
3496- </div>
3497- </div>
3498- <div>
3499- <h4 class="range-block-title justifyLeft">
3500- <span data-i18n="Custom Stopping Strings">
3501- Custom Stopping Strings
3502- </span>
3503- <a href="https://docs.sillytavern.app/usage/core-concepts/advancedformatting/#custom-stopping-strings" class="notes-link" target="_blank">
3504- <span class="fa-solid fa-circle-question note-link-span"></span>
3505- </a>
3506- </h4>
3507- <div>
3508- <small>
3509- <span data-i18n="JSON serialized array of strings">JSON serialized array of strings</span>
3510- </small>
3511- </div>
3512- <div>
3513- <textarea id="custom_stopping_strings" rows="2" class="text_pole textarea_compact monospace" placeholder="[&quot;Ford&quot;, &quot;BMW&quot;, &quot;Fiat&quot;]"></textarea>
3514- </div>
3515- <label class="checkbox_label" for="custom_stopping_strings_macro">
3516- <input id="custom_stopping_strings_macro" type="checkbox" checked>
3517- <span data-i18n="Replace Macro in Custom Stopping Strings">
3518- Replace Macro in Custom Stopping Strings
3519- </span>
3520- </label>
3521- </div>
3522- </div>
3523- <div data-newbie-hidden>
3524- <h4>
3525- <span data-i18n="Auto-Continue">Auto-Continue</span>
3526- </h4>
3527- <div class="flex-container">
3528- <label class="checkbox_label" for="auto_continue_enabled">
3529- <input id="auto_continue_enabled" type="checkbox" />
3530- <span data-i18n="Enabled">
3531- Enabled
3532- </span>
3533- </label>
3534- <label class="checkbox_label" for="auto_continue_allow_chat_completions">
3535- <input id="auto_continue_allow_chat_completions" type="checkbox" />
3536- <span data-i18n="Allow for Chat Completion APIs">
3537- Allow for Chat Completion APIs
3538- </span>
3539- </label>
3540- </div>
3541-
3542- <div class="auto_continue_settings_block">
3543- <label for="auto_continue_target_length">
3544- <span data-i18n="Target length (tokens)">Target length (tokens)</span>
3545- <input id="auto_continue_target_length" type="number" class="text_pole textarea_compact" min="0" max="1024" />
3546- </label>
3547- </div>
3548- </div>
3549- </div>
3550- </div>
3551- </div>
35523444 </div>
35533445 <div id="WI-SP-button" class="drawer">
35543446 <div class="drawer-toggle drawer-header">
@@ -3556,12 +3448,14 @@
35563448 </div>
35573449 <div id="WorldInfo" class="drawer-content closedDrawer">
35583450 <div id="WorldInfoheader" class="fa-solid fa-grip drag-grabber"></div>
3559- <div id="WI_panel_pin_div" class="flex-container alignitemscenter gap10px" title="Locked = World Editor will stay open" data-i18n="[title]Locked = World Editor will stay open">
3451+ <div class="flex-container alignitemscenter gap10px">
3452+ <div id="WI_panel_pin_div" title="Locked = World Editor will stay open" data-i18n="[title]Locked = World Editor will stay open">
35603453 <input type="checkbox" id="WI_panel_pin">
35613454 <label for="WI_panel_pin">
35623455 <div class="unchecked fa-solid fa-unlock "></div>
35633456 <div class="checked fa-solid fa-lock "></div>
35643457 </label>
3458+ </div>
35653459 <h3 class="margin0">
35663460 <span data-i18n="Worlds/Lorebooks">Worlds/Lorebooks</span>
35673461 <a href="https://docs.sillytavern.app/usage/core-concepts/worldinfo/" class="notes-link" target="_blank">
@@ -4290,15 +4184,49 @@
42904184 <input id="auto_swipe_minimum_length" name="auto_swipe_minimum_length" type="number" min="0" step="1" value="0" class="text_pole" title="If the generated message is shorter than this, trigger an auto-swipe." data-i18n="[title]If the generated message is shorter than this, trigger an auto-swipe">
42914185 <small data-i18n="Blacklisted words">Blacklisted words</small>
42924186 <div class="auto_swipe">
42934187 <textarea id="auto_swipe_blacklist" name="auto_swipe_blacklist" data-i18n="[placeholder]words you dont want generated separated by comma ','" placeholder="words you don't want generated separated by comma ','" class="text_pole textarea_compact" maxlength="5000" value="" autocomplete="off" rows="3"></textarea>
42944188 <small data-i18n="Blacklisted word count to swipe">Blacklisted word count to swipe</small>
42954189 <input id="auto_swipe_blacklist_threshold" name="auto_swipe_blacklist_threshold" type="number" min="0" step="1" value="1" class="text_pole" title="Minimum number of blacklisted words detected to trigger an auto-swipe." data-i18n="[title]Minimum number of blacklisted words detected to trigger an auto-swipe">
42964190 </div>
42974191 </div>
42984192 </div>
4193+ <div data-newbie-hidden nane="AutoContiueBlock" class="inline-drawer wide100p flexFlowColumn">
4194+ <div class="inline-drawer-toggle inline-drawer-header userSettingsInnerExpandable" title="Automatically 'continue' a response if the model stopped before reaching a certain amount of tokens.">
4195+ <b><span data-i18n="Auto-swipe">Auto-Continue</span></b>
4196+ <div class="fa-solid fa-circle-chevron-down inline-drawer-icon down"></div>
4197+ </div>
4198+ <div class="inline-drawer-content">
4199+ <div class="flex-container">
4200+ <label class="checkbox_label" for="auto_continue_enabled">
4201+ <input id="auto_continue_enabled" type="checkbox" />
4202+ <small data-i18n="Enabled">
4203+ Enabled
4204+ </small>
4205+ </label>
4206+ <label class="checkbox_label" for="auto_continue_allow_chat_completions">
4207+ <input id="auto_continue_allow_chat_completions" type="checkbox" />
4208+ <small data-i18n="Allow for Chat Completion APIs">
4209+ Allow for Chat Completion APIs
4210+ </small>
4211+ </label>
4212+ </div>
4213+ <div class="auto_continue_settings_block">
4214+ <label for="auto_continue_target_length">
4215+ <small data-i18n="Target length (tokens)">Target length (tokens)</small>
4216+ <input id="auto_continue_target_length" type="number" class="text_pole textarea_compact" min="0" max="1024" />
4217+ </label>
4218+ </div>
4219+ </div>
4220+
4221+
4222+ </div>
4223+ </div>
4224+ <div name="AutoCompleteToggle" class="inline-drawer wide100p flexFlowColumn">
4225+ <div class="inline-drawer-toggle inline-drawer-header userSettingsInnerExpandable" title="Options for the various autocompelte input boxes.">
4226+ <b><span data-i18n="AutoComplete Settings">AutoComplete Settings</span></b>
4227+ <div class="fa-solid fa-circle-chevron-down inline-drawer-icon down"></div>
42994228 </div>
43004229 <div nameclass="AutoCompleteToggleinline-drawer-content">
4301- <h4 data-i18n="AutoComplete Settings">AutoComplete Settings</h4>
43024230 <label data-newbie-hidden class="checkbox_label" for="stscript_autocomplete_autoHide">
43034231 <input id="stscript_autocomplete_autoHide" type="checkbox" />
43044232 <small data-i18n="Automatically hide details">
@@ -4363,6 +4291,7 @@
43634291 </div>
43644292 </div>
43654293 </div>
4294+ </div>
43664295 <div name="STscriptToggles">
43674296 <h4 data-i18n="STscript Settings">STscript Settings</h4>
43684297 <div title="Sets default flags for the STscript parser." data-i18n="[title]Sets default flags for the STscript parser.">
@@ -4491,8 +4420,8 @@
44914420 </div>
44924421 </div>
44934422 <div class="alignitemsflexstart flex-container wide100p">
44944423 <input id="extensions_url" type="text" class="flex1 heightFitContent text_pole widthNatural" maxlength="250" data-i18n="[placeholder]Extras API URL" placeholder="Extras API URL">
44954424 <input id="extensions_api_key" type="text" class="flex1 heightFitContent text_pole widthNatural" maxlength="250" data-i18n="[placeholder]Extras API key (optional)" placeholder="Extras API key (optional)">
44964425 <div class="extensions_url_block">
44974426 <div id="extensions_connect" class="menu_button" data-i18n="Connect">Connect</div>
44984427 </div>
@@ -4536,7 +4465,7 @@
45364465 <i class="fa-solid fa-person-circle-question fa-fw"></i>
45374466 <div data-i18n="Create">Create</div>
45384467 </div>
45394468 <input id="persona_search_bar" class="text_pole width100p flex1 margin0" type="search" data-i18n="[placeholder]Search..." placeholder="Search..." maxlength="100">
45404469 <select id="persona_sort_order" class="margin0">
45414470 <option value="search" data-i18n="Search" hidden>Search</option>
45424471 <option value="asc">A-Z</option>
@@ -4556,7 +4485,7 @@
45564485 <div class="flex1">
45574486 <h4 data-i18n="Name">Name</h4>
45584487 <div class="change_name">
45594488 <input id="your_name" name="your_name" data-i18n="[placeholder]Enter your name" placeholder="Enter your name" class="text_pole wide100p" maxlength="100" value="" autocomplete="off">
45604489 <div id="your_name_button" class="menu_button fa-solid fa-check" title="Click to set a new User Name" data-i18n="[title]Click to set a new User Name">
45614490 </div>
45624491 <div id="lock_user_name" class="menu_button fa-solid fa-unlock" title="Click to lock your selected persona to the current chat. Click again to remove the lock." data-i18n="[title]Click to lock your selected persona to the current chat. Click again to remove the lock.">
@@ -4566,7 +4495,7 @@
45664495 </div>
45674496 <div>
45684497 <h4 data-i18n="Persona Description">Persona Description</h4>
45694498 <textarea id="persona_description" name="persona_description" data-i18n="[placeholder]Example: [{{user}} is a 28-year-old Romanian cat girl.]" placeholder="Example:&#10;[{{user}} is a 28-year-old Romanian cat girl.]" class="text_pole textarea_compact" maxlength="50000" value="" autocomplete="off" rows="8"></textarea>
45704499 <div class="extension_token_counter">
45714500 <span data-i18n="Tokens persona description">Tokens</span>: <span id="persona_description_token_count">0</span>
45724501 </div>
@@ -4660,7 +4589,7 @@
46604589 <form id="form_create" action="javascript:void(null);" method="post" enctype="multipart/form-data">
46614590 <div id="avatar-and-name-block">
46624591 <div id="name_div">
46634592 <input id="character_name_pole" name="ch_name" class="text_pole" data-i18n="[placeholder]Name this character" placeholder="Name this character" maxlength="100" value="" autocomplete="off">
46644593 <div class="extension_token_counter">
46654594 <span data-i18n="extension_token_counter">Tokens:</span> <span data-token-counter="character_name_pole" data-token-permanent="true">counting...</span>
46664595 </div>
@@ -4731,7 +4660,7 @@
47314660 </div>
47324661 <div id="tags_div">
47334662 <div class="tag_controls">
47344663 <input id="tagInput" class="text_pole textarea_compact tag_input wide100p margin0" data-i18n="[placeholder]Search / Create Tags" placeholder="Search / Create tags" maxlength="50" />
47354664 <div class="tags_view menu_button fa-solid fa-tags" title="View all tags" data-i18n="[title]View all tags"></div>
47364665 </div>
47374666 <div id="tagList" class="tags"></div>
@@ -4816,12 +4745,12 @@
48164745 <div class="inline-drawer-content">
48174746 <div id="group-metadata-controls" class="marginTopBot5">
48184747 <div class="flex-container wide100p">
48194748 <input id="rm_group_chat_name" class="text_pole flex1" type="text" name="chat_name" data-i18n="[placeholder]Chat Name (Optional)" placeholder="Chat Name (Optional)" maxlength="200" />
48204749 <div class="chat_lorebook_button menu_button fa-solid fa-passport" title="Chat Lore" data-i18n="[title]Chat Lore"></div>
48214750 </div>
48224751 <div id="group_tags_div" class="wide100p">
48234752 <div class="tag_controls">
48244753 <input id="groupTagInput" class="text_pole textarea_compact tag_input flex1 margin0" data-i18n="[placeholder]Search / Create Tags" placeholder="Search / Create tags" maxlength="50" />
48254754 <div class="tags_view menu_button fa-solid fa-tags margin0" title="View all tags" data-i18n="[title]View all tags"></div>
48264755 </div>
48274756 <div id="groupTagList" class="tags paddingTopBot5"></div>
@@ -4863,7 +4792,7 @@
48634792 <div class="fa-solid fa-circle-info opacity50p" data-i18n="[title]When 'Join character cards' is selected, all respective fields of the characters are being joined together.This means that in the story string for example all character descriptions will be joined to one big text.If you want those fields to be separated, you can define a prefix or suffix here.This value supports normal macros and will also replace {{char}} with the relevant char's name and &lt;FIELDNAME&gt; with the name of the part (e.g.: description, personality, scenario, etc.)" title="When 'Join character cards' is selected, all respective fields of the characters are being joined together.&#13;This means that in the story string for example all character descriptions will be joined to one big text.&#13;If you want those fields to be separated, you can define a prefix or suffix here.&#13;&#13;This value supports normal macros and will also replace {{char}} with the relevant char's name and &lt;FIELDNAME&gt; with the name of the part (e.g.: description, personality, scenario, etc.)">
48644793 </div>
48654794 </label>
48664795 <textarea id="rm_group_generation_mode_join_prefix" class="text_pole wide100p textarea_compact autoSetHeight" maxlength="2000" placeholder="&mdash;" rows="1"></textarea>
48674796 </div>
48684797 <div class="flex1 flexGap5" title="Inserted after each part of the joined fields." data-i18n="[title]Inserted after each part of the joined fields.">
48694798 <label for="rm_group_generation_mode_join_suffix" class="flexnowrap width100p whitespacenowrap">
@@ -4871,7 +4800,7 @@
48714800 <div class="fa-solid fa-circle-info opacity50p" data-i18n="[title]When 'Join character cards' is selected, all respective fields of the characters are being joined together.This means that in the story string for example all character descriptions will be joined to one big text.If you want those fields to be separated, you can define a prefix or suffix here.This value supports normal macros and will also replace {{char}} with the relevant char's name and &lt;FIELDNAME&gt; with the name of the part (e.g.: description, personality, scenario, etc.)" title="When 'Join character cards' is selected, all respective fields of the characters are being joined together.&#13;This means that in the story string for example all character descriptions will be joined to one big text.&#13;If you want those fields to be separated, you can define a prefix or suffix here.&#13;&#13;This value supports normal macros and will also replace {{char}} with the relevant char's name and &lt;FIELDNAME&gt; with the name of the part (e.g.: description, personality, scenario, etc.)">
48724801 </div>
48734802 </label>
48744803 <textarea id="rm_group_generation_mode_join_suffix" class="text_pole wide100p textarea_compact autoSetHeight" maxlength="2000" placeholder="&mdash;" rows="1"></textarea>
48754804 </div>
48764805 </div>
48774806 <div id="GroupFavDelOkBack" class="flex-container flexGap5 spaceEvenly flex1">
@@ -4926,7 +4855,7 @@
49264855 <div class="inline-drawer-content">
49274856 <div name="Unadded Char List" class="flex-container flexFlowColumn overflowYAuto flex1">
49284857 <div id="rm_group_add_members_header">
49294858 <input id="rm_group_filter" class="text_pole margin0" type="search" data-i18n="[placeholder]Search..." placeholder="Search..." maxlength="200" />
49304859 </div>
49314860 <div class="rm_tag_controls">
49324861 <div class="tags rm_tag_filter"></div>
@@ -4940,7 +4869,7 @@
49404869 <div id="rm_character_import" class="right_menu" style="display: none;">
49414870 <form id="form_import" action="javascript:void(null);" method="post" enctype="multipart/form-data">
49424871 <input multiple type="file" id="character_import_file" accept=".json, image/png, .yaml, .yml, .charx" name="avatar">
49434872 <input id="character_import_file_type" name="file_type" class="text_pole" maxlength="999" size="2" value="" autocomplete="off">
49444873 </form>
49454874 <input type="file" id="character_replace_file" accept=".json, image/png, .yaml, .yml, .charx" name="replace_avatar" hidden>
49464875 </div>
@@ -4951,7 +4880,7 @@
49514880 <div id="character_import_button" title="Import Character from File" data-i18n="[title]Import Character from File" class="menu_button fa-solid fa-file-import faSmallFontSquareFix"></div>
49524881 <div id="external_import_button" title="Import content from external URL" data-i18n="[title]Import content from external URL" class="menu_button fa-solid fa-cloud-arrow-down faSmallFontSquareFix"></div>
49534882 <div id="rm_button_group_chats" title="Create New Chat Group" data-i18n="[title]Create New Chat Group" class="menu_button fa-solid fa-users-gear "></div>
49544883 <input id="character_search_bar" class="text_pole width100p" type="search" data-i18n="[placeholder]Search..." placeholder="Search..." maxlength="100" />
49554884 <select id="character_sort_order" title="Characters sorting order" data-i18n="[title]Characters sorting order">
49564885 <option data-field="search" data-order="desc" data-i18n="Search" hidden>Search</option>
49574886 <option data-field="name" data-order="asc" data-i18n="A-Z">A-Z</option>
@@ -4987,6 +4916,61 @@
49874916 </div>
49884917 </div>
49894918 <!-- various fullscreen popups -->
4919+ <div name="templatesAndPopupsWrapper"> <!--this div is just for IDE sanity for quick collapsing-->
4920+ <div id="export_format_popup" class="list-group">
4921+ <div class="export_format list-group-item" data-format="png">PNG</div>
4922+ <div class="export_format list-group-item" data-format="json">JSON</div>
4923+ </div>
4924+ <div id="zoomed_avatar_template" class="template_element">
4925+ <div class="zoomed_avatar">
4926+ <div class="panelControlBar flex-container">
4927+ <div class="fa-fw fa-solid fa-grip drag-grabber"></div>
4928+ <div class="fa-fw fa-solid fa-circle-xmark dragClose" id="closeZoom"></div>
4929+ </div>
4930+ <div class="zoomed_avatar_container">
4931+ <img class="zoomed_avatar_img" src="" data-izoomify-url="" data-izoomify-magnify="1.8" data-izoomify-duration="300" alt="">
4932+ </div>
4933+ </div>
4934+ </div>
4935+ <template id="generic_draggable_template">
4936+ <div class="draggable">
4937+ <div class="dragTitle"></div>
4938+ <div class="panelControlBar flex-container">
4939+ <div class="fa-fw fa-solid fa-grip drag-grabber"></div>
4940+ <div class="fa-fw fa-solid fa-circle-xmark dragClose"></div>
4941+ </div>
4942+ </div>
4943+ </template>
4944+ <div id="user_avatar_template" class="template_element">
4945+ <div class="avatar-container">
4946+ <div imgfile="" class="avatar">
4947+ <img src="" alt="User Avatar">
4948+ </div>
4949+ <div class="flex-container wide100pLess70px character_select_container">
4950+ <div class="wide100p character_name_block">
4951+ <span class="ch_name flex1"></span>
4952+ <div class="avatar-buttons">
4953+ <button class="menu_button bind_user_name" title="Bind user name to that avatar" data-i18n="[title]Bind user name to that avatar">
4954+ <i class="fa-fw fa-solid fa-user-edit"></i>
4955+ </button>
4956+ <button class="menu_button set_persona_image" title="Change persona image" data-i18n="[title]Change persona image">
4957+ <i class="fa-fw fa-solid fa-image"></i>
4958+ </button>
4959+ <button class="menu_button set_default_persona" title="Select this as default persona for the new chats." data-i18n="[title]Select this as default persona for the new chats.">
4960+ <i class="fa-fw fa-solid fa-crown"></i>
4961+ </button>
4962+ <button class="menu_button duplicate_persona" title="Duplicate persona" data-i18n="[title]Duplicate persona">
4963+ <i class="fa-fw fa-solid fa-clone"></i>
4964+ </button>
4965+ <button class="menu_button delete_avatar" title="Delete persona" data-i18n="[title]Delete persona">
4966+ <i class="fa-fw fa-solid fa-trash-alt"></i>
4967+ </button>
4968+ </div>
4969+ </div>
4970+ <div class="ch_description"></div>
4971+ </div>
4972+ </div>
4973+ </div>
49904974 <template id="popup_template" data-i18n="[popup-button-save]popup-button-save;[popup-button-yes]popup-button-yes;[popup-button-no]popup-button-no;[popup-button-cancel]popup-button-cancel;[popup-button-import]popup-button-import;[popup-button-crop]popup-button-crop" popup-button-save="Save" popup-button-yes="Yes" popup-button-no="No" popup-button-cancel="Cancel" popup-button-import="Import" popup-button-crop="Crop"> <!-- localization data holder for popups -->
49914975 <dialog class="popup">
49924976 <div class="popup-body">
@@ -4996,7 +4980,7 @@
49964980 <div class="popup-crop-wrap">
49974981 <img class="popup-crop-image" src="">
49984982 </div>
49994983 <textarea class="popup-input text_pole result-control auto-select" rows="1" data-result="1" data-result-event="submit"></textarea>
50004984 <div class="popup-inputs"></div>
50014985 <div class="popup-controls">
50024986 <div class="popup-button-ok menu_button result-control" data-result="1" data-i18n="Delete">Delete</div>
@@ -5039,14 +5023,14 @@
50395023 <small data-i18n="Insert {{original}} into either box to include the respective default prompt from system settings.">Insert {{original}} into either box to include the respective default prompt from system settings.</small>
50405024 <div>
50415025 <h4 data-i18n="Main Prompt">Main Prompt</h4>
50425026 <textarea id="system_prompt_textarea" name="system_prompt" data-i18n="[placeholder]Any contents here will replace the default Main Prompt used for this character. (v2 spec: system_prompt)" placeholder="Any contents here will replace the default Main Prompt used for this character.&#10;(v2 spec: system_prompt)" form="form_create" class="text_pole" autocomplete="off" rows="3" maxlength="50000"></textarea>
50435027 <div class="extension_token_counter">
50445028 <span data-i18n="extension_token_counter">Tokens:</span> <span data-token-counter="system_prompt_textarea">counting...</span>
50455029 </div>
50465030 </div>
50475031 <div>
50485032 <h4 data-i18n="Post-History Instructions">Post-History Instructions</h4>
50495033 <textarea id="post_history_instructions_textarea" name="post_history_instructions" data-i18n="[placeholder]Any contents here will replace the default Post-History Instructions used for this character. (v2 spec: post_history_instructions)" placeholder="Any contents here will replace the default Post-History Instructions used for this character.&#10;(v2 spec: post_history_instructions)" form="form_create" class="text_pole" autocomplete="off" rows="3" maxlength="50000"></textarea>
50505034 <div class="extension_token_counter">
50515035 <span data-i18n="extension_token_counter">Tokens:</span> <span data-token-counter="post_history_instructions_textarea">counting...</span>
50525036 </div>
@@ -5067,21 +5051,21 @@
50675051 <div class="flex-container flexnowrap">
50685052 <div class="flex1">
50695053 <h4 data-i18n="Created by">Created by</h4>
50705054 <textarea id="creator_textarea" name="creator" data-i18n="[placeholder](Botmaker's name / Contact Info)" placeholder="(Botmaker's name / Contact info)" form="form_create" class="text_pole" autocomplete="off" rows="2" maxlength="5000"></textarea>
50715055 </div>
50725056 <div class="flex1">
50735057 <h4 data-i18n="Character Version">Character Version</h4>
50745058 <textarea id="character_version_textarea" name="character_version" data-i18n="[placeholder](If you want to track character versions)" placeholder="(If you want to track character versions)" form="form_create" class="text_pole" autocomplete="off" rows="2" maxlength="500"></textarea>
50755059 </div>
50765060 </div>
50775061 <div class="flex-container flexnowrap">
50785062 <div class="flex1">
50795063 <h4 class="flex-box" data-i18n="Creator's Notes">Creator's Notes<i class="editor_maximize fa-solid fa-maximize" data-for="creator_notes_textarea" title="Expand the editor" data-i18n="[title]Expand the editor"></i></h4>
50805064 <textarea id="creator_notes_textarea" name="creator_notes" data-i18n="[placeholder](Describe the bot, give use tips, or list the chat models it has been tested on. This will be displayed in the character list.)" placeholder="(Describe the bot, give use tips, or list the chat models it has been tested on. This will be displayed in the character list.)" form="form_create" class="text_pole" autocomplete="off" rows="4" maxlength="20000"></textarea>
50815065 </div>
50825066 <div class="flex1">
50835067 <h4 data-i18n="Tags to Embed">Tags to Embed</h4>
50845068 <textarea id="tags_textarea" name="tags" data-i18n="[placeholder](Write a comma-separated list of tags)" placeholder="(Write a comma-separated list of tags)" form="form_create" class="text_pole" autocomplete="off" rows="4" maxlength="5000"></textarea>
50855069 </div>
50865070 </div>
50875071 </div>
@@ -5092,7 +5076,7 @@
50925076 <span data-i18n="Personality summary">Personality summary</span>
50935077 <a href="https://docs.sillytavern.app/usage/core-concepts/characterdesign/#personality-summary" class="notes-link" target="_blank"><span class="fa-solid fa-circle-question note-link-span"></span></a>
50945078 </h4>
50955079 <textarea id="personality_textarea" name="personality" data-i18n="[placeholder](A brief description of the personality)" placeholder="(A brief description of the personality)" form="form_create" class="text_pole" autocomplete="off" rows="4" maxlength="50000"></textarea>
50965080 <div class="extension_token_counter">
50975081 <span data-i18n="extension_token_counter">Tokens:</span> <span data-token-counter="personality_textarea" data-token-permanent="true">counting...</span>
50985082 </div>
@@ -5104,7 +5088,7 @@
51045088 <span class="fa-solid fa-circle-question note-link-span"></span>
51055089 </a>
51065090 </h4>
51075091 <textarea id="scenario_pole" name="scenario" data-i18n="[placeholder](Circumstances and context of the interaction)" placeholder="(Circumstances and context of the interaction)" class="text_pole" maxlength="50000" value="" autocomplete="off" form="form_create" rows="4"></textarea>
51085092 <div class="extension_token_counter">
51095093 <span data-i18n="extension_token_counter">Tokens:</span> <span data-token-counter="scenario_pole" data-token-permanent="true">counting...</span>
51105094 </div>
@@ -5116,7 +5100,7 @@
51165100 Character's Note
51175101 </span>
51185102 </h4>
51195103 <textarea id="depth_prompt_prompt" name="depth_prompt_prompt" class="text_pole" rows="5" maxlength="50000" autocomplete="off" form="form_create" data-i18n="[placeholder](Text to be inserted in-chat @ designated depth and role)" placeholder="(Text to be inserted in-chat @ designated depth and role)"></textarea>
51205104 </div>
51215105 <div>
51225106 <h4>
@@ -5158,52 +5142,24 @@
51585142 <h4><span data-i18n="Examples of dialogue">Examples of dialogue</span></h4>
51595143 <h5 data-i18n="Important to set the character's writing style.">Important to set the character's writing style. <a href="https://docs.sillytavern.app/usage/core-concepts/characterdesign/#examples-of-dialogue" class="notes-link" target="_blank"><span class="fa-solid fa-circle-question note-link-span"></span></a></h5>
51605144 </div>
51615145 <textarea id="mes_example_textarea" class="flexGrow" name="mes_example" data-i18n="[placeholder](Examples of chat dialog. Begin each example with START on a new line.)" placeholder="(Examples of chat dialog. Begin each example with &lt;START&gt; on a new line.)" form="form_create" maxlength="50000" rows="6"></textarea>
51625146 <div class="extension_token_counter">
51635147 <span data-i18n="extension_token_counter">Tokens:</span> <span data-token-counter="mes_example_textarea">counting...</span>
51645148 </div>
5165- <!-- PLACEHOLDER CODE FOR NEW EXAMPLE CHAT HANDLING
5149+ <!-- TODO: Example chats handhold-editor concept: https://gist.github.com/Cohee1207/50da02a4001ac1adae9b440f9b8e1079 -->
5166- <div name="exampleChatsBlockTemplate" class="flex-container flexFlowColumn">
5167- <div class="flex-container alignitemscenter">
5168- <textarea class="flexShrink flexGrow wideMinContent" rows="1" placeholder="Name for this example chat"></textarea>
5169- <div class="fa-solid fa-plus menu_button" title="Add a new message to this example chat block"></div>
5170- </div>
5171- <div class="flex-container whitespacenowrap">
5172- <div class="flex-container flexFlowColumn">
5173- <select>
5174- <option>{{user}}</option>
5175- <option>{{char}}</option>
5176- <option>Custom</option>
5177- </select>
5178- <textarea rows="1" placeholder="Custom Entity"></textarea>
5179- </div>
5180- <textarea class="flexShrink flexGrow wideMinContent" placeholder="Content of the example chat."></textarea>
5181- </div>
5182- <div class="flex-container whitespacenowrap">
5183- <div class="flex-container flexFlowColumn">
5184- <select>
5185- <option>{{user}}</option>
5186- <option>{{char}}</option>
5187- <option>Custom</option>
5188- </select>
5189- <textarea rows="1" placeholder="Custom Entity"></textarea>
5190- </div>
5191- <textarea class="flexShrink flexGrow wideMinContent" placeholder="Content of the example chat."></textarea>
5192- </div>
5193- </div>
5194- -->
51955150 </div>
51965151 <div id="character_popup_ok" class="menu_button" data-i18n="Save">Save</div>
51975152 </div>
5153+
51985154 <div id="shadow_select_chat_popup">
51995155 <div id="select_chat_popup">
52005156 <div name="selectChatPopupHeader" class="flex-container alignitemscenter justifySpaceBetween flexGap10">
52015157 <div id="select_chat_import"> <!-- import chat popup header -->
52025158 <form id="form_import_chat" action="javascript:void(null);" method="post" enctype="multipart/form-data" style="display: none;">
52035159 <input type="file" id="chat_import_file" accept=".json, .jsonl" name="avatar">
52045160 <input id="chat_import_file_type" name="file_type" class="text_pole" maxlength="999" size="2" value="" autocomplete="off" style="display: none;">
52055161 <input id="chat_import_avatar_url" name="avatar_url" class="text_pole" maxlength="999" size="2" value="" autocomplete="off" style="display: none;">
52065162 <input id="chat_import_character_name" name="character_name" class="text_pole" maxlength="999" size="2" value="" autocomplete="off" style="display: none;">
52075163 </form>
52085164 </div>
52095165 <div id="selectChatPopupHeaderText" class="TxtLrgBoldCenter">
@@ -5335,22 +5291,21 @@
53355291 <div class="world_entry">
53365292 <form class="world_entry_form wi-card-entry">
53375293 <div class="inline-drawer wide100p">
53385294 <div class="inline-drawer-toggle inline-drawer-header gap5px padding0">
53395295 <span class="drag-handle">&#9776;</span>
53405296 <div class="gap5px world_entry_thin_controls wide100p alignitemscenter">
53415297 <div class="inline-drawer-toggle fa-fw fa-solid fa-circle-chevron-down inline-drawer-icon down"></div>
5342- <div class="fa-solid fa-toggle-on killSwitch" name="entryKillSwitch" title="Toggle entry's active state."></div>
53435298 <div class="flex-container alignitemscenter wide100p">
5344-
53455299 <div class="WIEntryTitleAndStatus flex-container flex1 alignitemscenter">
5346-
53475300 <div class="flex-container flex1">
53485301 <textarea class="text_pole" rows="1" name="comment" maxlength="5000" data-i18n="[placeholder]Entry Title/Memo" placeholder="Entry Title/Memo"></textarea>
53495302 </div>
5303+ <!-- <span class="world_entry_form_position_value"></span> -->
53505304 <select data-i18n="[title]WI Entry Status:🔵 Constant🟢 Normal🔗 Vectorized❌ Disabled" title="WI Entry Status:&#13;🔵 Constant&#13;🟢 Normal&#13;🔗 Vectorized&#13;❌ Disabled" name="entryStateSelector" class="text_pole widthNatural margin0">
53515305 <option value="constant" title="Constant" data-i18n="[title]WI_Entry_Status_Constant">🔵</option>
53525306 <option value="normal" title="Normal" data-i18n="[title]WI_Entry_Status_Normal">🟢</option>
53535307 <option value="vectorized" title="Vectorized" data-i18n="[title]WI_Entry_Status_Vectorized">🔗</option>
5308+ <option value="disabled" title="Disabled" data-i18n="[title]WI_Entry_Status_Disabled">❌</option>
53545309 </select>
53555310 </div>
53565311 <div class="WIEnteryHeaderControls flex-container">
@@ -5415,7 +5370,7 @@
54155370 </small>
54165371 <small class="textAlignCenter" data-i18n="Primary Keywords">Primary Keywords</small>
54175372 <select class="keyprimaryselect keyselect select2_multi_sameline" name="key" data-i18n="[placeholder]Keywords or Regexes" placeholder="Keywords or Regexes" multiple="multiple"></select>
54185373 <textarea class="text_pole keyprimarytextpole mobile" name="key" rows="1" data-i18n="[placeholder]Comma separated list" placeholder="Comma separated list" maxlength="2000" style="display: none;"></textarea>
54195374 <button type="button" class="switch_input_type_icon" tabindex="-1" title="Switch to plaintext mode" data-i18n="[title]Switch to plaintext mode" data-icon-on="✨" data-icon-off="⌨️" data-tooltip-on="Switch to fancy mode" data-tooltip-off="Switch to plaintext mode">
54205375 ⌨️
54215376 </button>
@@ -5437,7 +5392,7 @@
54375392 </small>
54385393 <small class="textAlignCenter" data-i18n="Optional Filter">Optional Filter</small>
54395394 <select class="keysecondaryselect keyselect select2_multi_sameline" name="keysecondary" data-i18n="[placeholder]Keywords or Regexes (ignored if empty)" placeholder="Keywords or Regexes (ignored if empty)" multiple="multiple"></select>
54405395 <textarea class="text_pole keysecondarytextpole mobile" name="keysecondary" rows="1" data-i18n="[placeholder]Comma separated list (ignored if empty)" placeholder="Comma separated list (ignored if empty)" maxlength="2000" style="display: none;"></textarea>
54415396 <button type="button" class="switch_input_type_icon" tabindex="-1" title="Switch to plaintext mode" data-i18n="[title]Switch to plaintext mode" data-icon-on="✨" data-icon-off="⌨️" data-tooltip-on="Switch to fancy mode" data-tooltip-off="Switch to plaintext mode">
54425397 ⌨️
54435398 </button>
@@ -5599,16 +5554,13 @@
55995554 <div class="flex-container wide100p flexGap10">
56005555 <div class="flex4 flex-container flexFlowColumn flexNoGap">
56015556 <div class="flex-container justifySpaceBetween">
56025557 <small for="characterFilter" data-i18n="Filter to Characters or TagsCharacter(s)">
5603- Filter to Characters or Tags
5558+ Filter to Character(s)
56045559 </small>
56055560 <label class="checkbox_label flexNoGap margin-r5" for="character_exclusion">
56065561 <input type="checkbox" name="character_exclusion" />
56075562 <span>
5608- <small title="Switch the Character/Tags filter around to exclude the listed characters and tags from matching for this entry" data-i18n="[title]Switch the Character/Tags filter around to exclude the listed characters and tags from matching for this entry">
5563+ <small data-i18n="Character Exclusion">Character Exclusion</small>
5609- <span data-i18n="Exclude">Exclude</span>
5610- <div class="fa-solid fa-circle-info opacity50p"></div>
5611- </small>
56125564 </span>
56135565 </label>
56145566 </div>
@@ -5826,11 +5778,6 @@
58265778 <div title="Caption" class="right_menu_button fa-lg fa-solid fa-envelope-open-text mes_img_caption" data-i18n="[title]Caption"></div>
58275779 <div title="Delete" class="right_menu_button fa-lg fa-solid fa-trash-can mes_img_delete" data-i18n="[title]Delete"></div>
58285780 </div>
5829- <div class="mes_img_swipes">
5830- <div title="Swipe left" class="right_menu_button fa-lg fa-solid fa-chevron-left mes_img_swipe_left" data-i18n="[title]Swipe left"></div>
5831- <div class="mes_img_swipe_counter">1/1</div>
5832- <div title="Swipe right" class="right_menu_button fa-lg fa-solid fa-chevron-right mes_img_swipe_right" data-i18n="[title]Swipe right"></div>
5833- </div>
58345781 <img class="mes_img" src="" />
58355782 </div>
58365783 <div class="mes_bias"></div>
@@ -5878,6 +5825,21 @@
58785825 <b data-i18n="SillyTavern is aimed at advanced users.">
58795826 SillyTavern is aimed at advanced users.
58805827 </b>
5828+ <div>
5829+ <span data-i18n="If you're new to this, enable the simplified UI mode below.">
5830+ If you're new to this, enable the simplified UI mode below.
5831+ </span>
5832+ <br>
5833+ <span data-i18n="Change it later in the 'User Settings' panel.">
5834+ Change it later in the 'User Settings' panel.
5835+ </span>
5836+ </div>
5837+ <label class="checkbox_label">
5838+ <input type="checkbox" name="enable_simple_mode" />
5839+ <span data-i18n="Enable simple UI mode">
5840+ Enable simple UI mode
5841+ </span>
5842+ </label>
58815843 <div class="expander"></div>
58825844 <div class="textAlignCenter">
58835845 <h3 data-i18n="Looking for AI characters?">
@@ -6014,7 +5976,7 @@
60145976 <strong><span data-i18n="Alternate Greeting #">Alternate Greeting #</span><span class="greeting_index"></span></strong>
60155977 <div class="menu_button fa-solid fa-trash-alt delete_alternate_greeting"></div>
60165978 </div>
60175979 <textarea name="alternate_greetings" data-i18n="[placeholder](This will be the first message from the character that starts every chat)" placeholder="(This will be the first message from the character that starts every chat)" class="text_pole textarea_compact alternate_greeting_text" maxlength="50000" value="" autocomplete="off" rows="16"></textarea>
60185980 </div>
60195981 </div>
60205982
@@ -6031,6 +5993,7 @@
60315993 <div class="right_menu_button mes_file_delete fa-solid fa-trash-can" title="Remove the file" data-i18n="[title]Remove the file"></div>
60325994 </div>
60335995 </div>
5996+ </div>
60345997 <div id="movingDivs">
60355998 <div id="floatingPrompt" class="drawer-content flexGap5">
60365999 <div class="panelControlBar flex-container alignItemsBaseline">
@@ -6051,7 +6014,7 @@
60516014 <b data-i18n="Unique to this chat">Unique to this chat</b>.<br>
60526015 <span data-i18n="Checkpoints inherit the Note from their parent, and can be changed individually after that.">Checkpoints inherit the Note from their parent, and can be changed individually after that.</span><br>
60536016 </small>
60546017 <textarea id="extension_floating_prompt" class="text_pole textarea_compact" rows="8" maxlength="50000"></textarea>
60556018 <div class="extension_token_counter">
60566019 <span data-i18n="extension_token_counter">Tokens:</span> <span id="extension_floating_prompt_token_counter">0</span>
60576020 </div>
@@ -6108,7 +6071,7 @@
61086071 <div class="inline-drawer-content">
61096072 <small data-i18n="Will be automatically added as the author's note for this character. Will be used in groups, but can't be modified when a group chat is open.">Will be automatically added as the author's note for this character. Will be used in groups, but
61106073 can't be modified when a group chat is open.</small>
61116074 <textarea id="extension_floating_chara" class="text_pole textarea_compact" rows="8" maxlength="50000" placeholder="Example:&#10;[Scenario: wacky adventures; Genre: romantic comedy; Style: verbose, creative]"></textarea>
61126075 <div class="extension_token_counter">
61136076 <span data-i18n="extension_token_counter">Tokens:</span> <span id="extension_floating_chara_token_counter">0</span>
61146077 </div>
@@ -6140,7 +6103,7 @@
61406103 </div>
61416104 <div class="inline-drawer-content">
61426105 <small data-i18n="Will be automatically added as the Author's Note for all new chats.">Will be automatically added as the Author's Note for all new chats.</small>
61436106 <textarea id="extension_floating_default" class="text_pole textarea_compact" rows="8" maxlength="50000" placeholder="Example:&#10;[Scenario: wacky adventures; Genre: romantic comedy; Style: verbose, creative]"></textarea>
61446107 <div class="extension_token_counter">
61456108 <span data-i18n="extension_token_counter">Tokens:</span> <span id="extension_floating_default_token_counter">0</span>
61466109 </div>
@@ -6486,60 +6449,7 @@
64866449 </a>
64876450 </div>
64886451 </div>
6489- <div id="export_format_popup" class="list-group">
6452+
6490- <div class="export_format list-group-item" data-format="png">PNG</div>
6491- <div class="export_format list-group-item" data-format="json">JSON</div>
6492- </div>
6493- <div id="zoomed_avatar_template" class="template_element">
6494- <div class="zoomed_avatar">
6495- <div class="panelControlBar flex-container">
6496- <div class="fa-fw fa-solid fa-grip drag-grabber"></div>
6497- <div class="fa-fw fa-solid fa-circle-xmark dragClose" id="closeZoom"></div>
6498- </div>
6499- <div class="zoomed_avatar_container">
6500- <img class="zoomed_avatar_img" src="" data-izoomify-url="" data-izoomify-magnify="1.8" data-izoomify-duration="300" alt="">
6501- </div>
6502- </div>
6503- </div>
6504- <template id="generic_draggable_template">
6505- <div class="draggable">
6506- <div class="dragTitle"></div>
6507- <div class="panelControlBar flex-container">
6508- <div class="fa-fw fa-solid fa-grip drag-grabber"></div>
6509- <div class="fa-fw fa-solid fa-circle-xmark dragClose"></div>
6510- </div>
6511- </div>
6512- </template>
6513- <div id="user_avatar_template" class="template_element">
6514- <div class="avatar-container">
6515- <div imgfile="" class="avatar">
6516- <img src="" alt="User Avatar">
6517- </div>
6518- <div class="flex-container wide100pLess70px character_select_container">
6519- <div class="wide100p character_name_block">
6520- <span class="ch_name flex1"></span>
6521- <div class="avatar-buttons">
6522- <button class="menu_button bind_user_name" title="Bind user name to that avatar" data-i18n="[title]Bind user name to that avatar">
6523- <i class="fa-fw fa-solid fa-user-edit"></i>
6524- </button>
6525- <button class="menu_button set_persona_image" title="Change persona image" data-i18n="[title]Change persona image">
6526- <i class="fa-fw fa-solid fa-image"></i>
6527- </button>
6528- <button class="menu_button set_default_persona" title="Select this as default persona for the new chats." data-i18n="[title]Select this as default persona for the new chats.">
6529- <i class="fa-fw fa-solid fa-crown"></i>
6530- </button>
6531- <button class="menu_button duplicate_persona" title="Duplicate persona" data-i18n="[title]Duplicate persona">
6532- <i class="fa-fw fa-solid fa-clone"></i>
6533- </button>
6534- <button class="menu_button delete_avatar" title="Delete persona" data-i18n="[title]Delete persona">
6535- <i class="fa-fw fa-solid fa-trash-alt"></i>
6536- </button>
6537- </div>
6538- </div>
6539- <div class="ch_description"></div>
6540- </div>
6541- </div>
6542- </div>
65436453 <!-- Script includes -->
65446454 <script src="lib/diff_match_patch.js"></script>
65456455 <script src="lib/object-hasown.js"></script>
public/script.js+7 -2
@@ -452,7 +452,9 @@ export const event_types = {
452452 // TODO: Naming convention is inconsistent with other events
453453 CHARACTER_DELETED: 'characterDeleted',
454454 CHARACTER_DUPLICATED: 'character_duplicated',
455- SMOOTH_STREAM_TOKEN_RECEIVED: 'smooth_stream_token_received',
455+ /** @deprecated The event is aliased to STREAM_TOKEN_RECEIVED. */
456+ SMOOTH_STREAM_TOKEN_RECEIVED: 'stream_token_received',
457+ STREAM_TOKEN_RECEIVED: 'stream_token_received',
456458 FILE_ATTACHMENT_DELETED: 'file_attachment_deleted',
457459 WORLDINFO_FORCE_ACTIVATE: 'worldinfo_force_activate',
458460 OPEN_CHARACTER_LIBRARY: 'open_character_library',
@@ -3120,6 +3122,7 @@ class StreamingProcessor {
31203122 if (logprobs) {
31213123 this.messageLogprobs.push(...(Array.isArray(logprobs) ? logprobs : [logprobs]));
31223124 }
3125+ await eventSource.emit(event_types.STREAM_TOKEN_RECEIVED, text);
31233126 await sw.tick(() => this.onProgressStreaming(this.messageId, this.continueMessage + text));
31243127 }
31253128 const seconds = (timestamps[timestamps.length - 1] - timestamps[0]) / 1000;
@@ -10136,7 +10139,7 @@ jQuery(async function () {
1013610139 }
1013710140 });
1013810141
1013910142 $(document).on('click', '.mes_edit_cancel', async function () {
1014010143 let text = chat[this_edit_mes_id]['mes'];
1014110144
1014210145 $(this).closest('.mes_block').find('.mes_text').empty();
@@ -10154,6 +10157,8 @@ jQuery(async function () {
1015410157 ));
1015510158 appendMediaToMessage(chat[this_edit_mes_id], $(this).closest('.mes'));
1015610159 addCopyToCodeBlocks($(this).closest('.mes'));
10160+
10161+ await eventSource.emit(event_types.MESSAGE_UPDATED, this_edit_mes_id);
1015710162 this_edit_mes_id = undefined;
1015810163 });
1015910164
public/scripts/RossAscends-mods.js+1 -1
@@ -296,7 +296,7 @@ export async function favsToHotswap() {
296296
297297 //helpful instruction message if no characters are favorited
298298 if (favs.length == 0) {
299299 container.html(`<small><span><i class="fa-solid fa-star"></i>&nbsp;${DOMPurify.sanitize(container.attr('no_favs'))}</span></small>`);
300300 return;
301301 }
302302
public/scripts/extensions/memory/index.js+34 -12
@@ -15,6 +15,7 @@ import {
1515 generateRaw,
1616 getMaxContextSize,
1717 setExtensionPrompt,
18+ streamingProcessor,
1819} from '../../../script.js';
1920import { is_group_generating, selected_group } from '../../group-chats.js';
2021import { loadMovingUIState } from '../../power-user.js';
@@ -408,8 +409,8 @@ async function onChatEvent() {
408409 return;
409410 }
410411
411412 // Generation isStreaming in -progress, summary prevented
412413 if (is_send_pressstreamingProcessor && !streamingProcessor.isFinished) {
413414 return;
414415 }
415416
@@ -446,15 +447,9 @@ async function onChatEvent() {
446447 delete chat[chat.length - 1].extra.memory;
447448 }
448449
449- try {
450+ summarizeChat(context)
450- await summarizeChat(context);
451+ .catch(console.error)
451- }
452+ .finally(saveLastValues);
452- catch (error) {
453- console.log(error);
454- }
455- finally {
456- saveLastValues();
457- }
458453}
459454
460455/**
@@ -567,7 +562,7 @@ async function getSummaryPromptForNow(context, force) {
567562 await waitUntilCondition(() => is_group_generating === false, 1000, 10);
568563 }
569564 // Wait for the send button to be released
570565 await waitUntilCondition(() => is_send_press === false, 30000, 100);
571566 } catch {
572567 console.debug('Timeout waiting for is_send_press');
573568 return '';
@@ -650,9 +645,16 @@ async function summarizeChatWebLLM(context, force) {
650645 params.max_tokens = extension_settings.memory.overrideResponseLength;
651646 }
652647
648+ try {
649+ inApiCall = true;
653650 const summary = await generateWebLlmChatPrompt(messages, params);
654651 const newContext = getContext();
655652
653+ if (!summary) {
654+ console.warn('Empty summary received');
655+ return;
656+ }
657+
656658 // something changed during summarization request
657659 if (newContext.groupId !== context.groupId ||
658660 newContext.chatId !== context.chatId ||
@@ -663,6 +665,9 @@ async function summarizeChatWebLLM(context, force) {
663665
664666 setMemoryContext(summary, true, lastUsedIndex);
665667 return summary;
668+ } finally {
669+ inApiCall = false;
670+ }
666671}
667672
668673async function summarizeChatMain(context, force, skipWIAN) {
@@ -677,12 +682,18 @@ async function summarizeChatMain(context, force, skipWIAN) {
677682 let index = null;
678683
679684 if (prompt_builders.DEFAULT === extension_settings.memory.prompt_builder) {
685+ try {
686+ inApiCall = true;
680687 summary = await generateQuietPrompt(prompt, false, skipWIAN, '', '', extension_settings.memory.overrideResponseLength);
688+ } finally {
689+ inApiCall = false;
690+ }
681691 }
682692
683693 if ([prompt_builders.RAW_BLOCKING, prompt_builders.RAW_NON_BLOCKING].includes(extension_settings.memory.prompt_builder)) {
684694 const lock = extension_settings.memory.prompt_builder === prompt_builders.RAW_BLOCKING;
685695 try {
696+ inApiCall = true;
686697 if (lock) {
687698 deactivateSendButtons();
688699 }
@@ -700,12 +711,18 @@ async function summarizeChatMain(context, force, skipWIAN) {
700711 summary = await generateRaw(rawPrompt, '', false, false, prompt, extension_settings.memory.overrideResponseLength);
701712 index = lastUsedIndex;
702713 } finally {
714+ inApiCall = false;
703715 if (lock) {
704716 activateSendButtons();
705717 }
706718 }
707719 }
708720
721+ if (!summary) {
722+ console.warn('Empty summary received');
723+ return;
724+ }
725+
709726 const newContext = getContext();
710727
711728 // something changed during summarization request
@@ -840,6 +857,11 @@ async function summarizeChatExtras(context) {
840857 const summary = await callExtrasSummarizeAPI(resultingString);
841858 const newContext = getContext();
842859
860+ if (!summary) {
861+ console.warn('Empty summary received');
862+ return;
863+ }
864+
843865 // something changed during summarization request
844866 if (newContext.groupId !== context.groupId
845867 || newContext.chatId !== context.chatId
public/scripts/instruct-mode.js+37 -10
@@ -7,7 +7,7 @@ import {
77 power_user,
88 context_presets,
99} from './power-user.js';
1010import { regexFromString, resetScrollHeight } from './utils.js';
1111
1212/**
1313 * @type {any[]} Instruct mode presets.
@@ -78,28 +78,29 @@ function migrateInstructModeSettings(settings) {
7878 * Loads instruct mode settings from the given data object.
7979 * @param {object} data Settings data object.
8080 */
8181export async function loadInstructMode(data) {
8282 if (data.instruct !== undefined) {
8383 instruct_presets = data.instruct;
8484 }
8585
8686 migrateInstructModeSettings(power_user.instruct);
8787
88+ $('#instruct_enabled').parent().find('i').toggleClass('toggleEnabled', !!power_user.instruct.enabled);
89+ $('#instructSettingsBlock, #InstructSequencesColumn').toggleClass('disabled', !power_user.instruct.enabled);
90+ $('#instruct_bind_to_context').parent().find('i').toggleClass('toggleEnabled', !!power_user.instruct.bind_to_context);
91+
8892 controls.forEach(control => {
8993 const $element = $(`#${control.id}`);
9094
9195 if (control.isCheckbox) {
9296 $element.prop('checked', power_user.instruct[control.property]);
9397 } else {
9498 $element[0].valinnerText = (power_user.instruct[control.property]);
9599 }
96100
97101 $element.on('input', async function () {
98102 power_user.instruct[control.property] = control.isCheckbox ? !!$(this).prop('checked') : $(this)[0].val()innerText;
99103 saveSettingsDebounced();
100- if (!control.isCheckbox) {
101- await resetScrollHeight($element);
102- }
103104 });
104105
105106 if (control.trigger) {
@@ -107,6 +108,9 @@ export function loadInstructMode(data) {
107108 }
108109 });
109110
111+ $('#instruct_system_sequence').css('height', 'auto');
112+ $('#instruct_system_suffix').css('height', 'auto');
113+
110114 instruct_presets.forEach((preset) => {
111115 const name = preset.name;
112116 const option = document.createElement('option');
@@ -604,11 +608,29 @@ jQuery(() => {
604608
605609 $('#instruct_system_same_as_user').on('input', function () {
606610 const state = !!$(this).prop('checked');
607- $('#instruct_system_sequence').prop('disabled', state);
611+ if (state) {
608612 $('#instruct_system_suffixinstruct_system_sequence_block').propaddClass('disabled', state);
613+ $('#instruct_system_suffix_block').addClass('disabled');
614+ $('#instruct_system_sequence').css('height', 'auto');
615+ $('#instruct_system_suffix').css('height', 'auto');
616+ $('#instruct_system_sequence').prop('contenteditable', false);
617+ $('#instruct_system_suffix').prop('contenteditable', false);
618+ } else {
619+ $('#instruct_system_sequence_block').removeClass('disabled');
620+ $('#instruct_system_suffix_block').removeClass('disabled');
621+ $('#instruct_system_sequence').css('height', '');
622+ $('#instruct_system_suffix').css('height', '');
623+ $('#instruct_system_sequence').prop('contenteditable', true);
624+ $('#instruct_system_suffix').prop('contenteditable', true);
625+ }
626+
609627 });
610628
611629 $('#instruct_enabled').on('change', function () {
630+ //color toggle for the main switch
631+ $('#instruct_enabled').parent().find('i').toggleClass('toggleEnabled', !!power_user.instruct.enabled);
632+ $('#instructSettingsBlock, #InstructSequencesColumn').toggleClass('disabled', !power_user.instruct.enabled);
633+
612634 if (!power_user.instruct.bind_to_context) {
613635 return;
614636 }
@@ -622,6 +644,10 @@ jQuery(() => {
622644 }
623645 });
624646
647+ $('#instruct_bind_to_context').on('change', function () {
648+ $('#instruct_bind_to_context').parent().find('i').toggleClass('toggleEnabled', !!power_user.instruct.bind_to_context);
649+ });
650+
625651 $('#instruct_presets').on('change', function () {
626652 const name = String($(this).find(':selected').val());
627653 const preset = instruct_presets.find(x => x.name === name);
@@ -641,7 +667,8 @@ jQuery(() => {
641667 if (control.isCheckbox) {
642668 $element.prop('checked', power_user.instruct[control.property]).trigger('input');
643669 } else {
644670 $element[0].valinnerText = (power_user.instruct[control.property]).trigger('input');
671+ $element.trigger('input');
645672 }
646673 }
647674 });
public/scripts/power-user.js+12 -15
@@ -1469,7 +1469,7 @@ async function loadPowerUserSettings(settings, data) {
14691469 $('#auto_swipe_minimum_length').val(power_user.auto_swipe_minimum_length);
14701470 $('#auto_swipe_blacklist').val(power_user.auto_swipe_blacklist.join(', '));
14711471 $('#auto_swipe_blacklist_threshold').val(power_user.auto_swipe_blacklist_threshold);
14721472 $('#custom_stopping_strings').valtext(power_user.custom_stopping_strings);
14731473 $('#custom_stopping_strings_macro').prop('checked', power_user.custom_stopping_strings_macro);
14741474 $('#fuzzy_search_checkbox').prop('checked', power_user.fuzzy_search);
14751475 $('#persona_show_notifications').prop('checked', power_user.persona_show_notifications);
@@ -1499,7 +1499,7 @@ async function loadPowerUserSettings(settings, data) {
14991499 $('#waifuMode').prop('checked', power_user.waifuMode);
15001500 $('#movingUImode').prop('checked', power_user.movingUI);
15011501 $('#noShadowsmode').prop('checked', power_user.noShadows);
15021502 $('#start_reply_with').valtext(power_user.user_prompt_bias);
15031503 $('#chat-show-reply-prefix-checkbox').prop('checked', power_user.show_user_prompt_bias);
15041504 $('#auto_continue_enabled').prop('checked', power_user.auto_continue.enabled);
15051505 $('#auto_continue_allow_chat_completions').prop('checked', power_user.auto_continue.allow_chat_completions);
@@ -1600,7 +1600,7 @@ async function loadPowerUserSettings(settings, data) {
16001600 switchReducedMotion();
16011601 switchCompactInputArea();
16021602 reloadMarkdownProcessor(power_user.render_formulas);
16031603 await loadInstructMode(data);
16041604 await loadContextSettings();
16051605 loadMaxContextUnlocked();
16061606 switchWaifuMode();
@@ -1747,13 +1747,14 @@ async function loadContextSettings() {
17471747 if (control.isCheckbox) {
17481748 $element.prop('checked', power_user.context[control.property]);
17491749 } else {
17501750 $element[0].val(innerText = power_user.context[control.property]);
17511751 }
1752+ console.log(`Setting ${$element.prop('id')} to ${power_user.context[control.property]}`);
17521753
17531754 // If the setting already exists, no need to duplicate it
17541755 // TODO: Maybe check the power_user object for the setting instead of a flag?
17551756 $element.on('input keyup', async function () {
17561757 const value = control.isCheckbox ? !!$(this).prop('checked') : $(this)[0].val()innerText;
17571758 if (control.isGlobalSetting) {
17581759 power_user[control.property] = value;
17591760 } else {
@@ -1761,9 +1762,6 @@ async function loadContextSettings() {
17611762 }
17621763
17631764 saveSettingsDebounced();
1764- if (!control.isCheckbox) {
1765- await resetScrollHeight($element);
1766- }
17671765 });
17681766 });
17691767
@@ -1777,7 +1775,7 @@ async function loadContextSettings() {
17771775 });
17781776
17791777 $('#context_presets').on('change', function () {
17801778 const name = String($(this).find(':selected').valtext());
17811779 const preset = context_presets.find(x => x.name === name);
17821780
17831781 if (!preset) {
@@ -1802,9 +1800,8 @@ async function loadContextSettings() {
18021800 .prop('checked', control.isGlobalSetting ? power_user[control.property] : power_user.context[control.property])
18031801 .trigger('input');
18041802 } else {
1805- $element
1803+ $element[0].innerText = (control.isGlobalSetting ? power_user[control.property] : power_user.context[control.property])
1806- .val(control.isGlobalSetting ? power_user[control.property] : power_user.context[control.property])
1804+ $element.trigger('input');
1807- .trigger('input');
18081805 }
18091806 }
18101807 });
@@ -3106,7 +3103,7 @@ $(document).ready(() => {
31063103 });
31073104
31083105 $('#start_reply_with').on('input', function () {
31093106 power_user.user_prompt_bias = String($(this)[0].val()innerText);
31103107 saveSettingsDebounced();
31113108 });
31123109
@@ -3638,7 +3635,7 @@ $(document).ready(() => {
36383635 });
36393636
36403637 $('#custom_stopping_strings').on('input', function () {
36413638 power_user.custom_stopping_strings = String($(this)[0].val(innerText).trim();
36423639 saveSettingsDebounced();
36433640 });
36443641
public/scripts/slash-commands/SlashCommandCommonEnumsProvider.js+17 -0
@@ -36,6 +36,8 @@ export const enumIcons = {
3636
3737 true: '✔️',
3838 false: '❌',
39+ null: '🚫',
40+ undefined: '❓',
3941
4042 // Value types
4143 boolean: '🔲',
@@ -230,4 +232,19 @@ export const commonEnumProviders = {
230232 enumTypes.enum, '💉');
231233 });
232234 },
235+
236+ /**
237+ * Gets somewhat recognizable STscript types.
238+ *
239+ * @returns {SlashCommandEnumValue[]}
240+ */
241+ types: () => [
242+ new SlashCommandEnumValue('string', null, enumTypes.type, enumIcons.string),
243+ new SlashCommandEnumValue('number', null, enumTypes.type, enumIcons.number),
244+ new SlashCommandEnumValue('boolean', null, enumTypes.type, enumIcons.boolean),
245+ new SlashCommandEnumValue('array', null, enumTypes.type, enumIcons.array),
246+ new SlashCommandEnumValue('object', null, enumTypes.type, enumIcons.dictionary),
247+ new SlashCommandEnumValue('null', null, enumTypes.type, enumIcons.null),
248+ new SlashCommandEnumValue('undefined', null, enumTypes.type, enumIcons.undefined),
249+ ],
233250};
public/scripts/slash-commands/SlashCommandScope.js+6 -5
@@ -1,4 +1,5 @@
11import { SlashCommandClosure } from './SlashCommandClosure.js';
2+import { convertValueType } from '../utils.js';
23
34export class SlashCommandScope {
45 /**@type {string[]}*/ variableNames = [];
@@ -55,7 +56,7 @@ export class SlashCommandScope {
5556 if (this.existsVariableInScope(key)) throw new SlashCommandScopeVariableExistsError(`Variable named "${key}" already exists.`);
5657 this.variables[key] = value;
5758 }
5859 setVariable(key, value, index = null, type = null) {
5960 if (this.existsVariableInScope(key)) {
6061 if (index !== null && index !== undefined) {
6162 let v = this.variables[key];
@@ -63,13 +64,13 @@ export class SlashCommandScope {
6364 v = JSON.parse(v);
6465 const numIndex = Number(index);
6566 if (Number.isNaN(numIndex)) {
6667 v[index] = convertValueType(value, type);
6768 } else {
6869 v[numIndex] = convertValueType(value, type);
6970 }
7071 v = JSON.stringify(v);
7172 } catch {
7273 v[index] = convertValueType(value, type);
7374 }
7475 this.variables[key] = v;
7576 } else {
@@ -78,7 +79,7 @@ export class SlashCommandScope {
7879 return value;
7980 }
8081 if (this.parent) {
8182 return this.parent.setVariable(key, value, index, type);
8283 }
8384 throw new SlashCommandScopeVariableNotFoundError(`No such variable: "${key}"`);
8485 }
public/scripts/sse-stream.js+0 -2
@@ -1,4 +1,3 @@
1-import { eventSource, event_types } from '../script.js';
21import { power_user } from './power-user.js';
32import { delay } from './utils.js';
43
@@ -268,7 +267,6 @@ export class SmoothEventSourceStream extends EventSourceStream {
268267 hasFocus && await delay(getDelay(lastStr));
269268 controller.enqueue(new MessageEvent(event.type, { data: JSON.stringify(parsed.data) }));
270269 lastStr = parsed.chunk;
271- hasFocus && await eventSource.emit(event_types.SMOOTH_STREAM_TOKEN_RECEIVED, parsed.chunk);
272270 }
273271 } catch (error) {
274272 console.debug('Smooth Streaming parsing error', error);
public/scripts/utils.js+69 -0
@@ -4,6 +4,7 @@ import { isMobile } from './RossAscends-mods.js';
44import { collapseNewlines } from './power-user.js';
55import { debounce_timeout } from './constants.js';
66import { Popup, POPUP_RESULT, POPUP_TYPE } from './popup.js';
7+import { SlashCommandClosure } from './slash-commands/SlashCommandClosure.js';
78
89/**
910 * Pagination status string template.
@@ -34,6 +35,74 @@ export function isValidUrl(value) {
3435}
3536
3637/**
38+ * Converts string to a value of a given type. Includes pythonista-friendly aliases.
39+ * @param {string|SlashCommandClosure} value String value
40+ * @param {string} type Type to convert to
41+ * @returns {any} Converted value
42+ */
43+export function convertValueType(value, type) {
44+ if (value instanceof SlashCommandClosure || typeof type !== 'string') {
45+ return value;
46+ }
47+
48+ switch (type.trim().toLowerCase()) {
49+ case 'string':
50+ case 'str':
51+ return String(value);
52+
53+ case 'null':
54+ return null;
55+
56+ case 'undefined':
57+ case 'none':
58+ return undefined;
59+
60+ case 'number':
61+ return Number(value);
62+
63+ case 'int':
64+ return parseInt(value, 10);
65+
66+ case 'float':
67+ return parseFloat(value);
68+
69+ case 'boolean':
70+ case 'bool':
71+ return isTrueBoolean(value);
72+
73+ case 'list':
74+ case 'array':
75+ try {
76+ const parsedArray = JSON.parse(value);
77+ if (Array.isArray(parsedArray)) {
78+ return parsedArray;
79+ }
80+ // The value is not an array
81+ return [];
82+ } catch {
83+ return [];
84+ }
85+
86+ case 'object':
87+ case 'dict':
88+ case 'dictionary':
89+ try {
90+ const parsedObject = JSON.parse(value);
91+ if (typeof parsedObject === 'object') {
92+ return parsedObject;
93+ }
94+ // The value is not an object
95+ return {};
96+ } catch {
97+ return {};
98+ }
99+
100+ default:
101+ return value;
102+ }
103+}
104+
105+/**
37106 * Parses ranges like 10-20 or 10.
38107 * Range is inclusive. Start must be less than end.
39108 * Returns null if invalid.
public/scripts/variables.js+49 -8
@@ -11,7 +11,7 @@ import { commonEnumProviders, enumIcons } from './slash-commands/SlashCommandCom
1111import { SlashCommandEnumValue, enumTypes } from './slash-commands/SlashCommandEnumValue.js';
1212import { PARSER_FLAG, SlashCommandParser } from './slash-commands/SlashCommandParser.js';
1313import { SlashCommandScope } from './slash-commands/SlashCommandScope.js';
1414import { isFalseBoolean, convertValueType } from './utils.js';
1515
1616/** @typedef {import('./slash-commands/SlashCommandParser.js').NamedArguments} NamedArguments */
1717/** @typedef {import('./slash-commands/SlashCommand.js').UnnamedArguments} UnnamedArguments */
@@ -57,12 +57,12 @@ function setLocalVariable(name, value, args = {}) {
5757 if (localVariable === null) {
5858 localVariable = {};
5959 }
6060 localVariable[args.index] = convertValueType(value, args.as);
6161 } else {
6262 if (localVariable === null) {
6363 localVariable = [];
6464 }
6565 localVariable[numIndex] = convertValueType(value, args.as);
6666 }
6767 chat_metadata.variables[name] = JSON.stringify(localVariable);
6868 } catch {
@@ -106,12 +106,12 @@ function setGlobalVariable(name, value, args = {}) {
106106 if (globalVariable === null) {
107107 globalVariable = {};
108108 }
109109 globalVariable[args.index] = convertValueType(value, args.as);
110110 } else {
111111 if (globalVariable === null) {
112112 globalVariable = [];
113113 }
114114 globalVariable[numIndex] = convertValueType(value, args.as);
115115 }
116116 extension_settings.variables.global[name] = JSON.stringify(globalVariable);
117117 } catch {
@@ -667,6 +667,7 @@ function parseNumericSeries(value, scope = null) {
667667}
668668
669669function performOperation(value, operation, singleOperand = false, scope = null) {
670+ function getResult() {
670671 if (!value) {
671672 return 0;
672673 }
@@ -686,6 +687,10 @@ function performOperation(value, operation, singleOperand = false, scope = null)
686687 return result;
687688 }
688689
690+ const result = getResult();
691+ return String(result);
692+}
693+
689694function addValuesCallback(args, value) {
690695 return performOperation(value, (array) => array.reduce((a, b) => a + b, 0), false, args._scope);
691696}
@@ -836,7 +841,7 @@ function varCallback(args, value) {
836841 if (typeof key != 'string') throw new Error('Key must be a string');
837842 if (args._hasUnnamedArgument) {
838843 const val = typeof value[0] == 'string' ? value.join(' ') : value[0];
839844 args._scope.setVariable(key, val, args.index, args.as);
840845 return val;
841846 } else {
842847 return args._scope.getVariable(key, args.index);
@@ -846,7 +851,7 @@ function varCallback(args, value) {
846851 if (typeof key != 'string') throw new Error('Key must be a string');
847852 if (value.length > 0) {
848853 const val = typeof value[0] == 'string' ? value.join(' ') : value[0];
849854 args._scope.setVariable(key, val, args.index, args.as);
850855 return val;
851856 } else {
852857 return args._scope.getVariable(key, args.index);
@@ -901,6 +906,14 @@ export function registerVariableCommands() {
901906 new SlashCommandNamedArgument(
902907 'index', 'list index', [ARGUMENT_TYPE.NUMBER, ARGUMENT_TYPE.STRING], false,
903908 ),
909+ SlashCommandNamedArgument.fromProps({
910+ name: 'as',
911+ description: 'change the type of the value when used with index',
912+ forceEnum: true,
913+ enumProvider: commonEnumProviders.types,
914+ isRequired: false,
915+ defaultValue: 'string',
916+ }),
904917 ],
905918 unnamedArgumentList: [
906919 new SlashCommandArgument(
@@ -910,6 +923,7 @@ export function registerVariableCommands() {
910923 helpString: `
911924 <div>
912925 Set a local variable value and pass it down the pipe. The <code>index</code> argument is optional.
926+ To convert the value to a specific JSON type when using <code>index</code>, use the <code>as</code> argument.
913927 </div>
914928 <div>
915929 <strong>Example:</strong>
@@ -917,6 +931,9 @@ export function registerVariableCommands() {
917931 <li>
918932 <pre><code class="language-stscript">/setvar key=color green</code></pre>
919933 </li>
934+ <li>
935+ <pre><code class="language-stscript">/setvar key=ages index=John as=number 21</code></pre>
936+ </li>
920937 </ul>
921938 </div>
922939 `,
@@ -1015,6 +1032,14 @@ export function registerVariableCommands() {
10151032 new SlashCommandNamedArgument(
10161033 'index', 'list index', [ARGUMENT_TYPE.NUMBER, ARGUMENT_TYPE.STRING], false,
10171034 ),
1035+ SlashCommandNamedArgument.fromProps({
1036+ name: 'as',
1037+ description: 'change the type of the value when used with index',
1038+ forceEnum: true,
1039+ enumProvider: commonEnumProviders.types,
1040+ isRequired: false,
1041+ defaultValue: 'string',
1042+ }),
10181043 ],
10191044 unnamedArgumentList: [
10201045 new SlashCommandArgument(
@@ -1024,6 +1049,7 @@ export function registerVariableCommands() {
10241049 helpString: `
10251050 <div>
10261051 Set a global variable value and pass it down the pipe. The <code>index</code> argument is optional.
1052+ To convert the value to a specific JSON type when using <code>index</code>, use the <code>as</code> argument.
10271053 </div>
10281054 <div>
10291055 <strong>Example:</strong>
@@ -1031,6 +1057,9 @@ export function registerVariableCommands() {
10311057 <li>
10321058 <pre><code class="language-stscript">/setglobalvar key=color green</code></pre>
10331059 </li>
1060+ <li>
1061+ <pre><code class="language-stscript">/setglobalvar key=ages index=John as=number 21</code></pre>
1062+ </li>
10341063 </ul>
10351064 </div>
10361065 `,
@@ -2030,6 +2059,14 @@ export function registerVariableCommands() {
20302059 false, // isRequired
20312060 false, // acceptsMultiple
20322061 ),
2062+ SlashCommandNamedArgument.fromProps({
2063+ name: 'as',
2064+ description: 'change the type of the value when used with index',
2065+ forceEnum: true,
2066+ enumProvider: commonEnumProviders.types,
2067+ isRequired: false,
2068+ defaultValue: 'string',
2069+ }),
20332070 ],
20342071 unnamedArgumentList: [
20352072 SlashCommandArgument.fromProps({
@@ -2049,7 +2086,8 @@ export function registerVariableCommands() {
20492086 splitUnnamedArgumentCount: 1,
20502087 helpString: `
20512088 <div>
2052- Get or set a variable.
2089+ Get or set a variable. Use <code>index</code> to access elements of a JSON-serialized list or dictionary.
2090+ To convert the value to a specific JSON type when using with <code>index</code>, use the <code>as</code> argument.
20532091 </div>
20542092 <div>
20552093 <strong>Examples:</strong>
@@ -2060,6 +2098,9 @@ export function registerVariableCommands() {
20602098 <li>
20612099 <pre><code class="language-stscript">/let x foo | /var key=x foo bar | /var x | /echo</code></pre>
20622100 </li>
2101+ <li>
2102+ <pre><code class="language-stscript">/let x {} | /var index=cool as=number x 1337 | /echo {{var::x}}</code></pre>
2103+ </li>
20632104 </ul>
20642105 </div>
20652106 `,
public/style.css+20 -3
@@ -1602,6 +1602,7 @@ body[data-stscript-style] .hljs.language-stscript {
16021602 .hljs-pipe {
16031603 color: var(--ac-style-color-punctuation);
16041604 }
1605+
16051606 .hljs-pipebreak {
16061607 color: var(--ac-style-color-type);
16071608 }
@@ -1695,6 +1696,7 @@ body[data-stscript-style] .hljs.language-stscript {
16951696 background-color: var(--ac-color-selectedBackground);
16961697 color: var(--ac-color-selectedText);
16971698 }
1699+
16981700 &.selected.not-selectable>* {
16991701 background-color: var(--ac-color-notSelectableBackground);
17001702 color: var(--ac-color-notSelectableText);
@@ -1780,7 +1782,9 @@ body[data-stscript-style] .hljs.language-stscript {
17801782 display: flex;
17811783 gap: 0.5em;
17821784 }
1783- > .head > .name, > .name {
1785+
1786+ >.head>.name,
1787+ >.name {
17841788 flex: 1 1 auto;
17851789 font-weight: bold;
17861790 color: var(--ac-color-text);
@@ -1790,20 +1794,25 @@ body[data-stscript-style] .hljs.language-stscript {
17901794 text-decoration: 1px dotted underline;
17911795 }
17921796 }
1797+
17931798 >.head>.source {
17941799 padding: 0 0.5em;
17951800 cursor: help;
17961801 display: flex;
17971802 align-items: center;
17981803 gap: 0.5em;
1804+
17991805 &.isThirdParty.isExtension {
18001806 color: #F89406;
18011807 }
1808+
18021809 &.isCore {
18031810 color: transparent;
1811+
18041812 &.isExtension {
18051813 color: #51A351;
18061814 }
1815+
18071816 &:after {
18081817 content: '';
18091818 order: -1;
@@ -2605,7 +2614,8 @@ select option:not(:checked) {
26052614 color: var(--golden) !important;
26062615}
26072616
26082617.world_set {,
2618+.toggleEnabled {
26092619 color: var(--active) !important;
26102620}
26112621
@@ -5398,6 +5408,7 @@ body:not(.movingUI) .drawer-content.maximized {
53985408.popup:has(.faPicker) {
53995409 /* Fix height for fa picker popup, otherwise search is making it resize weirdly */
54005410 height: 70%;
5411+
54015412 .popup-content {
54025413 display: flex;
54035414 flex-direction: column;
@@ -5407,7 +5418,8 @@ body:not(.movingUI) .drawer-content.maximized {
54075418.faPicker-container {
54085419 display: flex;
54095420 flex-direction: column;
54105421 overflow: hidden;;
5422+ ;
54115423}
54125424
54135425.faQuery-container {
@@ -5429,6 +5441,7 @@ body:not(.movingUI) .drawer-content.maximized {
54295441 padding: 0.25em;
54305442 width: unset;
54315443 box-sizing: content-box;
5444+
54325445 &.hidden {
54335446 display: none;
54345447 }
@@ -5440,3 +5453,7 @@ body:not(.movingUI) .drawer-content.maximized {
54405453 color: var(--SmartThemeBodyColor);
54415454 opacity: 0.7;
54425455}
5456+
5457+#advanced-formatting-button div[contenteditable] {
5458+ overflow-wrap: anywhere;
5459+}