From 7bd6e11adcf501ddca3c87a4bca2aa96e2a4d122 Mon Sep 17 00:00:00 2001
From: ebolam <ebolam@gmail.com>
Date: Wed, 7 Sep 2022 17:36:40 -0400
Subject: [PATCH 01/20] fix for arguments being ignored

---
 aiserver.py          | 17 ++++++++++-------
 koboldai_settings.py |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/aiserver.py b/aiserver.py
index e344a657..25785c84 100644
--- a/aiserver.py
+++ b/aiserver.py
@@ -1040,7 +1040,14 @@ def general_startup(override_args=None):
         args = parser.parse_args(shlex.split(os.environ["KOBOLDAI_ARGS"]))
     else:
         args = parser.parse_args()
-
+    
+    #load system and user settings
+    for setting in ['user_settings', 'system_settings']:
+        if os.path.exists("settings/{}.v2_settings".format(setting)):
+            with open("settings/{}.v2_settings".format(setting), "r") as settings_file:
+                getattr(koboldai_vars, "_{}".format(setting)).from_json(settings_file.read())
+    
+    
     temp = [x for x in vars(args)]
     for arg in temp:
         if arg == "path":
@@ -1102,7 +1109,9 @@ def general_startup(override_args=None):
         koboldai_vars.host = True;
 
     if args.host:
+        print("setting host")
         koboldai_vars.host = True;
+        print("koboldai_vars.host: {}".format(koboldai_vars.host))
 
     if args.cpu:
         koboldai_vars.use_colab_tpu = False
@@ -1132,11 +1141,6 @@ def general_startup(override_args=None):
     koboldai_settings.queue = multiprocessing.Queue()
     socketio.start_background_task(socket_io_relay, koboldai_settings.queue, socketio)
     
-    #load system and user settings
-    for setting in ['user_settings', 'system_settings']:
-        if os.path.exists("settings/{}.v2_settings".format(setting)):
-            with open("settings/{}.v2_settings".format(setting), "r") as settings_file:
-                getattr(koboldai_vars, "_{}".format(setting)).from_json(settings_file.read())
         
 #==================================================================#
 # Load Model
@@ -10501,7 +10505,6 @@ if __name__ == "__main__":
             print("{0}Webserver has started, you can now connect to this machine at port {1}{2}"
                   .format(colors.GREEN, port, colors.END))
         koboldai_vars.serverstarted = True
-        
         socketio.run(app, host='0.0.0.0', port=port)
     else:
         if args.unblock:
diff --git a/koboldai_settings.py b/koboldai_settings.py
index abf0c6fb..06db24ce 100644
--- a/koboldai_settings.py
+++ b/koboldai_settings.py
@@ -705,7 +705,7 @@ class user_settings(settings):
         
 class system_settings(settings):
     local_only_variables = ['socketio', 'lua_state', 'lua_logname', 'lua_koboldbridge', 'lua_kobold', 'lua_koboldcore', 'regex_sl', 'acregex_ai', 'acregex_ui', 'comregex_ai', 'comregex_ui', 'sp', '_horde_pid']
-    no_save_variables = ['socketio', 'lua_state', 'lua_logname', 'lua_koboldbridge', 'lua_kobold', 'lua_koboldcore', 'sp', '_horde_pid', 'horde_share']
+    no_save_variables = ['socketio', 'lua_state', 'lua_logname', 'lua_koboldbridge', 'lua_kobold', 'lua_koboldcore', 'sp', '_horde_pid', 'horde_share', 'aibusy', 'serverstarted']
     settings_name = "system"
     def __init__(self, socketio):
         self.socketio = socketio

From ed62f852ecfe3fd4b9206ba6219e436703bf1b76 Mon Sep 17 00:00:00 2001
From: ebolam <ebolam@gmail.com>
Date: Wed, 7 Sep 2022 19:47:33 -0400
Subject: [PATCH 02/20] Fix for abort

---
 aiserver.py              | 19 ++++++++++---------
 koboldai_settings.py     | 13 +++++++++----
 static/koboldai.css      |  5 +++++
 templates/index_new.html |  2 +-
 4 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/aiserver.py b/aiserver.py
index 25785c84..49aabc34 100644
--- a/aiserver.py
+++ b/aiserver.py
@@ -918,17 +918,17 @@ def loadsettings():
 #  Load a soft prompt from a file
 #==================================================================#
 
-def check_for_sp_change():
-    while(True):
-        time.sleep(0.05)
-
-        if(koboldai_vars.sp_changed):
-            with app.app_context():
-                emit('from_server', {'cmd': 'spstatitems', 'data': {koboldai_vars.spfilename: koboldai_vars.spmeta} if koboldai_vars.allowsp and len(koboldai_vars.spfilename) else {}}, namespace=None, broadcast=True, room="UI_1")
-            koboldai_vars.sp_changed = False
+#def check_for_sp_change():
+#    while(True):
+#        time.sleep(0.05)
+#
+#        if(koboldai_vars.sp_changed):
+#            with app.app_context():
+#                emit('from_server', {'cmd': 'spstatitems', 'data': {koboldai_vars.spfilename: koboldai_vars.spmeta} if koboldai_vars.allowsp and len(koboldai_vars.spfilename) else {}}, namespace=None, broadcast=True, room="UI_1")
+#            koboldai_vars.sp_changed = False
 
 
-socketio.start_background_task(check_for_sp_change)
+#socketio.start_background_task(check_for_sp_change)
 
 def spRequest(filename):
     if(not koboldai_vars.allowsp):
@@ -1798,6 +1798,7 @@ def patch_transformers():
             if(koboldai_vars.abort or koboldai_vars.generated_tkns >= koboldai_vars.genamt):
                 self.regeneration_required = False
                 self.halt = False
+                koboldai_vars.abort = False
                 return True
             if(koboldai_vars.standalone):
                 return False
diff --git a/koboldai_settings.py b/koboldai_settings.py
index 06db24ce..cbdb3c44 100644
--- a/koboldai_settings.py
+++ b/koboldai_settings.py
@@ -317,7 +317,7 @@ class koboldai_vars(object):
         #    return getattr(self._story_settings[self._sessions['story']], name)
         else:
             return getattr(self._story_settings['default'], name)
-        
+
 
 class settings(object):
     def to_json(self):
@@ -796,9 +796,14 @@ class system_settings(settings):
         if name not in self.local_only_variables and name[0] != "_" and not new_variable:
             process_variable_changes(self.socketio, self.__class__.__name__.replace("_settings", ""), name, value, old_value)
             
-            if name == "aibusy" and value == False:
-                koboldai_vars.abort = False
-                
+            #if name == "aibusy" and value == False and self.abort == True:
+            #    koboldai_vars.abort = False
+            
+            #for original UI
+            if name == 'sp_changed':
+                self.socketio.emit('from_server', {'cmd': 'spstatitems', 'data': {koboldai_vars.spfilename: koboldai_vars.spmeta} if koboldai_vars.allowsp and len(koboldai_vars.spfilename) else {}}, namespace=None, broadcast=True, room="UI_1")
+                self.sp_changed = False
+            
             if name == 'horde_share':
                 if self.on_colab == False:
                     if os.path.exists("./KoboldAI-Horde"):
diff --git a/static/koboldai.css b/static/koboldai.css
index 548e054a..5fda3e58 100644
--- a/static/koboldai.css
+++ b/static/koboldai.css
@@ -1403,6 +1403,11 @@ body {
 	height: 0px;
 }
 
+.statusbar_outer[system_aibusy="false"] {
+	display: none;
+	height: 0px;
+}
+
 .statusbar_inner {
 	background-color: var(--statusbar_color);
 	color: var(--statusbar_text_color);
diff --git a/templates/index_new.html b/templates/index_new.html
index ec6884c3..e8f27c4d 100644
--- a/templates/index_new.html
+++ b/templates/index_new.html
@@ -80,7 +80,7 @@
 																											document.getElementById("themetext").value = "";
 																										}'
 																										onkeyup="calc_token_usage()"></textarea>
-			<div class="statusbar_outer hidden" id="status_bar" onclick="socket.emit('abort','');">
+			<div class="statusbar_outer hidden var_sync_alt_system_aibusy" id="status_bar" onclick="socket.emit('abort','');">
 				<div class="statusbar_inner" style="width:0%" onclick="socket.emit('abort','');">0%</div>
 			</div><br>
 			<button type="button" class="btn action_button submit var_sync_alt_system_aibusy" system_aibusy=False id="btnsubmit" 

From 9e66f42f5d0486c37ed42a5ff2d0966395e56d3d Mon Sep 17 00:00:00 2001
From: ebolam <ebolam@gmail.com>
Date: Wed, 7 Sep 2022 20:12:21 -0400
Subject: [PATCH 03/20] Cookie Saving for Colab - Needs work

---
 aiserver.py          | 21 ++++++++++++---------
 koboldai_settings.py |  1 +
 static/koboldai.js   | 45 ++++++++++++++++++++++++++++----------------
 3 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/aiserver.py b/aiserver.py
index 49aabc34..50bad101 100644
--- a/aiserver.py
+++ b/aiserver.py
@@ -6776,7 +6776,7 @@ def new_ui_index():
 def ui2_connect():
     #Send all variables to client
     koboldai_vars.send_to_ui()
-    UI_2_load_tweaks()
+    UI_2_load_cookies()
     pass
     
 #==================================================================#
@@ -7692,19 +7692,22 @@ def UI_2_theme_list_refresh(data):
 #==================================================================#
 # Save Tweaks
 #==================================================================#
-@socketio.on('save_tweaks')
-def UI_2_save_tweaks(data):
-    with open("./settings/tweaks.settings", "w") as f:
-        f.write(data)
+@socketio.on('save_cookies')
+def UI_2_save_cookies(data):
+    for key in data:
+        #Note this won't sync to the client automatically as we're modifying a variable rather than setting it
+        koboldai_vars.cookies[key] = data[key]
+    with open("./settings/cookies.settings", "w") as f:
+        f.write(json.dumps(koboldai_vars.cookies))
 
 #==================================================================#
 # Load Tweaks
 #==================================================================#
-def UI_2_load_tweaks():
+def UI_2_load_cookies():
     if koboldai_vars.on_colab:
-        if os.path.exists("./settings/tweaks.settings"):
-            with open("./settings/tweaks.settings", "r") as f:
-                socketio.emit('load_tweaks', f.read(), room="UI2")
+        if os.path.exists("./settings/cookies.settings"):
+            with open("./settings/cookies.settings", "r") as f:
+                socketio.emit('load_cookies', json.load(f), room="UI2")
 
 #==================================================================#
 # Test
diff --git a/koboldai_settings.py b/koboldai_settings.py
index cbdb3c44..a985d0e7 100644
--- a/koboldai_settings.py
+++ b/koboldai_settings.py
@@ -782,6 +782,7 @@ class system_settings(settings):
         print("Colab Check: {}".format(self.on_colab))
         self.horde_share = False
         self._horde_pid = None
+        self.cookies = {} #cookies for colab since colab's URL changes, cookies are lost
         
         
     def __setattr__(self, name, value):
diff --git a/static/koboldai.js b/static/koboldai.js
index 2ce5e3d9..3d4e738e 100644
--- a/static/koboldai.js
+++ b/static/koboldai.js
@@ -25,7 +25,7 @@ socket.on("world_info_folder", function(data){world_info_folder(data);});
 socket.on("delete_new_world_info_entry", function(data){document.getElementById("world_info_-1").remove();});
 socket.on("delete_world_info_entry", function(data){document.getElementById("world_info_"+data).remove();});
 socket.on("error", function(data){show_error_message(data);});
-socket.on('load_tweaks', function(data){load_tweaks(data);});
+socket.on('load_cookies', function(data){load_cookies(data);});
 //socket.onAny(function(event_name, data) {console.log({"event": event_name, "class": data.classname, "data": data});});
 
 var presets = {};
@@ -2025,17 +2025,20 @@ function save_tweaks() {
 		let path = tweakContainer.getAttribute("tweak-path");
 		if (toggle.checked) out.push(path);
 	}
-
-	if (on_colab) {
-		socket.emit("save_tweaks", JSON.stringify(out));
-	} else {
-		setCookie("enabledTweaks", JSON.stringify(out));
-	}
+	setCookie("enabledTweaks", JSON.stringify(out));
 }
 
 
-function load_tweaks(data) {
-	let enabledTweaks = JSON.parse(data);
+function load_cookies(data) {
+	for (cookie of data) {
+		setCookie(cookie, data[cookie]);
+	}
+	process_cookies();
+}
+
+function load_tweaks() {
+	
+	let enabledTweaks = JSON.parse(getCookie("enabledTweaks", "[]"));
 
 	for (const tweakContainer of document.getElementsByClassName("tweak-container")) {
 		let toggle = tweakContainer.querySelector("input");
@@ -3093,6 +3096,9 @@ function setCookie(cname, cvalue, exdays=60) {
   const d = new Date();
   d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000));
   let expires = "expires="+d.toUTCString();
+  if (document.getElementById("on_colab").textContent == "true") {
+	socket.emit("save_cookies", {cname: cvavlue});
+  }
   document.cookie = cname + "=" + cvalue + ";" + expires + ";";
 }
 
@@ -3380,13 +3386,7 @@ function open_finder() {
 	finderInput.focus();
 }
 
-$(document).ready(function(){
-	on_colab = document.getElementById("on_colab").textContent == "true";
-
-	create_theming_elements();
-	document.onkeydown = detect_key_down;
-	document.onkeyup = detect_key_up;
-	document.getElementById("input_text").onkeydown = detect_enter_submit;
+function process_cookies() {
 	if (getCookie("Settings_Pin") == "false") {
 		settings_unpin();
 	} else {
@@ -3399,6 +3399,19 @@ $(document).ready(function(){
 	}
 	preserve_game_space(!(getCookie("preserve_game_space") == "false"));
 	options_on_right(!(getCookie("options_on_right") == "false"));
+	
+	load_tweaks();
+}
+
+$(document).ready(function(){
+	on_colab = document.getElementById("on_colab").textContent == "true";
+
+	create_theming_elements();
+	document.onkeydown = detect_key_down;
+	document.onkeyup = detect_key_up;
+	document.getElementById("input_text").onkeydown = detect_enter_submit;
+	
+	process_cookies();
 
 
 	// Tweak registering

From b73fd4b9c36c7307f016907d4b4fdaa7ca05954b Mon Sep 17 00:00:00 2001
From: ebolam <ebolam@gmail.com>
Date: Thu, 8 Sep 2022 17:17:47 -0400
Subject: [PATCH 04/20] Fix for cookie storage

---
 static/koboldai.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/koboldai.js b/static/koboldai.js
index 3d4e738e..20aaddf3 100644
--- a/static/koboldai.js
+++ b/static/koboldai.js
@@ -285,7 +285,7 @@ function do_story_text_updates(data) {
 		
 		story_area.append(span);
 		clearTimeout(game_text_scroll_timeout);
-		game_text_scroll_timeout = setTimeout(function() {span.scrollIntoView(false);}, 200);
+		game_text_scroll_timeout = setTimeout(function() {document.getElementById('gamescreen').scrollTo(0, document.body.scrollHeight);}, 200);
 		if (span.textContent != "") {
 			assign_world_info_to_action(span, null);
 		}
@@ -2030,7 +2030,7 @@ function save_tweaks() {
 
 
 function load_cookies(data) {
-	for (cookie of data) {
+	for (const cookie of Object.keys(data)) {
 		setCookie(cookie, data[cookie]);
 	}
 	process_cookies();

From 04cf1851e6bc36625d44d6756c4af8817f093c0f Mon Sep 17 00:00:00 2001
From: ebolam <ebolam@gmail.com>
Date: Thu, 8 Sep 2022 17:22:06 -0400
Subject: [PATCH 05/20] Colab fix

---
 koboldai_settings.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/koboldai_settings.py b/koboldai_settings.py
index a985d0e7..5d75c023 100644
--- a/koboldai_settings.py
+++ b/koboldai_settings.py
@@ -35,7 +35,8 @@ def process_variable_changes(socketio, classname, name, value, old_value, debug_
                 #If we got a variable change from a thread other than what the app is run it, eventlet seems to block and no further messages are sent. Instead, we'll rely the message to the app and have the main thread send it
                 if not has_request_context():
                     data = ["var_changed", {"classname": classname, "name": name, "old_value": clean_var_for_emit(old_value), "value": clean_var_for_emit(value)}, {"include_self":True, "broadcast":True, "room":"UI_2"}]
-                    queue.put(data)
+                    if queue is not None:
+                        queue.put(data)
                         
                 else:
                     socketio.emit("var_changed", {"classname": classname, "name": name, "old_value": clean_var_for_emit(old_value), "value": clean_var_for_emit(value)}, include_self=True, broadcast=True, room="UI_2")

From c792cefc976a147d702b2de72e171eadfe3f5a4f Mon Sep 17 00:00:00 2001
From: ebolam <ebolam@gmail.com>
Date: Thu, 8 Sep 2022 17:31:27 -0400
Subject: [PATCH 06/20] Fix

---
 koboldai_settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/koboldai_settings.py b/koboldai_settings.py
index 5d75c023..f9c27248 100644
--- a/koboldai_settings.py
+++ b/koboldai_settings.py
@@ -803,7 +803,7 @@ class system_settings(settings):
             
             #for original UI
             if name == 'sp_changed':
-                self.socketio.emit('from_server', {'cmd': 'spstatitems', 'data': {koboldai_vars.spfilename: koboldai_vars.spmeta} if koboldai_vars.allowsp and len(koboldai_vars.spfilename) else {}}, namespace=None, broadcast=True, room="UI_1")
+                self.socketio.emit('from_server', {'cmd': 'spstatitems', 'data': {self.spfilename: self.spmeta} if self.allowsp and len(self.spfilename) else {}}, namespace=None, broadcast=True, room="UI_1")
                 self.sp_changed = False
             
             if name == 'horde_share':

From c4ec92abdf1a38731534a148301f10cdc49f5384 Mon Sep 17 00:00:00 2001
From: ebolam <ebolam@gmail.com>
Date: Thu, 8 Sep 2022 17:45:31 -0400
Subject: [PATCH 07/20] Bug fix

---
 koboldai_settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/koboldai_settings.py b/koboldai_settings.py
index f9c27248..48e834bb 100644
--- a/koboldai_settings.py
+++ b/koboldai_settings.py
@@ -804,7 +804,7 @@ class system_settings(settings):
             #for original UI
             if name == 'sp_changed':
                 self.socketio.emit('from_server', {'cmd': 'spstatitems', 'data': {self.spfilename: self.spmeta} if self.allowsp and len(self.spfilename) else {}}, namespace=None, broadcast=True, room="UI_1")
-                self.sp_changed = False
+                super().__setattr__("sp_changed", False)
             
             if name == 'horde_share':
                 if self.on_colab == False:

From eb0f59bdfbf12cb7da6aee47c0d53b3b628b431b Mon Sep 17 00:00:00 2001
From: ebolam <ebolam@gmail.com>
Date: Thu, 8 Sep 2022 18:00:57 -0400
Subject: [PATCH 08/20] Cookie Fix

---
 aiserver.py        | 3 +++
 static/koboldai.js | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/aiserver.py b/aiserver.py
index 50bad101..bfc03647 100644
--- a/aiserver.py
+++ b/aiserver.py
@@ -7694,9 +7694,12 @@ def UI_2_theme_list_refresh(data):
 #==================================================================#
 @socketio.on('save_cookies')
 def UI_2_save_cookies(data):
+    print("Adding: {}".format(data))
+    print("to: {}".format(koboldai_vars.cookies))
     for key in data:
         #Note this won't sync to the client automatically as we're modifying a variable rather than setting it
         koboldai_vars.cookies[key] = data[key]
+    print("Updated: {}".format(koboldai_vars.cookies))
     with open("./settings/cookies.settings", "w") as f:
         f.write(json.dumps(koboldai_vars.cookies))
 
diff --git a/static/koboldai.js b/static/koboldai.js
index 20aaddf3..547b5155 100644
--- a/static/koboldai.js
+++ b/static/koboldai.js
@@ -3097,7 +3097,7 @@ function setCookie(cname, cvalue, exdays=60) {
   d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000));
   let expires = "expires="+d.toUTCString();
   if (document.getElementById("on_colab").textContent == "true") {
-	socket.emit("save_cookies", {cname: cvavlue});
+	socket.emit("save_cookies", {[cname]: cvalue});
   }
   document.cookie = cname + "=" + cvalue + ";" + expires + ";";
 }

From b182d8dfecb0b4a0d90639d5f17abf9bcc4c2ff0 Mon Sep 17 00:00:00 2001
From: ebolam <ebolam@gmail.com>
Date: Thu, 8 Sep 2022 19:33:29 -0400
Subject: [PATCH 09/20] Colab Cookie Saving Correction

---
 aiserver.py        |  3 ---
 static/koboldai.js | 16 ++++++++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/aiserver.py b/aiserver.py
index bfc03647..50bad101 100644
--- a/aiserver.py
+++ b/aiserver.py
@@ -7694,12 +7694,9 @@ def UI_2_theme_list_refresh(data):
 #==================================================================#
 @socketio.on('save_cookies')
 def UI_2_save_cookies(data):
-    print("Adding: {}".format(data))
-    print("to: {}".format(koboldai_vars.cookies))
     for key in data:
         #Note this won't sync to the client automatically as we're modifying a variable rather than setting it
         koboldai_vars.cookies[key] = data[key]
-    print("Updated: {}".format(koboldai_vars.cookies))
     with open("./settings/cookies.settings", "w") as f:
         f.write(json.dumps(koboldai_vars.cookies))
 
diff --git a/static/koboldai.js b/static/koboldai.js
index 547b5155..e6ed804b 100644
--- a/static/koboldai.js
+++ b/static/koboldai.js
@@ -3389,16 +3389,24 @@ function open_finder() {
 function process_cookies() {
 	if (getCookie("Settings_Pin") == "false") {
 		settings_unpin();
-	} else {
+	} else if (getCookie("Settings_Pin") == "true") {
 		settings_pin();
 	}
 	if (getCookie("Story_Pin") == "true") {
 		story_pin();
-	} else {
+	} else if (getCookie("Story_Pin") == "false") {
 		story_unpin();
 	}
-	preserve_game_space(!(getCookie("preserve_game_space") == "false"));
-	options_on_right(!(getCookie("options_on_right") == "false"));
+	if (getCookie("preserve_game_space") == "false") {
+		preserve_game_space(false);
+	} else if (getCookie("preserve_game_space") == "true") {
+		preserve_game_space(true);
+	}
+	if (getCookie("options_on_right") == "false") {
+		options_on_right(false);
+	} else if (getCookie("options_on_right") == "true") {
+		options_on_right(true);
+	}
 	
 	load_tweaks();
 }

From 9b10e290696d26663ef090d8ad62ce6727cf1280 Mon Sep 17 00:00:00 2001
From: ebolam <ebolam@gmail.com>
Date: Thu, 8 Sep 2022 20:05:27 -0400
Subject: [PATCH 10/20] Colab cookie Fix

---
 aiserver.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/aiserver.py b/aiserver.py
index 50bad101..59576f8a 100644
--- a/aiserver.py
+++ b/aiserver.py
@@ -7707,7 +7707,8 @@ def UI_2_load_cookies():
     if koboldai_vars.on_colab:
         if os.path.exists("./settings/cookies.settings"):
             with open("./settings/cookies.settings", "r") as f:
-                socketio.emit('load_cookies', json.load(f), room="UI2")
+                data = json.load(f)
+                socketio.emit('load_cookies', data, room="UI_2")
 
 #==================================================================#
 # Test

From 6543f23ddbd17982083db96e616c10441e11707e Mon Sep 17 00:00:00 2001
From: ebolam <ebolam@gmail.com>
Date: Thu, 8 Sep 2022 20:43:22 -0400
Subject: [PATCH 11/20] Fix

---
 static/koboldai.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/static/koboldai.js b/static/koboldai.js
index e6ed804b..642f7f5c 100644
--- a/static/koboldai.js
+++ b/static/koboldai.js
@@ -25,7 +25,7 @@ socket.on("world_info_folder", function(data){world_info_folder(data);});
 socket.on("delete_new_world_info_entry", function(data){document.getElementById("world_info_-1").remove();});
 socket.on("delete_world_info_entry", function(data){document.getElementById("world_info_"+data).remove();});
 socket.on("error", function(data){show_error_message(data);});
-socket.on('load_cookies', function(data){load_cookies(data);});
+socket.on('load_cookies', function(data){colab_cookies = data;});
 //socket.onAny(function(event_name, data) {console.log({"event": event_name, "class": data.classname, "data": data});});
 
 var presets = {};
@@ -43,6 +43,7 @@ var world_info_folder_data = {};
 var saved_settings = {};
 var finder_selection_index = -1;
 var on_colab;
+var colab_cookies = null;
 
 // name, desc, icon, func
 const finder_actions = [
@@ -2029,13 +2030,6 @@ function save_tweaks() {
 }
 
 
-function load_cookies(data) {
-	for (const cookie of Object.keys(data)) {
-		setCookie(cookie, data[cookie]);
-	}
-	process_cookies();
-}
-
 function load_tweaks() {
 	
 	let enabledTweaks = JSON.parse(getCookie("enabledTweaks", "[]"));
@@ -3414,6 +3408,13 @@ function process_cookies() {
 $(document).ready(function(){
 	on_colab = document.getElementById("on_colab").textContent == "true";
 
+	if (colab_cookies != null) {
+		for (const cookie of Object.keys(colab_cookies)) {
+			setCookie(cookie, colab_cookies[cookie]);
+		}	
+		colab_cookies = null;
+	}
+
 	create_theming_elements();
 	document.onkeydown = detect_key_down;
 	document.onkeyup = detect_key_up;

From d040681457ed786aa2e37374e1f3baa803b951b1 Mon Sep 17 00:00:00 2001
From: somebody <onesome01@protonmail.com>
Date: Thu, 8 Sep 2022 21:15:32 -0500
Subject: [PATCH 12/20] WI Extra data hack

---
 aiserver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aiserver.py b/aiserver.py
index 59576f8a..207aca64 100644
--- a/aiserver.py
+++ b/aiserver.py
@@ -258,7 +258,7 @@ app.secret_key = secrets.token_hex()
 app.config['SESSION_TYPE'] = 'filesystem'
 app.config['TEMPLATES_AUTO_RELOAD'] = True
 Session(app)
-socketio = SocketIO(app, async_method="eventlet", manage_session=False, cors_allowed_origins='*')
+socketio = SocketIO(app, async_method="eventlet", manage_session=False, cors_allowed_origins='*', max_http_buffer_size=10_000_000)
 #socketio = SocketIO(app, async_method="eventlet", manage_session=False, cors_allowed_origins='*', logger=True, engineio_logger=True)
 koboldai_vars = koboldai_settings.koboldai_vars(session, socketio)
 

From e5fa6c9e8a42cf133b9abd0bcfa551149b3a932b Mon Sep 17 00:00:00 2001
From: ebolam <ebolam@gmail.com>
Date: Fri, 9 Sep 2022 10:17:51 -0400
Subject: [PATCH 13/20] Additional fix for colab tweak saving

---
 static/koboldai.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/static/koboldai.js b/static/koboldai.js
index 642f7f5c..9a911534 100644
--- a/static/koboldai.js
+++ b/static/koboldai.js
@@ -25,7 +25,7 @@ socket.on("world_info_folder", function(data){world_info_folder(data);});
 socket.on("delete_new_world_info_entry", function(data){document.getElementById("world_info_-1").remove();});
 socket.on("delete_world_info_entry", function(data){document.getElementById("world_info_"+data).remove();});
 socket.on("error", function(data){show_error_message(data);});
-socket.on('load_cookies', function(data){colab_cookies = data;});
+socket.on('load_cookies', function(data){load_cookies(data)});
 //socket.onAny(function(event_name, data) {console.log({"event": event_name, "class": data.classname, "data": data});});
 
 var presets = {};
@@ -1870,6 +1870,17 @@ function do_wpp(wpp_area) {
 	send_world_info(uid);
 }
 
+function load_cookies(data) {
+	colab_cookies = data;
+	if (document.readyState === 'complete') {
+		for (const cookie of Object.keys(colab_cookies)) {
+			setCookie(cookie, colab_cookies[cookie]);
+		}
+		process_cookies();
+		colab_cookies = null;
+	}
+}
+
 //--------------------------------------------UI to Server Functions----------------------------------
 function unload_userscripts() {
 	files_to_unload = document.getElementById('loaded_userscripts');

From 18faa7cabb77a44245e048670636fcc59dfda29f Mon Sep 17 00:00:00 2001
From: ebolam <ebolam@gmail.com>
Date: Fri, 9 Sep 2022 10:20:17 -0400
Subject: [PATCH 14/20] Another fix

---
 aiserver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aiserver.py b/aiserver.py
index 207aca64..7cfde87a 100644
--- a/aiserver.py
+++ b/aiserver.py
@@ -7698,7 +7698,7 @@ def UI_2_save_cookies(data):
         #Note this won't sync to the client automatically as we're modifying a variable rather than setting it
         koboldai_vars.cookies[key] = data[key]
     with open("./settings/cookies.settings", "w") as f:
-        f.write(json.dumps(koboldai_vars.cookies))
+        json.dump(koboldai_vars.cookies, f)
 
 #==================================================================#
 # Load Tweaks

From a2f49caa0214f1788e56fc6fa445e3706447eb01 Mon Sep 17 00:00:00 2001
From: ebolam <ebolam@gmail.com>
Date: Fri, 9 Sep 2022 14:03:28 -0400
Subject: [PATCH 15/20] Change debug prints to only print with --debug

---
 aiserver.py | 69 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 41 insertions(+), 28 deletions(-)

diff --git a/aiserver.py b/aiserver.py
index 7cfde87a..38a4fbf5 100644
--- a/aiserver.py
+++ b/aiserver.py
@@ -6792,10 +6792,12 @@ def ui2_serve_themes(path):
 #==================================================================#
 @socketio.on('upload_file')
 def upload_file(data):
-    print("upload_file {}".format(data['filename']))
+    if koboldai_vars.debug:
+        print("upload_file {}".format(data['filename']))
     if 'current_folder' in session:
         path = os.path.abspath(os.path.join(session['current_folder'], data['filename']).replace("\\", "/")).replace("\\", "/")
-        print("Want to save to {}".format(path))
+        if koboldai_vars.debug:
+            print("Want to save to {}".format(path))
         if 'popup_jailed_dir' not in session:
             print("Someone is trying to upload a file to your server. Blocked.")
         elif session['popup_jailed_dir'] is None:
@@ -6815,7 +6817,8 @@ def upload_file(data):
 
 @socketio.on('popup_change_folder')
 def popup_change_folder(data):
-    print("Doing popup change folder: {}".format(data))
+    if koboldai_vars.debug:
+        print("Doing popup change folder: {}".format(data))
     if 'popup_jailed_dir' not in session:
         print("Someone is trying to get at files in your server. Blocked.")
         return
@@ -7104,7 +7107,8 @@ def UI_2_var_change(data):
 #==================================================================#
 @socketio.on('save_story')
 def UI_2_save_story(data):
-    print("Saving Story")
+    if koboldai_vars.debug:
+        print("Saving Story")
     if data is None:
         #We need to check to see if there is a file already and if it's not the same story so we can ask the client if this is OK
         save_name = koboldai_vars.story_name if koboldai_vars.story_name != "" else "untitled"
@@ -7143,7 +7147,8 @@ def UI_2_save_to_json():
 #==================================================================#
 @socketio.on('Set Selected Text')
 def UI_2_Set_Selected_Text(data):
-    print("Updating Selected Text: {}".format(data))
+    if koboldai_vars.quiet:
+        print("Updating Selected Text: {}".format(data))
     koboldai_vars.actions[int(data['id'])] = data['text']
 
 #==================================================================#
@@ -7163,16 +7168,17 @@ def UI_2_Use_Option_Text(data):
 #==================================================================#
 @socketio.on('submit')
 def UI_2_submit(data):
-    print(data)
     if not koboldai_vars.noai and data['theme'] != "":
-        print("doing random prompt")
+        if koboldai_vars.debug:
+            print("doing random prompt")
         memory = koboldai_vars.memory
         koboldai_vars.memory = "{}\n\nYou generate the following {} story concept :".format(koboldai_vars.memory, data['theme'])
         koboldai_vars.lua_koboldbridge.feedback = None
         actionsubmit("", force_submit=True, force_prompt_gen=True)
         koboldai_vars.memory = memory
     else:
-        print("doing normal input")
+        if koboldai_vars.debug:
+            print("doing normal input")
         koboldai_vars.actions.clear_unused_options()
         koboldai_vars.lua_koboldbridge.feedback = None
         koboldai_vars.recentrng = koboldai_vars.recentrngm = None
@@ -7186,9 +7192,9 @@ def UI_2_submit(data):
 #==================================================================#
 @socketio.on('abort')
 def UI_2_abort(data):
-    print("got abort")
+    if koboldai_vars.debug:
+        print("got abort")
     koboldai_vars.abort = True
-    print(koboldai_vars.abort)
 
  
 #==================================================================#
@@ -7203,7 +7209,8 @@ def UI_2_Pinning(data):
 #==================================================================#
 @socketio.on('back')
 def UI_2_back(data):
-    print("back")
+    if koboldai_vars.debug:
+        print("back")
     koboldai_vars.actions.clear_unused_options()
     ignore = koboldai_vars.actions.pop()
     
@@ -7241,7 +7248,6 @@ def UI_2_load_model_button(data):
 #==================================================================#
 @socketio.on('select_model')
 def UI_2_select_model(data):
-    print(data)
     
     #We've selected a menu
     if data['model'] in model_menu:
@@ -7265,7 +7271,6 @@ def UI_2_select_model(data):
 #==================================================================#
 @socketio.on('load_model')
 def UI_2_load_model(data):
-    print(data)
     if not os.path.exists("settings/"):
         os.mkdir("settings")
     changed = True
@@ -7361,7 +7366,8 @@ def story_sort(base_path, desc=False):
 #==================================================================#
 @socketio.on('load_story')
 def UI_2_load_story(file):
-    print("loading {}".format(file))
+    if koboldai_vars.debug:
+        print("loading {}".format(file))
     loadRequest(file)
 
 #==================================================================#
@@ -7377,7 +7383,6 @@ def UI_2_new_story(data):
 #==================================================================#
 @socketio.on('move_wi')
 def UI_2_move_wi(data):
-    print(data)
     if data['folder'] is None:
         koboldai_vars.worldinfo_v2.reorder(int(data['dragged_id']), int(data['drop_id']))
     else:
@@ -7388,7 +7393,6 @@ def UI_2_move_wi(data):
 #==================================================================#
 @socketio.on('wi_set_folder')
 def UI_2_wi_set_folder(data):
-    print(data)
     koboldai_vars.worldinfo_v2.add_item_to_folder(int(data['dragged_id']), data['folder'])
 
 #==================================================================#
@@ -7396,8 +7400,9 @@ def UI_2_wi_set_folder(data):
 #==================================================================#
 @socketio.on('Rename_World_Info_Folder')
 def UI_2_Rename_World_Info_Folder(data):
-    print("Rename_World_Info_Folder")
-    print(data)
+    if koboldai_vars.debug:
+        print("Rename_World_Info_Folder")
+        print(data)
     koboldai_vars.worldinfo_v2.rename_folder(data['old_folder'], data['new_folder'])
 
 #==================================================================#
@@ -7405,8 +7410,9 @@ def UI_2_Rename_World_Info_Folder(data):
 #==================================================================#
 @socketio.on('edit_world_info')
 def UI_2_edit_world_info(data):
-    print("edit_world_info")
-    print(data)
+    if koboldai_vars.debug:
+        print("edit_world_info")
+        print(data)
     
     if data['uid'] < 0:
         koboldai_vars.worldinfo_v2.add_item(data['title'], data['key'], 
@@ -7491,7 +7497,6 @@ def UI_2_import_world_info(data):
 #==================================================================#
 @socketio.on('phrase_bias_update')
 def UI_2_phrase_bias_update(biases):
-    print(biases)
     koboldai_vars.biases = biases
 
 
@@ -7513,7 +7518,8 @@ def socket_io_relay(queue, socketio):
 # Event triggered when program errors out
 #==================================================================#
 def my_except_hook(exctype, value, traceback):
-    print("sending error to clients")
+    if koboldai_vars.debug:
+        print("sending error to clients")
     socketio.emit("error", "{}: {}".format(exctype, value), broadcast=True, room="UI_2")
     sys.__excepthook__(exctype, value, traceback)
 sys.excepthook = my_except_hook
@@ -7527,7 +7533,8 @@ def handle_exception(e):
         return e
 
     # now you're handling non-HTTP exceptions only
-    print("sending error to clients")
+    if koboldai_vars.debug:
+        print("sending error to clients")
     socketio.emit("error", "{}: {}".format(e.message, e.args), broadcast=True, room="UI_2")
     return render_template("500_generic.html", e=e), 500
 
@@ -7570,7 +7577,8 @@ def get_softprompt_desc(item_full_path, item, valid_selection):
 #==================================================================#
 @socketio.on('load_softprompt')
 def UI_2_load_softprompt(data):
-    print("Load softprompt: {}".format(data))
+    if koboldai_vars.debug:
+        print("Load softprompt: {}".format(data))
     spRequest(data)
 
 #==================================================================#
@@ -7586,7 +7594,8 @@ def UI_2_load_userscripts_list(data):
                                                                   column_widths=['200px', '150px', 'auto'])
                                                                 
 def valid_userscripts_to_load(file):
-    print("{} is valid: {}".format(file, file.endswith(".lua") and os.path.basename(file) not in koboldai_vars.userscripts))
+    if koboldai_vars.debug:
+        print("{} is valid: {}".format(file, file.endswith(".lua") and os.path.basename(file) not in koboldai_vars.userscripts))
     return file.endswith(".lua") and os.path.basename(file) not in koboldai_vars.userscripts
     
 def valid_userscripts_to_unload(file):
@@ -7637,6 +7646,7 @@ def get_userscripts_desc(item_full_path, item, valid_selection):
 #==================================================================#
 @socketio.on('load_userscripts')
 def UI_2_load_userscripts(data):
+        if koboldai_vars.debug:
     print("Loading Userscripts: {}".format(os.path.basename(data)))
     koboldai_vars.userscripts = [x for x in koboldai_vars.userscripts if x != os.path.basename(data)]+[os.path.basename(data)]
     load_lua_scripts()
@@ -7646,7 +7656,8 @@ def UI_2_load_userscripts(data):
 #==================================================================#
 @socketio.on('unload_userscripts')
 def UI_2_unload_userscripts(data):
-    print("Unloading Userscript: {}".format(data))
+    if koboldai_vars.debug:
+        print("Unloading Userscript: {}".format(data))
     koboldai_vars.userscripts = [x for x in koboldai_vars.userscripts if x != data]
     load_lua_scripts()
 
@@ -7657,7 +7668,8 @@ def UI_2_unload_userscripts(data):
 #==================================================================#
 @socketio.on('load_aidg_club')
 def UI_2_load_aidg_club(data):
-    print("Load aidg.club: {}".format(data))
+    if koboldai_vars.debug:
+        print("Load aidg.club: {}".format(data))
     importAidgRequest(data) 
 
 
@@ -7671,7 +7683,8 @@ def UI_2_theme_change(data):
         for key, value in data['theme'].items():
             f.write("\t{}: {};\n".format(key, value.replace(";", "").replace("--", "-")))
         f.write("}")
-    print("Theme Saved")
+    if koboldai_vars.debug:
+        print("Theme Saved")
 
 
 #==================================================================#

From aece9181df9152f6f4d63a8d76204f34138efddf Mon Sep 17 00:00:00 2001
From: ebolam <ebolam@gmail.com>
Date: Fri, 9 Sep 2022 15:07:28 -0400
Subject: [PATCH 16/20] Debug Print Cleanup

---
 aiserver.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/aiserver.py b/aiserver.py
index 38a4fbf5..b268eaa0 100644
--- a/aiserver.py
+++ b/aiserver.py
@@ -1109,9 +1109,7 @@ def general_startup(override_args=None):
         koboldai_vars.host = True;
 
     if args.host:
-        print("setting host")
         koboldai_vars.host = True;
-        print("koboldai_vars.host: {}".format(koboldai_vars.host))
 
     if args.cpu:
         koboldai_vars.use_colab_tpu = False
@@ -2878,7 +2876,7 @@ def lua_compute_context(submission, entries, folders, kwargs):
     )
     if koboldai_vars.alt_gen:
        txt, _, _ = koboldai_vars.calc_ai_text()
-       print("Using Alt Gen: {}".format(tokenizer.decode(txt)))
+       print("Using Alt Gen")
     else:
         txt, _, _ = calcsubmitbudget(
             len(actions),
@@ -4486,7 +4484,7 @@ def calcsubmit(txt):
     if(koboldai_vars.model != "InferKit"):
         if koboldai_vars.alt_gen:
             subtxt, min, max  = koboldai_vars.calc_ai_text(submitted_text=txt)
-            print("Using Alt Gen: {}".format(tokenizer.decode(subtxt)))
+            print("Using Alt Gen")
         else:
             subtxt, min, max = calcsubmitbudget(actionlen, winfo, mem, anotetxt, koboldai_vars.actions, submission=txt)
         if(actionlen == 0):
@@ -4634,7 +4632,7 @@ def _generate(txt, minimum, maximum, found_entries):
                 found_entries[i].update(_found_entries)
                 if koboldai_vars.alt_gen:
                    txt, _, _ = koboldai_vars.calc_ai_text(submitted_text=txt)
-                   print("Using Alt Gen: {}".format(tokenizer.decode(txt)))
+                   print("Using Alt Gen")
                 else:
                     txt, _, _ = calcsubmitbudget(len(koboldai_vars.actions), winfo, mem, anotetxt, koboldai_vars.actions, submission=txt)
                 encoded.append(torch.tensor(txt, dtype=torch.long, device=genout.device))
@@ -4715,7 +4713,6 @@ def generate(txt, minimum, maximum, found_entries=None):
             assert type(genout[-1]["generated_text"]) is str
     else:
         genout = [{"generated_text": utils.decodenewlines(tokenizer.decode(tokens[-already_generated:]))} for tokens in genout]
-    print([applyoutputformatting(x["generated_text"]) for x in genout])
     
     if(len(genout) == 1):
         genresult(genout[0]["generated_text"])

From 171bd0f1473941a8b42c18207477a86488b5ca77 Mon Sep 17 00:00:00 2001
From: ebolam <ebolam@gmail.com>
Date: Fri, 9 Sep 2022 16:00:19 -0400
Subject: [PATCH 17/20] Fix auto-scroll

---
 static/koboldai.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/koboldai.js b/static/koboldai.js
index 9a911534..8363a622 100644
--- a/static/koboldai.js
+++ b/static/koboldai.js
@@ -286,7 +286,7 @@ function do_story_text_updates(data) {
 		
 		story_area.append(span);
 		clearTimeout(game_text_scroll_timeout);
-		game_text_scroll_timeout = setTimeout(function() {document.getElementById('gamescreen').scrollTo(0, document.body.scrollHeight);}, 200);
+		game_text_scroll_timeout = setTimeout(function() {document.getElementById("Selected Text").scrollTop = document.getElementById("Selected Text").scrollHeight;}, 200);
 		if (span.textContent != "") {
 			assign_world_info_to_action(span, null);
 		}

From c945d2b15f56800df11bdd0d6e1f23f2ffa4a1da Mon Sep 17 00:00:00 2001
From: ebolam <ebolam@gmail.com>
Date: Fri, 9 Sep 2022 16:02:10 -0400
Subject: [PATCH 18/20] Fix

---
 aiserver.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aiserver.py b/aiserver.py
index b268eaa0..fbe3d6e0 100644
--- a/aiserver.py
+++ b/aiserver.py
@@ -7643,8 +7643,8 @@ def get_userscripts_desc(item_full_path, item, valid_selection):
 #==================================================================#
 @socketio.on('load_userscripts')
 def UI_2_load_userscripts(data):
-        if koboldai_vars.debug:
-    print("Loading Userscripts: {}".format(os.path.basename(data)))
+    if koboldai_vars.debug:
+        print("Loading Userscripts: {}".format(os.path.basename(data)))
     koboldai_vars.userscripts = [x for x in koboldai_vars.userscripts if x != os.path.basename(data)]+[os.path.basename(data)]
     load_lua_scripts()
     

From 1fa6d744a789d8935fd6b96e89083e7a47b9190c Mon Sep 17 00:00:00 2001
From: somebody <onesome01@protonmail.com>
Date: Fri, 9 Sep 2022 19:33:12 -0500
Subject: [PATCH 19/20] Debug dump

---
 static/koboldai.css            |  46 ++++++++++-
 static/koboldai.js             | 140 +++++++++++++++++++++++++++++++++
 templates/index_new.html       |   8 ++
 templates/popups.html          |  17 ++++
 templates/settings flyout.html |   1 +
 5 files changed, 211 insertions(+), 1 deletion(-)

diff --git a/static/koboldai.css b/static/koboldai.css
index 5fda3e58..778699f5 100644
--- a/static/koboldai.css
+++ b/static/koboldai.css
@@ -1853,7 +1853,8 @@ body {
 
 /* Finder */
 
-#finder-container {
+#finder-container,
+#debug-file-container {
 	display: flex;
 	justify-content: center;
 	align-items: center;
@@ -1925,6 +1926,49 @@ body {
 	align-items: center;
 }
 
+/* Debug File */
+#debug-dump {
+	opacity: 0.7;
+	font-size: small;
+	float: right;
+}
+
+#debug-file-prompt {
+	width: 25%;
+	max-height: 500px;
+	height: 30%;
+	background-color: var(--flyout_background_pinned);
+	padding: 10px;
+	border-radius: 4px;
+
+	display: flex;
+	flex-direction: column;
+}
+
+#debug-file-prompt > div {
+	display: flex;
+	text-align: center;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	padding: 10px;
+	cursor: pointer;
+}
+
+#debug-file-prompt > div > .focus {
+	font-size: 20px;
+}
+
+#debug-file-prompt > #redacted {
+	background-color: #407497;
+	flex-grow: 1;
+}
+
+#debug-file-prompt > #unredacted {
+	margin-top: 8px;
+	background-color: rgb(158, 2, 2);
+}
+
 /*---------------------------------- Global ------------------------------------------------*/
 .hidden {
 	display: none;
diff --git a/static/koboldai.js b/static/koboldai.js
index 8363a622..d710768b 100644
--- a/static/koboldai.js
+++ b/static/koboldai.js
@@ -3183,6 +3183,135 @@ function beep() {
     snd.play();
 }
 
+function downloadString(string, fileName) {
+	let a = document.createElement("a");
+	a.setAttribute("download", fileName);
+	a.href = URL.createObjectURL(new Blob([string]));
+	a.click();
+}
+
+function getRedactedValue(value) {
+	if (typeof value === "string") return `[Redacted string with length ${value.length}]`;
+	if (value instanceof Array) return `[Redacted array with length ${value.length}]`;
+
+	if (typeof value === "object") {
+		if (value === null) return null;
+
+		let built = {};
+		for (const key of Object.keys(value)) {
+			built[getRedactedValue(key)] = getRedactedValue(value[key]);
+		}
+
+		return built;
+	}
+
+	return "[Redacted value]"
+}
+
+async function downloadDebugFile(redact=true) {
+	let r = await fetch("/vars");
+	let varsData = await r.json();
+
+	// Redact sensitive user info
+
+	// [redacted string n characters long]
+	// [redacted array with n elements]
+
+	let redactables = [
+		"model_settings.apikey",
+		"model_settings.colaburl",
+		"model_settings.oaiapikey",
+		"system_settings.story_loads",
+		"user_settings.username",
+	];
+
+	if (redact) {
+		// TODO: genseqs, splist(?)
+		redactables = redactables.concat([
+			"story_settings.authornote",
+			"story_settings.chatname",
+			"story_settings.last_story_load",
+			"story_settings.lastact",
+			"story_settings.lastctx",
+			"story_settings.memory",
+			"story_settings.notes",
+			"story_settings.prompt",
+			"story_settings.story_name",
+			"story_settings.submission",
+			"story_settings.biases",
+			"story_settings.genseqs",
+
+			// System
+			"system_settings.savedir", // Can reveal username
+			"system_settings.spfilename",
+			"system_settings.spname",
+		]);
+
+		// Redact more complex things
+
+		// wifolders_d - name
+		for (const key of Object.keys(varsData.story_settings.wifolders_d)) {
+			varsData.story_settings.wifolders_d[key].name = getRedactedValue(varsData.story_settings.wifolders_d[key].name);
+		}
+
+		// worldinfo - comment, content, key, keysecondary
+		for (const key of Object.keys(varsData.story_settings.worldinfo)) {
+			for (const redactKey of ["comment", "content", "key", "keysecondary"]) {
+				varsData.story_settings.worldinfo[key][redactKey] = getRedactedValue(varsData.story_settings.worldinfo[key][redactKey]);
+			}
+		}
+
+		// worldinfo_i - comment, content, key, keysecondary
+		for (const key of Object.keys(varsData.story_settings.worldinfo_i)) {
+			for (const redactKey of ["comment", "content", "key", "keysecondary"]) {
+				varsData.story_settings.worldinfo_i[key][redactKey] = getRedactedValue(varsData.story_settings.worldinfo_i[key][redactKey]);
+			}
+		}
+
+		// worldinfo_u - comment, content, key, keysecondary
+		for (const key of Object.keys(varsData.story_settings.worldinfo_u)) {
+			for (const redactKey of ["comment", "content", "key", "keysecondary"]) {
+				varsData.story_settings.worldinfo_u[key][redactKey] = getRedactedValue(varsData.story_settings.worldinfo_u[key][redactKey]);
+			}
+		}
+
+		// worldinfo_v2 entries - comment, content, folder, key, keysecondary, manual_text, title, wpp
+		for (const key of Object.keys(varsData.story_settings.worldinfo_v2.entries)) {
+			for (const redactKey of ["comment", "content", "folder", "key", "keysecondary", "manual_text", "title", "wpp"]) {
+				varsData.story_settings.worldinfo_v2.entries[key][redactKey] = getRedactedValue(varsData.story_settings.worldinfo_v2.entries[key][redactKey]);
+			}
+		}
+
+		varsData.story_settings.worldinfo_v2.folders = getRedactedValue(varsData.story_settings.worldinfo_v2.folders);
+
+		// actions - "Selected Text", Options, Probabilities
+		for (const key of Object.keys(varsData.story_settings.actions.actions)) {
+			for (const redactKey of ["Selected Text", "Options", "Probabilities"]) {
+				varsData.story_settings.actions.actions[key][redactKey] = getRedactedValue(varsData.story_settings.actions.actions[key][redactKey]);
+			}
+		}
+
+	}
+
+	for (const varPath of redactables) {
+		let ref = varsData;
+		const parts = varPath.split(".");
+
+		for (const part of parts.slice(0, -1)) {
+			ref = ref[part];
+		}
+
+		const lastPart = parts[parts.length - 1];
+
+		ref[lastPart] = getRedactedValue(ref[lastPart]);
+	}
+
+	debug_info.currentVars = varsData;
+	console.log(debug_info);
+
+	downloadString(JSON.stringify(debug_info, null, 4), "kobold_debug.json");
+}
+
 function loadNAILorebook(data, filename) {
 	let lorebookVersion = data.lorebookVersion;
 	let wi_data = {folders: {[filename]: []}, entries: {}};
@@ -3575,6 +3704,17 @@ $(document).ready(function(){
 	finder.addEventListener("click", function(e) {
 		e.stopPropagation();
 	});
+
+	// Debug file
+	// TODO: All of this generic backdrop code really sucks. There should be a
+	// standardised thing for popups that adds the dimmed backdrop and standard
+	// closing, etc.
+
+	const debugContainer = document.getElementById("debug-file-container");
+
+	debugContainer.addEventListener("click", function(e) {
+		debugContainer.classList.add("hidden");
+	});
 });
 
 document.addEventListener("keydown", function(event) {
diff --git a/templates/index_new.html b/templates/index_new.html
index e8f27c4d..8498777e 100644
--- a/templates/index_new.html
+++ b/templates/index_new.html
@@ -1,6 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
+	<script>
+		// Error handler before all
+		var debug_info = {errors: []};
+
+		window.addEventListener('error', function(event) {
+			debug_info.push({msg: message, url: url, line: line});
+		});
+	</script>
 	<script type="module">import {encode, decode} from "./static/tokenizer.js";window.encode = encode;window.decode = decode;</script>
 	<link href="static/open-iconic/css/open-iconic.css" rel="stylesheet">
 	<link rel="stylesheet" href="static/bootstrap-toggle.min.css">
diff --git a/templates/popups.html b/templates/popups.html
index 7b98378a..df7835ce 100644
--- a/templates/popups.html
+++ b/templates/popups.html
@@ -142,4 +142,21 @@
 	<div id="finder">
 		<input id="finder-input" placeholder="Search for something..."></input>
 	</div>
+</div>
+
+<!---------------- Debug File ---------------------->
+<div id="debug-file-container" class="hidden">
+	<div id="debug-file-prompt">
+		<div id="redacted" onclick="downloadDebugFile(true);">
+			<span class="focus">Download debug file</span>
+			<span class="help_text">Sensitive information, including any story data, is redacted.</span>
+		</div>
+		<div id="unredacted" onclick="downloadDebugFile(false);">
+			<span class="focus">Download unredacted debug file</span>
+			<span class="help_text">
+				Extremely sensitive information, such as API keys or information about other stories, is still redacted.
+				<br><b>This file will contain your story.</b>
+			</span>
+		</div>
+	</div>
 </div>
\ No newline at end of file
diff --git a/templates/settings flyout.html b/templates/settings flyout.html
index d58b0a9a..f76ca472 100644
--- a/templates/settings flyout.html	
+++ b/templates/settings flyout.html	
@@ -104,6 +104,7 @@
 		<div id="probabilities">
 			
 		</div>
+		<span id="debug-dump" class="cursor" onclick="document.getElementById('debug-file-container').classList.remove('hidden');">Download debug dump</span>
 	</div>
 	<div id="setting_menu_settings" class="hidden settings_category_area tab-target tab-target-settings">
 		<div class="force_center">

From a7aebab40df062f59b72614a6848b299deb975bc Mon Sep 17 00:00:00 2001
From: somebody <onesome01@protonmail.com>
Date: Fri, 9 Sep 2022 19:37:14 -0500
Subject: [PATCH 20/20] Add some stuff to always redact

---
 static/koboldai.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/koboldai.js b/static/koboldai.js
index d710768b..cedcb75e 100644
--- a/static/koboldai.js
+++ b/static/koboldai.js
@@ -3223,6 +3223,8 @@ async function downloadDebugFile(redact=true) {
 		"model_settings.oaiapikey",
 		"system_settings.story_loads",
 		"user_settings.username",
+		"system_settings.savedir", // Can reveal username
+		"story_settings.last_story_load",
 	];
 
 	if (redact) {
@@ -3230,7 +3232,6 @@ async function downloadDebugFile(redact=true) {
 		redactables = redactables.concat([
 			"story_settings.authornote",
 			"story_settings.chatname",
-			"story_settings.last_story_load",
 			"story_settings.lastact",
 			"story_settings.lastctx",
 			"story_settings.memory",
@@ -3242,7 +3243,6 @@ async function downloadDebugFile(redact=true) {
 			"story_settings.genseqs",
 
 			// System
-			"system_settings.savedir", // Can reveal username
 			"system_settings.spfilename",
 			"system_settings.spname",
 		]);