From c0da7e4dcf7212c23828e8fb34ae73ac90a578d7 Mon Sep 17 00:00:00 2001
From: Concedo <39025047+LostRuins@users.noreply.github.com>
Date: Sat, 23 Nov 2024 19:59:55 +0800
Subject: [PATCH] multiplayer activity tracking

---
 kcpp_docs.embd | 30 ++++++++++++++++++++--
 klite.embd     | 68 +++++++++++++++++++++++++++++++++++++++++---------
 koboldcpp.py   | 61 +++++++++++++++++++++++++++++++-------------
 3 files changed, 127 insertions(+), 32 deletions(-)

diff --git a/kcpp_docs.embd b/kcpp_docs.embd
index d8f67cd4f..a76177628 100644
--- a/kcpp_docs.embd
+++ b/kcpp_docs.embd
@@ -687,7 +687,29 @@
                    }
                 },
                 "/api/extra/multiplayer/status": {
-                   "get": {
+                   "post": {
+                     "requestBody": {
+                         "content": {
+                            "application/json": {
+                               "example": {
+                                  "sender": "KCPP_1234",
+                                  "senderbusy": true,
+                               },
+                               "schema": {
+                                  "properties": {
+                                     "senderbusy": {
+                                        "type": "boolean"
+                                     },
+                                     "sender": {
+                                        "type": "string"
+                                     }
+                                  },
+                                  "type": "object"
+                               }
+                            }
+                         },
+                         "required": false
+                      },
                       "responses": {
                          "200": {
                             "content": {
@@ -715,7 +737,7 @@
                    }
                 },
                 "/api/extra/multiplayer/getstory": {
-                   "get": {
+                   "post": {
                       "responses": {
                          "200": {
                             "content": {
@@ -744,6 +766,7 @@
                             "application/json": {
                                "example": {
                                   "full_update": true,
+                                  "sender": "LITE_UID_123456",
                                   "data_format": "kcpp_lzma_b64",
                                   "data": "base64_lzma_str",
                                },
@@ -752,6 +775,9 @@
                                      "full_update": {
                                         "type": "boolean"
                                      },
+                                     "sender": {
+                                        "type": "string"
+                                     },
                                      "data_format": {
                                         "type": "string"
                                      },
diff --git a/klite.embd b/klite.embd
index e341a1b00..e15213720 100644
--- a/klite.embd
+++ b/klite.embd
@@ -12,7 +12,7 @@ Current version indicated by LITEVER below.
 -->
 
 <script>
-	const LITEVER = 190;
+	const LITEVER = 191;
 	const urlParams = new URLSearchParams(window.location.search);
 	var localflag = true;
 	const STORAGE_PREFIX = (localflag?"e_":"")+"kaihordewebui_";
@@ -4119,7 +4119,7 @@ Current version indicated by LITEVER below.
 	const poll_interval_base_text = 500;
 	const poll_interval_base_img = 3800;
 	const poll_interval_idle = 1000;
-	const poll_interval_multiplayer = 1500; //every 1.5s
+	const poll_interval_multiplayer = 1000; //every 1s
 
 	const horde_base_url = "https://aihorde.net"
 	const horde_perf_endpoint = horde_base_url + "/api/v2/status/performance";
@@ -4220,6 +4220,7 @@ Current version indicated by LITEVER below.
 	const SAVE_SLOTS = 6;
 
 	//all configurable globals
+	var unique_uid = "LITE_UID_"+(Math.floor(100000 + Math.random() * 900000)).toString();
 	var perfdata = null; //if it's null, we are not connected
 	var models_data = [];
 	var selected_models = []; //this stores ALL selected models properties as array of objects
@@ -4412,6 +4413,7 @@ Current version indicated by LITEVER below.
 		inject_timestamps: false,
 		inject_chatnames_instruct: false,
 		inject_jailbreak_instruct: false,
+		adventure_dicemode: false,
 		idle_responses: 0,
 		idle_duration: 60,
 		export_settings: true, //affects if settings are included with the story and sharelinks
@@ -4429,7 +4431,7 @@ Current version indicated by LITEVER below.
 		rep_pen: 1.07,
 		rep_pen_range: 360,
 		rep_pen_slope: 0.7,
-		temperature: 0.7,
+		temperature: 0.8,
 		dynatemp_range: 0.0,
 		dynatemp_exponent: 1.0,
 		smoothing_factor: 0.0,
@@ -4476,7 +4478,7 @@ Current version indicated by LITEVER below.
 			rep_pen_slope: defaultsettings.rep_pen_slope,
 			sampler_order: defaultsettings.sampler_order
 		},
-		{"preset":"Simple Logical","description":"A very predictable preset with low randomness.","temp":0.3,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"top_k":100,"top_p":0.6,"min_p":0.0,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":1,"rep_pen":1.02,"rep_pen_range":360,"rep_pen_slope":0.7,"sampler_order":[6,0,1,3,4,2,5]},{"preset":"Simple Balanced","description":"A good balanced preset with medium randomness.","temp":0.7,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"top_k":100,"top_p":0.92,"min_p":0.0,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":1,"rep_pen":1.07,"rep_pen_range":360,"rep_pen_slope":0.7,"sampler_order":[6,0,1,3,4,2,5]},{"preset":"Simple Creative","description":"A wild and unpredictable preset with higher randomness.","temp":1.0,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"top_k":100,"top_p":0.98,"min_p":0.0,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":1,"rep_pen":1.15,"rep_pen_range":360,"rep_pen_slope":0.7,"sampler_order":[6,0,1,3,4,2,5]},{"preset":"Basic Min-P","description":"A good default for Min-P, only works on backends with min-p.","temp":1.25,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"top_k":0,"top_p":1,"min_p":0.1,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":1,"rep_pen":1.03,"rep_pen_range":360,"rep_pen_slope":0.7,"sampler_order":[6,5,0,1,3,4,2]},{"preset":"Basic DynaTemp","description":"A good default for DynaTemp, only works on backends with it.","temp":1.25,"dynatemp_range":0.75,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"top_k":0,"top_p":1,"min_p":0.05,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":1,"rep_pen":1.03,"rep_pen_range":360,"rep_pen_slope":0.7,"sampler_order":[6,5,0,1,3,4,2]},{"preset":"Basic SmoothSample","description":"A good default for Smooth Sampling, only works on backends with it.","temp":1.0,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.25,"top_k":0,"top_p":1,"min_p":0.05,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":1,"rep_pen":1.03,"rep_pen_range":360,"rep_pen_slope":0.7,"sampler_order":[6,5,0,1,3,4,2]},{"preset":"Basic SillyTavern","description":"Similar to default preset used in SillyTavern.","temp":0.7,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"top_k":40,"top_p":0.6,"min_p":0,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":1.0,"rep_pen":1.18,"rep_pen_range":1024,"rep_pen_slope":0.8,"sampler_order":[6,0,1,3,4,2,5]},{"preset":"Neutral (Disabled)","description":"Sets all samplers neutralized, allowing you to customize your own.","temp":1.0,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"top_k":200,"top_p":1.0,"min_p":0.0,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":1,"rep_pen":1.0,"rep_pen_range":360,"rep_pen_slope":0.7,"sampler_order":[6,0,1,3,4,2,5]},{"preset":"CoherentCreativity (Legacy)","description":"Legacy preset. A good balance between coherence, creativity, and quality of prose.","rep_pen":1.2,"rep_pen_range":360,"rep_pen_slope":0,"sampler_order":[6,5,0,2,3,1,4],"temp":0.5,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"tfs":0.99,"top_a":0,"top_k":0,"top_p":1,"min_p":0.0,"presence_penalty":0.0,"typical":1},{"preset":"Godlike (Legacy)","description":"Legacy preset. Makes AI give a descriptive and sensual output.","temp":0.7,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"top_k":0,"top_p":0.5,"min_p":0.0,"presence_penalty":0.0,"top_a":0.75,"typical":0.19,"tfs":0.97,"rep_pen":1.1,"rep_pen_range":1024,"rep_pen_slope":0.7,"sampler_order":[6,5,4,3,2,1,0]},{"preset":"LiminalDrift (Legacy)","description":"Legacy preset. Sometimes surreal situations arise based on information already present in the story.","temp":0.66,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"top_k":0,"top_p":1,"min_p":0.0,"presence_penalty":0.0,"top_a":0.96,"typical":0.6,"tfs":1,"rep_pen":1.1,"rep_pen_range":1024,"rep_pen_slope":0.7,"sampler_order":[6,4,5,1,0,2,3]}
+		{"preset":"Simple Logical","description":"A very predictable preset with low randomness.","temp":0.3,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"top_k":100,"top_p":0.6,"min_p":0.0,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":1,"rep_pen":1.02,"rep_pen_range":360,"rep_pen_slope":0.7,"sampler_order":[6,0,1,3,4,2,5]},{"preset":"Simple Balanced","description":"A good balanced preset with medium randomness.","temp":0.8,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"top_k":100,"top_p":0.92,"min_p":0.0,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":1,"rep_pen":1.07,"rep_pen_range":360,"rep_pen_slope":0.7,"sampler_order":[6,0,1,3,4,2,5]},{"preset":"Simple Creative","description":"A wild and unpredictable preset with higher randomness.","temp":1.0,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"top_k":100,"top_p":0.98,"min_p":0.0,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":1,"rep_pen":1.15,"rep_pen_range":360,"rep_pen_slope":0.7,"sampler_order":[6,0,1,3,4,2,5]},{"preset":"Basic Min-P","description":"A good default for Min-P, only works on backends with min-p.","temp":1.25,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"top_k":0,"top_p":1,"min_p":0.1,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":1,"rep_pen":1.03,"rep_pen_range":360,"rep_pen_slope":0.7,"sampler_order":[6,5,0,1,3,4,2]},{"preset":"Basic DynaTemp","description":"A good default for DynaTemp, only works on backends with it.","temp":1.25,"dynatemp_range":0.75,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"top_k":0,"top_p":1,"min_p":0.05,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":1,"rep_pen":1.03,"rep_pen_range":360,"rep_pen_slope":0.7,"sampler_order":[6,5,0,1,3,4,2]},{"preset":"Basic SmoothSample","description":"A good default for Smooth Sampling, only works on backends with it.","temp":1.0,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.25,"top_k":0,"top_p":1,"min_p":0.05,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":1,"rep_pen":1.03,"rep_pen_range":360,"rep_pen_slope":0.7,"sampler_order":[6,5,0,1,3,4,2]},{"preset":"Basic SillyTavern","description":"Similar to default preset used in SillyTavern.","temp":0.8,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"top_k":40,"top_p":0.6,"min_p":0,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":1.0,"rep_pen":1.18,"rep_pen_range":1024,"rep_pen_slope":0.8,"sampler_order":[6,0,1,3,4,2,5]},{"preset":"Neutral (Disabled)","description":"Sets all samplers neutralized, allowing you to customize your own.","temp":1.0,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"top_k":200,"top_p":1.0,"min_p":0.0,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":1,"rep_pen":1.0,"rep_pen_range":360,"rep_pen_slope":0.7,"sampler_order":[6,0,1,3,4,2,5]},{"preset":"CoherentCreativity (Legacy)","description":"Legacy preset. A good balance between coherence, creativity, and quality of prose.","rep_pen":1.2,"rep_pen_range":360,"rep_pen_slope":0,"sampler_order":[6,5,0,2,3,1,4],"temp":0.5,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"tfs":0.99,"top_a":0,"top_k":0,"top_p":1,"min_p":0.0,"presence_penalty":0.0,"typical":1},{"preset":"Godlike (Legacy)","description":"Legacy preset. Makes AI give a descriptive and sensual output.","temp":0.7,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"top_k":0,"top_p":0.5,"min_p":0.0,"presence_penalty":0.0,"top_a":0.75,"typical":0.19,"tfs":0.97,"rep_pen":1.1,"rep_pen_range":1024,"rep_pen_slope":0.7,"sampler_order":[6,5,4,3,2,1,0]},{"preset":"LiminalDrift (Legacy)","description":"Legacy preset. Sometimes surreal situations arise based on information already present in the story.","temp":0.66,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"top_k":0,"top_p":1,"min_p":0.0,"presence_penalty":0.0,"top_a":0.96,"typical":0.6,"tfs":1,"rep_pen":1.1,"rep_pen_range":1024,"rep_pen_slope":0.7,"sampler_order":[6,4,5,1,0,2,3]}
 	];
 
 	const instructpresets = [
@@ -7499,6 +7501,7 @@ Current version indicated by LITEVER below.
 		multiplayer_active = false;
 		multiplayer_last_turn_major = 0;
 		multiplayer_last_turn_minor = 0;
+		max_poll_limit_counter = 0;
 		schedule_multiplayer_minor_change = false;
 		schedule_multiplayer_major_change = false;
 		multiplayer_override_name = "";
@@ -7559,6 +7562,7 @@ Current version indicated by LITEVER below.
 			body: JSON.stringify({
 				"full_update": fullupdate,
 				"data": subdata,
+				"sender": unique_uid,
 				"data_format":"kcpp_lzma_b64",
 			})
 		})
@@ -7567,7 +7571,7 @@ Current version indicated by LITEVER below.
 			if(vals && vals.success)
 			{
 				let expected_major = (fullupdate?(1+multiplayer_last_turn_major):multiplayer_last_turn_major);
-				let expected_minor = (fullupdate?0:(multiplayer_last_turn_minor+1));
+				let expected_minor = (fullupdate?1:(multiplayer_last_turn_minor+1));
 				if(vals.turn_major==expected_major && vals.turn_minor==expected_minor)
 				{
 					//if nobody else updated, disregard our own updates
@@ -10283,6 +10287,7 @@ Current version indicated by LITEVER below.
 		document.getElementById("inject_timestamps").checked = localsettings.inject_timestamps;
 		document.getElementById("inject_chatnames_instruct").checked = localsettings.inject_chatnames_instruct;
 		document.getElementById("inject_jailbreak_instruct").checked = localsettings.inject_jailbreak_instruct;
+		document.getElementById("adventure_dicemode").checked = localsettings.adventure_dicemode;
 		document.getElementById("idle_responses").value = localsettings.idle_responses;
 		document.getElementById("idle_duration").value = localsettings.idle_duration;
 		document.getElementById("fix_alpaca_leak").checked = localsettings.fix_alpaca_leak;
@@ -10604,6 +10609,7 @@ Current version indicated by LITEVER below.
 		localsettings.inject_timestamps = (document.getElementById("inject_timestamps").checked ? true : false);
 		localsettings.inject_chatnames_instruct = (document.getElementById("inject_chatnames_instruct").checked ? true : false);
 		localsettings.inject_jailbreak_instruct = (document.getElementById("inject_jailbreak_instruct").checked ? true : false);
+		localsettings.adventure_dicemode = (document.getElementById("adventure_dicemode").checked ? true : false);
 		localsettings.idle_responses = document.getElementById("idle_responses").value;
 		localsettings.idle_duration = document.getElementById("idle_duration").value;
 		localsettings.fix_alpaca_leak = (document.getElementById("fix_alpaca_leak").checked ? true : false);
@@ -11316,6 +11322,7 @@ Current version indicated by LITEVER below.
 		completed_imgs_meta = {};
 		localsettings.adventure_is_action = false;
 		prev_hl_chunk = null;
+		gametext_focused = false;
 		last_token_budget = "";
 		groupchat_removals = [];
 		welcome = "";
@@ -12296,7 +12303,14 @@ Current version indicated by LITEVER below.
 			}
 			if (localsettings.opmode == 2 && newgen != "" && localsettings.adventure_is_action) {
 				//append action for adventure mode, except for the first turn.
-				newgen = "\n\n\> " + newgen + "\n\n";
+				let diceaddon = "";
+				if(localsettings.adventure_dicemode)
+				{
+					let roll = Math.floor(Math.random() * 20) + 1;
+					let outcome = (roll==20?"Perfect":(roll>16?"Excellent":(roll>12?"Good":(roll>8?"Fair":(roll>4?"Poor":"Terrible")))));
+					diceaddon = ` (Rolled 1d20=${roll}/20, Outcome: ${outcome})`;
+				}
+				newgen = "\n\n\> " + newgen + diceaddon + "\n\n";
 			}
 			//if very first submission is a story in adventure mode, swap to action
 			if(localsettings.opmode == 2 && newgen != "" && gametext_arr.length==0)
@@ -14756,7 +14770,7 @@ Current version indicated by LITEVER below.
 		let newgenempty = (document.getElementById("input_text").value == "");
 		let	chatinputempty = (document.getElementById("cht_inp").value == "" && document.getElementById("corpo_cht_inp").value == "");
 		if ((localsettings.opmode == 1 || localsettings.opmode == 2 || localsettings.opmode == 3 || localsettings.opmode == 4)
-		&& localsettings.idle_responses > 0 && newgenempty && chatinputempty && !document.getElementById("btnsend").disabled && idle_triggered_counter<localsettings.idle_responses && !is_popup_open())
+		&& localsettings.idle_responses > 0 && newgenempty && chatinputempty && !gametext_focused && !document.getElementById("btnsend").disabled && idle_triggered_counter<localsettings.idle_responses && !is_popup_open())
 		{
 			idle_timer += 1000;
 			if (idle_timer > idle_timer_max) {
@@ -15068,6 +15082,7 @@ Current version indicated by LITEVER below.
 		});
 	}
 
+	var max_poll_limit_counter = 0;
 	function poll_multiplayer()
 	{
 		if(!is_using_kcpp_with_multiplayer() || !multiplayer_active)
@@ -15084,21 +15099,35 @@ Current version indicated by LITEVER below.
 			schedule_multiplayer_minor_change = false;
 			schedule_multiplayer_major_change = false;
 		}
-		else
+		else if(max_poll_limit_counter<4)
 		{
 			//listen for others changes
+			max_poll_limit_counter += 1;
+			let newgenempty = (document.getElementById("input_text").value == "");
+			let	chatinputempty = (document.getElementById("cht_inp").value == "" && document.getElementById("corpo_cht_inp").value == "");
 			fetch(apply_proxy_url(custom_kobold_endpoint + koboldcpp_multiplayer_check_endpoint),
 			{
-				method: 'GET',
+				method: 'POST',
 				headers: get_kobold_header(),
+				body: JSON.stringify({
+				"sender": unique_uid,
+				"senderbusy": (!newgenempty || !chatinputempty || gametext_focused),
+				}),
 			})
 			.then(response => response.json())
 			.then(vals => {
+				max_poll_limit_counter -= 1;
 				if(!multiplayer_pinged)
 				{
 					multiplayer_pinged = true;
 					render_gametext(false);
 				}
+				if(vals && vals.idle!=1)
+				{
+					document.getElementById("connectstatusmultiplayer").innerHTML = "<span title='Multiplayer Active' class='color_red'>M.P. (Active)</span>";
+				}else{
+					document.getElementById("connectstatusmultiplayer").innerHTML = "<span title='Multiplayer Idle'>M.P. (Idle)</span>";
+				}
 				if(vals && vals.turn_major && multiplayer_active && (vals.turn_major != multiplayer_last_turn_major || vals.turn_minor != multiplayer_last_turn_minor))
 				{
 					let minor_change = (multiplayer_last_turn_major == vals.turn_major);
@@ -15106,7 +15135,7 @@ Current version indicated by LITEVER below.
 					multiplayer_last_turn_minor = vals.turn_minor;
 					fetch(apply_proxy_url(custom_kobold_endpoint + koboldcpp_multiplayer_fetch_endpoint),
 					{
-						method: 'GET',
+						method: 'POST',
 						headers: get_kobold_header(),
 					})
 					.then(response => response.text())
@@ -15121,7 +15150,14 @@ Current version indicated by LITEVER below.
 								{
 									retry_preserve_last = false;
 									synchro_pending_stream = "";
-									abort_generation();
+									if(synchro_pending_stream != "" && pending_response_id != "")
+									{
+										abort_generation();
+									}
+									else
+									{
+										clear_poll_flags();
+									}
 								}
 								//minor change, load only gametext_arr. assume its v1
 								gametext_arr = [];
@@ -15359,12 +15395,14 @@ Current version indicated by LITEVER below.
 		}
 	}
 
+	var gametext_focused = false;
 	function click_gametext()
 	{
 		if(document.getElementById("allowediting").checked)
 		{
 			const isSupported = typeof window.getSelection !== "undefined";
 			if (isSupported) {
+				gametext_focused = true;
 				warn_on_quit = true;
 				const selection = window.getSelection();
 				let foundparent = null;
@@ -15432,6 +15470,7 @@ Current version indicated by LITEVER below.
 	}
 
 	function merge_edit_field() {
+		gametext_focused = false;
 		if (gametext_arr.length > 0 && document.getElementById("allowediting").checked) {
 			let oldInnerText = concat_gametext(false, "","","");
 			let gametext_elem = document.getElementById("gametext");
@@ -18343,7 +18382,7 @@ Current version indicated by LITEVER below.
 				</div>
 				<div id="connectstatusdiv">
 					<div id="connectstatus">Connecting</div>
-					<div class="hidden" id="connectstatusmultiplayer">Multiplayer</div>
+					<div class="hidden" style="font-size: 12px;" id="connectstatusmultiplayer"></div>
 				</div>
 			</div>
 		</div>
@@ -19112,6 +19151,11 @@ Current version indicated by LITEVER below.
 								class="helptext">Automatically injects a jailbreak message after every instruct query, to make the AI more likely to obey you.</span></span></div>
 							<input type="checkbox" title="Assistant Jailbreak" id="inject_jailbreak_instruct" style="margin:0px 0px 0px auto;">
 						</div>
+						<div class="settinglabel">
+							<div class="justifyleft settingsmall">Adventure DiceMode <span class="helpicon">?<span
+								class="helptext">Allows the AI to roll a dice to determine the outcome of your actions in adventure mode.</span></span></div>
+							<input type="checkbox" title="Adventure DiceMode" id="adventure_dicemode" style="margin:0px 0px 0px auto;">
+						</div>
 
 					</div>
 				</div>
diff --git a/koboldcpp.py b/koboldcpp.py
index fff746591..71ac46476 100644
--- a/koboldcpp.py
+++ b/koboldcpp.py
@@ -69,7 +69,7 @@ multiplayer_story_data_compressed = None #stores the full compressed story of th
 multiplayer_turn_major = 1 # to keep track of when a client needs to sync their stories
 multiplayer_turn_minor = 1
 multiplayer_dataformat = "" # used to tell what is the data payload in saved story. set by client
-multiplayer_lastactive = 0 # timestamp of last activity
+multiplayer_lastactive = {} # timestamp of last activity for each unique player
 preloaded_story = None
 chatcompl_adapter = None
 embedded_kailite = None
@@ -1693,6 +1693,14 @@ class ServerRequestHandler(http.server.SimpleHTTPRequestHandler):
         except Exception as e:
             print(e)
 
+    def get_multiplayer_idle_state(self,userid):
+        if modelbusy.locked():
+            return False
+        for key, value in multiplayer_lastactive.items():
+            if key!=userid and time.time()-value<6: #6s to idle
+                return False
+        return True
+
     def secure_endpoint(self): #returns false if auth fails. caller should exit
         #handle password stuff
         if password and password !="":
@@ -1939,20 +1947,6 @@ Enter Prompt:<br>
             content_type = 'text/html'
             response_body = (f"KoboldCpp OpenAI compatible endpoint is running!\n\nFor usage reference, see https://platform.openai.com/docs/api-reference").encode()
 
-        elif self.path=="/api/extra/multiplayer/status":
-            if not has_multiplayer:
-                response_body = (json.dumps({"error":"Multiplayer not enabled!"}).encode())
-            else:
-                response_body = (json.dumps({"turn_major":multiplayer_turn_major,"turn_minor":multiplayer_turn_minor,"idle":(0 if (modelbusy.locked() or (time.time()-multiplayer_lastactive)<10) else 1),"data_format":multiplayer_dataformat}).encode())
-
-        elif self.path=="/api/extra/multiplayer/getstory":
-            if not has_multiplayer:
-                response_body = ("".encode())
-            elif multiplayer_story_data_compressed is None:
-                response_body = ("".encode())
-            else:
-                response_body = multiplayer_story_data_compressed.encode()
-
         elif self.path=="/api/extra/preloadstory":
             if preloaded_story is None:
                 response_body = (json.dumps({}).encode())
@@ -2107,7 +2101,36 @@ Enter Prompt:<br>
                     logprobsdict = parse_last_logprobs(lastlogprobs)
             response_body = (json.dumps({"logprobs":logprobsdict}).encode())
 
-        elif self.path.endswith(('/api/extra/multiplayer/setstory')):
+        elif self.path=="/api/extra/multiplayer/status":
+            if not self.secure_endpoint():
+                return
+            if not has_multiplayer:
+                response_body = (json.dumps({"error":"Multiplayer not enabled!"}).encode())
+            else:
+                sender = ""
+                senderbusy = False
+                try:
+                    tempbody = json.loads(body)
+                    if isinstance(tempbody, dict):
+                        sender = tempbody.get('sender', "")
+                        senderbusy = tempbody.get('senderbusy', False)
+                except Exception as e:
+                    pass
+                if sender!="" and senderbusy:
+                    multiplayer_lastactive[sender] = int(time.time())
+                response_body = (json.dumps({"turn_major":multiplayer_turn_major,"turn_minor":multiplayer_turn_minor,"idle":self.get_multiplayer_idle_state(sender),"data_format":multiplayer_dataformat}).encode())
+
+        elif self.path=="/api/extra/multiplayer/getstory":
+            if not self.secure_endpoint():
+                return
+            if not has_multiplayer:
+                response_body = ("".encode())
+            elif multiplayer_story_data_compressed is None:
+                response_body = ("".encode())
+            else:
+                response_body = multiplayer_story_data_compressed.encode()
+
+        elif self.path=="/api/extra/multiplayer/setstory":
             if not self.secure_endpoint():
                 return
             if not has_multiplayer:
@@ -2118,6 +2141,7 @@ Enter Prompt:<br>
                     incoming_story = json.loads(body) # ensure submitted data is valid json
                     fullupdate = incoming_story.get('full_update', False)
                     dataformat = incoming_story.get('data_format', "")
+                    sender = incoming_story.get('sender', "")
                     storybody = incoming_story.get('data', None) #should be a compressed string
                     if storybody:
                         storybody = str(storybody)
@@ -2127,13 +2151,14 @@ Enter Prompt:<br>
                         else:
                             multiplayer_story_data_compressed = str(storybody) #save latest story
                             multiplayer_dataformat = dataformat
-                            multiplayer_lastactive = int(time.time())
+                            if sender!="":
+                                multiplayer_lastactive[sender] = int(time.time())
                             if fullupdate:
                                 multiplayer_turn_minor = 1
                                 multiplayer_turn_major += 1
                             else:
                                 multiplayer_turn_minor += 1
-                            response_body = (json.dumps({"success":True,"turn_major":multiplayer_turn_major,"turn_minor":multiplayer_turn_minor,"idle":(0 if (modelbusy.locked() or (time.time()-multiplayer_lastactive)<10) else 1),"data_format":multiplayer_dataformat}).encode())
+                            response_body = (json.dumps({"success":True,"turn_major":multiplayer_turn_major,"turn_minor":multiplayer_turn_minor,"idle":self.get_multiplayer_idle_state(sender),"data_format":multiplayer_dataformat}).encode())
                     else:
                         response_code = 400
                         response_body = (json.dumps({"success":False, "error":"No story submitted!"}).encode())