From 31beb05aa1714e95a32b0a3eab00c8baf42f42b9 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sat, 9 Sep 2023 18:19:01 +0300
Subject: [PATCH 1/3] Substitute macro in Novel preamble

---
 public/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/script.js b/public/script.js
index 7a23fc25a..73442f5f8 100644
--- a/public/script.js
+++ b/public/script.js
@@ -3416,7 +3416,7 @@ function parseTokenCounts(counts, thisPromptBits) {
 
 function addChatsPreamble(mesSendString) {
     return main_api === 'novel'
-        ? nai_settings.preamble + '\n' + mesSendString
+        ? substituteParams(nai_settings.preamble) + '\n' + mesSendString
         : mesSendString;
 }
 

From f92249790f86cde976cb5dba9f08f87c572c66b1 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sun, 10 Sep 2023 00:58:37 +0300
Subject: [PATCH 2/3] The return of permanent tokens display

---
 public/index.html                  | 21 ++++++++++++++-------
 public/scripts/RossAscends-mods.js |  5 +++++
 public/style.css                   | 11 +++++++++--
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/public/index.html b/public/index.html
index 890be2906..2ca5ebac5 100644
--- a/public/index.html
+++ b/public/index.html
@@ -3233,9 +3233,16 @@
                             <h2></h2>
                         </div>
                         <div id="result_info" class="flex-container" style="display: none;">
-                            <span id="result_info_text" title="Token counts may be inaccurate and provided just for reference." data-i18n="[title]Token counts may be inaccurate and provided just for reference.">
-                                <strong id="result_info_total_tokens">Calculating...</strong> Total Tokens
-                            </span>
+                            <div id="result_info_text" title="Token counts may be inaccurate and provided just for reference." data-i18n="[title]Token counts may be inaccurate and provided just for reference.">
+                                <div>
+                                    <strong id="result_info_total_tokens" title="Total tokens">Calculating...</strong>&nbsp;<span data-i18n="Tokens">Tokens</span>
+                                </div>
+                                <div>
+                                    <small title="Permanent tokens">
+                                        (<span id="result_info_permanent_tokens"></span>&nbsp;<span data-i18n="Permanent">Permanent</span>)
+                                    </small>
+                                </div>
+                            </div>
                             <a id="chartokenwarning" class="right_menu_button fa-solid fa-triangle-exclamation" href="https://docs.sillytavern.app/usage/core-concepts/characterdesign/#character-tokens" target="_blank" title="About Token 'Limits'"></a>
                             <i title="Click for stats!" class="fa-solid fa-ranking-star right_menu_button rm_stats_button"></i>
                             <i title="Toggle character info panel" id="hideCharPanelAvatarButton" class="fa-solid fa-eye right_menu_button"></i>
@@ -3251,7 +3258,7 @@
                             <div id="name_div">
                                 <input id="character_name_pole" name="ch_name" class="text_pole" data-i18n="[placeholder]Name this character" placeholder="Name this character" maxlength="50" value="" autocomplete="off">
                                 <div class="extension_token_counter">
-                                    Tokens: <span data-token-counter="character_name_pole">counting...</span>
+                                    Tokens: <span data-token-counter="character_name_pole" data-token-permanent="true">counting...</span>
                                 </div>
                             </div>
 
@@ -3333,7 +3340,7 @@
 
                         <textarea id="description_textarea" data-i18n="[placeholder]Describe your character's physical and mental traits here." placeholder="Describe your character's physical and mental traits here." class="marginBot5" name="description" placeholder=""></textarea>
                         <div class="extension_token_counter">
-                            Tokens: <span data-token-counter="description_textarea">counting...</span>
+                            Tokens: <span data-token-counter="description_textarea" data-token-permanent="true">counting...</span>
                         </div>
 
                         <div id="first_message_div" class="marginBot5 title_restorable">
@@ -3617,7 +3624,7 @@
             </h4>
             <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="1" maxlength="20000"></textarea>
             <div class="extension_token_counter">
-                Tokens: <span data-token-counter="personality_textarea">counting...</span>
+                Tokens: <span data-token-counter="personality_textarea" data-token-permanent="true">counting...</span>
             </div>
         </div>
 
@@ -3630,7 +3637,7 @@
             </h4>
             <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="20000" value="" autocomplete="off" form="form_create" rows="1"></textarea>
             <div class="extension_token_counter">
-                Tokens: <span data-token-counter="scenario_pole">counting...</span>
+                Tokens: <span data-token-counter="scenario_pole" data-token-permanent="true">counting...</span>
             </div>
         </div>
 
diff --git a/public/scripts/RossAscends-mods.js b/public/scripts/RossAscends-mods.js
index 0bbd92665..758abcaeb 100644
--- a/public/scripts/RossAscends-mods.js
+++ b/public/scripts/RossAscends-mods.js
@@ -210,10 +210,12 @@ $("#character_popup").on("input", function () { countTokensDebounced(); });
 //function:
 export function RA_CountCharTokens() {
     let total_tokens = 0;
+    let permanent_tokens = 0;
 
     $('[data-token-counter]').each(function () {
         const counter = $(this);
         const input = $(document.getElementById(counter.data('token-counter')));
+        const isPermanent = counter.data('token-permanent') === true;
         const value = String(input.val());
 
         if (input.length === 0) {
@@ -230,10 +232,12 @@ export function RA_CountCharTokens() {
 
         if (input.data('last-value-hash') === valueHash) {
             total_tokens += Number(counter.text());
+            permanent_tokens += isPermanent ? Number(counter.text()) : 0;
         } else {
             const tokens = getTokenCount(value);
             counter.text(tokens);
             total_tokens += tokens;
+            permanent_tokens += isPermanent ? tokens : 0;
             input.data('last-value-hash', valueHash);
         }
     });
@@ -242,6 +246,7 @@ export function RA_CountCharTokens() {
     const tokenLimit = Math.max(((main_api !== 'openai' ? max_context : oai_settings.openai_max_context) / 2), 1024);
     const showWarning = (total_tokens > tokenLimit);
     $('#result_info_total_tokens').text(total_tokens);
+    $('#result_info_permanent_tokens').text(permanent_tokens);
     $('#result_info_text').toggleClass('neutral_warning', showWarning);
     $('#chartokenwarning').toggle(showWarning);
 }
diff --git a/public/style.css b/public/style.css
index ef21e17c7..daa55b596 100644
--- a/public/style.css
+++ b/public/style.css
@@ -1172,7 +1172,7 @@ input[type="file"] {
 #rm_ch_create_block {
     display: none;
     overflow-y: auto;
-    padding: 0 5px;
+    padding: 5px;
     height: 100%;
 }
 
@@ -1767,10 +1767,17 @@ grammarly-extension {
 #result_info {
     font-size: calc(var(--mainFontSize) * 0.9);
     display: flex;
-    align-items: baseline;
+    align-items: center;
     gap: 10px;
 }
 
+#result_info_text {
+    display: flex;
+    flex-direction: column;
+    line-height: 1;
+    text-align: right;
+}
+
 .rm_stats_button {
     cursor: pointer;
 }

From 3dbdd1258e095121f102b3a667f02b5e3c671eaf Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sun, 10 Sep 2023 02:30:23 +0300
Subject: [PATCH 3/3] Don't close the panels when dismissing toasts

---
 public/script.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/script.js b/public/script.js
index 73442f5f8..ecc170884 100644
--- a/public/script.js
+++ b/public/script.js
@@ -8468,6 +8468,7 @@ jQuery(async function () {
             '#world_popup',
             '.ui-widget',
             '.text_pole',
+            '#toast-container',
         ];
         for (const id of forbiddenTargets) {
             if (clickTarget.closest(id).length > 0) {