From 91d8863f18dc993c74c0f975202e156d8c46d97e Mon Sep 17 00:00:00 2001
From: Concedo <39025047+LostRuins@users.noreply.github.com>
Date: Sat, 27 Dec 2025 09:46:06 +0800
Subject: [PATCH] power law sampler added

---
 embd_res/klite.embd   | 1033 +++++++++++++++++++++++++++++++++++++----
 expose.h              |    1 +
 gpttype_adapter.cpp   |   53 ++-
 koboldcpp.py          |    8 +-
 otherarch/otherarch.h |    2 +-
 5 files changed, 987 insertions(+), 110 deletions(-)

diff --git a/embd_res/klite.embd b/embd_res/klite.embd
index a59dd04ba..49240b533 100644
--- a/embd_res/klite.embd
+++ b/embd_res/klite.embd
@@ -12,7 +12,7 @@ Current version indicated by LITEVER below.
 -->
 
 <script id="init-config">
-	const LITEVER = 301;
+	const LITEVER = 302;
 	const urlParams = new URLSearchParams(window.location.search);
 	var localflag = urlParams.get('local'); //this will be replaced automatically in embedded kcpp
 	const STORAGE_PREFIX = (localflag?"e_":"")+"kaihordewebui_";
@@ -1992,6 +1992,35 @@ Current version indicated by LITEVER below.
 		height: 100%;
 	}
 
+	/* tools table */
+	.tools-table {
+		width: 100%;
+		border-collapse: collapse;
+		font-family: sans-serif;
+		font-size: 12px;
+		text-align: left;
+	}
+	.tools-table th,
+	.tools-table td {
+		padding: 4px;
+		vertical-align: top;
+	}
+	.tools-checkbox {
+		width: 30px;
+		text-align: center;
+	}
+	.tool-title {
+		font-weight: 600;
+		margin-bottom: 2px;
+	}
+	.tools_list_container {
+		margin: 4px;
+		max-height: 300px;
+		overflow-y: auto;
+		overflow-x: hidden;
+		color: var(--theme_color_text);
+	}
+
 	/* Aesthetic UI */
 	.ui-settings-inline { font-size: 12px; display:flex; flex-direction: row; }
 	.instruct-settings-input { margin: 0px 2px; font-size:10px; }
@@ -3562,6 +3591,7 @@ Current version indicated by LITEVER below.
 	const default_xtts_base = " http://localhost:8020";
 	const default_alltalk_base = "http://localhost:7851";
 	const default_comfy_base = "http://localhost:8188";
+	const default_mcp_base = "http://localhost:5001";
 
 	const WEBBROWSER_TTS_ID = 1;
 	const KCPP_TTS_ID = 2;
@@ -3640,10 +3670,11 @@ Current version indicated by LITEVER below.
 	var uses_cors_proxy = false; //we start off attempting a direct connection. switch to proxy if that fails
 	var synchro_polled_response = null;
 	var synchro_polled_respimg = null; //sometimes a LLM response can also include an image.
+	var synchro_polled_resptoolcall = null; //set if a tool call was triggered
 	var last_stop_reason = ""; //update stop reason if known
 	var synchro_pending_stream = ""; //used for storing incomplete streaming text
 	var streaming_was_thinking = false; //used as a switch to determine when thinking ends, to wrap output in tags
-	var waiting_for_tool_call = 0; //0=not waiting, 1=autosummary, 2=websearchsummary
+	var waiting_for_summarycall = 0; //0=not waiting, 1=autosummary, 2=websearchsummary
 	var oaiemulatecompletionscontent = "";
 	var italics_regex = new RegExp(/\*(\S[^*]+\S)\*/g); //the fallback regex
 	var bold_regex = new RegExp(/\*\*(\S[^*]+\S)\*\*/g); //the fallback regex
@@ -3752,6 +3783,7 @@ Current version indicated by LITEVER below.
 		saved_comfy_url: default_comfy_base,
 		saved_xtts_url: default_xtts_base,
 		saved_alltalk_url: default_alltalk_base,
+		saved_mcp_urls: default_mcp_base,
 		prev_custom_endpoint_type: 0, //show a reconnect box to custom endpoint if needed. 0 is horde, otherwise its dropdown value+1
 		prev_custom_endpoint_model: "", //we may not be able to match, but set it if we do
 		prev_custom_endpoint_ischatcmpl: true,
@@ -3852,6 +3884,9 @@ Current version indicated by LITEVER below.
 		darkmode: true,
 		colortheme: 0, // 0=newtheme, 1=oldtheme, 2=fruity, 3=black
 		render_streaming_markdown: true,
+		enable_tool_use: false,
+		tools_auto_exec: true,
+		corsproxy_mcp: false,
 
 		raw_instruct_tags: false, //experimental flags
 		show_endpoint_selector: false,
@@ -3884,8 +3919,8 @@ Current version indicated by LITEVER below.
 		second_ep_model:"gpt2",
 		second_ep_url:"",
 
-		max_context_length: (localflag?8192:3600),
-		max_length: (localflag?768:420),
+		max_context_length: (localflag?8192:3800),
+		max_length: (localflag?896:460),
 		last_maxctx: 0,
 		auto_ctxlen: true,
 		auto_genamt: true,
@@ -3901,6 +3936,7 @@ Current version indicated by LITEVER below.
 		top_p: 0.92,
 		min_p: 0.00,
 		presence_penalty: 0.00,
+		powerlaw_target: -1.0,
 		sampler_seed: -1,
 		top_k: 100,
 		top_a: 0,
@@ -3939,6 +3975,7 @@ Current version indicated by LITEVER below.
 			top_p: defaultsettings.top_p,
 			min_p: defaultsettings.min_p,
 			presence_penalty: defaultsettings.presence_penalty,
+			powerlaw_target: defaultsettings.powerlaw_target,
 			top_a: defaultsettings.top_a,
 			typical: defaultsettings.typ_s,
 			tfs: defaultsettings.tfs_s,
@@ -3947,7 +3984,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,"smoothing_curve":1.0,"nsigma":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.75,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"smoothing_curve":1.0,"nsigma":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.05,"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,"smoothing_curve":1.0,"nsigma":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.1,"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,"smoothing_curve":1.0,"nsigma":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 Top-nsigma","description":"A good default for Top-nsigma, only works on backends with Top-nsigma.","temp":1,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"smoothing_curve":1.0,"nsigma":1.0,"top_k":0,"top_p":1,"min_p":0.01,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":1,"rep_pen":1,"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,"smoothing_curve":1.0,"nsigma":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,"smoothing_curve":1.0,"nsigma":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 SillyTavern","description":"Similar to default preset used in SillyTavern.","temp":0.75,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"smoothing_curve":1.0,"nsigma":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":"Immortal","description":"Modernized version of the Godlike preset, designed for creative and longer story co-writing use.","temp":0.7,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"smoothing_curve":1.0,"nsigma":1.75,"top_k":0,"top_p":1.0,"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":"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,"smoothing_curve":1.0,"nsigma":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,"smoothing_curve":1.0,"nsigma":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,"smoothing_curve":1.0,"nsigma":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,"smoothing_curve":1.0,"nsigma":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,"smoothing_curve":1.0,"nsigma":0.0,"top_k":100,"top_p":0.6,"min_p":0.0,"presence_penalty":0.0,"powerlaw_target":-1.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.75,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"smoothing_curve":1.0,"nsigma":0.0,"top_k":100,"top_p":0.92,"min_p":0.0,"presence_penalty":0.0,"powerlaw_target":-1.0,"top_a":0,"typical":1,"tfs":1,"rep_pen":1.05,"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,"smoothing_curve":1.0,"nsigma":0.0,"top_k":100,"top_p":0.98,"min_p":0.0,"presence_penalty":0.0,"powerlaw_target":-1.0,"top_a":0,"typical":1,"tfs":1,"rep_pen":1.1,"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,"smoothing_curve":1.0,"nsigma":0.0,"top_k":0,"top_p":1,"min_p":0.1,"presence_penalty":0.0,"powerlaw_target":-1.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 Top-nsigma","description":"A good default for Top-nsigma, only works on backends with Top-nsigma.","temp":1,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"smoothing_curve":1.0,"nsigma":1.0,"top_k":0,"top_p":1,"min_p":0.01,"presence_penalty":0.0,"powerlaw_target":-1.0,"top_a":0,"typical":1,"tfs":1,"rep_pen":1,"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,"smoothing_curve":1.0,"nsigma":0.0,"top_k":0,"top_p":1,"min_p":0.05,"presence_penalty":0.0,"powerlaw_target":-1.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,"smoothing_curve":1.0,"nsigma":0.0,"top_k":0,"top_p":1,"min_p":0.05,"presence_penalty":0.0,"powerlaw_target":-1.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.75,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"smoothing_curve":1.0,"nsigma":0.0,"top_k":40,"top_p":0.6,"min_p":0,"presence_penalty":0.0,"powerlaw_target":-1.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":"Immortal","description":"Modernized version of the Godlike preset, designed for creative and longer story co-writing use.","temp":0.7,"dynatemp_range":0.0,"dynatemp_exponent":1.0,"smoothing_factor":0.0,"smoothing_curve":1.0,"nsigma":1.75,"top_k":0,"top_p":1.0,"min_p":0.0,"presence_penalty":0.0,"powerlaw_target":-1.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":"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,"smoothing_curve":1.0,"nsigma":0.0,"top_k":200,"top_p":1.0,"min_p":0.0,"presence_penalty":0.0,"powerlaw_target":-1.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,"smoothing_curve":1.0,"nsigma":0.0,"tfs":0.99,"top_a":0,"top_k":0,"top_p":1,"min_p":0.0,"presence_penalty":0.0,"powerlaw_target":-1.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,"smoothing_curve":1.0,"nsigma":0.0,"top_k":0,"top_p":0.5,"min_p":0.0,"presence_penalty":0.0,"powerlaw_target":-1.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,"smoothing_curve":1.0,"nsigma":0.0,"top_k":0,"top_p":1,"min_p":0.0,"presence_penalty":0.0,"powerlaw_target":-1.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 = [
@@ -4389,6 +4426,28 @@ Current version indicated by LITEVER below.
 		.replace(/\\r/g, "\r")
 		.replace(/\[temp_rr_seq\]/g, "\\\\");
 	}
+	function replaceStringsInObject(obj, src, tgt) { //recursively traverse an object, replacing all strings with another string
+		if (obj === null || obj === undefined) {
+			return obj;
+		}
+		if (typeof obj === 'string') {
+			return obj.replace(new RegExp(src, 'g'), tgt);
+		}
+		if (Array.isArray(obj)) {
+			return obj.map(item => replaceStringsInObject(item, src, tgt));
+		}
+		if (typeof obj === 'object') {
+			const result = {};
+			for (const key in obj) {
+				if (obj.hasOwnProperty(key)) {
+					result[key] = replaceStringsInObject(obj[key], src, tgt);
+				}
+			}
+			return result;
+		}
+		return obj;
+	}
+
 	function get_cursor_position() { //get the caret position in a text
 		let editor = document.getElementById("gametext");
 
@@ -5211,6 +5270,8 @@ Current version indicated by LITEVER below.
 			inputtxt = replaceAll(inputtxt,"{{char}}",(localsettings.chatopponent?firstopponent:defaultchatopponent),true);
 		}
 
+		inputtxt = replaceAll(inputtxt,"{{original}}","",true); //redundant in Lite; use sysprompt or assistant jailbreak instead
+
 		for(let i=0;i<localsettings.placeholder_tags_data.length;++i)
 		{
 			if(localsettings.placeholder_tags_data[i].p && localsettings.placeholder_tags_data[i].r)
@@ -6256,6 +6317,7 @@ Current version indicated by LITEVER below.
 			}else if (custom_gemini_key != "" && data.candidates != null && data.candidates.length>0 && data.candidates[0].content && data.candidates[0].content.parts != null && data.candidates[0].content.parts.length>0) {
 				synchro_polled_response = "";
 				synchro_polled_respimg = null;
+				synchro_polled_resptoolcall = null;
 				for(let x=0;x<data.candidates[0].content.parts.length;++x)
 				{
 					if(!synchro_polled_respimg && data.candidates[0].content.parts[x].inlineData && data.candidates[0].content.parts[x].inlineData.data)
@@ -6372,6 +6434,7 @@ Current version indicated by LITEVER below.
 		synchro_pending_stream = "";
 		streaming_was_thinking = false;
 		let logprobs_content_arr = [];
+		let pending_toolcall_obj = null;
 		let reqOpt =
 		{method: 'POST',
 		headers: submit_headers,
@@ -6500,6 +6563,44 @@ Current version indicated by LITEVER below.
 									streaming_was_thinking = true;
 									synchro_pending_stream += event.data.choices[0].delta.reasoning;
 								}
+								else if(event.data.choices[0].delta && !event.data.choices[0].delta.content && event.data.choices[0].delta.tool_calls && event.data.choices[0].delta.tool_calls.length>0)
+								{
+									//handle tool calls
+									if(pending_toolcall_obj==null)
+									{
+										pending_toolcall_obj = {};
+									}
+									let itm = event.data.choices[0].delta.tool_calls[0];
+									if(itm.id)
+									{
+										pending_toolcall_obj.id = itm.id;
+									}
+									if(itm.function)
+									{
+										if(itm.function.name)
+										{
+											if(!pending_toolcall_obj.name)
+											{
+												pending_toolcall_obj.name = itm.function.name;
+											}
+											else if(pending_toolcall_obj.name!=itm.function.name)
+											{
+												pending_toolcall_obj.name += itm.function.name;
+											}
+										}
+										if(itm.function.arguments)
+										{
+											if(!pending_toolcall_obj.arguments)
+											{
+												pending_toolcall_obj.arguments = itm.function.arguments;
+											}
+											else
+											{
+												pending_toolcall_obj.arguments += itm.function.arguments;
+											}
+										}
+									}
+								}
 
 								//collect logprobs if detected
 								if(event.data.choices[0].logprobs && event.data.choices[0].logprobs.content && event.data.choices[0].logprobs.content.length>0)
@@ -6518,6 +6619,10 @@ Current version indicated by LITEVER below.
 								{
 									last_stop_reason = "stop";
 								}
+								else if(event.data.choices[0].finish_reason=="tool_calls")
+								{
+									last_stop_reason = "tool_calls";
+								}
 							}
 
 							//potentially trigger an early stopping
@@ -6565,6 +6670,11 @@ Current version indicated by LITEVER below.
 					{
 						synchro_polled_response = cleanup_story_completion(synchro_polled_response);
 					}
+					if(synchro_polled_response=="" && last_stop_reason=="tool_calls" && pending_toolcall_obj!=null)
+					{
+						//a tool call was triggered instead
+						synchro_polled_resptoolcall = pending_toolcall_obj;
+					}
 					synchro_pending_stream = "";
 					streaming_was_thinking = false;
 					if (logprobs_content_arr.length>0 && last_response_obj==null) {
@@ -6790,7 +6900,7 @@ Current version indicated by LITEVER below.
 			input = input.replace(/^<blockquote>\n([\s\S]*?)\n<\/blockquote>/gm, (match, p1) => {
 				return `<blockquote>${p1}</blockquote>`; //return blockquotes to their rightful place
 			});
-			input = input.replace(/(^|[^\\])\$(\S[^$\n]*?\S)\$(?!\d)/g, (match, prefix, p1) => {
+			input = input.replace(/(^|[^\\])\$(\S[^$\n]*?\S)\$(?!\w)/g, (match, prefix, p1) => {
 				let content = p1;
 				content = unescape_html(content);
 				if(content.replace(/\s+/g, '').match(/^\${1,}$/)) //only dollar signs, just return
@@ -7113,6 +7223,460 @@ Current version indicated by LITEVER below.
 		});
 	}
 
+	//MCP HTTP client code
+	const MCP_PROTOCOL_VER = "2025-11-25";
+	var mcp_req_id = 0;
+	var cached_mcp_tools = {}; //key is url, value is tools array
+	function MCPGetAllowedTools()
+	{
+		let allowedtools = [];
+		for(key in cached_mcp_tools)
+		{
+			let currarr = cached_mcp_tools[key].tools;
+			for(let i=0;i<currarr.length;++i)
+			{
+				let mcptool = document.getElementById(`mcptool_${currarr[i].function.name}`);
+				if(mcptool && mcptool.checked)
+				{
+					allowedtools.push(currarr[i]);
+				}
+			}
+		}
+		return allowedtools;
+	}
+	function MCPToolIsAllowed(toolName)
+	{
+		if(!toolName || !cached_mcp_tools || Object.keys(cached_mcp_tools).length === 0)
+		{
+			return false;
+		}
+		let tl = MCPGetAllowedTools();
+		for(let i=0;i<tl.length;++i)
+		{
+			if(tl[i].function.name==toolName)
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+	function GetMCPUrlOfTool(toolName)
+	{
+		if(!toolName || !cached_mcp_tools || Object.keys(cached_mcp_tools).length === 0)
+		{
+			return null;
+		}
+		for(key in cached_mcp_tools)
+		{
+			let currarr = cached_mcp_tools[key].tools;
+			for(let i=0;i<currarr.length;++i)
+			{
+				if(currarr[i].function.name==toolName)
+				{
+					return key;
+				}
+			}
+		}
+		return null;
+	}
+	const jsonRPC = {
+		request: function (method, params) {
+			var req = {
+				jsonrpc: "2.0",
+				id: mcp_req_id,
+				method: method
+			};
+			if (params) {
+				req.params = params;
+			}
+			return JSON.stringify(req);
+		},
+		notification: function (method, params) {
+			var notif = {
+				jsonrpc: "2.0",
+				method: method
+			};
+			if (params) {
+				notif.params = params;
+			}
+			return JSON.stringify(notif);
+		},
+		// Message type checkers
+		isNotification: function (msg) { return "method" in msg && !("id" in msg); },
+		isRequest: function (msg) { return "method" in msg && "id" in msg; },
+		isResponse: function (msg) { return ("result" in msg || "error" in msg) && "id" in msg; },
+		isError: function (msg) { return "error" in msg; }
+	};
+	function ParseMCPResp(response, expectedId, onNotification) {
+		let ParseMCPSSE = function(response, expectedId, onNotification) {
+			return new Promise(function (resolve, reject) {
+				var reader = response.body.getReader();
+				var decoder = new TextDecoder();
+				var buffer = "";
+				function read() {
+					reader.read().then(function (result) {
+						if (result.done) {
+							resolve(null); // End of stream without final response
+							return;
+						}
+						buffer += decoder.decode(result.value, { stream: true });
+						var events = buffer.split("\n\n"); // Split on double newlines (SSE event boundary)
+						buffer = events.pop(); // Keep incomplete event in buffer
+						for (var i = 0; i < events.length; i++) {
+							var event = events[i];
+							// Parse SSE event fields
+							var eventType = "message"; // default per SSE spec
+							var data = "";
+							var lines = event.split("\n");
+							for (var j = 0; j < lines.length; j++) {
+								var line = lines[j];
+								if (line.indexOf("event:") === 0) {
+									eventType = line.slice(6).trim();
+								} else if (line.indexOf("data:") === 0) {
+									data += (data ? "\n" : "") + line.slice(5).trim();
+								}
+							}
+							if (!data || eventType !== "message") continue; // Skip non-message events (e.g., ping) or empty data
+							if (data.indexOf("{") !== 0) continue; // Skip non-JSON data
+							try {
+								var message = JSON.parse(data);
+							} catch (e) {
+								continue; // Ignore parse errors
+							}
+							if (jsonRPC.isNotification(message)) {
+								if (onNotification) onNotification(message);
+								continue;
+							}
+							if (jsonRPC.isResponse(message) && message.id === expectedId) {
+								// Must release reader before resolving
+								reader.cancel().catch(function () { }); // Cancel the stream
+								resolve(message);
+								return;
+							}
+						}
+						read(); // Continue reading
+					}).catch(reject);
+				}
+				read(); // Start reading
+			});
+		}
+
+		var contentType = response.headers.get("Content-Type") || "";
+		if (contentType.indexOf("text/event-stream") !== -1) {
+			return ParseMCPSSE(response, expectedId, onNotification);
+		}
+		return response.json();
+	}
+	class MCPClient {
+		constructor(url, sessionId, protocolVersion, customHeaders) {
+			this.url = url;
+			this.sessionId = sessionId;
+			this.protocolVersion = protocolVersion;
+			this.customHeaders = customHeaders || {};
+		}
+		headers() {
+			const headers = Object.assign({}, this.customHeaders);
+			headers["Content-Type"] = "application/json";
+			headers.Accept = "application/json, text/event-stream";
+			headers["MCP-Protocol-Version"] = this.protocolVersion;
+			if (this.sessionId) {
+				headers["MCP-Session-Id"] = this.sessionId;
+			}
+			return headers;
+		}
+		request(method, params, onNotification) {
+			const currentId = ++mcp_req_id;
+			return fetch(this.url, {
+				method: "POST",
+				headers: this.headers(),
+				body: jsonRPC.request(method, params)
+			}).then(response =>
+				ParseMCPResp(response, currentId, onNotification)
+			);
+		}
+		notify(method, params) {
+			return fetch(this.url, {
+				method: "POST",
+				headers: this.headers(),
+				body: jsonRPC.notification(method, params)
+			})
+			.then(response => {
+				console.log(response);
+			})
+			.catch(err => {
+				console.log(err.message || String(err));
+			});
+		}
+		listTools(onNotification) {
+			return this.request("tools/list", {}, onNotification);
+		}
+		callTool(name, args, onNotification) {
+			return this.request(
+				"tools/call",
+				{ name: name, arguments: args || {} },
+				onNotification
+			);
+		}
+	}
+
+	//MCP Exposed functions
+	function MCPInit(url, customHeaders, onNotification) {
+		let mcp_tools = [];
+		const clientName = 'KoboldAI Lite MCP';
+		const clientVersion = '1.0.0';
+		var currentId = ++mcp_req_id;
+		var request = jsonRPC.request("initialize", {
+			protocolVersion: MCP_PROTOCOL_VER,
+			clientInfo: {
+				name: clientName,
+				version: clientVersion
+			},
+			capabilities: {} // empty = minimal client, no roots/sampling/elicitation support
+		});
+		var headers = customHeaders || {};
+		headers["Content-Type"] = "application/json";
+		headers.Accept = "application/json, text/event-stream";
+		return fetch(url, {
+			method: "POST",
+			headers: headers,
+			body: request
+		}).then(function (response) {
+			var sessionId = response.headers.get("MCP-Session-Id");
+			return ParseMCPResp(response, currentId, onNotification)
+				.then(function (result) {
+					var negotiatedVersion = (result.result && result.result.protocolVersion) ? result.result.protocolVersion : MCP_PROTOCOL_VER;
+					var client = new MCPClient(url, sessionId, negotiatedVersion, customHeaders);
+					return client.notify("notifications/initialized").then(() => client);
+				}).catch(error => {
+					return null;
+				});
+		}).catch(error => {
+			return null;
+		});
+	}
+	function MCPToolList(mcp_client)
+	{
+		return mcp_client.listTools().then(function (toolsResult) {
+			console.log(toolsResult);
+			if(toolsResult && toolsResult.result && toolsResult.result.tools)
+			{
+				//convert to openai tools format
+				let remapped = toolsResult.result.tools.map(tool => ({
+					type: "function",
+					function: {
+					name: tool.name,
+					description: tool.description,
+					parameters: tool.inputSchema
+					}
+				}));
+
+				mcp_tools = remapped;
+			}
+			return mcp_tools;
+		}).catch(error => {
+			return null;
+		});
+	}
+	function MCPToolCallInternal(mcp_client, selectedTool, toolArgs) {
+		return new Promise(function(resolve, reject) {
+			// Validate inputs
+			if (!cached_mcp_tools || Object.keys(cached_mcp_tools).length === 0 || !selectedTool) {
+				reject(new Error("tool call invalid parameters"));
+				return;
+			}
+			// Make the tool call
+			mcp_client.callTool(selectedTool, toolArgs, function (notification) {
+				console.log(notification);
+			}).then(function (response) {
+				console.log(response);
+				if (jsonRPC.isError(response)) {
+					console.log("MCP Call Error");
+					console.log(response.error.message);
+					reject(new Error(response.error.message));
+				} else if (response.result) {
+					console.log("MCP Call OK");
+					console.log(response.result);
+					resolve(response.result);
+				} else {
+					// Handle case where there's no error but also no result
+					resolve(response);
+				}
+			}).catch(function (err) {
+				console.log(err.message || String(err));
+				reject(err);
+			});
+		});
+	}
+	function MCPToolCall(toolcall_obj)
+	{
+		if(!toolcall_obj || !toolcall_obj.tool_calls || toolcall_obj.tool_calls.length==0)
+		{
+			console.log("Error: cannot call tool, toolcall_obj is empty");
+			return;
+		}
+		let callargs = null;
+		try{
+			callargs = JSON.parse(toolcall_obj.tool_calls[0].function.arguments);
+		}
+		catch (e) {
+			console.log("Failed to parse tool call!");
+			return;
+		}
+		let callname = toolcall_obj.tool_calls[0].function.name;
+		let callid = toolcall_obj.tool_calls[0].id;
+		let call_allowed = MCPToolIsAllowed(callname);
+		let callresp = {
+			"role": "tool",
+			"tool_call_id": callid,
+			"name": callname,
+			"content": "{\"error\": \"Tool not found\"}"
+		};
+		if(call_allowed)
+		{
+			let callresptxt = "";
+			if(!(gametext_arr.length>0 && gametext_arr[gametext_arr.length-1].trim().endsWith("{{[OUTPUT]}}")))
+			{
+				callresptxt = get_instructendplaceholder(); //add instruct tag if needed
+			}
+
+			//show busy while waiting
+			pending_response_id = "toolcall-v1-dummy-id-"+(Math.floor(1000 + Math.random() * 9000)).toString(); //dummy id, autogenerated
+
+			let mcpurl = GetMCPUrlOfTool(callresp.name);
+			const customHeaders = cached_mcp_tools[mcpurl].apikey ?
+			{ 'Authorization': `Bearer ${cached_mcp_tools[mcpurl].apikey}` } : {};
+			if(localsettings.corsproxy_mcp)
+			{
+				mcpurl = apply_proxy_url(mcpurl,true);
+			}
+			MCPInit(mcpurl, customHeaders)
+			.then(mcp_client => {
+				return MCPToolCallInternal(mcp_client,callresp.name,callargs);
+			}).then(function (response) {
+				if(response.content && response.content.length>0)
+				{
+					let tgt = replaceStringsInObject(response.content[0],"&quot;","\""); //we must remove existing escaped quotes or things break later
+					callresp.content = JSON.stringify(tgt);
+				}
+				callresptxt += JSON.stringify(callresp) + get_instructendplaceholder();
+				gametext_arr.push(callresptxt);
+				console.log(response);
+				pending_response_id = "";
+				poll_in_progress = false;
+				show_abort_button(false);
+				submit_generation(""); //generate final response or new toolcall
+				render_gametext(false,false);
+			}).catch(function (error) {
+				// Handle errors
+				callresp.content = "{\"error\": \"Tool call failed\"}";
+				callresptxt += JSON.stringify(callresp) + get_instructendplaceholder();
+				gametext_arr.push(callresptxt);
+				console.error("MCP ToolCall Error:", error.message);
+				pending_response_id = "";
+				poll_in_progress = false;
+				show_abort_button(false);
+				submit_generation("");  //generate final response or new toolcall
+				render_gametext(false,false);
+			});
+		}
+		else
+		{
+			gametext_arr.push(get_instructendplaceholder() + callresp);
+		}
+	}
+	function parseMcpUrls() {
+		const textarea = document.getElementById('mcpurls');
+		const lines = textarea.value.split('\n').filter(line => line.trim());
+		const servers = {};
+		for (let i = 0; i < lines.length; i++) {
+			const line = lines[i];
+			const commaIndex = line.indexOf(',');
+			let url, apiKey;
+			if (commaIndex !== -1) {
+				url = line.substring(0, commaIndex).trim();
+				apiKey = line.substring(commaIndex + 1).trim();
+			} else {
+				url = line.trim();
+				apiKey = null;
+			}
+			servers[url] = { apikey: apiKey, tools:[] };
+		}
+		return servers;
+	}
+	function Fetch_MCP_Tools() //connects to multiple mcp servers, updates the tool list
+	{
+		const toolscontainer = document.getElementById("tools_list_container");
+		toolscontainer.innerHTML = "<p>Fetching tools from all servers...</p>";
+		cached_mcp_tools = parseMcpUrls();
+
+		const urls = Object.keys(cached_mcp_tools);
+		const fetchPromises = [];
+
+		urls.forEach(url => {
+			const customHeaders = cached_mcp_tools[url].apikey ?
+				{ 'Authorization': `Bearer ${cached_mcp_tools[url].apikey}` } : {};
+
+			let purl = url;
+			if(localsettings.corsproxy_mcp)
+			{
+				purl = apply_proxy_url(url,true);
+			}
+			const fetchPromise = MCPInit(purl, customHeaders)
+				.then(mcp_client => MCPToolList(mcp_client))
+				.then(mcp_result => {
+					if (mcp_result && Array.isArray(mcp_result) && mcp_result.length > 0) {
+						cached_mcp_tools[url].tools = mcp_result;
+						return { url, tools: mcp_result};
+					}
+					return { url, tools: []};
+				}).catch(error => {
+					console.error(`Error fetching tools from ${url}:`, error);
+					return { url, tools: []};
+				});
+
+			fetchPromises.push(fetchPromise);
+		});
+
+		// wait till all fetched or failed
+		Promise.all(fetchPromises)
+		.then(results => {
+			let toolshtml = `<table class="tools-table"><thead><tr><th>Tool</th><th>Enabled</th></tr></thead><tbody>`;
+			let hasAnyTools = false;
+
+			results.forEach(result => {
+				result.tools.forEach(tool => {
+					const toolFunction = tool.function || tool;
+					hasAnyTools = true;
+					toolshtml += `
+						<tr>
+							<td class="tools-info">
+								<div class="tool-title">${toolFunction.name}</div>
+								<div class="tool-description">${toolFunction.description ? toolFunction.description.substr(0, 180) : 'No description'}</div>
+							</td>
+							<td class="tools-checkbox">
+								<input type="checkbox" id="mcptool_${toolFunction.name}" value="${toolFunction.name}" checked/>
+							</td>
+						</tr>
+					`;
+				});
+			});
+			toolshtml += `</tbody></table>`;
+
+			let finalHtml = '';
+			if (hasAnyTools) {
+				finalHtml += toolshtml;
+			} else {
+				finalHtml += "<p>No tools were found from any reachable server.</p>";
+			}
+
+			toolscontainer.innerHTML = finalHtml;
+		})
+		.catch(error => {
+			console.error("An unexpected error occurred during the overall fetch process:", error);
+			toolscontainer.innerHTML = "<p>An unexpected error occurred. Please check the console.</p>";
+		});
+	}
+
 	//read any parameters passed in from the URL, and load content if found
 	function read_url_params_data()
 	{
@@ -8075,6 +8639,11 @@ Current version indicated by LITEVER below.
 		}
 	}
 
+	function determine_if_can_use_mcp()
+	{
+		return (custom_oai_key!="" && document.getElementById("useoaichatcompl").checked) || is_using_kcpp_with_streaming();
+	}
+
 	//returns true if the current multimodal setup for some media can be used, otherwise false.
 	function determine_if_can_use_vision_audio(currmeta)
 	{
@@ -8507,6 +9076,7 @@ Current version indicated by LITEVER below.
 			new_save_storyobj.savedsettings.saved_a1111_url = "";
 			new_save_storyobj.savedsettings.saved_comfy_url = "";
 			new_save_storyobj.savedsettings.saved_xtts_url = "";
+			new_save_storyobj.savedsettings.saved_mcp_urls = "";
 
 			new_save_storyobj.savedsettings.modelhashes = [];
 
@@ -8942,6 +9512,7 @@ Current version indicated by LITEVER below.
 					let tmp_comfy = localsettings.saved_comfy_url;
 					let tmp_xtts = localsettings.saved_xtts_url;
 					let tmp_imggen = localsettings.generate_images_mode;
+					let tmp_mcp = localsettings.saved_mcp_urls;
 
 					if(loadgensettings)
 					{
@@ -8998,6 +9569,7 @@ Current version indicated by LITEVER below.
 					localsettings.saved_comfy_url = tmp_comfy;
 					localsettings.saved_xtts_url = tmp_xtts;
 					localsettings.generate_images_mode = tmp_imggen;
+					localsettings.saved_mcp_urls = tmp_mcp;
 
 					if(loadaessettings)
 					{
@@ -9329,11 +9901,13 @@ Current version indicated by LITEVER below.
 			console.log("Loading tavern obj");
 			let chatopponent = obj.name?obj.name:defaultchatopponent;
 			let myname = ((localsettings.chatname && localsettings.chatname!="")?localsettings.chatname:"User");
-			let memory = obj.description?("Persona: "+obj.description):"";
+			let memory = obj.description?("Description: "+obj.description):"";
 			memory += obj.personality?("\nPersonality: "+obj.personality):"";
 			let scenario = obj.scenario?obj.scenario:"";
 			let examplemsg = obj.mes_example?obj.mes_example:"";
 			let sysprompt = obj.system_prompt?obj.system_prompt:"";
+			let personalnotes = obj.creator_notes?obj.creator_notes:"";
+			let posthistoryinstructions = obj.post_history_instructions?obj.post_history_instructions:"";
 			let greeting = selectedgreeting;
 
 			//post process
@@ -9341,15 +9915,19 @@ Current version indicated by LITEVER below.
 			{
 				scenario = "\n[Scenario: "+scenario+"]";
 			}
+			if(posthistoryinstructions!="")
+			{
+				posthistoryinstructions = "\n[Special Instructions: "+posthistoryinstructions+"]";
+			}
 			if(examplemsg!="")
 			{
-				examplemsg = "\n"+examplemsg;
+				examplemsg = "\n"+(/^<START>\r?\n/.test(examplemsg)?"":"<START>\n")+examplemsg;
 			}
 			if(sysprompt!="")
 			{
 				sysprompt = sysprompt+"\n";
 			}
-			let combinedmem = sysprompt + memory + scenario + examplemsg;
+			let combinedmem = sysprompt + memory + scenario + posthistoryinstructions + examplemsg;
 			let agnaidatafieldsempty = scenario + examplemsg + (obj.personality?obj.personality:"") + greeting;
 			let has_tav_wi_check = has_tavern_wi_check(obj);
 			//check if it's a world info only card, if so, do not restart game
@@ -9372,6 +9950,7 @@ Current version indicated by LITEVER below.
 				localsettings.chatname = myname;
 				localsettings.chatopponent = chatopponent;
 				current_memory = combinedmem + "\n***";
+				personal_notes = personalnotes;
 				localsettings.multiline_replies = true;
 				if(usechatmode)
 				{
@@ -9552,36 +10131,36 @@ Current version indicated by LITEVER below.
 			}
 
 			let chatopponent = obj.name?obj.name:"Bot";
-			let memory = obj.description?("Persona: "+obj.description):"";
+			let memory = obj.description?("Description: "+obj.description):"";
 			memory += obj.personality?("\nPersonality: "+obj.personality):"";
 			let scenario = obj.scenario?obj.scenario:"";
 			let examplemsg = obj.mes_example?obj.mes_example:"";
 			let greeting = obj.first_mes?obj.first_mes:"";
 			let sysprompt = obj.system_prompt?obj.system_prompt:"";
+			let creatornotes = obj.creator_notes?obj.creator_notes:"";
+			let posthistoryinstructions = obj.post_history_instructions?obj.post_history_instructions:"";
 
 			//aliases
-			if(examplemsg=="" && obj.mesExample!="")
-			{
-				examplemsg = obj.mesExample;
-			}
-			if(greeting=="" && obj.firstMes!="")
-			{
-				greeting = obj.firstMes;
-			}
+			examplemsg = (examplemsg==="" && obj.mesExample)?obj.mesExample:examplemsg;
+			greeting = (greeting==="" && obj.firstMes)?obj.firstMes:greeting;
 
 			if(scenario!="")
 			{
 				scenario = "\n[Scenario: "+scenario+"]";
 			}
+			if(posthistoryinstructions!="")
+			{
+				posthistoryinstructions = "\n[Special Instructions: "+posthistoryinstructions+"]";
+			}
 			if(examplemsg!="")
 			{
-				examplemsg = "\n"+examplemsg;
+				examplemsg = "\n"+(/^<START>\r?\n/.test(examplemsg)?"":"<START>\n")+examplemsg;
 			}
 			if(sysprompt!="")
 			{
 				sysprompt = sysprompt+"\n";
 			}
-			let combinedmem = sysprompt + memory + scenario + examplemsg;
+			let combinedmem = sysprompt + memory + scenario + posthistoryinstructions + examplemsg;
 			temp_scenario.title = chatopponent;
 			let prev2 = replaceAll(obj.description,"{{char}}",chatopponent,true);
 			prev2 = replaceAll(prev2,"{{user}}","User",true);
@@ -9589,6 +10168,7 @@ Current version indicated by LITEVER below.
 			temp_scenario.chatopponent = chatopponent;
 			temp_scenario.prompt = ("\n{{char}}: "+ greeting);
 			temp_scenario.memory = combinedmem;
+			temp_scenario.personalnotes = creatornotes;
 
 			//since cai format has no wi, try to grab it from tavern format
 			let myname = ((localsettings.chatname && localsettings.chatname!="")?localsettings.chatname:"User");
@@ -9856,6 +10436,9 @@ Current version indicated by LITEVER below.
 		if (temp_scenario.worldinfo && temp_scenario.worldinfo.length > 0) {
 			current_wi = temp_scenario.worldinfo;
 		}
+		if (temp_scenario.personalnotes && temp_scenario.personalnotes != "") {
+			personal_notes = temp_scenario.personalnotes;
+		}
 
 		localsettings.opmode = temp_scenario.opmode;
 		localsettings.inject_chatnames_instruct = false;
@@ -13844,12 +14427,14 @@ Current version indicated by LITEVER below.
 		document.getElementById("settingsmenumedia_tab").classList.remove("active");
 		document.getElementById("settingsmenutokens_tab").classList.remove("active");
 		document.getElementById("settingsmenuadvanced_tab").classList.remove("active");
+		document.getElementById("settingsmenutools_tab").classList.remove("active");
 
 		document.getElementById("settingsmenusamplers").classList.add("hidden");
 		document.getElementById("settingsmenuformat").classList.add("hidden");
 		document.getElementById("settingsmenumedia").classList.add("hidden");
 		document.getElementById("settingsmenutokens").classList.add("hidden");
 		document.getElementById("settingsmenuadvanced").classList.add("hidden");
+		document.getElementById("settingsmenutools").classList.add("hidden");
 
 		switch (tabidx) {
 			case 0: //format
@@ -13868,7 +14453,11 @@ Current version indicated by LITEVER below.
 				document.getElementById("settingsmenutokens").classList.remove("hidden");
 				document.getElementById("settingsmenutokens_tab").classList.add("active");
 			break;
-			case 4: //advanced
+			case 4: //tools
+				document.getElementById("settingsmenutools").classList.remove("hidden");
+				document.getElementById("settingsmenutools_tab").classList.add("active");
+			break;
+			case 5: //advanced
 				document.getElementById("settingsmenuadvanced").classList.remove("hidden");
 				document.getElementById("settingsmenuadvanced_tab").classList.add("active");
 			break;
@@ -13935,6 +14524,7 @@ Current version indicated by LITEVER below.
 		document.getElementById("dynatemp_overview").innerText = (localsettings.dynatemp_range!=0?"ON":"OFF");
 		document.getElementById("second_ep_overview").innerText = (localsettings.second_ep_qty>0 && localsettings.second_ep_url?"ON":"OFF");
 		document.getElementById("presence_penalty").value = localsettings.presence_penalty;
+		document.getElementById("powerlaw_target").value = localsettings.powerlaw_target;
 		document.getElementById("sampler_seed").value = localsettings.sampler_seed;
 		document.getElementById("top_k").value =  document.getElementById("top_k_slide").value = localsettings.top_k;
 		document.getElementById("top_a").value = localsettings.top_a;
@@ -13953,6 +14543,10 @@ Current version indicated by LITEVER below.
 		document.getElementById("second_ep_qty").value = localsettings.second_ep_qty;
 		document.getElementById("second_ep_model").value = localsettings.second_ep_model;
 		document.getElementById("second_ep_url").value = localsettings.second_ep_url;
+		document.getElementById("enable_tool_use").checked = localsettings.enable_tool_use;
+		document.getElementById("tools_auto_exec").checked = localsettings.tools_auto_exec;
+		document.getElementById("corsproxy_mcp").checked = localsettings.corsproxy_mcp;
+		document.getElementById("mcpurls").value = localsettings.saved_mcp_urls;
 
 		if(is_using_kcpp_with_mirostat())
 		{
@@ -14120,6 +14714,16 @@ Current version indicated by LITEVER below.
 		{
 			document.getElementById("websearchunsupporteddiv").classList.remove("hidden");
 		}
+		if(determine_if_can_use_mcp())
+		{
+			document.getElementById("nomcp").classList.add("hidden");
+			document.getElementById("tools_list_container").classList.remove("hidden");
+			document.getElementById("connect_mcp_btn").disabled = false;
+		}else{
+			document.getElementById("nomcp").classList.remove("hidden");
+			document.getElementById("tools_list_container").classList.add("hidden");
+			document.getElementById("connect_mcp_btn").disabled = true;
+		}
 		if(is_using_custom_ep())
 		{
 			document.getElementById("nologitbias").classList.add("hidden");
@@ -14190,6 +14794,7 @@ Current version indicated by LITEVER below.
 		if (found) {
 			document.getElementById("temperature").value = document.getElementById("temperature_slide").value = found.temp;
 			document.getElementById("presence_penalty").value = found.presence_penalty;
+			document.getElementById("powerlaw_target").value = found.powerlaw_target;
 			document.getElementById("min_p").value = found.min_p;
 			document.getElementById("dynatemp_range").value = found.dynatemp_range;
 			document.getElementById("dynatemp_exponent").value = found.dynatemp_exponent;
@@ -14279,6 +14884,7 @@ Current version indicated by LITEVER below.
 			document.getElementById("presetsdesc").innerText = found.description;
 			let changed = (document.getElementById("temperature").value != found.temp ||
 			document.getElementById("presence_penalty").value != found.presence_penalty ||
+			document.getElementById("powerlaw_target").value != found.powerlaw_target ||
 			document.getElementById("min_p").value != found.min_p ||
 			document.getElementById("dynatemp_range").value != found.dynatemp_range ||
 			document.getElementById("dynatemp_exponent").value != found.dynatemp_exponent ||
@@ -14568,6 +15174,7 @@ Current version indicated by LITEVER below.
 		localsettings.smoothing_curve = parseFloat(document.getElementById("smoothing_curve").value);
 		localsettings.nsigma = parseFloat(document.getElementById("nsigma").value);
 		localsettings.presence_penalty = parseFloat(document.getElementById("presence_penalty").value);
+		localsettings.powerlaw_target = parseFloat(document.getElementById("powerlaw_target").value);
 		localsettings.top_k = parseInt(document.getElementById("top_k").value);
 		localsettings.top_a = parseFloat(document.getElementById("top_a").value);
 		localsettings.typ_s = parseFloat(document.getElementById("typ_s").value);
@@ -14704,6 +15311,12 @@ Current version indicated by LITEVER below.
 		localsettings.save_remote_images = (document.getElementById("save_remote_images").checked ? true : false);
 		localsettings.prompt_for_savename = (document.getElementById("prompt_for_savename").checked ? true : false);
 		localsettings.img_allownsfw = (document.getElementById("img_allownsfw").checked ? true : false);
+
+		localsettings.enable_tool_use = (document.getElementById("enable_tool_use").checked ? true : false);
+		localsettings.tools_auto_exec = (document.getElementById("tools_auto_exec").checked ? true : false);
+		localsettings.corsproxy_mcp = (document.getElementById("corsproxy_mcp").checked ? true : false);
+		localsettings.saved_mcp_urls = document.getElementById("mcpurls").value.trim()?document.getElementById("mcpurls").value.trim():default_mcp_base;
+
 		update_genimg_button_visiblility();
 		update_websearch_button_visibility();
 
@@ -14778,6 +15391,7 @@ Current version indicated by LITEVER below.
 		localsettings.smoothing_curve = cleannum(localsettings.smoothing_curve, 0.1, 5.0);
 		localsettings.nsigma = cleannum(localsettings.nsigma, 0.0, 5.0);
 		localsettings.presence_penalty = cleannum(localsettings.presence_penalty, -2, 2);
+		localsettings.powerlaw_target = cleannum(localsettings.powerlaw_target, -1, 1);
 		localsettings.top_k = cleannum(Math.floor(localsettings.top_k), 0, 300);
 		localsettings.top_a = cleannum(localsettings.top_a, 0, 1);
 		localsettings.typ_s = cleannum(localsettings.typ_s, 0, 1);
@@ -15232,7 +15846,7 @@ Current version indicated by LITEVER below.
 			onDoneFn("");
 		} else {
 			pending_response_id = "-1";
-			waiting_for_tool_call = 2;
+			waiting_for_summarycall = 2;
 			let max_allowed_characters = Math.floor(localsettings.max_context_length * 3.0) - 100;
 			let truncated_context = recentCtx.substring(recentCtx.length - max_allowed_characters);
 
@@ -15297,12 +15911,12 @@ Current version indicated by LITEVER below.
 		temp_automem_store = document.getElementById("memorytext").value;
 		let onOk = ()=>{
 			pending_response_id = "-1";
-			waiting_for_tool_call = 1;
+			waiting_for_summarycall = 1;
 			let max_allowed_characters = Math.floor(localsettings.max_context_length * 3.0)-100;
 			let truncated_context = concat_gametext(true, "");
 
 			let max_mem_len = Math.floor(max_allowed_characters*0.8);
-			let truncated_memory = current_memory.substring(current_memory.length - max_mem_len);
+			let truncated_memory = truncate_memory(current_memory, max_mem_len, false);
 			if (truncated_memory != null && truncated_memory != "") {
 				truncated_memory += "\n";
 			}
@@ -15370,7 +15984,7 @@ Current version indicated by LITEVER below.
 	function handle_incoming_autosummary(gentxt)
 	{
 		retry_in_progress = false;
-		waiting_for_tool_call = 0;
+		waiting_for_summarycall = 0;
 		gentxt = gentxt.trim();
 		gentxt = gentxt.split("###")[0];
 		gentxt = replaceAll(gentxt,"\n\n","\n");
@@ -15409,7 +16023,7 @@ Current version indicated by LITEVER below.
 	function handle_incoming_searchsummary(gentxt)
 	{
 		retry_in_progress = false;
-		waiting_for_tool_call = 0;
+		waiting_for_summarycall = 0;
 		gentxt = gentxt.trim();
 		gentxt = gentxt.split("###")[0];
 		gentxt = replaceAll(gentxt,"\n\n","\n");
@@ -15593,10 +16207,11 @@ Current version indicated by LITEVER below.
 		poll_in_progress = false;
 		synchro_polled_response = null;
 		synchro_polled_respimg = null;
+		synchro_polled_resptoolcall = null;
 		last_stop_reason = "";
 		synchro_pending_stream = "";
 		streaming_was_thinking = false;
-		waiting_for_tool_call = 0;
+		waiting_for_summarycall = 0;
 		horde_poll_nearly_completed = false;
 		oaiemulatecompletionscontent = "";
 	}
@@ -15619,10 +16234,11 @@ Current version indicated by LITEVER below.
 		pending_response_id = "";
 		synchro_polled_response = null;
 		synchro_polled_respimg = null;
+		synchro_polled_resptoolcall = null;
 		last_stop_reason = "";
 		synchro_pending_stream = "";
 		streaming_was_thinking = false;
-		waiting_for_tool_call = 0;
+		waiting_for_summarycall = 0;
 		oaiemulatecompletionscontent = "";
 		last_reply_was_empty = false;
 		pending_context_preinjection = "";
@@ -15647,6 +16263,7 @@ Current version indicated by LITEVER below.
 		voice_is_processing = false;
 		recentSearchQueries = [];
 		lastSearchResults = [];
+		toolcall_waiting_approve = null;
 		if (!keep_memory)
 		{
 			personal_notes = "";
@@ -15910,6 +16527,25 @@ Current version indicated by LITEVER below.
 		}
 	}
 
+	//Prioritizes truncating example messages in memory
+	function truncate_memory(current_memory, max_mem_len, to_boundary)
+	{
+		if(current_memory.length <= max_mem_len) {
+			return current_memory;
+		}
+		let basictrunc = to_boundary?substring_to_boundary:((str,len) => str.substring(str.length-len));
+		let examplemsg = current_memory.match(/<START>\r?\n/);
+		if(!examplemsg) {
+			return basictrunc(current_memory, max_mem_len);
+		}
+		let examplemsgstart = examplemsg.index+examplemsg[0].length;
+		let suffix = current_memory.endsWith("\n***")?"\n***":"";
+		if(max_mem_len < examplemsgstart+suffix.length) { //discard all examplemsg
+			return basictrunc(current_memory.substring(0,examplemsg.index)+suffix,max_mem_len);
+		}
+		return current_memory.substring(0,examplemsgstart)+basictrunc(current_memory.substring(examplemsgstart),max_mem_len-examplemsgstart);
+	}
+
 	var warn_unsaved = false;
 	function handle_quit()
 	{
@@ -17318,8 +17954,8 @@ Current version indicated by LITEVER below.
 		}
 		else //may be continuting existing instruction OR starting a brand new session. check if first action
 		{
-			if (is_impersonate_user) {
-				is_impersonate_user = false;
+			let latest_human = is_instruct_latest_human_turn();
+			if (is_impersonate_user && !latest_human) {
 				if (localsettings.separate_end_tags) {
 					pending_context_preinjection = prev_et + ist; //bot response as first msg
 					pending_context_postinjection = iste + iet;
@@ -17415,7 +18051,7 @@ Current version indicated by LITEVER below.
 
 		if (!user_input_empty || gametext_arr.length > 0 || current_memory != "" || current_anote != "")
 		{
-			waiting_for_tool_call = 0;
+			waiting_for_summarycall = 0;
 			idle_timer = 0;
 			idle_triggered_counter = 0;
 			if (localsettings.tts_mode > 0)
@@ -17430,7 +18066,7 @@ Current version indicated by LITEVER below.
 			{
 				newgen = wrap_newgen_instruct_format(newgen,true);
 				let latest_human = is_instruct_latest_human_turn();
-				if(!localsettings.allow_continue_user_turn && newgen=="" && latest_human) //assume the user is trying to get the AI to respond even though there's no output tag
+				if(!localsettings.allow_continue_user_turn && newgen=="" && latest_human && !is_impersonate_user) //assume the user is trying to get the AI to respond even though there's no output tag
 				{
 					//so we force one
 					let iet = get_instructendplaceholder();
@@ -17639,7 +18275,6 @@ Current version indicated by LITEVER below.
 				let original_co = co;
 				if(is_impersonate_user) //replace opponent with ourselves if needed
 				{
-					is_impersonate_user = false;
 					co = get_my_multiplayer_chatname();
 				}
 
@@ -17782,7 +18417,7 @@ Current version indicated by LITEVER below.
 				}
 				appendedsysprompt += "\n";
 			}
-			let truncated_memory = substring_to_boundary(current_memory, max_mem_len);
+			let truncated_memory = truncate_memory(current_memory, max_mem_len, true);
 			if (truncated_memory != null && truncated_memory != "") {
 				if(newlineaftermemory)
 				{
@@ -17993,7 +18628,7 @@ Current version indicated by LITEVER below.
 				truncated_memory += wistr;
 			}
 
-			truncated_memory = appendedsysprompt + substring_to_boundary(truncated_memory, max_mem_len);
+			truncated_memory = appendedsysprompt + truncate_memory(truncated_memory, max_mem_len, true);
 
 			//now we resize the context such that the memory and authors note can fit inside
 			truncated_context = substring_to_boundary(truncated_context, max_allowed_characters);
@@ -18356,6 +18991,7 @@ Current version indicated by LITEVER below.
 		if((custom_kobold_endpoint != "" && is_using_kcpp_with_mirostat()) || custom_oai_endpoint!="")
 		{
 			submit_payload.params.presence_penalty = localsettings.presence_penalty;
+			submit_payload.params.power_law_target = localsettings.powerlaw_target;
 			submit_payload.params.logit_bias = JSON.parse(JSON.stringify(localsettings.logitbiasdict));
 		}
 
@@ -18383,6 +19019,40 @@ Current version indicated by LITEVER below.
 		return submit_payload;
 	}
 
+	function oai_append_media(mainoaibody)
+	{
+		for(let i=0;i<insertAIVisionImages.length;++i)
+		{
+			let oaiimg = {
+				"type": "image_url",
+				"image_url": {
+					"url": insertAIVisionImages[i]
+				}
+			};
+			mainoaibody.push(oaiimg);
+		}
+		for(let i=0;i<insertAIAudioSounds.length;++i)
+		{
+			let curr = insertAIAudioSounds[i];
+			let format = "wav";
+			if(curr.includes("base64,"))
+			{
+				let parts = curr.split("base64,");
+				curr = parts[1];
+				format = (parts[0].includes("mp3")||parts[0].includes("mpeg"))?"mp3":"wav";
+			}
+			let oaiimg = {
+				"type": "input_audio",
+				"input_audio": {
+					"data": curr,
+					"format": format
+				}
+			};
+			mainoaibody.push(oaiimg);
+		}
+		return mainoaibody;
+	}
+
 	function dispatch_submit_generation(submit_payload, input_was_empty) //if input is not empty, always unban eos
 	{
 		console.log(submit_payload);
@@ -18397,6 +19067,7 @@ Current version indicated by LITEVER below.
 			poll_in_progress = false;
 			synchro_polled_response = null;
 			synchro_polled_respimg = null;
+			synchro_polled_resptoolcall = null;
 			last_stop_reason = "";
 			synchro_pending_stream = "";
 			streaming_was_thinking = false;
@@ -18412,19 +19083,81 @@ Current version indicated by LITEVER below.
 				last_request_str = JSON.stringify(submit_payload);
 				last_response_obj = null;
 				last_response_streamlog = "";
-				if (localsettings.tokenstreammode==2 && is_using_kcpp_with_sse()) {
-					let sub_endpt = apply_proxy_url(custom_kobold_endpoint + kobold_custom_gen_stream_endpoint);
-					kobold_api_stream_sse(sub_endpt, submit_payload);
-				} else {
-					let sub_endpt = apply_proxy_url(custom_kobold_endpoint + kobold_custom_gen_endpoint);
-					let trackedgenid = pending_response_id; //if it changes, stop streaming
-					kobold_api_sync_req(sub_endpt, submit_payload, trackedgenid);
+
+				let kcpp_use_oai_for_tools = localsettings.enable_tool_use;
+
+				if(kcpp_use_oai_for_tools &&
+				determine_if_can_use_mcp() && cached_mcp_tools && Object.keys(cached_mcp_tools).length>0)
+				{
+					//for tool calling, we hijack the oai endpoint in order to utilize
+					let combinedprompt = submit_payload.prompt;
+					if(submit_payload.memory)
+					{
+						combinedprompt = submit_payload.memory + combinedprompt;
+					}
+					delete submit_payload["memory"];
+					delete submit_payload["prompt"];
+					submit_payload.messages = [];
+					let mhistory = repack_instruct_history(combinedprompt);
+					let oaiimgs = [];
+					oaiimgs = oai_append_media(oaiimgs);
+					if(mhistory.length>0 && oaiimgs.length>0)
+					{
+						mhistory[0].msg = [{type: 'text', text: mhistory[0].msg}];
+						for(let i=0;i<oaiimgs.length;++i)
+						{
+							mhistory[0].msg.push(oaiimgs[i]);
+						}
+					}
+					for(let i=0;i<mhistory.length;++i)
+					{
+						let cturn = { "role": (mhistory[i].myturn?"user":"assistant"), "content": mhistory[i].msg };
+						if(!mhistory[i].myturn && mhistory[i].tool_calls)
+						{
+							cturn.content = null;
+							cturn.tool_calls = mhistory[i].tool_calls;
+						}
+						else if(!mhistory[i].myturn && mhistory[i].tool_results)
+						{
+							cturn = mhistory[i].tool_results;
+						}
+						submit_payload.messages.push(cturn);
+					}
+					if(determine_if_can_use_mcp() && cached_mcp_tools && Object.keys(cached_mcp_tools).length>0)
+					{
+						let senttools = MCPGetAllowedTools();
+						if(senttools.length>0)
+						{
+							submit_payload.use_default_badwordsids = false;
+							submit_payload.tools = senttools;
+						}
+					}
+					let targetep = apply_proxy_url(custom_kobold_endpoint + oai_submit_endpoint_chat);
+					if(is_browser_supports_sse() && localsettings.tokenstreammode!=0)
+					{
+						submit_payload.stream = true;
+						oai_api_stream_sse(targetep,submit_payload,get_kobold_header());
+					}
+					else
+					{
+						oai_api_sync_req(targetep,submit_payload,get_kobold_header());
+					}
+				}
+				else
+				{
+					if (localsettings.tokenstreammode==2 && is_using_kcpp_with_sse()) {
+						let sub_endpt = apply_proxy_url(custom_kobold_endpoint + kobold_custom_gen_stream_endpoint);
+						kobold_api_stream_sse(sub_endpt, submit_payload);
+					} else {
+						let sub_endpt = apply_proxy_url(custom_kobold_endpoint + kobold_custom_gen_endpoint);
+						let trackedgenid = pending_response_id; //if it changes, stop streaming
+						kobold_api_sync_req(sub_endpt, submit_payload, trackedgenid);
+					}
 				}
 				update_custom_kobold_endpoint_model_display();
 			}
 			else if (custom_oai_key != "")//handle for OAI
 			{
-
 				let targetep = apply_proxy_url(custom_oai_endpoint + oai_submit_endpoint);
 
 				let scaled_rep_pen = 0;
@@ -18510,35 +19243,7 @@ Current version indicated by LITEVER below.
 								"text": mainoaibody
 							}
 						];
-						for(let i=0;i<insertAIVisionImages.length;++i)
-						{
-							let oaiimg = {
-								"type": "image_url",
-								"image_url": {
-									"url": insertAIVisionImages[i]
-								}
-							};
-							mainoaibody.push(oaiimg);
-						}
-						for(let i=0;i<insertAIAudioSounds.length;++i)
-						{
-							let curr = insertAIAudioSounds[i];
-							let format = "wav";
-							if(curr.includes("base64,"))
-							{
-								let parts = curr.split("base64,");
-								curr = parts[1];
-								format = (parts[0].includes("mp3")||parts[0].includes("mpeg"))?"mp3":"wav";
-							}
-							let oaiimg = {
-								"type": "input_audio",
-								"input_audio": {
-									"data": curr,
-									"format": format
-								}
-							};
-							mainoaibody.push(oaiimg);
-						}
+						mainoaibody = oai_append_media(mainoaibody);
 					}
 
 					oai_payload.messages = [];
@@ -18589,13 +19294,21 @@ Current version indicated by LITEVER below.
 							}
 						}
 
-
 						for(let i=0;i<mhistory.length;++i)
 						{
 							oai_payload.messages.push({ "role": (mhistory[i].myturn?"user":"assistant"), "content": mhistory[i].msg });
 						}
 					}
 
+					if(determine_if_can_use_mcp() && cached_mcp_tools && Object.keys(cached_mcp_tools).length>0)
+					{
+						let senttools = MCPGetAllowedTools();
+						if(senttools.length>0)
+						{
+							oai_payload.tools = senttools;
+						}
+					}
+
 					if (document.getElementById("jailbreakprompt2") && document.getElementById("jailbreakprompt2").checked && document.getElementById("jailbreakprompttext2").value!="") {
 						let addrole = document.getElementById("jailbreakprompttext2role").value;
 						addrole = ((addrole==2)?"system":(addrole==1?"assistant":"user"));
@@ -19937,7 +20650,7 @@ Current version indicated by LITEVER below.
 		if (canvisionaudio) {
 			vision_indicator_hide = "";
 		}
-		const str = `<span><br><button type="button" title="Attached Audio" class="btn btn-primary" style="font-size:12px; padding:8px 8px; border-radius: 16px" onclick="return click_audio(this,\'${audiohash}\',\'${audioblob}\',${duplicate_idx});">🔊 Attached Audio ${fndisp}<span class="mediaindicator ${vision_indicator_hide}"> 🦻</span></button><br></span>`;
+		const str = `<span><br><button type="button" title="Attached Audio" class="btn btn-primary" style="font-size:12px; padding:8px 8px; border-radius: 16px" onclick="return click_audio(this,\'${audiohash}\',\'${audioblob}\',${duplicate_idx});">🔊 Attached Audio ${fndisp}<span class="mediaindicator ${vision_indicator_hide}"> 👁️</span></button><br></span>`;
 		return str;
 	}
 
@@ -21326,7 +22039,7 @@ Current version indicated by LITEVER below.
 					{
 						//still waiting, do nothing until next poll
 						console.log("sync request: still awaiting reply");
-						let polledstreaming = (waiting_for_tool_call==0 && localsettings.tokenstreammode==1 && is_using_kcpp_with_streaming());
+						let polledstreaming = (waiting_for_summarycall==0 && localsettings.tokenstreammode==1 && is_using_kcpp_with_streaming());
 						//only check once every 2 ticks if remote
 						if (polledstreaming && (localflag?true:(poll_ticks_passed%2==0)))
 						{
@@ -21371,7 +22084,7 @@ Current version indicated by LITEVER below.
 						pending_response_id = "";
 						poll_in_progress = false;
 						let resp = synchro_polled_response;
-						if(waiting_for_tool_call==0)
+						if(waiting_for_summarycall==0)
 						{
 							last_reply_was_empty = (resp=="" || resp.trim()=="");
 						}
@@ -21380,11 +22093,11 @@ Current version indicated by LITEVER below.
 							let genworker = "Custom Endpoint";
 							let genkudos = "0";
 							let genmdl = (selected_models.length>0?selected_models[0].name:"Unknown Model");
-							if(waiting_for_tool_call==2)
+							if(waiting_for_summarycall==2)
 							{
 								handle_incoming_searchsummary(gentxt);
 							}
-							else if(waiting_for_tool_call==1)
+							else if(waiting_for_summarycall==1)
 							{
 								handle_incoming_autosummary(gentxt);
 							}
@@ -21403,6 +22116,36 @@ Current version indicated by LITEVER below.
 						render_gametext(true,false); //only scroll to bottom if autoscroll is on
 						sync_multiplayer(false);
 					}
+					if(synchro_polled_resptoolcall && cached_mcp_tools)
+					{
+						//if valid, execute the tool call and get the result
+						let savedcallobj = {"tool_calls": [
+							{
+							"id": synchro_polled_resptoolcall.id,
+							"type": "function",
+							"function": {
+								"name": synchro_polled_resptoolcall.name,
+								"arguments": synchro_polled_resptoolcall.arguments
+							}
+							}
+						]};
+
+						let calltxt = "";
+						if(!(gametext_arr.length>0 && gametext_arr[gametext_arr.length-1].trim().endsWith("{{[OUTPUT]}}")))
+						{
+							calltxt = get_instructendplaceholder(); //add instruct tag if needed
+						}
+						calltxt += JSON.stringify(savedcallobj) + get_instructendplaceholder();
+						gametext_arr.push(calltxt);
+
+						if(localsettings.tools_auto_exec)
+						{
+							MCPToolCall(savedcallobj);
+						}
+
+						synchro_polled_resptoolcall = null;
+						render_gametext(false,false);
+					}
 					if(synchro_polled_respimg)
 					{
 						if(!synchro_polled_respimg.startsWith("data:image"))
@@ -21456,9 +22199,9 @@ Current version indicated by LITEVER below.
 												let genworker = data.generations[0].worker_name;
 												let genmdl = data.generations[0].model;
 												let genkudos = data.kudos;
-												if (waiting_for_tool_call == 2) {
+												if (waiting_for_summarycall == 2) {
 													handle_incoming_searchsummary(gentxt);
-												} else if (waiting_for_tool_call == 1) {
+												} else if (waiting_for_summarycall == 1) {
 													handle_incoming_autosummary(gentxt);
 												}
 												else {
@@ -22190,6 +22933,7 @@ Current version indicated by LITEVER below.
 				}
 
 				let instruct_turns = repack_instruct_turns(fulltxt, `%SpcStg%`,`%SpcEtg%`, true);
+				repact_instruct_turns_beautify_render(instruct_turns);
 				fulltxt = "";
 				for(let i=0;i<instruct_turns.length;++i)
 				{
@@ -22327,7 +23071,7 @@ Current version indicated by LITEVER below.
 			}
 
 			//streaming display for all other cases
-			if(!alreadyShowedStreaming && synchro_pending_stream!="" && waiting_for_tool_call==0)
+			if(!alreadyShowedStreaming && synchro_pending_stream!="" && waiting_for_summarycall==0)
 			{
 				let pend = escape_html(pending_context_preinjection) + format_streaming_text(escape_html(synchro_pending_stream));
 				fulltxt += `<span class="color_yellow pending_text">${pend}</span>`;
@@ -22805,9 +23549,76 @@ Current version indicated by LITEVER below.
 				unlabelled_turns = false;
 			}
 		}
+
+		//post process the chatunits to handle tool calls
+		for(let i=0;i<chatunits.length;++i)
+		{
+			if(!chatunits[i].myturnchat && (chatunits[i].msg.includes("tool_call_id") || chatunits[i].msg.includes("tool_calls")))
+			{
+				try {
+					let unsc = unescape_html(chatunits[i].msg);
+					let parsed_payload = JSON.parse(unsc);
+					if(parsed_payload.tool_calls && parsed_payload.tool_calls.length>0)
+					{
+						chatunits[i].tool_calls = parsed_payload.tool_calls;
+					}
+					else if(parsed_payload.role=="tool")
+					{
+						chatunits[i].tool_results = parsed_payload;
+					}
+				} catch (e) {}
+			}
+		}
+
 		return chatunits;
 	}
 
+	var toolcall_waiting_approve = null;
+	function repact_instruct_turns_beautify_render(chatunits) //to turn ugly turn calls into nice looking placeholders
+	{
+		toolcall_waiting_approve = null;
+		for(let i=0;i<chatunits.length;++i)
+		{
+			if(chatunits[i].tool_calls)
+			{
+				chatunits[i].origmsg = chatunits[i].msg;
+				chatunits[i].msg = `<span class="color_lightgreen" style="font-weight:bold;">Made a tool call ${chatunits[i].tool_calls[0].id} to ${chatunits[i].tool_calls[0].function.name}</span>`;
+				if(!localsettings.tools_auto_exec && (i==chatunits.length-1 || (i==chatunits.length-2 && chatunits[chatunits.length-1].msg=="")))
+				{
+					toolcall_waiting_approve = {"tool_calls":chatunits[i].tool_calls};
+					let approvebtns = "";
+					if(pending_response_id == "")
+					{
+						approvebtns = `<button type="button" title="Inspect Tool Call" class="btn btn-primary" style="font-size:12px;padding:2px 2px; margin-left:4px;" onclick="inspect_waiting_toolcall()">Inspect</button><button type="button" title="Approve Tool Call" class="btn btn-primary" style="font-size:12px;padding:2px 2px; margin-left:4px;" onclick="execute_waiting_toolcall()">Approve</button>`;
+					}
+					chatunits[i].msg = `<span class="color_lightgreen" style="font-weight:bold;">Requesting a tool call to ${chatunits[i].tool_calls[0].function.name}</span>${approvebtns}`;
+				}
+			}
+			if(chatunits[i].tool_results)
+			{
+				chatunits[i].origmsg = chatunits[i].msg;
+				chatunits[i].msg = `<span class="color_lightgreen" style="font-weight:bold;">Received tool call results for ${chatunits[i].tool_results.tool_call_id} to ${chatunits[i].tool_results.name}</span>`;
+			}
+		}
+		return chatunits;
+	}
+	function inspect_waiting_toolcall()
+	{
+		msgbox(toolcall_waiting_approve?JSON.stringify(toolcall_waiting_approve):"No Pending Tool Call","Pending Tool Call");
+	}
+	function execute_waiting_toolcall()
+	{
+		if(toolcall_waiting_approve && cached_mcp_tools && Object.keys(cached_mcp_tools).length > 0)
+		{
+			MCPToolCall(toolcall_waiting_approve);
+			render_gametext(false,false);
+		}
+		else
+		{
+			msgbox("Tools disconnected or cached tool is missing. Please generate tool call again.","Pending Tool Call Missing.");
+		}
+	}
+
 	function repack_postprocess_turn(currchatunit, countmap)
 	{
 		let processed_msg = currchatunit.msg;
@@ -23282,6 +24093,7 @@ Current version indicated by LITEVER below.
 		else
 		{
 			chatunits = repack_instruct_history(input);
+			repact_instruct_turns_beautify_render(chatunits);
 		}
 
 		let incomplete_resp = (synchro_pending_stream!="" || pending_response_id!="");
@@ -23304,7 +24116,7 @@ Current version indicated by LITEVER below.
 			let bodypart = (corpo_editing_turn == i ?
 				`<div class="corpo_edit_outer">
 				<div class="corpo_edit_inner" id="corpo_edit_inp_lengthtester" style="white-space: nowrap; visibility: hidden; height: 0px; position:absolute; width: auto;"></div>
-				<textarea class="corpo_edit_inner" id="corpo_edit_inp" type="text" name="crpeditinp"  role="presentation" autocomplete="noppynop" spellcheck="true" rows="1" wrap="on" placeholder="Edit Message" value="" oninput="corpoedit_resize_input();"/>${stash_image_placeholders(curr.msg, false)}</textarea>
+				<textarea class="corpo_edit_inner" id="corpo_edit_inp" type="text" name="crpeditinp"  role="presentation" autocomplete="noppynop" spellcheck="true" rows="1" wrap="on" placeholder="Edit Message" value="" oninput="corpoedit_resize_input();"/>${stash_image_placeholders(curr.origmsg?curr.origmsg:curr.msg, false)}</textarea>
 				</div>
 				<button type="button" class="btn btn-primary corpoeditbtn" style="float:right;" onclick="corpo_edit_chunk_start(-1)">Cancel</button>
 				${resendbtn}
@@ -25224,6 +26036,7 @@ Current version indicated by LITEVER below.
 		else
 		{
 			chatunits = repack_instruct_history(input);
+			repact_instruct_turns_beautify_render(chatunits);
 		}
 
 		let newbodystr = "";
@@ -26535,7 +27348,8 @@ Current version indicated by LITEVER below.
 				<li id="settingsmenusamplers_tab" ><a class="" href="#" title="Open Samplers Menu" onclick="display_settings_tab(1)">Samplers</a></li>
 				<li id="settingsmenumedia_tab" ><a class="" href="#" title="Open Media Menu" onclick="display_settings_tab(2)">Media</a></li>
 				<li id="settingsmenutokens_tab" ><a class="" href="#" title="Open Tokens Menu" onclick="display_settings_tab(3)">Tokens</a></li>
-				<li id="settingsmenuadvanced_tab" ><a class="" href="#" title="Open Advanced Menu" onclick="display_settings_tab(4)">Advanced</a></li>
+				<li id="settingsmenutools_tab" ><a class="" href="#" title="Open Tools Menu" onclick="display_settings_tab(4)">Tools</a></li>
+				<li id="settingsmenuadvanced_tab" ><a class="" href="#" title="Open Advanced Menu" onclick="display_settings_tab(5)">Advanced</a></li>
 			</ul></div>
 
 			<div class="settingsbody">
@@ -26647,6 +27461,11 @@ Current version indicated by LITEVER below.
 							class="helptext">Whether to allow multiple lines in AI responses (Chat/Adventure). Disable this if the AI starts generating rubbish.</span></span> </div>
 							<input type="checkbox" title="Multiline Replies" id="multiline_replies" style="margin:0px 0px 0px auto;">
 						</div>
+						<div class="settinglabel">
+							<div class="justifyleft settingsmall">Continue User Turns <span class="helpicon">?<span
+								class="helptext">In instruct mode, allows the AI to continue generating the user's turn when pressing Generate More.</span></span></div>
+							<input title="Legacy Savefile" type="checkbox" id="allow_continue_user_turn" style="margin:0px 0px 0px auto;">
+						</div>
 						<div class="settinglabel">
 							<div class="justifyleft settingsmall">Continue Bot Replies <span class="helpicon">?<span
 							class="helptext">Allow AI to continue incomplete past responses, which can be extended by pressing submit again. Not recommended for newbies.</span></span></div>
@@ -26878,6 +27697,11 @@ Current version indicated by LITEVER below.
 								<div class="justifyleft settingsmall" style="width:100%">
 								<input title="Presence Penalty" class="settinglabel miniinput" type="text" inputmode="decimal" placeholder="0" value="0" id="presence_penalty"></div>
 							</div>
+							<div class="settinglabel settingcell">
+								<div title="Power Law Sampler Target. 0 to Deactivate. Range 0 to 1." class="justifyleft settingsmall" style="width:100%">PLaw.Tgt.</div>
+								<div class="justifyleft settingsmall" style="width:100%">
+								<input title="Power Law Sampler Target" class="settinglabel miniinput" type="text" inputmode="decimal" placeholder="0" value="0" id="powerlaw_target"></div>
+							</div>
 						</div>
 						<div style="display:flex;width:100%;">
 							<div class="settinglabel settingcell">
@@ -27532,6 +28356,42 @@ Current version indicated by LITEVER below.
 					</div>
 				</div>
 
+				<!--tools settings menu top-->
+				<div id="settingsmenutools" class="settingsmenu hidden" onchange="setting_tweaked()">
+					<div class="settingitem wide">
+						<div class="settinglabel">
+							<div class="justifyleft settingsmall">Enable Toolcalling <span class="helpicon">?<span
+								class="helptext">Allow tool calling and MCP server usage. Require Chat Completions endpoint (KoboldCpp will auto switch).</span></span></div>
+							<input title="Enable MCP Tools" type="checkbox" id="enable_tool_use" style="margin:0px 0px 0px auto;">
+						</div>
+						<div class="settinglabel">
+							<div class="justifyleft settingsmall">Automatically Execute Tools <span class="helpicon">?<span
+								class="helptext">If disabled, you need to manually execute every tool call the AI suggests.</span></span></div>
+							<input title="Automatically Execute Tools" type="checkbox" id="tools_auto_exec" style="margin:0px 0px 0px auto;">
+						</div>
+						<div class="settinglabel">
+							<div class="justifyleft settingsmall">Use CORS Proxy for MCP <span class="helpicon">?<span
+								class="helptext">Many public MCP servers restrict CORS, use this to proxy your requests. Uses external tools, please only use if necessary.</span></span></div>
+							<input title="Use CORS Proxy for MCP" type="checkbox" id="corsproxy_mcp" style="margin:0px 0px 0px auto;">
+						</div>
+
+						<div class="settinglabel">
+							<div class="justifyleft settingsmall">MCP Server URLs <span class="helpicon">?<span
+								class="helptext">Connect to local or remote MCP servers to use tools there. One URL per row, optional API keys separated by commas.</span></span></div>
+							<textarea class="form-control menuinput_multiline" style="height: 80px;line-height:1.1;margin-bottom: 4px;" id="mcpurls" placeholder="MCP server URLs (e.g. http://localhost:3000/mcp)&#10;One URL per row, optional API keys separated by commas." rows="4"></textarea>
+							<button type="button" id="connect_mcp_btn" class="btn btn-primary" style="width:80px; padding:2px 3px;font-size:12px; margin: 0px 0px 0px auto;" onclick="Fetch_MCP_Tools()">Connect All</button>
+						</div>
+
+						<div class="color_red hidden" id="nomcp">MCP Toolcalling unavailable, requires chat completions.</div>
+
+						<div id="tools_list_container" class="tools_list_container">
+
+						</div>
+
+
+					</div>
+				</div>
+
 				<!--advanced settings menu top-->
 				<div id="settingsmenuadvanced" class="settingsmenu hidden" onchange="setting_tweaked()">
 					<div class="settingitem">
@@ -27726,11 +28586,6 @@ Current version indicated by LITEVER below.
 								class="helptext">Adds extra data to the savefile for better legacy support. Will make your savefile much larger.</span></span></div>
 							<input title="Legacy Savefile" type="checkbox" id="legacy_savefile" style="margin:0px 0px 0px 0px;">
 						</div>
-						<div class="settinglabel">
-							<div class="justifyleft settingsmall">AllowContinueUserTurn <span class="helpicon">?<span
-								class="helptext">In instruct mode, allows the AI to continue generating the user's turn when pressing Generate More.</span></span></div>
-							<input title="Legacy Savefile" type="checkbox" id="allow_continue_user_turn" style="margin:0px 0px 0px 0px;">
-						</div>
 						<div class="settinglabel">
 							<div class="justifyleft settingsmall">ProxyDisableStream <span class="helpicon">?<span
 								class="helptext">Prevent the CORS proxy from streaming, if applicable.</span></span></div>
@@ -28016,7 +28871,7 @@ Current version indicated by LITEVER below.
 					<div style="margin-top:3px; text-align: center; align-self: center; width: 100%">
 						<span style="font-weight:bold;text-decoration: underline;">Slot Storage Option</span>
 						<span style="float:right; text-align: right;">
-							<button type="button" class="btn btn-primary" style="font-size:10px;padding:2px 5px;margin-left:4px;margin:2px;" onclick="hide_popups();display_settings();display_settings_tab(4);">Configure</button>
+							<button type="button" class="btn btn-primary" style="font-size:10px;padding:2px 5px;margin-left:4px;margin:2px;" onclick="hide_popups();display_settings();display_settings_tab(5);">Configure</button>
 						</span>
 					</div>
 					<div style="display:flex;">
diff --git a/expose.h b/expose.h
index a7116aa42..c4810fd5a 100644
--- a/expose.h
+++ b/expose.h
@@ -123,6 +123,7 @@ struct generation_inputs
     const float dynatemp_exponent = 1.0f;
     const float smoothing_factor = 0.0f;
     const float smoothing_curve = 1.0f;
+    const float power_law_target = -1.0f;
     const float dry_multiplier = 0.0f;
     const float dry_base = 0.0f;
     const int dry_allowed_length = 0;
diff --git a/gpttype_adapter.cpp b/gpttype_adapter.cpp
index 4f0eeca37..0ed2b71fc 100644
--- a/gpttype_adapter.cpp
+++ b/gpttype_adapter.cpp
@@ -125,6 +125,8 @@ static std::vector<gpt_vocab::id> current_context_tokens;
 static size_t mem_per_token = 0;
 static std::vector<float> logits;
 static std::vector<int> smartcontext;
+static float power_law_weighted_sum = 0; //power law sampling state vars
+static float power_law_total_weight = 0;
 static std::vector<std::string> stop_sequence;
 static std::vector<int> special_stop_sequence; //for stop sequences that don't have a string representation
 static std::vector<std::string> banned_tokens;
@@ -1271,39 +1273,41 @@ float & weighted_sum,    // persistent EMA state
 float & total_weight,    // persistent EMA state
 llama_token_data_array * cur_p)
 {
-    const float width = 0.3;             // DISTRIBUTION_WIDTH
-    const float peak_logit = 5.0;        // PEAK_LOGIT_VALUE
+    const float width = 0.3;              // DISTRIBUTION_WIDTH
+    const float peak_logit = 5.0;         // PEAK_LOGIT_VALUE
+    const float inv_width = 1.0f / width; // INV_WIDTH
 
     if (target <= 0.0f || cur_p->size == 0) {
         return;
     }
 
-    const float inv_width = 1.0f / width;
+    // target is the desired average probability for selected tokens (0.0 to 1.0)
+    // higher values favor more probable tokens (more stable and predictable)
+    // lower values favor less probable tokens (more creative)
 
-    // Step 1: softmax to get original probabilities
     sample_softmax(cur_p);
 
-    // Step 2: compute adaptive target (EMA feedback)
-    float computed_target;
-    if (total_weight == 0.0f) {
-        computed_target = target;
-    } else {
-        computed_target = 2.0f * target - (weighted_sum / total_weight);
-        computed_target = std::clamp(computed_target, 0.0f, 1.0f);
-    }
+    // compute the adapted target probability for the current sampling step
+    float computed_target = std::clamp(total_weight == 0.0f ? target : 2.0f * target - (weighted_sum / total_weight),0.0f, 1.0f);
 
-    // Step 3: apply power-law shaping in logit space
+    // power law transform
     for (size_t i = 0; i < cur_p->size; ++i) {
-        float dist  = (cur_p->data[i].p - computed_target) * inv_width;
-        float score = peak_logit / (1.0f + dist * dist);
-        cur_p->data[i].logit = score;
+        float dist = (cur_p->data[i].p - computed_target) * inv_width;
+        cur_p->data[i].logit = (peak_logit / (1.0f + dist * dist));
     }
 
     cur_p->sorted = false;
+    sample_softmax(cur_p);
 
-    // Step 4: update EMA history AFTER sampling, update_power_law_history(original_prob[idx])
+    //update EMA history AFTER sampling, update_power_law_history(original_prob[idx])
 }
 inline void power_law_update_history(float selected_token_prob, float & weighted_sum, float & total_weight) {
+    // decay controls how quickly history influence fades (0.0 to 0.99)
+    // lower values = faster adaptation, more reactive to recent tokens
+    // higher values = slower adaptation, more stable over time
+    // effective history length ≈ 1/(1-decay) tokens
+    // example: decay=0.5 --> ~2 tokens; decay=0.9 --> ~10 tokens; decay=0.95 --> ~20 tokens
+    // keep <= 0.99 to prevent unbounded accumulation
     const float power_law_decay = 0.90f;
     weighted_sum = selected_token_prob + power_law_decay * weighted_sum;
     total_weight = 1.0f + power_law_decay * total_weight;
@@ -1735,7 +1739,7 @@ void sample_guidance(struct llama_context * ctx, struct llama_context * guidance
 
 int SampleLogits(const float * logits, int n_ctx, int n_vocab, int rep_pen_range, float rep_pen, float rep_pen_slope, float presence_penalty, float top_k, float top_a, float top_p, float min_p, float typical_p, float tfs, float nsigma, float temp, std::mt19937 & rng,
 int mirostat, float mirostat_tau, float mirostat_eta, float dry_multiplier, float dry_base, int dry_allowed_length, int dry_penalty_last_n, float xtc_threshold, float xtc_probability,
-const std::vector<samplers> & sampler_order, llama_grammar * grammar, float dynatemp_range, float dynatemp_exponent, float smoothing_factor, float smoothing_curve)
+const std::vector<samplers> & sampler_order, llama_grammar * grammar, float dynatemp_range, float dynatemp_exponent, float smoothing_factor, float smoothing_curve, float power_law_target)
 {
     // printf("SampleLogits called with: n_ctx=%d, n_vocab=%d, rep_pen_range=%d, rep_pen=%f, rep_pen_slope=%f, presence_penalty=%f, top_k=%f, top_a=%f, top_p=%f, min_p=%f, typical_p=%f, tfs=%f, nsigma=%f, temp=%f, mirostat=%d, mirostat_tau=%f, mirostat_eta=%f, dry_multiplier=%f, dry_base=%f, dry_allowed_length=%d, dry_penalty_last_n=%d, xtc_threshold=%f, xtc_probability=%f, sampler_order_size=%zu, dynatemp_range=%f, dynatemp_exponent=%f, smoothing_factor=%f\n",
     // n_ctx, n_vocab, rep_pen_range, rep_pen, rep_pen_slope, presence_penalty, top_k, top_a, top_p, min_p, typical_p, tfs, nsigma, temp, mirostat, mirostat_tau, mirostat_eta, dry_multiplier, dry_base, dry_allowed_length, dry_penalty_last_n, xtc_threshold, xtc_probability, sampler_order.size(), dynatemp_range, dynatemp_exponent, smoothing_factor);
@@ -1841,6 +1845,8 @@ const std::vector<samplers> & sampler_order, llama_grammar * grammar, float dyna
         }
         //xtc always last
         sample_xtc(&candidates_p, xtc_threshold, xtc_probability, rng);
+        //power law must be last, it messes up all probs
+        sample_power_law(power_law_target, power_law_weighted_sum, power_law_total_weight, &candidates_p);
         id = sample_token(&candidates_p, rng);
     }
 
@@ -3436,6 +3442,9 @@ generation_outputs gpttype_generate(const generation_inputs inputs)
         }
     }
 
+    power_law_weighted_sum = 0;
+    power_law_total_weight = 0;
+
     //handle custom token bans and antislop phrase banning
     banned_phrases.clear();
     delayed_generated_tokens_limit = 0;
@@ -3644,6 +3653,7 @@ generation_outputs gpttype_generate(const generation_inputs inputs)
     kcpp_data->n_ctx = inputs.max_context_length;
     kcpp_data->smoothing_factor = inputs.smoothing_factor;
     kcpp_data->smoothing_curve = inputs.smoothing_curve;
+    kcpp_data->power_law_target = inputs.power_law_target;
 
     // Parse dry sequence breakers / restart sequences
     kcpp_data->dry_sequence_breakers.clear();
@@ -4606,7 +4616,12 @@ generation_outputs gpttype_generate(const generation_inputs inputs)
                 kcpp_data->mirostat, kcpp_data->mirostat_tau, kcpp_data->mirostat_eta,
                 kcpp_data->dry_multiplier, kcpp_data->dry_base,
                 kcpp_data->dry_allowed_length, kcpp_data->dry_penalty_last_n, kcpp_data->xtc_threshold, kcpp_data->xtc_probability,
-                sampler_order, grammar, dynatemp_range, dynatemp_exponent, smoothing_factor, smoothing_curve);
+                sampler_order, grammar, dynatemp_range, dynatemp_exponent, smoothing_factor, smoothing_curve, power_law_target);
+
+                if (power_law_target > 0.0f) {
+                    float original_prob = original_candidates[id].p;
+                    power_law_update_history(original_prob, power_law_weighted_sum, power_law_total_weight);
+                }
 
                 if(draft_used)
                 {
diff --git a/koboldcpp.py b/koboldcpp.py
index 6398115c8..b7041d457 100755
--- a/koboldcpp.py
+++ b/koboldcpp.py
@@ -265,6 +265,7 @@ class generation_inputs(ctypes.Structure):
                 ("dynatemp_exponent", ctypes.c_float),
                 ("smoothing_factor", ctypes.c_float),
                 ("smoothing_curve", ctypes.c_float),
+                ("power_law_target", ctypes.c_float),
                 ("dry_multiplier", ctypes.c_float),
                 ("dry_base", ctypes.c_float),
                 ("dry_allowed_length", ctypes.c_int),
@@ -1603,6 +1604,9 @@ def generate(genparams, stream_flag=False):
     dynatemp_exponent = tryparsefloat(genparams.get('dynatemp_exponent', 1.0),1.0)
     smoothing_factor = tryparsefloat(genparams.get('smoothing_factor', 0.0),0.0)
     smoothing_curve = tryparsefloat(genparams.get('smoothing_curve', 1.0),1.0)
+    power_law_target = tryparsefloat(genparams.get('power_law_target', -1.0),-1.0)
+    if power_law_target>0 and min_p<=0 and top_p>=1.0: #power law sampler requires a truncation sampler first, force a tiny min-p
+        min_p = 0.01
     logit_biases = genparams.get('logit_bias', {})
     render_special = genparams.get('render_special', False)
     banned_strings = genparams.get('banned_strings', []) # SillyTavern uses that name
@@ -1666,6 +1670,7 @@ def generate(genparams, stream_flag=False):
     inputs.dynatemp_exponent = dynatemp_exponent
     inputs.smoothing_factor = smoothing_factor
     inputs.smoothing_curve = smoothing_curve
+    inputs.power_law_target = power_law_target
     inputs.grammar = grammar.encode("UTF-8")
     inputs.grammar_retain_state = grammar_retain_state
     inputs.allow_eos_token = not ban_eos_token
@@ -2814,7 +2819,8 @@ ws ::= | " " | "\n" [ \t]{0,20}
         default_adapter = {} if chatcompl_adapter is None else chatcompl_adapter
         adapter_obj = genparams.get('adapter', default_adapter)
         default_max_tok = (adapter_obj.get("max_length", args.defaultgenamt) if (api_format==4 or api_format==7) else args.defaultgenamt)
-        genparams["max_length"] = tryparseint(genparams.get('max_tokens', genparams.get('max_completion_tokens', default_max_tok)),default_max_tok)
+        oaiml = tryparseint(genparams.get('max_tokens', genparams.get('max_completion_tokens', default_max_tok)),default_max_tok)
+        genparams["max_length"] = genparams.get('max_length', oaiml)
         if genparams["max_length"] <= 0:
             genparams["max_length"] = default_max_tok
         presence_penalty = genparams.get('presence_penalty', genparams.get('frequency_penalty', 0.0))
diff --git a/otherarch/otherarch.h b/otherarch/otherarch.h
index 1322cff0d..9c177284c 100644
--- a/otherarch/otherarch.h
+++ b/otherarch/otherarch.h
@@ -50,7 +50,7 @@ struct kcpp_params {
     float xtc_probability      = 0;
     float   dynatemp_range     = 0.0f;  // enables DynaTemp if neq 0. dynatemp_min = temperature - dt_range, dynatemp_max = temperature + dt_range
     float   dynatemp_exponent  = 1.0f;
-    float power_law_target     = 0.0f; // 0.0 - 1.0, <=0.0 is disabled
+    float power_law_target     = -1.0f; // 0.0 - 1.0, <=0.0 is disabled
 
     std::string model_filename       = ""; // model path
     std::string prompt               = "";